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

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

May 15, 2013

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

Piotr Caban : user32: Use SendNotifyMessage to send WM_DRAWCLIPBOARD.
by Alexandre Julliard May 15, 2013

May 15, 2013

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

Jacek Caban : ieframe: Keep reference to ShellObject while calling DocumentComplete event.
by Alexandre Julliard May 15, 2013

May 15, 2013

Module: wine Branch: master Commit: 3a1ce6a864acfe3e0143b1c1bea663be15d6ddeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1ce6a864acfe3e0143b1c1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 12:52:41 2013 +0200 ieframe: Keep reference to ShellObject while calling DocumentComplete event. --- dlls/ieframe/shellbrowser.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 944c7bc..55763db 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -824,12 +824,18 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dp); TRACE("<<<\n"); SysFreeString(url); - This->doc_host->busy = VARIANT_FALSE; + if(This->doc_host) + This->doc_host->busy = VARIANT_FALSE; + + IShellBrowser_Release(&This->IShellBrowser_iface); return S_OK; }

1 0

Stefan Dösinger : wined3d: Initialize the gl_info pointer from the context.
by Alexandre Julliard May 15, 2013

May 15, 2013

Module: wine Branch: master Commit: 121bd9d20108178fb14d1f335c95eb6ddb917edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=121bd9d20108178fb14d1f335… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 23:46:01 2013 +0200 wined3d: Initialize the gl_info pointer from the context. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6a901e3..405a123 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7042,7 +7042,7 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d { BYTE table[256][4]; struct wined3d_device *device = surface->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; BOOL colorkey = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) != 0;

1 0

Nikolay Sivov : msxml3: Fix ignorable whitespace detection in case of formatting text nodes.
by Alexandre Julliard May 15, 2013

May 15, 2013

Module: wine Branch: master Commit: e5261f03e6bf85b895e875c854b494d146291456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5261f03e6bf85b895e875c85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 15 00:18:07 2013 +0400 msxml3: Fix ignorable whitespace detection in case of formatting text nodes. --- dlls/msxml3/domdoc.c | 12 +++++++++--- dlls/msxml3/tests/domdoc.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e98fa72..4c7237a 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -416,20 +416,26 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) if (ctxt->node) { + xmlChar cur = *(ctxt->input->cur); + /* Characters are reported with multiple calls, for example each charref is reported with a separate call and then parser appends it to a single text node or creates a new node if not created. It's not possible to tell if it's ignorable data or not just looking at data itself cause it could be - a space chars that separate charrefs or similar case. We only need to skip leading and trailing spaces, + space chars that separate charrefs or similar case. We only need to skip leading and trailing spaces, or whole node if it has nothing but space chars, so to detect leading space node->last is checked that contains text node pointer if already created, trailing spaces are detected directly looking at parser input - for next '<' opening bracket - similar logic is used by libxml2 itself. + for next '<' opening bracket - similar logic is used by libxml2 itself. Basically 'cur' == '<' means the last + chunk of char data, in case it's not the last chunk we check for previously added node type and if it's not + a text node it's safe to ignore. Note that during domdoc_loadXML() the xmlDocPtr->_private data is not available. */ + if (!This->properties->preserving && !is_preserving_whitespace(ctxt->node) && strn_isspace(ch, len) && (!ctxt->node->last || - ((ctxt->node->last && (*ctxt->input->cur) == '<')))) + ((ctxt->node->last && (cur == '<' || ctxt->node->last->type != XML_TEXT_NODE)) + ))) return; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cc79d4b..20b9609 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -385,6 +385,15 @@ static const WCHAR szComplete6[] = { '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 }; +static const char complete7[] = { + "<?xml version=\"1.0\"?>\n\t" + "<root>\n" + "\t<a/>\n" + "\t<b/>\n" + "\t<c/>\n" + "</root>" +}; + #define DECL_WIN_1252 \ "<?xml version=\"1.0\" encoding=\"Windows-1252\"?>" @@ -4212,7 +4221,11 @@ static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) static void test_whitespace(void) { IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; + IXMLDOMNodeList *list; + IXMLDOMElement *root; VARIANT_BOOL b; + HRESULT hr; + LONG len; doc1 = create_document(&IID_IXMLDOMDocument2); doc2 = create_document(&IID_IXMLDOMDocument2); @@ -4286,6 +4299,26 @@ static void test_whitespace(void) /* text with char references */ test_preserve_charref(doc1, VARIANT_TRUE); test_preserve_charref(doc1, VARIANT_FALSE); + + /* formatting whitespaces */ + hr = IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_loadXML(doc1, _bstr_(complete7), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "for %x\n", b); + + hr = IXMLDOMDocument2_get_documentElement(doc1, &root); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMElement_get_childNodes(root, &list); + ok(hr == S_OK, "got 0x%08x\n", hr); + len = 0; + hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 3, "got %d\n", len); + IXMLDOMNodeList_Release(list); + IXMLDOMElement_Release(root); + IXMLDOMDocument2_Release(doc1); free_bstrs();

1 0

Alexandre Julliard : wshom.ocx: Don't bother to free memory at process exit .
by Alexandre Julliard May 15, 2013

May 15, 2013

Module: wine Branch: master Commit: 0ef01edfd02ce608ed0b52417a815ca5b9b88ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef01edfd02ce608ed0b52417… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:34:57 2013 +0200 wshom.ocx: Don't bother to free memory at process exit. --- dlls/wshom.ocx/wshom_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index c253b61..0f40a0a 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -161,6 +161,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(wshom_instance); break; case DLL_PROCESS_DETACH: + if (lpv) break; release_typelib(); break; }

1 0

Alexandre Julliard : ws2_32: Don't bother to free memory at process exit.
by Alexandre Julliard May 15, 2013

May 15, 2013

Module: wine Branch: master Commit: f38cbfc99d0e3c1962db6c8850158e1a4d66df6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38cbfc99d0e3c1962db6c885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:34:26 2013 +0200 ws2_32: Don't bother to free memory at process exit. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a6a1b4c..80b317a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -897,9 +897,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_ATTACH: break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; free_per_thread_data(); DeleteCriticalSection(&csWSgetXXXbyYYY); - num_startup = 0; break; case DLL_THREAD_DETACH: free_per_thread_data();

1 0

Alexandre Julliard : wineoss.drv: Don' t bother to free memory at process exit.
by Alexandre Julliard May 15, 2013

May 15, 2013

Module: wine Branch: master Commit: 8d8d55e1b0f0dbc21f29171273a58c258c97af61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8d55e1b0f0dbc21f2917127… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:30:36 2013 +0200 wineoss.drv: Don't bother to free memory at process exit. --- dlls/wineoss.drv/mmdevdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 2c81404..0db7bb7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -243,6 +243,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) break; case DLL_PROCESS_DETACH: + if (!reserved) { OSSDevice *iter, *iter2; @@ -251,9 +252,8 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &g_devices, OSSDevice, entry){ HeapFree(GetProcessHeap(), 0, iter); } - - break; } + break; } return TRUE; }

1 0

Alexandre Julliard : spoolss: Don't bother to free memory at process exit.
by Alexandre Julliard May 15, 2013

May 15, 2013

Module: wine Branch: master Commit: aca523b72009f2eaae43e91900b57e7b02821247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca523b72009f2eaae43e9190… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:28:00 2013 +0200 spoolss: Don't bother to free memory at process exit. --- dlls/spoolss/spoolss_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 9f248f0..61c565d 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -55,6 +55,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; backend_unload_all(); break; }

1 0

Alexandre Julliard : shell32: Don't bother to free memory at process exit.
by Alexandre Julliard May 15, 2013

May 15, 2013

Module: wine Branch: master Commit: d92a9264f3e788980aedb7f34d39761b2529f265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92a9264f3e788980aedb7f34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:27:25 2013 +0200 shell32: Don't bother to free memory at process exit. --- dlls/shell32/shell32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 1507d4a..4c124bd 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1279,7 +1279,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) break; case DLL_PROCESS_DETACH: - shell32_hInstance = 0; + if (fImpLoad) break; SIC_Destroy(); FreeChangeNotifications(); break;

1 0