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

Author: winesync
Date: Thu Nov 29 13:48:07 2007
New Revision: 30869

URL: http://svn.reactos.org/svn/reactos?rev=30869&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/sendmail.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.rb…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32.rbuild (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32.rbuild Thu Nov 29 13:48:07 2007
@@ -1,13 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mapi32" type="win32dll"
baseaddress="${BASEADDRESS_MAPI32}" installbase="system32"
installname="mapi32.dll" allowwarnings="true">
 	<importlibrary definition="mapi32.spec.def" />
 	<include base="mapi32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__WINESRC__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
+	<define name="WINVER">0x600</define>
+	<define name="_WIN32_WINNT">0x600</define>
 	<library>wine</library>
 	<library>shlwapi</library>
 	<library>shell32</library>

Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.sp…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32.spec (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32.spec Thu Nov 29 13:48:07 2007
@@ -16,7 +16,7 @@
  24 stub PRProviderInit
  25 stub LAUNCHWIZARD
  26 stub LaunchWizard@20
- 27 stub DllGetClassObject
+ 27 stdcall -private DllGetClassObject(ptr ptr ptr)
  28 stdcall -private DllCanUnloadNow()
  29 stub MAPIOpenFormMgr
  30 stub MAPIOpenFormMgr@8

Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32_main.c (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32_main.c Thu Nov 29 13:48:07 2007
@@ -25,6 +25,7 @@
 #include "winerror.h"
 #include "objbase.h"
 #include "mapix.h"
+#include "mapiform.h"
 #include "mapi.h"
 #include "wine/debug.h"
 
@@ -49,6 +50,16 @@
 	break;
     }
     return TRUE;
+}
+
+/***********************************************************************
+ *		DllGetClassObject (MAPI32.27)
+ */
+HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
+{
+    *ppv = NULL;
+    FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid),
debugstr_guid(iid));
+    return CLASS_E_CLASSNOTAVAILABLE;
 }
 
 /***********************************************************************

Modified: trunk/reactos/dll/win32/mapi32/sendmail.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/sendmail.c (original)
+++ trunk/reactos/dll/win32/mapi32/sendmail.c Thu Nov 29 13:48:07 2007
@@ -53,7 +53,7 @@
  *  Failure: MAPI_E_FAILURE
  *
  * NOTES
- *  This is a temporary hack.
+ *  This is a temporary hack. 
  */
 ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam,
     lpMapiMessage message, FLAGS flags, ULONG reserved )
@@ -169,7 +169,7 @@
     }
     ret = MAPI_E_FAILURE;
     size = sizeof(format) + to_size + cc_size + bcc_size + subj_size + body_size;
-
+    
     mailto = HeapAlloc( GetProcessHeap(), 0, size );
     if (!mailto) goto exit;
 

Modified: trunk/reactos/dll/win32/mapi32/util.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/util.c (original)
+++ trunk/reactos/dll/win32/mapi32/util.c Thu Nov 29 13:48:07 2007
@@ -806,7 +806,7 @@
  *
  * PARAMS
  *  session          [I]   MAPI session handle
- *  item             [I]   Enumerated variable that identifies which
+ *  item             [I]   Enumerated variable that identifies which 
  *                         configuration information is being requested
  *  reference        [O]   Buffer where configuration information is written
  *  config_extensions[I/O] Path of file to create stream on