October 2014 - Wine-commits

Alexandre Julliard : wininet/tests: Fix a test failure on Windows.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: d883281806e4e54bbd2c36326005d5e8d9a7953c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d883281806e4e54bbd2c36326… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 30 13:16:42 2014 +0900 wininet/tests: Fix a test failure on Windows. --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ca5f4af..98c8d62 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4223,7 +4223,7 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) ok(!info.lpszSignatureAlgName, "lpszSignatureAlgName = %s\n", info.lpszSignatureAlgName); ok(!info.lpszEncryptionAlgName, "lpszEncryptionAlgName = %s\n", info.lpszEncryptionAlgName); ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); - ok(info.dwKeySize == 128 || info.dwKeySize == 256, "dwKeySize = %u\n", info.dwKeySize); + ok(info.dwKeySize >= 128 && info.dwKeySize <= 256, "dwKeySize = %u\n", info.dwKeySize); release_cert_info(&info); }

1 0

Matteo Bruni : wined3d: Check ARB_TEXTURE_COMPRESSION_RGTC for applying the correct fixup.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: dd923c3029fa4de25b5135c24edc6899c308b563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd923c3029fa4de25b5135c24… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 29 18:01:50 2014 +0100 wined3d: Check ARB_TEXTURE_COMPRESSION_RGTC for applying the correct fixup. --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e969fa7..b9d60de 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2018,7 +2018,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ */ } - if (gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) + if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) { idx = getFmtIdx(WINED3DFMT_ATI2N); gl_info->formats[idx].color_fixup = create_color_fixup_desc(

1 0

Michael Stefaniuc : d3drm: Pass the correct pointer to IDirectXFileData_GetData (PVS-Studio).
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 0726542dedf481d3eb8c01825da038a71c5363c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0726542dedf481d3eb8c01825… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 11:24:20 2014 +0100 d3drm: Pass the correct pointer to IDirectXFileData_GetData (PVS-Studio). Also remove an uneeded initialization of "size" as that is purely an [OUT] parameter. --- dlls/d3drm/d3drm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 06850bc..92ac272 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1240,17 +1240,16 @@ static HRESULT load_data(IDirect3DRM3 *iface, IDirectXFileData *data_object, IID /* Cannot be requested */ if (parent_frame) { - D3DRMMATRIX4D matrix; + D3DRMMATRIX4D *matrix; DWORD size; TRACE("Load Frame Transform Matrix data\n"); - size = sizeof(matrix); - hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)matrix); + hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)&matrix); if ((hr != DXFILE_OK) || (size != sizeof(matrix))) goto end; - hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, matrix); + hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, *matrix); if (FAILED(hr)) goto end; }

1 0

Nikolay Sivov : msxml3: Return S_FALSE in getNamedItem() of PI node.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 04305134486cadfb78643a8796ab6a13fec6c202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04305134486cadfb78643a879… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 30 11:06:27 2014 +0300 msxml3: Return S_FALSE in getNamedItem() of PI node. --- dlls/msxml3/pi.c | 4 +++- dlls/msxml3/tests/domdoc.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 6b8fc12..96fb118 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -685,7 +685,9 @@ static HRESULT dom_pi_get_qualified_item(const xmlNodePtr node, BSTR name, BSTR static HRESULT dom_pi_get_named_item(const xmlNodePtr node, BSTR name, IXMLDOMNode **item) { FIXME("(%p)->(%s %p): stub\n", node, debugstr_w(name), item ); - return E_NOTIMPL; + if (item) + *item = NULL; + return S_FALSE; } static HRESULT dom_pi_set_named_item(xmlNodePtr node, IXMLDOMNode *newItem, IXMLDOMNode **namedItem) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 038df04..b768260 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9152,6 +9152,11 @@ static void test_get_attributes(void) hr = IXMLDOMNode_get_attributes(node, &map); ok(hr == S_OK, "got %08x\n", hr); + node2 = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getNamedItem(map, _bstr_("attr"), &node2); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(node2 == NULL, "got %p\n", node2); + length = -1; hr = IXMLDOMNamedNodeMap_get_length(map, &length); EXPECT_HR(hr, S_OK);

1 0

Huw Davies : comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 433df0d5d8763e24772e60168bb8f1a664bd9ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=433df0d5d8763e24772e60168… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 28 15:01:18 2014 +0000 comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID. --- dlls/comctl32/propsheet.c | 21 +++++---------------- dlls/comctl32/tests/propsheet.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 0dd1ca7..5de0deb 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2430,15 +2430,16 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON); HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON); HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); + BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); TRACE("%d\n", dwFlags); - EnableWindow(hwndBack, FALSE); - EnableWindow(hwndNext, FALSE); - EnableWindow(hwndFinish, FALSE); + EnableWindow(hwndBack, dwFlags & PSWIZB_BACK); + EnableWindow(hwndNext, dwFlags & PSWIZB_NEXT); + EnableWindow(hwndFinish, enable_finish); /* set the default pushbutton to an enabled button */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + if (enable_finish) SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); else if (dwFlags & PSWIZB_NEXT) SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); @@ -2447,13 +2448,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) else SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); - - if (dwFlags & PSWIZB_BACK) - EnableWindow(hwndBack, TRUE); - - if (dwFlags & PSWIZB_NEXT) - EnableWindow(hwndNext, TRUE); - if (!psInfo->hasFinish) { if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH)) @@ -2463,9 +2457,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) /* Show the Finish button */ ShowWindow(hwndFinish, SW_SHOW); - - if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); } else { @@ -2475,8 +2466,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) ShowWindow(hwndNext, SW_SHOW); } } - else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); } /****************************************************************************** diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index d3112d5..2797e94 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -279,6 +279,37 @@ static INT_PTR CALLBACK nav_page_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM return FALSE; } +static WNDPROC old_nav_dialog_proc; + +static LRESULT CALLBACK new_nav_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case DM_SETDEFID: + ok( IsWindowEnabled( GetDlgItem(hwnd, wp) ), "button is not enabled\n" ); + break; + } + return CallWindowProcW( old_nav_dialog_proc, hwnd, msg, wp, lp ); +} + +static LRESULT CALLBACK hook_proc( int code, WPARAM wp, LPARAM lp ) +{ + static BOOL done; + if (code == HCBT_CREATEWND) + { + CBT_CREATEWNDW *c = (CBT_CREATEWNDW *)lp; + + /* The first dialog created will be the parent dialog */ + if (!done && c->lpcs->lpszClass == MAKEINTRESOURCEW(WC_DIALOG)) + { + old_nav_dialog_proc = (WNDPROC)SetWindowLongPtrW( (HWND)wp, GWLP_WNDPROC, (LONG_PTR)new_nav_dialog_proc ); + done = TRUE; + } + } + + return CallNextHookEx( NULL, code, wp, lp ); +} + static void test_wiznavigation(void) { HPROPSHEETPAGE hpsp[4]; @@ -291,6 +322,10 @@ static void test_wiznavigation(void) BOOL hwndtoindex_supported = TRUE; const INT nextID = 12324; const INT backID = 12323; + HHOOK hook; + + /* set up a hook proc in order to subclass the main dialog early on */ + hook = SetWindowsHookExW( WH_CBT, hook_proc, NULL, GetCurrentThreadId() ); /* create the property sheet pages */ memset(psp, 0, sizeof(PROPSHEETPAGEA) * 4); @@ -400,6 +435,7 @@ static void test_wiznavigation(void) ok(defidres == MAKELRESULT(nextID, DC_HASDEFID), "Expected default button ID to be %d, is %d\n", nextID, LOWORD(defidres)); DestroyWindow(hdlg); + UnhookWindowsHookEx( hook ); } static void test_buttons(void)

1 0

Jacek Caban : mshtml: Don' t call stop_binding in error cases in start_binding.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 0506a52266a0243a01338208830fa3da059f9358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0506a52266a0243a013382088… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 29 18:00:49 2014 +0100 mshtml: Don't call stop_binding in error cases in start_binding. --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a0174ea..0b3d5b5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -801,7 +801,7 @@ HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBi } if(FAILED(hres)) { - bscallback->vtbl->stop_binding(bscallback, hres); + bscallback->window = NULL; return hres; } @@ -809,7 +809,7 @@ HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBi IBindCtx_Release(bctx); if(FAILED(hres)) { WARN("BindToStorage failed: %08x\n", hres); - bscallback->vtbl->stop_binding(bscallback, hres); + bscallback->window = NULL; return hres; }

1 0

Vincent Povirk : gdiplus: Fix error when drawing from a rectangle outside bitmap bounds.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 4361cbabd7c133184f487719232b3341e760b1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4361cbabd7c133184f4877192… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 28 16:09:57 2014 -0500 gdiplus: Fix error when drawing from a rectangle outside bitmap bounds. --- dlls/gdiplus/graphics.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d192bf2..840d866 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -827,6 +827,10 @@ static void get_bitmap_sample_size(InterpolationMode interpolation, WrapMode wra right = bitmap->width-1; if (bottom >= bitmap->height) bottom = bitmap->height-1; + if (bottom < top || right < left) + /* entirely outside image, just sample a pixel so we don't have to + * special-case this later */ + left = top = right = bottom = 0; } else {

1 0

Nikolay Sivov : dwrite: Properly null-terminate name string when converting to WCHAR.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 2bc984a5b1eafa23944fdee26526c342329da870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc984a5b1eafa23944fdee26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 29 22:39:55 2014 +0300 dwrite: Properly null-terminate name string when converting to WCHAR. --- dlls/dwrite/opentype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 21b1cb2..6d48f90 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -793,8 +793,9 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA if (codepage) { DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); - name_string = heap_alloc(sizeof(WCHAR) * len); + name_string = heap_alloc(sizeof(WCHAR) * (len+1)); MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, name_string, len); + name_string[len] = 0; } else { int i;

1 0

Nikolay Sivov : dwrite: Implement system font collection as any other font collection.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: cae5d19338099f3ae8a57fcaf7c8bf46a2d79538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae5d19338099f3ae8a57fcaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 29 22:41:47 2014 +0300 dwrite: Implement system font collection as any other font collection. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 631 +++++++++++++++---------------------------- dlls/dwrite/main.c | 2 +- dlls/dwrite/tests/font.c | 39 +-- 4 files changed, 225 insertions(+), 449 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cae5d19338099f3ae8a57…

1 0

Nikolay Sivov : dwrite: Turn fixme to trace in Analyze().
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 712692161573fc03fa7ef127e957088dc43a7b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=712692161573fc03fa7ef127e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 29 22:43:51 2014 +0300 dwrite: Turn fixme to trace in Analyze(). --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 622027c..8420fdc 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1792,7 +1792,7 @@ static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSup IDWriteFontFileStream *stream; HRESULT hr; - FIXME("(%p)->(%p, %p, %p, %p): Stub\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); + TRACE("(%p)->(%p, %p, %p, %p)\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); *isSupportedFontType = FALSE; *fontFileType = DWRITE_FONT_FILE_TYPE_UNKNOWN;

1 0