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

Alexandre Julliard : winegcc: Add support for specifying section alignment on Solaris.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: e468ab3585d3d2067350fb6596187cd5f6f5b90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e468ab3585d3d2067350fb659… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 22 13:27:07 2008 +0200 winegcc: Add support for specifying section alignment on Solaris. --- tools/winegcc/winegcc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b4a314d..113819d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -160,6 +160,7 @@ struct options const char* wine_objdir; const char* output_name; const char* image_base; + const char* section_align; strarray* prefix; strarray* lib_dirs; strarray* linker_args; @@ -640,6 +641,17 @@ static void build(struct options* opts) } #endif +#ifdef __sun + { + char *mapfile = get_temp_file( output_name, ".map" ); + const char *align = opts->section_align ? opts->section_align : "0x1000"; + + create_file( mapfile, 0644, "text = A%s;\ndata = A%s;\n", align, align ); + strarray_add(link_args, strmake("-Wl,-M,%s", mapfile)); + strarray_add(tmp_files, mapfile); + } +#endif + for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); @@ -971,6 +983,11 @@ int main(int argc, char **argv) opts.image_base = strdup( Wl->base[++j] ); continue; } + if (!strcmp(Wl->base[j], "--section-alignment") && j < Wl->size - 1) + { + opts.section_align = strdup( Wl->base[++j] ); + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); }

1 0

Alexandre Julliard : winebuild: Don't put the PE header in the . init section on Solaris.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: b24b2d584e750c56087c7e6c0cee7c98bdf97ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24b2d584e750c56087c7e6c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 22 13:26:45 2008 +0200 winebuild: Don't put the PE header in the .init section on Solaris. --- tools/winebuild/spec32.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 5038579..afcc7da 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -358,15 +358,20 @@ void BuildSpec32File( DLLSPEC *spec ) /* Reserve some space for the PE header */ - if (target_platform == PLATFORM_APPLE) + switch (target_platform) { + case PLATFORM_APPLE: output( "\t.text\n" ); output( "\t.align %d\n", get_alignment(page_size) ); output( "__wine_spec_pe_header:\n" ); output( "\t.space 65536\n" ); - } - else - { + break; + case PLATFORM_SOLARIS: + output( "\n\t.section \".text\",\"ax\"\n" ); + output( "__wine_spec_pe_header:\n" ); + output( "\t.skip %u\n", 65536 + page_size ); + break; + default: output( "\n\t.section \".init\",\"ax\"\n" ); switch(target_cpu) { @@ -383,6 +388,7 @@ void BuildSpec32File( DLLSPEC *spec ) output( "__wine_spec_pe_header:\n" ); output( "\t.skip %u\n", 65536 + page_size ); output( "1:\n" ); + break; } /* Output the NT header */

1 0

Mikołaj Zalewski : comctl32: Don' t print ERRs for reflected messages.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 60a1e20ba8e5b827a93867b3978efbf0642de4fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a1e20ba8e5b827a93867b39… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jul 22 00:18:09 2008 +0200 comctl32: Don't print ERRs for reflected messages. --- dlls/comctl32/animate.c | 2 +- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/datetime.c | 2 +- dlls/comctl32/flatsb.c | 2 +- dlls/comctl32/header.c | 2 +- dlls/comctl32/hotkey.c | 2 +- dlls/comctl32/ipaddress.c | 2 +- dlls/comctl32/listview.c | 2 +- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/nativefont.c | 2 +- dlls/comctl32/progress.c | 2 +- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/status.c | 2 +- dlls/comctl32/syslink.c | 2 +- dlls/comctl32/tab.c | 2 +- dlls/comctl32/toolbar.c | 2 +- dlls/comctl32/tooltips.c | 2 +- dlls/comctl32/trackbar.c | 2 +- dlls/comctl32/treeview.c | 2 +- dlls/comctl32/updown.c | 2 +- 22 files changed, 65 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60a1e20ba8e5b827a9386…

1 0

Alexandre Julliard : winebuild: Add Solaris as a separate platform.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: a3f42116da68d35dd3b0f5d799c565b39ede3357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f42116da68d35dd3b0f5d79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 22 13:26:30 2008 +0200 winebuild: Add Solaris as a separate platform. --- tools/winebuild/build.h | 2 +- tools/winebuild/main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 85309ad..b13b994 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -116,7 +116,7 @@ enum target_cpu enum target_platform { - PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_WINDOWS + PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS }; extern enum target_cpu target_cpu; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 82ee59d..3f2dcf2 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -65,6 +65,8 @@ enum target_cpu target_cpu = CPU_POWERPC; #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; +#elif defined(__sun) +enum target_platform target_platform = PLATFORM_SOLARIS; #elif defined(_WINDOWS) enum target_platform target_platform = PLATFORM_WINDOWS; #else @@ -124,6 +126,7 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "solaris", PLATFORM_SOLARIS }, { "windows", PLATFORM_WINDOWS }, { "winnt", PLATFORM_WINDOWS } };

1 0

Dan Hipschman : ntdll: Implement [Rtl]Create/DeleteTimerQueue[Ex].
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 20a1ca2bbfe1c79f2971e55ba18fa4dcab06426b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a1ca2bbfe1c79f2971e55ba… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jul 21 17:46:30 2008 -0700 ntdll: Implement [Rtl]Create/DeleteTimerQueue[Ex]. --- dlls/kernel32/sync.c | 25 +++++++++++---- dlls/kernel32/tests/sync.c | 12 +------ dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/threadpool.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 2 + 5 files changed, 97 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index a484392..7bce445 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1047,9 +1047,16 @@ BOOL WINAPI CancelWaitableTimer( HANDLE handle ) */ HANDLE WINAPI CreateTimerQueue(void) { - FIXME("stub\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; + HANDLE q; + NTSTATUS status = RtlCreateTimerQueue(&q); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return NULL; + } + + return q; } @@ -1058,9 +1065,15 @@ HANDLE WINAPI CreateTimerQueue(void) */ BOOL WINAPI DeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) { - FIXME("(%p, %p): stub\n", TimerQueue, CompletionEvent); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + NTSTATUS status = RtlDeleteTimerQueueEx(TimerQueue, CompletionEvent); + + 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 cb118cf..697f905 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -605,18 +605,15 @@ static void test_timer_queue(void) /* Test asynchronous deletion of the queue. */ q = pCreateTimerQueue(); - todo_wine ok(q != NULL, "CreateTimerQueue\n"); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, NULL); ok(!ret, "DeleteTimerQueueEx\n"); - todo_wine ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); /* Test synchronous deletion of the queue and running timers. */ q = pCreateTimerQueue(); - todo_wine ok(q != NULL, "CreateTimerQueue\n"); /* Called once. */ @@ -668,9 +665,9 @@ static void test_timer_queue(void) Sleep(500); ret = pDeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); + ok(ret, "DeleteTimerQueueEx\n"); todo_wine { - ok(ret, "DeleteTimerQueueEx\n"); ok(n1 == 1, "Timer callback 1\n"); ok(n2 < n3, "Timer callback 2 should be much slower than 3\n"); } @@ -687,23 +684,18 @@ static void test_timer_queue(void) } q = pCreateTimerQueue(); - todo_wine ok(q != NULL, "CreateTimerQueue\n"); SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, e); ok(!ret, "DeleteTimerQueueEx\n"); - todo_wine - { ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); ok(WaitForSingleObject(e, 250) == WAIT_OBJECT_0, "Timer destruction event not triggered\n"); - } CloseHandle(e); /* Test deleting/changing a timer in execution. */ q = pCreateTimerQueue(); - todo_wine ok(q != NULL, "CreateTimerQueue\n"); d2.t = t2 = NULL; @@ -731,9 +723,9 @@ static void test_timer_queue(void) Sleep(200); ret = pDeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); + ok(ret, "DeleteTimerQueueEx\n"); todo_wine { - ok(ret, "DeleteTimerQueueEx\n"); ok(d2.num_calls == d2.max_calls, "DeleteTimerQueueTimer\n"); ok(d3.num_calls == d3.max_calls, "ChangeTimerQueueTimer\n"); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 575f99d..0be408e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -489,7 +489,7 @@ # @ stub RtlCreateSystemVolumeInformationFolder @ stub RtlCreateTagHeap # @ stub RtlCreateTimer -# @ stub RtlCreateTimerQueue +@ stdcall RtlCreateTimerQueue(ptr) @ stdcall RtlCreateUnicodeString(ptr wstr) @ stdcall RtlCreateUnicodeStringFromAsciiz(ptr str) @ stub RtlCreateUserProcess @@ -520,7 +520,7 @@ @ stdcall RtlDeleteSecurityObject(ptr) # @ stub RtlDeleteTimer # @ stub RtlDeleteTimerQueue -# @ stub RtlDeleteTimerQueueEx +@ stdcall RtlDeleteTimerQueueEx(ptr ptr) @ stdcall RtlDeregisterWait(ptr) @ stdcall RtlDeregisterWaitEx(ptr ptr) @ stdcall RtlDestroyAtomTable(ptr) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index e054136..aa03959 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -528,3 +528,75 @@ NTSTATUS WINAPI RtlDeregisterWait(HANDLE WaitHandle) { return RtlDeregisterWaitEx(WaitHandle, NULL); } + + +/************************** Timer Queue Impl **************************/ + +struct queue_timer +{ + struct list entry; +}; + +struct timer_queue +{ + RTL_CRITICAL_SECTION cs; + struct list timers; +}; + +/*********************************************************************** + * RtlCreateTimerQueue (NTDLL.@) + * + * Creates a timer queue object and returns a handle to it. + * + * PARAMS + * NewTimerQueue [O] The newly created queue. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE NewTimerQueue) +{ + struct timer_queue *q = RtlAllocateHeap(GetProcessHeap(), 0, sizeof *q); + if (!q) + return STATUS_NO_MEMORY; + + RtlInitializeCriticalSection(&q->cs); + list_init(&q->timers); + + *NewTimerQueue = q; + return STATUS_SUCCESS; +} + +/*********************************************************************** + * RtlDeleteTimerQueueEx (NTDLL.@) + * + * Deletes a timer queue object. + * + * PARAMS + * TimerQueue [I] The timer queue to destroy. + * CompletionEvent [I] If NULL, return immediately. If INVALID_HANDLE_VALUE, + * wait until all timers are finished firing before + * returning. Otherwise, return immediately and set the + * event when all timers are done. + * + * RETURNS + * Success: STATUS_SUCCESS if synchronous, STATUS_PENDING if not. + * Failure: Any NTSTATUS code. + */ +NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) +{ + struct timer_queue *q = TimerQueue; + + RtlDeleteCriticalSection(&q->cs); + RtlFreeHeap(GetProcessHeap(), 0, q); + + if (CompletionEvent == INVALID_HANDLE_VALUE) + return STATUS_SUCCESS; + else + { + if (CompletionEvent) + NtSetEvent(CompletionEvent, NULL); + return STATUS_PENDING; + } +} diff --git a/include/winternl.h b/include/winternl.h index fe2f83d..7b8e055 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2117,6 +2117,7 @@ NTSYSAPI NTSTATUS WINAPI RtlCreateEnvironment(BOOLEAN, PWSTR*); NTSYSAPI HANDLE WINAPI RtlCreateHeap(ULONG,PVOID,SIZE_T,SIZE_T,PVOID,PRTL_HEAP_DEFINITION); 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 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*); @@ -2127,6 +2128,7 @@ NTSYSAPI NTSTATUS WINAPI RtlDeleteCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI RtlDeleteRegistryValue(ULONG, PCWSTR, PCWSTR); NTSYSAPI void WINAPI RtlDeleteResource(LPRTL_RWLOCK); NTSYSAPI NTSTATUS WINAPI RtlDeleteSecurityObject(PSECURITY_DESCRIPTOR*); +NTSYSAPI NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE, HANDLE); NTSYSAPI PRTL_USER_PROCESS_PARAMETERS WINAPI RtlDeNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*); NTSYSAPI NTSTATUS WINAPI RtlDeregisterWait(HANDLE); NTSYSAPI NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE,HANDLE);

1 0

Mikołaj Zalewski : comctl32: statusbar: Change the height expression to one that seems to be the same as in Windows .
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: f240b8f49e3e986ec7f4b5aa158137b3aa19b033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f240b8f49e3e986ec7f4b5aa1… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 17 17:33:08 2008 +0200 comctl32: statusbar: Change the height expression to one that seems to be the same as in Windows. --- dlls/comctl32/status.c | 5 +++- dlls/comctl32/tests/status.c | 58 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 1b97b41..45615eb 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -94,6 +94,7 @@ typedef struct #define HORZ_BORDER 0 #define VERT_BORDER 2 #define HORZ_GAP 2 +#define MIN_PANE_HEIGHT 18 static const WCHAR themeClass[] = { 'S','t','a','t','u','s',0 }; @@ -114,9 +115,11 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) HTHEME theme; UINT height; TEXTMETRICW tm; + int margin; COMCTL32_GetFontMetrics(infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont, &tm); - height = tm.tmHeight + 4 + infoPtr->verticalBorder; + margin = (tm.tmInternalLeading ? tm.tmInternalLeading : 2); + height = max(tm.tmHeight + margin + 2*GetSystemMetrics(SM_CYBORDER), MIN_PANE_HEIGHT) + infoPtr->verticalBorder; if ((theme = GetWindowTheme(infoPtr->Self))) { diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index b6c5b7b..178d3ed 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -106,12 +106,56 @@ static void test_create() DestroyWindow(hwnd); } -static void test_setfont() +static int CALLBACK check_height_font_enumproc(ENUMLOGFONTEX *enumlf, NEWTEXTMETRICEX *ntm, DWORD type, LPARAM lParam) { + HWND hwndStatus = (HWND)lParam; + HDC hdc = GetDC(NULL); + static const int sizes[] = {8, 9, 10, 12, 16, 22, 28, 36, 48, 72}; + int i; + + trace("Font %s\n", enumlf->elfFullName); + for (i = 0; i < sizeof(sizes)/sizeof(sizes[0]); i++) + { + HFONT hFont; + TEXTMETRIC tm; + HFONT hCtrlFont; + HFONT hOldFont; + RECT rcCtrl; + + enumlf->elfLogFont.lfHeight = sizes[i]; + hFont = CreateFontIndirect(&enumlf->elfLogFont); + hCtrlFont = (HFONT)SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE); + hOldFont = SelectObject(hdc, hFont); + + GetClientRect(hwndStatus, &rcCtrl); + GetTextMetrics(hdc, &tm); + expect(max(tm.tmHeight + (tm.tmInternalLeading ? tm.tmInternalLeading : 2) + 4, 20), rcCtrl.bottom); + + SelectObject(hdc, hOldFont); + SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hCtrlFont, TRUE); + DeleteObject(hFont); + } + ReleaseDC(NULL, hdc); + return 1; +} + +static int CALLBACK check_height_family_enumproc(ENUMLOGFONTEX *enumlf, NEWTEXTMETRICEX *ntm, DWORD type, LPARAM lParam) +{ + HDC hdc = GetDC(NULL); + enumlf->elfLogFont.lfHeight = 0; + EnumFontFamiliesEx(hdc, &enumlf->elfLogFont, (FONTENUMPROC)check_height_font_enumproc, lParam, 0); + ReleaseDC(NULL, hdc); + return 1; +} + +static void test_height(void) +{ + LOGFONT lf; HFONT hFont; RECT rc1, rc2; HWND hwndStatus = CreateWindow(SUBCLASS_NAME, NULL, WS_CHILD|WS_VISIBLE, 0, 0, 300, 20, g_hMainWnd, NULL, NULL, NULL); + HDC hdc; GetClientRect(hwndStatus, &rc1); hFont = CreateFont(32, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, @@ -122,7 +166,7 @@ static void test_setfont() ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n"); GetClientRect(hwndStatus, &rc2); - todo_wine expect_rect(0, 0, 672, 42, rc2); + todo_wine expect_rect(0, 0, 672, 42, rc2); /* GetTextMetrics returns invalid tmInternalLeading for this font */ g_wmsize_count = 0; SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE); @@ -131,6 +175,14 @@ static void test_setfont() GetClientRect(hwndStatus, &rc2); todo_wine expect_rect(0, 0, 672, 42, rc2); + /* test the height formula */ + ZeroMemory(&lf, sizeof(lf)); + SendMessage(hwndStatus, SB_SETMINHEIGHT, 0, 0); + hdc = GetDC(NULL); + trace("dpi=%d\n", GetDeviceCaps(hdc, LOGPIXELSY)); + EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC)check_height_family_enumproc, (LPARAM)hwndStatus, 0); + ReleaseDC(NULL, hdc); + DestroyWindow(hwndStatus); DeleteObject(hFont); } @@ -294,5 +346,5 @@ START_TEST(status) test_status_control(); test_create(); - test_setfont(); + test_height(); }

1 0

Dan Hipschman : kernel32: Add a stub for ChangeTimerQueueTimer.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: ecd76fb77c91c9d46913c064f72b85e196ef6ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd76fb77c91c9d46913c064f… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jul 21 17:42:03 2008 -0700 kernel32: Add a stub for ChangeTimerQueueTimer. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 19 +++++++++++++++++++ include/winbase.h | 1 + 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6a24e33..2816d5b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -179,7 +179,7 @@ @ stdcall CancelIo(long) # @ stub CancelTimerQueueTimer @ stdcall CancelWaitableTimer(long) -@ stub ChangeTimerQueueTimer +@ stdcall ChangeTimerQueueTimer(ptr ptr long long) # @ stub CheckNameLegalDOS8Dot3A # @ stub CheckNameLegalDOS8Dot3W @ stdcall CheckRemoteDebuggerPresent(long ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index da558fd..a484392 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1086,6 +1086,25 @@ BOOL WINAPI CreateTimerQueueTimer( PHANDLE phNewTimer, HANDLE TimerQueue, } /*********************************************************************** + * ChangeTimerQueueTimer (KERNEL32.@) + * + * Changes the times at which the timer expires. + * + * RETURNS + * nonzero on success or zero on failure + * + * BUGS + * Unimplemented + */ +BOOL WINAPI ChangeTimerQueueTimer( HANDLE TimerQueue, HANDLE Timer, + ULONG DueTime, ULONG Period ) +{ + FIXME("stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * DeleteTimerQueueTimer (KERNEL32.@) * * Cancels a timer-queue timer. diff --git a/include/winbase.h b/include/winbase.h index 0ee36c2..cf0345b 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1312,6 +1312,7 @@ WINBASEAPI BOOL WINAPI CallNamedPipeW(LPCWSTR,LPVOID,DWORD,LPVOID,DWORD,L #define CallNamedPipe WINELIB_NAME_AW(CallNamedPipe) WINBASEAPI BOOL WINAPI CancelIo(HANDLE); WINBASEAPI BOOL WINAPI CancelWaitableTimer(HANDLE); +WINBASEAPI BOOL WINAPI ChangeTimerQueueTimer(HANDLE,HANDLE,ULONG,ULONG); WINADVAPI BOOL WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL); WINBASEAPI BOOL WINAPI ClearCommBreak(HANDLE); WINBASEAPI BOOL WINAPI ClearCommError(HANDLE,LPDWORD,LPCOMSTAT);

1 0

Detlef Riekenberg : kernel32/tests: Run the tests again on Win9x.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: f8dea7ab2d43992e56fa1347fc77cc63d98e02b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8dea7ab2d43992e56fa1347f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 21 17:42:41 2008 -0700 kernel32/tests: Run the tests again on Win9x. --- dlls/kernel32/tests/sync.c | 44 ++++++++++++++++++++++++++++---------------- 1 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 06b1e5c..48d472a 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -27,7 +27,11 @@ #include "wine/test.h" +static HANDLE (WINAPI *pCreateTimerQueue)(void); +static BOOL (WINAPI *pCreateTimerQueueTimer)(PHANDLE, HANDLE, WAITORTIMERCALLBACK, + PVOID, DWORD, DWORD, ULONG); static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*,BOOL,LPCSTR); +static BOOL (WINAPI *pDeleteTimerQueueEx)(HANDLE, HANDLE); static HANDLE (WINAPI *pOpenWaitableTimerA)(DWORD,BOOL,LPCSTR); static void test_signalandwait(void) @@ -549,61 +553,66 @@ static void test_timer_queue(void) HANDLE e; BOOL ret; + if (!pCreateTimerQueue || !pCreateTimerQueueTimer || !pDeleteTimerQueueEx) { + skip("TimerQueue API not present\n"); + return; + } + /* Test asynchronous deletion of the queue. */ - q = CreateTimerQueue(); + q = pCreateTimerQueue(); todo_wine ok(q != NULL, "CreateTimerQueue\n"); SetLastError(0xdeadbeef); - ret = DeleteTimerQueueEx(q, NULL); + ret = pDeleteTimerQueueEx(q, NULL); ok(!ret, "DeleteTimerQueueEx\n"); todo_wine ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); /* Test synchronous deletion of the queue and running timers. */ - q = CreateTimerQueue(); + q = pCreateTimerQueue(); todo_wine ok(q != NULL, "CreateTimerQueue\n"); /* Called once. */ t1 = NULL; n1 = 0; - ret = CreateTimerQueueTimer(&t1, q, timer_queue_cb1, &n1, 0, - 0, 0); + ret = pCreateTimerQueueTimer(&t1, q, timer_queue_cb1, &n1, 0, + 0, 0); ok(ret, "CreateTimerQueueTimer\n"); /* A slow one. */ t2 = NULL; n2 = 0; - ret = CreateTimerQueueTimer(&t2, q, timer_queue_cb1, &n2, 0, - 100, 0); + ret = pCreateTimerQueueTimer(&t2, q, timer_queue_cb1, &n2, 0, + 100, 0); ok(ret, "CreateTimerQueueTimer\n"); /* A fast one. */ t3 = NULL; n3 = 0; - ret = CreateTimerQueueTimer(&t3, q, timer_queue_cb1, &n3, 0, - 10, 0); + ret = pCreateTimerQueueTimer(&t3, q, timer_queue_cb1, &n3, 0, + 10, 0); ok(ret, "CreateTimerQueueTimer\n"); /* Start really late (it won't start). */ t4 = NULL; n4 = 0; - ret = CreateTimerQueueTimer(&t4, q, timer_queue_cb1, &n4, 10000, - 10, 0); + ret = pCreateTimerQueueTimer(&t4, q, timer_queue_cb1, &n4, 10000, + 10, 0); ok(ret, "CreateTimerQueueTimer\n"); /* Start soon, but delay so long it won't run again. */ t5 = NULL; n5 = 0; - ret = CreateTimerQueueTimer(&t5, q, timer_queue_cb1, &n5, 0, - 10000, 0); + ret = pCreateTimerQueueTimer(&t5, q, timer_queue_cb1, &n5, 0, + 10000, 0); ok(ret, "CreateTimerQueueTimer\n"); /* Give them a chance to do some work. */ Sleep(500); - ret = DeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); + ret = pDeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); todo_wine { ok(ret, "DeleteTimerQueueEx\n"); @@ -622,12 +631,12 @@ static void test_timer_queue(void) return; } - q = CreateTimerQueue(); + q = pCreateTimerQueue(); todo_wine ok(q != NULL, "CreateTimerQueue\n"); SetLastError(0xdeadbeef); - ret = DeleteTimerQueueEx(q, e); + ret = pDeleteTimerQueueEx(q, e); ok(!ret, "DeleteTimerQueueEx\n"); todo_wine { @@ -641,7 +650,10 @@ static void test_timer_queue(void) START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); + pCreateTimerQueue = (void*)GetProcAddress(hdll, "CreateTimerQueue"); + pCreateTimerQueueTimer = (void*)GetProcAddress(hdll, "CreateTimerQueueTimer"); pCreateWaitableTimerA = (void*)GetProcAddress(hdll, "CreateWaitableTimerA"); + pDeleteTimerQueueEx = (void*)GetProcAddress(hdll, "DeleteTimerQueueEx"); pOpenWaitableTimerA = (void*)GetProcAddress(hdll, "OpenWaitableTimerA"); test_signalandwait();

1 0

Dan Hipschman : kernel32/tests: Add tests for Change/DeleteTimerQueueTimer.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: bf0f78b11a3e99004483a2b73bd915d587572eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0f78b11a3e99004483a2b73… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jul 21 17:43:28 2008 -0700 kernel32/tests: Add tests for Change/DeleteTimerQueueTimer. --- dlls/kernel32/tests/sync.c | 82 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 48d472a..a8a1d93 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -27,11 +27,13 @@ #include "wine/test.h" +static BOOL (WINAPI *pChangeTimerQueueTimer)(HANDLE, HANDLE, ULONG, ULONG); static HANDLE (WINAPI *pCreateTimerQueue)(void); static BOOL (WINAPI *pCreateTimerQueueTimer)(PHANDLE, HANDLE, WAITORTIMERCALLBACK, PVOID, DWORD, DWORD, ULONG); static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*,BOOL,LPCSTR); static BOOL (WINAPI *pDeleteTimerQueueEx)(HANDLE, HANDLE); +static BOOL (WINAPI *pDeleteTimerQueueTimer)(HANDLE, HANDLE, HANDLE); static HANDLE (WINAPI *pOpenWaitableTimerA)(DWORD,BOOL,LPCSTR); static void test_signalandwait(void) @@ -546,14 +548,57 @@ static void CALLBACK timer_queue_cb1(PVOID p, BOOLEAN timedOut) ++*pn; } +struct timer_queue_data1 +{ + int num_calls; + int max_calls; + HANDLE q, t; +}; + +static void CALLBACK timer_queue_cb2(PVOID p, BOOLEAN timedOut) +{ + struct timer_queue_data1 *d = p; + ok(timedOut, "Timer callbacks should always time out\n"); + if (d->t && ++d->num_calls == d->max_calls) + { + BOOL ret; + SetLastError(0xdeadbeef); + /* Note, XP SP2 does *not* do any deadlock checking, so passing + INVALID_HANDLE_VALUE here will just hang. */ + ret = pDeleteTimerQueueTimer(d->q, d->t, NULL); + todo_wine + { + ok(!ret, "DeleteTimerQueueTimer\n"); + ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueTimer\n"); + } + } +} + +static void CALLBACK timer_queue_cb3(PVOID p, BOOLEAN timedOut) +{ + struct timer_queue_data1 *d = p; + ok(timedOut, "Timer callbacks should always time out\n"); + if (d->t && ++d->num_calls == d->max_calls) + { + /* Basically kill the timer since it won't have time to run + again. */ + BOOL ret = pChangeTimerQueueTimer(d->q, d->t, 10000, 0); + todo_wine + ok(ret, "ChangeTimerQueueTimer\n"); + } +} + static void test_timer_queue(void) { HANDLE q, t1, t2, t3, t4, t5; int n1, n2, n3, n4, n5; + struct timer_queue_data1 d2, d3; HANDLE e; BOOL ret; - if (!pCreateTimerQueue || !pCreateTimerQueueTimer || !pDeleteTimerQueueEx) { + if (!pChangeTimerQueueTimer || !pCreateTimerQueue || !pCreateTimerQueueTimer + || !pDeleteTimerQueueEx || !pDeleteTimerQueueTimer) + { skip("TimerQueue API not present\n"); return; } @@ -645,15 +690,50 @@ static void test_timer_queue(void) "Timer destruction event not triggered\n"); } CloseHandle(e); + + /* Test deleting/changing a timer in execution. */ + q = pCreateTimerQueue(); + todo_wine + ok(q != NULL, "CreateTimerQueue\n"); + + d2.t = t2 = NULL; + d2.num_calls = 0; + d2.max_calls = 3; + d2.q = q; + ret = pCreateTimerQueueTimer(&t2, q, timer_queue_cb2, &d2, 10, + 10, 0); + d2.t = t2; + ok(ret, "CreateTimerQueueTimer\n"); + + d3.t = t3 = NULL; + d3.num_calls = 0; + d3.max_calls = 4; + d3.q = q; + ret = pCreateTimerQueueTimer(&t3, q, timer_queue_cb3, &d3, 10, + 10, 0); + d3.t = t3; + ok(ret, "CreateTimerQueueTimer\n"); + + Sleep(200); + + ret = pDeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); + todo_wine + { + ok(ret, "DeleteTimerQueueEx\n"); + ok(d2.num_calls == d2.max_calls, "DeleteTimerQueueTimer\n"); + ok(d3.num_calls == d3.max_calls, "ChangeTimerQueueTimer\n"); + } } START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); + pChangeTimerQueueTimer = (void*)GetProcAddress(hdll, "ChangeTimerQueueTimer"); pCreateTimerQueue = (void*)GetProcAddress(hdll, "CreateTimerQueue"); pCreateTimerQueueTimer = (void*)GetProcAddress(hdll, "CreateTimerQueueTimer"); pCreateWaitableTimerA = (void*)GetProcAddress(hdll, "CreateWaitableTimerA"); pDeleteTimerQueueEx = (void*)GetProcAddress(hdll, "DeleteTimerQueueEx"); + pDeleteTimerQueueTimer = (void*)GetProcAddress(hdll, "DeleteTimerQueueTimer"); pOpenWaitableTimerA = (void*)GetProcAddress(hdll, "OpenWaitableTimerA"); test_signalandwait();

1 0

Dan Hipschman : kernel32/tests: Check that timers are not NULL in timer queue tests.
by Alexandre Julliard 22 Jul '08

22 Jul '08

Module: wine Branch: master Commit: 09f4ca64e27103717c8455a1a3cd270d275c5062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f4ca64e27103717c8455a1a… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jul 21 17:44:05 2008 -0700 kernel32/tests: Check that timers are not NULL in timer queue tests. --- dlls/kernel32/tests/sync.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index a8a1d93..cb118cf 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -625,6 +625,8 @@ 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. */ t2 = NULL; @@ -632,6 +634,8 @@ 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. */ t3 = NULL; @@ -639,6 +643,8 @@ 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). */ t4 = NULL; @@ -646,6 +652,8 @@ 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. */ t5 = NULL; @@ -653,6 +661,8 @@ 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. */ Sleep(500); @@ -704,6 +714,8 @@ 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; d3.num_calls = 0; @@ -713,6 +725,8 @@ static void test_timer_queue(void) 10, 0); d3.t = t3; ok(ret, "CreateTimerQueueTimer\n"); + todo_wine + ok(t3 != NULL, "CreateTimerQueueTimer\n"); Sleep(200);

1 0