April 2008 - Wine-commits - list.winehq.org

Jacek Caban : urlmon: Ignore query and hash part in file protocol URL.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 8dddd89500f15bcd192f6c38c913b9d66e01ecba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dddd89500f15bcd192f6c38c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 17:09:05 2008 +0200 urlmon: Ignore query and hash part in file protocol URL. --- dlls/urlmon/file.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 91aca2c..b3691b0 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -99,8 +99,7 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl DWORD grfBINDF = 0; LARGE_INTEGER size; DWORD len; - LPWSTR url, mime = NULL; - LPCWSTR file_name; + LPWSTR url, mime = NULL, file_name; WCHAR null_char = 0; BOOL first_call = FALSE; HRESULT hres; @@ -136,6 +135,8 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); if(!This->file) { + WCHAR *ptr; + first_call = TRUE; IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); @@ -146,6 +147,13 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl if(*file_name == '/') file_name++; + for(ptr = file_name; *ptr; ptr++) { + if(*ptr == '?' || *ptr == '#') { + *ptr = 0; + break; + } + } + This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Jacek Caban : oleaut32: Properly clear VT_BSTR record.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 378c17019ec8ebc36b3809141575478d1d3f1d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378c17019ec8ebc36b3809141… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 17:09:25 2008 +0200 oleaut32: Properly clear VT_BSTR record. --- dlls/oleaut32/recinfo.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 710cf1a..3576e1b 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -211,8 +211,7 @@ static HRESULT WINAPI IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvEx var = ((PBYTE)pvExisting)+This->fields[i].offset; switch(This->fields[i].vt) { case VT_BSTR: - /* NOTE: Windows implementation reads DWORD (len) before string, - * but it seems to do nothing with this */ + SysFreeString(*(BSTR*)var); *(BSTR*)var = NULL; break; case VT_I2:

1 0

Stefan Dösinger : wined3d: Call activate_dimensions from the atifs code.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 9ee7e42de87e05b86c5538d940e3c80a26f554c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee7e42de87e05b86c5538d94… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 23 22:23:57 2008 +0200 wined3d: Call activate_dimensions from the atifs code. --- dlls/wined3d/ati_fragment_shader.c | 22 +++++++ dlls/wined3d/state.c | 120 +---------------------------------- dlls/wined3d/utils.c | 114 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 141 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ee7e42de87e05b86c553…

1 0

Alexandre Julliard : kernel32: If necessary reload the environment after wineboot has run.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 4073805aeb2900a1e2032115bd18859b9740a54e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4073805aeb2900a1e2032115b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 11:53:45 2008 +0200 kernel32: If necessary reload the environment after wineboot has run. --- dlls/kernel32/process.c | 76 +++++++++++++++++++++-------------------------- 1 files changed, 34 insertions(+), 42 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index fe523d6..59fd1f5 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -372,7 +372,7 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) * %SystemRoot% which are predefined. But Wine defines these in the * registry, so we need two passes. */ -static void set_registry_environment(void) +static BOOL set_registry_environment(void) { static const WCHAR env_keyW[] = {'M','a','c','h','i','n','e','\\', 'S','y','s','t','e','m','\\', @@ -385,6 +385,7 @@ static void set_registry_environment(void) OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE hkey; + BOOL ret = FALSE; attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -400,10 +401,11 @@ static void set_registry_environment(void) set_registry_variables( hkey, REG_SZ ); set_registry_variables( hkey, REG_EXPAND_SZ ); NtClose( hkey ); + ret = TRUE; } /* then the ones for the current user */ - if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &attr.RootDirectory ) != STATUS_SUCCESS) return; + if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &attr.RootDirectory ) != STATUS_SUCCESS) return ret; RtlInitUnicodeString( &nameW, envW ); if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) == STATUS_SUCCESS) { @@ -412,6 +414,7 @@ static void set_registry_environment(void) NtClose( hkey ); } NtClose( attr.RootDirectory ); + return ret; } /*********************************************************************** @@ -731,45 +734,6 @@ static void init_windows_dirs(void) /*********************************************************************** - * process_init - * - * Main process initialisation code - */ -static BOOL process_init(void) -{ - static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; - PEB *peb = NtCurrentTeb()->Peb; - RTL_USER_PROCESS_PARAMETERS *params = peb->ProcessParameters; - - PTHREAD_Init(); - - setbuf(stdout,NULL); - setbuf(stderr,NULL); - - kernel32_handle = GetModuleHandleW(kernel32W); - - LOCALE_Init(); - - if (!params->Environment) - { - /* Copy the parent environment */ - if (!build_initial_environment( __wine_main_environ )) return FALSE; - - /* convert old configuration to new format */ - convert_old_config(); - - set_registry_environment(); - set_additional_environment(); - } - - init_windows_dirs(); - init_current_directory( &params->CurrentDirectory ); - - return TRUE; -} - - -/*********************************************************************** * start_wineboot * * Start the wineboot process if necessary. Return the event to wait on. @@ -893,15 +857,41 @@ static void set_process_name( int argc, char *argv[] ) */ void __wine_kernel_init(void) { + static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; static const WCHAR dotW[] = {'.',0}; static const WCHAR exeW[] = {'.','e','x','e',0}; WCHAR *p, main_exe_name[MAX_PATH+1]; PEB *peb = NtCurrentTeb()->Peb; + RTL_USER_PROCESS_PARAMETERS *params = peb->ProcessParameters; HANDLE boot_event = 0; + BOOL got_environment = TRUE; /* Initialize everything */ - if (!process_init()) exit(1); + + PTHREAD_Init(); + + setbuf(stdout,NULL); + setbuf(stderr,NULL); + kernel32_handle = GetModuleHandleW(kernel32W); + + LOCALE_Init(); + + if (!params->Environment) + { + /* Copy the parent environment */ + if (!build_initial_environment( __wine_main_environ )) exit(1); + + /* convert old configuration to new format */ + convert_old_config(); + + got_environment = set_registry_environment(); + set_additional_environment(); + } + + init_windows_dirs(); + init_current_directory( &params->CurrentDirectory ); + set_process_name( __wine_main_argc, __wine_main_argv ); set_library_wargv( __wine_main_argv ); @@ -954,6 +944,8 @@ void __wine_kernel_init(void) { if (WaitForSingleObject( boot_event, 30000 )) WARN( "boot event wait timed out\n" ); CloseHandle( boot_event ); + /* if we didn't find environment section, try again now that wineboot has run */ + if (!got_environment) set_registry_environment(); } LdrInitializeThunk( 0, 0, 0, 0 );

1 0

Alexandre Julliard : user32: Make drivers non-const to avoid a compiler warning.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: c6d04ea9d51810a566174d94aeaa2097ddbe401b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d04ea9d51810a566174d94a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 11:53:58 2008 +0200 user32: Make drivers non-const to avoid a compiler warning. --- dlls/user32/driver.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index bdca8f9..305e1e5 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -27,7 +27,7 @@ #include "user_private.h" -static const USER_DRIVER null_driver, lazy_load_driver; +static USER_DRIVER null_driver, lazy_load_driver; const USER_DRIVER *USER_Driver = &lazy_load_driver; static DWORD driver_load_error; @@ -125,7 +125,7 @@ static const USER_DRIVER *load_driver(void) #undef GET_USER_FUNC } - prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, (void *)&lazy_load_driver ); + prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); if (prev != &lazy_load_driver) { /* another thread beat us to it */ @@ -410,7 +410,7 @@ static LRESULT nulldrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM return 0; } -static const USER_DRIVER null_driver = +static USER_DRIVER null_driver = { /* keyboard functions */ nulldrv_ActivateKeyboardLayout, @@ -736,7 +736,7 @@ static LRESULT loaderdrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPAR return load_driver()->pWindowMessage( hwnd, msg, wparam, lparam ); } -static const USER_DRIVER lazy_load_driver = +static USER_DRIVER lazy_load_driver = { /* keyboard functions */ loaderdrv_ActivateKeyboardLayout,

1 0

Lei Zhang : user32: Handle VK_RETURN WM_KEYDOWN events better in edit controls.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 2f0b111243609c9501c130e341871cd6dedfb515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0b111243609c9501c130e34… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 23 17:58:30 2008 -0700 user32: Handle VK_RETURN WM_KEYDOWN events better in edit controls. Elias Benali wrote the initial version of this patch. --- dlls/user32/edit.c | 8 ++++++-- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 7748b70..4c0342b 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4602,8 +4602,12 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) /* If the edit doesn't want the return send a message to the default object */ if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) { - HWND hwndParent = GetParent(es->hwndSelf); - DWORD dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); + HWND hwndParent; + DWORD dw; + + if (!EDIT_IsInsideDialog(es)) return 1; + hwndParent = GetParent(es->hwndSelf); + dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); if (HIWORD(dw) == DC_HASDEFID) { SendMessageW( hwndParent, WM_COMMAND, diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index b34e6e0..9f40416 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1932,8 +1932,8 @@ static void test_child_edit_wmkeydown(void) hwParent = GetParent(hwEdit); SetWindowLong(hwParent, GWL_WNDPROC, (LONG)child_edit_wmkeydown_proc); r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); - todo_wine ok(1 == r, "expected 1, got %d\n", r); - todo_wine ok(0 == child_edit_wmkeydown_num_messages, "expected 0, got %d\n", child_edit_wmkeydown_num_messages); + ok(1 == r, "expected 1, got %d\n", r); + ok(0 == child_edit_wmkeydown_num_messages, "expected 0, got %d\n", child_edit_wmkeydown_num_messages); destroy_child_editcontrol(hwEdit); }

1 0

Lei Zhang : user32: Add a test for sending WM_KEYDOWN to a child edit control.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 1e5faee29e568b6c6df2b0eb3cc6d86b73ff91f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5faee29e568b6c6df2b0eb3… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 23 17:48:34 2008 -0700 user32: Add a test for sending WM_KEYDOWN to a child edit control. --- dlls/user32/tests/edit.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index e5a69ac..b34e6e0 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1906,6 +1906,37 @@ static void test_singleline_wantreturn_edit_dialog(void) ok(444 == r, "Expected %d, got %d\n", 444, r); } +static int child_edit_wmkeydown_num_messages = 0; +static INT_PTR CALLBACK child_edit_wmkeydown_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_DESTROY: + case WM_NCDESTROY: + break; + + default: + child_edit_wmkeydown_num_messages++; + break; + } + + return FALSE; +} + +static void test_child_edit_wmkeydown(void) +{ + HWND hwEdit, hwParent; + int r; + + hwEdit = create_child_editcontrol(0, 0); + hwParent = GetParent(hwEdit); + SetWindowLong(hwParent, GWL_WNDPROC, (LONG)child_edit_wmkeydown_proc); + r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + todo_wine ok(1 == r, "expected 1, got %d\n", r); + todo_wine ok(0 == child_edit_wmkeydown_num_messages, "expected 0, got %d\n", child_edit_wmkeydown_num_messages); + destroy_child_editcontrol(hwEdit); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1980,6 +2011,7 @@ START_TEST(edit) test_multi_edit_dialog(); test_wantreturn_edit_dialog(); test_singleline_wantreturn_edit_dialog(); + test_child_edit_wmkeydown(); UnregisterWindowClasses(); }

1 0

James Hawkins : uxtheme: Fix a test that fails in win2k3.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 97e1fef09fcf0a21a27886ad241353cc0461a865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e1fef09fcf0a21a27886ad2… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 23 19:07:19 2008 -0500 uxtheme: Fix a test that fails in win2k3. --- dlls/uxtheme/tests/system.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b5f6619..ef9c08a 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -420,7 +420,9 @@ static void test_GetCurrentThemeName(void) if (bThemeActive) ok( hRes == E_POINTER || hRes == S_OK, "Expected E_POINTER or S_OK, got 0x%08x\n", hRes); else - ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); + ok( hRes == E_PROP_ID_UNSUPPORTED || + hRes == E_POINTER, /* win2k3 */ + "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%08x\n", GetLastError());

1 0

James Hawkins : riched20: Fix a few tests that fail in XP and up.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: ead42d7f7f605996d2f212102e65e53ce4dcece2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead42d7f7f605996d2f212102… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 23 18:20:21 2008 -0500 riched20: Fix a few tests that fail in XP and up. --- dlls/riched20/tests/editor.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 236a777..b6e9176 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -680,9 +680,12 @@ static void test_WM_GETTEXT(void) /* Test for behavior in overflow case */ memset(buffer, 0, 1024); result = SendMessage(hwndRichEdit, WM_GETTEXT, strlen(text), (LPARAM)buffer); - ok(result == 0, - "WM_GETTEXT returned %d, expected 0\n", result); + ok(result == 0 || + result == lstrlenA(text) - 1, /* XP, win2k3 */ + "WM_GETTEXT returned %d, expected 0 or %d\n", result, lstrlenA(text) - 1); result = strcmp(buffer,text); + if (result) + result = strncmp(buffer, text, lstrlenA(text) - 1); /* XP, win2k3 */ ok(result == 0, "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); @@ -704,9 +707,12 @@ static void test_WM_GETTEXT(void) /* Test for behavior of CRLF conversion in case of overflow */ memset(buffer, 0, 1024); result = SendMessage(hwndRichEdit, WM_GETTEXT, strlen(text2), (LPARAM)buffer); - ok(result == 0, - "WM_GETTEXT returned %d, expected 0\n", result); + ok(result == 0 || + result == lstrlenA(text2) - 1, /* XP, win2k3 */ + "WM_GETTEXT returned %d, expected 0 or %d\n", result, lstrlenA(text2) - 1); result = strcmp(buffer,text2); + if (result) + result = strncmp(buffer, text2, lstrlenA(text2) - 1); /* XP, win2k3 */ ok(result == 0, "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result);

1 0

James Hawkins : shell32: Fix a test that fails in win2k3.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 9ba8989026231b034bc4f91061671bf87263e9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba8989026231b034bc4f9106… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 23 18:45:49 2008 -0500 shell32: Fix a test that fails in win2k3. --- dlls/shell32/tests/shlfileop.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index e940c86..df4bd41 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -963,7 +963,9 @@ static void test_copy(void) shfo.fFlags = FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + ok(retval == ERROR_CANCELLED || + retval == ERROR_SUCCESS, /* win2k3 */ + "Expected ERROR_CANCELLED or ERROR_SUCCESS, got %d\n", retval); ok(!DeleteFileA("threedir\\one.txt"), "Expected file to not exist\n"); ok(!DeleteFileA("threedir\\two.txt"), "Expected file to not exist\n"); ok(DeleteFileA("one.txt"), "Expected file to exist\n");

1 0