Author: akhaldi Date: Thu Sep 26 14:06:42 2013 New Revision: 60362
URL: http://svn.reactos.org/svn/reactos?rev=60362&view=rev Log: [PRINTUI] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/printui/CMakeLists.txt trunk/reactos/dll/win32/printui/printui.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/printui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/CMakeList... ============================================================================== --- trunk/reactos/dll/win32/printui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/CMakeLists.txt [iso-8859-1] Thu Sep 26 14:06:42 2013 @@ -1,20 +1,15 @@
+add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__WINESRC__) - spec2def(printui.dll printui.spec)
list(APPEND SOURCE printui.c - printui.rc ${CMAKE_CURRENT_BINARY_DIR}/printui_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/printui.def)
-add_library(printui SHARED ${SOURCE}) +add_library(printui SHARED ${SOURCE} printui.rc) set_module_type(printui win32dll) - target_link_libraries(printui wine) - add_importlibs(printui shell32 msvcrt kernel32 ntdll) -add_dependencies(printui psdk) add_cd_file(TARGET printui DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/printui/printui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.c... ============================================================================== --- trunk/reactos/dll/win32/printui/printui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui.c [iso-8859-1] Thu Sep 26 14:06:42 2013 @@ -41,8 +41,6 @@ #include "printui_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(printui); - -static HINSTANCE PRINTUI_hInstance = NULL;
/* ################################# */
@@ -231,7 +229,6 @@ return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH: - PRINTUI_hInstance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); break; }
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 26 14:06:42 2013 @@ -153,7 +153,7 @@ reactos/dll/win32/pdh # Synced to Wine-1.7.1 reactos/dll/win32/pidgen # Synced to Wine-1.5.19 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to Wine-1.5.4 +reactos/dll/win32/printui # Synced to Wine-1.7.1 reactos/dll/win32/propsys # Synced to Wine-1.5.26 reactos/dll/win32/pstorec # Synced to Wine-1.5.4 reactos/dll/win32/qmgr # Synced to Wine-1.5.26