May 2013 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Keep reference to document node in onload event handler.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 503032749b0b9091dfbde69385888bc39d733672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503032749b0b9091dfbde6938… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 12:52:52 2013 +0200 mshtml: Keep reference to document node in onload event handler. --- dlls/mshtml/nsevents.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 297ef8c..fc6504b 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -235,6 +235,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event HTMLDocumentNode *doc = This->This->doc; nsIDOMHTMLElement *nsbody = NULL; HTMLDocumentObj *doc_obj = NULL; + nsresult nsres = NS_OK; TRACE("(%p)\n", doc); @@ -245,6 +246,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event connect_scripts(doc->window); + htmldoc_addref(&doc->basedoc); + if(doc_obj) handle_docobj_load(doc_obj); @@ -264,18 +267,19 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service, &doc->basedoc.window->base.IHTMLWindow2_iface, 0); - if(!doc->nsdoc) { + if(doc->nsdoc) { + nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); + if(nsbody) { + fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event, (IDispatch*)&doc->window->base.IDispatchEx_iface); + nsIDOMHTMLElement_Release(nsbody); + } + }else { ERR("NULL nsdoc\n"); - return NS_ERROR_FAILURE; + nsres = NS_ERROR_FAILURE; } - nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); - if(nsbody) { - fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event, (IDispatch*)&doc->window->base.IDispatchEx_iface); - nsIDOMHTMLElement_Release(nsbody); - } - - return NS_OK; + htmldoc_release(&doc->basedoc); + return nsres; } static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event)

1 0

Piotr Caban : user32: Use SendNotifyMessage to send WM_DRAWCLIPBOARD.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: dd573925e5bbfad0a19470c0462d5f23bcbc201d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd573925e5bbfad0a19470c04… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 15 15:04:58 2013 +0200 user32: Use SendNotifyMessage to send WM_DRAWCLIPBOARD. --- dlls/user32/clipboard.c | 4 +- dlls/user32/tests/clipboard.c | 78 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 0985e6f..e6fda2e 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -287,7 +287,7 @@ BOOL WINAPI CloseClipboard(void) bCBHasChanged = FALSE; if (hWndViewer) - SendMessageW(hWndViewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); + SendNotifyMessageW(hWndViewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); } bRet = TRUE; @@ -393,7 +393,7 @@ HWND WINAPI SetClipboardViewer( HWND hWnd ) HWND hwndPrev = CLIPBOARD_SetClipboardViewer(hWnd); if (hWnd) - SendMessageW(hWnd, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); + SendNotifyMessageW(hWnd, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); TRACE("(%p): returning %p\n", hWnd, hwndPrev); return hwndPrev; diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 655d158..e2e727c 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -269,6 +269,83 @@ static void test_synthesized(void) ok(r, "gle %d\n", GetLastError()); } +static CRITICAL_SECTION clipboard_cs; +static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + switch(msg) { + case WM_DRAWCLIPBOARD: + EnterCriticalSection(&clipboard_cs); + LeaveCriticalSection(&clipboard_cs); + break; + case WM_USER: + PostQuitMessage(0); + break; + } + + return DefWindowProc(hwnd, msg, wp, lp); +} + +static DWORD WINAPI clipboard_thread(void *param) +{ + HWND win = param; + BOOL r; + + EnterCriticalSection(&clipboard_cs); + SetLastError(0xdeadbeef); + SetClipboardViewer(win); + ok(GetLastError() == 0xdeadbeef, "GetLastError = %d\n", GetLastError()); + LeaveCriticalSection(&clipboard_cs); + + r = OpenClipboard(win); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + + r = EmptyClipboard(); + ok(r, "EmptyClipboard failed: %d\n", GetLastError()); + + EnterCriticalSection(&clipboard_cs); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + LeaveCriticalSection(&clipboard_cs); + + r = PostMessage(win, WM_USER, 0, 0); + ok(r, "PostMessage failed: %d\n", GetLastError()); + return 0; +} + +static void test_messages(void) +{ + WNDCLASS cls; + HWND win; + MSG msg; + HANDLE thread; + DWORD tid; + + InitializeCriticalSection(&clipboard_cs); + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = clipboard_wnd_proc; + cls.hInstance = GetModuleHandle(0); + cls.lpszClassName = "clipboard_test"; + RegisterClass(&cls); + + win = CreateWindow("clipboard_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0); + ok(win != NULL, "CreateWindow failed: %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, clipboard_thread, (void*)win, 0, &tid); + ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); + + while(GetMessage(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + ok(WaitForSingleObject(thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + UnregisterClass("clipboard_test", GetModuleHandle(0)); + DeleteCriticalSection(&clipboard_cs); +} + START_TEST(clipboard) { SetLastError(0xdeadbeef); @@ -278,4 +355,5 @@ START_TEST(clipboard) test_RegisterClipboardFormatA(); test_ClipboardOwner(); test_synthesized(); + test_messages(); }

1 0

Aric Stewart : user32: Points for IMR_QUERYCHARPOSITION need to be in screen coordinates.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 7559526438736fe634dc07e6effd8d8d993cc1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7559526438736fe634dc07e6e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 15 12:40:43 2013 -0500 user32: Points for IMR_QUERYCHARPOSITION need to be in screen coordinates. Found by Ken Thomases. --- dlls/user32/edit.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 1ce79db..126ab12 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5182,6 +5182,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B chpos->pt.y = HIWORD(pos); chpos->cLineHeight = es->line_height; chpos->rcDocument = es->format_rect; + MapWindowPoints(hwnd, 0, &chpos->pt, 1); + MapWindowPoints(hwnd, 0, (POINT*)&chpos->rcDocument, 2); result = 1; break; }

1 0

Alexandre Julliard : credui: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 0f3523b101a0d59024f4fb349b139a41bf2c7021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3523b101a0d59024f4fb349… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:15:39 2013 +0200 credui: Don't bother to free memory at process exit. --- dlls/credui/credui_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 6e8d452..c7b2da4 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -80,6 +80,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; LIST_FOR_EACH_ENTRY_SAFE(entry, cursor2, &pending_credentials_list, struct pending_credentials, entry) { list_remove(&entry->entry);

1 0

Alexandre Julliard : crypt32: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 99bf9ee8e0b3665aae175be56acaf53b3b6111d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99bf9ee8e0b3665aae175be56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:16:05 2013 +0200 crypt32: Don't bother to free memory at process exit. --- dlls/crypt32/main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index db9dc1a..78f14f9 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -45,14 +45,12 @@ BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, PVOID pvReserved) crypt_oid_init(); break; case DLL_PROCESS_DETACH: + if (pvReserved) break; crypt_oid_free(); crypt_sip_free(); root_store_free(); default_chain_engine_free(); - /* Don't release the default provider on process shutdown, there's - * no guarantee the provider dll hasn't already been unloaded. - */ - if (hDefProv && !pvReserved) CryptReleaseContext(hDefProv, 0); + if (hDefProv) CryptReleaseContext(hDefProv, 0); break; } return TRUE;

1 0

Alexandre Julliard : dwrite: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 14f7900b8dfc51d276b2f3020d493607360f3700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f7900b8dfc51d276b2f3020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:17:03 2013 +0200 dwrite: Don't bother to free memory at process exit. --- dlls/dwrite/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index da023d9..d253c42 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -44,6 +44,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) DisableThreadLibraryCalls( hinstDLL ); break; case DLL_PROCESS_DETACH: + if (reserved) break; release_system_fontcollection(); break; }

1 0

Alexandre Julliard : dxgi: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 575d0e60142aaa0e0a0c6ae78eb79b5e37e6e5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=575d0e60142aaa0e0a0c6ae78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:18:37 2013 +0200 dxgi: Don't bother to free memory at process exit. --- dlls/dxgi/dxgi_main.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index c9d6f2e..e9ed482 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -44,16 +44,8 @@ static struct dxgi_main dxgi_main; static void dxgi_main_cleanup(void) { - EnterCriticalSection(&dxgi_cs); - HeapFree(GetProcessHeap(), 0, dxgi_main.device_layers); - dxgi_main.device_layers = NULL; - dxgi_main.layer_count = 0; - FreeLibrary(dxgi_main.d3d10core); - dxgi_main.d3d10core = NULL; - - LeaveCriticalSection(&dxgi_cs); DeleteCriticalSection(&dxgi_cs); } @@ -68,6 +60,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: + if (lpv) break; dxgi_main_cleanup(); break; }

1 0

Alexandre Julliard : gdiplus: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 1731ee55b618c41db421f24249fe555cd38313a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1731ee55b618c41db421f2424… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:19:18 2013 +0200 gdiplus: Don't bother to free memory at process exit. --- dlls/gdiplus/gdiplus.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index f199055..bfa3279 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -66,6 +66,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: + if (reserved) break; free_installed_fonts(); break; }

1 0

Alexandre Julliard : inetmib1: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: d6976d7e009927357220be0429beb336d20bad3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6976d7e009927357220be042… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:20:16 2013 +0200 inetmib1: Don't bother to free memory at process exit. --- dlls/inetmib1/main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 20d8006..c0719c1 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1454,10 +1454,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; cleanup(); break; - default: - break; } return TRUE;

1 0

Alexandre Julliard : jscript: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 56c6916894970c2ec5ec2c046c209e80ce2c7b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c6916894970c2ec5ec2c046… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:20:50 2013 +0200 jscript: Don't bother to free memory at process exit. --- dlls/jscript/jscript_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 75e44c0..9f9f412 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -144,6 +144,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return FALSE; break; case DLL_PROCESS_DETACH: + if (lpv) break; free_strings(); }

1 0