wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Gabriel Ivăncescu : vbscript/tests: Add tests for named item script dispatches.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 553cb05b415c00234914d51779d0eca11a8ea92c URL: https://source.winehq.org/git/wine.git/?a=commit;h=553cb05b415c00234914d517… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 14 15:57:15 2020 +0200 vbscript/tests: Add tests for named item script dispatches. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 286 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 275 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=553cb05b415c00234914…

1 0

Gabriel Ivăncescu : vbscript: Implement separate script dispatch objects for each named item.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: ba8429e717dca614dfd09ec8f92bf36520f099ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba8429e717dca614dfd09ec8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 14 15:57:14 2020 +0200 vbscript: Implement separate script dispatch objects for each named item. Each named item should have its own associated script dispatch object. Identifiers are added to this object, but code does look into the global script object as well. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 47 ++++++++++++++++++++++++++++++----------------- dlls/vbscript/interp.c | 27 ++++++++++++++++++++------- dlls/vbscript/vbscript.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/vbscript/vbscript.h | 4 ++++ 4 files changed, 99 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba8429e717dca614dfd0…

1 0

Gabriel Ivăncescu : vbscript: Move the named_item_t definition.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 1546aff9594cf90a1f5248ad49b8c77f273fa638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1546aff9594cf90a1f5248ad… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 14 15:57:13 2020 +0200 vbscript: Move the named_item_t definition. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index f37b0ce0ee..589abc3ff6 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -55,14 +55,6 @@ typedef struct _vbscode_t vbscode_t; typedef struct _script_ctx_t script_ctx_t; typedef struct _vbdisp_t vbdisp_t; -typedef struct named_item_t { - IDispatch *disp; - DWORD flags; - LPWSTR name; - - struct list entry; -} named_item_t; - typedef enum { VBDISP_CALLGET, VBDISP_LET, @@ -156,6 +148,14 @@ typedef struct { script_ctx_t *ctx; } BuiltinDisp; +typedef struct named_item_t { + IDispatch *disp; + DWORD flags; + LPWSTR name; + + struct list entry; +} named_item_t; + HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetLight() and d3d9_device_LightEnable().
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: e804df72a6686f9c9a4c743e60671d5bec636307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e804df72a6686f9c9a4c743e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:53 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetLight() and d3d9_device_LightEnable(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6f37dfddf2..3b4c9d5277 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2222,8 +2222,6 @@ static HRESULT WINAPI d3d9_device_SetLight(IDirect3DDevice9Ex *iface, DWORD inde /* Note: D3DLIGHT9 is compatible with struct wined3d_light. */ wined3d_mutex_lock(); hr = wined3d_stateblock_set_light(device->update_state, index, (const struct wined3d_light *)light); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light(device->wined3d_device, index, (const struct wined3d_light *)light); wined3d_mutex_unlock(); return hr; @@ -2254,8 +2252,6 @@ static HRESULT WINAPI d3d9_device_LightEnable(IDirect3DDevice9Ex *iface, DWORD i wined3d_mutex_lock(); hr = wined3d_stateblock_set_light_enable(device->update_state, index, enable); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light_enable(device->wined3d_device, index, enable); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d9: Retrieve light state from the primary stateblock.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 66f751f21c365f3857d0fa999918617a21ac9d20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66f751f21c365f3857d0fa99… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:52 2020 -0600 d3d9: Retrieve light state from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 10 ++++++---- dlls/wined3d/stateblock.c | 15 +++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ac03c7e241..6f37dfddf2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2232,13 +2232,14 @@ static HRESULT WINAPI d3d9_device_SetLight(IDirect3DDevice9Ex *iface, DWORD inde static HRESULT WINAPI d3d9_device_GetLight(IDirect3DDevice9Ex *iface, DWORD index, D3DLIGHT9 *light) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + BOOL enabled; HRESULT hr; TRACE("iface %p, index %u, light %p.\n", iface, index, light); /* Note: D3DLIGHT9 is compatible with struct wined3d_light. */ wined3d_mutex_lock(); - hr = wined3d_device_get_light(device->wined3d_device, index, (struct wined3d_light *)light); + hr = wined3d_stateblock_get_light(device->state, index, (struct wined3d_light *)light, &enabled); wined3d_mutex_unlock(); return hr; @@ -2260,15 +2261,16 @@ static HRESULT WINAPI d3d9_device_LightEnable(IDirect3DDevice9Ex *iface, DWORD i return hr; } -static HRESULT WINAPI d3d9_device_GetLightEnable(IDirect3DDevice9Ex *iface, DWORD index, BOOL *enable) +static HRESULT WINAPI d3d9_device_GetLightEnable(IDirect3DDevice9Ex *iface, DWORD index, BOOL *enabled) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_light light; HRESULT hr; - TRACE("iface %p, index %u, enable %p.\n", iface, index, enable); + TRACE("iface %p, index %u, enabled %p.\n", iface, index, enabled); wined3d_mutex_lock(); - hr = wined3d_device_get_light_enable(device->wined3d_device, index, enable); + hr = wined3d_stateblock_get_light(device->state, index, &light, enabled); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 499d23fbbd..ad1410f1bd 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1699,6 +1699,21 @@ const struct wined3d_stateblock_state * CDECL wined3d_stateblock_get_state(const return &stateblock->stateblock_state; } +HRESULT CDECL wined3d_stateblock_get_light(const struct wined3d_stateblock *stateblock, + UINT light_idx, struct wined3d_light *light, BOOL *enabled) +{ + struct wined3d_light_info *light_info; + + if (!(light_info = wined3d_light_state_get_light(&stateblock->light_state, light_idx))) + { + TRACE("Light %u is not defined.\n", light_idx); + return WINED3DERR_INVALIDCALL; + } + *light = light_info->OriginalParms; + *enabled = light_info->enabled ? 128 : 0; + return WINED3D_OK; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c8ef442c72..8538b3dcd6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,7 @@ @ cdecl wined3d_stateblock_capture(ptr ptr) @ cdecl wined3d_stateblock_create(ptr ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) +@ cdecl wined3d_stateblock_get_light(ptr long ptr ptr) @ cdecl wined3d_stateblock_get_state(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_init_contained_states(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d313c7aec8..7fba4ea9f0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2726,6 +2726,8 @@ void __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, const struct wined3d_stateblock *device_state, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); +HRESULT __cdecl wined3d_stateblock_get_light(const struct wined3d_stateblock *stateblock, + UINT light_idx, struct wined3d_light *light, BOOL *enabled); const struct wined3d_stateblock_state * __cdecl wined3d_stateblock_get_state(const struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock);

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetMaterial().
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 824e27090f3f3bdd1e09837c2c8b47c9946ca05f URL: https://source.winehq.org/git/wine.git/?a=commit;h=824e27090f3f3bdd1e09837c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:51 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetMaterial(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 802a974f34..ac03c7e241 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2193,8 +2193,6 @@ static HRESULT WINAPI d3d9_device_SetMaterial(IDirect3DDevice9Ex *iface, const D /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); - if (!device->recording) - wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Retrieve the material from the primary stateblock.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 85b6123c81719b4cd3c9bd41016a059709a213f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85b6123c81719b4cd3c9bd41… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:50 2020 -0600 d3d9: Retrieve the material from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 447aa26844..802a974f34 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2208,7 +2208,7 @@ static HRESULT WINAPI d3d9_device_GetMaterial(IDirect3DDevice9Ex *iface, D3DMATE /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK;

1 0

Alexandre Julliard : kernel32/tests: Add more normalization tests.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 84b05383bb5f5253525e80183f9067cc90ff4469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b05383bb5f5253525e8018… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 19:59:16 2020 +0100 kernel32/tests: Add more normalization tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 67b1982395..097cd1fcb4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6104,6 +6104,14 @@ static void test_NormalizeString(void) ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], ptest->str, -1, &ret ); + todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); + if (!wcscmp( ptest->str, dst )) + todo_wine + ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); + else + ok( !ret, "%s:%d: normalized (dst %s)\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst) ); + ret = FALSE; status = pRtlIsNormalizedString( norm_forms[i], dst, dstlen, &ret ); todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); todo_wine ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); @@ -6301,7 +6309,7 @@ static void test_NormalizeString(void) { char *p, buffer[1024]; WCHAR str[3], srcW[32], dstW[32], resW[4][32]; - int i, line = 0, part = 0, ch; + int line = 0, part = 0, ch; char tested[0x110000 / 8]; while (fgets( buffer, sizeof(buffer), f )) @@ -6334,6 +6342,28 @@ static void test_NormalizeString(void) ok( !wcscmp( dstW, resW[i] ), "line %u form %u: wrong result %s for %s expected %s\n", line, i, wine_dbgstr_w( dstW ), wine_dbgstr_w( srcW ), wine_dbgstr_w( resW[i] )); + + ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], srcW, -1, &ret ); + ok( !status, "line %u form %u: RtlIsNormalizedString failed %x\n", line, i, status ); + if (!wcscmp( srcW, dstW )) + ok( ret, "line %u form %u: source not normalized %s\n", line, i, wine_dbgstr_w(srcW) ); + else + ok( !ret, "line %u form %u: source normalized %s\n", line, i, wine_dbgstr_w(srcW) ); + ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], dstW, -1, &ret ); + ok( !status, "line %u form %u: RtlIsNormalizedString failed %x\n", line, i, status ); + ok( ret, "line %u form %u: dest not normalized %s\n", line, i, wine_dbgstr_w(dstW) ); + + for (j = 0; j < 4; j++) + { + int expect = i | (j & 2); + memset( dstW, 0xcc, sizeof(dstW) ); + dstlen = pNormalizeString( norm_forms[i], resW[j], -1, dstW, ARRAY_SIZE(dstW) ); + ok( !wcscmp( dstW, resW[expect] ), + "line %u form %u res %u: wrong result %s for %s expected %s\n", line, i, j, + wine_dbgstr_w( dstW ), wine_dbgstr_w( resW[j] ), wine_dbgstr_w( resW[expect] )); + } } } fclose( f );

1 0

Alexandre Julliard : wine.inf: Add registry keys for normalization forms.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: c388ad357a3e54fe6526ab9af4abf2aed530a649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c388ad357a3e54fe6526ab9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 11:23:28 2020 +0100 wine.inf: Add registry keys for normalization forms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 ++ loader/wine.inf.in | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 27dceaf8e7..07cf54576c 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -407,6 +407,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) static const WCHAR normnfdW[] = {'n','o','r','m','n','f','d','.','n','l','s',0}; static const WCHAR normnfkcW[] = {'n','o','r','m','n','f','k','c','.','n','l','s',0}; static const WCHAR normnfkdW[] = {'n','o','r','m','n','f','k','d','.','n','l','s',0}; + static const WCHAR normidnaW[] = {'n','o','r','m','i','d','n','a','.','n','l','s',0}; DWORD size; HANDLE handle; @@ -471,6 +472,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) case NormalizationD: name = normnfdW; break; case NormalizationKC: name = normnfkcW; break; case NormalizationKD: name = normnfkdW; break; + case 13: name = normidnaW; break; } break; } diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1b5c6ba95c..3a73f1fd04 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -1153,6 +1153,12 @@ HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021004",,"a" HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00021404",,"9" HKLM,System\CurrentControlSet\Control\Nls\Locale\Alternate Sorts,"00030404",,"9" +HKLM,System\CurrentControlSet\Control\Nls\Normalization,"1",,"normnfc.nls" +HKLM,System\CurrentControlSet\Control\Nls\Normalization,"2",,"normnfd.nls" +HKLM,System\CurrentControlSet\Control\Nls\Normalization,"5",,"normnfkc.nls" +HKLM,System\CurrentControlSet\Control\Nls\Normalization,"6",,"normnfkd.nls" +HKLM,System\CurrentControlSet\Control\Nls\Normalization,"d",,"normidna.nls" + [OLE] HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y" HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N"

1 0

Alexandre Julliard : unicode: Use the standard compression function for the casemap table.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: b507fe49ea66dda809b53102b05bf2383a01d727 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b507fe49ea66dda809b53102… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 11:14:58 2020 +0100 unicode: Use the standard compression function for the casemap table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/casemap.c | 724 +++++++++++++++++++++++----------------------------- tools/make_unicode | 55 +--- 2 files changed, 326 insertions(+), 453 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b507fe49ea66dda809b5…

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2020