https://git.reactos.org/?p=reactos.git;a=commitdiff;h=493f429748f353434379de...
commit 493f429748f353434379de02ae3d0458d45ae348 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Tue Mar 20 12:39:58 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Tue Mar 20 12:39:58 2018 +0100
[OLEACC] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/oleacc/CMakeLists.txt | 4 ++-- dll/win32/oleacc/client.c | 8 ++++++++ dll/win32/oleacc/main.c | 19 ++++++++++++++----- dll/win32/oleacc/oleacc.rc | 6 ++---- dll/win32/oleacc/oleacc_private.h | 29 ++--------------------------- dll/win32/oleacc/precomp.h | 19 +++++++++++++++++++ dll/win32/oleacc/propservice.c | 8 ++++++++ dll/win32/oleacc/window.c | 8 ++++++++ media/doc/README.WINE | 2 +- 9 files changed, 64 insertions(+), 39 deletions(-)
diff --git a/dll/win32/oleacc/CMakeLists.txt b/dll/win32/oleacc/CMakeLists.txt index 891784d1e7..9f28fffd6c 100644 --- 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 b4b8d6525c..5b1f0eee5f 100644 --- 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 ca6c65d86f..ee8a6c03b1 100644 --- 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 aeb2facb5a..6acae631fa 100644 --- 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 d80578f6cd..52186828b1 100644 --- 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 index 0000000000..e5b208dd09 --- /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 bd99831777..3ed1818ef7 100644 --- 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 a7efe713f0..32c19fd7c2 100644 --- 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 858be58afb..93c8ef96d0 100644 --- 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
-
Amine Khaldi