[PATCH 1/5] wine.inf: Map the Desktop section of win.ini to the registry.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 loader/wine.inf.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 65b224c37fd..82a6888643b 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -565,6 +565,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16
 HKLM,%CurrentVersionNT%\Gre_Initialize,,16
 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1"
 HKLM,%CurrentVersionNT%\Image File Execution Options,,16
+HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop"

[PATCH 2/5] wine.inf: Map the Extensions section of win.ini to the registry.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 loader/wine.inf.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 82a6888643b..34d06963889 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -567,6 +567,7 @@ HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1"
 HKLM,%CurrentVersionNT%\Image File Execution Options,,16
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices"
+HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop"
 HKLM,%CurrentVersionNT%\LanguagePack,,16

[PATCH 3/5] wine.inf: Map the PrinterPorts section of win.ini to the registry.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 loader/wine.inf.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 34d06963889..9f612cdc76d 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -568,6 +568,7 @@ HKLM,%CurrentVersionNT%\Image File Execution Options,,16
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions"
+HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"printerports",,"USR:Software\Microsoft\Windows NT\CurrentVersion\PrinterPorts"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop"
 HKLM,%CurrentVersionNT%\LanguagePack,,16

[PATCH 3/5] wine.inf: Map the PrinterPorts section of win.ini to the registry.

[Huw Davies]

Signed-off-by: Huw Davies

[PATCH 4/5] winspool: Stop setting the PrinterPorts profile section.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/winspool.drv/info.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index f9c10f3de1a..fb9c1599d38 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -259,7 +259,6 @@ static const WCHAR Previous_NamesW[] = {'P','r','e','v','i','o','u','s',' ','N',
 static const WCHAR Print_ProcessorW[] = {'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r',0};
 static const WCHAR Printer_DriverW[] = {'P','r','i','n','t','e','r',' ','D','r','i','v','e','r',0};
 static const WCHAR PrinterDriverDataW[] = {'P','r','i','n','t','e','r','D','r','i','v','e','r','D','a','t','a',0};
-static const WCHAR PrinterPortsW[] = {'P','r','i','n','t','e','r','P','o','r','t','s',0};
 static const WCHAR PriorityW[] = {'P','r','i','o','r','i','t','y',0};
 static const WCHAR ProviderW[] = {'P','r','o','v','i','d','e','r',0};
 static const WCHAR Separator_FileW[] = {'S','e','p','a','r','a','t','o','r',' ','F','i','l','e',0};
@@ -3171,7 +3170,6 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi)
         }

lstrcatW(devline, timeout_15_45);
-        WriteProfileStringW(PrinterPortsW, pi->pPrinterName, devline);
         if (!RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey)) {
             RegSetValueExW(hkey, pi->pPrinterName, 0, REG_SZ, (LPBYTE)devline,
                             (lstrlenW(devline) + 1) * sizeof(WCHAR));
@@ -3427,7 +3425,6 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter)
         RegDeleteTreeW(hkeyPrinters, lpNameW);
         RegCloseKey(hkeyPrinters);
     }
-    WriteProfileStringW(PrinterPortsW, lpNameW, NULL);

if(RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey) == ERROR_SUCCESS) {
         RegDeleteValueW(hkey, lpNameW);

[PATCH 4/5] winspool: Stop setting the PrinterPorts profile section.

[Huw Davies]

Signed-off-by: Huw Davies

[PATCH 5/5] wine.inf: Map the Sounds section of win.ini to the registry.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 loader/wine.inf.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 9f612cdc76d..35992a01dfd 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -569,6 +569,7 @@ HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Des
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"printerports",,"USR:Software\Microsoft\Windows NT\CurrentVersion\PrinterPorts"
+HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"sounds",,"USR:Control Panel\Sounds"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop"
 HKLM,%CurrentVersionNT%\LanguagePack,,16