November 2018 - Wine-commits

Gijs Vermeulen : wine.inf: Add "Sources" key.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 454666ea414803d1d86ed4b643a30ed7d0089497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=454666ea414803d1d86ed4b6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 25 01:52:06 2018 +0200 wine.inf: Add "Sources" key. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44981 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f407828f9713f834712507c98ce8f11a1a2ec902) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3117296..7418aa0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3393,7 +3393,7 @@ HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 -HKLM,"System\CurrentControlSet\Services\Eventlog\System",,16 +HKLM,"System\CurrentControlSet\Services\Eventlog\System","Sources",0x10000,"" HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16

1 0

Fabian Maurer : winmm: Don' t crash in waveOutOpen when nSamplesPerSec is 0 and add tests.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: f7d1fa464cd2a99cac83dea093991336517efd3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7d1fa464cd2a99cac83dea0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Aug 3 07:55:03 2018 -0500 winmm: Don't crash in waveOutOpen when nSamplesPerSec is 0 and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45530 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7000af554740db447aa891efc25644f4be825299) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/wave.c | 22 ++++++++++++++++++++++ dlls/winmm/waveform.c | 7 +++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 284b624..2d52891 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1412,6 +1412,28 @@ static void wave_out_test_device(UINT_PTR device) } else trace("waveOutOpen(%s): 32 bit float samples not supported\n", dev_name(device)); + + /* Test invalid parameters */ + + format.wFormatTag = WAVE_FORMAT_PCM; + format.nChannels = 1; + format.nSamplesPerSec = 11025; + format.nBlockAlign = 1; + format.nAvgBytesPerSec = 11025 * 1; + format.wBitsPerSample = 8; + format.cbSize = 0; + + format.nAvgBytesPerSec = 0; + rc = waveOutOpen(&wout, device, &format, 0, 0, 0); + ok(rc == MMSYSERR_NOERROR, + "waveOutOpen(%s): returned %s\n",dev_name(device),wave_out_error(rc)); + waveOutClose(wout); + format.nAvgBytesPerSec = 11025 * 1; + + format.nSamplesPerSec = 0; + rc = waveOutOpen(&wout, device, &format, 0, 0, 0); + ok(rc == MMSYSERR_INVALPARAM || rc == WAVERR_BADFORMAT, /* XP and lower return WAVERR_BADFORMAT */ + "waveOutOpen(%s): returned %s\n",dev_name(device),wave_out_error(rc)); } static void wave_out_tests(void) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 045bf4a..0a259c0 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1088,6 +1088,13 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, } if(info->format->wFormatTag == WAVE_FORMAT_PCM){ + + if (info->format->nSamplesPerSec == 0) + { + ret = MMSYSERR_INVALPARAM; + goto error; + } + /* we aren't guaranteed that the struct in lpFormat is a full * WAVEFORMATEX struct, which IAC::IsFormatSupported requires */ device->orig_fmt = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX));

1 0

Piotr Caban : msvcp90: Fix EOF delimiter handling in basic_istream<char>:: ignore.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 94ebf4ad4ef0e7c963edbb8f9b313a4b2d9f1c4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ebf4ad4ef0e7c963edbb8f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 26 14:40:21 2018 +0200 msvcp90: Fix EOF delimiter handling in basic_istream<char>::ignore. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45495 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b5415c42ea75f28298f1b507af147546fd772e77) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp90/ios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index fea2ade..d15e2be 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -8101,7 +8101,7 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi break; } - if(ch==(unsigned char)delim) + if(ch==delim) break; this->count++; diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index cafc85d..4778aad 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8583,7 +8583,7 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi break; } - if(ch==(unsigned char)delim) + if(ch==delim) break; this->count++;

1 0

Kai Krakow : winebus.sys: Do not print HID report read errors.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 91da7132e929d24e14c9cc5e4279b36699debf1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=91da7132e929d24e14c9cc5e… Author: Kai Krakow <kai(a)kaishome.de> Date: Wed Aug 15 20:29:05 2018 +0200 winebus.sys: Do not print HID report read errors. Device reports may come in faster than our consumers could possibly read them, this is especially true for multi-axis events: When you move a stick across its range, it will always generate at least two events, one for the x axis, and one for the y axis. This is not really an error situation, so let's just discard the error message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43125 Signed-off-by: Kai Krakow <kai(a)kaishome.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d744f367d263a131feee96e103fb8220e8400b53) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 978540b..6008a7b 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -603,9 +603,6 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) ext->buffer_size = length; } - if (!ext->last_report_read) - ERR_(hid_report)("Device reports coming in too fast, last report not read yet!\n"); - memcpy(ext->last_report, report, length); ext->last_report_size = length; ext->last_report_read = FALSE;

1 0

Austin English : setupapi: Set LastError on success in SetupInstallFromInfSectionW.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: cd9167914ed30f052368705090f847ea3e3e9fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd9167914ed30f0523687050… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 3 22:13:22 2018 +0200 setupapi: Set LastError on success in SetupInstallFromInfSectionW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45167 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d45e6814d67c1f1a2eb6023f0fb5574d560fd9b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/install.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 0593df8..5a76e3a 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1188,6 +1188,7 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, return FALSE; } + SetLastError(ERROR_SUCCESS); return TRUE; }

1 0

Nikolay Sivov : dwrite: Avoid possible out-of-bounds cluster metrics access.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 68bf2fa07328f62ee8d61a13931e5820ed1d9a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68bf2fa07328f62ee8d61a13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 13 11:22:06 2018 +0300 dwrite: Avoid possible out-of-bounds cluster metrics access. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45535 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 470ed3c559c89d7bc9ee3fd3a9afbf19ea6e7aad) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 104b039..1218ee8 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2089,7 +2089,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) */ if (layout->len == 0) hr = layout_set_dummy_line_metrics(layout, 0); - else if (layout->clustermetrics[layout->cluster_count - 1].isNewline) + else if (layout->cluster_count && layout->clustermetrics[layout->cluster_count - 1].isNewline) hr = layout_set_dummy_line_metrics(layout, layout->len - 1); if (FAILED(hr)) return hr;

1 0

Gabriel Ivăncescu : ntdll: Properly set the current directory for UNC paths.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 2ac5c5de0faeabfe368f51172e00ed198c4bd843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ac5c5de0faeabfe368f5117… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 23 17:14:18 2018 +0300 ntdll: Properly set the current directory for UNC paths. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37834 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3acc0b0968fc2fd92220708f6a6629d2dfd28815) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/path.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 3062787..89662d8 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -1018,6 +1018,14 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) size -= 4; if (size && ptr[size - 1] != '\\') ptr[size++] = '\\'; + /* convert \??\UNC\ path to \\ prefix */ + if (size >= 4 && !strncmpiW(ptr, UncPfxW, 4)) + { + ptr += 2; + size -= 2; + *ptr = '\\'; + } + memcpy( curdir->DosPath.Buffer, ptr, size * sizeof(WCHAR)); curdir->DosPath.Buffer[size] = 0; curdir->DosPath.Length = size * sizeof(WCHAR);

1 0

Alistair Leslie-Hughes : d3dx9: Return a mesh in D3DXCreateTeapot().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 20975f243bae8d54bf2989f51a0a6fab3d12b347 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20975f243bae8d54bf2989f5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 31 15:04:48 2018 +0200 d3dx9: Return a mesh in D3DXCreateTeapot(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36884 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 135d458d34b8c217bd09084edeeeba6ab01a3664) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6294ce6..668d607 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5164,9 +5164,9 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency) { - FIXME("(%p, %p, %p): stub\n", device, mesh, adjacency); + FIXME("device %p, mesh %p, adjacency %p semi-stub.\n", device, mesh, adjacency); - return E_NOTIMPL; + return D3DXCreateSphere(device, 1.0f, 4, 4, mesh, adjacency); } HRESULT WINAPI D3DXCreateTextA(struct IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation,

1 0

Jason Edmeades : cmd: for /f fails to launch quoted program plus args.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: c7bbcd46ad8eb8a3a35858a5f0883f3687e08922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7bbcd46ad8eb8a3a35858a5… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:51 2018 +0100 cmd: for /f fails to launch quoted program plus args. for /f can run a program and parse its output. The program name can supply args and be quoted or not. If quoted, wine fails to run the program because internally we were adding an extra pair of quotes. These are not needed and can be removed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39906 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8b6ba774c0ef5f25e1dfd314d870b16f60dce2b6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 4 +++- programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 160940e..5d1e1b6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2065,7 +2065,7 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd static const WCHAR redirOutW[] = {'>','%','s','\0'}; static const WCHAR cmdW[] = {'C','M','D','\0'}; static const WCHAR cmdslashcW[] = {'C','M','D','.','E','X','E',' ', - '/','C',' ','"','%','s','"','\0'}; + '/','C',' ','%','s','\0'}; /* Remove leading and trailing character */ if ((iscmd && (itemstr[0] == '`' && usebackq)) || diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 03c6cc8..dcc4eb7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1672,9 +1672,11 @@ if "%CD%"=="" goto :SkipFORFcmdNT4 for /f %%i in ('echo.Passed1') do echo %%i for /f "usebackq" %%i in (`echo.Passed2`) do echo %%i for /f usebackq %%i in (`echo.Passed3`) do echo %%i +for /f "usebackq" %%i in (`"c:\windows\system32\cmd.exe" /C echo Passed4`) do echo %%i +for /f "usebackq" %%i in (`""c:\windows\system32\cmd.exe" /C echo Passed5"`) do echo %%i goto :ContinueFORF :SkipFORFcmdNT4 -for /l %%i in (1,1,3) do echo Missing functionality - Broken%%i +for /l %%i in (1,1,5) do echo Missing functionality - Broken%%i :ContinueFORF rem FIXME: Rest not testable right now in wine: not implemented and would need rem preliminary grep-like program implementation (e.g. like findstr or fc) even diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0431e41..78cbcf1 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1198,6 +1198,8 @@ c Passed1(a)or_broken@Missing functionality - Broken1 Passed2(a)or_broken@Missing functionality - Broken2 Passed3(a)or_broken@Missing functionality - Broken3 +Passed4(a)or_broken@Missing functionality - Broken4 +Passed5(a)or_broken@Missing functionality - Broken5 ------ eol option and(a)or_broken@Broken NT4 functionality1 Line(a)or_broken@Broken NT4 functionality2

1 0

Thomas Faller : wine.inf: Set CurrentBuild always to the same value as CurrentBuildNumber.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 929778fc57ae14a3d2c40bb443f201e086a2622b URL: https://source.winehq.org/git/wine.git/?a=commit;h=929778fc57ae14a3d2c40bb4… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Wed Aug 29 00:14:17 2018 +0200 wine.inf: Set CurrentBuild always to the same value as CurrentBuildNumber. Make that the registry entry HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuild has always the same value as HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuildNumber Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42870 Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6c1118994cc4c2ba8f24325099fdc7f76115fe4f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 2 ++ programs/winecfg/appdefaults.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7418aa0..58b873c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3402,6 +3402,7 @@ HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" @@ -3412,6 +3413,7 @@ HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [VersionInfo.ntamd64] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index a08542a..09d4d46 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -435,6 +435,7 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL); @@ -449,6 +450,7 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", win_versions[selection].szCSDVersion); snprintf(Buffer, sizeof(Buffer), "%d", win_versions[selection].dwBuildNumber); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", Buffer); snprintf(Buffer, sizeof(Buffer), "Microsoft %s", win_versions[selection].szDescription); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", Buffer); @@ -467,6 +469,7 @@ static void on_winver_change(HWND dialog) case VER_PLATFORM_WIN32s: set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL);

1 0