December 2009 - Wine-Commits

Ilya Shpigor : comctl32: Test the WM_GETTEXT processing of datetime control .
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: e4e55ed8b4e2ff57a62927fb91f4d4244a0a3b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e55ed8b4e2ff57a62927fb9… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Mon Nov 30 15:24:27 2009 +0300 comctl32: Test the WM_GETTEXT processing of datetime control. --- dlls/comctl32/tests/datetime.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 8a3ad03..9218e07 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -659,7 +659,7 @@ static void test_dtm_set_and_get_system_time(void) static void test_wm_set_get_text(void) { static const CHAR a_str[] = "a"; - char buff[10]; + char buff[16], time[16]; HWND hWnd; LRESULT ret; @@ -674,6 +674,10 @@ static void test_wm_set_get_text(void) ret = SendMessage(hWnd, WM_GETTEXT, sizeof(buff), (LPARAM)buff); ok(strcmp(buff, a_str) != 0, "Expected text not to change, got %s\n", buff); + GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, time, sizeof(time)); + todo_wine + ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); + DestroyWindow(hWnd); }

1 0

Rob Shearman : winex11.drv: Make sure that the selectionAcquired flag has been set before returning from X11DRV_AcquireClipboard .
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: b894925b0ef54007957e21dcfa7df01307a75285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b894925b0ef54007957e21dcf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 1 13:16:20 2009 +0000 winex11.drv: Make sure that the selectionAcquired flag has been set before returning from X11DRV_AcquireClipboard. X11DRV_CLIPBOARD_UpdateCache depends on selectionAcquired being set if the current process is the selection owner, otherwise it will defer to getting the clipformats from X, manufacturing extra formats that the app may not be expecting, having just set the formats itself. Worse still, since selectionAcquired is set in another thread this behaviour is not predicatable and it may sometimes use the clipformats already set and other times defer to X. --- dlls/winex11.drv/clipboard.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 2740264..3d9c153 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2653,9 +2653,14 @@ static void selection_acquire(void) } } -static DWORD WINAPI selection_thread_proc(LPVOID unused) +static DWORD WINAPI selection_thread_proc(LPVOID p) { + HANDLE event = p; + + TRACE("\n"); + selection_acquire(); + SetEvent(event); while (selectionAcquired) { @@ -2705,7 +2710,8 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) } else { - selectionThread = CreateThread(NULL, 0, &selection_thread_proc, NULL, 0, NULL); + HANDLE event = CreateEventW(NULL, FALSE, FALSE, NULL); + selectionThread = CreateThread(NULL, 0, &selection_thread_proc, event, 0, NULL); if (!selectionThread) { @@ -2713,6 +2719,8 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) return 0; } + WaitForSingleObject(event, INFINITE); + CloseHandle(event); CloseHandle(selectionThread); }

1 0

Rob Shearman : ws2_32: Initialise buffer eventually passed into send to zero in test_write_events .
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 0d10ddd4d54e5094d9fddce90b937a72a7b04078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d10ddd4d54e5094d9fddce90… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 1 13:14:06 2009 +0000 ws2_32: Initialise buffer eventually passed into send to zero in test_write_events. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c17b894..fbe55f6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2589,7 +2589,7 @@ static void test_write_events(void) goto end; } - buffer = HeapAlloc(GetProcessHeap(), 0, bufferSize); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufferSize); if (buffer == NULL) { ok(0, "could not allocate memory for test\n");

1 0

Rob Shearman : oleaut32: Remove LPVOID variables in olefont tests and pass IFont pointers into OleCreateFontIndirect directly .
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: f7624cbfbc868601719722d6aa94621af0f98f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7624cbfbc868601719722d6a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 1 13:13:40 2009 +0000 oleaut32: Remove LPVOID variables in olefont tests and pass IFont pointers into OleCreateFontIndirect directly. In many places the assignment of the LPVOID variable into the corresponding IFont * variable has been forgotten. --- dlls/oleaut32/tests/olefont.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index b457f36..55e0e58 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -491,8 +491,6 @@ static void test_Invoke(void) static void test_IsEqual(void) { FONTDESC fd; - LPVOID pvObj = NULL; - LPVOID pvObj2 = NULL; IFont* ifnt = NULL; IFont* ifnt2 = NULL; HRESULT hres; @@ -509,12 +507,10 @@ static void test_IsEqual(void) fd.fStrikethrough = 0; /* Create font */ - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj); - ifnt = pvObj; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt); /* Test equal fonts */ - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_OK, "IFont_IsEqual: (EQUAL) Expected S_OK but got 0x%08x\n",hres); @@ -527,7 +523,7 @@ static void test_IsEqual(void) /* Test strName */ fd.lpstrName = arial_font; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (strName) Expected S_FALSE but got 0x%08x\n",hres); @@ -536,8 +532,7 @@ static void test_IsEqual(void) /* Test lo font size */ S(fd.cySize).Lo = 10000; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Lo font size) Expected S_FALSE but got 0x%08x\n",hres); @@ -546,8 +541,7 @@ static void test_IsEqual(void) /* Test hi font size */ S(fd.cySize).Hi = 10000; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Hi font size) Expected S_FALSE but got 0x%08x\n",hres); @@ -556,8 +550,7 @@ static void test_IsEqual(void) /* Test font weight */ fd.sWeight = 100; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Weight) Expected S_FALSE but got 0x%08x\n",hres); @@ -566,7 +559,7 @@ static void test_IsEqual(void) /* Test charset */ fd.sCharset = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Charset) Expected S_FALSE but got 0x%08x\n",hres); @@ -575,7 +568,7 @@ static void test_IsEqual(void) /* Test italic setting */ fd.fItalic = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Italic) Expected S_FALSE but got 0x%08x\n",hres); @@ -584,7 +577,7 @@ static void test_IsEqual(void) /* Test underline setting */ fd.fUnderline = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Underline) Expected S_FALSE but got 0x%08x\n",hres); @@ -593,7 +586,7 @@ static void test_IsEqual(void) /* Test strikethrough setting */ fd.fStrikethrough = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Strikethrough) Expected S_FALSE but got 0x%08x\n",hres);

1 0

Alexandre Julliard : server: Make sure that last error doesn' t get set during thread cleanup.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: e4faa12900a8bc2be59cbb611b3cdf456942cbf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4faa12900a8bc2be59cbb611… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 15:10:23 2009 +0100 server: Make sure that last error doesn't get set during thread cleanup. --- server/clipboard.c | 6 ++++-- server/hook.c | 5 +++-- server/process.c | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 065dd2d..0c39319 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "request.h" #include "object.h" +#include "process.h" #include "user.h" #include "winuser.h" #include "winternl.h" @@ -112,9 +113,10 @@ static struct clipboard *get_process_clipboard(void) void cleanup_clipboard_thread(struct thread *thread) { struct clipboard *clipboard; - struct winstation *winstation = get_process_winstation( thread->process, WINSTA_ACCESSCLIPBOARD ); + struct winstation *winstation; - if (!winstation) return; + if (!thread->process->winstation) return; + if (!(winstation = get_process_winstation( thread->process, WINSTA_ACCESSCLIPBOARD ))) return; if ((clipboard = winstation->clipboard)) { diff --git a/server/hook.c b/server/hook.c index f5ebc2b..7b889d8 100644 --- a/server/hook.c +++ b/server/hook.c @@ -114,9 +114,10 @@ static struct hook_table *alloc_hook_table(void) static struct hook_table *get_global_hooks( struct thread *thread ) { struct hook_table *table; - struct desktop *desktop = get_thread_desktop( thread, 0 ); + struct desktop *desktop; - if (!desktop) return NULL; + if (!thread->desktop) return NULL; + if (!(desktop = get_thread_desktop( thread, 0 ))) return NULL; table = desktop->global_hooks; release_object( desktop ); return table; diff --git a/server/process.c b/server/process.c index 630abe6..51193b7 100644 --- a/server/process.c +++ b/server/process.c @@ -632,6 +632,8 @@ static void process_killed( struct process *process ) handles = process->handles; process->handles = NULL; if (handles) release_object( handles ); + process->winstation = 0; + process->desktop = 0; /* close the console attached to this process, if any */ free_console( process );

1 0

Maarten Lankhorst : ntdll: Silence a common warning.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 58c7aa46914b21c3bb2300e4bd9c0369bbf3685d URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c7aa46914b21c3bb2300e4b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 30 18:18:58 2009 +0100 ntdll: Silence a common warning. --- dlls/ntdll/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index a09aab1..40cc455 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2412,7 +2412,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI if (status != STATUS_SUCCESS) { /* couldn't find it at all, fail */ - WARN( "%s not found in %s\n", debugstr_w(name), unix_name ); + TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); RtlFreeHeap( GetProcessHeap(), 0, unix_name ); return status; }

1 0

Alexandre Julliard : server: Don't set last error in close_handle(), return the error code instead.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 60efdd55eaf73bf556dc9ab97745780f911da3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60efdd55eaf73bf556dc9ab97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 13:59:41 2009 +0100 server: Don't set last error in close_handle(), return the error code instead. --- server/handle.c | 33 ++++++++------------------------- server/handle.h | 2 +- server/winstation.c | 5 ++--- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/server/handle.c b/server/handle.c index d1b6a14..3baaa6d 100644 --- a/server/handle.c +++ b/server/handle.c @@ -347,35 +347,22 @@ struct handle_table *copy_handle_table( struct process *process, struct process } /* close a handle and decrement the refcount of the associated object */ -/* return 1 if OK, 0 on error */ -int close_handle( struct process *process, obj_handle_t handle ) +unsigned int close_handle( struct process *process, obj_handle_t handle ) { struct handle_table *table; struct handle_entry *entry; struct object *obj; - if (!(entry = get_handle( process, handle ))) - { - set_error( STATUS_INVALID_HANDLE ); - return 0; - } - if (entry->access & RESERVED_CLOSE_PROTECT) - { - set_error( STATUS_HANDLE_NOT_CLOSABLE ); - return 0; - } + if (!(entry = get_handle( process, handle ))) return STATUS_INVALID_HANDLE; + if (entry->access & RESERVED_CLOSE_PROTECT) return STATUS_HANDLE_NOT_CLOSABLE; obj = entry->ptr; - if (!obj->ops->close_handle( obj, process, handle )) - { - set_error( STATUS_HANDLE_NOT_CLOSABLE ); - return 0; - } + if (!obj->ops->close_handle( obj, process, handle )) return STATUS_HANDLE_NOT_CLOSABLE; entry->ptr = NULL; table = handle_is_global(handle) ? global_table : process->handles; if (entry < table->entries + table->free) table->free = entry - table->entries; if (entry == table->entries + table->last) shrink_handle_table( table ); release_object( obj ); - return 1; + return STATUS_SUCCESS; } /* retrieve the object corresponding to one of the magic pseudo-handles */ @@ -567,7 +554,8 @@ unsigned int get_handle_table_count( struct process *process ) /* close a handle */ DECL_HANDLER(close_handle) { - close_handle( current->process, req->handle ); + unsigned int err = close_handle( current->process, req->handle ); + set_error( err ); } /* set a handle information */ @@ -596,12 +584,7 @@ DECL_HANDLER(dup_handle) release_object( dst ); } /* close the handle no matter what happened */ - if (req->options & DUP_HANDLE_CLOSE_SOURCE) - { - unsigned int err = get_error(); /* don't overwrite error from the above calls */ - reply->closed = close_handle( src, req->src_handle ); - set_error( err ); - } + if (req->options & DUP_HANDLE_CLOSE_SOURCE) reply->closed = !close_handle( src, req->src_handle ); reply->self = (src == current->process); release_object( src ); } diff --git a/server/handle.h b/server/handle.h index 3809aa3..7860f52 100644 --- a/server/handle.h +++ b/server/handle.h @@ -38,7 +38,7 @@ extern obj_handle_t alloc_handle( struct process *process, void *obj, unsigned int access, unsigned int attr ); extern obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ); -extern int close_handle( struct process *process, obj_handle_t handle ); +extern unsigned int close_handle( struct process *process, obj_handle_t handle ); extern struct object *get_handle_obj( struct process *process, obj_handle_t handle, unsigned int access, const struct object_ops *ops ); extern unsigned int get_handle_access( struct process *process, obj_handle_t handle ); diff --git a/server/winstation.c b/server/winstation.c index cfff0a4..7ddc277 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -403,7 +403,6 @@ void close_thread_desktop( struct thread *thread ) thread->desktop = 0; if (handle) close_handle( thread->process, handle ); - clear_error(); /* ignore errors */ } /* set the reply data from the object name */ @@ -458,7 +457,7 @@ DECL_HANDLER(close_winstation) if ((winstation = (struct winstation *)get_handle_obj( current->process, req->handle, 0, &winstation_ops ))) { - if (!close_handle( current->process, req->handle )) set_error( STATUS_ACCESS_DENIED ); + if (close_handle( current->process, req->handle )) set_error( STATUS_ACCESS_DENIED ); release_object( winstation ); } } @@ -544,7 +543,7 @@ DECL_HANDLER(close_desktop) if ((desktop = (struct desktop *)get_handle_obj( current->process, req->handle, 0, &desktop_ops ))) { - if (!close_handle( current->process, req->handle )) set_error( STATUS_DEVICE_BUSY ); + if (close_handle( current->process, req->handle )) set_error( STATUS_DEVICE_BUSY ); release_object( desktop ); } }

1 0

Hans Leidekker : wininet/tests: Trace extended errors in a couple of places .
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: c4d12bde2bb4ff7fa63346e7f2a5a5be1a3df889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d12bde2bb4ff7fa63346e7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 1 11:35:11 2009 +0100 wininet/tests: Trace extended errors in a couple of places. --- dlls/wininet/tests/ftp.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index b4de4e1..d19b9a8 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -360,6 +360,20 @@ static void test_getfile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %d\n", GetLastError()); } +static void trace_extended_error(DWORD error) +{ + DWORD code, buflen = 0; + + if (error != ERROR_INTERNET_EXTENDED_ERROR) return; + if (!InternetGetLastResponseInfoA(&code, NULL, &buflen) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + char *text = HeapAlloc(GetProcessHeap(), 0, ++buflen); + InternetGetLastResponseInfoA(&code, text, &buflen); + trace("%u %s\n", code, text); + HeapFree(GetProcessHeap(), 0, text); + } +} + static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) { HINTERNET hOpenFile; @@ -414,21 +428,26 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) if (hOpenFile) { BOOL bRet; + DWORD error; HINTERNET hOpenFile2; HANDLE hFile; /* We have a handle so all ftp calls should fail (TODO: Put all ftp-calls in here) */ SetLastError(0xdeadbeef); bRet = FtpCreateDirectoryA(hFtp, "new_directory_deadbeef"); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpCreateDirectoryA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); + trace_extended_error(error); SetLastError(0xdeadbeef); bRet = FtpDeleteFileA(hFtp, "non_existent_file_deadbeef"); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); + trace_extended_error(error); SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0);

1 0

Hans Leidekker : msi/tests: Don't check more bytes than written to the file .
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: fd8620f6c0aac1f89b217581d86f15134ea430d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8620f6c0aac1f89b217581d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 1 11:34:07 2009 +0100 msi/tests: Don't check more bytes than written to the file. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a007538..ee7e85b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2849,7 +2849,7 @@ static void test_readonlyfile_cab(void) ReadFile(file, buf, sizeof(buf) - 1, &size, NULL); CloseHandle(file); } - ok( !lstrcmp( buf, "maximus" ), "Expected file to be overwritten, got '%s'\n", buf ); + ok(!memcmp( buf, "maximus", sizeof("maximus")-1 ), "Expected file to be overwritten, got '%s'\n", buf); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");

1 0

Henri Verbeet : d3d8: Return D3DERR_INVALIDCALL when trying to delete an invalid pixel shader.
by Alexandre Julliard Dec. 1, 2009

Dec. 1, 2009

Module: wine Branch: master Commit: 212ee15bd7813fc71368e431e5a264cdc6d87e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212ee15bd7813fc71368e431e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 1 11:27:47 2009 +0100 d3d8: Return D3DERR_INVALIDCALL when trying to delete an invalid pixel shader. It appears this is fixed on Vista/Win7 to be consistent with DeleteVertexShader(). Match the more consistent behaviour of Vista/Win7 and mark the previous behaviour as broken. --- dlls/d3d8/device.c | 2 +- dlls/d3d8/tests/device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 450a5ff..f390691 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2316,7 +2316,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 i { WARN("Invalid handle (%#x) passed.\n", pShader); wined3d_mutex_unlock(); - return D3D_OK; + return D3DERR_INVALIDCALL; } IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &cur); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 900fbb7..5e1f523 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1084,9 +1084,9 @@ static void test_shader(void) /* Check for double delete. */ hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader2); - ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); + ok(hr == D3DERR_INVALIDCALL || broken(hr == D3D_OK), "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader); - ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); + ok(hr == D3DERR_INVALIDCALL || broken(hr == D3D_OK), "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); } else {

1 0