November 2008 - Wine-Commits

Dmitry Timoshkov : user32: Do not change focus if the window is no longer active.
by Alexandre Julliard Nov. 19, 2008

Nov. 19, 2008

Module: wine Branch: master Commit: 5dfcadd7a3af47f61d056441407548ae8aef2004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dfcadd7a3af47f61d0564414… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 19 13:52:36 2008 +0800 user32: Do not change focus if the window is no longer active. --- dlls/user32/focus.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 3253a87..36f44f3 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -276,6 +276,9 @@ HWND WINAPI SetFocus( HWND hwnd ) { if (!set_active_window( hwndTop, NULL, FALSE, FALSE )) return 0; if (!IsWindow( hwnd )) return 0; /* Abort if window destroyed */ + + /* Do not change focus if the window is no longer active */ + if (hwndTop != GetActiveWindow()) return 0; } } else /* NULL hwnd passed in */

1 0

Alexandre Julliard : winetest: Allow to specify a subset of tests to run on the command line.
by Alexandre Julliard Nov. 19, 2008

Nov. 19, 2008

Module: wine Branch: master Commit: a580c6c24009f08fc4201bbcb4bd62b09559b7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a580c6c24009f08fc4201bbcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 19 12:19:42 2008 +0100 winetest: Allow to specify a subset of tests to run on the command line. --- programs/winetest/main.c | 74 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 56 insertions(+), 18 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 7ed848b..30ed15b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -51,6 +51,35 @@ static const char whitespace[] = " \t\r\n"; static const char testexe[] = "_test.exe"; static char build_id[64]; +/* filters for running only specific tests */ +static char *filters[64]; +static unsigned int nb_filters = 0; + +/* check if test is being filtered out */ +static BOOL test_filtered_out( LPCSTR module, LPCSTR testname ) +{ + char *p, dllname[MAX_PATH]; + unsigned int i, len; + + strcpy( dllname, module ); + CharLowerA( dllname ); + p = strstr( dllname, testexe ); + if (p) *p = 0; + len = strlen(dllname); + + if (!nb_filters) return FALSE; + for (i = 0; i < nb_filters; i++) + { + if (!strncmp( dllname, filters[i], len )) + { + if (!filters[i][len]) return FALSE; + if (filters[i][len] != ':') continue; + if (!testname || !strcmp( testname, &filters[i][len+1] )) return FALSE; + } + } + return TRUE; +} + static char * get_file_version(char * file_name) { static char version[32]; @@ -392,7 +421,8 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) test->subtests = xrealloc (test->subtests, allocated * sizeof(char*)); } - test->subtests[test->subtest_count++] = strdup (index); + if (!test_filtered_out( test->name, index )) + test->subtests[test->subtest_count++] = xstrdup(index); index = strtok (NULL, whitespace); } test->subtests = xrealloc (test->subtests, @@ -420,7 +450,7 @@ static BOOL CALLBACK EnumTestFileProc (HMODULE hModule, LPCTSTR lpszType, LPTSTR lpszName, LONG_PTR lParam) { - (*(int*)lParam)++; + if (!test_filtered_out( lpszName, NULL )) (*(int*)lParam)++; return TRUE; } @@ -432,6 +462,8 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, char dllname[MAX_PATH]; HMODULE dll; + if (test_filtered_out( lpszName, NULL )) return TRUE; + /* Check if the main dll is present on this system */ CharLowerA(lpszName); strcpy(dllname, lpszName); @@ -582,7 +614,7 @@ static void usage (void) { fprintf (stderr, -"Usage: winetest [OPTION]...\n\n" +"Usage: winetest [OPTION]... [TESTS]\n\n" " -c console mode, no GUI\n" " -e preserve the environment\n" " -h print this message and exit\n" @@ -607,11 +639,14 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, cmdLine = strtok (cmdLine, whitespace); while (cmdLine) { if (cmdLine[0] != '-' || cmdLine[2]) { - report (R_ERROR, "Not a single letter option: %s", cmdLine); - usage (); - exit (2); + if (nb_filters == sizeof(filters)/sizeof(filters[0])) + { + report (R_ERROR, "Too many test filters specified"); + exit (2); + } + filters[nb_filters++] = xstrdup( cmdLine ); } - switch (cmdLine[1]) { + else switch (cmdLine[1]) { case 'c': report (R_TEXTMODE); interactive = 0; @@ -672,21 +707,24 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, SetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", "0" ); } - while (!tag) { - if (!interactive) - report (R_FATAL, "Please specify a tag (-t option) if " - "running noninteractive!"); - if (guiAskTag () == IDABORT) exit (1); - } - report (R_TAG); + if (!nb_filters) /* don't submit results when filtering */ + { + while (!tag) { + if (!interactive) + report (R_FATAL, "Please specify a tag (-t option) if " + "running noninteractive!"); + if (guiAskTag () == IDABORT) exit (1); + } + report (R_TAG); - if (!build_id[0]) - report( R_WARNING, "You won't be able to submit results without a valid build id.\n" - "To submit results, winetest needs to be built from a git checkout." ); + if (!build_id[0]) + report( R_WARNING, "You won't be able to submit results without a valid build id.\n" + "To submit results, winetest needs to be built from a git checkout." ); + } if (!logname) { logname = run_tests (NULL); - if (build_id[0] && + if (build_id[0] && !nb_filters && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) if (!send_file (logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError());

1 0

Alexandre Julliard : winetest: Capture the Win32 stderr into the log file too.
by Alexandre Julliard Nov. 19, 2008

Nov. 19, 2008

Module: wine Branch: master Commit: db8783e724d8ce3b942b7676043613e62b17acb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8783e724d8ce3b942b76760… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 19 12:19:22 2008 +0100 winetest: Capture the Win32 stderr into the log file too. --- programs/winetest/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 86035f0..7ed848b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -271,7 +271,7 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms) si.dwFlags = STARTF_USESTDHANDLES; si.hStdInput = GetStdHandle( STD_INPUT_HANDLE ); si.hStdOutput = out_file ? out_file : GetStdHandle( STD_OUTPUT_HANDLE ); - si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); + si.hStdError = out_file ? out_file : GetStdHandle( STD_ERROR_HANDLE ); if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, tempdir, &si, &pi)) {

1 0

Ricardo Filipe : rpcrt4: Fixed dead increments (llvm/clang).
by Alexandre Julliard Nov. 19, 2008

Nov. 19, 2008

Module: wine Branch: master Commit: 16920c1da745129681921cf65a50a87c9fcd4932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16920c1da745129681921cf65… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Thu Nov 13 12:21:10 2008 +0000 rpcrt4: Fixed dead increments (llvm/clang). --- dlls/rpcrt4/rpc_transport.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 3d66740..815ed64 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -479,7 +479,6 @@ static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data, memcpy(tower_data, networkaddr, networkaddr_size); else tower_data[0] = 0; - tower_data += networkaddr_size; return size; } @@ -692,7 +691,6 @@ static size_t rpcrt4_ncalrpc_get_top_of_tower(unsigned char *tower_data, pipe_floor->count_rhs = endpoint_size; memcpy(tower_data, endpoint, endpoint_size); - tower_data += endpoint_size; return size; }

1 0

Ricardo Filipe : ntdll: Fixed dead store (llvm/clang).
by Alexandre Julliard Nov. 19, 2008

Nov. 19, 2008

Module: wine Branch: master Commit: 68d76db6d44e49934b9b5eaf4a360c41f62381eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d76db6d44e49934b9b5eaf4… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Thu Nov 13 11:06:31 2008 +0000 ntdll: Fixed dead store (llvm/clang). --- dlls/ntdll/env.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 6110a74..5ac3543 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -237,7 +237,6 @@ NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR* penv, PUNICODE_STRING name, RtlDestroyEnvironment(env); if (!penv) NtCurrentTeb()->Peb->ProcessParameters->Environment = new_env; else *penv = new_env; - env = new_env; } else {

1 0

Ricardo Filipe : oleaut32: Fixed dead increment (llvm/clang).
by Alexandre Julliard Nov. 19, 2008

Nov. 19, 2008

Module: wine Branch: master Commit: 50c2cafea9664632d11ab1d62284b0d63a357ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c2cafea9664632d11ab1d62… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Thu Nov 13 12:04:46 2008 +0000 oleaut32: Fixed dead increment (llvm/clang). --- dlls/oleaut32/varformat.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 79c3053..d76ceb5 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1532,7 +1532,6 @@ VARIANT_FormatNumber_Bool: } } count = min(count_max, pad); - count_max -= count; pad -= count; TRACE("write %d whole trailing 0's\n", count); while (count--)

1 0

Francois Gouget : msxml3: Fix compilation on systems that don' t have xsltInit().
by Alexandre Julliard Nov. 19, 2008

Nov. 19, 2008

Module: wine Branch: master Commit: 681d3751365d2f72560ec19c60b6fc7a1f8c7875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=681d3751365d2f72560ec19c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 19 08:40:25 2008 +0100 msxml3: Fix compilation on systems that don't have xsltInit(). Reduce the scope of xsltInit(). Remove an include that was needed only for xsltInit(). --- dlls/msxml3/main.c | 3 ++- dlls/msxml3/msxml_private.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 3084625..358a5cb 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -49,7 +49,6 @@ HRESULT WINAPI DllCanUnloadNow(void) void* libxslt_handle = NULL; #ifdef SONAME_LIBXSLT # define DECL_FUNCPTR(f) typeof(f) * p##f = NULL -DECL_FUNCPTR(xsltInit); DECL_FUNCPTR(xsltApplyStylesheet); DECL_FUNCPTR(xsltCleanupGlobals); DECL_FUNCPTR(xsltFreeStylesheet); @@ -60,6 +59,8 @@ DECL_FUNCPTR(xsltParseStylesheetDoc); static void init_libxslt(void) { #ifdef SONAME_LIBXSLT + void (*pxsltInit)(void); /* Missing in libxslt <= 1.1.14 */ + libxslt_handle = wine_dlopen(SONAME_LIBXSLT, RTLD_NOW, NULL, 0); if (!libxslt_handle) return; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 56a5b39..aa14b9b 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -102,10 +102,8 @@ void* libxslt_handle; # endif # include <libxslt/xsltutils.h> # include <libxslt/xsltInternals.h> -# include <libxslt/xslt.h> # define MAKE_FUNCPTR(f) extern typeof(f) * p##f -MAKE_FUNCPTR(xsltInit); MAKE_FUNCPTR(xsltApplyStylesheet); MAKE_FUNCPTR(xsltCleanupGlobals); MAKE_FUNCPTR(xsltFreeStylesheet);

1 0

Detlef Riekenberg : shdocvw/tests: Make the webbrowser test dpi aware, make it pass in wine.
by Alexandre Julliard Nov. 19, 2008

Nov. 19, 2008

Module: wine Branch: master Commit: a815677d93372d72ce39783e4949aef99f208678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a815677d93372d72ce39783e4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Nov 19 05:33:38 2008 +0100 shdocvw/tests: Make the webbrowser test dpi aware, make it pass in wine. --- dlls/shdocvw/Makefile.in | 2 +- dlls/shdocvw/oleobject.c | 15 +++++++++++++-- dlls/shdocvw/tests/Makefile.in | 2 +- dlls/shdocvw/tests/webbrowser.c | 16 +++++++++++++++- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 764b4c6..0fd59c5 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shdocvw.dll IMPORTLIB = shdocvw -IMPORTS = uuid shell32 shlwapi user32 advapi32 kernel32 +IMPORTS = uuid shell32 shlwapi user32 gdi32 advapi32 kernel32 DELAYIMPORTS = version urlmon ole32 oleaut32 C_SRCS = \ diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 70a163d..9a38cf0 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -890,6 +890,16 @@ static const IOleCommandTargetVtbl OleCommandTargetVtbl = { void WebBrowser_OleObject_Init(WebBrowser *This) { + DWORD dpi_x; + DWORD dpi_y; + HDC hdc; + + /* default aspect ratio is 96dpi / 96dpi */ + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + This->lpOleObjectVtbl = &OleObjectVtbl; This->lpOleInPlaceObjectVtbl = &OleInPlaceObjectVtbl; This->lpOleControlVtbl = &OleControlVtbl; @@ -907,8 +917,9 @@ void WebBrowser_OleObject_Init(WebBrowser *This) memset(&This->clip_rect, 0, sizeof(RECT)); memset(&This->frameinfo, 0, sizeof(OLEINPLACEFRAMEINFO)); - This->extent.cx = 1323; - This->extent.cy = 529; + /* The size is dpi dependent */ + This->extent.cx = 127000 / dpi_x; + This->extent.cy = 50800 / dpi_y; } void WebBrowser_OleObject_Destroy(WebBrowser *This) diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index e20f8ed..5ab9b5a 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shdocvw.dll -IMPORTS = shell32 ole32 oleaut32 user32 advapi32 kernel32 +IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 kernel32 CTESTS = \ intshcut.c \ diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index dad9527..ec036c5 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1816,6 +1816,17 @@ static void test_Extent(IUnknown *unk) IOleObject *oleobj; SIZE size; HRESULT hres; + DWORD dpi_x; + DWORD dpi_y; + HDC hdc; + + /* default aspect ratio is 96dpi / 96dpi */ + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + if (dpi_x != 96 || dpi_y != 96) + trace("dpi: %d / %d\n", dpi_y, dpi_y); hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObkect: %08x\n", hres); @@ -1825,7 +1836,10 @@ static void test_Extent(IUnknown *unk) size.cx = size.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &size); ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - ok(size.cx == 1323 && size.cy == 529, "size = {%d %d}\n", size.cx, size.cy); + /* The default size is dpi dependent (96:1323x529 / 120:1058x423) */ + ok(size.cx == (127000 / dpi_x) && + size.cy == (50800 / dpi_y), "size = {%d %d} (expected %d %d)\n", + size.cx, size.cy, 127000 / dpi_x, 50800 / dpi_y); size.cx = 800; size.cy = 700;

1 0

Francois Gouget : kernel32: Simplify and optimize create_(system, env) _registry_keys().
by Alexandre Julliard Nov. 19, 2008

Nov. 19, 2008

Module: wine Branch: master Commit: 0a66633ce310eee7556cb3bba9d525faa1ae6115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a66633ce310eee7556cb3bba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 18 21:58:38 2008 +0100 kernel32: Simplify and optimize create_(system,env)_registry_keys(). --- dlls/kernel32/cpu.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 6f50009..63ca277 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -132,7 +132,7 @@ static void create_system_registry_keys( const SYSTEM_INFO *info ) if (NtCreateKey( &system_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) return; RtlInitUnicodeString( &valueW, IdentifierW ); - NtSetValueKey( system_key, &valueW, 0, REG_SZ, SysidW, (strlenW(SysidW)+1) * sizeof(WCHAR) ); + NtSetValueKey( system_key, &valueW, 0, REG_SZ, SysidW, sizeof(SysidW) ); attr.RootDirectory = system_key; RtlInitUnicodeString( &nameW, fpuW ); @@ -151,6 +151,7 @@ static void create_system_registry_keys( const SYSTEM_INFO *info ) if (!NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) { WCHAR idW[60]; + DWORD sizeW; DWORD cpuMHz = cpuHz / 1000000; /*TODO: report 64bit processors properly*/ @@ -158,12 +159,12 @@ static void create_system_registry_keys( const SYSTEM_INFO *info ) sprintf( id, "x86 Family %d Model %d Stepping %d", info->wProcessorLevel, HIBYTE(info->wProcessorRevision), LOBYTE(info->wProcessorRevision) ); - RtlMultiByteToUnicodeN( idW, sizeof(idW), NULL, id, strlen(id)+1 ); - NtSetValueKey( hkey, &valueW, 0, REG_SZ, idW, (strlenW(idW)+1)*sizeof(WCHAR) ); + RtlMultiByteToUnicodeN( idW, sizeof(idW), &sizeW, id, strlen(id)+1 ); + NtSetValueKey( hkey, &valueW, 0, REG_SZ, idW, sizeW ); /*TODO; report amd's properly*/ RtlInitUnicodeString( &valueW, VendorIdentifierW ); - NtSetValueKey( hkey, &valueW, 0, REG_SZ, VenidIntelW, (strlenW(VenidIntelW)+1) * sizeof(WCHAR) ); + NtSetValueKey( hkey, &valueW, 0, REG_SZ, VenidIntelW, sizeof(VenidIntelW) ); RtlInitUnicodeString( &valueW, mhzKeyW ); NtSetValueKey( hkey, &valueW, 0, REG_DWORD, &cpuMHz, sizeof(DWORD) ); @@ -194,6 +195,7 @@ static void create_env_registry_keys( const SYSTEM_INFO *info ) HANDLE env_key; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW, valueW; + DWORD sizeW; char nProc[10],id[60],procLevel[10],rev[10]; WCHAR nProcW[10],idW[60],procLevelW[10],revW[10]; @@ -214,31 +216,31 @@ static void create_env_registry_keys( const SYSTEM_INFO *info ) if (NtCreateKey( &env_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) return; sprintf( nProc, "%d", info->dwNumberOfProcessors ); - RtlMultiByteToUnicodeN( nProcW, sizeof(nProcW), NULL, nProc, strlen(nProc)+1 ); + RtlMultiByteToUnicodeN( nProcW, sizeof(nProcW), &sizeW, nProc, strlen(nProc)+1 ); RtlInitUnicodeString( &valueW, NumProcW ); - NtSetValueKey( env_key, &valueW, 0, REG_SZ, nProcW, (strlenW(nProcW)+1)*sizeof(WCHAR) ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, nProcW, sizeW ); /* TODO: currently hardcoded x86, add different processors */ RtlInitUnicodeString( &valueW, ProcArchW ); - NtSetValueKey( env_key, &valueW, 0, REG_SZ, x86W, (strlenW(x86W)+1) * sizeof(WCHAR) ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, x86W, sizeof(x86W) ); /* TODO: currently hardcoded Intel, add different processors */ sprintf( id, "x86 Family %d Model %d Stepping %d, GenuineIntel", info->wProcessorLevel, HIBYTE(info->wProcessorRevision), LOBYTE(info->wProcessorRevision) ); - RtlMultiByteToUnicodeN( idW, sizeof(idW), NULL, id, strlen(id)+1 ); + RtlMultiByteToUnicodeN( idW, sizeof(idW), &sizeW, id, strlen(id)+1 ); RtlInitUnicodeString( &valueW, ProcIdW ); - NtSetValueKey( env_key, &valueW, 0, REG_SZ, idW, (strlenW(idW)+1)*sizeof(WCHAR) ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, idW, sizeW ); sprintf( procLevel, "%d", info->wProcessorLevel ); - RtlMultiByteToUnicodeN( procLevelW, sizeof(procLevelW), NULL, procLevel, strlen(procLevel)+1 ); + RtlMultiByteToUnicodeN( procLevelW, sizeof(procLevelW), &sizeW, procLevel, strlen(procLevel)+1 ); RtlInitUnicodeString( &valueW, ProcLvlW ); - NtSetValueKey( env_key, &valueW, 0, REG_SZ, procLevelW, (strlenW(procLevelW)+1)*sizeof(WCHAR) ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, procLevelW, sizeW ); /* Properly report model/stepping */ sprintf( rev, "%04x", info->wProcessorRevision); - RtlMultiByteToUnicodeN( revW, sizeof(revW), NULL, rev, strlen(rev)+1 ); + RtlMultiByteToUnicodeN( revW, sizeof(revW), &sizeW, rev, strlen(rev)+1 ); RtlInitUnicodeString( &valueW, ProcRevW ); - NtSetValueKey( env_key, &valueW, 0, REG_SZ, revW, (strlenW(revW)+1)*sizeof(WCHAR) ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, revW, sizeW ); NtClose( env_key ); }

1 0

Francois Gouget : kernel32: Fix create_scsi_entry() so it puts properly '\0 '-terminated strings in the registry.
by Alexandre Julliard Nov. 19, 2008

Nov. 19, 2008

Module: wine Branch: master Commit: 24eb38bdd4889342f832cc6a1b519aa779637438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24eb38bdd4889342f832cc6a1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 18 21:58:26 2008 +0100 kernel32: Fix create_scsi_entry() so it puts properly '\0'-terminated strings in the registry. --- dlls/kernel32/oldconfig.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index ee41d81..20b6eaa 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -105,7 +105,7 @@ static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uD OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; WCHAR dataW[50]; - DWORD lenW; + DWORD sizeW; char buffer[40]; DWORD value; const char *data; @@ -145,8 +145,8 @@ static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uD RtlFreeUnicodeString( &nameW ); RtlCreateUnicodeStringFromAsciiz( &nameW, "Driver" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &lenW, lpDriver, strlen(lpDriver)); - NtSetValueKey( portKey, &nameW, 0, REG_SZ, (BYTE*)dataW, lenW ); + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, lpDriver, strlen(lpDriver)+1); + NtSetValueKey( portKey, &nameW, 0, REG_SZ, (BYTE*)dataW, sizeW ); RtlFreeUnicodeString( &nameW ); value = 10; RtlCreateUnicodeStringFromAsciiz( &nameW, "FirstBusTimeScanInMs" ); @@ -233,26 +233,26 @@ static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uD break; } RtlCreateUnicodeStringFromAsciiz( &nameW, "Type" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &lenW, data, strlen(data)); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, (BYTE*)dataW, lenW ); + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, data, strlen(data)+1); + NtSetValueKey( lunKey, &nameW, 0, REG_SZ, (BYTE*)dataW, sizeW ); RtlFreeUnicodeString( &nameW ); RtlCreateUnicodeStringFromAsciiz( &nameW, "Identifier" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &lenW, lpDriveName, strlen(lpDriveName)); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, (BYTE*)dataW, lenW ); + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, lpDriveName, strlen(lpDriveName)+1); + NtSetValueKey( lunKey, &nameW, 0, REG_SZ, (BYTE*)dataW, sizeW ); RtlFreeUnicodeString( &nameW ); if (uDriveType == DRIVE_CDROM || uDriveType == DRIVE_REMOVABLE) { RtlCreateUnicodeStringFromAsciiz( &nameW, "DeviceName" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &lenW, buffer, strlen(buffer)); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, (BYTE*)dataW, lenW ); + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, buffer, strlen(buffer)+1); + NtSetValueKey( lunKey, &nameW, 0, REG_SZ, (BYTE*)dataW, sizeW ); RtlFreeUnicodeString( &nameW ); } RtlCreateUnicodeStringFromAsciiz( &nameW, "UnixDeviceName" ); - RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &lenW, lpUnixDeviceName, strlen(lpUnixDeviceName)); - NtSetValueKey( lunKey, &nameW, 0, REG_SZ, (BYTE*)dataW, lenW ); + RtlMultiByteToUnicodeN( dataW, sizeof(dataW), &sizeW, lpUnixDeviceName, strlen(lpUnixDeviceName)+1); + NtSetValueKey( lunKey, &nameW, 0, REG_SZ, (BYTE*)dataW, sizeW ); RtlFreeUnicodeString( &nameW ); NtClose( lunKey );

1 0