wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

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

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

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 : 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

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

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 : 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

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 : pdh: Fix two tests that fail on win2k3.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 6c59a15a1912e75e79f5ae661e8995493aa7c797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c59a15a1912e75e79f5ae661… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 23 18:05:02 2008 -0500 pdh: Fix two tests that fail on win2k3. --- dlls/pdh/tests/pdh.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 7b31cb4..4b7c562 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -647,7 +647,9 @@ static void test_PdhLookupPerfNameByIndexA( void ) size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 674, NULL, &size ); - ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_ARGUMENT || + ret == PDH_MORE_DATA, /* win2k3 */ + "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 674, buffer, &size ); @@ -677,7 +679,9 @@ static void test_PdhLookupPerfNameByIndexW( void ) size = sizeof(buffer) / sizeof(WCHAR); ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size ); - ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_ARGUMENT || + ret == PDH_MORE_DATA, /* win2k3 */ + "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); size = sizeof(buffer) / sizeof(WCHAR); ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size );

1 0

Michael Stefaniuc : start: Update the German translation.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 1cb8e96da9326faca581778769129870e9df1fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb8e96da9326faca58177876… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 24 01:04:40 2008 +0200 start: Update the German translation. --- programs/start/De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/start/De.rc b/programs/start/De.rc index bf0f5c5..600de90 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -61,4 +61,6 @@ Schau in die Datei COPYING.LIB f " STRING_EXECFAIL "Es konnte keine Anwendung gestartet werden, oder es ist keine Anwendung mit der angegebenen Datei verkn�pft.\nShellExecuteEx gescheitert" + +STRING_UNIXFAIL "Der angegebene Unix Dateiname konnte nicht in einen DOS Dateinamen umgewandelt werden." }

1 0

Andrew Talbot : quartz: Remove unused variables.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 523552fcc3fd88471755abc55598e01094986388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523552fcc3fd88471755abc55… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 23 22:13:04 2008 +0100 quartz: Remove unused variables. --- dlls/quartz/avidec.c | 2 -- dlls/quartz/mpegsplit.c | 5 +---- dlls/quartz/videorenderer.c | 9 --------- 3 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 83d212c..d449662 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -70,7 +70,6 @@ static HRESULT AVIDec_ProcessBegin(TransformFilterImpl* pTransformFilter) static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, IMediaSample *pSample) { AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; - VIDEOINFOHEADER* format; AM_MEDIA_TYPE amt; HRESULT hr; DWORD res; @@ -96,7 +95,6 @@ static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, I ERR("Unable to retrieve media type\n"); goto error; } - format = (VIDEOINFOHEADER*)amt.pbFormat; /* Update input size to match sample size */ This->pBihIn->biSizeImage = cbSrcStream; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 395ce71..eb2cb4b 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -123,7 +123,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) { LONGLONG duration; - int bitrate_index, freq_index, mode_ext, emphasis, lsf = 1, mpeg1, layer, mode, padding, bitrate, length; + int bitrate_index, freq_index, lsf = 1, mpeg1, layer, padding, bitrate, length; if (!(header[0] == 0xff && ((header[1]>>5)&0x7) == 0x7 && ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && @@ -141,9 +141,6 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) bitrate_index = ((header[2]>>4)&0xf); freq_index = ((header[2]>>2)&0x3) + (mpeg1?(lsf*3):6); padding = ((header[2]>>1)&0x1); - mode = ((header[3]>>6)&0x3); - mode_ext = ((header[3]>>4)&0x3); - emphasis = ((header[3]>>0)&0x3); bitrate = tabsel_123[lsf][layer-1][bitrate_index] * 1000; if (!bitrate || layer != 3) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f49f8fb..97bb825 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -267,16 +267,11 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, { AM_MEDIA_TYPE amt; HRESULT hr = S_OK; - DDSURFACEDESC sdesc; - int width; - int height; - LPBYTE palette = NULL; HDC hDC; BITMAPINFOHEADER *bmiHeader; TRACE("%p %p %d\n", This, data, size); - sdesc.dwSize = sizeof(sdesc); hr = IPin_ConnectionMediaType(This->ppPins[0], &amt); if (FAILED(hr)) { ERR("Unable to retrieve media type\n"); @@ -306,10 +301,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); - width = bmiHeader->biWidth; - height = bmiHeader->biHeight; - palette = ((LPBYTE)bmiHeader) + bmiHeader->biSize; - if (!This->init) { if (!This->WindowPos.right || !This->WindowPos.bottom)

1 0

Andrew Talbot : riched20: Remove unused variables.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 0ba867743012bd324377c47aaa358bcdb86165c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba867743012bd324377c47aa… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 23 22:13:07 2008 +0100 riched20: Remove unused variables. --- dlls/riched20/editor.c | 3 --- dlls/riched20/paint.c | 3 +-- dlls/riched20/style.c | 3 +-- dlls/riched20/wrap.c | 4 +--- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9c4a013..c5a7554 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3531,7 +3531,6 @@ int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar) int car_pos = 0; int text_pos=-1; int URLmin, URLmax = 0; - CHARRANGE url; FINDTEXTA ft; CHARFORMAT2W cur_format; CHARFORMAT2W default_format; @@ -3585,8 +3584,6 @@ int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar) } if (text_pos != -1) { - url.cpMin=text_pos; - url.cpMax=car_pos-1; ME_SetCharFormat(editor, text_pos, (URLmax-text_pos), &link); ME_RewrapRepaint(editor); break; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e6ec8ce..ddd7de7 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -479,7 +479,7 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { RECT rc, rcPara; int y = c->pt.y; int height = 0, baseline = 0, no=0, pno = 0; - int xs = 0, xe = 0; + int xe = 0; BOOL visible = FALSE; int nMargWidth = 0; @@ -494,7 +494,6 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { nMargWidth = ME_twips2pointsX(c, para->pFmt->dxStartIndent); if (pno != 0) nMargWidth += ME_twips2pointsX(c, para->pFmt->dxOffset); - xs = c->rcView.left+nMargWidth; xe = c->rcView.right - ME_twips2pointsX(c, para->pFmt->dxRightIndent); y += ME_DrawParaDecoration(c, para, y); break; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0ec822e..b483be0 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -327,10 +327,9 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) { - int rx, ry; + int ry; ME_InitCharFormat2W(fmt); - rx = GetDeviceCaps(hDC, LOGPIXELSX); ry = GetDeviceCaps(hDC, LOGPIXELSY); lstrcpyW(fmt->szFaceName, lf->lfFaceName); fmt->dwEffects = 0; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a657b03..43d3d79 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -470,7 +470,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *item; ME_Context c; BOOL bModified = FALSE; - int yStart = -1, yEnd = -1; + int yStart = -1; ME_InitContext(&c, editor, GetDC(editor->hWnd)); c.pt.x = 0; @@ -499,8 +499,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { bModified = bModified | bRedraw; c.pt.y += item->member.para.nHeight; - if (bRedraw) - yEnd = c.pt.y; item = item->member.para.next_para; } editor->sizeWindow.cx = c.rcView.right-c.rcView.left;

1 0

Andrew Talbot : qcap: Remove unused variable.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 1e52433f017a62c1241c2d86af5e0649c5abb789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e52433f017a62c1241c2d86a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 23 22:13:01 2008 +0100 qcap: Remove unused variable. --- dlls/qcap/yuv.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c index 26048e1..29aa1f2 100644 --- a/dlls/qcap/yuv.c +++ b/dlls/qcap/yuv.c @@ -140,14 +140,13 @@ static void Parse_PYUV(unsigned char *destbuffer, const unsigned char *input, in /* We have 3 pointers, One to Y, one to Cb and 1 to Cr */ /* C19 *89* declaration block (Grr julliard for not allowing C99) */ - int uvjump, ysize, uvsize; + int ysize, uvsize; const unsigned char *pY, *pCb, *pCr; int swstep = 0, shstep = 0; int ypos = 0, xpos = 0; int indexUV = 0, cUv; /* End of Grr */ - uvjump = width / wstep; ysize = width * height; uvsize = (width / wstep) * (height / hstep); pY = input;

1 0

Rob Shearman : wintrust: Check that provider functions are not NULL before using them.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 91d5844f76df3dccd2537042538a7970c8642a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d5844f76df3dccd25370425… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 23 20:10:14 2008 +0100 wintrust: Check that provider functions are not NULL before using them. --- dlls/wintrust/wintrust_main.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 47c0865..f7fc3ca 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -111,19 +111,32 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, provData->pgActionID = actionID; WintrustGetRegPolicyFlags(&provData->dwRegPolicySettings); - err = provData->psPfns->pfnInitialize(provData); - if (err) - goto done; - err = provData->psPfns->pfnObjectTrust(provData); - if (err) - goto done; - err = provData->psPfns->pfnSignatureTrust(provData); - if (err) - goto done; - err = provData->psPfns->pfnCertificateTrust(provData); - if (err) - goto done; - err = provData->psPfns->pfnFinalPolicy(provData); + if (provData->psPfns->pfnInitialize) + { + err = provData->psPfns->pfnInitialize(provData); + if (err) + goto done; + } + if (provData->psPfns->pfnObjectTrust) + { + err = provData->psPfns->pfnObjectTrust(provData); + if (err) + goto done; + } + if (provData->psPfns->pfnSignatureTrust) + { + err = provData->psPfns->pfnSignatureTrust(provData); + if (err) + goto done; + } + if (provData->psPfns->pfnCertificateTrust) + { + err = provData->psPfns->pfnCertificateTrust(provData); + if (err) + goto done; + } + if (provData->psPfns->pfnFinalPolicy) + err = provData->psPfns->pfnFinalPolicy(provData); goto done; oom:

1 0

Rob Shearman : wintrust: Implement WTHelperGetProvPrivateDataFromChain.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 8e0f125f458fc935d0c6f1b88f46d5ab7eaf306a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0f125f458fc935d0c6f1b88… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 23 20:09:19 2008 +0100 wintrust: Implement WTHelperGetProvPrivateDataFromChain. Also fill in pfnAddPrivData2Chain in WintrustLoadFunctionPointers, which is the complement of WTHelperGetProvPrivateDataFromChain. --- dlls/wintrust/register.c | 2 +- dlls/wintrust/wintrust.spec | 2 +- dlls/wintrust/wintrust_main.c | 57 +++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_priv.h | 2 + include/wintrust.h | 1 + 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index e039ab4..05e48ef 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -862,7 +862,7 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, pPfns->pfnAddStore2Chain = WINTRUST_AddStore; pPfns->pfnAddSgnr2Chain = WINTRUST_AddSgnr; pPfns->pfnAddCert2Chain = WINTRUST_AddCert; - pPfns->pfnAddPrivData2Chain = NULL; + pPfns->pfnAddPrivData2Chain = WINTRUST_AddPrivData; pPfns->psUIpfns = NULL; pPfns->pfnInitialize = (PFN_PROVIDER_INIT_CALL)WINTRUST_ReadProviderFromReg(GuidString, Initialization); pPfns->pfnObjectTrust = (PFN_PROVIDER_OBJTRUST_CALL)WINTRUST_ReadProviderFromReg(GuidString, Message); diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 552cfdd..191e3d1 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -81,7 +81,7 @@ @ stdcall WTHelperGetFileName(ptr) @ stub WTHelperGetKnownUsages @ stdcall WTHelperGetProvCertFromChain(ptr long) -@ stub WTHelperGetProvPrivateDataFromChain +@ stdcall WTHelperGetProvPrivateDataFromChain(ptr ptr) @ stdcall WTHelperGetProvSignerFromChain(ptr long long long) @ stub WTHelperIsInRootStore @ stub WTHelperOpenKnownStores diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index c5b1612..47c0865 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -425,6 +425,25 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( return cert; } +CRYPT_PROVIDER_PRIVDATA *WINAPI WTHelperGetProvPrivateDataFromChain( + CRYPT_PROVIDER_DATA* pProvData, + GUID* pgProviderID) +{ + CRYPT_PROVIDER_PRIVDATA *privdata = NULL; + DWORD i; + + TRACE("(%p, %s)\n", pProvData, debugstr_guid(pgProviderID)); + + for (i = 0; i < pProvData->csProvPrivData; i++) + if (IsEqualGUID(pgProviderID, &pProvData->pasProvPrivData[i].gProviderID)) + { + privdata = &pProvData->pasProvPrivData[i]; + break; + } + + return privdata; +} + /*********************************************************************** * WTHelperProvDataFromStateData (WINTRUST.@) */ @@ -649,3 +668,41 @@ BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, SetLastError(ERROR_OUTOFMEMORY); return ret; } + +BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, + CRYPT_PROVIDER_PRIVDATA *pPrivData2Add) +{ + BOOL ret = FALSE; + + TRACE("(%p, %p)\n", data, pPrivData2Add); + + if (pPrivData2Add->cbStruct > sizeof(CRYPT_PROVIDER_PRIVDATA)) + { + SetLastError(ERROR_INVALID_PARAMETER); + WARN("invalid struct size\n"); + return FALSE; + } + if (data->csProvPrivData) + data->pasProvPrivData = WINTRUST_ReAlloc(data->pasProvPrivData, + (data->csProvPrivData + 1) * sizeof(CRYPT_PROVIDER_SGNR)); + else + { + data->pasProvPrivData = WINTRUST_Alloc(sizeof(CRYPT_PROVIDER_SGNR)); + data->csProvPrivData = 0; + } + if (data->pasProvPrivData) + { + DWORD i; + + for (i = 0; i < data->csProvPrivData; i++) + if (IsEqualGUID(&pPrivData2Add->gProviderID, &data->pasProvPrivData[i])) + break; + + data->pasProvPrivData[i] = *pPrivData2Add; + if (i == data->csProvPrivData) + data->csProvPrivData++; + } + else + SetLastError(ERROR_OUTOFMEMORY); + return ret; +} diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 4519bd9..c73f666 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -26,5 +26,7 @@ BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr); BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add); +BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, + CRYPT_PROVIDER_PRIVDATA *pPrivData2Add); #endif /* ndef __WINTRUST_PRIV_H__ */ diff --git a/include/wintrust.h b/include/wintrust.h index bc1c367..5408ad4 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -428,6 +428,7 @@ CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSigner, DWORD idxCounterSigner); CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData); +CRYPT_PROVIDER_PRIVDATA * WINAPI WTHelperGetProvPrivateDataFromChain(CRYPT_PROVIDER_DATA *,GUID *); #define SPC_INDIRECT_DATA_OBJID "1.3.6.1.4.1.311.2.1.4" #define SPC_SP_AGENCY_INFO_OBJID "1.3.6.1.4.1.311.2.1.10"

1 0

Rob Shearman : crypt32: Decode the message content on finishing in CDecodeMsg_Update for the streamed case as well as the non-streamed case .
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 3f2ea57013dc4f23073beb3d8c8b1aa7a94f1051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2ea57013dc4f23073beb3d8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 23 20:08:50 2008 +0100 crypt32: Decode the message content on finishing in CDecodeMsg_Update for the streamed case as well as the non-streamed case. --- dlls/crypt32/msg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 056c698..0972436 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1673,6 +1673,9 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, { ret = CDecodeMsg_CopyData(msg, pbData, cbData); msg->base.state = MsgStateDataFinalized; + if (ret) + ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, + msg->type); } else {

1 0

Reece Dunn : shlwapi/tests: Add 'res:' protocol tests for UrlCanonicalize.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 48f39dc9955de76502f534c6595444a7e359dcc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f39dc9955de76502f534c65… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Apr 22 13:35:34 2008 +0100 shlwapi/tests: Add 'res:' protocol tests for UrlCanonicalize. --- dlls/shlwapi/tests/url.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 8a40cc2..cd7a5f2 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -87,6 +87,16 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"c:dir\\file", 0, S_OK, "file:///c:dir/file", FALSE}, {"c:\\tests\\foo bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, {"c:\\tests\\foo bar", 0, S_OK, "file:///c:/tests/foo%20bar", FALSE}, + {"res:///c:/tests/foo%20bar", URL_UNESCAPE , S_OK, "res:///c:/tests/foo bar", FALSE}, + {"res:///c:/tests\\foo%20bar", URL_UNESCAPE , S_OK, "res:///c:/tests\\foo bar", TRUE}, + {"res:///c:/tests/foo%20bar", 0, S_OK, "res:///c:/tests/foo%20bar", FALSE}, + {"res:///c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "res:///c:/tests/foo%20bar", TRUE}, + {"res://c:/tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "res://c:/tests/foo%20bar", TRUE}, + {"res://c:/tests\\../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "res://c:/tests/foo%20bar", TRUE}, + {"res://c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "res://c:/tests/foo%20bar", TRUE}, + {"res:///c://tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "res:///c://tests/foo%20bar", TRUE}, + {"res:///c:\\tests\\foo bar", 0, S_OK, "res:///c:\\tests\\foo bar", TRUE}, + {"res:///c:\\tests\\foo bar", URL_DONT_SIMPLIFY, S_OK, "res:///c:\\tests\\foo bar", TRUE}, {"A", 0, S_OK, "A", FALSE}, {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", TRUE} /*LimeWire online installer calls this*/, {"", 0, S_OK, "", FALSE}

1 0

Alex Villacís Lasso : riched20: Yet more tests for EM_STREAMIN.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: a9caca3edabec21f5c4d5de5fd25198cfa25b33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9caca3edabec21f5c4d5de5f… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Apr 23 09:52:14 2008 -0500 riched20: Yet more tests for EM_STREAMIN. --- dlls/riched20/tests/editor.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 69d9ac3..236a777 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2328,6 +2328,10 @@ static void test_EM_STREAMIN(void) EDITSTREAM es; char buffer[1024] = {0}; + const char * streamText0 = "{\\rtf1 TestSomeText}"; + const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; + const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; + const char * streamText1 = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" \ "\\viewkind4\\uc1\\pard\\f0\\fs17 TestSomeText\\par\r\n" \ @@ -2345,6 +2349,56 @@ static void test_EM_STREAMIN(void) const char * streamText3 = "RichEdit1"; + /* Minimal test without \par at the end */ + es.dwCookie = (DWORD_PTR)&streamText0; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok (result == 12, + "EM_STREAMIN: Test 0 returned %ld, expected 12\n", result); + result = strcmp (buffer,"TestSomeText"); + ok (result == 0, + "EM_STREAMIN: Test 0 set wrong text: Result: %s\n",buffer); + + /* Native richedit 2.0 ignores last \par */ + es.dwCookie = (DWORD_PTR)&streamText0a; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine { + ok (result == 12, + "EM_STREAMIN: Test 0-a returned %ld, expected 12\n", result); + } + result = strcmp (buffer,"TestSomeText"); + todo_wine { + ok (result == 0, + "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + } + + /* Native richedit 2.0 ignores last \par, next-to-last \par appears */ + es.dwCookie = (DWORD_PTR)&streamText0b; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_RTF), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine { + ok (result == 14, + "EM_STREAMIN: Test 0-b returned %ld, expected 14\n", result); + } + result = strcmp (buffer,"TestSomeText\r\n"); + todo_wine { + ok (result == 0, + "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); + } + es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback;

1 0

Alex Villacís Lasso : uxtheme: Skip creation of temporary bitmap when painting a single tile.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 4165a1f696213fc6af67fd8abfb0e5d74729cc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4165a1f696213fc6af67fd8ab… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Apr 23 09:48:44 2008 -0500 uxtheme: Skip creation of temporary bitmap when painting a single tile. --- dlls/uxtheme/draw.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 3650113..9c7d62b 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -345,6 +345,18 @@ static inline BOOL UXTHEME_SizedBlt (HDC hdcDst, int nXOriginDst, int nYOriginDs if (!nWidthSrc || !nHeightSrc) return TRUE; + /* For destination width/height less than or equal to source + width/height, do not bother with memory bitmap optimization */ + if (nWidthSrc >= nWidthDst && nHeightSrc >= nHeightDst) + { + int bltWidth = min (nWidthDst, nWidthSrc); + int bltHeight = min (nHeightDst, nHeightSrc); + + return UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, bltWidth, bltHeight, + hdcSrc, nXOriginSrc, nYOriginSrc, + transparent, transcolor); + } + /* Create a DC with a bitmap consisting of a tiling of the source bitmap, with standard GDI functions. This is faster than an iteration with UXTHEME_Blt(). */

1 0

Alex Villacís Lasso : uxtheme: Fix nasty regression with painting of themed progress bar.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 6a422640530592116cb3fd48d8cb1ddb436bcce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a422640530592116cb3fd48d… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Apr 23 09:45:53 2008 -0500 uxtheme: Fix nasty regression with painting of themed progress bar. --- dlls/uxtheme/draw.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 493cf0b..3650113 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -343,6 +343,8 @@ static inline BOOL UXTHEME_SizedBlt (HDC hdcDst, int nXOriginDst, int nYOriginDs HDC hdcTemp; BOOL result = FALSE; + if (!nWidthSrc || !nHeightSrc) return TRUE; + /* Create a DC with a bitmap consisting of a tiling of the source bitmap, with standard GDI functions. This is faster than an iteration with UXTHEME_Blt(). */

1 0

Jacek Caban : mshtml: Added elements IDispatchEx implementation.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: d5059b8303b084ab13bb9eb042e161f12b32d164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5059b8303b084ab13bb9eb04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 16:45:52 2008 +0200 mshtml: Added elements IDispatchEx implementation. --- dlls/mshtml/dispex.c | 4 ++++ dlls/mshtml/htmlelem.c | 14 ++++++++++++++ dlls/mshtml/htmlnode.c | 8 ++++++++ dlls/mshtml/mshtml_private.h | 5 +++++ 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 26be1e8..e42649c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -52,11 +52,15 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, &DIID_DispHTMLDocument, + &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, &IID_IHTMLDocument2, &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IHTMLDOMNode, + &IID_IHTMLElement, + &IID_IHTMLElement2, &IID_IHTMLWindow2, &IID_IHTMLWindow3, &IID_IOmNavigator diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8777870..748faf6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1282,6 +1282,17 @@ static const NodeImplVtbl HTMLElementImplVtbl = { HTMLElement_destructor }; +static dispex_static_data_t HTMLElement_dispex = { + DispHTMLUnknownElement_tid, + NULL, + { + IHTMLDOMNode_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + 0 + } +}; + void HTMLElement_Init(HTMLElement *This) { This->node.vtbl = &HTMLElementImplVtbl; @@ -1344,6 +1355,9 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) ret->nselem = nselem; + if(!ret->node.dispex.data) + init_dispex(&ret->node.dispex, (IUnknown*)HTMLELEM(ret), &HTMLElement_dispex); + return ret; } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f009411..d3a9b72 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -313,6 +313,14 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = HTMLDOMNODE(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + if(This->dispex.data) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(&This->dispex); + }else { + FIXME("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + return E_NOINTERFACE; + } }else if(IsEqualGUID(&IID_IHTMLDOMNode, riid)) { TRACE("(%p)->(IID_IHTMLDOMNode %p)\n", This, ppv); *ppv = HTMLDOMNODE(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 73169f7..5fb37da 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -62,11 +62,15 @@ typedef struct event_target_t event_target_t; typedef enum { NULL_tid, DispHTMLDocument_tid, + DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, IHTMLDocument2_tid, IHTMLDocument3_tid, IHTMLDocument4_tid, IHTMLDocument5_tid, + IHTMLDOMNode_tid, + IHTMLElement_tid, + IHTMLElement2_tid, IHTMLWindow2_tid, IHTMLWindow3_tid, IOmNavigator_tid, @@ -293,6 +297,7 @@ typedef struct { } NodeImplVtbl; struct HTMLDOMNode { + DispatchEx dispex; const IHTMLDOMNodeVtbl *lpHTMLDOMNodeVtbl; const NodeImplVtbl *vtbl;

1 0

Jacek Caban : mshtml.idl: Added DispHTMLUnknownElement declaration.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 22eb495aaf0bf0d4d3374e0e6f5890badb351bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=22eb495aaf0bf0d4d3374e0e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 16:45:21 2008 +0200 mshtml.idl: Added DispHTMLUnknownElement declaration. --- include/mshtmdid.h | 44 +++- include/mshtml.idl | 834 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 877 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22eb495aaf0bf0d4d3374…

1 0

Jacek Caban : mshtml: Use heap_alloc_zero for allocating node objects.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 38b14274fb507d1b6d387b38875f85720a5ee78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b14274fb507d1b6d387b388… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 16:44:21 2008 +0200 mshtml: Use heap_alloc_zero for allocating node objects. --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlnode.c | 3 +-- dlls/mshtml/htmloption.c | 2 +- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmltable.c | 2 +- dlls/mshtml/htmltextarea.c | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index d404925..8663291 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -481,7 +481,7 @@ static const NodeImplVtbl HTMLAnchorElementImplVtbl = { HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement *nselem) { - HTMLAnchorElement *ret = heap_alloc(sizeof(HTMLAnchorElement)); + HTMLAnchorElement *ret = heap_alloc_zero(sizeof(HTMLAnchorElement)); HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 2ca3f28..8e1f70c 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -598,7 +598,7 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) { - HTMLBodyElement *ret = heap_alloc(sizeof(HTMLBodyElement)); + HTMLBodyElement *ret = heap_alloc_zero(sizeof(HTMLBodyElement)); nsresult nsres; TRACE("(%p)->(%p)\n", ret, nselem); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6dab3a1..8777870 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1336,7 +1336,7 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) ret = HTMLTextAreaElement_Create(nselem); if(!ret) { - ret = heap_alloc(sizeof(HTMLElement)); + ret = heap_alloc_zero(sizeof(HTMLElement)); HTMLElement_Init(ret); } diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 9c390c8..e580bb6 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1055,7 +1055,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement *nselem) { - HTMLInputElement *ret = heap_alloc(sizeof(HTMLInputElement)); + HTMLInputElement *ret = heap_alloc_zero(sizeof(HTMLInputElement)); nsresult nsres; HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 64cabe4..f009411 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -352,14 +352,13 @@ static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *nsnode) ret = &HTMLElement_Create(nsnode)->node; break; default: - ret = heap_alloc(sizeof(HTMLDOMNode)); + ret = heap_alloc_zero(sizeof(HTMLDOMNode)); ret->vtbl = &HTMLDOMNodeImplVtbl; } ret->lpHTMLDOMNodeVtbl = &HTMLDOMNodeVtbl; ret->ref = 1; ret->doc = doc; - ret->event_target = NULL; nsIDOMNode_AddRef(nsnode); ret->nsnode = nsnode; diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 20a35ae..7252dde 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -333,7 +333,7 @@ static const NodeImplVtbl HTMLOptionElementImplVtbl = { HTMLElement *HTMLOptionElement_Create(nsIDOMHTMLElement *nselem) { - HTMLOptionElement *ret = heap_alloc(sizeof(HTMLOptionElement)); + HTMLOptionElement *ret = heap_alloc_zero(sizeof(HTMLOptionElement)); nsresult nsres; HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 6c49af5..36512ad 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -288,7 +288,7 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLElement *HTMLScriptElement_Create(nsIDOMHTMLElement *nselem) { - HTMLScriptElement *ret = heap_alloc(sizeof(HTMLScriptElement)); + HTMLScriptElement *ret = heap_alloc_zero(sizeof(HTMLScriptElement)); nsresult nsres; HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 3718e8a..03fcb8f 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -422,7 +422,7 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement *nselem) { - HTMLSelectElement *ret = heap_alloc(sizeof(HTMLSelectElement)); + HTMLSelectElement *ret = heap_alloc_zero(sizeof(HTMLSelectElement)); nsresult nsres; HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 66d55d0..88f6e75 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -546,7 +546,7 @@ static const NodeImplVtbl HTMLTableImplVtbl = { HTMLElement *HTMLTable_Create(nsIDOMHTMLElement *nselem) { - HTMLTable *ret = heap_alloc(sizeof(HTMLTable)); + HTMLTable *ret = heap_alloc_zero(sizeof(HTMLTable)); HTMLElement_Init(&ret->element); diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 64245e7..6e94174 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -402,7 +402,7 @@ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement *nselem) { - HTMLTextAreaElement *ret = heap_alloc(sizeof(HTMLTextAreaElement)); + HTMLTextAreaElement *ret = heap_alloc_zero(sizeof(HTMLTextAreaElement)); nsresult nsres; HTMLElement_Init(&ret->element);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008