June 2011 - Wine-Commits - list.winehq.org

Andrew Nguyen : dbghelp: Implement SymEnumSourceFilesW.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 6ee16099a3b541c656b2146821fc6787aca6112b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee16099a3b541c656b214682… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 31 06:12:44 2011 -0500 dbghelp: Implement SymEnumSourceFilesW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/dbghelp_private.h | 3 + dlls/dbghelp/module.c | 6 +- dlls/dbghelp/source.c | 122 +++++++++++++++++++++++++++++++++++++--- 4 files changed, 121 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index c50ab22..ddb9d33 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -45,7 +45,7 @@ @ stub SymEnumProcesses @ stub SymEnumSourceFileTokens @ stdcall SymEnumSourceFiles(ptr int64 str ptr ptr) -@ stub SymEnumSourceFilesW +@ stdcall SymEnumSourceFilesW(ptr int64 wstr ptr ptr) @ stub SymEnumSourceLines @ stub SymEnumSourceLinesW @ stub SymEnumSym diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 4a64253..43aca49 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -538,6 +538,9 @@ extern struct module* module_find_by_addr(const struct process* pcs, unsigned long addr, enum module_type type) DECLSPEC_HIDDEN; extern struct module* + module_find_by_nameW(const struct process* pcs, + const WCHAR* name) DECLSPEC_HIDDEN; +extern struct module* module_find_by_nameA(const struct process* pcs, const char* name) DECLSPEC_HIDDEN; extern struct module* diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 7f75cc2..2a1471f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -234,10 +234,10 @@ struct module* module_new(struct process* pcs, const WCHAR* name, } /*********************************************************************** - * module_find_by_name + * module_find_by_nameW * */ -static struct module* module_find_by_name(const struct process* pcs, const WCHAR* name) +struct module* module_find_by_nameW(const struct process* pcs, const WCHAR* name) { struct module* module; @@ -254,7 +254,7 @@ struct module* module_find_by_nameA(const struct process* pcs, const char* name) WCHAR wname[MAX_PATH]; MultiByteToWideChar(CP_ACP, 0, name, -1, wname, sizeof(wname) / sizeof(WCHAR)); - return module_find_by_name(pcs, wname); + return module_find_by_nameW(pcs, wname); } /*********************************************************************** diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index 5f12b9f..3bed023 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -157,17 +157,19 @@ const char* source_get(const struct module* module, unsigned idx) } /****************************************************************** - * SymEnumSourceFiles (DBGHELP.@) + * SymEnumSourceFilesW (DBGHELP.@) * */ -BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, PCSTR Mask, - PSYM_ENUMSOURCEFILES_CALLBACK cbSrcFiles, - PVOID UserContext) +BOOL WINAPI SymEnumSourceFilesW(HANDLE hProcess, ULONG64 ModBase, PCWSTR Mask, + PSYM_ENUMSOURCEFILES_CALLBACKW cbSrcFiles, + PVOID UserContext) { struct module_pair pair; - SOURCEFILE sf; + SOURCEFILEW sf; char* ptr; - + WCHAR* conversion_buffer = NULL; + DWORD conversion_buffer_len = 0; + if (!cbSrcFiles) return FALSE; pair.pcs = process_find_by_handle(hProcess); if (!pair.pcs) return FALSE; @@ -181,7 +183,7 @@ BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, PCSTR Mask, { if (Mask[0] == '!') { - pair.requested = module_find_by_nameA(pair.pcs, Mask + 1); + pair.requested = module_find_by_nameW(pair.pcs, Mask + 1); if (!module_get_debug(&pair)) return FALSE; } else @@ -193,15 +195,119 @@ BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, PCSTR Mask, if (!pair.effective->sources) return FALSE; for (ptr = pair.effective->sources; *ptr; ptr += strlen(ptr) + 1) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, ptr, -1, NULL, 0); + + if (len > conversion_buffer_len) + { + HeapFree(GetProcessHeap(), 0, conversion_buffer); + conversion_buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!conversion_buffer) return FALSE; + conversion_buffer_len = len; + } + + MultiByteToWideChar(CP_ACP, 0, ptr, -1, conversion_buffer, len); + /* FIXME: not using Mask */ sf.ModBase = ModBase; - sf.FileName = ptr; + sf.FileName = conversion_buffer; if (!cbSrcFiles(&sf, UserContext)) break; } + HeapFree(GetProcessHeap(), 0, conversion_buffer); return TRUE; } +struct enum_sources_files_context +{ + PSYM_ENUMSOURCEFILES_CALLBACK callbackA; + PVOID caller_context; + char *conversion_buffer; + DWORD conversion_buffer_len; + DWORD callback_error; +}; + +static BOOL CALLBACK enum_source_files_W_to_A(PSOURCEFILEW source_file, PVOID context) +{ + struct enum_sources_files_context *ctx = context; + SOURCEFILE source_fileA; + DWORD len; + + len = WideCharToMultiByte(CP_ACP, 0, source_file->FileName, -1, NULL, 0, NULL, NULL); + if (len > ctx->conversion_buffer_len) + { + char *ptr = ctx->conversion_buffer ? HeapReAlloc(GetProcessHeap(), 0, ctx->conversion_buffer, len) : + HeapAlloc(GetProcessHeap(), 0, len); + + if (!ptr) + { + ctx->callback_error = ERROR_OUTOFMEMORY; + return FALSE; + } + + ctx->conversion_buffer = ptr; + ctx->conversion_buffer_len = len; + } + + WideCharToMultiByte(CP_ACP, 0, source_file->FileName, -1, ctx->conversion_buffer, len, NULL, NULL); + + source_fileA.ModBase = source_file->ModBase; + source_fileA.FileName = ctx->conversion_buffer; + return ctx->callbackA(&source_fileA, ctx->caller_context); +} + +/****************************************************************** + * SymEnumSourceFiles (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, PCSTR Mask, + PSYM_ENUMSOURCEFILES_CALLBACK cbSrcFiles, + PVOID UserContext) +{ + WCHAR *maskW = NULL; + PSYM_ENUMSOURCEFILES_CALLBACKW callbackW; + PVOID context; + struct enum_sources_files_context callback_context = {cbSrcFiles, UserContext}; + BOOL ret; + + if (Mask) + { + DWORD len = MultiByteToWideChar(CP_ACP, 0, Mask, -1, NULL, 0); + + maskW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!maskW) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + MultiByteToWideChar(CP_ACP, 0, Mask, -1, maskW, len); + } + + if (cbSrcFiles) + { + callbackW = enum_source_files_W_to_A; + context = &callback_context; + } + else + { + callbackW = NULL; + context = UserContext; + } + + ret = SymEnumSourceFilesW(hProcess, ModBase, maskW, callbackW, context); + + if (callback_context.callback_error) + { + SetLastError(callback_context.callback_error); + ret = FALSE; + } + + HeapFree(GetProcessHeap(), 0, callback_context.conversion_buffer); + HeapFree(GetProcessHeap(), 0, maskW); + + return ret; +} + /****************************************************************** * SymGetSourceFileToken (DBGHELP.@) *

1 0

Andrew Nguyen : ws2_32: Avoid a crash with an optional pointer in WSAAsyncGetServByPort.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 9edafeb742d8ce0436e7e055998a94957cfacdd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9edafeb742d8ce0436e7e0559… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 1 07:14:18 2011 -0500 ws2_32: Avoid a crash with an optional pointer in WSAAsyncGetServByPort. --- dlls/ws2_32/async.c | 16 ++++++++--- dlls/ws2_32/tests/sock.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index ce28142..01d5d48 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -407,7 +407,7 @@ HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port, LPCSTR proto, LPSTR sbuf, INT buflen) { struct async_query_getservbyport *aq; - unsigned int len = strlen(proto) + 1; + unsigned int len = proto ? strlen(proto) + 1 : 0; TRACE("hwnd %p, msg %04x, port %i, proto %s\n", hWnd, uMsg, port, debugstr_a(proto)); @@ -416,9 +416,17 @@ HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port, SetLastError( WSAEWOULDBLOCK ); return 0; } - aq->serv_proto = (char *)(aq + 1); - aq->serv_port = port; - strcpy( aq->serv_proto, proto ); + + if (proto) + { + aq->serv_proto = (char *)(aq + 1); + strcpy( aq->serv_proto, proto ); + } + else + aq->serv_proto = NULL; + + aq->serv_port = port; + return run_query( hWnd, uMsg, async_getservbyport, &aq->query, sbuf, buflen ); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5db9013..f6a3e57 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4810,6 +4810,67 @@ static void test_synchronous_WSAIoctl(void) CloseHandle( previous_port ); } +#define WM_ASYNCCOMPLETE (WM_USER + 100) +static HWND create_async_message_window(void) +{ + static const char class_name[] = "ws2_32 async message window class"; + + WNDCLASSEXA wndclass; + HWND hWnd; + + wndclass.cbSize = sizeof(wndclass); + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = DefWindowProcA; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = GetModuleHandleA(NULL); + wndclass.hIcon = LoadIconA(NULL, IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, IDC_ARROW); + wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wndclass.lpszClassName = class_name; + wndclass.lpszMenuName = NULL; + + RegisterClassExA(&wndclass); + + hWnd = CreateWindow(class_name, "ws2_32 async message window", WS_OVERLAPPEDWINDOW, + 0, 0, 500, 500, NULL, NULL, GetModuleHandleA(NULL), NULL); + if (!hWnd) + { + ok(0, "failed to create window: %u\n", GetLastError()); + return NULL; + } + + return hWnd; +} + +static void test_WSAAsyncGetServByPort(void) +{ + HWND hwnd = create_async_message_window(); + HANDLE ret; + char buffer[MAXGETHOSTSTRUCT]; + + if (!hwnd) + return; + + /* FIXME: The asynchronous window messages should be tested. */ + + /* Parameters are not checked when initiating the asynchronous operation. */ + ret = WSAAsyncGetServByPort(NULL, 0, 0, NULL, NULL, 0); + ok(ret != NULL, "WSAAsyncGetServByPort returned NULL\n"); + + ret = WSAAsyncGetServByPort(hwnd, WM_ASYNCCOMPLETE, 0, NULL, NULL, 0); + ok(ret != NULL, "WSAAsyncGetServByPort returned NULL\n"); + + ret = WSAAsyncGetServByPort(hwnd, WM_ASYNCCOMPLETE, htons(80), NULL, NULL, 0); + ok(ret != NULL, "WSAAsyncGetServByPort returned NULL\n"); + + ret = WSAAsyncGetServByPort(hwnd, WM_ASYNCCOMPLETE, htons(80), NULL, buffer, MAXGETHOSTSTRUCT); + ok(ret != NULL, "WSAAsyncGetServByPort returned NULL\n"); + + DestroyWindow(hwnd); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -4870,6 +4931,8 @@ START_TEST( sock ) test_sioRoutingInterfaceQuery(); + test_WSAAsyncGetServByPort(); + /* this is a io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl();

1 0

Hans Leidekker : msi: GetUserName sets last error to ERROR_INSUFFICIENT_BUFFER if the buffer is too small .
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 926fe277185778e275b3ad17bd2b86e5413ba959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=926fe277185778e275b3ad17b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 1 14:48:01 2011 +0200 msi: GetUserName sets last error to ERROR_INSUFFICIENT_BUFFER if the buffer is too small. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c421805..1cbb221 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1005,7 +1005,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_set_property( package->db, szProductState, bufstr ); len = 0; - if (!GetUserNameW( NULL, &len ) && GetLastError() == ERROR_MORE_DATA) + if (!GetUserNameW( NULL, &len ) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { WCHAR *username; if ((username = msi_alloc( len * sizeof(WCHAR) )))

1 0

Andrew Nguyen : ws2_32: Free the asynchronous query structure if thread creation fails.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: a5e0f09b52e045c70965947f8f98fa8b84de6edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5e0f09b52e045c70965947f8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 1 07:14:08 2011 -0500 ws2_32: Free the asynchronous query structure if thread creation fails. --- dlls/ws2_32/async.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 2f79968..ce28142 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -284,6 +284,7 @@ static HANDLE run_query( HWND hWnd, UINT uMsg, LPTHREAD_START_ROUTINE func, if (!thread) { SetLastError( WSAEWOULDBLOCK ); + HeapFree( GetProcessHeap(), 0, query ); return 0; } CloseHandle( thread );

1 0

Alasdair Sinclair : comctl32/tab: Fully initialize itemData to fix x64 test failure.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: b6484ccbebb67d107934f9b6d4a142eb70ac946d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6484ccbebb67d107934f9b6d… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Wed Jun 1 03:24:30 2011 +0100 comctl32/tab: Fully initialize itemData to fix x64 test failure. --- dlls/comctl32/tab.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 0424f7f..1ad8c53 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1770,6 +1770,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect { /* this could be considered broken on 64 bit, but that's how it works - only first 4 bytes are copied */ + dis.itemData = 0; memcpy(&dis.itemData, (ULONG_PTR*)TAB_GetItem(infoPtr, iItem)->extra, 4); }

1 0

Andrew Nguyen : advapi32: Fix last error value of GetUserNameA/ W and output buffer handling in GetUserNameA.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: c0b7345e386ac1ccc1e99577cc85093f05c55631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b7345e386ac1ccc1e99577c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 1 07:13:57 2011 -0500 advapi32: Fix last error value of GetUserNameA/W and output buffer handling in GetUserNameA. --- dlls/advapi32/advapi.c | 18 +++++++----------- dlls/advapi32/tests/security.c | 10 ---------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 47286a1..e135fa5 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -55,24 +55,20 @@ GetUserNameA( LPSTR lpszName, LPDWORD lpSize ) { WCHAR *buffer; BOOL ret; - DWORD sizeW = *lpSize * 2; + DWORD sizeW = *lpSize; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeW * sizeof(WCHAR) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } + ret = GetUserNameW( buffer, &sizeW ); if (ret) - { - if (!(*lpSize = WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpszName, *lpSize, NULL, NULL ))) - { - *lpSize = WideCharToMultiByte( CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL ); - SetLastError( ERROR_MORE_DATA ); - ret = FALSE; - } - } - else *lpSize = sizeW * 2; + WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpszName, *lpSize, NULL, NULL ); + else + *lpSize = sizeW; + HeapFree( GetProcessHeap(), 0, buffer ); return ret; } @@ -91,7 +87,7 @@ GetUserNameW( LPWSTR lpszName, LPDWORD lpSize ) if (len > *lpSize) { - SetLastError(ERROR_MORE_DATA); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); *lpSize = len; return FALSE; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1d677ac..6a9a1d2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3741,7 +3741,6 @@ static void test_GetUserNameA(void) ret = GetUserNameA(NULL, &required_len); ok(ret == FALSE, "GetUserNameA returned %d\n", ret); ok(required_len != 0, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -3749,7 +3748,6 @@ static void test_GetUserNameA(void) ret = GetUserNameA(NULL, &required_len); ok(ret == FALSE, "GetUserNameA returned %d\n", ret); ok(required_len != 0 && required_len != 1, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); /* Tests crashes on Windows. */ @@ -3774,7 +3772,6 @@ static void test_GetUserNameA(void) ok(ret == FALSE, "GetUserNameA returned %d\n", ret); ok(!memcmp(buffer, filler, sizeof(filler)), "Output buffer was altered\n"); ok(required_len != 0, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -3783,7 +3780,6 @@ static void test_GetUserNameA(void) ret = GetUserNameA(buffer, &buffer_len); ok(ret == TRUE, "GetUserNameA returned %d, last error %u\n", ret, GetLastError()); ok(memcmp(buffer, filler, sizeof(filler)) != 0, "Output buffer was untouched\n"); - todo_wine ok(buffer_len == required_len || broken(buffer_len == required_len / sizeof(WCHAR)), /* XP+ */ "Outputted buffer length was %u\n", buffer_len); @@ -3795,11 +3791,9 @@ static void test_GetUserNameA(void) buffer_len--; ret = GetUserNameA(buffer, &buffer_len); ok(ret == FALSE, "GetUserNameA returned %d\n", ret); - todo_wine { ok(!memcmp(buffer, filler, sizeof(filler)), "Output buffer was untouched\n"); ok(buffer_len == required_len, "Outputted buffer length was %u\n", buffer_len); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); - } } static void test_GetUserNameW(void) @@ -3820,7 +3814,6 @@ static void test_GetUserNameW(void) ret = GetUserNameW(NULL, &required_len); ok(ret == FALSE, "GetUserNameW returned %d\n", ret); ok(required_len != 0, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -3828,7 +3821,6 @@ static void test_GetUserNameW(void) ret = GetUserNameW(NULL, &required_len); ok(ret == FALSE, "GetUserNameW returned %d\n", ret); ok(required_len != 0 && required_len != 1, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); /* Tests crash on Windows. */ @@ -3851,7 +3843,6 @@ static void test_GetUserNameW(void) ok(ret == FALSE, "GetUserNameW returned %d\n", ret); ok(!memcmp(buffer, filler, sizeof(filler)), "Output buffer was altered\n"); ok(required_len != 0, "Outputted buffer length was %u\n", required_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -3872,7 +3863,6 @@ static void test_GetUserNameW(void) broken(memcmp(buffer, filler, sizeof(filler)) != 0), /* XP+ */ "Output buffer was altered\n"); ok(buffer_len == required_len, "Outputted buffer length was %u\n", buffer_len); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); }

1 0

Huw Davies : gdi32: Fix an error in the blue channel of the 32 -> 16 bpp conversion and update the tests to catch this.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: ea361367ed87a18704e8d36646e73692f3a1c69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea361367ed87a18704e8d3664… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 09:41:43 2011 +0100 gdi32: Fix an error in the blue channel of the 32 -> 16 bpp conversion and update the tests to catch this. --- dlls/gdi32/dibdrv/primitives.c | 2 +- dlls/gdi32/tests/dib.c | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 4711a65..411cddd 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -1038,7 +1038,7 @@ static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r src_val = *src_pixel++; *dst_pixel++ = ((src_val >> 9) & 0x7c00) | ((src_val >> 6) & 0x03e0) | - ((src_val >> 3) & 0x001e); + ((src_val >> 3) & 0x001f); } dst_start += dst->stride / 2; src_start += src->stride / 4; diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index c750a46..60791ca 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -91,8 +91,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "6c530622a025d872a642e8f950867884d7b136cb", "7c07d91b8f68fb31821701b3dcb96de018bf0c66", "b2261353decda2712b83538ab434a49ce21f3172", - "ef654fedcb494dae79559f4db8b691ae2d522a3f", - "a694872f38e66a7ff471440c3e6a9310ef78328a", + "35f731c0f6356b8f30651bb3cbe0d922c49deba5", + "9b9874c1c1d92afa554137e191d34ea33acc322f", "c311dd74325e8cebfc8529a6d24a6fa4ecb7137e", "d7398de15b2837a58a62a701ca1b3384625afec4", "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", @@ -120,8 +120,8 @@ static const char *sha1_graphics_a8b8g8r8[] = "bf57a6a37fb107d29ed3d45695919887abcb7902", "3db0f8bcca3d94920aa57be6321202b8c3c08822", "1f1fc165a4dae7ba118ddccb58a279bfe3876b0a", - "66da15b6780a4ca3b3d2eb1d1dba4e30f7b74964", - "42fefefe4435570fa8038ec759140c66c76570e9", + "8e09abb108e137c99527ab4c9bd07d95b9254bbb", + "b0178632775d29bec2b16de7b9b8287115c40d0f", "ca7e859647b9498b53fdd92543ad8aea98ff46f3", "3369889a67d6c79a24ee15f7d14374f9995215e4", "473a1fd07df800c87a5d3286b642ace10c61c6af", @@ -149,8 +149,8 @@ static const char *sha1_graphics_24[] = "0fa8cf332a56bb6d7e14e85861fdd60f51d70501", "593d694cdcc8349b3bfc8257041dbcb27e61da45", "1036b91d93e31cd1d4740d0c8642e115e5a38188", - "3469776cc7d8f6fd3bce17a39eec0b4092294e49", - "1cb7f3fcf42c9ca47a0689195ced239a09d3c308", + "1898073cdb35ca4d2b21bba933ac16a0b4297317", + "5068bff794553cf5a3145ae407c9a2984357844c", "413a7989969c229dee4ab1798362f32f96cf0a10", "0bb222e540b82720d4971e4a2fc626899af03e03", "adc20832d8c43f1cf372d8392535492013cd2306", @@ -178,8 +178,8 @@ static const char *sha1_graphics_r5g5b5[] = "420e39ff3bdd04c4b6cc2c98e99cb7993c7a0de5", "1fabf0fdd046857b1974e31c1c1764fa9d1a762f", "449092689226a1172b6086ba1181d6b6d6499f26", - "5c636ffadec10fbe440b552fe6436f3dbc607dcf", - "4aac89fc18c128eddb69eea658272af53138a1cb", + "1a92a60f190d33ef06d9decb56fd3fdd33f3af03", + "e61f5978c2e28c0c6d8f5eefe0f840c975586efc", "897d16f4d6a6ddad685d23ed7828d4f676539b75", "9d21bcfdeaf1ca5d47eb823bdefc24d7a95f4f56", "6daaf945a955928c5c124c880522ca4634fb2343", @@ -207,8 +207,8 @@ static const char *sha1_graphics_r4g4b4[] = "115a6bd382410a4a1d3c1fa71d8bf02536863e38", "65c6d1228e3b6d63d42647f14217bc1658b70d9a", "25fcb75aa687aac35b8f72640889fe92413e00c5", - "dbc8d66b419880108793db91c05766c0c6efd86d", - "6092ccbab6b6e073c6ac8244d122f2cfc453aa38", + "3bddf9d53e89560b083302b146cd33791b13d941", + "a81504498c7a7bb46340ce74476a42f70f2730b1", "e61a4f2657a444d8c49f84fb944f9f847667bf2b", "32b6e0aa79b7e96cd0ab2da167f6463c011023a8", "1d283aa4d2b2114f7809fe59357d590c7c779aa7", @@ -236,8 +236,8 @@ static const char *sha1_graphics_8[] = "5ba8f99ca034666effa556748c49a0f5a015125f", "b67ba2f55659c75ac72c1112494461bb3086e1a4", "73e2859ce849f756f954718ce3c90f02e31712b6", - "196d832d283bf642d2e481e5452ca175f7902761", - "9552f48b88982633a44001227abb847dae4d06b0", + "b1dff0f5dd233b44ee568878c5d3f8ae1d80c6d9", + "1f27dc1a1316fb7a4a78fe40fcd4bdae3aaad218", "6e375e1485a1e45ac6ab10af49645d5fb2e76dff", "cfc67c325c7cdf96d90af9b3cceb8d0504cbb3b0", "7262364067e03c7fa498af1d59d228d6c63b460e", @@ -265,8 +265,8 @@ static const char *sha1_graphics_4[] = "665bbbc749a5ffeedc0d62aef0661a5ce845b017", "1f26a01730f67d40ea711a50d9d801bac15a642e", "3b53d24178cfacba53103a44dfd5d072b15a6781", - "fa0d5f2d9419d8310fe4af7a290d13c5026c77de", - "5070ecae5085209508f7450d5f21c69737a178e9", + "c52cfd57f26037723d37192722fc3a217f280c9e", + "e34da6500cf2e424d980714d92737cf6c31a7bda", "d17f4358ae529f920960ed89e535902ee13b0033", "0f44e12ecd1ea7e39433890443626d4fc35204a4", "eb38683e812fd13dca971ba8f4cfd2b6820d3524", @@ -636,6 +636,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh brush_bits[14] = 0xff; brush_bits[65] = 0xff; brush_bits[69] = 0xff; + brush_bits[72] = 0xff; dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS);

1 0

Huw Davies : gdi32/tests: Add tests for 24 bpp brushes.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: cc4c2529620a3eaf78440a8ba2e71e55ff44bb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4c2529620a3eaf78440a8ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 09:41:42 2011 +0100 gdi32/tests: Add tests for 24 bpp brushes. --- dlls/gdi32/tests/dib.c | 50 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index e1ef345..c750a46 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -93,6 +93,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "b2261353decda2712b83538ab434a49ce21f3172", "ef654fedcb494dae79559f4db8b691ae2d522a3f", "a694872f38e66a7ff471440c3e6a9310ef78328a", + "c311dd74325e8cebfc8529a6d24a6fa4ecb7137e", "d7398de15b2837a58a62a701ca1b3384625afec4", "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "5246ef357e7317b9d141a3294d300c195da76cb7", @@ -121,6 +122,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "1f1fc165a4dae7ba118ddccb58a279bfe3876b0a", "66da15b6780a4ca3b3d2eb1d1dba4e30f7b74964", "42fefefe4435570fa8038ec759140c66c76570e9", + "ca7e859647b9498b53fdd92543ad8aea98ff46f3", "3369889a67d6c79a24ee15f7d14374f9995215e4", "473a1fd07df800c87a5d3286b642ace10c61c6af", "10cd25a0ed5cd8f978d7d68236f81d949b938e84", @@ -149,6 +151,7 @@ static const char *sha1_graphics_24[] = "1036b91d93e31cd1d4740d0c8642e115e5a38188", "3469776cc7d8f6fd3bce17a39eec0b4092294e49", "1cb7f3fcf42c9ca47a0689195ced239a09d3c308", + "413a7989969c229dee4ab1798362f32f96cf0a10", "0bb222e540b82720d4971e4a2fc626899af03e03", "adc20832d8c43f1cf372d8392535492013cd2306", "45649794dcbcabda487f66f7a80fc1bec79047a1", @@ -177,6 +180,7 @@ static const char *sha1_graphics_r5g5b5[] = "449092689226a1172b6086ba1181d6b6d6499f26", "5c636ffadec10fbe440b552fe6436f3dbc607dcf", "4aac89fc18c128eddb69eea658272af53138a1cb", + "897d16f4d6a6ddad685d23ed7828d4f676539b75", "9d21bcfdeaf1ca5d47eb823bdefc24d7a95f4f56", "6daaf945a955928c5c124c880522ca4634fb2343", "12a288390d16e1efa99d4185301de48a4d433b14", @@ -205,6 +209,7 @@ static const char *sha1_graphics_r4g4b4[] = "25fcb75aa687aac35b8f72640889fe92413e00c5", "dbc8d66b419880108793db91c05766c0c6efd86d", "6092ccbab6b6e073c6ac8244d122f2cfc453aa38", + "e61a4f2657a444d8c49f84fb944f9f847667bf2b", "32b6e0aa79b7e96cd0ab2da167f6463c011023a8", "1d283aa4d2b2114f7809fe59357d590c7c779aa7", "29640e2ddd2d3016da14507c3ce9b2ce32f39bb4", @@ -233,6 +238,7 @@ static const char *sha1_graphics_8[] = "73e2859ce849f756f954718ce3c90f02e31712b6", "196d832d283bf642d2e481e5452ca175f7902761", "9552f48b88982633a44001227abb847dae4d06b0", + "6e375e1485a1e45ac6ab10af49645d5fb2e76dff", "cfc67c325c7cdf96d90af9b3cceb8d0504cbb3b0", "7262364067e03c7fa498af1d59d228d6c63b460e", "5241241a355a667ef0834049adf4218e8b3f16b8", @@ -261,6 +267,7 @@ static const char *sha1_graphics_4[] = "3b53d24178cfacba53103a44dfd5d072b15a6781", "fa0d5f2d9419d8310fe4af7a290d13c5026c77de", "5070ecae5085209508f7450d5f21c69737a178e9", + "d17f4358ae529f920960ed89e535902ee13b0033", "0f44e12ecd1ea7e39433890443626d4fc35204a4", "eb38683e812fd13dca971ba8f4cfd2b6820d3524", "73bbc83f88f1aaa6df0158b63e70bb3165163163", @@ -435,7 +442,8 @@ static const RECT rectangles[] = {200, 40, 210, 43} /* height == 3 */ }; -static const BITMAPINFOHEADER dib_brush_header_32 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 32, BI_RGB, 0, 0, 0, 0, 0}; +static const BITMAPINFOHEADER dib_brush_header_8888 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 32, BI_RGB, 0, 0, 0, 0, 0}; +static const BITMAPINFOHEADER dib_brush_header_24 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 24, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_555 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 16, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_8 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 8, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_4 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 4, BI_RGB, 0, 0, 0, 0, 0}; @@ -618,9 +626,9 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh ExtSelectClipRgn(hdc, NULL, RGN_COPY); - /* DIB pattern brush */ + /* 8888 DIB pattern brush */ - brush_bi->bmiHeader = dib_brush_header_32; + brush_bi->bmiHeader = dib_brush_header_8888; brush_bits = (BYTE*)brush_bi + sizeof(BITMAPINFOHEADER); memset(brush_bits, 0, 16 * 16 * sizeof(DWORD)); brush_bits[2] = 0xff; @@ -645,13 +653,13 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash(bmi, bits, sha1, "top-down dib brush patblt"); + compare_hash(bmi, bits, sha1, "top-down 8888 dib brush patblt"); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); DeleteObject(dib_brush); - /* Bottom-up DIB pattern brush */ + /* 8888 bottom-up DIB pattern brush */ brush_bi->bmiHeader.biHeight = -brush_bi->bmiHeader.biHeight; @@ -675,9 +683,39 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash(bmi, bits, sha1, "bottom-up dib brush patblt"); + compare_hash(bmi, bits, sha1, "bottom-up 8888 dib brush patblt"); memset(bits, 0xcc, dib_size); + /* 24 bpp dib pattern brush */ + + brush_bi->bmiHeader = dib_brush_header_24; + brush_bits = (BYTE*)brush_bi + sizeof(BITMAPINFOHEADER); + memset(brush_bits, 0, 16 * 16 * 3); + brush_bits[0] = brush_bits[3] = brush_bits[6] = brush_bits[8] = 0xff; + brush_bits[49] = brush_bits[52] = 0xff; + + dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS); + + SelectObject(hdc, dib_brush); + SetBrushOrgEx(hdc, 1, 1, NULL); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + if(!rop_uses_src(rop3[i])) + { + ret = PatBlt(hdc, 10 + i, y, 100, 20, rop3[i]); + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 25; + } + } + compare_hash(bmi, bits, sha1, "top-down 24 bpp brush patblt"); + memset(bits, 0xcc, dib_size); + + SelectObject(hdc, orig_brush); + DeleteObject(dib_brush); + /* 555 dib pattern brush */ brush_bi->bmiHeader = dib_brush_header_555;

1 0

Andrew Nguyen : ddraw: Handle a callback cancellation attempt in d3d7_EnumDevices.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: a90b698e0cbcdf4f2b0d67e2a35788b66e1baf58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90b698e0cbcdf4f2b0d67e2a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 1 07:13:03 2011 -0500 ddraw: Handle a callback cancellation attempt in d3d7_EnumDevices. --- dlls/ddraw/ddraw.c | 10 +++++++++- dlls/ddraw/tests/d3d.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 65e70dd..8fb2ce0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4271,8 +4271,16 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA for (i = 0; i < sizeof(device_list7)/sizeof(device_list7[0]); i++) { + HRESULT ret; + device_desc7.deviceGUID = *device_list7[i].device_guid; - callback(device_list7[i].interface_name, device_list7[i].device_name, &device_desc7, context); + ret = callback(device_list7[i].interface_name, device_list7[i].device_name, &device_desc7, context); + if (ret != DDENUMRET_OK) + { + TRACE("Application cancelled the enumeration.\n"); + LeaveCriticalSection(&ddraw_cs); + return D3D_OK; + } } TRACE("End of enumeration.\n"); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d6b8fb8..f975612 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -54,6 +54,11 @@ typedef struct { int unk; } D3D7ETest; +typedef struct { + HRESULT desired_ret; + int total; +} D3D7ECancelTest; + #define MAX_ENUMERATION_COUNT 10 typedef struct { @@ -870,6 +875,15 @@ static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR De return DDENUMRET_OK; } +static HRESULT WINAPI enumDevicesCancelTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +{ + D3D7ECancelTest *d3d7et = Context; + + d3d7et->total++; + + return d3d7et->desired_ret; +} + static HRESULT WINAPI enumDevicesLifetimeTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) { D3D7ELifetimeTest *ctx = Context; @@ -895,12 +909,14 @@ static void D3D7EnumTest(void) { HRESULT hr; D3D7ETest d3d7et; + D3D7ECancelTest d3d7_cancel_test; hr = IDirect3D7_EnumDevices(lpD3D, NULL, NULL); ok(hr == DDERR_INVALIDPARAMS, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); memset(&d3d7et, 0, sizeof(d3d7et)); - IDirect3D7_EnumDevices(lpD3D, enumDevicesCallbackTest7, &d3d7et); + hr = IDirect3D7_EnumDevices(lpD3D, enumDevicesCallbackTest7, &d3d7et); + ok(hr == D3D_OK, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); /* A couple of games (Delta Force LW and TFD) rely on this behaviour */ ok(d3d7et.tnlhal < d3d7et.total, "TnLHal device enumerated as only device.\n"); @@ -910,6 +926,23 @@ static void D3D7EnumTest(void) if(d3d7et.tnlhal) ok(d3d7et.hal, "TnLHal device enumerated, but no Hal device found.\n"); + + d3d7_cancel_test.desired_ret = DDENUMRET_CANCEL; + d3d7_cancel_test.total = 0; + hr = IDirect3D7_EnumDevices(lpD3D, enumDevicesCancelTest7, &d3d7_cancel_test); + ok(hr == D3D_OK, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); + + ok(d3d7_cancel_test.total == 1, "Enumerated a total of %u devices\n", + d3d7_cancel_test.total); + + /* An enumeration callback can return any value besides DDENUMRET_OK to stop enumeration. */ + d3d7_cancel_test.desired_ret = E_INVALIDARG; + d3d7_cancel_test.total = 0; + hr = IDirect3D7_EnumDevices(lpD3D, enumDevicesCancelTest7, &d3d7_cancel_test); + ok(hr == D3D_OK, "IDirect3D7_EnumDevices returned 0x%08x\n", hr); + + ok(d3d7_cancel_test.total == 1, "Enumerated a total of %u devices\n", + d3d7_cancel_test.total); } static void D3D7EnumLifetimeTest(void)

1 0

Andrew Nguyen : hostname: Output a CRLF newline with the hostname string.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: c8ea11c0d8d6e0e22463715abb5a2c5843a5cb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ea11c0d8d6e0e22463715ab… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 1 07:13:21 2011 -0500 hostname: Output a CRLF newline with the hostname string. --- programs/hostname/hostname.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index 003bbba..77ff23b 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -109,7 +109,7 @@ static int hostname_message(int msg) static void display_computer_name(void) { - static const WCHAR fmtW[] = {'%','s','\n',0}; + static const WCHAR fmtW[] = {'%','s','\r','\n',0}; char nameA[256]; WCHAR nameW[256];

1 0