[ros-diffs] [winesync] 32845: Autosyncing with Wine HEAD

[winesync at svn.reactos.org]

Author: winesync
Date: Fri Apr  4 08:24:16 2008
New Revision: 32845

URL: http://svn.reactos.org/svn/reactos?rev=32845&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/mapi32/mapi32.rbuild
    trunk/reactos/dll/win32/mapi32/mapi32.spec
    trunk/reactos/dll/win32/mapi32/mapi32_main.c
    trunk/reactos/dll/win32/mapi32/prop.c
    trunk/reactos/dll/win32/mapi32/util.c

Modified: trunk/reactos/dll/win32/mapi32/mapi32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.rbuild?rev=32845&r1=32844&r2=32845&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32.rbuild [iso-8859-1] Fri Apr  4 08:24:16 2008
@@ -8,17 +8,17 @@
 	<define name="__WINESRC__" />
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
+	<file>imalloc.c</file>
+	<file>mapi32_main.c</file>
+	<file>prop.c</file>
+	<file>sendmail.c</file>
+	<file>util.c</file>
+	<file>mapi32.spec</file>
 	<library>wine</library>
 	<library>shlwapi</library>
 	<library>shell32</library>
 	<library>kernel32</library>
 	<library>uuid</library>
 	<library>ntdll</library>
-	<file>imalloc.c</file>
-	<file>mapi32_main.c</file>
-	<file>prop.c</file>
-	<file>sendmail.c</file>
-	<file>util.c</file>
-	<file>mapi32.spec</file>
 </module>
 </group>

Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.spec?rev=32845&r1=32844&r2=32845&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] Fri Apr  4 08:24:16 2008
@@ -54,7 +54,7 @@
  72 stdcall FEqualNames at 8(ptr ptr) FEqualNames
  73 stub WrapStoreEntryID at 24
  74 stdcall IsBadBoundedStringPtr at 8(ptr long) IsBadBoundedStringPtr
- 75 stub HrQueryAllRows at 24
+ 75 stdcall HrQueryAllRows at 24(ptr ptr ptr ptr long ptr) HrQueryAllRows
  76 stdcall PropCopyMore at 16(ptr ptr ptr ptr) PropCopyMore
  77 stdcall UlPropSize at 4(ptr) UlPropSize
  78 stdcall FPropContainsProp at 12(ptr ptr long) FPropContainsProp

Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_main.c?rev=32845&r1=32844&r2=32845&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] Fri Apr  4 08:24:16 2008
@@ -24,6 +24,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "objbase.h"
+#include "initguid.h"
 #include "mapix.h"
 #include "mapiform.h"
 #include "mapi.h"

Modified: trunk/reactos/dll/win32/mapi32/prop.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?rev=32845&r1=32844&r2=32845&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Fri Apr  4 08:24:16 2008
@@ -83,7 +83,7 @@
     case PT_CLSID:
         scode = lpMore(sizeof(GUID), lpOrig, (LPVOID*)&lpDest->Value.lpguid);
         if (SUCCEEDED(scode))
-            memcpy(lpDest->Value.lpguid, lpSrc->Value.lpguid, sizeof(GUID));
+            *lpDest->Value.lpguid = *lpSrc->Value.lpguid;
         break;
     case PT_STRING8:
         ulLen = lstrlenA(lpSrc->Value.lpszA) + 1u;
@@ -810,7 +810,7 @@
         {
         case PT_CLSID:
             lpDest->Value.lpguid = (LPGUID)lpDataDest;
-            memcpy(lpDest->Value.lpguid, lpProps->Value.lpguid, sizeof(GUID));
+            *lpDest->Value.lpguid = *lpProps->Value.lpguid;
             lpDataDest += sizeof(GUID);
             break;
         case PT_STRING8:

Modified: trunk/reactos/dll/win32/mapi32/util.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?rev=32845&r1=32844&r2=32845&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] Fri Apr  4 08:24:16 2008
@@ -890,3 +890,15 @@
     }
     return ret;
 }
+
+/**************************************************************************
+ *  HrQueryAllRows   (MAPI32.75)
+ */
+HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags,
+    LPSRestriction lpRestriction, LPSSortOrderSet lpSortOrderSet,
+    LONG crowsMax, LPSRowSet *lppRows)
+{
+    FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows);
+    *lppRows = NULL;
+    return MAPI_E_CALL_FAILED;
+}