September 2014 - Wine-commits

Francois Gouget : comdlg32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: e9e76d823fa12e2e62cf9274939fec34dfe00e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e76d823fa12e2e62cf92749… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 4 10:01:17 2014 +0200 comdlg32/tests: Add a trailing '\n' to an ok() call. --- dlls/comdlg32/tests/itemdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 6a6c450..d3efb88 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -191,7 +191,7 @@ static LRESULT CALLBACK test_customize_dlgproc(HWND hwnd, UINT message, WPARAM w case IDT_CLOSEDIALOG: /* Calling IFileDialog_Close here does not work */ br = PostMessageW(hwnd, WM_COMMAND, IDCANCEL, 0); - ok(br, "Failed"); + ok(br, "Failed\n"); return TRUE; } }

1 0

Jacek Caban : wininet/tests: Fixed security flags tests on IE11.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: 4cda419575e11a29d65d995c764ce616f3964ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cda419575e11a29d65d995c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 4 11:34:59 2014 +0200 wininet/tests: Fixed security flags tests on IE11. --- dlls/wininet/tests/http.c | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3d09917..0a840a2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -32,6 +32,12 @@ #include "wine/test.h" +/* Undocumented security flags */ +#define _SECURITY_FLAG_CERT_REV_FAILED 0x00800000 +#define _SECURITY_FLAG_CERT_INVALID_CA 0x01000000 +#define _SECURITY_FLAG_CERT_INVALID_CN 0x02000000 +#define _SECURITY_FLAG_CERT_INVALID_DATE 0x04000000 + #define TEST_URL "http://test.winehq.org/tests/hello.html" static BOOL first_connection_to_test_url = TRUE; @@ -4251,8 +4257,8 @@ static void _test_security_info(unsigned line, const char *urlc, DWORD error, DW } } -#define test_secflags_option(a,b) _test_secflags_option(__LINE__,a,b) -static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) +#define test_secflags_option(a,b,c) _test_secflags_option(__LINE__,a,b,c) +static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags, DWORD opt_flags) { DWORD flags, size; BOOL res; @@ -4261,14 +4267,16 @@ static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) size = sizeof(flags); res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); ok_(__FILE__,line)(res, "InternetQueryOptionW(INTERNET_OPTION_SECURITY_FLAGS) failed: %u\n", GetLastError()); - ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", flags, ex_flags); + ok_(__FILE__,line)((flags & ~opt_flags) == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", + flags, ex_flags); /* Option 98 is undocumented and seems to be the same as INTERNET_OPTION_SECURITY_FLAGS */ flags = 0xdeadbeef; size = sizeof(flags); res = InternetQueryOptionW(req, 98, &flags, &size); ok_(__FILE__,line)(res, "InternetQueryOptionW(98) failed: %u\n", GetLastError()); - ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS(98) flags = %x, expected %x\n", flags, ex_flags); + ok_(__FILE__,line)((flags & ~opt_flags) == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS(98) flags = %x, expected %x\n", + flags, ex_flags); } #define set_secflags(a,b,c) _set_secflags(__LINE__,a,b,c) @@ -4321,17 +4329,17 @@ static void test_security_flags(void) return; } - test_secflags_option(req, 0); + test_secflags_option(req, 0, 0); test_security_info("https://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_REVOCATION); - test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION, 0); set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_CERT_CN_INVALID); - test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID, 0); set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); - test_secflags_option(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID); + test_secflags_option(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID, 0); flags = SECURITY_FLAG_IGNORE_CERT_CN_INVALID|SECURITY_FLAG_SECURE; res = InternetSetOptionW(req, 99, &flags, sizeof(flags)); @@ -4375,7 +4383,7 @@ static void test_security_flags(void) test_request_flags(req, 0); test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA - |SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID|SECURITY_FLAG_STRENGTH_STRONG); + |SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID|SECURITY_FLAG_STRENGTH_STRONG, 0); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); @@ -4460,10 +4468,12 @@ static void test_security_flags(void) ok(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "HttpQueryInfoA(HTTP_QUERY_CONTENT_ENCODING) failed: %u\n", GetLastError()); test_request_flags(req, 8); - test_secflags_option(req, 0x800000); + /* IE11 finds both rev failure and invalid CA. Previous versions required rev failure + to be ignored before invalid CA was reported. */ + test_secflags_option(req, _SECURITY_FLAG_CERT_REV_FAILED, _SECURITY_FLAG_CERT_INVALID_CA); set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_REVOCATION); - test_secflags_option(req, 0x800000|SECURITY_FLAG_IGNORE_REVOCATION); + test_secflags_option(req, _SECURITY_FLAG_CERT_REV_FAILED|SECURITY_FLAG_IGNORE_REVOCATION, _SECURITY_FLAG_CERT_INVALID_CA); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -4488,12 +4498,12 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); test_request_flags(req, INTERNET_REQFLAG_NO_HEADERS); - test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); test_security_info("https://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); - test_secflags_option(req, 0x1800000|SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_UNKNOWN_CA - |SECURITY_FLAG_IGNORE_REVOCATION); + test_secflags_option(req, _SECURITY_FLAG_CERT_INVALID_CA|_SECURITY_FLAG_CERT_REV_FAILED + |SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_UNKNOWN_CA, 0); test_http_version(req); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -4530,10 +4540,11 @@ static void test_security_flags(void) test_request_flags(req, 0); test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION - |SECURITY_FLAG_STRENGTH_STRONG|0x1800000); + |SECURITY_FLAG_STRENGTH_STRONG|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); test_cert_struct(req, &test_winehq_com_cert); - test_security_info("https://test.winehq.com/data/some_file.html?q", 0, 0x1800000); + test_security_info("https://test.winehq.com/data/some_file.html?q", 0, + _SECURITY_FLAG_CERT_INVALID_CA|_SECURITY_FLAG_CERT_REV_FAILED); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); @@ -4566,7 +4577,7 @@ static void test_security_flags(void) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG - |SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); + |SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); test_http_version(req); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -4601,7 +4612,7 @@ static void test_security_flags(void) test_request_flags(req, 0); test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG - |SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); + |SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError());

1 0

David Hedberg : comdlg32: ::SetFileTypeIndex and :: GetFileTypeIndex uses a one-based index.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: 7b7f4c613f2f5efbe40b4d1bcdec5f1b0bdf01a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7f4c613f2f5efbe40b4d1bc… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Sep 3 22:58:26 2014 +0200 comdlg32: ::SetFileTypeIndex and ::GetFileTypeIndex uses a one-based index. --- dlls/comdlg32/itemdlg.c | 12 +++++++----- dlls/comdlg32/tests/itemdlg.c | 22 +++++++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index c3197ab..a6b45f8 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1880,10 +1880,9 @@ static HRESULT WINAPI IFileDialog2_fnSetFileTypeIndex(IFileDialog2 *iface, UINT if(!This->filterspecs) return E_FAIL; - if(iFileType >= This->filterspec_count) - This->filetypeindex = This->filterspec_count - 1; - else - This->filetypeindex = iFileType; + iFileType = max(iFileType, 1); + iFileType = min(iFileType, This->filterspec_count); + This->filetypeindex = iFileType-1; return S_OK; } @@ -1896,7 +1895,10 @@ static HRESULT WINAPI IFileDialog2_fnGetFileTypeIndex(IFileDialog2 *iface, UINT if(!piFileType) return E_INVALIDARG; - *piFileType = This->filetypeindex; + if(This->filterspec_count == 0) + *piFileType = 0; + else + *piFileType = This->filetypeindex + 1; return S_OK; } diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d3efb88..d65c459 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -643,8 +643,6 @@ static void test_basics(void) hr = IFileOpenDialog_SetFileTypes(pfod, 0, filterspec); ok(hr == S_OK, "got 0x%08x.\n", hr); - hr = IFileOpenDialog_SetFileTypeIndex(pfod, -1); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 0); ok(hr == E_FAIL, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 1); @@ -655,25 +653,39 @@ static void test_basics(void) ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 0); ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_GetFileTypeIndex(pfod, &filetype); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(filetype == 1, "got %d\n", filetype); hr = IFileOpenDialog_SetFileTypeIndex(pfod, 100); ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_GetFileTypeIndex(pfod, &filetype); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(filetype == 1, "got %d\n", filetype); hr = IFileOpenDialog_SetFileTypes(pfod, 1, filterspec); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypes(pfod, 1, &filterspec[1]); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); - hr = IFileSaveDialog_SetFileTypeIndex(pfsd, -1); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); hr = IFileSaveDialog_SetFileTypeIndex(pfsd, 0); ok(hr == E_FAIL, "got 0x%08x.\n", hr); hr = IFileSaveDialog_SetFileTypeIndex(pfsd, 1); ok(hr == E_FAIL, "got 0x%08x.\n", hr); - hr = IFileSaveDialog_SetFileTypes(pfsd, 1, filterspec); + hr = IFileSaveDialog_SetFileTypes(pfsd, 2, filterspec); ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetFileTypeIndex(pfsd, &filetype); + ok(hr == S_OK, "got 0x%08x.\n", hr); + /* I hope noone relies on this one */ + todo_wine ok(filetype == 0, "got %d\n", filetype); hr = IFileSaveDialog_SetFileTypeIndex(pfsd, 0); ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetFileTypeIndex(pfsd, &filetype); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(filetype == 1, "got %d\n", filetype); hr = IFileSaveDialog_SetFileTypeIndex(pfsd, 100); ok(hr == S_OK, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetFileTypeIndex(pfsd, &filetype); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(filetype == 2, "got %d\n", filetype); hr = IFileSaveDialog_SetFileTypes(pfsd, 1, filterspec); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileSaveDialog_SetFileTypes(pfsd, 1, &filterspec[1]);

1 0

David Hedberg : comdlg32: Set BS_MULTILINE also for check buttons.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: dc7f17ee14321100a9e812190add3e122f1e58e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7f17ee14321100a9e812190… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Sep 3 22:58:27 2014 +0200 comdlg32: Set BS_MULTILINE also for check buttons. --- dlls/comdlg32/itemdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index a6b45f8..0426488 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -3265,7 +3265,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddCheckButton(IFileDialogCustomize HRESULT hr; TRACE("%p (%d, %p, %d)\n", This, dwIDCtl, pszLabel, bChecked); - hr = cctrl_create_new(This, dwIDCtl, pszLabel, WC_BUTTONW, BS_AUTOCHECKBOX, 0, + hr = cctrl_create_new(This, dwIDCtl, pszLabel, WC_BUTTONW, BS_AUTOCHECKBOX|BS_MULTILINE, 0, This->cctrl_def_height, &ctrl); if(SUCCEEDED(hr)) {

1 0

David Hedberg : comdlg32: Expand the filetype combobox dropdown to fit the contents.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: d495cc37a676eaafd3af5585adf2bf012b7cceda URL: http://source.winehq.org/git/wine.git/?a=commit;h=d495cc37a676eaafd3af5585a… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Sep 3 22:58:28 2014 +0200 comdlg32: Expand the filetype combobox dropdown to fit the contents. --- dlls/comdlg32/comdlg32.rc | 2 +- dlls/comdlg32/itemdlg.c | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 3118610..d3deeab 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -487,7 +487,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT - COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | + COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_HASSTRINGS | CBS_DROPDOWNLIST DEFPUSHBUTTON "&Open", IDOK, 350, 240, 40, 14, WS_GROUP diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 0426488..3b97111 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1535,10 +1535,32 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) hitem = GetDlgItem(This->dlg_hwnd, IDC_FILETYPE); if(This->filterspec_count) { - UINT i; + HDC hdc; + HFONT font; + SIZE size; + UINT i, maxwidth = 0; + + hdc = GetDC(hitem); + font = (HFONT)SendMessageW(hitem, WM_GETFONT, 0, 0); + SelectObject(hdc, font); + for(i = 0; i < This->filterspec_count; i++) + { SendMessageW(hitem, CB_ADDSTRING, 0, (LPARAM)This->filterspecs[i].pszName); + if(GetTextExtentPoint32W(hdc, This->filterspecs[i].pszName, lstrlenW(This->filterspecs[i].pszName), &size)) + maxwidth = max(maxwidth, size.cx); + } + ReleaseDC(hitem, hdc); + + if(maxwidth > 0) + { + maxwidth += GetSystemMetrics(SM_CXVSCROLL) + 4; + SendMessageW(hitem, CB_SETDROPPEDWIDTH, (WPARAM)maxwidth, 0); + } + else + ERR("Failed to calculate width of filetype dropdown\n"); + SendMessageW(hitem, CB_SETCURSEL, This->filetypeindex, 0); } else

1 0

Stefan Dösinger : ddrawex: Don't leak surfaces.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: 28850ae5f84b2d1746de52dc1c915e0a6bb5f824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28850ae5f84b2d1746de52dc1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 4 13:18:16 2014 +0200 ddrawex: Don't leak surfaces. dds_get_outer AddRefs the inner surface when it creates the wrapper surface. The wrapper releases only one reference when it is destroyed, leaking one of the two. AddRefing in dds_get_outer makes sense because this is also used by e.g. GetAttachedSurface, where it creates a new wrapper for surfaces ddrawex didn't know about yet. --- dlls/ddrawex/ddraw.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index af23c89..b32f726 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -338,6 +338,7 @@ static HRESULT WINAPI ddrawex4_CreateSurface(IDirectDraw4 *iface, DDSURFACEDESC2 HRESULT hr; const DWORD perm_dc_flags = DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY; BOOL permanent_dc; + IDirectDrawSurface4 *inner_surface; TRACE("iface %p, desc %p, surface %p, outer_unknown %p.\n", iface, desc, surface, outer_unknown); @@ -362,8 +363,17 @@ static HRESULT WINAPI ddrawex4_CreateSurface(IDirectDraw4 *iface, DDSURFACEDESC2 permanent_dc = FALSE; } - hr = IDirectDraw4_CreateSurface(ddrawex->parent, desc, surface, outer_unknown); - *surface = dds_get_outer(*surface); + hr = IDirectDraw4_CreateSurface(ddrawex->parent, desc, &inner_surface, outer_unknown); + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + + *surface = dds_get_outer(inner_surface); + /* The wrapper created by dds_get_outer holds a reference to its inner surface. */ + IDirectDrawSurface4_Release(inner_surface); + if (permanent_dc) prepare_permanent_dc(*surface);

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetDpi().
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: 3e2a7493e0cb13a59ec7ebaccacaa6cda062ba3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2a7493e0cb13a59ec7ebacc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 4 08:14:29 2014 +0200 d2d1: Implement d2d_d3d_render_target_GetDpi(). --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/render_target.c | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 925fafb..5bbac5c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -31,6 +31,8 @@ struct d2d_d3d_render_target D2D1_SIZE_U pixel_size; D2D1_MATRIX_3X2_F transform; + float dpi_x; + float dpi_y; }; HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 2c079a3..39b0dad 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -466,10 +466,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1RenderTarget *if static void STDMETHODCALLTYPE d2d_d3d_render_target_GetDpi(ID2D1RenderTarget *iface, float *dpi_x, float *dpi_y) { - FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); - *dpi_x = 96.0f; - *dpi_y = 96.0f; + *dpi_x = render_target->dpi_x; + *dpi_y = render_target->dpi_y; } static D2D1_SIZE_F STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1RenderTarget *iface) @@ -593,6 +595,14 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, render_target->pixel_size.width = surface_desc.Width; render_target->pixel_size.height = surface_desc.Height; render_target->transform = identity; + render_target->dpi_x = desc->dpiX; + render_target->dpi_y = desc->dpiY; + + if (render_target->dpi_x == 0.0f && render_target->dpi_y == 0.0f) + { + render_target->dpi_x = 96.0f; + render_target->dpi_y = 96.0f; + } return S_OK; }

1 0

Sebastian Lackner : msi: Fix ITERATE_MoveFiles when no source- and destname is specified.
by Alexandre Julliard 04 Sep '14

04 Sep '14

Module: wine Branch: master Commit: 582f2640d2828da6d010d27715a30e13d0dc8adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=582f2640d2828da6d010d2771… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 14 01:39:13 2014 +0200 msi: Fix ITERATE_MoveFiles when no source- and destname is specified. --- dlls/msi/files.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index ec46ae3..62e5f43 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -843,7 +843,13 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) { if (!wildcards) { - destname = strdupW(sourcename); + WCHAR *p; + if (sourcename) + destname = strdupW(sourcename); + else if ((p = strrchrW(sourcedir, '\\'))) + destname = strdupW(p + 1); + else + destname = strdupW(sourcedir); if (!destname) goto done; }

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_EndDraw().
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 53d0c20526014a61b56aa0f9b8c159d9477d7b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d0c20526014a61b56aa0f9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 07:48:22 2014 +0200 d2d1: Implement d2d_d3d_render_target_EndDraw(). Tag1/tag2 are "error tags". You set them with SetTags(), and if a subsequent drawing operation generates an error, EndDraw() will return the error code and tags that were set when the error occurred. --- dlls/d2d1/render_target.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index d6db977..3897a1c 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -440,9 +440,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_BeginDraw(ID2D1RenderTarget static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); + TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - return E_NOTIMPL; + if (tag1) + *tag1 = 0; + if (tag2) + *tag2 = 0; + + return S_OK; } static D2D1_PIXEL_FORMAT STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1RenderTarget *iface)

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetPixelSize().
by Alexandre Julliard 03 Sep '14

03 Sep '14

Module: wine Branch: master Commit: 5295edbd3a139d4280019c35f7bb8dc8c8744a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5295edbd3a139d4280019c35f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 07:48:23 2014 +0200 d2d1: Implement d2d_d3d_render_target_GetPixelSize(). --- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/factory.c | 8 +++++++- dlls/d2d1/render_target.c | 21 +++++++++++++++++---- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 001c986..925fafb 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -29,10 +29,11 @@ struct d2d_d3d_render_target ID2D1RenderTarget ID2D1RenderTarget_iface; LONG refcount; + D2D1_SIZE_U pixel_size; D2D1_MATRIX_3X2_F transform; }; -void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, +HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; struct d2d_gradient diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 0bc465e..f8cd912 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -191,13 +191,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { struct d2d_d3d_render_target *object; + HRESULT hr; TRACE("iface %p, surface %p, desc %p, render_target %p.\n", iface, surface, desc, render_target); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_d3d_render_target_init(object, iface, surface, desc); + if (FAILED(hr = d2d_d3d_render_target_init(object, iface, surface, desc))) + { + WARN("Failed to initialize render target, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } TRACE("Created render target %p.\n", object); *render_target = &object->ID2D1RenderTarget_iface; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 3897a1c..2c079a3 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -483,11 +483,11 @@ static D2D1_SIZE_F STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1RenderTa static D2D1_SIZE_U STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelSize(ID2D1RenderTarget *iface) { - static const D2D1_SIZE_U size = {0, 0}; + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); - return size; + return render_target->pixel_size; } static UINT32 STDMETHODCALLTYPE d2d_d3d_render_target_GetMaximumBitmapSize(ID2D1RenderTarget *iface) @@ -566,9 +566,12 @@ static const struct ID2D1RenderTargetVtbl d2d_d3d_render_target_vtbl = d2d_d3d_render_target_IsSupported, }; -void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, +HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { + DXGI_SURFACE_DESC surface_desc; + HRESULT hr; + static const D2D1_MATRIX_3X2_F identity = { 1.0f, 0.0f, @@ -581,5 +584,15 @@ void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2 render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; render_target->refcount = 1; + if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) + { + WARN("Failed to get surface desc, hr %#x.\n", hr); + return hr; + } + + render_target->pixel_size.width = surface_desc.Width; + render_target->pixel_size.height = surface_desc.Height; render_target->transform = identity; + + return S_OK; }

1 0