February 2019 - Wine-commits

Matteo Bruni : d3d9: Release system memory wined3d buffer only after the draw buffer is destroyed.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 7052e8e390b5998ff0c7870504dd499c59299f4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7052e8e390b5998ff0c78705… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 27 18:30:08 2019 +0100 d3d9: Release system memory wined3d buffer only after the draw buffer is destroyed. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index dcd7e28..43321b3 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -59,9 +59,10 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -81,9 +82,10 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -270,6 +272,9 @@ static const IDirect3DVertexBuffer9Vtbl d3d9_vertexbuffer_vtbl = static void STDMETHODCALLTYPE d3d9_vertexbuffer_wined3d_object_destroyed(void *parent) { struct d3d9_vertexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); } @@ -387,9 +392,10 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -409,9 +415,10 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -596,6 +603,9 @@ static const IDirect3DIndexBuffer9Vtbl d3d9_indexbuffer_vtbl = static void STDMETHODCALLTYPE d3d9_indexbuffer_wined3d_object_destroyed(void *parent) { struct d3d9_indexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d9_resource_cleanup(&buffer->resource); heap_free(buffer); }

1 0

Matteo Bruni : d3d8: Release system memory wined3d buffer only after the draw buffer is destroyed.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 873178c03a56eca4d818369386b0be6ba01b08c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=873178c03a56eca4d8183693… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 27 18:30:09 2019 +0100 d3d8: Release system memory wined3d buffer only after the draw buffer is destroyed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46371 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 8aec654..822730f 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -57,9 +57,10 @@ static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface) { IDirect3DDevice8_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -79,9 +80,10 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface) IDirect3DDevice8 *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -269,6 +271,9 @@ static const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = static void STDMETHODCALLTYPE d3d8_vertexbuffer_wined3d_object_destroyed(void *parent) { struct d3d8_vertexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d8_resource_cleanup(&buffer->resource); heap_free(buffer); } @@ -380,9 +385,10 @@ static ULONG WINAPI d3d8_indexbuffer_AddRef(IDirect3DIndexBuffer8 *iface) { IDirect3DDevice8_AddRef(buffer->parent_device); wined3d_mutex_lock(); - wined3d_buffer_incref(buffer->wined3d_buffer); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); + else + wined3d_buffer_incref(buffer->wined3d_buffer); wined3d_mutex_unlock(); } @@ -402,9 +408,10 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface) IDirect3DDevice8 *device = buffer->parent_device; wined3d_mutex_lock(); - wined3d_buffer_decref(buffer->wined3d_buffer); if (draw_buffer) wined3d_buffer_decref(draw_buffer); + else + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -591,6 +598,9 @@ static const IDirect3DIndexBuffer8Vtbl d3d8_indexbuffer_vtbl = static void STDMETHODCALLTYPE d3d8_indexbuffer_wined3d_object_destroyed(void *parent) { struct d3d8_indexbuffer *buffer = parent; + + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->wined3d_buffer); d3d8_resource_cleanup(&buffer->resource); heap_free(buffer); }

1 0

Matteo Bruni : d3d9/tests: Add a test for drawing with released buffers.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 73d9d728defa51ab1d23e13d0ea811235d664a54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d9d728defa51ab1d23e13d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 27 18:30:10 2019 +0100 d3d9/tests: Add a test for drawing with released buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 52 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 52d67c8..69cd441 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24518,8 +24518,9 @@ static void test_color_vertex(void) static void test_sysmem_draw(void) { - IDirect3DVertexBuffer9 *vb, *vb_s0, *vb_s1, *dst_vb; + IDirect3DVertexBuffer9 *vb, *vb_s0, *vb_s1, *dst_vb, *get_vb; IDirect3DVertexDeclaration9 *vertex_declaration; + unsigned int i, offset, stride; IDirect3DTexture9 *texture; IDirect3DIndexBuffer9 *ib; IDirect3DDevice9 *device; @@ -24527,7 +24528,6 @@ static void test_sysmem_draw(void) D3DLOCKED_RECT lr; IDirect3D9 *d3d; D3DCOLOR colour; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -24713,6 +24713,53 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00443322, 1), "Got unexpected colour 0x%08x.\n", colour); + /* Test that releasing but not unbinding a vertex buffer doesn't break. */ + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + refcount = IDirect3DVertexBuffer9_Release(vb_s1); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + hr = IDirect3DDevice9_GetStreamSource(device, 1, &get_vb, &offset, &stride); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(get_vb == vb_s1, "Got unexpected vertex buffer %p.\n", get_vb); + refcount = IDirect3DVertexBuffer9_Release(get_vb); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb_s0, 0, sizeof(*quad_s0)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&lr, 0, sizeof(lr)); @@ -24742,7 +24789,6 @@ static void test_sysmem_draw(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3DTexture9_Release(texture); - IDirect3DVertexBuffer9_Release(vb_s1); IDirect3DVertexBuffer9_Release(vb_s0); IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DIndexBuffer9_Release(ib);

1 0

Matteo Bruni : d3d8/tests: Add a test for drawing with released buffers.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 50200209340d9ee08a0b011e8b19a6a2cab7aec9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50200209340d9ee08a0b011e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 27 18:30:11 2019 +0100 d3d8/tests: Add a test for drawing with released buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 52 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c405f82..377f8e0 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10473,16 +10473,16 @@ static void test_color_vertex(void) static void test_sysmem_draw(void) { - IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1, *dst_vb; + IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1, *dst_vb, *get_vb; D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DTexture8 *texture; IDirect3DIndexBuffer8 *ib; IDirect3DDevice8 *device; + unsigned int i, stride; struct vec4 *dst_data; D3DLOCKED_RECT lr; IDirect3D8 *d3d; D3DCOLOR colour; - unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -10698,6 +10698,53 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00443322, 1), "Got unexpected colour 0x%08x.\n", colour); + /* Test that releasing but not unbinding a vertex buffer doesn't break. */ + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetIndices(device, ib, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + refcount = IDirect3DVertexBuffer8_Release(vb_s1); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + hr = IDirect3DDevice8_GetStreamSource(device, 1, &get_vb, &stride); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(get_vb == vb_s1, "Got unexpected vertex buffer %p.\n", get_vb); + refcount = IDirect3DVertexBuffer8_Release(get_vb); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb_s0, sizeof(*quad_s0)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice8_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&lr, 0, sizeof(lr)); @@ -10727,7 +10774,6 @@ static void test_sysmem_draw(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3DTexture8_Release(texture); - IDirect3DVertexBuffer8_Release(vb_s1); IDirect3DVertexBuffer8_Release(vb_s0); IDirect3DDevice8_DeleteVertexShader(device, vs); IDirect3DIndexBuffer8_Release(ib);

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: a552a0e78fd4ff467ff7d44893adb693f8e5570c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a552a0e78fd4ff467ff7d448… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed Feb 20 12:02:49 2019 +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 | 421 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 215 insertions(+), 206 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a552a0e78fd4ff467ff7…

1 0

Isira Seneviratne : kernel32: Add the Sinhala NLS file.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: b40c14d8aa9f4aa25b4524bf1dc89a76b54859c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b40c14d8aa9f4aa25b4524bf… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Thu Feb 28 12:04:01 2019 +0530 kernel32: Add the Sinhala NLS file. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/sin.nls | 170 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 37b20e3..3f9cfd4 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -234,6 +234,8 @@ #include "nls/syr.nls" /* 0x045a LANG_SYRIAC, SUBLANG_DEFAULT */ +#include "nls/sin.nls" /* 0x045b LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA */ + #include "nls/nep.nls" /* 0x0461 LANG_NEPALI, SUBLANG_NEPALI_NEPAL */ #include "nls/div.nls" /* 0x0465 LANG_DIVEHI, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls new file mode 100644 index 0000000..04fe70f --- /dev/null +++ b/dlls/kernel32/nls/sin.nls @@ -0,0 +1,170 @@ +/* + * Locale definitions for Sinhala + * + * Copyright 2019 Isira Seneviratne + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8010\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "94" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "94" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "045B" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "045B" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "උදේ" + LOCALE_S2359 "හවස" + LOCALE_SABBREVCTRYNAME "LK" + LOCALE_SABBREVDAYNAME1 "ස" + LOCALE_SABBREVDAYNAME2 "අ" + LOCALE_SABBREVDAYNAME3 "බ" + LOCALE_SABBREVDAYNAME4 "බ්ර" + LOCALE_SABBREVDAYNAME5 "සි" + LOCALE_SABBREVDAYNAME6 "සෙ" + LOCALE_SABBREVDAYNAME7 "ඉ" + LOCALE_SABBREVLANGNAME "SIN" + LOCALE_SABBREVMONTHNAME1 "ජන." + LOCALE_SABBREVMONTHNAME2 "පෙබ." + LOCALE_SABBREVMONTHNAME3 "මාර්තු" + LOCALE_SABBREVMONTHNAME4 "අප්රේල්" + LOCALE_SABBREVMONTHNAME5 "මැයි" + LOCALE_SABBREVMONTHNAME6 "ජූනි" + LOCALE_SABBREVMONTHNAME7 "ජූලි" + LOCALE_SABBREVMONTHNAME8 "අගෝ." + LOCALE_SABBREVMONTHNAME9 "සැප්." + LOCALE_SABBREVMONTHNAME10 "ඔක්." + LOCALE_SABBREVMONTHNAME11 "නොවැ." + LOCALE_SABBREVMONTHNAME12 "දෙසැ." + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Sri Lanka" + LOCALE_SCURRENCY "රු." + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "සඳුදා" + LOCALE_SDAYNAME2 "අඟහරුවාදා" + LOCALE_SDAYNAME3 "බදාදා" + LOCALE_SDAYNAME4 "බ්‍රහස්පතින්දා" + LOCALE_SDAYNAME5 "සිකුරාදා" + LOCALE_SDAYNAME6 "සෙනසුරාදා" + LOCALE_SDAYNAME7 "ඉරිදා" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Sri Lanka" + LOCALE_SENGCURRNAME "Sri Lankan Rupee" + LOCALE_SENGLANGUAGE "Sinhala" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "LKR" + LOCALE_SISO3166CTRYNAME "LK" + LOCALE_SISO639LANGNAME "si" + LOCALE_SLANGUAGE "Sinhala" + LOCALE_SLIST "," + LOCALE_SLONGDATE "yyyy MMMM dd" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "ජනවාරි" + LOCALE_SMONTHNAME2 "පෙබරවාරි" + LOCALE_SMONTHNAME3 "මාර්තු" + LOCALE_SMONTHNAME4 "අප්රේල්" + LOCALE_SMONTHNAME5 "මැයි" + LOCALE_SMONTHNAME6 "ජූනි" + LOCALE_SMONTHNAME7 "ජූලි" + LOCALE_SMONTHNAME8 "අගෝස්තු" + LOCALE_SMONTHNAME9 "සැප්තැම්බර්" + LOCALE_SMONTHNAME10 "ඔක්තෝබර්" + LOCALE_SMONTHNAME11 "නොවැම්බර්" + LOCALE_SMONTHNAME12 "දෙසැම්බර්" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "si-LK" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "ශ්‍රී ලංකා" + LOCALE_SNATIVECURRNAME "රුපියල" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "සිංහල (ශ්‍රී ලංකා)" + LOCALE_SNATIVELANGNAME "සිංහල" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "SIN " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Taml;" + LOCALE_SPARENT "si" + LOCALE_SSHORTDATE "yyyy/MMMM/dd" + LOCALE_SSHORTESTDAYNAME1 "ස" + LOCALE_SSHORTESTDAYNAME2 "අ" + LOCALE_SSHORTESTDAYNAME3 "බ" + LOCALE_SSHORTESTDAYNAME4 "බ්ර" + LOCALE_SSHORTESTDAYNAME5 "සි" + LOCALE_SSHORTESTDAYNAME6 "සෙ" + LOCALE_SSHORTESTDAYNAME7 "ඉ" + LOCALE_SSHORTTIME "H.mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H.mm:ss" + LOCALE_SYEARMONTH "yyyy MMMM" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +}

1 0

Michael Stefaniuc : d3dx9: Rename the ID3DXEffect object and methods.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 612196b64c6b17d694831b92e7182afe9b2d9aca URL: https://source.winehq.org/git/wine.git/?a=commit;h=612196b64c6b17d694831b92… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 01:11:30 2019 +0100 d3dx9: Rename the ID3DXEffect object and methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 536 ++++++++++++++++++++++++------------------------- 1 file changed, 264 insertions(+), 272 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=612196b64c6b17d69483…

1 0

Michael Stefaniuc : d3dx9: Merge the stub ID3DXBaseEffect methods.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 715b932768d1f34815c6b0db18554e0d734bbec6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715b932768d1f34815c6b0db… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 01:11:31 2019 +0100 d3dx9: Merge the stub ID3DXBaseEffect methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 54 ++++++++------------------------------------------ 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 95753d0..1660b47 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1198,14 +1198,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static HRESULT d3dx9_base_effect_get_function_desc(struct d3dx9_base_effect *base, - D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) -{ - FIXME("stub!\n"); - - return E_NOTIMPL; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base, D3DXHANDLE parameter, UINT index) { @@ -1409,20 +1401,6 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_function(struct d3dx9_base_effect *base, UINT index) -{ - FIXME("stub!\n"); - - return NULL; -} - -static D3DXHANDLE d3dx9_base_effect_get_function_by_name(struct d3dx9_base_effect *base, const char *name) -{ - FIXME("stub!\n"); - - return NULL; -} - static UINT get_annotation_from_object(struct d3dx9_base_effect *base, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -2772,14 +2750,6 @@ static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *bas return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT start, UINT end) -{ - FIXME("stub!\n"); - - return E_NOTIMPL; -} - static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) { static const struct @@ -3486,11 +3456,9 @@ static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pas static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, shader %p, desc %p stub.\n", iface, shader, desc); - TRACE("iface %p, shader %p, desc %p.\n", iface, shader, desc); - - return d3dx9_base_effect_get_function_desc(&effect->base_effect, shader, desc); + return E_NOTIMPL; } static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) @@ -3569,20 +3537,16 @@ static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDL static D3DXHANDLE WINAPI d3dx_effect_GetFunction(ID3DXEffect *iface, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, index %u stub.\n", iface, index); - TRACE("iface %p, index %u.\n", iface, index); - - return d3dx9_base_effect_get_function(&effect->base_effect, index); + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); - - TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + FIXME("iface %p, name %s stub.\n", iface, debugstr_a(name)); - return d3dx9_base_effect_get_function_by_name(&effect->base_effect, name); + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) @@ -3948,11 +3912,9 @@ static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3D static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, parameter %p, start %u, end %u stub.\n", iface, parameter, start, end); - TRACE("iface %p, parameter %p, start %u, end %u.\n", iface, parameter, start, end); - - return d3dx9_base_effect_set_array_range(&effect->base_effect, parameter, start, end); + return E_NOTIMPL; } /*** ID3DXEffect methods ***/

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx9_effect_GetDesc() helper.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 4b85165cdc297f97a3609cfab2d64d87e435397e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b85165cdc297f97a3609cfa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 01:11:32 2019 +0100 d3dx9: Merge the d3dx9_effect_GetDesc() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1660b47..78aa1c0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -991,25 +991,6 @@ static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) return (0xfeff0000 | ((major) << 8) | (minor)); } -static HRESULT d3dx9_base_effect_get_desc(struct d3dx9_base_effect *base, D3DXEFFECT_DESC *desc) -{ - if (!desc) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - FIXME("partial stub!\n"); - - /* TODO: add creator and function count. */ - desc->Creator = NULL; - desc->Functions = 0; - desc->Parameters = base->parameter_count; - desc->Techniques = base->technique_count; - - return D3D_OK; -} - static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *base, D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) { @@ -3419,9 +3400,21 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - TRACE("iface %p, desc %p.\n", iface, desc); + FIXME("iface %p, desc %p partial stub.\n", iface, desc); - return d3dx9_base_effect_get_desc(&effect->base_effect, desc); + if (!desc) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + /* TODO: add creator and function count. */ + desc->Creator = NULL; + desc->Functions = 0; + desc->Parameters = effect->base_effect.parameter_count; + desc->Techniques = effect->base_effect.technique_count; + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Alexandre Julliard : kernel32/tests: Use GetTempFileName() instead of hardcoding directory names.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: c525d7ab98d558a158613903e797f93ce2979748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c525d7ab98d558a158613903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 28 21:24:51 2019 +0100 kernel32/tests: Use GetTempFileName() instead of hardcoding directory names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/change.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 3c8084d..254faf9 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -118,10 +118,12 @@ static void test_FindFirstChangeNotification(void) ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindCloseChangeNotification error: %d\n", GetLastError()); - ret = GetTempPathA(MAX_PATH, workdir); + ret = GetTempPathA(MAX_PATH, dirname1); ok(ret, "GetTempPathA error: %d\n", GetLastError()); - lstrcatA(workdir, "testFileChangeNotification"); + ret = GetTempFileNameA(dirname1, "ffc", 0, workdir); + ok(ret, "GetTempFileNameA error: %d\n", GetLastError()); + DeleteFileA( workdir ); ret = CreateDirectoryA(workdir, NULL); ok(ret, "CreateDirectoryA error: %d\n", GetLastError()); @@ -370,14 +372,14 @@ static void test_ffcnMultipleThreads(void) LONG r; DWORD filter, threadId, status, exitcode; HANDLE handles[2]; - char path[MAX_PATH]; + char tmp[MAX_PATH], path[MAX_PATH]; - r = GetTempPathA(MAX_PATH, path); + r = GetTempPathA(MAX_PATH, tmp); ok(r, "GetTempPathA error: %d\n", GetLastError()); - lstrcatA(path, "ffcnTestMultipleThreads"); - - RemoveDirectoryA(path); + r = GetTempFileNameA(tmp, "ffc", 0, path); + ok(r, "GetTempFileNameA error: %d\n", GetLastError()); + DeleteFileA( path ); r = CreateDirectoryA(path, NULL); ok(r, "CreateDirectoryA error: %d\n", GetLastError());

1 0