wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Alexander Nicolaysen Sørnes : winedbg: Add Norwegian Bokmål translation.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: bdda678803a04a6cf91a7f25163f6e07aafdd291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdda678803a04a6cf91a7f251… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 14 23:47:38 2009 +0100 winedbg: Add Norwegian Bokmål translation. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/rsrc_No.rc | 55 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index cf73058..1d92849 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -39,6 +39,7 @@ RC_SRCS = \ rsrc_Ko.rc \ rsrc_Lt.rc \ rsrc_Nl.rc \ + rsrc_No.rc \ rsrc_Pt.rc \ rsrc_Ru.rc \ rsrc_Sv.rc diff --git a/programs/winedbg/rsrc_No.rc b/programs/winedbg/rsrc_No.rc new file mode 100644 index 0000000..795aec3 --- /dev/null +++ b/programs/winedbg/rsrc_No.rc @@ -0,0 +1,55 @@ +/* + * Norwegian Bokmål Language Support + * + * Copyright 2009 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Debug", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Programfeil" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Programmet %s har fått et alvorlig problem og må \ + avsluttes. Vi beklager det inntrufne.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Dette kan skyldes et problem i programmet eller en feil i Wine. \ + Du kan besøke http://appdb.winehq.org for råd om hvordan du kan kjøre \ + dette programmet.\n\n\ + Du kan rapportere feilen på http://bugs.winehq.org hvis problemet \ + ikke oppstår i Windows.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Lukk", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Wine programfeil" + IDS_INVALID_PARAMS "Interne feil - mottok ugyldig parameter" + IDS_UNIDENTIFIED "(uidentifisert)" +END

1 0

Marcus Meissner : rpcrt4: Exit on unknown confirmance type (Coverity).
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 122ca034db085b4d76525e4b08c1d705c8109234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=122ca034db085b4d76525e4b0… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Dec 15 11:44:37 2009 +0100 rpcrt4: Exit on unknown confirmance type (Coverity). --- dlls/rpcrt4/ndr_marshall.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 4c9f625..3b10af4 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -551,7 +551,8 @@ PFORMAT_STRING ComputeConformanceOrVariance( } break; default: - FIXME("unknown conformance type %x\n", pFormat[0] & 0xf0); + FIXME("unknown conformance type %x, expect crash.\n", pFormat[0] & 0xf0); + goto finish_conf; } switch (pFormat[1]) {

1 0

Marcus Meissner : ntdll: Check for NULL attr in NtOpenKey (Coverity).
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: afd4aed5fca819d954f174d5d62eb5a38ed02625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd4aed5fca819d954f174d5d… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Dec 15 11:39:23 2009 +0100 ntdll: Check for NULL attr in NtOpenKey (Coverity). --- dlls/ntdll/reg.c | 4 +++- dlls/ntdll/tests/reg.c | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 7d24a9b..286dbdb 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -114,8 +114,10 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJEC NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; - DWORD len = attr->ObjectName->Length; + DWORD len; + if (!attr) return STATUS_ACCESS_VIOLATION; + len = attr->ObjectName->Length; TRACE( "(%p,%s,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), access, retkey ); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 89f7c68..a061293 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -336,9 +336,6 @@ static void test_NtOpenKey(void) OBJECT_ATTRIBUTES attr; ACCESS_MASK am = KEY_READ; - if (0) - { - /* Crashes Wine */ /* All NULL */ status = pNtOpenKey(NULL, 0, NULL); ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status); @@ -347,7 +344,6 @@ static void test_NtOpenKey(void) status = pNtOpenKey(&key, 0, NULL); ok(status == STATUS_ACCESS_VIOLATION /* W2K3/XP/W2K */ || status == STATUS_INVALID_PARAMETER /* NT4 */, "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08x\n", status); - } InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0);

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

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

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

Alexandre Julliard : user32: Return failure in WaitForInputIdle if we can' t open the idle event.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 6c253bb143886d6ef9a1bfe0efd55491ecfb62f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c253bb143886d6ef9a1bfe0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:10:10 2009 +0100 user32: Return failure in WaitForInputIdle if we can't open the idle event. --- dlls/user32/message.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a1d7779..8916cae 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3322,12 +3322,11 @@ DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut ) SERVER_START_REQ( get_process_idle_event ) { req->handle = wine_server_obj_handle( hProcess ); - if (!(ret = wine_server_call_err( req ))) - handles[1] = wine_server_ptr_handle( reply->event ); + wine_server_call_err( req ); + handles[1] = wine_server_ptr_handle( reply->event ); } SERVER_END_REQ; - if (ret) return WAIT_FAILED; /* error */ - if (!handles[1]) return 0; /* no event to wait on */ + if (!handles[1]) return WAIT_FAILED; /* no event to wait on */ start_time = GetTickCount(); elapsed = 0;

1 0

Stefan Dösinger : wined3d: Frontbuffers are onscreen.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 2ee6bb1cbb4ddfdfcc5eb17344c4fd20734e5672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee6bb1cbb4ddfdfcc5eb1734… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 14 23:58:13 2009 +0100 wined3d: Frontbuffers are onscreen. --- dlls/wined3d/context.c | 3 ++- dlls/wined3d/device.c | 1 - dlls/wined3d/swapchain.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 62eb0ac..f923a6f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1348,6 +1348,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface ret->gl_info = &This->adapter->gl_info; ret->surface = (IWineD3DSurface *) target; ret->current_rt = (IWineD3DSurface *)target; + ret->render_offscreen = surface_is_offscreen((IWineD3DSurface *) target); ret->tid = GetCurrentThreadId(); if(This->shader_backend->shader_dirtifyable_constants((IWineD3DDevice *) This)) { /* Create the dirty constants array and initialize them to dirty */ @@ -1893,7 +1894,7 @@ static inline struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWin context = findThreadContextForSwapChain(swapchain, tid); old_render_offscreen = context->render_offscreen; - context->render_offscreen = ((IWineD3DSwapChainImpl *)swapchain)->render_to_fbo; + context->render_offscreen = surface_is_offscreen(target); /* The context != This->activeContext will catch a NOP context change. This can occur * if we are switching back to swapchain rendering in case of FBO or Back Buffer offscreen * rendering. No context change is needed in that case diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c71d4eb..a55f3e6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6297,7 +6297,6 @@ HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain * } swapchain->context[0] = context_create(This, target, swapchain->win_handle, FALSE, &swapchain->presentParms); swapchain->num_contexts = 1; - swapchain->context[0]->render_offscreen = swapchain->render_to_fbo; create_dummy_textures(This); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 91791de..fb902ea 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -809,8 +809,6 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface hr = WINED3DERR_NOTAVAILABLE; goto err; } - - swapchain->context[0]->render_offscreen = swapchain->render_to_fbo; } else {

1 0

Eric Pouech : dbghelp: Move the core of some line related functions to 64bit interface.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 9500df82f1d64cb413527b182b8805b8f990c60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9500df82f1d64cb413527b182… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:06:17 2009 +0100 dbghelp: Move the core of some line related functions to 64bit interface. --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/symbol.c | 134 +++++++++++++++++++--------------------- 3 files changed, 67 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9500df82f1d64cb413527…

1 0

Eric Pouech : dbghelp: Fix symt_find_nearest so that it searches for 64bit addresses on 64bit platforms .
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 776e75e43cfab6654dbf7d47e454f9b5c23fd628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776e75e43cfab6654dbf7d47e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:06:06 2009 +0100 dbghelp: Fix symt_find_nearest so that it searches for 64bit addresses on 64bit platforms. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/symbol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index a0b40a1..fd5ec0d 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -538,7 +538,7 @@ extern struct module* symt_cmp_addr_module; extern int symt_cmp_addr(const void* p1, const void* p2); extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si); extern struct symt_ht* - symt_find_nearest(struct module* module, DWORD addr); + symt_find_nearest(struct module* module, DWORD_PTR addr); extern struct symt_compiland* symt_new_compiland(struct module* module, unsigned long address, unsigned src_idx); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ede588c..d686b4a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -900,7 +900,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON } /* assume addr is in module */ -struct symt_ht* symt_find_nearest(struct module* module, DWORD addr) +struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) { int mid, high, low; ULONG64 ref_addr, ref_size;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009