December 2009 - Wine-commits

Alexandre Julliard : user32/tests: Add a number of tests for WaitForInputIdle.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: d6dfcf94b09afd63a18cef2746536e4460d1c478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6dfcf94b09afd63a18cef274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:10:53 2009 +0100 user32/tests: Add a number of tests for WaitForInputIdle. With help from Dmitry Timoshkov. --- dlls/user32/tests/msg.c | 239 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 239 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bfc81dc..c67aa13 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12014,11 +12014,249 @@ static void test_PostMessage(void) flush_events(); } +static const struct +{ + DWORD exp, broken; + BOOL todo; +} wait_idle_expect[] = +{ +/* 0 */ { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, WAIT_TIMEOUT, TRUE }, + { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, +/* 5 */ { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, + { 0, 0, FALSE }, + { 0, 0, FALSE }, +/* 10 */ { 0, 0, FALSE }, + { 0, 0, FALSE }, + { 0, WAIT_FAILED, FALSE }, +}; + +static void do_wait_idle_child( int arg ) +{ + WNDCLASS cls; + MSG msg; + HWND hwnd = 0; + HANDLE start_event = OpenEventA( EVENT_ALL_ACCESS, FALSE, "test_WaitForInputIdle_start" ); + HANDLE end_event = OpenEventA( EVENT_ALL_ACCESS, FALSE, "test_WaitForInputIdle_end" ); + + memset( &cls, 0, sizeof(cls) ); + cls.lpfnWndProc = DefWindowProc; + cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + cls.hCursor = LoadCursor(0, IDC_ARROW); + cls.lpszClassName = "TestClass"; + RegisterClass( &cls ); + + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); /* create the msg queue */ + + ok( start_event != 0, "failed to create start event, error %u\n", GetLastError() ); + ok( end_event != 0, "failed to create end event, error %u\n", GetLastError() ); + + switch (arg) + { + case 0: + SetEvent( start_event ); + break; + case 1: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, 0, 0, 0, PM_REMOVE ); + break; + case 2: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); + PostThreadMessage( GetCurrentThreadId(), WM_COMMAND, 0x1234, 0xabcd ); + PeekMessage( &msg, 0, 0, 0, PM_REMOVE ); + break; + case 3: + SetEvent( start_event ); + Sleep( 200 ); + SendMessage( HWND_BROADCAST, WM_WININICHANGE, 0, 0 ); + break; + case 4: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE|PM_NOYIELD )) DispatchMessage( &msg ); + break; + case 5: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + break; + case 6: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + while (PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE )) + { + GetMessage( &msg, 0, 0, 0 ); + DispatchMessage( &msg ); + } + break; + case 7: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + SetTimer( hwnd, 3, 1, NULL ); + Sleep( 1000 ); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE|PM_NOYIELD )) DispatchMessage( &msg ); + break; + case 8: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); + MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); + break; + case 9: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + for (;;) GetMessage( &msg, 0, 0, 0 ); + break; + case 10: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + SetTimer( hwnd, 3, 1, NULL ); + Sleep( 200 ); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + break; + case 11: + SetEvent( start_event ); + Sleep( 200 ); + return; /* exiting the process makes WaitForInputIdle return success too */ + case 12: + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); + Sleep( 200 ); + MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); + SetEvent( start_event ); + break; + } + WaitForSingleObject( end_event, 2000 ); + CloseHandle( start_event ); + CloseHandle( end_event ); + if (hwnd) DestroyWindow( hwnd ); +} + +static LRESULT CALLBACK wait_idle_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + if (msg == WM_WININICHANGE) Sleep( 200 ); /* make sure the child waits */ + return DefWindowProcA( hwnd, msg, wp, lp ); +} + +static DWORD CALLBACK wait_idle_thread( void *arg ) +{ + WNDCLASS cls; + MSG msg; + HWND hwnd; + + memset( &cls, 0, sizeof(cls) ); + cls.lpfnWndProc = wait_idle_proc; + cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + cls.hCursor = LoadCursor(0, IDC_ARROW); + cls.lpszClassName = "TestClass"; + RegisterClass( &cls ); + + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL); + while (GetMessage( &msg, 0, 0, 0 )) DispatchMessage( &msg ); + return 0; +} + +static void test_WaitForInputIdle( char *argv0 ) +{ + char path[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA startup; + BOOL ret; + HANDLE start_event, end_event, thread; + unsigned int i; + DWORD id; + const IMAGE_DOS_HEADER *dos = (const IMAGE_DOS_HEADER *)GetModuleHandleA(0); + const IMAGE_NT_HEADERS *nt = (const IMAGE_NT_HEADERS *)((const char *)dos + dos->e_lfanew); + BOOL console_app = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_GUI); + + if (console_app) /* build the test with -mwindows for better coverage */ + trace( "not built as a GUI app, WaitForInputIdle may not be fully tested\n" ); + + start_event = CreateEventA(NULL, 0, 0, "test_WaitForInputIdle_start"); + end_event = CreateEventA(NULL, 0, 0, "test_WaitForInputIdle_end"); + ok(start_event != 0, "failed to create start event, error %u\n", GetLastError()); + ok(end_event != 0, "failed to create end event, error %u\n", GetLastError()); + + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + thread = CreateThread( NULL, 0, wait_idle_thread, NULL, 0, &id ); + + for (i = 0; i < sizeof(wait_idle_expect)/sizeof(wait_idle_expect[0]); i++) + { + sprintf( path, "%s msg %u", argv0, i ); + ret = CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &pi ); + ok( ret, "CreateProcess '%s' failed err %u.\n", path, GetLastError() ); + if (ret) + { + ret = WaitForSingleObject( start_event, 5000 ); + ok( ret == WAIT_OBJECT_0, "%u: WaitForSingleObject failed\n", i ); + if (ret == WAIT_OBJECT_0) + { + ret = WaitForInputIdle( pi.hProcess, 1000 ); + if (ret == WAIT_FAILED) + ok( console_app || + ret == wait_idle_expect[i].exp || + broken(ret == wait_idle_expect[i].broken), + "%u: WaitForInputIdle error %08x expected %08x\n", + i, ret, wait_idle_expect[i].exp ); + else if (wait_idle_expect[i].todo) + todo_wine + ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken), + "%u: WaitForInputIdle error %08x expected %08x\n", + i, ret, wait_idle_expect[i].exp ); + else + ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken), + "%u: WaitForInputIdle error %08x expected %08x\n", + i, ret, wait_idle_expect[i].exp ); + SetEvent( end_event ); + WaitForSingleObject( pi.hProcess, 1000 ); /* give it a chance to exit on its own */ + } + TerminateProcess( pi.hProcess, 0 ); /* just in case */ + winetest_wait_child_process( pi.hProcess ); + ret = WaitForInputIdle( pi.hProcess, 100 ); + ok( ret == WAIT_FAILED, "%u: WaitForInputIdle after exit error %08x\n", i, ret ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + } + CloseHandle( start_event ); + PostThreadMessage( id, WM_QUIT, 0, 0 ); + WaitForSingleObject( thread, 10000 ); + CloseHandle( thread ); +} + START_TEST(msg) { + char **test_argv; BOOL ret; BOOL (WINAPI *pIsWinEventHookInstalled)(DWORD)= 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ + int argc = winetest_get_mainargs( &test_argv ); + if (argc >= 3) + { + unsigned int arg; + /* Child process. */ + sscanf (test_argv[2], "%d", (unsigned int *) &arg); + do_wait_idle_child( arg ); + return; + } + init_procs(); if (!RegisterWindowClasses()) assert(0); @@ -12059,6 +12297,7 @@ START_TEST(msg) test_ShowWindow(); test_PeekMessage(); test_PeekMessage2(); + test_WaitForInputIdle( test_argv[0] ); test_scrollwindowex(); test_messages(); test_setwindowpos();

1 0

Andrew Eikum : mshtml: Search content_window's properties in HTML[I] FrameBase::get_dispid.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 9bf516a8131391757576456c2d21190b9a87c3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf516a8131391757576456c2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 14 17:38:53 2009 -0600 mshtml: Search content_window's properties in HTML[I]FrameBase::get_dispid. --- dlls/mshtml/htmlframebase.c | 28 ++++++++++++++++++++++++++-- dlls/mshtml/htmliframe.c | 28 ++++++++++++++++++++++++++-- dlls/mshtml/htmlwindow.c | 22 ++++++++++++++++------ dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 7174298..e94c801 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -597,6 +597,30 @@ static HRESULT HTMLFrameElement_get_document(HTMLDOMNode *iface, IDispatch **p) return S_OK; } +static HRESULT HTMLFrameElement_get_dispid(HTMLDOMNode *iface, BSTR name, + DWORD grfdex, DISPID *pid) +{ + HTMLFrameElement *This = HTMLFRAME_NODE_THIS(iface); + + if(!This->framebase.content_window) + return DISP_E_UNKNOWNNAME; + + return search_window_props(This->framebase.content_window, name, grfdex, pid); +} + +static HRESULT HTMLFrameElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLFrameElement *This = HTMLFRAME_NODE_THIS(iface); + + if(!This->framebase.content_window) { + ERR("no content window to invoke on\n"); + return E_FAIL; + } + + return IDispatchEx_InvokeEx(DISPATCHEX(This->framebase.content_window), id, lcid, flags, params, res, ei, caller); +} + static HRESULT HTMLFrameElement_bind_to_tree(HTMLDOMNode *iface) { HTMLFrameElement *This = HTMLFRAME_NODE_THIS(iface); @@ -626,8 +650,8 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = { NULL, HTMLFrameElement_get_document, NULL, - NULL, - NULL, + HTMLFrameElement_get_dispid, + HTMLFrameElement_invoke, HTMLFrameElement_bind_to_tree }; diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index ed86dd0..ddb32c8 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -65,6 +65,30 @@ static HRESULT HTMLIFrame_get_document(HTMLDOMNode *iface, IDispatch **p) return S_OK; } +static HRESULT HTMLIFrame_get_dispid(HTMLDOMNode *iface, BSTR name, + DWORD grfdex, DISPID *pid) +{ + HTMLIFrame *This = HTMLIFRAME_NODE_THIS(iface); + + if(!This->framebase.content_window) + return DISP_E_UNKNOWNNAME; + + return search_window_props(This->framebase.content_window, name, grfdex, pid); +} + +static HRESULT HTMLIFrame_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLIFrame *This = HTMLIFRAME_NODE_THIS(iface); + + if(!This->framebase.content_window) { + ERR("no content window to invoke on\n"); + return E_FAIL; + } + + return IDispatchEx_InvokeEx(DISPATCHEX(This->framebase.content_window), id, lcid, flags, params, res, ei, caller); +} + static HRESULT HTMLIFrame_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLIFrame *This = HTMLIFRAME_NODE_THIS(iface); @@ -101,8 +125,8 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = { NULL, HTMLIFrame_get_document, HTMLIFrame_get_readystate, - NULL, - NULL, + HTMLIFrame_get_dispid, + HTMLIFrame_invoke, HTMLIFrame_bind_to_tree }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6bc971c..6db3148 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1721,15 +1721,11 @@ static inline DWORD prop_to_dispid(HTMLWindow *This, global_prop_t *prop) return MSHTML_DISPID_CUSTOM_MIN + (prop-This->global_props); } -static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +HRESULT search_window_props(HTMLWindow *This, BSTR bstrName, DWORD grfdex, DISPID *pid) { - HTMLWindow *This = DISPEX_THIS(iface); + DWORD i; ScriptHost *script_host; DISPID id; - DWORD i; - HRESULT hres; - - TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); for(i=0; i < This->global_prop_cnt; i++) { /* FIXME: case sensitivity */ @@ -1753,6 +1749,20 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, return S_OK; } + return DISP_E_UNKNOWNNAME; +} + +static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + HTMLWindow *This = DISPEX_THIS(iface); + HRESULT hres; + + TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + + hres = search_window_props(This, bstrName, grfdex, pid); + if(hres != DISP_E_UNKNOWNNAME) + return hres; + hres = IDispatchEx_GetDispID(DISPATCHEX(&This->dispex), bstrName, grfdex, pid); if(hres != DISP_E_UNKNOWNNAME) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1beaf55..4fb4c89 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -779,6 +779,7 @@ IDispatch *script_parse_event(HTMLWindow*,LPCWSTR); void set_script_mode(HTMLWindow*,SCRIPTMODE); BOOL find_global_prop(HTMLWindow*,BSTR,DWORD,ScriptHost**,DISPID*); IDispatch *get_script_disp(ScriptHost*); +HRESULT search_window_props(HTMLWindow*,BSTR,DWORD,DISPID*); IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL); IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,IUnknown*,nsIDOMNodeList*);

1 0

Marcus Meissner : dbghelp: Check for NULL return from process_find_by_handle (Coverity).
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 6feb525bc7742e0767d56a1026f08c9b1a787207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6feb525bc7742e0767d56a102… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Dec 15 11:14:48 2009 +0100 dbghelp: Check for NULL return from process_find_by_handle (Coverity). --- dlls/dbghelp/dbghelp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index ae26518..1fe829a 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -466,6 +466,7 @@ static BOOL CALLBACK reg_cb64to32(HANDLE hProcess, ULONG action, ULONG64 data, U IMAGEHLP_DEFERRED_SYMBOL_LOAD64* idsl64; IMAGEHLP_DEFERRED_SYMBOL_LOAD idsl; + if (!pcs) return FALSE; switch (action) { case CBA_DEBUG_INFO:

1 0

Hans Leidekker : rpcrt4: Avoid test failures on win9x.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: d95e58ba4debf07f2b7d1fd88737fbfc5a185628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95e58ba4debf07f2b7d1fd88… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 15 09:50:10 2009 +0100 rpcrt4: Avoid test failures on win9x. --- dlls/rpcrt4/tests/server.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index a871583..353d0cd 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1337,11 +1337,6 @@ s_authinfo_test(unsigned int protseq, int secure) if (secure || protseq == RPC_PROTSEQ_LRPC) { - status = RpcImpersonateClient(NULL); - ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); - status = RpcRevertToSelf(); - ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); - status = RpcBindingInqAuthClientA(binding, &privs, &principal, &level, &authnsvc, NULL); ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); ok(privs != (RPC_AUTHZ_HANDLE)0xdeadbeef, "privs unchanged\n"); @@ -1365,6 +1360,17 @@ s_authinfo_test(unsigned int protseq, int secure) } ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "level unchanged\n"); ok(authnsvc == RPC_C_AUTHN_WINNT, "authnsvc unchanged\n"); + + status = RpcImpersonateClient(NULL); + if (status == RPC_S_CANNOT_SUPPORT) + { + win_skip("RpcImpersonateClient not supported\n"); + return; + } + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + status = RpcRevertToSelf(); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + } else {

1 0

Hans Leidekker : msi: Reject greater than and less than string comparisons in WHERE clauses.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 6df6332198597aa0e03f9e15c9f4e8c883356f3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df6332198597aa0e03f9e15c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 15 09:50:40 2009 +0100 msi: Reject greater than and less than string comparisons in WHERE clauses. --- dlls/msi/tests/db.c | 24 ++++++++++++++++++++++++ dlls/msi/where.c | 6 +----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index e44970d..c909f90 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1761,6 +1761,30 @@ static void test_where(void) ok( r == ERROR_SUCCESS, "query failed: %d\n", r ); MsiCloseHandle( rec ); + rec = 0; + query = "SELECT * FROM `Media` WHERE `DiskPrompt` < 'Cabinet'"; + r = do_query(hdb, query, &rec); + ok( r == ERROR_BAD_QUERY_SYNTAX, "query failed: %d\n", r ); + MsiCloseHandle( rec ); + + rec = 0; + query = "SELECT * FROM `Media` WHERE `DiskPrompt` > 'Cabinet'"; + r = do_query(hdb, query, &rec); + ok( r == ERROR_BAD_QUERY_SYNTAX, "query failed: %d\n", r ); + MsiCloseHandle( rec ); + + rec = 0; + query = "SELECT * FROM `Media` WHERE `DiskPrompt` <> 'Cabinet'"; + r = do_query(hdb, query, &rec); + todo_wine ok( r == ERROR_SUCCESS, "query failed: %d\n", r ); + MsiCloseHandle( rec ); + + rec = 0; + query = "SELECT * FROM `Media` WHERE `DiskPrompt` = 'Cabinet'"; + r = do_query(hdb, query, &rec); + ok( r == ERROR_NO_MORE_ITEMS, "query failed: %d\n", r ); + MsiCloseHandle( rec ); + rec = MsiCreateRecord(1); MsiRecordSetString(rec, 1, ""); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 32f71b9..545d6a8 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -309,9 +309,7 @@ static UINT STRCMP_Evaluate( MSIWHEREVIEW *wv, UINT row, const struct expr *cond sr = lstrcmpW( l_str, r_str ); *val = ( cond->u.expr.op == OP_EQ && ( sr == 0 ) ) || - ( cond->u.expr.op == OP_NE && ( sr != 0 ) ) || - ( cond->u.expr.op == OP_LT && ( sr < 0 ) ) || - ( cond->u.expr.op == OP_GT && ( sr > 0 ) ); + ( cond->u.expr.op == OP_NE && ( sr != 0 ) ); return ERROR_SUCCESS; } @@ -644,8 +642,6 @@ static UINT WHERE_VerifyCondition( MSIDATABASE *db, MSIVIEW *table, struct expr switch( cond->u.expr.op ) { case OP_EQ: - case OP_GT: - case OP_LT: case OP_NE: break; default:

1 0

David Adam : d3dx9/tests: Check a relative error instead of an absolute error.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 3ff4d07c401d856fdf592603c211a43470deba50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff4d07c401d856fdf592603c… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Dec 15 09:59:13 2009 +0100 d3dx9/tests: Check a relative error instead of an absolute error. --- dlls/d3dx9_36/tests/math.c | 107 ++++++++++++++++++++++---------------------- 1 files changed, 54 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ff4d07c401d856fdf592…

1 0

Eric Pouech : winedbg: Fix some types for homogenous support on 64bit platform.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 4ce6c90c361cc814aead4df81cf4061f9acfdad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce6c90c361cc814aead4df81… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:05:16 2009 +0100 winedbg: Fix some types for homogenous support on 64bit platform. --- programs/winedbg/debugger.h | 2 +- programs/winedbg/stack.c | 2 +- programs/winedbg/symbol.c | 4 ++-- programs/winedbg/tgt_active.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 7e2559e..e48dbd3 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -397,7 +397,7 @@ extern void symbol_read_symtable(const char* filename, unsigned long extern enum dbg_line_status symbol_get_function_line_status(const ADDRESS64* addr); extern BOOL symbol_get_line(const char* filename, const char* func, IMAGEHLP_LINE64* ret); extern void symbol_info(const char* str); -extern void symbol_print_local(const SYMBOL_INFO* sym, ULONG_PTR base, BOOL detailed); +extern void symbol_print_local(const SYMBOL_INFO* sym, DWORD_PTR base, BOOL detailed); extern int symbol_info_locals(void); extern BOOL symbol_is_local(const char* name); struct sgv_data; diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 221ad34..c80e5c3 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -124,7 +124,7 @@ BOOL stack_set_frame(int newframe) ADDRESS64 addr; if (!stack_set_frame_internal(newframe)) return FALSE; addr.Mode = AddrModeFlat; - addr.Offset = (unsigned long)memory_to_linear_addr(&dbg_curr_thread->frames[dbg_curr_thread->curr_frame].addr_pc); + addr.Offset = (DWORD_PTR)memory_to_linear_addr(&dbg_curr_thread->frames[dbg_curr_thread->curr_frame].addr_pc); source_list_from_addr(&addr, 0); return TRUE; } diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 35d1c5d..ca2feee 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -648,7 +648,7 @@ BOOL symbol_get_line(const char* filename, const char* name, * <name>=<value> (local|pmt <where>) in detailed form * Note <value> can be an error message in case of error */ -void symbol_print_local(const SYMBOL_INFO* sym, ULONG_PTR base, BOOL detailed) +void symbol_print_local(const SYMBOL_INFO* sym, DWORD_PTR base, BOOL detailed) { struct dbg_lvalue lvalue; char buffer[64]; @@ -682,7 +682,7 @@ static BOOL CALLBACK info_locals_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) types_print_type(&type, FALSE); dbg_printf(" "); - symbol_print_local(sym, (ULONG_PTR)ctx, TRUE); + symbol_print_local(sym, (DWORD_PTR)ctx, TRUE); dbg_printf("\n"); return TRUE; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8d13667..232b2cc 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -616,8 +616,8 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) break_set_xpoints(TRUE); if (DBG_IVAR(BreakOnDllLoad)) { - dbg_printf("Stopping on DLL %s loading at 0x%08lx\n", - dbg_W2A(u.buffer, -1), (unsigned long)de->u.LoadDll.lpBaseOfDll); + dbg_printf("Stopping on DLL %s loading at %p\n", + dbg_W2A(u.buffer, -1), de->u.LoadDll.lpBaseOfDll); if (dbg_fetch_context()) cont = 0; } break;

1 0

Eric Pouech : winedbg: Allow internal (host) integral variables to hold 64bit value on 64bit platforms.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 5aa859de721329bb7783b9710e8d192c72f181a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa859de721329bb7783b9710… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:05:27 2009 +0100 winedbg: Allow internal (host) integral variables to hold 64bit value on 64bit platforms. --- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/expr.c | 16 ++++++++-------- programs/winedbg/types.c | 20 +++++++++++++++++++- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index e48dbd3..300f48a 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -328,8 +328,8 @@ extern int display_enable(int displaynum, int enable); extern void expr_free_all(void); extern struct expr* expr_alloc_internal_var(const char* name); extern struct expr* expr_alloc_symbol(const char* name); -extern struct expr* expr_alloc_sconstant(int val); -extern struct expr* expr_alloc_uconstant(unsigned val); +extern struct expr* expr_alloc_sconstant(long int val); +extern struct expr* expr_alloc_uconstant(long unsigned val); extern struct expr* expr_alloc_string(const char* str); extern struct expr* expr_alloc_binary_op(int oper, struct expr*, struct expr*); extern struct expr* expr_alloc_unary_op(int oper, struct expr*); diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 3d5cef1..6b8c46f 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -37,12 +37,12 @@ struct expr { struct { - int value; + long int value; } s_const; struct { - unsigned int value; + long unsigned int value; } u_const; struct @@ -165,7 +165,7 @@ struct expr* expr_alloc_symbol(const char* name) return ex; } -struct expr* expr_alloc_sconstant(int value) +struct expr* expr_alloc_sconstant(long int value) { struct expr* ex; @@ -176,7 +176,7 @@ struct expr* expr_alloc_sconstant(int value) return ex; } -struct expr* expr_alloc_uconstant(unsigned int value) +struct expr* expr_alloc_uconstant(long unsigned int value) { struct expr* ex; @@ -350,13 +350,13 @@ struct dbg_lvalue expr_eval(struct expr* exp) break; case EXPR_TYPE_U_CONST: rtn.cookie = DLV_HOST; - rtn.type.id = dbg_itype_unsigned_int; + rtn.type.id = dbg_itype_unsigned_long_int; rtn.type.module = 0; rtn.addr.Offset = (ULONG_PTR)&exp->un.u_const.value; break; case EXPR_TYPE_S_CONST: rtn.cookie = DLV_HOST; - rtn.type.id = dbg_itype_signed_int; + rtn.type.id = dbg_itype_signed_long_int; rtn.type.module = 0; rtn.addr.Offset = (ULONG_PTR)&exp->un.s_const.value; break; @@ -690,10 +690,10 @@ int expr_print(const struct expr* exp) dbg_printf("$%s", exp->un.intvar.name); break; case EXPR_TYPE_U_CONST: - dbg_printf("%u", exp->un.u_const.value); + dbg_printf("%lu", exp->un.u_const.value); break; case EXPR_TYPE_S_CONST: - dbg_printf("%d", exp->un.s_const.value); + dbg_printf("%ld", exp->un.s_const.value); break; case EXPR_TYPE_STRING: dbg_printf("\"%s\"", exp->un.string.str); diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 68bf12b..414bb9f 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -784,6 +784,24 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v switch (type->id) { + case dbg_itype_unsigned_long_int: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = ADDRSIZE; break; + case TI_GET_BASETYPE: X(DWORD) = btUInt; break; + default: WINE_FIXME("unsupported %u for u-long int\n", ti); return FALSE; + } + break; + case dbg_itype_signed_long_int: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = ADDRSIZE; break; + case TI_GET_BASETYPE: X(DWORD) = btInt; break; + default: WINE_FIXME("unsupported %u for s-long int\n", ti); return FALSE; + } + break; case dbg_itype_unsigned_int: switch (ti) { @@ -851,7 +869,7 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v switch (ti) { case TI_GET_SYMTAG: X(DWORD) = SymTagPointerType; break; - case TI_GET_LENGTH: X(DWORD64) = 4; break; + case TI_GET_LENGTH: X(DWORD64) = ADDRSIZE; break; case TI_GET_TYPE: X(DWORD) = dbg_itype_char; break; default: WINE_FIXME("unsupported %u for a string\n", ti); return FALSE; }

1 0

Eric Pouech : winedbg: Added 'a' to the format supported in examine command (a stands for address).
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: f96bdda0f332113f24233aca13549e9ec76911fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96bdda0f332113f24233aca1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:05:34 2009 +0100 winedbg: Added 'a' to the format supported in examine command (a stands for address). --- programs/winedbg/debug.l | 2 +- programs/winedbg/memory.c | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 9b1e4fa..2e87ddb 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -109,7 +109,7 @@ static int syntax_error; DIGIT [0-9] HEXDIGIT [0-9a-fA-F] -FORMAT [ubcdgiswx] +FORMAT [ubcdgiswxa] IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]* PATHNAME [\\/_a-zA-Z0-9\.~@][\\/\-_a-zA-Z0-9\.~@]* STRING \"[^\n"]+\" diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 2292ea6..e4f4729 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -216,15 +216,24 @@ void memory_examine(const struct dbg_lvalue *lvalue, int count, char format) } \ } \ dbg_printf("\n"); \ - } \ - return + } #define DO_DUMP(_t,_l,_f) DO_DUMP2(_t,_l,_f,_v) - case 'x': DO_DUMP(int, 4, " %8.8x"); - case 'd': DO_DUMP(unsigned int, 4, " %4.4d"); - case 'w': DO_DUMP(unsigned short, 8, " %04x"); - case 'c': DO_DUMP2(char, 32, " %c", (_v < 0x20) ? ' ' : _v); - case 'b': DO_DUMP2(char, 16, " %02x", (_v) & 0xff); + case 'x': DO_DUMP(int, 4, " %8.8x"); break; + case 'd': DO_DUMP(unsigned int, 4, " %4.4d"); break; + case 'w': DO_DUMP(unsigned short, 8, " %04x"); break; + case 'a': + if (sizeof(DWORD_PTR) == 4) + { + DO_DUMP(DWORD_PTR, 4, " %8.8lx"); + } + else + { + DO_DUMP(DWORD_PTR, 2, " %16.16lx"); + } + break; + case 'c': DO_DUMP2(char, 32, " %c", (_v < 0x20) ? ' ' : _v); break; + case 'b': DO_DUMP2(char, 16, " %02x", (_v) & 0xff); break; } }

1 0

Eric Pouech : dbghelp: Fix module on which GetTypeFromName is done.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 07c1a1ca51b651a4b1ba4e8e5476e403b0560959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c1a1ca51b651a4b1ba4e8e5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:05:40 2009 +0100 dbghelp: Fix module on which GetTypeFromName is done. --- dlls/dbghelp/type.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 3955815..b9f4a22 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -878,13 +878,13 @@ BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Name, PSYMBOL_INFO Symbol) { struct process* pcs = process_find_by_handle(hProcess); - struct module* module; + struct module_pair pair; struct symt* type; if (!pcs) return FALSE; - module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); - if (!module) return FALSE; - type = symt_find_type_by_name(module, SymTagNull, Name); + pair.requested = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); + if (!module_get_debug(&pair)) return FALSE; + type = symt_find_type_by_name(pair.effective, SymTagNull, Name); if (!type) return FALSE; Symbol->TypeIndex = (DWORD)type;

1 0