September 2008 - Wine-Commits

Marcus Meissner : dnsapi: Fixed incorrect buffer size to GetComputerNameExW .
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 8a4748bf01e1d4be86819f46640aa6b17526b38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4748bf01e1d4be86819f466… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 14 10:13:17 2008 +0200 dnsapi: Fixed incorrect buffer size to GetComputerNameExW. --- dlls/dnsapi/query.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 6c7e4c8..75e2e33 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -773,7 +773,7 @@ static DNS_STATUS dns_get_hostname_a( COMPUTER_NAME_FORMAT format, PSTR buffer, PDWORD len ) { char name[256]; - DWORD size = sizeof(name); + DWORD size = sizeof(name)/sizeof(name[0]); if (!GetComputerNameExA( format, name, &size )) return DNS_ERROR_NAME_DOES_NOT_EXIST; @@ -792,7 +792,7 @@ static DNS_STATUS dns_get_hostname_w( COMPUTER_NAME_FORMAT format, PWSTR buffer, PDWORD len ) { WCHAR name[256]; - DWORD size = sizeof(name); + DWORD size = sizeof(name)/sizeof(name[0]); if (!GetComputerNameExW( format, name, &size )) return DNS_ERROR_NAME_DOES_NOT_EXIST;

1 0

Michael Karcher : kernel32: Clean up PROFILE_isspaceW.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: fe09bc1a39cbcd3ef750830b3681a858eaafa91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe09bc1a39cbcd3ef750830b3… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Sep 14 16:40:07 2008 +0200 kernel32: Clean up PROFILE_isspaceW. --- dlls/kernel32/profile.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 22d4cb5..ab26533 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -272,10 +272,8 @@ static void PROFILE_Free( PROFILESECTION *section ) /* returns 1 if a character white space else 0 */ static inline int PROFILE_isspaceW(WCHAR c) { - if (isspaceW(c)) return 1; - if (c=='\r' || c==0x1a) return 1; - /* CR and ^Z (DOS EOF) are spaces too (found on CD-ROMs) */ - return 0; + /* ^Z (DOS EOF) is a space too (found on CD-ROMs) */ + return isspaceW(c) || c == 0x1a; } static inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len) @@ -415,7 +413,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) /* get rid of white space */ while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) szLineStart++; - while ((szLineEnd > szLineStart) && ((szLineEnd[-1] == '\n') || PROFILE_isspaceW(szLineEnd[-1]))) szLineEnd--; + while ((szLineEnd > szLineStart) && PROFILE_isspaceW(szLineEnd[-1])) szLineEnd--; if (szLineStart >= szLineEnd) continue;

1 0

Michael Karcher : ole32/compobj: Fix function name in comment.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 75bf84e60b8dea05760b0f0036355b3f8750e26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bf84e60b8dea05760b0f003… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Sep 14 23:22:15 2008 +0200 ole32/compobj: Fix function name in comment. --- dlls/ole32/compobj.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 69f42fc..bdf1a6d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -209,8 +209,8 @@ static void COMPOBJ_InitProcess( void ) * following class is created. The *caller* of CoMarshalInterface (i.e., the * application) is responsible for pumping the message loop in that thread. * The WM_USER messages which point to the RPCs are then dispatched to - * COM_AptWndProc by the user's code from the apartment in which the interface - * was unmarshalled. + * apartment_wndproc by the user's code from the apartment in which the + * interface was unmarshalled. */ memset(&wclass, 0, sizeof(wclass)); wclass.lpfnWndProc = apartment_wndproc;

1 0

Alexandre Julliard : include: Added definition for RPC_BAD_STUB_DATA_EXCEPTION_FILTER.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: d60c32769d1b1b3b970b82d01d2f226a7f57243d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60c32769d1b1b3b970b82d01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 11:30:29 2008 +0200 include: Added definition for RPC_BAD_STUB_DATA_EXCEPTION_FILTER. --- include/rpcndr.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 38f3c5f..15f1cb2 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -115,6 +115,12 @@ typedef unsigned char boolean; #define NdrFcLong(s) (unsigned char)(s & 0xff), (unsigned char)((s & 0x0000ff00) >> 8), \ (unsigned char)((s & 0x00ff0000) >> 16), (unsigned char)(s >> 24) +#define RPC_BAD_STUB_DATA_EXCEPTION_FILTER \ + ((RpcExceptionCode() == STATUS_ACCESS_VIOLATION) || \ + (RpcExceptionCode() == STATUS_DATATYPE_MISALIGNMENT) || \ + (RpcExceptionCode() == RPC_X_BAD_STUB_DATA) || \ + (RpcExceptionCode() == RPC_S_INVALID_BOUND)) + typedef struct { void *pad[2];

1 0

Paul Vriens : crypt32/tests: Don't crash on NT4.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 7e4ea8e57c71b52fae30f671bdcd6c0dc311879a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4ea8e57c71b52fae30f671b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 14 22:18:34 2008 +0200 crypt32/tests: Don't crash on NT4. --- dlls/crypt32/tests/store.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b982c56..450b754 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1260,11 +1260,15 @@ static void testFileNameStore(void) BOOL ret; DWORD GLE; - store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, 0, 0, 0, NULL); - GLE = GetLastError(); - ok(!store && (GLE == ERROR_PATH_NOT_FOUND || GLE == ERROR_INVALID_PARAMETER), - "Expected ERROR_PATH_NOT_FOUND or ERROR_INVALID_PARAMETER, got %08x\n", - GLE); + if (0) + { + /* Crashes on NT4 */ + store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, 0, 0, 0, NULL); + GLE = GetLastError(); + ok(!store && (GLE == ERROR_PATH_NOT_FOUND || GLE == ERROR_INVALID_PARAMETER), + "Expected ERROR_PATH_NOT_FOUND or ERROR_INVALID_PARAMETER, got %08x\n", + GLE); + } if (!GetTempFileNameW(szDot, szPrefix, 0, filename)) return;

1 0

Alexandre Julliard : user32/tests: Fix a test that fails on all Windows versions.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 6337ba3ca0a777b372872118d68c2d2ebb995dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6337ba3ca0a777b372872118d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 11:30:13 2008 +0200 user32/tests: Fix a test that fails on all Windows versions. --- dlls/user32/tests/win.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 30bc973..407becd 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4791,8 +4791,7 @@ static void test_hwnd_message(void) SetLastError(0xdeadbeef); found = FindWindowExA( GetDesktopWindow(), 0, 0, "message window" ); ok( found == 0, "found message window %p/%p\n", found, hwnd ); - todo_wine - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok( GetLastError() == 0xdeadbeef, "expected deadbeef, got %d\n", GetLastError() ); if (parent) { found = FindWindowExA( parent, 0, 0, "message window" );

1 0

Alexandre Julliard : user32/tests: Ignore some more messages.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: b2f34b3587866390e145e894aaaf977a6c7e0433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f34b3587866390e145e894a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 11:29:58 2008 +0200 user32/tests: Ignore some more messages. --- dlls/user32/tests/msg.c | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 62cc2dc..57a09ca 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3613,6 +3613,9 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam /* explicitly ignore WM_GETICON message */ if (message == WM_GETICON) return 0; + /* ignore registered messages */ + if (message >= 0xc000) return 0; + switch (message) { /* ignore */ @@ -4890,6 +4893,9 @@ static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam, /* explicitly ignore WM_GETICON message */ if (message == WM_GETICON) return 0; + /* ignore registered messages */ + if (message >= 0xc000) return 0; + msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -5031,6 +5037,9 @@ static LRESULT CALLBACK static_hook_proc(HWND hwnd, UINT message, WPARAM wParam, /* explicitly ignore WM_GETICON message */ if (message == WM_GETICON) return 0; + /* ignore registered messages */ + if (message >= 0xc000) return 0; + msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -6362,6 +6371,7 @@ static void pump_msg_loop(HWND hwnd, HACCEL hAccel) /* ignore some unwanted messages */ if (msg.message == WM_MOUSEMOVE || msg.message == WM_GETICON || + msg.message == WM_TIMER || msg.message == WM_DEVICECHANGE) continue; @@ -6588,6 +6598,9 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, /* explicitly ignore WM_GETICON message */ if (message == WM_GETICON) return 0; + /* ignore registered messages */ + if (message >= 0xc000) return 0; + switch (message) { case WM_ENABLE: @@ -6780,6 +6793,9 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam /* explicitly ignore WM_GETICON message */ if (message == WM_GETICON) return 0; + /* ignore registered messages */ + if (message >= 0xc000) return 0; + logged_lParam=lParam; if (log_all_parent_messages || message == WM_PARENTNOTIFY || message == WM_CANCELMODE || @@ -6884,6 +6900,9 @@ static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARA /* explicitly ignore WM_GETICON message */ if (message == WM_GETICON) return 0; + /* ignore registered messages */ + if (message >= 0xc000) return 0; + if (test_def_id) { DefDlgProcA(hwnd, DM_SETDEFID, 1, 0); @@ -7050,13 +7069,17 @@ LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) MSG msg2; static int i = 0; - i++; - if (PeekMessageA(&msg2, 0, 0, 0, 1)) + if (i < 256) { - TranslateMessage(&msg2); - DispatchMessage(&msg2); + i++; + if (PeekMessageA(&msg2, 0, 0, 0, 1)) + { + TranslateMessage(&msg2); + DispatchMessage(&msg2); + } + i--; } - i--; + else ok(broken(1), "infinite loop\n"); if ( i == 0) paint_loop_done = 1; return DefWindowProcA(hWnd,msg,wParam,lParam); @@ -8594,6 +8617,9 @@ static LRESULT CALLBACK edit_hook_proc(HWND hwnd, UINT message, WPARAM wParam, L /* explicitly ignore WM_GETICON message */ if (message == WM_GETICON) return 0; + /* ignore registered messages */ + if (message >= 0xc000) return 0; + msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc;

1 0

James Hawkins : comctl32: Fix the remaining broken tests in win95.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 72638e0ea4a13983fecf543739186899c936fb8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72638e0ea4a13983fecf54373… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 15 04:08:24 2008 -0500 comctl32: Fix the remaining broken tests in win95. --- dlls/comctl32/tests/status.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d7cb25c..0418c8d 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -166,6 +166,11 @@ static void test_height(void) g_wmsize_count = 0; SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE); + if (!g_wmsize_count) + { + skip("Status control not resized in win95, skipping broken tests."); + return; + } ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n"); GetClientRect(hwndStatus, &rc2); @@ -361,8 +366,11 @@ static void test_status_control(void) todo_wine { SendMessage(hWndStatus, SB_SETTIPTEXT, 0,(LPARAM) "Tooltip Text"); + lstrcpyA(charArray, "apple"); SendMessage(hWndStatus, SB_GETTIPTEXT, MAKEWPARAM (0, 20),(LPARAM) charArray); - ok(strcmp(charArray,"Tooltip Text") == 0, "Expected Tooltip Text, got %s\n", charArray); + ok(strcmp(charArray,"Tooltip Text") == 0 || + broken(!strcmp(charArray, "apple")), /* win95 */ + "Expected Tooltip Text, got %s\n", charArray); } /* Make simple */

1 0

James Hawkins : comctl32: Fix several failing tests in win95.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 3b5c2cba441a20c93c241e5b38ea961c45a0db65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5c2cba441a20c93c241e5b3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Sep 14 21:47:19 2008 -0500 comctl32: Fix several failing tests in win95. --- dlls/comctl32/tests/status.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d0c19cb..d7cb25c 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -303,18 +303,28 @@ static void test_status_control(void) /* Set background color */ r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, RGB(255,0,0)); - expect(CLR_DEFAULT,r); + ok(r == CLR_DEFAULT || + broken(r == 0), /* win95 */ + "Expected %d, got %d\n", CLR_DEFAULT, r); r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, CLR_DEFAULT); - expect(RGB(255,0,0),r); + ok(r == RGB(255,0,0) || + broken(r == 0), /* win95 */ + "Expected %d, got %d\n", RGB(255,0,0), r); /* Add an icon to the status bar */ hIcon = LoadIcon(NULL, IDI_QUESTION); r = SendMessage(hWndStatus, SB_SETICON, 1, (LPARAM) NULL); - ok(r != 0, "Expected non-zero, got %d\n", r); + ok(r != 0 || + broken(r == 0), /* win95 */ + "Expected non-zero, got %d\n", r); r = SendMessage(hWndStatus, SB_SETICON, 1, (LPARAM) hIcon); - ok(r != 0, "Expected non-zero, got %d\n", r); + ok(r != 0 || + broken(r == 0), /* win95 */ + "Expected non-zero, got %d\n", r); r = SendMessage(hWndStatus, SB_SETICON, 1, (LPARAM) NULL); - ok(r != 0, "Expected non-zero, got %d\n", r); + ok(r != 0 || + broken(r == 0), /* win95 */ + "Expected non-zero, got %d\n", r); /* Set the Unicode format */ r = SendMessage(hWndStatus, SB_SETUNICODEFORMAT, FALSE, 0); @@ -323,7 +333,9 @@ static void test_status_control(void) r = SendMessage(hWndStatus, SB_SETUNICODEFORMAT, TRUE, 0); expect(FALSE,r); r = SendMessage(hWndStatus, SB_GETUNICODEFORMAT, 0, 0); - expect(TRUE,r); + ok(r == TRUE || + broken(r == FALSE), /* win95 */ + "Expected TRUE, got %d\n", r); /* Reset number of parts */ r = SendMessage(hWndStatus, SB_SETPARTS, 2, (LPARAM)nParts);

1 0

James Hawkins : shell32: Remove calls to unicode functions that aren' t implemented in win9x.
by Alexandre Julliard Sept. 15, 2008

Sept. 15, 2008

Module: wine Branch: master Commit: 17a3949007524437c1026b98d7a5d63b2bef8bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a3949007524437c1026b98d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Sep 14 19:54:05 2008 -0500 shell32: Remove calls to unicode functions that aren't implemented in win9x. --- dlls/shell32/tests/appbar.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 8c2315f..ae06a90 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -26,7 +26,7 @@ #define MSG_APPBAR WM_APP -static const WCHAR testwindow_class[] = {'t','e','s','t','w','i','n','d','o','w',0}; +static const CHAR testwindow_class[] = "testwindow"; static HMONITOR (WINAPI *pMonitorFromWindow)(HWND, DWORD); @@ -107,16 +107,16 @@ static void do_events(void) { MSG msg; - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessageW(&msg); + DispatchMessageA(&msg); } } static void register_testwindow_class(void) { - WNDCLASSEXW cls; + WNDCLASSEXA cls; ZeroMemory(&cls, sizeof(cls)); cls.cbSize = sizeof(cls); @@ -127,7 +127,7 @@ static void register_testwindow_class(void) cls.hbrBackground = (HBRUSH) COLOR_WINDOW; cls.lpszClassName = testwindow_class; - RegisterClassExW(&cls); + RegisterClassExA(&cls); } static void test_setpos(void) @@ -143,7 +143,7 @@ static void test_setpos(void) screen_height = GetSystemMetrics(SM_CYSCREEN); /* create and register window1 */ - window1 = CreateWindowExW(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, + window1 = CreateWindowExA(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, testwindow_class, testwindow_class, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0, NULL, NULL, NULL, NULL); ok(window1 != NULL, "couldn't create window\n"); @@ -170,7 +170,7 @@ static void test_setpos(void) do_events(); /* create and register window2 */ - window2 = CreateWindowExW(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, + window2 = CreateWindowExA(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, testwindow_class, testwindow_class, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0, NULL, NULL, NULL, NULL); ok(window2 != NULL, "couldn't create window\n"); @@ -204,7 +204,7 @@ static void test_setpos(void) window2_info.allocated_rect.left, window2_info.allocated_rect.top, window2_info.allocated_rect.right, window2_info.allocated_rect.bottom); /* create and register window3 */ - window3 = CreateWindowExW(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, + window3 = CreateWindowExA(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, testwindow_class, testwindow_class, WS_POPUP|WS_VISIBLE, 0, 0, 0, 0, NULL, NULL, NULL, NULL); ok(window3 != NULL, "couldn't create window\n");

1 0