[OLEACC] Sync with Wine Staging 3.3. CORE-14434

diff --git a/dll/win32/oleacc/CMakeLists.txt b/dll/win32/oleacc/CMakeLists.txt
index 891784d..9f28fff 100644 (file)
--- a/dll/win32/oleacc/CMakeLists.txt
+++ b/dll/win32/oleacc/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND SOURCE
     main.c
     propservice.c
     window.c
-    oleacc_private.h
+    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c)
 
 add_idl_headers(oleacc_idlheader oleacc_classes.idl)
@@ -39,5 +39,5 @@ add_dependencies(oleacc oleacc_idlheader stdole2)
 set_module_type(oleacc win32dll)
 target_link_libraries(oleacc uuid wine ${PSEH_LIB})
 add_importlibs(oleacc oleaut32 ole32 user32 rpcrt4 msvcrt kernel32 ntdll)
-add_pch(oleacc oleacc_private.h SOURCE)
+add_pch(oleacc precomp.h SOURCE)
 add_cd_file(TARGET oleacc DESTINATION reactos/system32 FOR all)

diff --git a/dll/win32/oleacc/client.c b/dll/win32/oleacc/client.c
index b4b8d65..5b1f0ee 100644 (file)
--- a/dll/win32/oleacc/client.c
+++ b/dll/win32/oleacc/client.c
@@ -16,8 +16,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
+
 #include "oleacc_private.h"
 
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "wine/heap.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
+
 typedef struct {
     IAccessible IAccessible_iface;
     IOleWindow IOleWindow_iface;

diff --git a/dll/win32/oleacc/main.c b/dll/win32/oleacc/main.c
index ca6c65d..ee8a6c0 100644 (file)
--- a/dll/win32/oleacc/main.c
+++ b/dll/win32/oleacc/main.c
@@ -18,15 +18,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "oleacc_private.h"
-
-#include <commctrl.h>
-#include <rpcproxy.h>
+#define COBJMACROS
 
-#include <wine/unicode.h>
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "ole2.h"
+#include "commctrl.h"
+#include "rpcproxy.h"
 
+#include "initguid.h"
+#include "oleacc_private.h"
 #include "resource.h"
 
+#include "wine/unicode.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
+
 static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'};
 
 static const WCHAR menuW[] = {'#','3','2','7','6','8',0};

diff --git a/dll/win32/oleacc/oleacc.rc b/dll/win32/oleacc/oleacc.rc
index aeb2fac..6acae63 100644 (file)
--- a/dll/win32/oleacc/oleacc.rc
+++ b/dll/win32/oleacc/oleacc.rc
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <oleacc.h>
-
+#include "oleacc.h"
 #include "resource.h"
 
 1 TYPELIB "oleacc_classes.tlb"
@@ -36,7 +34,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define WINE_PRODUCTVERSION 6,1,7600,16385
 #define WINE_PRODUCTVERSION_STR "6.1.6700.16385"
 
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
 
 /* UTF-8 */
 #pragma code_page(65001)

diff --git a/dll/win32/oleacc/oleacc_private.h b/dll/win32/oleacc/oleacc_private.h
index d80578f..5218682 100644 (file)
--- a/dll/win32/oleacc/oleacc_private.h
+++ b/dll/win32/oleacc/oleacc_private.h
@@ -16,37 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _OLEACC_PRIVATE_H_
-#define _OLEACC_PRIVATE_H_
+#pragma once
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <ole2.h>
-#include <oleacc_classes.h>
-
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
+#include "oleacc_classes.h"
 
 HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN;
 HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN;
 HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN;
 
 int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN;
-
-static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len)
-{
-    return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
-
-#endif /* _OLEACC_PRIVATE_H_ */

diff --git a/dll/win32/oleacc/precomp.h b/dll/win32/oleacc/precomp.h
new file mode 100644 (file)
index 0000000..e5b208d
--- /dev/null
+++ b/dll/win32/oleacc/precomp.h
@@ -0,0 +1,19 @@
+
+#ifndef _OLEACC_PRECOMP_H_
+#define _OLEACC_PRECOMP_H_
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <ole2.h>
+
+#include <wine/debug.h>
+
+#include "oleacc_private.h"
+
+#endif /* !_OLEACC_PRECOMP_H_ */

diff --git a/dll/win32/oleacc/propservice.c b/dll/win32/oleacc/propservice.c
index bd99831..3ed1818 100644 (file)
--- a/dll/win32/oleacc/propservice.c
+++ b/dll/win32/oleacc/propservice.c
@@ -16,8 +16,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
+
+#include <stdarg.h>
+
 #include "oleacc_private.h"
 
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
+
 static HRESULT WINAPI AccPropServices_QueryInterface(IAccPropServices *iface, REFIID riid, void **ppv)
 {
     if(IsEqualGUID(&IID_IUnknown, riid)) {

diff --git a/dll/win32/oleacc/window.c b/dll/win32/oleacc/window.c
index a7efe71..32c19fd 100644 (file)
--- a/dll/win32/oleacc/window.c
+++ b/dll/win32/oleacc/window.c
@@ -16,8 +16,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
+
 #include "oleacc_private.h"
 
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "wine/heap.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
+
 typedef struct {
     IAccessible IAccessible_iface;
     IOleWindow IOleWindow_iface;

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 858be58..93c8ef9 100644 (file)
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -140,7 +140,7 @@ reactos/dll/win32/objsel              # Synced to WineStaging-3.3
 reactos/dll/win32/odbc32              # Synced to WineStaging-3.3. Depends on port of Linux ODBC.
 reactos/dll/win32/odbccp32            # Synced to WineStaging-3.3
 reactos/dll/win32/ole32               # Synced to WineStaging-3.3
-reactos/dll/win32/oleacc              # Synced to WineStaging-2.9
+reactos/dll/win32/oleacc              # Synced to WineStaging-3.3
 reactos/dll/win32/oleaut32            # Synced to WineStaging-3.3
 reactos/dll/win32/olecli32            # Synced to WineStaging-2.9
 reactos/dll/win32/oledlg              # Synced to WineStaging-2.9