Autosyncing with Wine HEAD

svn path=/trunk/; revision=32845

diff --git a/reactos/dll/win32/mapi32/mapi32.rbuild b/reactos/dll/win32/mapi32/mapi32.rbuild
index 330f775..dc600d6 100644 (file)
--- a/reactos/dll/win32/mapi32/mapi32.rbuild
+++ b/reactos/dll/win32/mapi32/mapi32.rbuild
@@ -8,17 +8,17 @@
        <define name="__WINESRC__" />
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
-       <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>
+       <library>wine</library>
+       <library>shlwapi</library>
+       <library>shell32</library>
+       <library>kernel32</library>
+       <library>uuid</library>
+       <library>ntdll</library>
 </module>
 </group>

diff --git a/reactos/dll/win32/mapi32/mapi32.spec b/reactos/dll/win32/mapi32/mapi32.spec
index bf97415..abf79bf 100644 (file)
--- a/reactos/dll/win32/mapi32/mapi32.spec
+++ b/reactos/dll/win32/mapi32/mapi32.spec
@@ -54,7 +54,7 @@
  72 stdcall FEqualNames@8(ptr ptr) FEqualNames
  73 stub WrapStoreEntryID@24
  74 stdcall IsBadBoundedStringPtr@8(ptr long) IsBadBoundedStringPtr
- 75 stub HrQueryAllRows@24
+ 75 stdcall HrQueryAllRows@24(ptr ptr ptr ptr long ptr) HrQueryAllRows
  76 stdcall PropCopyMore@16(ptr ptr ptr ptr) PropCopyMore
  77 stdcall UlPropSize@4(ptr) UlPropSize
  78 stdcall FPropContainsProp@12(ptr ptr long) FPropContainsProp

diff --git a/reactos/dll/win32/mapi32/mapi32_main.c b/reactos/dll/win32/mapi32/mapi32_main.c
index edfa326..936d435 100644 (file)
--- a/reactos/dll/win32/mapi32/mapi32_main.c
+++ b/reactos/dll/win32/mapi32/mapi32_main.c
@@ -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"

diff --git a/reactos/dll/win32/mapi32/prop.c b/reactos/dll/win32/mapi32/prop.c
index 18e8013..e30a83b 100644 (file)
--- a/reactos/dll/win32/mapi32/prop.c
+++ b/reactos/dll/win32/mapi32/prop.c
@@ -83,7 +83,7 @@ SCODE WINAPI PropCopyMore(LPSPropValue lpDest, LPSPropValue lpSrc,
     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 @@ SCODE WINAPI ScCopyProps(int cValues, LPSPropValue lpProps, LPVOID lpDst, ULONG
         {
         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:

diff --git a/reactos/dll/win32/mapi32/util.c b/reactos/dll/win32/mapi32/util.c
index 6621e6f..b68eceb 100644 (file)
--- a/reactos/dll/win32/mapi32/util.c
+++ b/reactos/dll/win32/mapi32/util.c
@@ -890,3 +890,15 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path
     }
     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;
+}