July 2008 - Wine-commits - list.winehq.org

Dan Hipschman : ntdll: Implement RtlCreateTimer for kernel32' s CreateTimerQueueTimer.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: d343f2baf76413eb690cbc44a0d56ed39915328d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d343f2baf76413eb690cbc44a… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 22 18:10:08 2008 -0700 ntdll: Implement RtlCreateTimer for kernel32's CreateTimerQueueTimer. --- dlls/kernel32/sync.c | 14 +++++++---- dlls/kernel32/tests/sync.c | 7 ----- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/threadpool.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 5 files changed, 68 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 7bce445..c739a5b 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1085,16 +1085,20 @@ BOOL WINAPI DeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) * * RETURNS * nonzero on success or zero on failure - * - * BUGS - * Unimplemented */ BOOL WINAPI CreateTimerQueueTimer( PHANDLE phNewTimer, HANDLE TimerQueue, WAITORTIMERCALLBACK Callback, PVOID Parameter, DWORD DueTime, DWORD Period, ULONG Flags ) { - FIXME("stub\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + NTSTATUS status = RtlCreateTimer(phNewTimer, TimerQueue, Callback, + Parameter, DueTime, Period, Flags); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 697f905..05f67dc 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -622,7 +622,6 @@ static void test_timer_queue(void) ret = pCreateTimerQueueTimer(&t1, q, timer_queue_cb1, &n1, 0, 0, 0); ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t1 != NULL, "CreateTimerQueueTimer\n"); /* A slow one. */ @@ -631,7 +630,6 @@ static void test_timer_queue(void) ret = pCreateTimerQueueTimer(&t2, q, timer_queue_cb1, &n2, 0, 100, 0); ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t2 != NULL, "CreateTimerQueueTimer\n"); /* A fast one. */ @@ -640,7 +638,6 @@ static void test_timer_queue(void) ret = pCreateTimerQueueTimer(&t3, q, timer_queue_cb1, &n3, 0, 10, 0); ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t3 != NULL, "CreateTimerQueueTimer\n"); /* Start really late (it won't start). */ @@ -649,7 +646,6 @@ static void test_timer_queue(void) ret = pCreateTimerQueueTimer(&t4, q, timer_queue_cb1, &n4, 10000, 10, 0); ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t4 != NULL, "CreateTimerQueueTimer\n"); /* Start soon, but delay so long it won't run again. */ @@ -658,7 +654,6 @@ static void test_timer_queue(void) ret = pCreateTimerQueueTimer(&t5, q, timer_queue_cb1, &n5, 0, 10000, 0); ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t5 != NULL, "CreateTimerQueueTimer\n"); /* Give them a chance to do some work. */ @@ -706,7 +701,6 @@ static void test_timer_queue(void) 10, 0); d2.t = t2; ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t2 != NULL, "CreateTimerQueueTimer\n"); d3.t = t3 = NULL; @@ -717,7 +711,6 @@ static void test_timer_queue(void) 10, 0); d3.t = t3; ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t3 != NULL, "CreateTimerQueueTimer\n"); Sleep(200); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0be408e..595a5f6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -488,7 +488,7 @@ @ stdcall RtlCreateSecurityDescriptor(ptr long) # @ stub RtlCreateSystemVolumeInformationFolder @ stub RtlCreateTagHeap -# @ stub RtlCreateTimer +@ stdcall RtlCreateTimer(ptr ptr ptr ptr long long long) @ stdcall RtlCreateTimerQueue(ptr) @ stdcall RtlCreateUnicodeString(ptr wstr) @ stdcall RtlCreateUnicodeStringFromAsciiz(ptr str) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index aa03959..c698cb7 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -543,6 +543,12 @@ struct timer_queue struct list timers; }; +static void queue_remove_timer(struct queue_timer *t) +{ + list_remove(&t->entry); + RtlFreeHeap(GetProcessHeap(), 0, t); +} + /*********************************************************************** * RtlCreateTimerQueue (NTDLL.@) * @@ -587,6 +593,12 @@ NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE NewTimerQueue) NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) { struct timer_queue *q = TimerQueue; + struct queue_timer *t, *temp; + + RtlEnterCriticalSection(&q->cs); + LIST_FOR_EACH_ENTRY_SAFE(t, temp, &q->timers, struct queue_timer, entry) + queue_remove_timer(t); + RtlLeaveCriticalSection(&q->cs); RtlDeleteCriticalSection(&q->cs); RtlFreeHeap(GetProcessHeap(), 0, q); @@ -600,3 +612,48 @@ NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) return STATUS_PENDING; } } + +/*********************************************************************** + * RtlCreateTimer (NTDLL.@) + * + * Creates a new timer associated with the given queue. + * + * PARAMS + * NewTimer [O] The newly created timer. + * TimerQueue [I] The queue to hold the timer. + * Callback [I] The callback to fire. + * Parameter [I] The argument for the callback. + * DueTime [I] The delay, in milliseconds, before first firing the + * timer. + * Period [I] The period, in milliseconds, at which to fire the timer + * after the first callback. If zero, the timer will only + * fire once. It still needs to be deleted with + * RtlDeleteTimer. + * Flags [I] Flags controling the execution of the callback. In + * addition to the WT_* thread pool flags (see + * RtlQueueWorkItem), WT_EXECUTEINTIMERTHREAD and + * WT_EXECUTEONLYONCE are supported. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS WINAPI RtlCreateTimer(PHANDLE NewTimer, HANDLE TimerQueue, + RTL_WAITORTIMERCALLBACKFUNC Callback, + PVOID Parameter, DWORD DueTime, DWORD Period, + ULONG Flags) +{ + struct timer_queue *q = TimerQueue; + struct queue_timer *t = RtlAllocateHeap(GetProcessHeap(), 0, sizeof *t); + if (!t) + return STATUS_NO_MEMORY; + + FIXME("timer expiration unimplemented\n"); + + RtlEnterCriticalSection(&q->cs); + list_add_tail(&q->timers, &t->entry); + RtlLeaveCriticalSection(&q->cs); + + *NewTimer = t; + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index 7b8e055..30bd0e5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2118,6 +2118,7 @@ NTSYSAPI HANDLE WINAPI RtlCreateHeap(ULONG,PVOID,SIZE_T,SIZE_T,PVOID,PRTL_HEA NTSYSAPI NTSTATUS WINAPI RtlCreateProcessParameters(RTL_USER_PROCESS_PARAMETERS**,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,PWSTR,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI RtlCreateSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE); +NTSYSAPI NTSTATUS WINAPI RtlCreateTimer(PHANDLE, HANDLE, RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,const SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*);

1 0

H. Verbeet : server: Calling ResumeThread() on a terminated thread is valid .
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: ff870e01322298c8b2f646531f0f8875fd8e4ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff870e01322298c8b2f646531… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 22 23:54:39 2008 +0200 server: Calling ResumeThread() on a terminated thread is valid. --- dlls/kernel32/tests/thread.c | 8 ++++++++ server/thread.c | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index d1ac617..5c3d99e 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -450,6 +450,7 @@ static VOID test_CreateThread_suspended(void) { HANDLE thread; DWORD threadId; + DWORD suspend_count; int error; thread = CreateThread(NULL,0,threadFunc2,NULL, @@ -471,6 +472,13 @@ static VOID test_CreateThread_suspended(void) if(error!=WAIT_OBJECT_0) { TerminateThread(thread,1); } + + suspend_count = SuspendThread(thread); + ok(suspend_count == -1, "SuspendThread returned %d, expected -1\n", suspend_count); + + suspend_count = ResumeThread(thread); + ok(suspend_count == 0, "ResumeThread returned %d, expected 0\n", suspend_count); + ok(CloseHandle(thread)!=0,"CloseHandle failed\n"); } diff --git a/server/thread.c b/server/thread.c index 4929b4a..0c496db 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1160,8 +1160,7 @@ DECL_HANDLER(resume_thread) if ((thread = get_thread_from_handle( req->handle, THREAD_SUSPEND_RESUME ))) { - if (thread->state == TERMINATED) set_error( STATUS_ACCESS_DENIED ); - else reply->count = resume_thread( thread ); + reply->count = resume_thread( thread ); release_object( thread ); } }

1 0

Mikołaj Zalewski : comctl32: statusbar: Optimize STATUSBAR_RefreshPart.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 9a70306c5356fa90a2688735ebf8cd4729f6d2ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a70306c5356fa90a2688735e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jul 22 21:30:54 2008 +0200 comctl32: statusbar: Optimize STATUSBAR_RefreshPart. --- dlls/comctl32/status.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index b0fcc35..c1214bb 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -252,15 +252,15 @@ static void STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { HBRUSH hbrBk; - HFONT hOldFont; HTHEME theme; TRACE("item %d\n", itemID); - if (!IsWindowVisible (infoPtr->Self)) - return; if (part->bound.right < part->bound.left) return; + if (!RectVisible(hdc, &part->bound)) + return; + if ((theme = GetWindowTheme (infoPtr->Self))) { RECT cr; @@ -278,18 +278,7 @@ STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPA DeleteObject (hbrBk); } - hOldFont = SelectObject (hdc, infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont); - - STATUSBAR_DrawPart (infoPtr, hdc, part, itemID); - - SelectObject (hdc, hOldFont); - - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { - RECT rect; - - GetClientRect (infoPtr->Self, &rect); - STATUSBAR_DrawSizeGrip (theme, hdc, &rect); - } + STATUSBAR_DrawPart (infoPtr, hdc, part, itemID); }

1 0

Reece Dunn : shell32: Don' t crash if the shlexec tests fail to create an extension in the registry.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 787361d3616066561c8845af64a1fadd64187834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=787361d3616066561c8845af6… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Jul 22 09:37:06 2008 +0100 shell32: Don't crash if the shlexec tests fail to create an extension in the registry. --- dlls/shell32/tests/shlexec.c | 46 ++++++++++++++++++++++++++++++++--------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index a60c4ad..644d611 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -201,7 +201,7 @@ static int shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, * ***/ -static void create_test_association(const char* extension) +static BOOL create_test_association(const char* extension) { HKEY hkey, hkey_shell; char class[MAX_PATH]; @@ -210,19 +210,25 @@ static void create_test_association(const char* extension) sprintf(class, "shlexec%s", extension); rc=RegCreateKeyEx(HKEY_CLASSES_ROOT, extension, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, NULL); - assert(rc==ERROR_SUCCESS); + if (rc != ERROR_SUCCESS) + return FALSE; + rc=RegSetValueEx(hkey, NULL, 0, REG_SZ, (LPBYTE) class, strlen(class)+1); - assert(rc==ERROR_SUCCESS); + ok(rc==ERROR_SUCCESS, "RegSetValueEx '%s' failed, expected ERROR_SUCCESS, got %d\n", class, rc); CloseHandle(hkey); rc=RegCreateKeyEx(HKEY_CLASSES_ROOT, class, 0, NULL, 0, KEY_CREATE_SUB_KEY | KEY_ENUMERATE_SUB_KEYS, NULL, &hkey, NULL); - assert(rc==ERROR_SUCCESS); + ok(rc==ERROR_SUCCESS, "RegCreateKeyEx '%s' failed, expected ERROR_SUCCESS, got %d\n", class, rc); + rc=RegCreateKeyEx(hkey, "shell", 0, NULL, 0, KEY_CREATE_SUB_KEY, NULL, &hkey_shell, NULL); - assert(rc==ERROR_SUCCESS); + ok(rc==ERROR_SUCCESS, "RegCreateKeyEx 'shell' failed, expected ERROR_SUCCESS, got %d\n", rc); + CloseHandle(hkey); CloseHandle(hkey_shell); + + return TRUE; } /* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -831,7 +837,11 @@ static void test_find_executable(void) const filename_tests_t* test; int rc; - create_test_association(".sfe"); + if (!create_test_association(".sfe")) + { + skip("Unable to create association for '.sfe'\n"); + return; + } create_test_verb(".sfe", "Open", 1, "%1"); /* Don't test FindExecutable(..., NULL), it always crashes */ @@ -859,7 +869,11 @@ static void test_find_executable(void) delete_test_association(".sfe"); - create_test_association(".shl"); + if (!create_test_association(".shl")) + { + skip("Unable to create association for '.shl'\n"); + return; + } create_test_verb(".shl", "Open", 0, "Open"); sprintf(filename, "%s\\test file.shl", tmpdir); @@ -1234,7 +1248,11 @@ static void test_dde(void) test = dde_tests; while (test->command) { - create_test_association(".sde"); + if (!create_test_association(".sde")) + { + skip("Unable to create association for '.sfe'\n"); + return; + } create_test_verb_dde(".sde", "Open", 0, test->command, test->ddeexec, test->application, test->topic, test->ifexec); hszApplication = DdeCreateStringHandleA(ddeInst, test->application ? @@ -1384,7 +1402,11 @@ static void test_dde_default_app(void) test = dde_default_app_tests; while (test->command) { - create_test_association(".sde"); + if (!create_test_association(".sde")) + { + skip("Unable to create association for '.sde'\n"); + return; + } sprintf(params, test->command, tmpdir); create_test_verb_dde(".sde", "Open", 1, params, "[test]", NULL, "shlexec", NULL); @@ -1544,7 +1566,11 @@ static void init_test(void) create_lnk(lnkfile, &desc, 0); /* Create a basic association suitable for most tests */ - create_test_association(".shlexec"); + if (!create_test_association(".shlexec")) + { + skip("Unable to create association for '.shlexec'\n"); + return; + } create_test_verb(".shlexec", "Open", 0, "Open \"%1\""); create_test_verb(".shlexec", "NoQuotes", 0, "NoQuotes %1"); create_test_verb(".shlexec", "LowerL", 0, "LowerL %l");

1 0

Gerald Pfeifer : wordpad: Remove unused parameter for preview_command().
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 412cd04cfc0e22d5a9a41c9672d0e3f19f3f469d URL: http://source.winehq.org/git/wine.git/?a=commit;h=412cd04cfc0e22d5a9a41c967… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jul 22 12:04:08 2008 +0200 wordpad: Remove unused parameter for preview_command(). --- programs/wordpad/print.c | 2 +- programs/wordpad/wordpad.c | 2 +- programs/wordpad/wordpad.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index c0cd182..933c8b8 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -814,7 +814,7 @@ void update_preview(HWND hWnd) InvalidateRect(hWnd, &rc, TRUE); } -LRESULT preview_command(HWND hWnd, WPARAM wParam, LPARAM lParam) +LRESULT preview_command(HWND hWnd, WPARAM wParam) { switch(LOWORD(wParam)) { diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index be6bb8b..d98758a 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2467,7 +2467,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_COMMAND: if(preview_isactive()) { - return preview_command( hWnd, wParam, lParam ); + return preview_command( hWnd, wParam ); } return OnCommand( hWnd, wParam, lParam ); diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 96b2a25..9f093b3 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -204,7 +204,7 @@ void dialog_printsetup(HWND); void dialog_print(HWND, LPWSTR); void target_device(HWND, DWORD); void print_quick(LPWSTR); -LRESULT preview_command(HWND, WPARAM, LPARAM); +LRESULT preview_command(HWND, WPARAM); void init_preview(HWND, LPWSTR); void close_preview(HWND); BOOL preview_isactive(void);

1 0

Mikołaj Zalewski : comctl32: toolbar: TB_SETBITMAPSIZE should not change a coordinate when passed -1 ( with testcase).
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: a289bab122fd001688505012e0126137c91db4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a289bab122fd001688505012e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jul 22 14:29:27 2008 +0200 comctl32: toolbar: TB_SETBITMAPSIZE should not change a coordinate when passed -1 (with testcase). --- dlls/comctl32/tests/toolbar.c | 19 +++++++++++++++++++ dlls/comctl32/toolbar.c | 34 +++++++++++++++++++++++----------- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 2693025..4b6d3c3 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -203,6 +203,13 @@ static void rebuild_toolbar_with_buttons(HWND *hToolbar) ok(SendMessage(*hToolbar, TB_AUTOSIZE, 0, 0) == 0, "TB_AUTOSIZE failed\n"); } +static void add_128x15_bitmap(HWND hToolbar, int nCmds) +{ + TBADDBITMAP bmp128; + bmp128.hInst = GetModuleHandle(NULL); + bmp128.nID = IDB_BITMAP_128x15; + ok(SendMessageA(hToolbar, TB_ADDBITMAP, nCmds, (LPARAM)&bmp128) == 0, "TB_ADDBITMAP - unexpected return\n"); +} #define CHECK_IMAGELIST(count, dx, dy) { \ int cx, cy; \ @@ -854,6 +861,18 @@ static void test_sizes(void) ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(23, 22), "Unexpected button size\n"); SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(16, 15)); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(23, 21), "Unexpected button size\n"); + /* -1 in TB_SETBITMAPSIZE is a special code meaning that the coordinate shouldn't be changed */ + add_128x15_bitmap(hToolbar, 16); + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(14, -1)), "TB_SETBITMAPSIZE failed\n"); + compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(21, 21), "%x"); + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(-1, 12)), "TB_SETBITMAPSIZE failed\n"); + compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(21, 18), "%x"); + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(-1, -1)), "TB_SETBITMAPSIZE failed\n"); + compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(21, 18), "%x"); + /* check the imagelist */ + InvalidateRect(hToolbar, NULL, TRUE); + UpdateWindow(hToolbar); + CHECK_IMAGELIST(16, 14, 12); rebuild_toolbar(&hToolbar); SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"A\0MMMMMMMMMMMMM\0"); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 15e65b3..0beb2c6 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4374,26 +4374,38 @@ TOOLBAR_SetBitmapSize (HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); HIMAGELIST himlDef = GETDEFIMAGELIST(infoPtr, 0); + short width = (short)LOWORD(lParam); + short height = (short)HIWORD(lParam); TRACE("hwnd=%p, wParam=%ld, lParam=%ld\n", hwnd, wParam, lParam); if (wParam != 0) FIXME("wParam is %ld. Perhaps image list index?\n", wParam); - if (LOWORD(lParam) == 0) - lParam = MAKELPARAM(1, HIWORD(lParam)); - - if (HIWORD(lParam)==0) - lParam = MAKELPARAM(LOWORD(lParam), 1); + /* 0 width or height is changed to 1 */ + if (width == 0) + width = 1; + if (height == 0) + height = 1; if (infoPtr->nNumButtons > 0) - WARN("%d buttons, undoc increase to bitmap size : %d-%d -> %d-%d\n", - infoPtr->nNumButtons, - infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, - LOWORD(lParam), HIWORD(lParam)); + TRACE("%d buttons, undoc change to bitmap size : %d-%d -> %d-%d\n", + infoPtr->nNumButtons, + infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, width, height); + + if (width < -1 || height < -1) + { + /* Windows destroys the imagelist and seems to actually use negative + * values to compute button sizes */ + FIXME("Negative bitmap sizes not supported (%d, %d)\n", width, height); + return FALSE; + } - infoPtr->nBitmapWidth = (INT)LOWORD(lParam); - infoPtr->nBitmapHeight = (INT)HIWORD(lParam); + /* width or height of -1 means no change */ + if (width != -1) + infoPtr->nBitmapWidth = width; + if (height != -1) + infoPtr->nBitmapHeight = height; if ((himlDef == infoPtr->himlInt) && (ImageList_GetImageCount(infoPtr->himlInt) == 0))

1 0

Mikołaj Zalewski : comctl32: statusbar: Test and fix SB_SETMINHEIGHT.
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 72d4318c8c368924a21145f7ff6d16b8b374b851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d4318c8c368924a21145f7f… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jul 22 21:29:19 2008 +0200 comctl32: statusbar: Test and fix SB_SETMINHEIGHT. The minimal height should be saved so that it survives WM_SIZE or WM_SETFONT. --- dlls/comctl32/status.c | 43 ++++++----------------------------------- dlls/comctl32/tests/status.c | 29 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index f96d2b9..b0fcc35 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -72,6 +72,7 @@ typedef struct HWND Notify; WORD numParts; UINT height; + UINT minHeight; /* at least MIN_PANE_HEIGHT, can be increased by SB_SETMINHEIGHT */ BOOL simple; HWND hwndToolTip; HFONT hFont; @@ -119,7 +120,7 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) COMCTL32_GetFontMetrics(infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont, &tm); margin = (tm.tmInternalLeading ? tm.tmInternalLeading : 2); - height = max(tm.tmHeight + margin + 2*GetSystemMetrics(SM_CYBORDER), MIN_PANE_HEIGHT) + infoPtr->verticalBorder; + height = max(tm.tmHeight + margin + 2*GetSystemMetrics(SM_CYBORDER), infoPtr->minHeight) + infoPtr->verticalBorder; if ((theme = GetWindowTheme(infoPtr->Self))) { @@ -128,7 +129,7 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) HDC hdc = GetDC(infoPtr->Self); RECT r; memset (&r, 0, sizeof (r)); - r.bottom = tm.tmHeight; + r.bottom = max(infoPtr->minHeight, tm.tmHeight); if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) { height = r.bottom - r.top; @@ -659,40 +660,9 @@ STATUSBAR_SetIcon (STATUS_INFO *infoPtr, INT nPart, HICON hIcon) static BOOL STATUSBAR_SetMinHeight (STATUS_INFO *infoPtr, INT height) { - - TRACE("(height=%d)\n", height); - if (IsWindowVisible (infoPtr->Self)) { - INT width, x, y; - RECT parent_rect; - HTHEME theme; - - infoPtr->height = height + infoPtr->verticalBorder; - - if ((theme = GetWindowTheme (infoPtr->Self))) - { - /* Determine bar height from theme such that the content area is - * 'height' pixels large */ - HDC hdc = GetDC (infoPtr->Self); - RECT r; - memset (&r, 0, sizeof (r)); - r.bottom = height; - if (SUCCEEDED(GetThemeBackgroundExtent (theme, hdc, SP_PANE, 0, &r, &r))) - { - infoPtr->height = r.bottom - r.top; - } - ReleaseDC (infoPtr->Self, hdc); - } - - if (GetClientRect (infoPtr->Notify, &parent_rect)) - { - width = parent_rect.right - parent_rect.left; - x = parent_rect.left; - y = parent_rect.bottom - infoPtr->height; - MoveWindow (infoPtr->Self, x, y, width, infoPtr->height, TRUE); - STATUSBAR_SetPartBounds (infoPtr); - } - } - + infoPtr->minHeight = max(height, MIN_PANE_HEIGHT); + infoPtr->height = STATUSBAR_ComputeHeight(infoPtr); + /* like native, don't resize the control */ return TRUE; } @@ -962,6 +932,7 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) infoPtr->horizontalBorder = HORZ_BORDER; infoPtr->verticalBorder = VERT_BORDER; infoPtr->horizontalGap = HORZ_GAP; + infoPtr->minHeight = MIN_PANE_HEIGHT; STATUSBAR_NotifyFormat(infoPtr, infoPtr->Notify, NF_REQUERY); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 178d3ed..0ca7a93 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -151,7 +151,7 @@ static int CALLBACK check_height_family_enumproc(ENUMLOGFONTEX *enumlf, NEWTEXTM static void test_height(void) { LOGFONT lf; - HFONT hFont; + HFONT hFont, hFontSm; RECT rc1, rc2; HWND hwndStatus = CreateWindow(SUBCLASS_NAME, NULL, WS_CHILD|WS_VISIBLE, 0, 0, 300, 20, g_hMainWnd, NULL, NULL, NULL); @@ -175,6 +175,32 @@ static void test_height(void) GetClientRect(hwndStatus, &rc2); todo_wine expect_rect(0, 0, 672, 42, rc2); + /* minheight < fontsize - no effects*/ + SendMessage(hwndStatus, SB_SETMINHEIGHT, 12, 0); + SendMessage(hwndStatus, WM_SIZE, 0, 0); + GetClientRect(hwndStatus, &rc2); + todo_wine expect_rect(0, 0, 672, 42, rc2); + + /* minheight > fontsize - has an effect after WM_SIZE */ + SendMessage(hwndStatus, SB_SETMINHEIGHT, 60, 0); + GetClientRect(hwndStatus, &rc2); + todo_wine expect_rect(0, 0, 672, 42, rc2); + SendMessage(hwndStatus, WM_SIZE, 0, 0); + GetClientRect(hwndStatus, &rc2); + expect_rect(0, 0, 672, 62, rc2); + + /* font changed to smaller than minheight - has an effect */ + SendMessage(hwndStatus, SB_SETMINHEIGHT, 30, 0); + expect_rect(0, 0, 672, 62, rc2); + SendMessage(hwndStatus, WM_SIZE, 0, 0); + GetClientRect(hwndStatus, &rc2); + todo_wine expect_rect(0, 0, 672, 42, rc2); + hFontSm = CreateFont(9, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, "Tahoma"); + SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFontSm, TRUE); + GetClientRect(hwndStatus, &rc2); + expect_rect(0, 0, 672, 32, rc2); + /* test the height formula */ ZeroMemory(&lf, sizeof(lf)); SendMessage(hwndStatus, SB_SETMINHEIGHT, 0, 0); @@ -185,6 +211,7 @@ static void test_height(void) DestroyWindow(hwndStatus); DeleteObject(hFont); + DeleteObject(hFontSm); } static void test_status_control(void)

1 0

Alexandre Julliard : user32/tests: Make sure the bitmap info passed to CreateDIBSection contains a valid color table .
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 70a9d70ba5106942c72782f81f4dc3da78699ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a9d70ba5106942c72782f81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 22 17:56:12 2008 +0200 user32/tests: Make sure the bitmap info passed to CreateDIBSection contains a valid color table. --- dlls/user32/tests/cursoricon.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index e00c45e..6b16560 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -504,7 +504,7 @@ static void test_CreateIcon(void) static const BYTE bmp_bits[1024]; HICON hIcon; HBITMAP hbmMask, hbmColor; - BITMAPINFO bmpinfo; + BITMAPINFO *bmpinfo; ICONINFO info; HDC hdc; void *bits; @@ -585,22 +585,22 @@ static void test_CreateIcon(void) /* test creating an icon from a DIB section */ - memset( &bmpinfo, 0, sizeof(bmpinfo) ); - bmpinfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmpinfo.bmiHeader.biWidth = 32; - bmpinfo.bmiHeader.biHeight = 32; - bmpinfo.bmiHeader.biPlanes = 1; - bmpinfo.bmiHeader.biBitCount = 8; - bmpinfo.bmiHeader.biCompression = BI_RGB; - hbmColor = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); + bmpinfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(BITMAPINFO,bmiColors[256])); + bmpinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmpinfo->bmiHeader.biWidth = 32; + bmpinfo->bmiHeader.biHeight = 32; + bmpinfo->bmiHeader.biPlanes = 1; + bmpinfo->bmiHeader.biBitCount = 8; + bmpinfo->bmiHeader.biCompression = BI_RGB; + hbmColor = CreateDIBSection( hdc, bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); ok(hbmColor != NULL, "Expected a handle to the DIB\n"); if (bits) - memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); - bmpinfo.bmiHeader.biBitCount = 1; - hbmMask = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); + memset( bits, 0x55, 32 * 32 * bmpinfo->bmiHeader.biBitCount / 8 ); + bmpinfo->bmiHeader.biBitCount = 1; + hbmMask = CreateDIBSection( hdc, bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); ok(hbmMask != NULL, "Expected a handle to the DIB\n"); if (bits) - memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + memset( bits, 0x55, 32 * 32 * bmpinfo->bmiHeader.biBitCount / 8 ); info.fIcon = TRUE; info.xHotspot = 8; @@ -614,11 +614,11 @@ static void test_CreateIcon(void) DestroyIcon(hIcon); DeleteObject(hbmColor); - bmpinfo.bmiHeader.biBitCount = 16; - hbmColor = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); + bmpinfo->bmiHeader.biBitCount = 16; + hbmColor = CreateDIBSection( hdc, bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); ok(hbmColor != NULL, "Expected a handle to the DIB\n"); if (bits) - memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + memset( bits, 0x55, 32 * 32 * bmpinfo->bmiHeader.biBitCount / 8 ); info.fIcon = TRUE; info.xHotspot = 8; @@ -632,11 +632,11 @@ static void test_CreateIcon(void) DestroyIcon(hIcon); DeleteObject(hbmColor); - bmpinfo.bmiHeader.biBitCount = 32; - hbmColor = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); + bmpinfo->bmiHeader.biBitCount = 32; + hbmColor = CreateDIBSection( hdc, bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); ok(hbmColor != NULL, "Expected a handle to the DIB\n"); if (bits) - memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + memset( bits, 0x55, 32 * 32 * bmpinfo->bmiHeader.biBitCount / 8 ); info.fIcon = TRUE; info.xHotspot = 8; @@ -651,6 +651,7 @@ static void test_CreateIcon(void) DeleteObject(hbmMask); DeleteObject(hbmColor); + HeapFree( GetProcessHeap(), 0, bmpinfo ); ReleaseDC(0, hdc); }

1 0

Alexandre Julliard : inetmib1: Check for failure of the iphlpapi functions instead of blindly trusting them .
by Alexandre Julliard 23 Jul '08

23 Jul '08

Module: wine Branch: master Commit: 5530977fdbfc5225e9db58d19e76d9d73a89e5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5530977fdbfc5225e9db58d19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 22 19:48:45 2008 +0200 inetmib1: Check for failure of the iphlpapi functions instead of blindly trusting them. --- dlls/inetmib1/main.c | 45 ++++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 09b408c..e5b44ce 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -107,9 +107,12 @@ static void mib2IfNumberInit(void) if (ret == ERROR_INSUFFICIENT_BUFFER) { - ifTable = HeapAlloc(GetProcessHeap(), 0, size); - if (ifTable) - GetIfTable(ifTable, &size, FALSE); + MIB_IFTABLE *table = HeapAlloc(GetProcessHeap(), 0, size); + if (table) + { + if (!GetIfTable(table, &size, FALSE)) ifTable = table; + else HeapFree(GetProcessHeap(), 0, table ); + } } } @@ -633,9 +636,12 @@ static void mib2IpAddrInit(void) if (ret == ERROR_INSUFFICIENT_BUFFER) { - ipAddrTable = HeapAlloc(GetProcessHeap(), 0, size); - if (ipAddrTable) - GetIpAddrTable(ipAddrTable, &size, TRUE); + MIB_IPADDRTABLE *table = HeapAlloc(GetProcessHeap(), 0, size); + if (table) + { + if (!GetIpAddrTable(table, &size, TRUE)) ipAddrTable = table; + else HeapFree(GetProcessHeap(), 0, table ); + } } } @@ -721,9 +727,12 @@ static void mib2IpRouteInit(void) if (ret == ERROR_INSUFFICIENT_BUFFER) { - ipRouteTable = HeapAlloc(GetProcessHeap(), 0, size); - if (ipRouteTable) - GetIpForwardTable(ipRouteTable, &size, TRUE); + MIB_IPFORWARDTABLE *table = HeapAlloc(GetProcessHeap(), 0, size); + if (table) + { + if (!GetIpForwardTable(ipRouteTable, &size, TRUE)) ipRouteTable = table; + else HeapFree(GetProcessHeap(), 0, table ); + } } } @@ -801,9 +810,12 @@ static void mib2IpNetInit(void) if (ret == ERROR_INSUFFICIENT_BUFFER) { - ipNetTable = HeapAlloc(GetProcessHeap(), 0, size); - if (ipNetTable) - GetIpNetTable(ipNetTable, &size, FALSE); + MIB_IPNETTABLE *table = HeapAlloc(GetProcessHeap(), 0, size); + if (table) + { + if (!GetIpNetTable(ipNetTable, &size, FALSE)) ipNetTable = table; + else HeapFree(GetProcessHeap(), 0, table ); + } } } @@ -1047,9 +1059,12 @@ static void mib2UdpEntryInit(void) if (ret == ERROR_INSUFFICIENT_BUFFER) { - udpTable = HeapAlloc(GetProcessHeap(), 0, size); - if (udpTable) - GetUdpTable(udpTable, &size, TRUE); + MIB_UDPTABLE *table = HeapAlloc(GetProcessHeap(), 0, size); + if (table) + { + if (!GetUdpTable(table, &size, TRUE)) udpTable = table; + else HeapFree(GetProcessHeap(), 0, table); + } } }

1 0

Alexandre Julliard : user32: Fix MapWindowPoints behavior in the process that owns the desktop window.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 406f5b2545d553b36d370a913a8454078797b097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=406f5b2545d553b36d370a913… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 22 15:31:04 2008 +0200 user32: Fix MapWindowPoints behavior in the process that owns the desktop window. --- dlls/user32/painting.c | 2 ++ dlls/user32/winpos.c | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 436bd16..65f708e 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -623,6 +623,8 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (child) hwnd = *child; + if (hwnd == GetDesktopWindow()) return whole_rgn; + if (whole_rgn) { RECT client, update; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index acfd481..a05b5f7 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -434,8 +434,11 @@ static void WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, POINT *offset ) } if (wndPtr == WND_DESKTOP) break; if (wndPtr == WND_OTHER_PROCESS) goto other_process; - offset->x += wndPtr->rectClient.left; - offset->y += wndPtr->rectClient.top; + if (wndPtr->parent) + { + offset->x += wndPtr->rectClient.left; + offset->y += wndPtr->rectClient.top; + } hwnd = wndPtr->parent; WIN_ReleasePtr( wndPtr ); } @@ -455,8 +458,11 @@ static void WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, POINT *offset ) } if (wndPtr == WND_DESKTOP) break; if (wndPtr == WND_OTHER_PROCESS) goto other_process; - offset->x -= wndPtr->rectClient.left; - offset->y -= wndPtr->rectClient.top; + if (wndPtr->parent) + { + offset->x -= wndPtr->rectClient.left; + offset->y -= wndPtr->rectClient.top; + } hwnd = wndPtr->parent; WIN_ReleasePtr( wndPtr ); }

1 0