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

Alexandre Julliard : rpcrt4/tests: Fix the marshalling test for Win9x.
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: wine Branch: master Commit: 39d75dfba422d1a1a1e4f3dd0290b22b360af7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d75dfba422d1a1a1e4f3dd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 12:49:20 2009 +0200 rpcrt4/tests: Fix the marshalling test for Win9x. --- dlls/rpcrt4/tests/ndr_marshall.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d8ba912..2aa8146 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -211,8 +211,16 @@ static void test_pointer_marshal(const unsigned char *formattypes, ptr = NdrPointerMarshall( &StubMsg, memsrc, formattypes ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled\n", msgpfx); + if (srcsize == 8 && wiredatalen == 16 && StubMsg.Buffer - StubMsg.BufferStart == 12) + { + /* win9x doesn't align 8-byte types properly */ + wiredatalen = 12; + } + else + { + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled\n", msgpfx); + } StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0;

1 0

Alexandre Julliard : configure: Don't accept mingw32 as target name, we need an explicit CPU specification.
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: wine Branch: master Commit: ccbf959969e32c9d71d2b4c46dbfe4db1ad2ab3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccbf959969e32c9d71d2b4c46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 21:35:51 2009 +0200 configure: Don't accept mingw32 as target name, we need an explicit CPU specification. --- aclocal.m4 | 2 +- configure | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index e73b934..90e166d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -141,7 +141,7 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [AC_CHECK_PROGS([$1], m4_foreach([ac_wine_prefix], - [$host_cpu-pc-mingw32, i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, mingw32, i686-pc-mingw32, mingw], + [$host_cpu-pc-mingw32, i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, i686-pc-mingw32], [ac_wine_prefix-$2 ]), [$3],[$4])]) diff --git a/configure b/configure index 7d18ad5..b4163cd 100755 --- a/configure +++ b/configure @@ -8233,7 +8233,7 @@ fi if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" then - for ac_prog in $host_cpu-pc-mingw32-gcc i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc i686-pc-mingw32-gcc mingw-gcc + for ac_prog in $host_cpu-pc-mingw32-gcc i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc i686-pc-mingw32-gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8276,7 +8276,7 @@ fi done test -n "$CROSSCC" || CROSSCC="false" - for ac_prog in $host_cpu-pc-mingw32-dlltool i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool i686-pc-mingw32-dlltool mingw-dlltool + for ac_prog in $host_cpu-pc-mingw32-dlltool i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool i686-pc-mingw32-dlltool do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8319,7 +8319,7 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in $host_cpu-pc-mingw32-ar i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar i686-pc-mingw32-ar mingw-ar + for ac_prog in $host_cpu-pc-mingw32-ar i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar i686-pc-mingw32-ar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2

1 0

Alexandre Julliard : ntdll: Simplify the thread startup routine and make it CPU-specific.
by Alexandre Julliard June 19, 2009

June 19, 2009

Module: wine Branch: master Commit: f124c7cc38e7edf0823347afa5f8e7126143080d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f124c7cc38e7edf0823347afa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 16:38:30 2009 +0200 ntdll: Simplify the thread startup routine and make it CPU-specific. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_i386.c | 31 ++++++++++++++++ dlls/ntdll/signal_powerpc.c | 17 +++++++++ dlls/ntdll/signal_sparc.c | 17 +++++++++ dlls/ntdll/signal_x86_64.c | 18 +++++++++ dlls/ntdll/thread.c | 82 +++--------------------------------------- 6 files changed, 90 insertions(+), 76 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3e54250..6129962 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -48,6 +48,7 @@ extern void set_cpu_context( const CONTEXT *context ); extern void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ); extern NTSTATUS context_to_server( context_t *to, const CONTEXT *from ); extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ); +extern void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) DECLSPEC_NORETURN; /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index dc1f12c..0efce89 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2264,6 +2264,37 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) +/* wrapper for apps that don't declare the thread function correctly */ +extern void DECLSPEC_NORETURN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC(call_thread_func, + "pushl %ebp\n\t" + "movl %esp,%ebp\n\t" + "subl $4,%esp\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leal -4(%ebp),%esp\n\t" + "pushl %eax\n\t" + "call " __ASM_NAME("RtlExitUserThread") "\n\t" + "int $3" ) + +/*********************************************************************** + * call_thread_entry_point + */ +void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + call_thread_func( entry, arg ); + } + __EXCEPT(unhandled_exception_filter) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + abort(); /* should not be reached */ +} + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 40b8061..4401006 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1086,6 +1086,23 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) if (status) raise_status( status, rec ); } +/*********************************************************************** + * call_thread_entry_point + */ +void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + RtlExitUserThread( entry( arg )); + } + __EXCEPT(unhandled_exception_filter) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + abort(); /* should not be reached */ +} + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index a024d2e..17bfc54 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -828,6 +828,23 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) if (status) raise_status( status, rec ); } +/*********************************************************************** + * call_thread_entry_point + */ +void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + RtlExitUserThread( entry( arg )); + } + __EXCEPT(unhandled_exception_filter) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + abort(); /* should not be reached */ +} + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 83b84dc..7ff38af 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2551,6 +2551,24 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 1 ) +/*********************************************************************** + * call_thread_entry_point + */ +void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +{ + __TRY + { + RtlExitUserThread( entry( arg )); + } + __EXCEPT(unhandled_exception_filter) + { + NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); + } + __ENDTRY + abort(); /* should not be reached */ +} + + /********************************************************************** * __wine_enter_vm86 (NTDLL.@) */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1a5017e..cd54b31 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -388,66 +388,6 @@ static void DECLSPEC_NORETURN exit_thread( int status ) } -#ifdef __i386__ -/* wrapper for apps that don't declare the thread function correctly */ -extern DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ); -__ASM_GLOBAL_FUNC(call_thread_entry_point, - "pushl %ebp\n\t" - "movl %esp,%ebp\n\t" - "subl $4,%esp\n\t" - "pushl 12(%ebp)\n\t" - "movl 8(%ebp),%eax\n\t" - "call *%eax\n\t" - "leave\n\t" - "ret" ) -#else -static inline DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ) -{ - LPTHREAD_START_ROUTINE func = (LPTHREAD_START_ROUTINE)entry; - return func( arg ); -} -#endif - -/*********************************************************************** - * call_thread_func - * - * Hack to make things compatible with the thread procedures used by kernel32.CreateThread. - */ -static void DECLSPEC_NORETURN call_thread_func( PRTL_THREAD_START_ROUTINE rtl_func, void *arg ) -{ - DWORD exit_code; - BOOL last; - - MODULE_DllThreadAttach( NULL ); - - if (TRACE_ON(relay)) - DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), rtl_func, arg ); - - exit_code = call_thread_entry_point( rtl_func, arg ); - - /* send the exit code to the server */ - SERVER_START_REQ( terminate_thread ) - { - req->handle = wine_server_obj_handle( GetCurrentThread() ); - req->exit_code = exit_code; - wine_server_call( req ); - last = reply->last; - } - SERVER_END_REQ; - - if (last) - { - LdrShutdownProcess(); - exit( exit_code ); - } - else - { - LdrShutdownThread(); - exit_thread( exit_code ); - } -} - - /*********************************************************************** * start_thread * @@ -474,22 +414,12 @@ static void start_thread( struct startup_info *info ) InsertHeadList( &tls_links, &teb->TlsLinks ); RtlReleasePebLock(); - /* NOTE: Windows does not have an exception handler around the call to - * the thread attach. We do for ease of debugging */ - if (unhandled_exception_filter) - { - __TRY - { - call_thread_func( func, arg ); - } - __EXCEPT(unhandled_exception_filter) - { - NtTerminateThread( GetCurrentThread(), GetExceptionCode() ); - } - __ENDTRY - } - else - call_thread_func( func, arg ); + MODULE_DllThreadAttach( NULL ); + + if (TRACE_ON(relay)) + DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); + + call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); }

1 0

Paul Vriens : wldap32/tests: Skip a test on older versions of wldap32 to prevent a crash.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: d17f3fe8a500c66273ee03a146bda8ca873c012d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17f3fe8a500c66273ee03a14… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 18 13:35:00 2009 +0200 wldap32/tests: Skip a test on older versions of wldap32 to prevent a crash. --- dlls/wldap32/tests/parse.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index d4b5de2..0f22d23 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -57,8 +57,13 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ok( !ret, "ldap_search_ext_sA failed 0x%x\n", ret ); ok( res != NULL, "expected res != NULL\n" ); - ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); - ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed 0x%x\n", ret ); + if (GetProcAddress(GetModuleHandle("wldap32.dll"), "ber_init")) + { + ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed 0x%x\n", ret ); + } + else + win_skip("Test would crash on older wldap32 versions\n"); result = ~0u; ret = ldap_parse_resultA( ld, res, &result, NULL, NULL, NULL, &server_ctrls, 1 );

1 0

Dmitry Timoshkov : user32: Invalidate button on WM_KILLFOCUS, like Windows does.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 45c8e640578153eb3c6781d96e7685944022eb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c8e640578153eb3c6781d96… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 18 20:06:33 2009 +0900 user32: Invalidate button on WM_KILLFOCUS, like Windows does. --- dlls/user32/button.c | 1 + dlls/user32/tests/msg.c | 96 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 87 insertions(+), 10 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index f2097aa..926563c 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -446,6 +446,7 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, if (style & BS_NOTIFY) BUTTON_NOTIFY_PARENT(hWnd, BN_KILLFOCUS); + InvalidateRect( hWnd, NULL, FALSE ); break; case WM_SYSCOLORCHANGE: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bde52ca..580582f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1775,6 +1775,7 @@ static BOOL ignore_message( UINT message ) message == WM_GETICON || message == WM_GETOBJECT || message == WM_TIMECHANGE || + message == WM_DISPLAYCHANGE || message == WM_DEVICECHANGE); } @@ -1870,7 +1871,10 @@ static void add_message_(int line, const struct recvd_message *msg) di.u.lp = 0; di.u.item.type = dis->CtlType; di.u.item.ctl_id = dis->CtlID; - di.u.item.item_id = dis->itemID; + if (dis->CtlType == ODT_LISTBOX || + dis->CtlType == ODT_COMBOBOX || + dis->CtlType == ODT_MENU) + di.u.item.item_id = dis->itemID; di.u.item.action = dis->itemAction; di.u.item.state = dis->itemState; @@ -5088,6 +5092,8 @@ todo_wine { } /****************** button message test *************************/ +#define ID_BUTTON 0x000e + static const struct message WmSetFocusButtonSeq[] = { { HCBT_SETFOCUS, hook }, @@ -5095,7 +5101,9 @@ static const struct message WmSetFocusButtonSeq[] = { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam, 0 }, - { WM_CTLCOLORBTN, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, + { WM_APP, sent|wparam|lparam, 0, 0 }, { 0 } }; static const struct message WmKillFocusButtonSeq[] = @@ -5103,9 +5111,13 @@ static const struct message WmKillFocusButtonSeq[] = { HCBT_SETFOCUS, hook }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, - { WM_CTLCOLORBTN, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_KILLFOCUS) }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_CTLCOLORBTN, sent|parent }, { 0 } }; static const struct message WmSetFocusStaticSeq[] = @@ -5115,7 +5127,10 @@ static const struct message WmSetFocusStaticSeq[] = { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam, 0 }, - { WM_CTLCOLORSTATIC, sent|defwinproc }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, + { WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */ + { WM_APP, sent|wparam|lparam, 0, 0 }, { 0 } }; static const struct message WmKillFocusStaticSeq[] = @@ -5123,9 +5138,42 @@ static const struct message WmKillFocusStaticSeq[] = { HCBT_SETFOCUS, hook }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, - { WM_CTLCOLORSTATIC, sent|defwinproc }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_KILLFOCUS) }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { 0 } +}; +static const struct message WmSetFocusOwnerdrawSeq[] = +{ + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|wparam, 0 }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x001040e4 }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message WmKillFocusOwnerdrawSeq[] = +{ + { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_KILLFOCUS, sent|wparam, 0 }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x000040e4 }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_KILLFOCUS) }, + { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x000010e4 }, { 0 } }; static const struct message WmLButtonDownSeq[] = @@ -5242,10 +5290,10 @@ static void test_button_messages(void) { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq }, { BS_OWNERDRAW, DLGC_BUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq } + WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq } }; unsigned int i; - HWND hwnd; + HWND hwnd, parent; DWORD dlg_code; HFONT zfont; @@ -5262,30 +5310,58 @@ static void test_button_messages(void) subclass_button(); + parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(parent != 0, "Failed to create parent window\n"); + for (i = 0; i < sizeof(button)/sizeof(button[0]); i++) { - hwnd = CreateWindowExA(0, "my_button_class", "test", button[i].style | WS_POPUP, - 0, 0, 50, 14, 0, 0, 0, NULL); + MSG msg; + DWORD style; + + hwnd = CreateWindowExA(0, "my_button_class", "test", button[i].style | WS_CHILD | BS_NOTIFY, + 0, 0, 50, 14, parent, (HMENU)ID_BUTTON, 0, NULL); ok(hwnd != 0, "Failed to create button window\n"); + style = GetWindowLongA(hwnd, GWL_STYLE); + style &= ~(WS_CHILD | BS_NOTIFY); + /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */ + if (button[i].style == BS_USERBUTTON) + todo_wine ok(style == BS_PUSHBUTTON, "expected style BS_PUSHBUTTON got %x\n", style); + else + ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); + dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); SetFocus(0); + flush_events(); flush_sequence(); + log_all_parent_messages++; + trace("button style %08x\n", button[i].style); + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); SetFocus(hwnd); + SendMessage(hwnd, WM_APP, 0, 0); /* place a separator mark here */ + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(button[i].setfocus, "SetFocus(hwnd) on a button", FALSE); SetFocus(0); + SendMessage(hwnd, WM_APP, 0, 0); /* place a separator mark here */ + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(button[i].killfocus, "SetFocus(0) on a button", FALSE); + log_all_parent_messages--; + + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); DestroyWindow(hwnd); } + DestroyWindow(parent); + hwnd = CreateWindowExA(0, "my_button_class", "test", BS_PUSHBUTTON | WS_POPUP | WS_VISIBLE, 0, 0, 50, 14, 0, 0, 0, NULL); ok(hwnd != 0, "Failed to create button window\n"); @@ -7169,7 +7245,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam message == WM_PARENTNOTIFY || message == WM_CANCELMODE || message == WM_SETFOCUS || message == WM_KILLFOCUS || message == WM_ENABLE || message == WM_ENTERIDLE || - message == WM_DRAWITEM || + message == WM_DRAWITEM || message == WM_COMMAND || message == WM_IME_SETCONTEXT) { switch (message)

1 0

Ken Sharp : ntoskrnl: Add FsRtlRegisterUncProvider stub.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 31e5093555a864ca7e28768186920372821d451e URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e5093555a864ca7e2876818… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 17 22:29:33 2009 +0100 ntoskrnl: Add FsRtlRegisterUncProvider stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 306f065..ab7cbbf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -935,6 +935,15 @@ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, return STATUS_NOT_IMPLEMENTED; } +/*********************************************************************** +* FsRtlRegisterUncProvider (NTOSKRNL.EXE.@) +*/ +NTSTATUS WINAPI FsRtlRegisterUncProvider(PHANDLE MupHandle, PUNICODE_STRING RedirDevName, + BOOLEAN MailslotsSupported) +{ + FIXME("(%p %p %d): stub\n", MupHandle, RedirDevName, MailslotsSupported); + return STATUS_NOT_IMPLEMENTED; +} /*********************************************************************** * KeInitializeEvent (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a857bc3..786de83 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -271,7 +271,7 @@ @ stub FsRtlPrivateLock @ stub FsRtlProcessFileLock @ stub FsRtlRegisterFileSystemFilterCallbacks -@ stub FsRtlRegisterUncProvider +@ stdcall FsRtlRegisterUncProvider(ptr ptr long) @ stub FsRtlReleaseFile @ stub FsRtlRemoveLargeMcbEntry @ stub FsRtlRemoveMcbEntry

1 0

Paul Vriens : shell32/tests: Fix some test failures on Vista and higher.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 61b89b630838e27a4621703740ba57798a3893ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b89b630838e27a462170374… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 18 11:03:19 2009 +0200 shell32/tests: Fix some test failures on Vista and higher. --- dlls/shell32/tests/shlfolder.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 255d019..f09afbc 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -81,6 +81,15 @@ static void init_function_pointers(void) ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr); } +static const char *wine_dbgstr_w(LPCWSTR str) +{ + static char buf[512]; + if (!str) + return "(null)"; + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + static void test_ParseDisplayName(void) { HRESULT hr; @@ -1120,6 +1129,10 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC 'A','t','t','r','i','b','u','t','e','s',0 }; static const WCHAR wszResolveLinkFlags[] = { 'R','e','s','o','l','v','e','L','i','n','k','F','l','a','g','s',0 }; + static const WCHAR wszTargetKnownFolder[] = { + 'T','a','r','g','e','t','K','n','o','w','n','F','o','l','d','e','r',0 }; + static const WCHAR wszCLSID[] = { + 'C','L','S','I','D',0 }; if (!lstrcmpW(pszPropName, wszTargetSpecialFolder)) { ok(V_VT(pVar) == VT_I4 || @@ -1159,7 +1172,19 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC return S_OK; } - ok(FALSE, "PropertyBag was asked for unknown property (vt=%d)!\n", V_VT(pVar)); + if (!lstrcmpW(pszPropName, wszTargetKnownFolder)) { + ok(V_VT(pVar) == VT_BSTR, "Wrong variant type for 'TargetKnownFolder' property!\n"); + /* TODO */ + return E_INVALIDARG; + } + + if (!lstrcmpW(pszPropName, wszCLSID)) { + ok(V_VT(pVar) == VT_EMPTY, "Wrong variant type for 'CLSID' property!\n"); + /* TODO */ + return E_INVALIDARG; + } + + ok(FALSE, "PropertyBag was asked for unknown property %s (vt=%d)!\n", wine_dbgstr_w(pszPropName), V_VT(pVar)); return E_INVALIDARG; } @@ -1626,15 +1651,6 @@ static void testSHGetFolderPathAndSubDirA(void) RemoveDirectoryA(testpath); } -static const char *wine_dbgstr_w(LPCWSTR str) -{ - static char buf[512]; - if (!str) - return "(null)"; - WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); - return buf; -} - static void test_LocalizedNames(void) { static char cCurrDirA[MAX_PATH];

1 0

Ken Sharp : ntoskrnl: Add IoRegisterFileSystem stub.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: d5c3b44fc216c2ba607f6549af28d48665c8f01d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c3b44fc216c2ba607f6549a… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 17 22:25:43 2009 +0100 ntoskrnl: Add IoRegisterFileSystem stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 462c4e1..ec98ea4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1058,6 +1058,13 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object, return STATUS_NOT_IMPLEMENTED; } +/*********************************************************************** + * IoRegisterFileSystem (NTOSKRNL.EXE.@) + */ +VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject) +{ + FIXME("(%p): stub\n", DeviceObject); +} /*********************************************************************** * MmAllocateNonCachedMemory (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6ceb4c3..2cfd4fe 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -427,7 +427,7 @@ @ stub IoRegisterBootDriverReinitialization @ stub IoRegisterDeviceInterface @ stdcall IoRegisterDriverReinitialization(ptr ptr ptr) -@ stub IoRegisterFileSystem +@ stdcall IoRegisterFileSystem(ptr) @ stub IoRegisterFsRegistrationChange @ stub IoRegisterLastChanceShutdownNotification @ stub IoRegisterPlugPlayNotification

1 0

Ken Sharp : ntoskrnl: Add ObfReferenceObject stub.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 49d638c78e80a952d0d709ae4a60b0281475da60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d638c78e80a952d0d709ae4… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 17 22:23:58 2009 +0100 ntoskrnl: Add ObfReferenceObject stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 59268f3..462c4e1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1114,6 +1114,13 @@ void WINAPI MmResetDriverPaging(PVOID AddrInSection) TRACE("%p\n", AddrInSection); } +/*********************************************************************** + * ObfReferenceObject (NTOSKRNL.EXE.@) + */ +VOID WINAPI ObfReferenceObject(PVOID Object) +{ + FIXME("(%p): stub\n", Object); +} /*********************************************************************** * ObReferenceObjectByHandle (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0d874bc..6ceb4c3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -49,7 +49,7 @@ @ stub KiAcquireSpinLock @ stub KiReleaseSpinLock @ stdcall -norelay ObfDereferenceObject(ptr) -@ stub ObfReferenceObject +@ stdcall ObfReferenceObject(ptr) @ stub RtlPrefetchMemoryNonTemporal @ cdecl -i386 -norelay RtlUlongByteSwap() ntdll.RtlUlongByteSwap @ cdecl -ret64 RtlUlonglongByteSwap(double) ntdll.RtlUlonglongByteSwap

1 0

Damjan Jovanovic : winemenubuilder: Log where freedesktop menu files are created, and provide an option to clean them up.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 267858b4c2484aa1905790140b0c962c12dcbb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=267858b4c2484aa1905790140… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 18 07:13:02 2009 +0200 winemenubuilder: Log where freedesktop menu files are created, and provide an option to clean them up. --- programs/winemenubuilder/winemenubuilder.c | 144 ++++++++++++++++++++++++--- 1 files changed, 128 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=267858b4c2484aa190579…

1 0