[ros-diffs] [dchapyshev] 41062: - Sync riched20, qmgr, pdh with Wine 1.1.22

dchapyshev at svn.reactos.org dchapyshev at svn.reactos.org
Sat May 23 12:25:03 CEST 2009


Author: dchapyshev
Date: Sat May 23 14:25:02 2009
New Revision: 41062

URL: http://svn.reactos.org/svn/reactos?rev=41062&view=rev
Log:
- Sync riched20, qmgr, pdh with Wine 1.1.22

Modified:
    trunk/reactos/dll/win32/pdh/pdh_main.c
    trunk/reactos/dll/win32/qmgr/job.c
    trunk/reactos/dll/win32/riched20/editor.h
    trunk/reactos/dll/win32/riched20/string.c

Modified: trunk/reactos/dll/win32/pdh/pdh_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?rev=41062&r1=41061&r2=41062&view=diff
==============================================================================
--- trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] Sat May 23 14:25:02 2009
@@ -1098,6 +1098,8 @@
             }
             heap_free( bufferW );
         }
+        else
+            ret = PDH_MEMORY_ALLOCATION_FAILURE;
     }
 
 done:

Modified: trunk/reactos/dll/win32/qmgr/job.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/job.c?rev=41062&r1=41061&r2=41062&view=diff
==============================================================================
--- trunk/reactos/dll/win32/qmgr/job.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgr/job.c [iso-8859-1] Sat May 23 14:25:02 2009
@@ -334,8 +334,8 @@
     IBackgroundCopyJob2 *iface,
     BG_JOB_PRIORITY Val)
 {
-    FIXME("Not implemented\n");
-    return E_NOTIMPL;
+    FIXME("(%p,0x%08x) stub\n", iface, Val);
+    return S_OK;
 }
 
 static HRESULT WINAPI BITS_IBackgroundCopyJob_GetPriority(

Modified: trunk/reactos/dll/win32/riched20/editor.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.h?rev=41062&r1=41061&r2=41062&view=diff
==============================================================================
--- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Sat May 23 14:25:02 2009
@@ -86,7 +86,6 @@
 const char *ME_GetDITypeName(ME_DIType type);
 
 /* string.c */
-ME_String *ME_MakeString(LPCWSTR szText);
 ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars);
 ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars);
 ME_String *ME_StrDup(const ME_String *s);

Modified: trunk/reactos/dll/win32/riched20/string.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/string.c?rev=41062&r1=41061&r2=41062&view=diff
==============================================================================
--- trunk/reactos/dll/win32/riched20/string.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/string.c [iso-8859-1] Sat May 23 14:25:02 2009
@@ -47,11 +47,6 @@
   /* Native allows NULL chars */
   memcpy(s->szData, szText, s->nLen * sizeof(WCHAR));
   return s;
-}
-
-ME_String *ME_MakeString(LPCWSTR szText)
-{
-  return ME_MakeStringN(szText, lstrlenW(szText));
 }
 
 /* Make a string by repeating a char nMaxChars times */



More information about the Ros-diffs mailing list