April 2008 - wine-commits

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

Jacek Caban : mshtml: Added IHTMLDocument3::getElementById implementation.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: e610d2ff12fbb52ecd0fd17a4ade034de9b22d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e610d2ff12fbb52ecd0fd17a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 16:43:50 2008 +0200 mshtml: Added IHTMLDocument3::getElementById implementation. --- dlls/mshtml/htmldoc3.c | 33 +++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 3b109e9..4fbd131 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -407,8 +407,37 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v IHTMLElement **pel) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMDocument *nsdoc = NULL; + nsIDOMElement *nselem = NULL; + HTMLDOMNode *node; + nsAString id_str; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + *pel = NULL; + + if(!This->nscontainer) + return S_OK; + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres) || !nsdoc) + return S_OK; + + nsAString_Init(&id_str, v); + nsIDOMDocument_GetElementById(nsdoc, &id_str, &nselem); + nsIDOMDocument_Release(nsdoc); + nsAString_Finish(&id_str); + + if(!nselem) { + *pel = NULL; + return S_OK; + } + + node = get_node(This, (nsIDOMNode*)nselem, TRUE); + nsIDOMElement_Release(nselem); + + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)pel); } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 59c2a17..ae716d9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -777,6 +777,26 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id, BOOL expect return elem; } +static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id) +{ + IHTMLDocument3 *doc3; + IHTMLElement *elem; + BSTR tmp; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + + tmp = SysAllocString(id); + hres = IHTMLDocument3_getElementById(doc3, tmp, &elem); + SysFreeString(tmp); + ok(hres == S_OK, "getElementById(%s) failed: %08x\n", dbgstr_w(id), hres); + + IHTMLDocument3_Release(doc3); + + return elem; +} + static void test_select_elem(IHTMLSelectElement *select) { test_select_length(select, 2); @@ -1357,6 +1377,15 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElementCollection_Release(col); get_elem_by_id(doc, xxxW, FALSE); + elem = get_doc_elem_by_id(doc, xxxW); + ok(!elem, "elem != NULL\n"); + + elem = get_doc_elem_by_id(doc, sW); + ok(elem != NULL, "elem == NULL\n"); + test_elem_type((IUnknown*)elem, ET_SELECT); + if(elem) + IHTMLElement_Release(elem); + elem = get_elem_by_id(doc, sW, TRUE); if(elem) { IHTMLSelectElement *select;

1 0

Stefan Dösinger : d3d9: Add a test for NP2 stretchrect .
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 5d49dea3735b1904fa27b1a22237a5b4ce4be719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d49dea3735b1904fa27b1a22… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 23 16:19:19 2008 +0200 d3d9: Add a test for NP2 stretchrect. --- dlls/d3d9/tests/visual.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 7 ++- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e977930..4fe3cd9 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8951,6 +8951,109 @@ out: if(shader)IDirect3DVertexShader9_Release(shader); } +static void np2_stretch_rect_test(IDirect3DDevice9 *device) { + IDirect3DSurface9 *src = NULL, *dst = NULL, *backbuffer = NULL; + IDirect3DTexture9 *dsttex = NULL; + HRESULT hr; + DWORD color; + D3DRECT r1 = {0, 0, 50, 50 }; + D3DRECT r2 = {50, 0, 100, 50 }; + D3DRECT r3 = {50, 50, 100, 100}; + D3DRECT r4 = {0, 50, 50, 100}; + const float quad[] = { + -1.0, -1.0, 0.1, 0.0, 0.0, + 1.0, -1.0, 0.1, 1.0, 0.0, + -1.0, 1.0, 0.1, 0.0, 1.0, + 1.0, 1.0, 0.1, 1.0, 1.0, + }; + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3D_OK, "IDirect3DDevice9_GetBackBuffer failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 100, 100, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &src, NULL ); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateRenderTarget failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_CreateTexture(device, 25, 25, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &dsttex, NULL); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture failed with %s\n", DXGetErrorString9(hr)); + + if(!src || !dsttex) { + skip("One or more test resources could not be created\n"); + goto cleanup; + } + + hr = IDirect3DTexture9_GetSurfaceLevel(dsttex, 0, &dst); + ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_Clear(device, 1, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + /* Clear the StretchRect destination for debugging */ + hr = IDirect3DDevice9_SetRenderTarget(device, 0, dst); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 1, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, src); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_Clear(device, 1, &r1, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 1, &r2, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 1, &r3, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 1, &r4, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + /* Stretchrect before setting the render target back to the backbuffer. This will make Wine use + * the target -> texture GL blit path + */ + hr = IDirect3DDevice9_StretchRect(device, src, NULL, dst, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "IDirect3DDevice9_StretchRect failed with %s\n", DXGetErrorString9(hr)); + IDirect3DSurface9_Release(dst); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) dsttex); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(float) * 5); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %s\n", DXGetErrorString9(hr)); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + color = getPixelColor(device, 160, 360); + ok(color == 0x00ff0000, "stretchrect: Pixel 160,360 has color 0x%08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 480, 360); + ok(color == 0x0000ff00, "stretchrect: Pixel 480,360 has color 0x%08x, expected 0x0000ff00\n", color); + color = getPixelColor(device, 480, 120); + ok(color == 0x000000ff, "stretchrect: Pixel 480,120 has color 0x%08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x00000000, "stretchrect: Pixel 160,120 has color 0x%08x, expected 0x00000000\n", color); + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + +cleanup: + if(src) IDirect3DSurface9_Release(src); + if(backbuffer) IDirect3DSurface9_Release(backbuffer); + if(dsttex) IDirect3DTexture9_Release(dsttex); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -9045,6 +9148,7 @@ START_TEST(visual) } pointsize_test(device_ptr); tssargtemp_test(device_ptr); + np2_stretch_rect_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a52e822..c462bd2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2791,8 +2791,11 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine Src->Flags &= ~SFLAG_INTEXTURE; } - glReadBuffer(GL_BACK); - checkGLcall("glReadBuffer(GL_BACK)"); + if(swapchain) { + glReadBuffer(surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain)); + } else { + glReadBuffer(myDevice->offscreenBuffer); + } /* TODO: Only back up the part that will be overwritten */ glCopyTexSubImage2D(texture_target, 0,

1 0

Stefan Dösinger : wined3d: Support framebuffer reading from texture_rectangle sources.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 1c9f1f8ddd5fa7ab8cae6dc510b01087895f8ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c9f1f8ddd5fa7ab8cae6dc51… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 23 02:48:55 2008 +0200 wined3d: Support framebuffer reading from texture_rectangle sources. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 26 +++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 33f4180..89eb835 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -663,7 +663,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U object->glDescription.level = Level; /* Flags */ - object->Flags = 0; + object->Flags = SFLAG_NORMCOORD; /* Default to normalized coords */ object->Flags |= Discard ? SFLAG_DISCARD : 0; object->Flags |= (WINED3DFMT_D16_LOCKABLE == Format) ? SFLAG_LOCKABLE : 0; object->Flags |= Lockable ? SFLAG_LOCKABLE : 0; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7d4eea9..a52e822 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -626,6 +626,11 @@ void WINAPI IWineD3DSurfaceImpl_SetGlTextureDesc(IWineD3DSurface *iface, UINT te IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); IWineD3DSurface_AddDirtyRect(iface, NULL); } + if(target == GL_TEXTURE_RECTANGLE_ARB && This->glDescription.target != target) { + This->Flags &= ~SFLAG_NORMCOORD; + } else if(This->glDescription.target == GL_TEXTURE_RECTANGLE_ARB && target != GL_TEXTURE_RECTANGLE_ARB) { + This->Flags |= SFLAG_NORMCOORD; + } This->glDescription.textureName = textureName; This->glDescription.target = target; This->Flags &= ~SFLAG_ALLOCATED; @@ -2845,15 +2850,22 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine } checkGLcall("glEnd and previous"); - left = (float) srect->x1 / (float) Src->pow2Width; - right = (float) srect->x2 / (float) Src->pow2Width; + left = srect->x1; + right = srect->x2; if(upsidedown) { - top = (float) (Src->currentDesc.Height - srect->y1) / (float) Src->pow2Height; - bottom = (float) (Src->currentDesc.Height - srect->y2) / (float) Src->pow2Height; + top = Src->currentDesc.Height - srect->y1; + bottom = Src->currentDesc.Height - srect->y2; } else { - top = (float) (Src->currentDesc.Height - srect->y2) / (float) Src->pow2Height; - bottom = (float) (Src->currentDesc.Height - srect->y1) / (float) Src->pow2Height; + top = Src->currentDesc.Height - srect->y2; + bottom = Src->currentDesc.Height - srect->y1; + } + + if(Src->Flags & SFLAG_NORMCOORD) { + left /= Src->pow2Width; + right /= Src->pow2Width; + top /= Src->pow2Height; + bottom /= Src->pow2Height; } /* draw the source texture stretched and upside down. The correct surface is bound already */ @@ -3774,7 +3786,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->glDescription.target = GL_TEXTURE_RECTANGLE_ARB; This->pow2Width = This->currentDesc.Width; This->pow2Height = This->currentDesc.Height; - This->Flags &= ~SFLAG_NONPOW2; + This->Flags &= ~(SFLAG_NONPOW2 | SFLAG_NORMCOORD); } /* No oversize, gl rect is the full texture size */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bdad91b..2404505 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1365,6 +1365,7 @@ void get_drawable_size_fbo(IWineD3DSurfaceImpl *This, UINT *width, UINT *height) #define SFLAG_CLIENT 0x00010000 /* GL_APPLE_client_storage is used on that texture */ #define SFLAG_ALLOCATED 0x00020000 /* A gl texture is allocated for this surface */ #define SFLAG_PBO 0x00040000 /* Has a PBO attached for speeding up data transfers for dynamically locked surfaces */ +#define SFLAG_NORMCOORD 0x00080000 /* Set if the GL texture coords are normalized(non-texture rectangle) */ /* In some conditions the surface memory must not be freed: * SFLAG_OVERSIZE: Not all data can be kept in GL

1 0

Stefan Dösinger : wined3d: Use the shader backend to enable / disable atifs and nvts.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: e3bd5b6dcdae9018f4f148aa6c964d0bb3be21d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bd5b6dcdae9018f4f148aa6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 11 08:19:04 2008 +0200 wined3d: Use the shader backend to enable / disable atifs and nvts. The previous logic assumed that if NVTS or ATIFS are available they will be used. This happens to be true for NVTS, but ATIFS is only used if neither ARBFP nor GLSL are supported. This breaks fixed function fragment processing on ATI r300 and newer cards --- dlls/wined3d/arb_program_shader.c | 5 +++ dlls/wined3d/ati_fragment_shader.c | 11 ++++++++ dlls/wined3d/baseshader.c | 17 ++++++++++++ dlls/wined3d/context.c | 50 ++++++----------------------------- dlls/wined3d/glsl_shader.c | 5 +++ dlls/wined3d/wined3d_private.h | 1 + 6 files changed, 48 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a165b9c..6bed3c5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2081,6 +2081,10 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info static void shader_arb_load_init(void) { } +static void shader_arb_fragment_enable(IWineD3DDevice *iface, BOOL enable) { + none_shader_backend.shader_fragment_enable(iface, enable); +} + const shader_backend_t arb_program_shader_backend = { &shader_arb_select, &shader_arb_select_depth_blt, @@ -2096,5 +2100,6 @@ const shader_backend_t arb_program_shader_backend = { &shader_arb_generate_vshader, &shader_arb_get_caps, &shader_arb_load_init, + &shader_arb_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index cd5a11b..0d3687e 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1026,6 +1026,16 @@ static void shader_atifs_generate_vshader(IWineD3DVertexShader *iface, SHADER_BU arb_program_shader_backend.shader_generate_vshader(iface, buffer); } +static void shader_atifs_fragment_enable(IWineD3DDevice *iface, BOOL enable) { + if(enable) { + glEnable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } else { + glDisable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glDisable(GL_FRAGMENT_SHADER_ATI)"); + } +} + const shader_backend_t atifs_shader_backend = { shader_atifs_select, shader_atifs_select_depth_blt, @@ -1041,5 +1051,6 @@ const shader_backend_t atifs_shader_backend = { shader_atifs_generate_vshader, shader_atifs_get_caps, shader_atifs_load_init, + shader_atifs_fragment_enable, ATIFSStateTable }; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 37ddd78..174f2ea 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1182,6 +1182,22 @@ static void shader_none_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_inf #endif } + +static void shader_none_fragment_enable(IWineD3DDevice *iface, BOOL enable) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + WineD3D_GL_Info *gl_info = &This->adapter->gl_info; + + if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { + if(enable) { + glEnable(GL_TEXTURE_SHADER_NV); + checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); + } else { + glDisable(GL_TEXTURE_SHADER_NV); + checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)"); + } + } +} + #undef GLINFO_LOCATION const shader_backend_t none_shader_backend = { @@ -1199,6 +1215,7 @@ const shader_backend_t none_shader_backend = { &shader_none_generate_vshader, &shader_none_get_caps, &shader_none_load_init, + &shader_none_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 67baee5..6e19cae 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -351,10 +351,9 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar /* Set up the context defaults */ oldCtx = pwglGetCurrentContext(); oldDrawable = pwglGetCurrentDC(); - if(oldCtx && oldDrawable && GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + if(oldCtx && oldDrawable) { /* See comment in ActivateContext context switching */ - glDisable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, FALSE); } if(pwglMakeCurrent(hdc, ctx) == FALSE) { ERR("Cannot activate context to set up defaults\n"); @@ -439,10 +438,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar if(oldDrawable && oldCtx) { pwglMakeCurrent(oldDrawable, oldCtx); } - if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); - } + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, TRUE); out: return ret; @@ -687,13 +683,7 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex checkGLcall("glViewport"); Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); - if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - glDisable(GL_TEXTURE_SHADER_NV); - checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)"); - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glDisable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glDisable(GL_FRAGMENT_SHADER_ATI)"); - } + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, FALSE); } /***************************************************************************** @@ -941,22 +931,12 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU else { TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); - if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - /* Mesa crashes when enabling a context with GL_FRAGMENT_SHADER_ATI enabled. - * Thus we disable it before deactivating any context, and re-enable it afterwards. - * - * This bug is filed as bug #15269 on bugs.freedesktop.org - */ - glDisable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); - } - + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, FALSE); ret = pwglMakeCurrent(context->hdc, context->glCtx); if(ret == FALSE) { ERR("Failed to activate the new context\n"); - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER) && !context->last_was_blit) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } else if(!context->last_was_blit) { + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, TRUE); } } if(This->activeContext->vshader_const_dirty) { @@ -988,13 +968,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU case CTXUSAGE_CLEAR: if(context->last_was_blit) { - if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - glEnable(GL_TEXTURE_SHADER_NV); - checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); - } + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, TRUE); } /* Blending and clearing should be orthogonal, but tests on the nvidia driver show that disabling @@ -1013,13 +987,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU case CTXUSAGE_DRAWPRIM: /* This needs all dirty states applied */ if(context->last_was_blit) { - if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - glEnable(GL_TEXTURE_SHADER_NV); - checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); - } + This->shader_backend->shader_fragment_enable((IWineD3DDevice *) This, TRUE); } IWineD3DDeviceImpl_FindTexUnitMap(This); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1c5a97f..cc0c2e0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3583,6 +3583,10 @@ static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_inf static void shader_glsl_load_init(void) {} +static void shader_glsl_fragment_enable(IWineD3DDevice *iface, BOOL enable) { + none_shader_backend.shader_fragment_enable(iface, enable); +} + const shader_backend_t glsl_shader_backend = { &shader_glsl_select, &shader_glsl_select_depth_blt, @@ -3598,5 +3602,6 @@ const shader_backend_t glsl_shader_backend = { &shader_glsl_generate_vshader, &shader_glsl_get_caps, &shader_glsl_load_init, + &shader_glsl_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 92387ed..bdad91b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -300,6 +300,7 @@ typedef struct { void (*shader_generate_vshader)(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer); void (*shader_get_caps)(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *caps); void (*shader_dll_load_init)(void); + void (*shader_fragment_enable)(IWineD3DDevice *iface, BOOL enable); const struct StateEntry *StateTable; } shader_backend_t;

1 0

Alexandre Julliard : explorer: Convert the command line parsing to Unicode.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 9bbbebc2ce807885c5fc1fe927b14af27d8f1421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bbbebc2ce807885c5fc1fe92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 23 18:04:43 2008 +0200 explorer: Convert the command line parsing to Unicode. --- programs/explorer/Makefile.in | 2 +- programs/explorer/desktop.c | 63 +++++++++++++++++----------- programs/explorer/explorer.c | 75 ++++++++++++++++------------------ programs/explorer/explorer_private.h | 8 +--- 4 files changed, 76 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bbbebc2ce807885c5fc1…

1 0

Alexandre Julliard : winex11: Don' t allow changing the X11 size of a maximized window.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: bbd32aacff1555df0153deee22ca40de992de007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd32aacff1555df0153deee2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 23 15:34:07 2008 +0200 winex11: Don't allow changing the X11 size of a maximized window. --- dlls/winex11.drv/window.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5dc5ffc..89b7150 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1157,12 +1157,17 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data { DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); XWindowChanges changes; - int mask = CWWidth | CWHeight; + unsigned int mask = 0; if (data->managed && data->iconic) return; - if ((changes.width = data->whole_rect.right - data->whole_rect.left) <= 0) changes.width = 1; - if ((changes.height = data->whole_rect.bottom - data->whole_rect.top) <= 0) changes.height = 1; + /* resizing a managed maximized window is not allowed */ + if (!(style & WS_MAXIMIZE) || !data->managed) + { + if ((changes.width = data->whole_rect.right - data->whole_rect.left) <= 0) changes.width = 1; + if ((changes.height = data->whole_rect.bottom - data->whole_rect.top) <= 0) changes.height = 1; + mask |= CWWidth | CWHeight; + } /* only the size is allowed to change for the desktop window */ if (data->whole_window != root_window)

1 0

Alexandre Julliard : winex11: Make sure that the window gravity is always set.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 6ba06fa7af24922ec6b88c1ba49a46628bec5299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ba06fa7af24922ec6b88c1ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 23 15:33:29 2008 +0200 winex11: Make sure that the window gravity is always set. --- dlls/winex11.drv/window.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 95b43a7..5dc5ffc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -222,6 +222,7 @@ static int get_window_attributes( Display *display, struct x11drv_win_data *data attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0); attr->cursor = x11drv_thread_data()->cursor; attr->bit_gravity = NorthWestGravity; + attr->win_gravity = StaticGravity; attr->backing_store = NotUseful; attr->event_mask = (ExposureMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | @@ -725,15 +726,17 @@ static void set_size_hints( Display *display, struct x11drv_win_data *data, DWOR if (!(size_hints = XAllocSizeHints())) return; + size_hints->win_gravity = StaticGravity; + size_hints->flags |= PWinGravity; + /* don't update size hints if window is not in normal state */ if (!(style & (WS_MINIMIZE | WS_MAXIMIZE))) { if (data->hwnd != GetDesktopWindow()) /* don't force position of desktop */ { - size_hints->win_gravity = StaticGravity; size_hints->x = data->whole_rect.left; size_hints->y = data->whole_rect.top; - size_hints->flags |= PWinGravity | PPosition; + size_hints->flags |= PPosition; } if (!is_window_resizable( data, style ))

1 0

Alexandre Julliard : winex11: Merged the contents of winpos.c into window.c .
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 855308fd95257ff811c40390c790b4100b5d2214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855308fd95257ff811c40390c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 23 15:32:58 2008 +0200 winex11: Merged the contents of winpos.c into window.c. --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/window.c | 449 +++++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/winpos.c | 466 ------------------------------------------ dlls/winex11.drv/x11drv.h | 12 +- 5 files changed, 438 insertions(+), 492 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=855308fd95257ff811c40…

1 0

Alexandre Julliard : winex11: Moved the X11DRV_resize_desktop function to desktop.c.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 39f2a082770d150edb38a82b289193772e4af1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f2a082770d150edb38a82b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 23 15:22:17 2008 +0200 winex11: Moved the X11DRV_resize_desktop function to desktop.c. --- dlls/winex11.drv/desktop.c | 67 ++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winpos.c | 72 +------------------------------------------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 69 insertions(+), 71 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 1699318..14fba93 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -155,3 +155,70 @@ Window X11DRV_create_desktop( UINT width, UINT height ) if (win != None) X11DRV_init_desktop( win, width, height ); return win; } + + +struct desktop_resize_data +{ + RECT old_screen_rect; + RECT old_virtual_rect; +}; + +static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ) +{ + struct x11drv_win_data *data; + Display *display = thread_display(); + struct desktop_resize_data *resize_data = (struct desktop_resize_data *)lparam; + int mask = 0; + + if (!(data = X11DRV_get_win_data( hwnd ))) return TRUE; + + /* update the full screen state */ + update_net_wm_states( display, data ); + + if (resize_data->old_virtual_rect.left != virtual_screen_rect.left) mask |= CWX; + if (resize_data->old_virtual_rect.top != virtual_screen_rect.top) mask |= CWY; + if (mask && data->whole_window) + { + XWindowChanges changes; + + wine_tsx11_lock(); + changes.x = data->whole_rect.left - virtual_screen_rect.left; + changes.y = data->whole_rect.top - virtual_screen_rect.top; + XReconfigureWMWindow( display, data->whole_window, + DefaultScreen(display), mask, &changes ); + wine_tsx11_unlock(); + } + return TRUE; +} + + +/*********************************************************************** + * X11DRV_resize_desktop + */ +void X11DRV_resize_desktop( unsigned int width, unsigned int height ) +{ + HWND hwnd = GetDesktopWindow(); + struct desktop_resize_data resize_data; + + SetRect( &resize_data.old_screen_rect, 0, 0, screen_width, screen_height ); + resize_data.old_virtual_rect = virtual_screen_rect; + + xinerama_init( width, height ); + + if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) + { + SendMessageW( hwnd, WM_X11DRV_RESIZE_DESKTOP, 0, MAKELPARAM( width, height ) ); + } + else + { + TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); + SetWindowPos( hwnd, 0, virtual_screen_rect.left, virtual_screen_rect.top, + virtual_screen_rect.right - virtual_screen_rect.left, + virtual_screen_rect.bottom - virtual_screen_rect.top, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); + SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, + MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); + } + + EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); +} diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 5348ec6..2f66a21 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -51,7 +51,7 @@ static const char managed_prop[] = "__wine_x11_managed"; /*********************************************************************** * update_net_wm_states */ -static void update_net_wm_states( Display *display, struct x11drv_win_data *data ) +void update_net_wm_states( Display *display, struct x11drv_win_data *data ) { static const unsigned int state_atoms[NB_NET_WM_STATES] = { @@ -464,73 +464,3 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, XFlush( display ); /* make sure changes are done before we start painting again */ wine_tsx11_unlock(); } - - -struct desktop_resize_data -{ - RECT old_screen_rect; - RECT old_virtual_rect; -}; - -static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ) -{ - struct x11drv_win_data *data; - Display *display = thread_display(); - struct desktop_resize_data *resize_data = (struct desktop_resize_data *)lparam; - int mask = 0; - - if (!(data = X11DRV_get_win_data( hwnd ))) return TRUE; - - if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE) - { - /* update the full screen state */ - update_net_wm_states( display, data ); - } - - if (resize_data->old_virtual_rect.left != virtual_screen_rect.left) mask |= CWX; - if (resize_data->old_virtual_rect.top != virtual_screen_rect.top) mask |= CWY; - if (mask && data->whole_window) - { - XWindowChanges changes; - - wine_tsx11_lock(); - changes.x = data->whole_rect.left - virtual_screen_rect.left; - changes.y = data->whole_rect.top - virtual_screen_rect.top; - XReconfigureWMWindow( display, data->whole_window, - DefaultScreen(display), mask, &changes ); - wine_tsx11_unlock(); - } - return TRUE; -} - - -/*********************************************************************** - * X11DRV_resize_desktop - */ -void X11DRV_resize_desktop( unsigned int width, unsigned int height ) -{ - HWND hwnd = GetDesktopWindow(); - struct desktop_resize_data resize_data; - - SetRect( &resize_data.old_screen_rect, 0, 0, screen_width, screen_height ); - resize_data.old_virtual_rect = virtual_screen_rect; - - xinerama_init( width, height ); - - if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) - { - SendMessageW( hwnd, WM_X11DRV_RESIZE_DESKTOP, 0, MAKELPARAM( width, height ) ); - } - else - { - TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); - SetWindowPos( hwnd, 0, virtual_screen_rect.left, virtual_screen_rect.top, - virtual_screen_rect.right - virtual_screen_rect.left, - virtual_screen_rect.bottom - virtual_screen_rect.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); - SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, - MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); - } - - EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); -} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 287acbb..f40445b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -711,6 +711,7 @@ extern void flush_gl_drawable( X11DRV_PDEVICE *physDev ); extern int get_window_wm_state( Display *display, struct x11drv_win_data *data ); extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, BOOL set ); +extern void update_net_wm_states( Display *display, struct x11drv_win_data *data ); extern void make_window_embedded( Display *display, struct x11drv_win_data *data ); /* X context to associate a hwnd to an X window */

1 0

Dan Kegel : gdiplus: GdipLoadImageFromStream: initialize variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 8c8262510dbd1595bda8970bc59b389b0597cf81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c8262510dbd1595bda8970bc… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Apr 22 16:52:56 2008 -0700 gdiplus: GdipLoadImageFromStream: initialize variable. --- dlls/gdiplus/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3de6ff0..a89b6ea 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -759,6 +759,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) IPicture_get_Handle(pic, &hbm); IPicture_get_CurDC(pic, &hdc); + ZeroMemory(&bmi, sizeof(bmi)); bmch = (BITMAPCOREHEADER*) (&bmi.bmiHeader); bmch->bcSize = sizeof(BITMAPCOREHEADER);

1 0

Nikolay Sivov : gdiplus: Implemented GdipCloneFont.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: f994306a028cd1bc1e99abf9254cfd6a53bad9f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f994306a028cd1bc1e99abf92… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 23 01:12:59 2008 +0400 gdiplus: Implemented GdipCloneFont. --- dlls/gdiplus/font.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index be60843..d5d7e94 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -99,3 +99,16 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, return Ok; } + +GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) +{ + if(!font || !cloneFont) + return InvalidParameter; + + *cloneFont = GdipAlloc(sizeof(GpFont)); + if(!*cloneFont) return OutOfMemory; + + **cloneFont = *font; + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index cbea1b9..e301f57 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -50,7 +50,7 @@ @ stub GdipCloneBitmapAreaI @ stdcall GdipCloneBrush(ptr ptr) @ stdcall GdipCloneCustomLineCap(ptr ptr) -@ stub GdipCloneFont +@ stdcall GdipCloneFont(ptr ptr) @ stub GdipCloneFontFamily @ stub GdipCloneImage @ stub GdipCloneImageAttributes diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a8f6568..5765795 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -313,6 +313,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**) GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); +GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);

1 0

Reece Dunn : shlwapi/tests: Improve the way that the UrlCanonicalize tests report failure.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: eb139e44a75fb9e8388dec749723c6aabf171c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb139e44a75fb9e8388dec749… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Apr 22 13:18:07 2008 +0100 shlwapi/tests: Improve the way that the UrlCanonicalize tests report failure. --- dlls/shlwapi/tests/url.c | 115 ++++++++++++++++++++++----------------------- 1 files changed, 56 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb139e44a75fb9e8388de…

1 0

James Hawkins : kernel32: Fix a test that fails on win9x.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 4d07047d4e0cc2ce2abab131969a08a80f7fca3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d07047d4e0cc2ce2abab1319… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Apr 21 23:42:19 2008 -0500 kernel32: Fix a test that fails on win9x. --- dlls/kernel32/tests/time.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 73aae4d..21a8232 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -104,9 +104,12 @@ static void test_conversions(void) memset(&ft,0,sizeof ft); + SetLastError(0xdeadbeef); SETUP_EARLY(st) ok (!SystemTimeToFileTime(&st, &ft), "Conversion succeeded EARLY\n"); - ok (GetLastError() == ERROR_INVALID_PARAMETER, "EARLY should be INVALID\n"); + ok (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == 0xdeadbeef, /* win9x */ + "EARLY should be INVALID\n"); SETUP_ZEROTIME(st) ok (SystemTimeToFileTime(&st, &ft), "Conversion failed ZERO_TIME\n");

1 0

James Hawkins : version: Fix tests that fail in win9x and win2k.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 3550d3bfbc3b903c4f6e872d65a18eec02f8d189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3550d3bfbc3b903c4f6e872d6… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 21 20:30:35 2008 -0500 version: Fix tests that fail in win9x and win2k. --- dlls/version/tests/info.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index 3bfc9fb..9a6bcf4 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -31,18 +31,20 @@ ok( (ERROR_PATH_NOT_FOUND == GetLastError()) || \ (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || \ (ERROR_FILE_NOT_FOUND == GetLastError()) || \ - (ERROR_BAD_PATHNAME == GetLastError()), \ + (ERROR_BAD_PATHNAME == GetLastError()) || \ + (ERROR_SUCCESS == GetLastError()), \ "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_BAD_PATHNAME (98)/" \ - "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \ - "expected, got %u\n", GetLastError()); + "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3) " \ + "ERROR_SUCCESS (2k) expected, got %u\n", GetLastError()); #define EXPECT_INVALID__NOT_FOUND \ ok( (ERROR_PATH_NOT_FOUND == GetLastError()) || \ (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || \ (ERROR_FILE_NOT_FOUND == GetLastError()) || \ - (ERROR_INVALID_PARAMETER == GetLastError()), \ + (ERROR_INVALID_PARAMETER == GetLastError()) || \ + (ERROR_SUCCESS == GetLastError()), \ "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_INVALID_PARAMETER (98)/" \ - "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \ - "expected, got %u\n", GetLastError()); + "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3) " \ + "ERROR_SUCCESS (2k) expected, got %u\n", GetLastError()); static void create_file(const CHAR *name) { @@ -122,7 +124,8 @@ static void test_info_size(void) retval); ok( (ERROR_FILE_NOT_FOUND == GetLastError()) || (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || - (MY_LAST_ERROR == GetLastError()), + (MY_LAST_ERROR == GetLastError()) || + (ERROR_SUCCESS == GetLastError()), /* win2k */ "Last error wrong! ERROR_FILE_NOT_FOUND/ERROR_RESOURCE_DATA_NOT_FOUND " "(XP)/0x%08x (NT4) expected, got %u\n", MY_LAST_ERROR, GetLastError()); @@ -174,7 +177,9 @@ static void test_info_size(void) retval = GetFileVersionInfoSizeA("test.txt", &hdl); ok(retval == 0, "Expected 0, got %d\n", retval); ok(hdl == 0, "Expected 0, got %d\n", hdl); - ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND, + ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND || + GetLastError() == ERROR_BAD_FORMAT || /* win9x */ + GetLastError() == ERROR_SUCCESS, /* win2k */ "Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError()); DeleteFileA("test.txt"); @@ -480,7 +485,9 @@ static void test_VerQueryValue(void) GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0, "expected 0 got %x\n", len); + ok(len == 0 || + len == 0xbeef, /* win9x */ + "expected 0 got %x\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; @@ -547,7 +554,9 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0, "expected 0 got %x\n", len); + ok(len == 0 || + len == 0xbeef, /* win9x */ + "expected 0 or 0xbeef, got %x\n", len); } HeapFree(GetProcessHeap(), 0, ver);

1 0

ByeongSik Jeon : imm32: More implementation of the ImmGetConversionStatus() .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: a720292bac0c27bb97fd64ebe1b35569f0f02c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a720292bac0c27bb97fd64ebe… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 23 19:05:46 2008 +0900 imm32: More implementation of the ImmGetConversionStatus(). Match the ImmSetConversionStatus() function. --- dlls/imm32/imm.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9a46ef5..04b0d77 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1095,11 +1095,18 @@ DWORD WINAPI ImmGetConversionListW( BOOL WINAPI ImmGetConversionStatus( HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence) { - TRACE("(%p, %p, %p): best guess\n", hIMC, lpfdwConversion, lpfdwSentence); + InputContextData *data = (InputContextData*)hIMC; + + TRACE("%p %p %p\n", hIMC, lpfdwConversion, lpfdwSentence); + + if (!data) + return FALSE; + if (lpfdwConversion) - *lpfdwConversion = IME_CMODE_NATIVE; + *lpfdwConversion = data->IMC.fdwConversion; if (lpfdwSentence) - *lpfdwSentence = IME_SMODE_NONE; + *lpfdwSentence = data->IMC.fdwSentence; + return TRUE; }

1 0

ByeongSik Jeon : imm32: Pass the old conversion status value to the IME.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 4c5a21c60e7f929ba5daf0bc28b0c0a1dc67ded6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5a21c60e7f929ba5daf0bc2… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 23 19:05:30 2008 +0900 imm32: Pass the old conversion status value to the IME. --- dlls/imm32/imm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c4fab3c..9a46ef5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1779,6 +1779,7 @@ BOOL WINAPI ImmSetCompositionWindow( BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { + DWORD oldConversion, oldSentence; InputContextData *data = (InputContextData*)hIMC; TRACE("%p %d %d\n", hIMC, fdwConversion, fdwSentence); @@ -1788,14 +1789,16 @@ BOOL WINAPI ImmSetConversionStatus( if ( fdwConversion != data->IMC.fdwConversion ) { + oldConversion = data->IMC.fdwConversion; data->IMC.fdwConversion = fdwConversion; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCONVERSIONMODE); + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldConversion, IMC_SETCONVERSIONMODE); ImmInternalSendIMENotify(data, IMN_SETCONVERSIONMODE, 0); } if ( fdwSentence != data->IMC.fdwSentence ) { + oldSentence = data->IMC.fdwSentence; data->IMC.fdwSentence = fdwSentence; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSENTENCEMODE); + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldSentence, IMC_SETSENTENCEMODE); ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); }

1 0

ByeongSik Jeon : imm32: Examine whether the fOpen value differs with its old value.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 9a89e4d68c01e1869908746f22b49dd84c6a8d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a89e4d68c01e1869908746f2… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 23 19:05:23 2008 +0900 imm32: Examine whether the fOpen value differs with its old value. --- dlls/imm32/imm.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 932f1ed..c4fab3c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1824,8 +1824,14 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) IMM_GetThreadData()->hwndDefault = data->imeWnd; } - data->IMC.fOpen = fOpen; - return ImmNotifyIME(hIMC,NI_CONTEXTUPDATED,0,IMC_SETOPENSTATUS); + if (!fOpen != !data->IMC.fOpen) + { + data->IMC.fOpen = fOpen; + ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS); + ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); + } + + return TRUE; } /***********************************************************************

1 0

ByeongSik Jeon : user32: Pass the WM_IME_NOTIFY message to the default IME window.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 4b77bb4ae2b05023a87c6f14590d6192495c3f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b77bb4ae2b05023a87c6f145… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 12:33:22 2008 +0900 user32: Pass the WM_IME_NOTIFY message to the default IME window. --- dlls/user32/defwnd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 43ae405..9d72f9a 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -854,6 +854,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case WM_IME_COMPOSITION: case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: + case WM_IME_NOTIFY: { HWND hwndIME; @@ -1006,6 +1007,7 @@ LRESULT WINAPI DefWindowProcW( case WM_IME_COMPOSITION: case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: + case WM_IME_NOTIFY: { HWND hwndIME;

1 0

ByeongSik Jeon : imm32: Add stub and header of Imm{Create|Show|Destroy}SoftKeyboard.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: a6ff00c4dabb6245264e3d024973b6f290e713dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ff00c4dabb6245264e3d024… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:44:39 2008 +0900 imm32: Add stub and header of Imm{Create|Show|Destroy}SoftKeyboard. --- dlls/imm32/imm.c | 30 ++++++++++++++++++++++++++++++ dlls/imm32/imm32.spec | 6 +++--- include/ddk/imm.h | 4 ++++ 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 959bb5c..932f1ed 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1839,6 +1839,36 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) } /*********************************************************************** + * ImmCreateSoftKeyboard(IMM32.@) + */ +HWND WINAPI ImmCreateSoftKeyboard(UINT uType, UINT hOwner, int x, int y) +{ + FIXME("(%d, %d, %d, %d): stub\n", uType, hOwner, x, y); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/*********************************************************************** + * ImmDestroySoftKeyboard(IMM32.@) + */ +BOOL WINAPI ImmDestroySoftKeyboard(HWND hSoftWnd) +{ + FIXME("(%p): stub\n", hSoftWnd); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * ImmShowSoftKeyboard(IMM32.@) + */ +BOOL WINAPI ImmShowSoftKeyboard(HWND hSoftWnd, int nCmdShow) +{ + FIXME("(%p, %d): stub\n", hSoftWnd, nCmdShow); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * ImmSimulateHotKey (IMM32.@) */ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID) diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 058e313..e0c9385 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -5,10 +5,10 @@ @ stdcall ImmConfigureIMEW(long long long ptr) @ stdcall ImmCreateContext() @ stdcall ImmCreateIMCC(long) -@ stub ImmCreateSoftKeyboard +@ stdcall ImmCreateSoftKeyboard(long long long long) @ stdcall ImmDestroyContext(long) @ stdcall ImmDestroyIMCC(long) -@ stub ImmDestroySoftKeyboard +@ stdcall ImmDestroySoftKeyboard(long) @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME @ stub ImmEnumInputContext @@ -96,7 +96,7 @@ #@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey @ stdcall ImmSetOpenStatus(long long) @ stdcall ImmSetStatusWindowPos(long ptr) -@ stub ImmShowSoftKeyboard +@ stdcall ImmShowSoftKeyboard(long long) @ stdcall ImmSimulateHotKey(long long) @ stub ImmSystemHandler @ stdcall ImmTranslateMessage(long long long long) diff --git a/include/ddk/imm.h b/include/ddk/imm.h index 4c3ec45..a33073d 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -145,6 +145,10 @@ LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); #define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); +HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); +BOOL WINAPI ImmDestroySoftKeyboard(HWND); +BOOL WINAPI ImmShowSoftKeyboard(HWND, int); + BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT);

1 0

ByeongSik Jeon : imm32: Add stub and header of ImmRequestMessage.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: f9316b187782fd5d9d36033beaaa80b4b33e6519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9316b187782fd5d9d36033be… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:44:22 2008 +0900 imm32: Add stub and header of ImmRequestMessage. --- dlls/imm32/imm.c | 20 ++++++++++++++++++++ dlls/imm32/imm32.spec | 4 ++-- include/ddk/imm.h | 3 +++ include/imm.h | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c267a70..959bb5c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1573,6 +1573,26 @@ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) } /*********************************************************************** +* ImmRequestMessageA(IMM32.@) +*/ +LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) +{ + FIXME("(%p %ld %ld): stub\n", hIMC, wParam, wParam); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/*********************************************************************** +* ImmRequestMessageW(IMM32.@) +*/ +LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) +{ + FIXME("(%p %ld %ld): stub\n", hIMC, wParam, wParam); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/*********************************************************************** * ImmSetCandidateWindow (IMM32.@) */ BOOL WINAPI ImmSetCandidateWindow( diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 4e0b023..058e313 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -79,8 +79,8 @@ @ stdcall ImmRegisterWordA(long str long str) @ stdcall ImmRegisterWordW(long wstr long wstr) @ stdcall ImmReleaseContext(long long) -@ stub ImmRequestMessageA -@ stub ImmRequestMessageW +@ stdcall ImmRequestMessageA(ptr long long) +@ stdcall ImmRequestMessageW(ptr long long) @ stub ImmSendIMEMessageExA @ stub ImmSendIMEMessageExW @ stub ImmSendMessageToActiveDefImeWndW diff --git a/include/ddk/imm.h b/include/ddk/imm.h index ee10b27..4c3ec45 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -141,6 +141,9 @@ DWORD WINAPI ImmGetIMCCSize(HIMCC); #define NI_IMEMENUSELECTED 0x0018 BOOL WINAPI ImmGenerateMessage(HIMC); +LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); +LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); +#define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); diff --git a/include/imm.h b/include/imm.h index 1b4cc71..57658de 100644 --- a/include/imm.h +++ b/include/imm.h @@ -394,6 +394,8 @@ typedef struct _tagCOMPOSITIONFORM #define IMR_COMPOSITIONFONT 0x0003 #define IMR_RECONVERTSTRING 0x0004 #define IMR_CONFIRMRECONVERTSTRING 0x0005 +#define IMR_QUERYCHARPOSITION 0x0006 +#define IMR_DOCUMENTFEED 0x0007 /* error code of ImmGetCompositionString */

1 0

Tomasz Jezierski : shell32: Secure filename copy to fixed size variable wfileName.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 3229c3de92dfba4fd32d55a28b09ef42514800d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3229c3de92dfba4fd32d55a28… Author: Tomasz Jezierski <developers(a)tefnet.pl> Date: Tue Apr 22 09:39:48 2008 +0200 shell32: Secure filename copy to fixed size variable wfileName. --- dlls/shell32/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 794d0bd..fec7870 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1711,10 +1711,10 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } } - strcpyW(wfileName, sei_tmp.lpFile); + lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); } } else - strcpyW(wfileName, sei_tmp.lpFile); + lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); lpFile = wfileName;

1 0

Maarten Lankhorst : dsound: Skip WAVE_FORMAT_EXTENSIBLE tests on directx < 8.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: bf739cbcc38c2ba95a0f087cb34be61f5ca395ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf739cbcc38c2ba95a0f087cb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 22 17:12:28 2008 -0700 dsound: Skip WAVE_FORMAT_EXTENSIBLE tests on directx < 8. --- dlls/dsound/tests/dsound.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 3a1bd18..6c81640 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -44,6 +44,8 @@ static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID,LPDIRECTSOUND*, LPUNKNOWN)=NULL; +static BOOL gotdx8; + static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, LPCGUID lpGuid) { @@ -569,8 +571,13 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) formats[f][2]); wfx2=wfx; rc=IDirectSoundBuffer_SetFormat(primary,&wfx); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", - format_string(&wfx), DXGetErrorString8(rc)); + + if (wfx.wBitsPerSample <= 16) + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", + format_string(&wfx), DXGetErrorString8(rc)); + else + ok(rc==DS_OK || rc == E_INVALIDARG, "SetFormat (%s) failed: %s\n", + format_string(&wfx), DXGetErrorString8(rc)); /* There is no guarantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard @@ -723,14 +730,30 @@ static HRESULT test_secondary(LPGUID lpGuid) wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - if (wfx.wBitsPerSample != 8 && wfx.wBitsPerSample != 16) - ok(rc == DSERR_CONTROLUNAVAIL && !secondary, "IDirectSound_CreateSoundBuffer() " - "should have returned DSERR_CONTROLUNAVAIL and NULL, returned: %s %p\n", - DXGetErrorString8(rc), secondary); + if (gotdx8 || wfx.wBitsPerSample <= 16) + { + if (wfx.wBitsPerSample > 16) + ok(rc == DSERR_CONTROLUNAVAIL && !secondary, "IDirectSound_CreateSoundBuffer() " + "should have returned DSERR_CONTROLUNAVAIL and NULL, returned: %s %p\n", + DXGetErrorString8(rc), secondary); + else + ok(rc==DS_OK && secondary!=NULL, + "IDirectSound_CreateSoundBuffer() failed to create a secondary " + "buffer %s\n",DXGetErrorString8(rc)); + } else - ok(rc==DS_OK && secondary!=NULL, - "IDirectSound_CreateSoundBuffer() failed to create a secondary " - "buffer %s\n",DXGetErrorString8(rc)); + ok(rc==E_INVALIDARG, "Creating %d bpp buffer on dx < 8 returned: %p %s\n", + wfx.wBitsPerSample, secondary, DXGetErrorString8(rc)); + + if (!gotdx8) + { + skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n"); + /* Apparently they succeed with bogus values, + * which means that older dsound doesn't look at them + */ + goto no_wfe; + } + if (secondary) IDirectSoundBuffer_Release(secondary); secondary = NULL; @@ -792,6 +815,7 @@ static HRESULT test_secondary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() failed to create a secondary " "buffer %s\n",DXGetErrorString8(rc)); +no_wfe: if (rc==DS_OK && secondary!=NULL) { if (winetest_interactive) { trace(" Testing a secondary buffer at %dx%dx%d " @@ -1066,6 +1090,8 @@ START_TEST(dsound) pDirectSoundCreate = (void*)GetProcAddress(hDsound, "DirectSoundCreate"); + gotdx8 = !!GetProcAddress(hDsound, "DirectSoundCreate8"); + IDirectSound_tests(); dsound_tests();

1 0

Maarten Lankhorst : quartz: Make the file source support multiple samples by preallocating enough handles .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: e0fe0ef01b32b06503e22310c1a54ae9c765b54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fe0ef01b32b06503e22310c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 22 16:54:28 2008 -0700 quartz: Make the file source support multiple samples by preallocating enough handles. --- dlls/quartz/filesource.c | 214 ++++++++++++++++++++++++++------------------- 1 files changed, 124 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0fe0ef01b32b06503e22…

1 0

Maarten Lankhorst : quartz: Make wave parser and mpeg splitter zero copy by getting rid of the seperate allocator for the output pin .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 3a39805ed8345047d217f4a0d7de3954cce7cb93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a39805ed8345047d217f4a0d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 22 13:57:11 2008 -0700 quartz: Make wave parser and mpeg splitter zero copy by getting rid of the seperate allocator for the output pin. --- dlls/quartz/avisplit.c | 7 +- dlls/quartz/mpegsplit.c | 362 +++++++++++++++++---------------------------- dlls/quartz/parser.c | 26 +++- dlls/quartz/parser.h | 4 +- dlls/quartz/pin.c | 158 +++++++++++++------- dlls/quartz/pin.h | 10 +- dlls/quartz/waveparser.c | 211 ++++++++++++++------------- 7 files changed, 384 insertions(+), 394 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a39805ed8345047d217f…

1 0

Maarten Lankhorst : quartz: Add some sanity checks to file splitter.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: ec124be8239b6292ba239bb24f125cd4e267fdd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec124be8239b6292ba239bb24… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 22 13:44:33 2008 -0700 quartz: Add some sanity checks to file splitter. --- dlls/quartz/filesource.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 930ebfc..396384f 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1107,6 +1107,9 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw if (!This->bFlushing) { + if (!This->pHead) + ERR("Called without samples in queue!\n"); + /* wait for the read to finish or timeout */ if (WaitForSingleObject(This->hEvent, dwTimeout) == WAIT_TIMEOUT) hr = VFW_E_TIMEOUT; @@ -1139,10 +1142,10 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw *pdwUser = pDataRq->dwUserData; if (This->bFlushing) - { hr = VFW_E_WRONG_STATE; + + if (FAILED(hr)) dwBytes = 0; - } /* Set the time on the sample */ IMediaSample_SetActualDataLength(pDataRq->pSample, dwBytes); @@ -1156,6 +1159,12 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw assert(rtStop <= rtSampleStop); IMediaSample_SetTime(pDataRq->pSample, &rtStart, &rtStop); + assert(rtStart == rtSampleStart); + if (hr == S_OK) + assert(rtStop == rtSampleStop); + else + assert(rtStop == rtStart); + } /* no need to close event handle since we will close it when the pin is destroyed */

1 0

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