[ros-diffs] [hbelusca] 75345: Sync with trunk r75344 to get the inflib stuff in place.

Author: hbelusca
Date: Fri Jul 14 22:33:15 2017
New Revision: 75345

URL: http://svn.reactos.org/svn/reactos?rev=75345&view=rev
Log:
Sync with trunk r75344 to get the inflib stuff in place.

Modified:
    branches/setup_improvements/   (props changed)
    branches/setup_improvements/base/setup/usetup/inffile.h
    branches/setup_improvements/boot/freeldr/freeldr/include/inffile.h
    branches/setup_improvements/dll/appcompat/apphelp/hsdb.c
    branches/setup_improvements/dll/appcompat/apphelp/layer.c
    branches/setup_improvements/dll/win32/dnsapi/dnsapi/query.c
    branches/setup_improvements/media/sdb/sysmain.xml
    branches/setup_improvements/sdk/lib/3rdparty/adns/src/adns.h
    branches/setup_improvements/sdk/lib/3rdparty/adns/src/setup.c
    branches/setup_improvements/sdk/lib/inflib/infpriv.h
    branches/setup_improvements/win32ss/printing/base/spoolss/main.c
    branches/setup_improvements/win32ss/printing/base/spoolss/spoolss.spec

Propchange: branches/setup_improvements/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Fri Jul 14 22:33:15 2017
@@ -23,4 +23,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:74526-75337
+/trunk/reactos:74526-75344

Modified: branches/setup_improvements/base/setup/usetup/inffile.h
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u…
==============================================================================
--- branches/setup_improvements/base/setup/usetup/inffile.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/inffile.h	[iso-8859-1] Fri Jul 14
22:33:15 2017
@@ -74,10 +74,12 @@
  * Delete it once we don't use inflib anymore */
 typedef struct _INFCONTEXT
 {
-    PVOID Inf;
-    PVOID Section;
-    PVOID Line;
+  PVOID Inf;
+  PVOID CurrentInf;
+  PVOID Section;
+  PVOID Line;
 } INFCONTEXT;
+C_ASSERT(sizeof(INFCONTEXT) == 2 * sizeof(PVOID) + 2 * sizeof(UINT));
 
 BOOL
 WINAPI

Modified: branches/setup_improvements/boot/freeldr/freeldr/include/inffile.h
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr…
==============================================================================
--- branches/setup_improvements/boot/freeldr/freeldr/include/inffile.h	[iso-8859-1]
(original)
+++ branches/setup_improvements/boot/freeldr/freeldr/include/inffile.h	[iso-8859-1] Fri
Jul 14 22:33:15 2017
@@ -39,7 +39,7 @@
 typedef struct _INFCONTEXT
 {
   PVOID Inf;
-//  PVOID CurrentInf;
+  PVOID CurrentInf;
   PVOID Section;
   PVOID Line;
 } INFCONTEXT, *PINFCONTEXT;

Modified: branches/setup_improvements/dll/appcompat/apphelp/hsdb.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa…
==============================================================================
--- branches/setup_improvements/dll/appcompat/apphelp/hsdb.c	[iso-8859-1] (original)
+++ branches/setup_improvements/dll/appcompat/apphelp/hsdb.c	[iso-8859-1] Fri Jul 14
22:33:15 2017
@@ -577,7 +577,7 @@
 
     if (!default_dir)
     {
-        WCHAR* tmp = NULL;
+        WCHAR* tmp;
         UINT len = GetSystemWindowsDirectoryW(NULL, 0) + lstrlenW(szAppPatch);
         tmp = SdbAlloc((len + 1)* sizeof(WCHAR));
         if (tmp)
@@ -706,7 +706,7 @@
     pData->unknown = 0;
     pData->szLayer[0] = UNICODE_NULL;   /* TODO */
 
-    SHIM_INFO("\ndwFlags    0x%x\ndwMagic    0x%x\ntrExe      0x%x\ntrLayer   
0x%x",
+    SHIM_INFO("\ndwFlags    0x%x\ndwMagic    0x%x\ntrExe      0x%x\ntrLayer   
0x%x\n",
               pData->Query.dwFlags, pData->dwMagic, pData->Query.atrExes[0],
pData->Query.atrLayers[0]);
 
     /* Database List */

Modified: branches/setup_improvements/dll/appcompat/apphelp/layer.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa…
==============================================================================
--- branches/setup_improvements/dll/appcompat/apphelp/layer.c	[iso-8859-1] (original)
+++ branches/setup_improvements/dll/appcompat/apphelp/layer.c	[iso-8859-1] Fri Jul 14
22:33:15 2017
@@ -159,7 +159,7 @@
             FindClose(FindHandle);
             SdbpResizeTempStr(LongPath, (LongPath->Str.Length >> 1) + 20);
             StringCbPrintfW(LongPath->Str.Buffer, LongPath->Str.MaximumLength,
SIGN_MEDIA_FMT, SignMedia, Scratch.Str.Buffer + 3);
-            LongPath->Str.Length = wcslen(LongPath->Str.Buffer) * sizeof(WCHAR);
+            LongPath->Str.Length = (USHORT)wcslen(LongPath->Str.Buffer) *
sizeof(WCHAR);
             SdbpFreeTempStr(&Scratch);
             return TRUE;
         }
@@ -217,7 +217,7 @@
             return Status;
         }
     }
-    FullPath->MaximumLength = BasePath.Length + (wcslen(LayersKey) + 1) *
sizeof(WCHAR);
+    FullPath->MaximumLength = (USHORT)(BasePath.Length + (wcslen(LayersKey) + 1) *
sizeof(WCHAR));
     FullPath->Buffer = SdbAlloc(FullPath->MaximumLength);
     FullPath->Length = 0;
     RtlAppendUnicodeStringToString(FullPath, &BasePath);

Modified: branches/setup_improvements/dll/win32/dnsapi/dnsapi/query.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/dn…
==============================================================================
--- branches/setup_improvements/dll/win32/dnsapi/dnsapi/query.c	[iso-8859-1] (original)
+++ branches/setup_improvements/dll/win32/dnsapi/dnsapi/query.c	[iso-8859-1] Fri Jul 14
22:33:15 2017
@@ -798,6 +798,14 @@
             }
         }
 
+        if (!adns_numservers(astate))
+        {
+            /* There are no servers to query so bail out */
+            adns_finish(astate);
+            RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName);
+            return ERROR_FILE_NOT_FOUND;
+        }
+
         /*
         * adns doesn't resolve chained CNAME records (a CNAME which points to
         * another CNAME pointing to another... pointing to an A record), according

Modified: branches/setup_improvements/media/sdb/sysmain.xml
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/media/sdb/sy…
==============================================================================
--- branches/setup_improvements/media/sdb/sysmain.xml	[iso-8859-1] (original)
+++ branches/setup_improvements/media/sdb/sysmain.xml	[iso-8859-1] Fri Jul 14 22:33:15
2017
@@ -7,224 +7,183 @@
 
             <!-- Version lie shims -->
 
-            <SHIM>
-                <NAME>Win95VersionLie</NAME>
+            <SHIM NAME="Win95VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>Win98VersionLie</NAME>
+            <SHIM NAME="Win98VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>WinNT4SP5VersionLie</NAME>
+            <SHIM NAME="WinNT4SP5VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>Win2000VersionLie</NAME>
+            <SHIM NAME="Win2000VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>Win2000SP1VersionLie</NAME>
+            <SHIM NAME="Win2000SP1VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>Win2000SP2VersionLie</NAME>
+            <SHIM NAME="Win2000SP2VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>Win2000SP3VersionLie</NAME>
+            <SHIM NAME="Win2000SP3VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>WinXPVersionLie</NAME>
+            <SHIM NAME="WinXPVersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>WinXPSP1VersionLie</NAME>
+            <SHIM NAME="WinXPSP1VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>WinXPSP2VersionLie</NAME>
+            <SHIM NAME="WinXPSP2VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>WinXPSP3VersionLie</NAME>
+            <SHIM NAME="WinXPSP3VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>Win2k3RTMVersionLie</NAME>
+            <SHIM NAME="Win2k3RTMVersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>Win2k3SP1VersionLie</NAME>
+            <SHIM NAME="Win2k3SP1VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>Win2k3SP2VersionLie</NAME>
+            <SHIM NAME="Win2k3SP2VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>VistaRTMVersionLie</NAME>
+            <SHIM NAME="VistaRTMVersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>VistaSP1VersionLie</NAME>
+            <SHIM NAME="VistaSP1VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>VistaSP2VersionLie</NAME>
+            <SHIM NAME="VistaSP2VersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>Win7RTMVersionLie</NAME>
+            <SHIM NAME="Win7RTMVersionLie">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
 
             <!-- Display mode shims -->
 
-            <SHIM>
-                <NAME>Force640x480</NAME>
+            <SHIM NAME="Force640x480">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
-            <SHIM>
-                <NAME>Force8BitColor</NAME>
+            <SHIM NAME="Force8BitColor">
                 <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
 
             <!-- misc shims -->
 
-            <SHIM>
-                <NAME>DisableThemes</NAME>
+            <SHIM NAME="DisableThemes">
                 <DLLFILE>acgenral.dll</DLLFILE>
+            </SHIM>
+
+            <SHIM NAME="HideShimEnv">
+                <DLLFILE>aclayers.dll</DLLFILE>
             </SHIM>
 
         </LIBRARY>
 
         <!-- Backwards compatibility layers, incomplete! -->
 
-        <LAYER>
-            <NAME>WIN95</NAME>
+        <LAYER NAME="WIN95">
             <SHIM_REF NAME="Win95VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WIN98</NAME>
+        <LAYER NAME="WIN98">
             <SHIM_REF NAME="Win98VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>NT4SP5</NAME>
+        <LAYER NAME="NT4SP5">
             <SHIM_REF NAME="WinNT4SP5VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WIN2000</NAME>
+        <LAYER NAME="WIN2000">
             <SHIM_REF NAME="Win2000VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WIN2000SP1</NAME>
+        <LAYER NAME="WIN2000SP1">
             <SHIM_REF NAME="Win2000SP1VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WIN2000SP2</NAME>
+        <LAYER NAME="WIN2000SP2">
             <SHIM_REF NAME="Win2000SP2VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WIN2000SP3</NAME>
+        <LAYER NAME="WIN2000SP3">
             <SHIM_REF NAME="Win2000SP3VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WINXP</NAME>
+        <LAYER NAME="WINXP">
             <SHIM_REF NAME="WinXPVersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WINXPSP1</NAME>
+        <LAYER NAME="WINXPSP1">
             <SHIM_REF NAME="WinXPSP1VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WINXPSP2</NAME>
+        <LAYER NAME="WINXPSP2">
             <SHIM_REF NAME="WinXPSP2VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WINXPSP3</NAME>
+        <LAYER NAME="WINXPSP3">
             <SHIM_REF NAME="WinXPSP3VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WINSRV03RTM</NAME>
+        <LAYER NAME="WINSRV03RTM">
             <SHIM_REF NAME="Win2k3RTMVersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WINSRV03SP1</NAME>
+        <LAYER NAME="WINSRV03SP1">
             <SHIM_REF NAME="Win2k3SP1VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WINSRV03SP2</NAME>
+        <LAYER NAME="WINSRV03SP2">
             <SHIM_REF NAME="Win2k3SP2VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>VISTARTM</NAME>
+        <LAYER NAME="VISTARTM">
             <SHIM_REF NAME="VistaRTMVersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>VISTASP1</NAME>
+        <LAYER NAME="VISTASP1">
             <SHIM_REF NAME="VistaSP1VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>VISTASP2</NAME>
+        <LAYER NAME="VISTASP2">
             <SHIM_REF NAME="VistaSP2VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WINSRV08</NAME>
+        <LAYER NAME="WINSRV08">
             <SHIM_REF NAME="VistaRTMVersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WINSRV08SP1</NAME>
+        <LAYER NAME="WINSRV08SP1">
             <SHIM_REF NAME="VistaSP1VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WINSRV08SP2</NAME>
+        <LAYER NAME="WINSRV08SP2">
             <SHIM_REF NAME="VistaSP2VersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
-        <LAYER>
-            <NAME>WIN7RTM</NAME>
+        <LAYER NAME="WIN7RTM">
             <SHIM_REF NAME="Win7RTMVersionLie" />
             <!-- TODO: Add more fixes! -->
         </LAYER>
 
         <!-- Display mode layers -->
 
-        <LAYER>
-            <NAME>256Color</NAME>
+        <LAYER NAME="256Color">
             <SHIM_REF NAME="DisableThemes" />
             <SHIM_REF NAME="Force8BitColor" />
         </LAYER>
-        <LAYER>
-            <NAME>640X480</NAME>
+        <LAYER NAME="640X480">
             <SHIM_REF NAME="Force640x480" />
         </LAYER>
 
 
         <!-- misc layers -->
 
-        <LAYER>
-            <NAME>DisableThemes</NAME>
+        <LAYER NAME="DisableThemes">
             <SHIM_REF NAME="DisableThemes" />
         </LAYER>
 

Modified: branches/setup_improvements/sdk/lib/3rdparty/adns/src/adns.h
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/3rdp…
==============================================================================
--- branches/setup_improvements/sdk/lib/3rdparty/adns/src/adns.h	[iso-8859-1] (original)
+++ branches/setup_improvements/sdk/lib/3rdparty/adns/src/adns.h	[iso-8859-1] Fri Jul 14
22:33:15 2017
@@ -368,7 +368,11 @@
 
 /* ReactOS addition */
 ADNS_API void adns_addserver(adns_state state, struct in_addr server);
-ADNS_API void adns_ccf_search(adns_state ads, const char *fn, int lno, const char *buf);
+ADNS_API void adns_ccf_search(adns_state state,
+                              const char *fn,
+                              int lno,
+                              const char *buf);
+ADNS_API int adns_numservers(adns_state state);
 
 ADNS_API int adns_init_strcfg(adns_state *newstate_r, adns_initflags flags,
 		     FILE *diagfile /*0=>discard*/, const char *configtext);

Modified: branches/setup_improvements/sdk/lib/3rdparty/adns/src/setup.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/3rdp…
==============================================================================
--- branches/setup_improvements/sdk/lib/3rdparty/adns/src/setup.c	[iso-8859-1] (original)
+++ branches/setup_improvements/sdk/lib/3rdparty/adns/src/setup.c	[iso-8859-1] Fri Jul 14
22:33:15 2017
@@ -715,3 +715,6 @@
 void adns_ccf_search(adns_state ads, const char *fn, int lno, const char *buf) {
     ccf_search(ads, fn, lno, buf);
 }
+int adns_numservers(adns_state ads) {
+    return ads->nservers;
+}

Modified: branches/setup_improvements/sdk/lib/inflib/infpriv.h
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/infl…
==============================================================================
--- branches/setup_improvements/sdk/lib/inflib/infpriv.h	[iso-8859-1] (original)
+++ branches/setup_improvements/sdk/lib/inflib/infpriv.h	[iso-8859-1] Fri Jul 14 22:33:15
2017
@@ -65,6 +65,7 @@
 typedef struct _INFCONTEXT
 {
   PINFCACHE Inf;
+  PINFCACHE CurrentInf;
   PINFCACHESECTION Section;
   PINFCACHELINE Line;
 } INFCONTEXT;

Modified: branches/setup_improvements/win32ss/printing/base/spoolss/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin…
==============================================================================
--- branches/setup_improvements/win32ss/printing/base/spoolss/main.c	[iso-8859-1]
(original)
+++ branches/setup_improvements/win32ss/printing/base/spoolss/main.c	[iso-8859-1] Fri Jul
14 22:33:15 2017
@@ -246,3 +246,14 @@
     SetLastError(ERROR_SUCCESS);
     return TRUE;
 }
+
+BOOL WINAPI
+BuildOtherNamesFromMachineName(LPVOID * ptr1, LPVOID * ptr2)
+{
+    FIXME("(%p, %p) stub\n", ptr1, ptr2);
+
+    *ptr1 = NULL;
+    *ptr2 = NULL;
+    return FALSE;
+}
+

Modified: branches/setup_improvements/win32ss/printing/base/spoolss/spoolss.spec
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin…
==============================================================================
--- branches/setup_improvements/win32ss/printing/base/spoolss/spoolss.spec	[iso-8859-1]
(original)
+++ branches/setup_improvements/win32ss/printing/base/spoolss/spoolss.spec	[iso-8859-1]
Fri Jul 14 22:33:15 2017
@@ -22,7 +22,7 @@
 @ stub AppendPrinterNotifyInfoData
 @ stub bGetDevModePerUser
 @ stub bSetDevModePerUser
-@ stub BuildOtherNamesFromMachineName
+@ stdcall BuildOtherNamesFromMachineName(ptr ptr)
 @ stub CacheAddName
 @ stub CacheCreateAndAddNode
 @ stub CacheCreateAndAddNodeWithIPAddresses