[PRINTUI]
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 26 Sep 2013 14:06:42 +0000 (14:06 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 26 Sep 2013 14:06:42 +0000 (14:06 +0000)
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60362

reactos/dll/win32/printui/CMakeLists.txt
reactos/dll/win32/printui/printui.c
reactos/media/doc/README.WINE

index 332fb0e..98a1d95 100644 (file)
@@ -1,20 +1,15 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
-
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 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)
index 5c24baf..f47e8f6 100644 (file)
@@ -42,8 +42,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(printui);
 
-static HINSTANCE PRINTUI_hInstance = NULL;
-
 /* ################################# */
 
 /* Must be in order with OPT_*      */
@@ -231,7 +229,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
             return FALSE;           /* prefer native version */
 
         case DLL_PROCESS_ATTACH:
-            PRINTUI_hInstance = hinstDLL;
             DisableThreadLibraryCalls( hinstDLL );
             break;
     }
index 5a639da..70f134a 100644 (file)
@@ -153,7 +153,7 @@ reactos/dll/win32/olethk32        # Synced to Wine-1.5.19
 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