August 2018 - Wine-commits - list.winehq.org

Józef Kucia : d3d10core/tests: Add a test for CopySubresourceRegion() with 1D textures.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 958c93104e4a6bd08aa7d97ae5931ff0422fe17d URL: https://source.winehq.org/git/wine.git/?a=commit;h=958c93104e4a6bd08aa7d97a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 20 13:09:27 2018 +0200 d3d10core/tests: Add a test for CopySubresourceRegion() with 1D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 87 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8c95ee3..569c8ee 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9241,6 +9241,92 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } +static void test_copy_subresource_region_1d(void) +{ + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data[4]; + D3D10_TEXTURE1D_DESC texture1d_desc; + D3D10_TEXTURE2D_DESC texture2d_desc; + struct resource_readback rb; + ID3D10Texture1D *texture1d; + ID3D10Texture2D *texture2d; + ID3D10Device *device; + unsigned int i, j; + D3D10_BOX box; + DWORD color; + HRESULT hr; + + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + texture1d_desc.Width = 4; + texture1d_desc.MipLevels = 1; + texture1d_desc.ArraySize = 4; + texture1d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture1d_desc.Usage = D3D10_USAGE_DEFAULT; + texture1d_desc.BindFlags = 0; + texture1d_desc.CPUAccessFlags = 0; + texture1d_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + resource_data[i].pSysMem = &bitmap_data[4 * i]; + resource_data[i].SysMemPitch = texture1d_desc.Width * sizeof(bitmap_data); + resource_data[i].SysMemSlicePitch = 0; + } + + hr = ID3D10Device_CreateTexture1D(device, &texture1d_desc, resource_data, &texture1d); + ok(hr == S_OK, "Failed to create 1d texture, hr %#x.\n", hr); + + texture2d_desc.Width = 4; + texture2d_desc.Height = 4; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D10_USAGE_DEFAULT; + texture2d_desc.BindFlags = 0; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture2d_desc, NULL, &texture2d); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, 4, 1, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)texture2d, 0, + 0, i, 0, (ID3D10Resource *)texture1d, i, &box); + } + + get_texture_readback(texture2d, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, j, i); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D10Texture1D_Release(texture1d); + ID3D10Texture2D_Release(texture2d); + release_test_context(&test_context); +} + #define check_buffer_cpu_access(a, b, c, d) check_buffer_cpu_access_(__LINE__, a, b, c, d) static void check_buffer_cpu_access_(unsigned int line, ID3D10Buffer *buffer, D3D10_USAGE usage, UINT bind_flags, UINT cpu_access) @@ -17112,6 +17198,7 @@ START_TEST(device) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); + test_copy_subresource_region_1d(); test_resource_access(); test_check_multisample_quality_levels(); test_cb_relative_addressing();

1 0

Jactry Zeng : riched20: Initialize style_list before ME_MakeFirstParagraph ().
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 0120e35a7d5ac2d13a052e664441f0b23d39645a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0120e35a7d5ac2d13a052e66… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Aug 20 22:03:40 2018 +0800 riched20: Initialize style_list before ME_MakeFirstParagraph(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8020117..12f1fa6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3047,6 +3047,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->pBuffer = ME_MakeText(); ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->nAvailWidth = 0; /* wrap to client area */ + list_init( &ed->style_list ); ME_MakeFirstParagraph(ed); /* The four cursors are for: * 0 - The position where the caret is shown @@ -3146,7 +3147,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->wheel_remain = 0; - list_init( &ed->style_list ); list_init( &ed->reobj_list ); OleInitialize(NULL);

1 0

Jactry Zeng : riched20: Call ITextHost_TxGetCharFormat() for setting default charformat.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 13e523297e719424edaff600335c499f6056b0aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e523297e719424edaff600… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Aug 20 22:03:49 2018 +0800 riched20: Call ITextHost_TxGetCharFormat() for setting default charformat. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 9 +++++++++ dlls/riched20/tests/txtsrv.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index f2a70e5..8f35342 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -36,6 +36,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; CHARFORMAT2W cf; + const CHARFORMATW *host_cf; LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; @@ -76,6 +77,14 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) style = ME_MakeStyle(&cf); text->pDefaultStyle = style; + if (ITextHost_TxGetCharFormat(editor->texthost, &host_cf) == S_OK) + { + ZeroMemory(&cf, sizeof(cf)); + cf.cbSize = sizeof(cf); + cfany_to_cf2w(&cf, (CHARFORMAT2W *)host_cf); + ME_SetDefaultCharFormat(editor, &cf); + } + eol_len = editor->bEmulateVersion10 ? 2 : 1; para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 5d312ca..4dee5fd 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -85,6 +85,7 @@ typedef struct ITextHostTestImpl { ITextHost ITextHost_iface; LONG refCount; + CHARFORMAT2W char_format; } ITextHostTestImpl; static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) @@ -330,7 +331,8 @@ static HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface, { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetCharFormat(%p, ppCF=%p)\n", This, ppCF); - return E_NOTIMPL; + *ppCF = (CHARFORMATW *)&This->char_format; + return S_OK; } static HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, @@ -624,6 +626,7 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; + HFONT hf; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -632,6 +635,11 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; dummyTextHost->refCount = 1; + memset(&dummyTextHost->char_format, 0, sizeof(dummyTextHost->char_format)); + dummyTextHost->char_format.cbSize = sizeof(dummyTextHost->char_format); + dummyTextHost->char_format.dwMask = CFM_ALL2; + hf = GetStockObject(DEFAULT_GUI_FONT); + hf_to_cf(hf, &dummyTextHost->char_format); /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a @@ -952,6 +960,36 @@ static void test_QueryInterface(void) ITextHost_Release(host); } +static void test_default_format(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT result; + LRESULT lresult; + CHARFORMAT2W cf2; + const CHARFORMATW *host_cf; + DWORD expected_effects; + + if (!init_texthost(&txtserv, &host)) + return; + + cf2.cbSize = sizeof(CHARFORMAT2W); + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + + ITextHostImpl_TxGetCharFormat(host, &host_cf); + ok(!lstrcmpW(host_cf->szFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); + ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, host_cf->yHeight); + expected_effects = (cf2.dwEffects & ~(CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)); + ok(host_cf->dwEffects == expected_effects , "got wrong dwEffects: %x, expetced %x.\n", cf2.dwEffects, expected_effects); + ok(cf2.bPitchAndFamily == host_cf->bPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", + cf2.bPitchAndFamily, host_cf->bPitchAndFamily); + ok(cf2.bCharSet == host_cf->bCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, host_cf->bCharSet); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -982,6 +1020,7 @@ START_TEST( txtsrv ) test_TxGetNaturalSize(); test_TxDraw(); test_QueryInterface(); + test_default_format(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); }

1 0

Alistair Leslie-Hughes : wininet: Always copy the password even if blank.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 6552ddaaa5c189db504e81a2360bbf4b2f6325a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6552ddaaa5c189db504e81a2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Aug 5 11:06:58 2018 +0000 wininet: Always copy the password even if blank. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c699c5b..75784da 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5809,8 +5809,7 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->hostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) session->userName = heap_strdupW(lpszUserName); - if (lpszPassword && lpszPassword[0]) - session->password = heap_strdupW(lpszPassword); + session->password = heap_strdupW(lpszPassword); session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; session->send_timeout = 0;

1 0

Zebediah Figura : msi: Don' t assume that WoW64 redirection is enabled in custom_start_server().
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 51ad009bacd297c0607bc6de4d5dae18afe6ea98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51ad009bacd297c0607bc6de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 18 22:19:40 2018 -0500 msi: Don't assume that WoW64 redirection is enabled in custom_start_server(). As of 3a884c2ef the server is started on the main thread, so this is no longer a valid assumption. In particular, we disable WoW64 redirection while running standard actions, including the top-level INSTALL action. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45663 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index cd37a56..ee259e8 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -601,14 +601,17 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) if (pipe == INVALID_HANDLE_VALUE) ERR("Failed to create custom action client pipe: %u\n", GetLastError()); - if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) + if (!IsWow64Process(GetCurrentProcess(), &wow64)) + wow64 = FALSE; + + if ((sizeof(void *) == 8 || wow64) && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); else GetSystemDirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); strcatW(path, msiexecW); sprintfW(cmdline, argsW, path, GetCurrentProcessId()); - if (IsWow64Process(GetCurrentProcess(), &wow64) && wow64 && arch == SCS_64BIT_BINARY) + if (wow64 && arch == SCS_64BIT_BINARY) { Wow64DisableWow64FsRedirection(&cookie); CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);

1 0

Alex Henrie : shell32: Add Internet icon.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 44bb2c88307a9f538f73dbd454c08922dc4b1c3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=44bb2c88307a9f538f73dbd4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:53 2018 -0600 shell32: Add Internet icon. Adapted from internet-web-browser.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/internet.ico | Bin 0 -> 78510 bytes dlls/shell32/internet.svg | 2614 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + 4 files changed, 2618 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44bb2c88307a9f538f73…

1 0

Alex Henrie : shell32: Add network icon.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 891b6fda83aff5f304c49cb9886587626ab221dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=891b6fda83aff5f304c49cb9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:54 2018 -0600 shell32: Add network icon. Adapted from network-workgroup.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/network.ico | Bin 0 -> 47208 bytes dlls/shell32/network.svg | 2727 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + 4 files changed, 2731 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=891b6fda83aff5f304c4…

1 0

Alex Henrie : shell32: Switch the "My Network Places" icon to the network icon.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: f094a3d198ced493faf552b5543871719d411463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f094a3d198ced493faf552b5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:55 2018 -0600 shell32: Switch the "My Network Places" icon to the network icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0eac3a1..15ffb33 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -480,6 +480,9 @@ IDI_SHELL_MY_COMPUTER ICON mycomputer.ico /* @makedep: printer.ico */ IDI_SHELL_PRINTER ICON printer.ico +/* @makedep: network.ico */ +IDI_SHELL_MY_NETWORK_PLACES ICON network.ico + /* @makedep: shortcut.ico */ IDI_SHELL_SHORTCUT ICON shortcut.ico @@ -503,10 +506,6 @@ IDI_SHELL_MY_DOCUMENTS ICON mydocs.ico /* FIXME: Following resource is not yet added */ /* @makedep: mydocs.ico */ -IDI_SHELL_MY_NETWORK_PLACES ICON mydocs.ico - -/* FIXME: Following resource is not yet added */ -/* @makedep: mydocs.ico */ IDI_SHELL_FAVORITES ICON mydocs.ico /* @makedep: idb_tb_large.bmp */

1 0

Alex Henrie : shell32: Add "Computers Near Me" icon.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: f0c1f79b07675bc9eb42fc1cd8af7847db153c3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c1f79b07675bc9eb42fc1c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:56 2018 -0600 shell32: Add "Computers Near Me" icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 15ffb33..bad35fd 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -483,6 +483,9 @@ IDI_SHELL_PRINTER ICON printer.ico /* @makedep: network.ico */ IDI_SHELL_MY_NETWORK_PLACES ICON network.ico +/* @makedep: network.ico */ +IDI_SHELL_COMPUTERS_NEAR_ME ICON network.ico + /* @makedep: shortcut.ico */ IDI_SHELL_SHORTCUT ICON shortcut.ico

1 0

Alex Henrie : shell32: Add recent documents icon.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 76e02a83118e615587d6ebe8c32e136fd8f1baee URL: https://source.winehq.org/git/wine.git/?a=commit;h=76e02a83118e615587d6ebe8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:57 2018 -0600 shell32: Add recent documents icon. Adapted from appointment-new.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/recent.ico | Bin 0 -> 71868 bytes dlls/shell32/recent.svg | 944 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 949 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76e02a83118e615587d6…

1 0