[ros-diffs] [akhaldi] 60238: [INSENG] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Fri Sep 20 09:59:40 2013
New Revision: 60238

URL: http://svn.reactos.org/svn/reactos?rev=60238&view=rev
Log:
[INSENG]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/inseng/CMakeLists.txt
    trunk/reactos/dll/win32/inseng/inseng.spec
    trunk/reactos/dll/win32/inseng/inseng_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/inseng/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/inseng/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inseng/CMakeLists.txt	[iso-8859-1] Fri Sep 20 09:59:40 2013
@@ -1,6 +1,3 @@
-
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -8,19 +5,11 @@
 
 list(APPEND SOURCE
     inseng_main.c
-    inseng.rc
     ${CMAKE_CURRENT_BINARY_DIR}/inseng_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/inseng.def)
 
-add_library(inseng SHARED ${SOURCE})
+add_library(inseng SHARED ${SOURCE} inseng.rc)
 set_module_type(inseng win32dll)
-target_link_libraries(inseng uuid wine)
-
-add_importlibs(inseng
-    ole32
-    advapi32
-    msvcrt
-    kernel32
-    ntdll)
-
+target_link_libraries(inseng wine)
+add_importlibs(inseng msvcrt kernel32 ntdll)
 add_cd_file(TARGET inseng DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/inseng/inseng.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.sp…
==============================================================================
--- trunk/reactos/dll/win32/inseng/inseng.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inseng/inseng.spec	[iso-8859-1] Fri Sep 20 09:59:40 2013
@@ -3,7 +3,7 @@
 @ stdcall CheckTrustEx(ptr ptr ptr ptr ptr)
 @ stdcall -private DllCanUnloadNow()
 @ stdcall -private DllGetClassObject(ptr ptr ptr)
-@ stub -private DllInstall
+@ stdcall -private DllInstall(long wstr)
 @ stdcall -private DllRegisterServer()
 @ stdcall -private DllUnregisterServer()
 @ stub DownloadFile

Modified: trunk/reactos/dll/win32/inseng/inseng_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng_ma…
==============================================================================
--- trunk/reactos/dll/win32/inseng/inseng_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inseng/inseng_main.c	[iso-8859-1] Fri Sep 20 09:59:40 2013
@@ -51,8 +51,6 @@
         instance = hInstDLL;
         DisableThreadLibraryCalls(hInstDLL);
         break;
-    case DLL_PROCESS_DETACH:
-        break;
     }
     return TRUE;
 }
@@ -96,3 +94,12 @@
     FIXME("%p %p %p %p %p\n", a, b, c, d, e );
     return TRUE;
 }
+
+/***********************************************************************
+ *  DllInstall (INSENG.@)
+ */
+HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
+{
+    FIXME("(%s, %s): stub\n", bInstall ? "TRUE" : "FALSE",
debugstr_w(cmdline));
+    return S_OK;
+}

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Fri Sep 20 09:59:40 2013
@@ -87,7 +87,7 @@
 reactos/dll/win32/inetcomm        # Synced to Wine-1.7.1
 reactos/dll/win32/inetmib1        # Synced to Wine-1.7.1
 reactos/dll/win32/initpki         # Synced to Wine-1.7.1
-reactos/dll/win32/inseng          # Synced to Wine-1.5.4
+reactos/dll/win32/inseng          # Synced to Wine-1.7.1
 reactos/dll/win32/iphlpapi        # Out of sync
 reactos/dll/win32/itircl          # Synced to Wine-1.5.19
 reactos/dll/win32/itss            # Synced to Wine-1.5.4