huwcampbell.com / reactos
Reactos
fork atom

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

Amine Khaldi 8361200d f76b348c

+44 -21
+2 -2
dll/win32/objsel/CMakeLists.txt
··· 9 9 list(APPEND SOURCE 10 10 factory.c 11 11 objsel.c 12 - objsel_private.h) 12 + precomp.h) 13 13 14 14 add_library(objsel SHARED 15 15 ${SOURCE} ··· 19 19 set_module_type(objsel win32dll) 20 20 target_link_libraries(objsel uuid wine) 21 21 add_importlibs(objsel ole32 advapi32 msvcrt kernel32 ntdll) 22 - add_pch(objsel objsel_private.h SOURCE) 22 + add_pch(objsel precomp.h SOURCE) 23 23 add_cd_file(TARGET objsel DESTINATION reactos/system32 FOR all)
+5
dll/win32/objsel/factory.c
··· 21 21 22 22 #include "objsel_private.h" 23 23 24 + #include "wine/debug.h" 25 + 26 + WINE_DEFAULT_DEBUG_CHANNEL(objsel); 27 + 28 + 24 29 static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) 25 30 { 26 31 return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface);
+4 -1
dll/win32/objsel/objsel.c
··· 19 19 */ 20 20 21 21 #include "objsel_private.h" 22 + #include "rpcproxy.h" 23 + 24 + #include "wine/debug.h" 22 25 23 - #include <rpcproxy.h> 26 + WINE_DEFAULT_DEBUG_CHANNEL(objsel); 24 27 25 28 LONG dll_refs = 0; 26 29 static HINSTANCE hInstance;
+3 -2
dll/win32/objsel/objsel.rc
··· 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 19 */ 20 20 21 - #include <windef.h> 21 + #include "windef.h" 22 + #include "winbase.h" 22 23 23 24 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 24 25 ··· 26 27 27 28 #define WINE_FILENAME_STR "objsel.dll" 28 29 29 - #include <wine/wine_common_ver.rc> 30 + #include "wine/wine_common_ver.rc"
+16 -15
dll/win32/objsel/objsel_private.h
··· 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 19 */ 20 20 21 - #ifndef _OBJSEL_PRIVATE_H 22 - #define _OBJSEL_PRIVATE_H 21 + #pragma once 23 22 23 + #include <string.h> 24 24 #include <stdarg.h> 25 - 26 - #define WIN32_NO_STATUS 27 - #define _INC_WINDOWS 28 - #define COM_NO_WINDOWS_H 25 + #include <stdio.h> 26 + #include "winerror.h" 27 + #include "windef.h" 28 + #include "winbase.h" 29 + #include "winreg.h" 30 + #include "wingdi.h" 31 + #include "winuser.h" 29 32 30 33 #define COBJMACROS 31 34 32 - #include <windef.h> 33 - #include <winbase.h> 34 - #include <objbase.h> 35 - #include <objsel.h> 36 - 37 - #include <wine/debug.h> 38 - WINE_DEFAULT_DEBUG_CHANNEL(objsel); 35 + #include "ole2.h" 36 + #include "strmif.h" 37 + #include "olectl.h" 38 + #include "unknwn.h" 39 + #include "objsel.h" 40 + #include "wine/unicode.h" 41 + #include "uuids.h" 39 42 40 43 /********************************************************************** 41 44 * Dll lifetime tracking declaration for objsel.dll ··· 61 64 HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) DECLSPEC_HIDDEN; 62 65 63 66 extern ClassFactoryImpl OBJSEL_ClassFactory DECLSPEC_HIDDEN; 64 - 65 - #endif /* _OBJSEL_PRIVATE_H */
+13
dll/win32/objsel/precomp.h
··· 1 + 2 + #ifndef _OBJSEL_PRECOMP_H 3 + #define _OBJSEL_PRECOMP_H 4 + 5 + #define WIN32_NO_STATUS 6 + #define _INC_WINDOWS 7 + #define COM_NO_WINDOWS_H 8 + 9 + #include "objsel_private.h" 10 + 11 + #include <wine/debug.h> 12 + 13 + #endif /* !_OBJSEL_PRECOMP_H */
+1 -1
media/doc/README.WINE
··· 136 136 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 137 137 reactos/dll/win32/npptools # Synced to WineStaging-3.3 138 138 reactos/dll/win32/ntdsapi # Synced to WineStaging-3.3 139 - reactos/dll/win32/objsel # Synced to WineStaging-2.9 139 + reactos/dll/win32/objsel # Synced to WineStaging-3.3 140 140 reactos/dll/win32/odbc32 # Synced to WineStaging-2.9. Depends on port of Linux ODBC. 141 141 reactos/dll/win32/odbccp32 # Synced to WineStaging-2.9 142 142 reactos/dll/win32/ole32 # Synced to Wine-3.0