[ros-diffs] [akhaldi] 72025: [0.4.2] * Merge setupapi work by Hermès in revisions 72020-72022. CORE-11689 ROSTESTS-234

Author: akhaldi
Date: Wed Jul 27 19:32:11 2016
New Revision: 72025

URL: http://svn.reactos.org/svn/reactos?rev=72025&view=rev
Log:
[0.4.2] * Merge setupapi work by Hermès in revisions 72020-72022. CORE-11689 ROSTESTS-234

Modified:
    branches/ros-branch-0_4_2/   (props changed)
    branches/ros-branch-0_4_2/reactos/   (props changed)
    branches/ros-branch-0_4_2/reactos/dll/win32/setupapi/install.c
    branches/ros-branch-0_4_2/rostests/   (props changed)
    branches/ros-branch-0_4_2/rostests/winetests/setupapi/dialog.c

Propchange: branches/ros-branch-0_4_2/
------------------------------------------------------------------------------
    svn:mergeinfo = /trunk:72020-72022

Propchange: branches/ros-branch-0_4_2/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Jul 27 19:32:11 2016
@@ -20,3 +20,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
+/trunk/reactos:72020-72022

Modified: branches/ros-branch-0_4_2/reactos/dll/win32/setupapi/install.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_4_2/reactos/dll/win32/setupapi/install.c	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_2/reactos/dll/win32/setupapi/install.c	[iso-8859-1] Wed Jul 27
19:32:11 2016
@@ -1577,11 +1577,15 @@
     if ( hinf != INVALID_HANDLE_VALUE )
         SetupCloseInfFile( hinf );
 
+#ifdef CORE_11689_IS_FIXED
     // TODO: Localize the error string.
     if (!ret && !(GlobalSetupFlags & PSPGF_NONINTERACTIVE))
     {
         MessageBoxW(hwnd, section, L"setupapi.dll: An error happened...",
MB_ICONERROR | MB_OK);
     }
+#else
+    #pragma message("We need to understand why setupapi_winetest fails before
reenabling the error popup in InstallHinfSectionW. CORE-11689")
+#endif
 }
 
 

Propchange: branches/ros-branch-0_4_2/rostests/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Jul 27 19:32:11 2016
@@ -1,2 +1,3 @@
 /branches/GSoC_2011/KMTestSuite:51165-53670
 /branches/ros-amd64-bringup/rostests:44459,44462,44537
+/trunk/rostests:72020-72022

Modified: branches/ros-branch-0_4_2/rostests/winetests/setupapi/dialog.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/rostests/winet…
==============================================================================
--- branches/ros-branch-0_4_2/rostests/winetests/setupapi/dialog.c	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_2/rostests/winetests/setupapi/dialog.c	[iso-8859-1] Wed Jul 27
19:32:11 2016
@@ -32,7 +32,12 @@
 
 static void test_SetupPromptForDiskA(void)
 {
+#ifdef __REACTOS__
+    char path[] = "C:\\ReactOS\\system32";
+#else
+    #error "path must use GetSystemDirectoryA()! ROSTESTS_234"
     char path[] = "C:\\windows\\system32";
+#endif
     char file[] = "kernel32.dll";
     char buffer[MAX_PATH];
     UINT ret;
@@ -66,7 +71,12 @@
 
 static void test_SetupPromptForDiskW(void)
 {
+#ifdef __REACTOS__
+    WCHAR path[] =
{'C',':','\\','R','e','a','c','t','O','S','\\','s','y','s','t','e','m','3','2','\0'};
+#else
+    #error "path must use GetSystemDirectoryW()! ROSTESTS_234"
     WCHAR path[] =
{'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\0'};
+#endif
     WCHAR file[] =
{'k','e','r','n','e','l','3','2','.','d','l','l','\0'};
     WCHAR title[] = {'T','e','s','t','\0'};
     WCHAR disk[] =
{'T','e','s','t','d','i','s','k','\0'};