December 2018 - Wine-Commits

Józef Kucia : d3d9: Fix Reset() with system memory buffers.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: wine Branch: master Commit: 70a95cea66384b475bd3584768b5fffc5f940a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70a95cea66384b475bd35847… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 25 13:24:34 2018 +0100 d3d9: Fix Reset() with system memory buffers. Fixes a regression introduced by commit b18a53a5b44b651cde8e05200c75eacf54f49926. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46362 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/d3d9/device.c | 15 +++++++++++++++ dlls/d3d9/tests/device.c | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 17f6565..c1418e9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -875,6 +875,8 @@ static UINT WINAPI d3d9_device_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) { + struct d3d9_vertexbuffer *vertex_buffer; + struct d3d9_indexbuffer *index_buffer; struct wined3d_resource_desc desc; IDirect3DBaseTexture9 *texture; struct d3d9_surface *surface; @@ -886,6 +888,19 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) if (desc.resource_type != WINED3D_RTYPE_TEXTURE_2D) { + if (desc.bind_flags & WINED3D_BIND_VERTEX_BUFFER) + { + vertex_buffer = wined3d_resource_get_parent(resource); + if (vertex_buffer && vertex_buffer->draw_buffer) + return D3D_OK; + } + if (desc.bind_flags & WINED3D_BIND_INDEX_BUFFER) + { + index_buffer = wined3d_resource_get_parent(resource); + if (index_buffer && index_buffer->draw_buffer) + return D3D_OK; + } + WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); return D3DERR_INVALIDCALL; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6edf2b3..bc8d708 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1827,6 +1827,8 @@ static void test_reset(void) IDirect3DDevice9 *device2 = NULL; IDirect3DSwapChain9 *swapchain; struct device_desc device_desc; + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; DEVMODEW devmode; IDirect3D9 *d3d; D3DCAPS9 caps; @@ -2198,6 +2200,20 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); IDirect3DSurface9_Release(surface); + hr = IDirect3DDevice9_CreateVertexBuffer(device1, 16, 0, + D3DFVF_XYZ, D3DPOOL_SYSTEMMEM, &vb, NULL); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DVertexBuffer9_Release(vb); + + hr = IDirect3DDevice9_CreateIndexBuffer(device1, 16, 0, + D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib, NULL); + ok(hr == D3D_OK, "Failed to create index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DIndexBuffer9_Release(ib); + /* The depth stencil should get reset to the auto depth stencil when present. */ hr = IDirect3DDevice9_SetDepthStencilSurface(device1, NULL); ok(hr == D3D_OK, "SetDepthStencilSurface failed with 0x%08x\n", hr);

1 0

Józef Kucia : wined3d: Handle unmappable buffers in wined3d_device_process_vertices() gracefully.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: wine Branch: master Commit: 2058505cebc7bb069e1e2d0d738353336e943b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2058505cebc7bb069e1e2d0d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 25 13:24:36 2018 +0100 wined3d: Handle unmappable buffers in wined3d_device_process_vertices() gracefully. 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/wined3d/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c90cbdb..d03a982 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3340,7 +3340,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_resource *resource; struct wined3d_box box = {0}; struct wined3d_shader *vs; - unsigned int i; + unsigned int i, j; HRESULT hr; WORD map; @@ -3375,7 +3375,20 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, box.left = src_start_idx * e->stride; box.right = box.left + vertex_count * e->stride; if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READ))) + { ERR("Failed to map resource.\n"); + for (j = 0, map = stream_info.use_map; map && j < i; map >>= 1, ++j) + { + if (!(map & 1)) + continue; + + e = &stream_info.elements[j]; + resource = &state->streams[e->stream_idx].buffer->resource; + if (FAILED(wined3d_resource_unmap(resource, 0))) + ERR("Failed to unmap resource.\n"); + } + return WINED3DERR_INVALIDCALL; + } e->data.buffer_object = 0; e->data.addr += (ULONG_PTR)map_desc.data; }

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: wine Branch: master Commit: 693dbf900e20b4b20ac600ae57c7bfe4ad9a4ff5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=693dbf900e20b4b20ac600ae… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Thu Dec 27 11:04:54 2018 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 106 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/po/si.po b/po/si.po index 99ce144..60feedc 100644 --- a/po/si.po +++ b/po/si.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-22 04:58+0530\n" +"PO-Revision-Date: 2018-12-27 10:39+0530\n" "Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" "Language-Team: Sinhala\n" "Language: si\n" @@ -41,7 +41,7 @@ msgstr "තොරතුරු සඳහා සහාය (&S)" #: appwiz.rc:68 regedit.rc:133 regedit.rc:232 msgid "&Modify..." -msgstr "" +msgstr "වෙනස් කරන්න... (&M)" #: appwiz.rc:69 appwiz.rc:45 cryptui.rc:351 msacm32.rc:40 winecfg.rc:200 #: winecfg.rc:237 wordpad.rc:256 @@ -92,7 +92,7 @@ msgstr "තොරතුරු සඳහා සහාය:" #: appwiz.rc:84 msgid "Support Telephone:" -msgstr "" +msgstr "සහාය දුරකතනය:" #: appwiz.rc:85 msgid "Readme:" @@ -353,7 +353,7 @@ msgstr "" #: progman.rc:184 progman.rc:202 progman.rc:219 regedit.rc:77 taskmgr.rc:87 #: winefile.rc:82 winemine.rc:53 winhlp32.rc:57 wordpad.rc:102 msgid "&Help" -msgstr "" +msgstr "උදව් (&H)" #: comctl32.rc:103 msgid "Move &Up" @@ -424,7 +424,7 @@ msgstr "අදට යන්න" #: comdlg32.rc:157 comdlg32.rc:170 comdlg32.rc:459 comdlg32.rc:484 #: comdlg32.rc:511 shell32.rc:167 oleview.rc:101 msgid "Open" -msgstr "" +msgstr "අරින්න" #: comdlg32.rc:160 comdlg32.rc:182 msgid "File &Name:" @@ -470,7 +470,7 @@ msgstr "" #: comdlg32.rc:207 comdlg32.rc:384 regedit.rc:268 msgid "&All" -msgstr "" +msgstr "ඔක්කොම (&A)" #: comdlg32.rc:208 msgid "S&election" @@ -478,7 +478,7 @@ msgstr "" #: comdlg32.rc:209 msgid "&Pages" -msgstr "" +msgstr "පිටු (&P)" #: comdlg32.rc:212 comdlg32.rc:234 msgid "&Setup" @@ -538,11 +538,11 @@ msgstr "" #: comdlg32.rc:240 comdlg32.rc:415 comdlg32.rc:435 wineps.rc:28 msgid "Paper" -msgstr "" +msgstr "කඩදාසි" #: comdlg32.rc:241 msgid "Si&ze" -msgstr "" +msgstr "ප්රමාණය (&Z)" #: comdlg32.rc:242 msgid "&Source" @@ -562,7 +562,7 @@ msgstr "" #: comdlg32.rc:259 comdlg32.rc:436 winecfg.rc:294 msgid "&Size:" -msgstr "" +msgstr "ප්රමාණය (&S):" #: comdlg32.rc:266 msgid "Effects" @@ -697,7 +697,7 @@ msgstr "" #: comdlg32.rc:366 comdlg32.rc:404 msacm32.rc:34 winefile.rc:138 msgid "&Name:" -msgstr "" +msgstr "නම (&N):" #: comdlg32.rc:368 comdlg32.rc:406 msgid "Status:" @@ -705,11 +705,11 @@ msgstr "" #: comdlg32.rc:370 comdlg32.rc:408 msgid "Type:" -msgstr "" +msgstr "වර්ගය:" #: comdlg32.rc:372 comdlg32.rc:410 msgid "Where:" -msgstr "" +msgstr "කොහෙද:" #: comdlg32.rc:374 comdlg32.rc:412 msgid "Comment:" @@ -729,7 +729,7 @@ msgstr "" #: comdlg32.rc:385 msgid "Pa&ges" -msgstr "" +msgstr "පිටු (&G)" #: comdlg32.rc:386 msgid "&Selection" @@ -1902,7 +1902,7 @@ msgstr "" #: crypt32.rc:208 msgid "Full Name" -msgstr "" +msgstr "මුළු නම" #: crypt32.rc:209 msgid "RDN Name" @@ -9635,11 +9635,11 @@ msgstr "" #: urlmon.rc:35 msgid "Do you want to install this software?" -msgstr "" +msgstr "මේ මෘදුකාංගය ඔබට ස්ථාපනය කරන්න ඕනෙද?" #: urlmon.rc:39 msgid "Don't install" -msgstr "" +msgstr "ස්ථාපනය කරන්න එපා" #: urlmon.rc:43 msgid "" @@ -9653,11 +9653,11 @@ msgstr "" #: urlmon.rc:52 msgid "Install (%d)" -msgstr "" +msgstr "ස්ථාපනය කරන්න (%d)" #: urlmon.rc:53 msgid "Install" -msgstr "" +msgstr "ස්ථාපනය කරන්න" #: user32.rc:30 user32.rc:43 taskmgr.rc:138 msgctxt "window" @@ -9690,7 +9690,7 @@ msgstr "" #: user32.rc:49 msgid "&Close\tCtrl+F4" -msgstr "" +msgstr "වහන්න (&C)\tCtrl+F4" #: user32.rc:51 msgid "Nex&t\tCtrl+F6" @@ -10669,7 +10669,7 @@ msgstr "" #: clock.rc:40 msgid "&Date" -msgstr "" +msgstr "දිනය (&D)" #: clock.rc:42 taskmgr.rc:43 taskmgr.rc:141 msgid "&Always on Top" @@ -10681,7 +10681,7 @@ msgstr "" #: clock.rc:51 msgid "Clock" -msgstr "" +msgstr "ඔරලෝසුව" #: cmd.rc:40 msgid "" @@ -11122,7 +11122,7 @@ msgstr "" #: cmd.rc:371 msgid "More..." -msgstr "" +msgstr "තව..." #: cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" @@ -12640,7 +12640,7 @@ msgstr "" #: regedit.rc:294 regedit.rc:305 msgid "Name:" -msgstr "" +msgstr "නම:" #: regedit.rc:302 msgid "Remove Favorite" @@ -14065,7 +14065,7 @@ msgstr "" #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "" +msgstr "Wine වින්යාසය %s ඇතුලේ යාවත්කාලීන වේ, බලා සිටින්න..." #: winecfg.rc:141 msgid "" @@ -14467,7 +14467,7 @@ msgstr "" #: winecfg.rc:72 msgid "Floppy disk" -msgstr "" +msgstr "Floppy තැටිය" #: winecfg.rc:73 msgid "CD-ROM" @@ -14638,7 +14638,7 @@ msgstr "" #: wineconsole.rc:64 msgid "&Small" -msgstr "" +msgstr "පොඩි (&S)" #: wineconsole.rc:65 msgid "&Medium" @@ -14646,7 +14646,7 @@ msgstr "" #: wineconsole.rc:66 msgid "&Large" -msgstr "" +msgstr "ලොකු (&L)" #: wineconsole.rc:68 msgid "Command history" @@ -14690,7 +14690,7 @@ msgstr "" #: wineconsole.rc:90 msgid "&Color" -msgstr "" +msgstr "පාට (&C)" #: wineconsole.rc:101 msgid "Configuration" @@ -14702,11 +14702,11 @@ msgstr "" #: wineconsole.rc:105 msgid "&Width:" -msgstr "" +msgstr "පළල (&W):" #: wineconsole.rc:108 msgid "&Height:" -msgstr "" +msgstr "උස (&H):" #: wineconsole.rc:112 msgid "Window size" @@ -14714,11 +14714,11 @@ msgstr "" #: wineconsole.rc:113 msgid "W&idth:" -msgstr "" +msgstr "පළල (&I):" #: wineconsole.rc:116 msgid "H&eight:" -msgstr "" +msgstr "උස (&E):" #: wineconsole.rc:120 msgid "End of program" @@ -14861,7 +14861,7 @@ msgstr "" #: winedbg.rc:62 msgid "Show &Details" -msgstr "" +msgstr "විස්තර පෙන්නන්න (&D)" #: winedbg.rc:67 msgid "Program Error Details" @@ -14923,7 +14923,7 @@ msgstr "" #: winefile.rc:51 msgid "&Name" -msgstr "" +msgstr "නම (&N)" #: winefile.rc:52 msgid "&All File Details" @@ -15064,15 +15064,15 @@ msgstr "" #: winefile.rc:109 msgid "Creation date" -msgstr "" +msgstr "හදපු දිනය" #: winefile.rc:110 msgid "Access date" -msgstr "" +msgstr "පිවිසුම් දිනය" #: winefile.rc:111 msgid "Modification date" -msgstr "" +msgstr "වෙනස් කරපු දිනය" #: winefile.rc:112 msgid "Index/Inode" @@ -15088,7 +15088,7 @@ msgstr "" #: winemine.rc:40 msgid "&New\tF2" -msgstr "" +msgstr "අලුත් (&N)\tF2" #: winemine.rc:42 msgid "Question &Marks" @@ -15208,15 +15208,15 @@ msgstr "" #: winhlp32.rc:52 winhlp32.rc:72 msgid "Small" -msgstr "" +msgstr "පොඩි" #: winhlp32.rc:53 winhlp32.rc:73 msgid "Normal" -msgstr "" +msgstr "සාමාන" #: winhlp32.rc:54 winhlp32.rc:74 msgid "Large" -msgstr "" +msgstr "ලොකු" #: winhlp32.rc:58 msgid "&Help on help\tF1" @@ -15292,7 +15292,7 @@ msgstr "" #: wordpad.rc:31 msgid "&New...\tCtrl+N" -msgstr "" +msgstr "අලුත්... (&N)\tCtrl+N" #: wordpad.rc:45 msgid "R&edo\tCtrl+Y" @@ -15372,7 +15372,7 @@ msgstr "" #: wordpad.rc:88 msgid "Numbers" -msgstr "" +msgstr "නොම්බර" #: wordpad.rc:89 msgid "Letters - lower case" @@ -15440,11 +15440,11 @@ msgstr "" #: wordpad.rc:236 wordpad.rc:159 msgid "Left" -msgstr "" +msgstr "වම් පැත්ත" #: wordpad.rc:238 wordpad.rc:160 msgid "Right" -msgstr "" +msgstr "දකුණු පැත්ත" #: wordpad.rc:240 msgid "First line" @@ -15503,7 +15503,7 @@ msgstr "" #: wordpad.rc:286 msgctxt "accelerator Align Right" msgid "R" -msgstr "" +msgstr "R" #: wordpad.rc:293 msgctxt "accelerator Redo" @@ -15571,19 +15571,19 @@ msgstr "" #: wordpad.rc:174 msgid "Next page" -msgstr "" +msgstr "ඊළඟ පිටුව" #: wordpad.rc:175 msgid "Previous page" -msgstr "" +msgstr "කලින් පිටුව" #: wordpad.rc:176 msgid "Two pages" -msgstr "" +msgstr "පිටු දෙකක්" #: wordpad.rc:177 msgid "One page" -msgstr "" +msgstr "එක පිටුවක්" #: wordpad.rc:178 msgid "Zoom in" @@ -15595,11 +15595,11 @@ msgstr "" #: wordpad.rc:181 msgid "Page" -msgstr "" +msgstr "පිටුව" #: wordpad.rc:182 msgid "Pages" -msgstr "" +msgstr "පිටු" #: wordpad.rc:183 msgctxt "unit: centimeter"

1 0

Sebastian Lackner : appwiz.cpl: Copy addons to cache instead of moving.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: wine Branch: master Commit: 29e5f1d97804595639d1e9198c8c4288070da60b URL: https://source.winehq.org/git/wine.git/?a=commit;h=29e5f1d97804595639d1e919… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Dec 26 13:43:03 2018 -0600 appwiz.cpl: Copy addons to cache instead of moving. This leaves behind entries in wininet's own cache. That these are created in the first place is probably less than desirable, but that seems best addressed after code freeze. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46364 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index c34101f..79f667b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -513,7 +513,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, cache_file_name = get_cache_file_name(TRUE); if(cache_file_name) { - MoveFileW(msi_file, cache_file_name); + CopyFileW(msi_file, cache_file_name, FALSE); heap_free(cache_file_name); } }else {

1 0

Józef Kucia : d3d8: Fix Reset() with system memory buffers.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: wine Branch: master Commit: bdccebcab40fdc3bb04c4d6cae8fd2dde1749691 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdccebcab40fdc3bb04c4d6c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 25 13:24:35 2018 +0100 d3d8: Fix Reset() with system memory buffers. Fixes a regression introduced by commit 75b7ff60562880b6e7b646a8fa84486670162d00. 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/d3d8/device.c | 15 +++++++++++++++ dlls/d3d8/tests/device.c | 18 +++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 11ee0b2..b4d445d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -826,6 +826,8 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) { + struct d3d8_vertexbuffer *vertex_buffer; + struct d3d8_indexbuffer *index_buffer; struct wined3d_resource_desc desc; IDirect3DBaseTexture8 *texture; struct d3d8_surface *surface; @@ -837,6 +839,19 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) if (desc.resource_type != WINED3D_RTYPE_TEXTURE_2D) { + if (desc.bind_flags & WINED3D_BIND_VERTEX_BUFFER) + { + vertex_buffer = wined3d_resource_get_parent(resource); + if (vertex_buffer && vertex_buffer->draw_buffer) + return D3D_OK; + } + if (desc.bind_flags & WINED3D_BIND_INDEX_BUFFER) + { + index_buffer = wined3d_resource_get_parent(resource); + if (index_buffer && index_buffer->draw_buffer) + return D3D_OK; + } + WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); return D3DERR_DEVICELOST; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 49d2a98..adfeca8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1312,6 +1312,8 @@ static void test_reset(void) D3DPRESENT_PARAMETERS d3dpp; IDirect3DSurface8 *surface; IDirect3DTexture8 *texture; + IDirect3DVertexBuffer8 *vb; + IDirect3DIndexBuffer8 *ib; UINT adapter_mode_count; D3DLOCKED_RECT lockrect; UINT mode_count = 0; @@ -1704,6 +1706,20 @@ static void test_reset(void) ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); IDirect3DTexture8_Release(texture); + hr = IDirect3DDevice8_CreateVertexBuffer(device1, 16, 0, + D3DFVF_XYZ, D3DPOOL_SYSTEMMEM, &vb); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DVertexBuffer8_Release(vb); + + hr = IDirect3DDevice8_CreateIndexBuffer(device1, 16, 0, + D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib); + ok(hr == D3D_OK, "Failed to create index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DIndexBuffer8_Release(ib); + /* The depth stencil should get reset to the auto depth stencil when present. */ hr = IDirect3DDevice8_SetRenderTarget(device1, NULL, NULL); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); @@ -2878,7 +2894,7 @@ static void test_wndproc(void) && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); - /* I have to minimize and restore the focus window, otherwise native d3d9 fails + /* I have to minimize and restore the focus window, otherwise native d3d8 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window * restore is triggered by the user. */ expect_messages = reactivate_messages;

1 0

Alexandre Julliard : winetest: Also check for file size overflow occurring between tests.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: tools Branch: master Commit: 5579470f18ba8ce4014d441916777660577f4159 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5579470f18ba8ce4014d441… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 27 13:06:20 2018 +0100 winetest: Also check for file size overflow occurring between tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index 24d5621..a468812 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -751,6 +751,8 @@ close_test_unit(1); close SUM or mydie "error writing to '$tmpdir/summary.txt': $!"; close IN; +mydie "report reached file size limit (runaway test?)" if -s $report >= $maxfilesize; + # # Generate the 'DLL version' section of the info box

1 0

Alexander Coffin : cmd/tests: Add some tests for "choice".
by Alexandre Julliard Dec. 26, 2018

Dec. 26, 2018

Module: wine Branch: master Commit: fc358a82750fbec482ddddee7191f2723b503435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc358a82750fbec482ddddee… Author: Alexander Coffin <alexcoffin1999(a)gmail.com> Date: Tue Dec 18 19:25:01 2018 -0600 cmd/tests: Add some tests for "choice". Signed-off-by: Alexander Coffin <alexcoffin1999(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 42 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 14 +++++++++++ 2 files changed, 56 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 79233d8..f4dfc9f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -527,6 +527,48 @@ rmdir "fol;der" rmdir folder PATH=%PATH_BACKUP% +echo ------------ Testing 'choice' ------------ + +rem Windows XP and Windows 2000 do not come with choice +rem echo is used for @or_broken@ formatting +choice /C:ABC /M "Example message" /D A /T:0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C ABC "/M:Example message" /D:B /T 0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C def /D:f /T:0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +REM If a pipe fails due to a nonexistent command +REM it will stop the whole program's execution +if %ERRORLEVEL% NEQ 9009 ( + echo Y | choice /C ABCXYZ /D A /T 2 +) +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C ABC /N /D A /T 0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C abcABC /CS /D:A /T:0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +rem intentional error +choice /C abcABC /D:A /T:0 >NUL 2>NUL +echo %ERRORLEVEL% + echo ------------ Testing variable expansion ------------ call :setError 0 echo ~p0 should be path containing batch file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 01ddc4d..d78d91a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -479,6 +479,20 @@ foo I'm here!@space@ I'm here!@space@ I'm here!@space@ +------------ Testing 'choice' ------------ +(a)todo_wine@Example message [A,B,C]?A(a)or_broken@choice unavailable +(a)todo_wine@1(a)or_broken@9009 +(a)todo_wine@Example message [A,B,C]?B(a)or_broken@choice unavailable +(a)todo_wine@2(a)or_broken@9009 +(a)todo_wine@[D,E,F]?F(a)or_broken@choice unavailable +(a)todo_wine@3(a)or_broken@9009 +(a)todo_wine@[A,B,C,X,Y,Z]?Y(a)or_broken@choice unavailable +(a)todo_wine@5(a)or_broken@9009 +(a)todo_wine@A(a)or_broken@choice unavailable +(a)todo_wine@1(a)or_broken@9009 +(a)todo_wine@[a,b,c,A,B,C]?A(a)or_broken@choice unavailable +(a)todo_wine@4(a)or_broken@9009 +(a)todo_wine@255(a)or_broken@9009 ------------ Testing variable expansion ------------ ~p0 should be path containing batch file @path@

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard Dec. 26, 2018

Dec. 26, 2018

Module: wine Branch: master Commit: ab445900dd1e7679c1d97fd59a0ad925819aaed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab445900dd1e7679c1d97fd5… Author: Mingcong Bai <jeffbai(a)aosc.io> Date: Tue Dec 25 10:41:55 2018 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.io> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 420 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 200 insertions(+), 220 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab445900dd1e7679c1d9…

1 0

Isira Seneviratne : po: Add Sinhala translation.
by Alexandre Julliard Dec. 26, 2018

Dec. 26, 2018

Module: wine Branch: master Commit: 39b51d2b3d68535565af18c25aed51540f770b1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b51d2b3d68535565af18c2… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sat Dec 22 05:17:16 2018 +0530 po: Add Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/Makefile.in | 1 + po/si.po | 15769 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 15770 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39b51d2b3d68535565af…

1 0

Sven Baars : quartz: Fix some memory leaks (Valgrind).
by Alexandre Julliard Dec. 26, 2018

Dec. 26, 2018

Module: wine Branch: master Commit: 889fe31483e05e162345e0d329e071761290a054 URL: https://source.winehq.org/git/wine.git/?a=commit;h=889fe31483e05e162345e0d3… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Dec 22 15:47:22 2018 +0100 quartz: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 6 +++--- dlls/quartz/filtergraph.c | 4 ++++ dlls/quartz/memallocator.c | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index e5904dc..df444ae 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -493,7 +493,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) } CoTaskMemFree(This->pszFileName); if (This->pmt) - FreeMediaType(This->pmt); + DeleteMediaType(This->pmt); BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); return 0; @@ -610,7 +610,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi { CoTaskMemFree(This->pszFileName); if (This->pmt) - FreeMediaType(This->pmt); + DeleteMediaType(This->pmt); This->pszFileName = CoTaskMemAlloc((strlenW(pszFileName) + 1) * sizeof(WCHAR)); strcpyW(This->pszFileName, pszFileName); @@ -650,7 +650,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi CoTaskMemFree(This->pszFileName); if (This->pmt) - FreeMediaType(This->pmt); + DeleteMediaType(This->pmt); This->pszFileName = NULL; This->pmt = NULL; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7abffa5..02707b4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -687,6 +687,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte IBaseFilter_SetSyncSource(pFilter, NULL); IBaseFilter_Release(pFilter); list_remove(&entry->entry); + CoTaskMemFree(entry->name); heap_free(entry); This->version++; /* Invalidate interfaces in the cache */ @@ -1801,6 +1802,9 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR TRACE("MajorType %s\n", debugstr_guid(&mt.majortype)); TRACE("SubType %s\n", debugstr_guid(&mt.subtype)); + CoTaskMemFree(filename); + FreeMediaType(&mt); + if (ppFilter) *ppFilter = preader; IFileSourceFilter_Release(pfile); diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index f5ee3c2..477c63a 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -444,6 +444,9 @@ static HRESULT StdMediaSample2_Construct(BYTE * pbBuffer, LONG cbBuffer, IMemAll static void StdMediaSample2_Delete(StdMediaSample2 * This) { + if (This->props.pMediaType) + DeleteMediaType(This->props.pMediaType); + /* NOTE: does not remove itself from the list it belongs to */ CoTaskMemFree(This); } @@ -676,7 +679,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED if (This->props.pMediaType) { - FreeMediaType(This->props.pMediaType); + DeleteMediaType(This->props.pMediaType); This->props.pMediaType = NULL; } if (!pMediaType)

1 0