[MAPI32] Sync with Wine Staging 2.16. CORE-13762

[reactos.git] / reactos / dll / win32 / mapi32 / prop.c

diff --git a/reactos/dll/win32/mapi32/prop.c b/reactos/dll/win32/mapi32/prop.c
index 215c2c4..1e323b1 100644 (file)
--- a/reactos/dll/win32/mapi32/prop.c
+++ b/reactos/dll/win32/mapi32/prop.c
@@ -18,26 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-//#include "winerror.h"
-//#include "winternl.h"
-//#include "objbase.h"
-#include <shlwapi.h>
-#include <wine/list.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include <mapival.h>
+#include "precomp.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(mapi);
+#include <wine/list.h>
 
 BOOL WINAPI FBadRglpszA(LPSTR*,ULONG);
 
@@ -1518,7 +1501,7 @@ static HRESULT WINAPI IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid,
        IsEqualIID(riid, &IID_IMAPIProp) ||
        IsEqualIID(riid, &IID_IMAPIPropData))
     {
-        *ppvObj = This;
+        *ppvObj = &This->IPropData_iface;
         IPropData_AddRef(iface);
         TRACE("returning %p\n", *ppvObj);
         return S_OK;
@@ -1640,7 +1623,7 @@ static HRESULT WINAPI IPropData_fnSaveChanges(LPPROPDATA iface, ULONG ulFlags)
  *
  * PARAMS
  *  iface    [I] IMAPIProp object to get the property values from
- *  lpTags   [I] Property tage of property values to be retrieved
+ *  lpTags   [I] Property tags of property values to be retrieved
  *  ulFlags  [I] Return 0=Ascii MAPI_UNICODE=Unicode strings for
  *                 unspecified types
  *  lpCount  [O] Destination for number of properties returned