wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zhiyi Zhang : wined3d: Refactor wined3d_get_adapter_identifier() to wined3d_adapter_get_identifier().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 591068cec06257f3d5ed23e19ee4ad055ad978aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=591068cec06257f3d5ed23e1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:09 2020 +0800 wined3d: Refactor wined3d_get_adapter_identifier() to wined3d_adapter_get_identifier(). wined3d_adapter_get_identifier() uses a struct wined3d_adapter pointer as parameter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 9 ++++++++- dlls/d3d9/directx.c | 18 ++++++++++++++++-- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/main.c | 2 +- dlls/dxgi/adapter.c | 8 ++++---- dlls/wined3d/directx.c | 14 +++----------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 8 files changed, 37 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=591068cec06257f3d5ed…

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_device_create().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: a8072e0841248b3c9a8e58c3f433df4250217825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8072e0841248b3c9a8e58c3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:30:50 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_device_create(). Signed-off-by: Zhiyi Zhang <zzhang(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 | 9 ++++++++- dlls/d3d9/device.c | 9 ++++++++- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/device.c | 2 +- dlls/wined3d/directx.c | 11 +++-------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d6253a4a2b..02b010c22a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3658,8 +3658,10 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine { struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_adapter *wined3d_adapter; struct d3d8_swapchain *d3d_swapchain; struct wined3d_caps caps; + unsigned int output_idx; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -3670,6 +3672,10 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine WINED3D_FEATURE_LEVEL_5, }; + output_idx = adapter; + if (output_idx >= parent->wined3d_output_count) + return D3DERR_INVALIDCALL; + device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; device->device_parent.ops = &d3d8_wined3d_device_parent_ops; device->ref = 1; @@ -3684,7 +3690,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_create(wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); + if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, device_type, focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8ffe04c94d..84c119d3e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4590,8 +4590,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) { struct wined3d_swapchain_desc *swapchain_desc; + struct wined3d_adapter *wined3d_adapter; struct d3d9_swapchain *d3d_swapchain; struct wined3d_caps caps; + unsigned int output_idx; unsigned i, count = 1; HRESULT hr; @@ -4606,6 +4608,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine WINED3D_FEATURE_LEVEL_5, }; + output_idx = adapter; + if (output_idx >= parent->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (mode) FIXME("Ignoring display mode.\n"); @@ -4616,7 +4622,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_create(wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); + if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, device_type, focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 17a02bbc05..d3a536e412 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5030,7 +5030,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de ddraw->flags |= DDRAW_NO3D; } - if (FAILED(hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, + if (FAILED(hr = wined3d_device_create(ddraw->wined3d, ddraw->wined3d_adapter, device_type, NULL, 0, DDRAW_STRIDE_ALIGNMENT, feature_levels, ARRAY_SIZE(feature_levels), &ddraw->device_parent, &ddraw->wined3d_device))) { diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 4b23155754..5edd431199 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -519,7 +519,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l IWineDXGIDeviceParent_Release(dxgi_device_parent); if (FAILED(hr = wined3d_device_create(dxgi_factory->wined3d, - dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, + dxgi_adapter->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, (const enum wined3d_feature_level *)feature_levels, level_count, wined3d_device_parent, &device->wined3d_device))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 208e00b839..ecfa444e05 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2319,24 +2319,19 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in return WINED3D_OK; } -HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { - const struct wined3d_adapter *adapter; struct wined3d_device *object; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, " + TRACE("wined3d %p, adapter %p, device_type %#x, focus_window %p, flags %#x, " "surface_alignment %u, feature_levels %p, feature_level_count %u, device_parent %p, device %p.\n", - wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, + wined3d, adapter, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent, device); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; if (FAILED(hr = adapter->adapter_ops->adapter_create_device(wined3d, adapter, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent, &object))) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3530a11f8d..d4b0a14726 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -42,7 +42,7 @@ @ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) -@ cdecl wined3d_device_create(ptr long long ptr long long ptr long ptr ptr) +@ cdecl wined3d_device_create(ptr ptr long ptr long long ptr long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_dispatch_compute(ptr long long long) @ cdecl wined3d_device_dispatch_compute_indirect(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 923f184d96..115084e6c4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2312,7 +2312,7 @@ HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *d unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags); void __cdecl wined3d_device_copy_uav_counter(struct wined3d_device *device, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); -HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device);

1 0

Akihiro Sagawa : dsound: Make GlobalHandle() for the sound buffer failed.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 70aeb7e4b0eb8efefd24c26d1c1442ea6c25d082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70aeb7e4b0eb8efefd24c26d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 6 21:52:46 2020 +0900 dsound: Make GlobalHandle() for the sound buffer failed. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 15 +++++---------- dlls/dsound/tests/dsound.c | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 8d4a3b92fa..ea428c0816 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -999,6 +999,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; + size_t bufsize; TRACE("(%p,%p,%p)\n", device, dsbd, buffer); @@ -1054,19 +1055,15 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds TRACE("capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", capf, device->drvcaps.dwFlags); /* Allocate an empty buffer */ - dsb->buffer = HeapAlloc(GetProcessHeap(),0,sizeof(*(dsb->buffer))); + bufsize = (sizeof(*(dsb->buffer)) + sizeof(void *) - 1) & ~(sizeof(void *) - 1); + dsb->buffer = HeapAlloc(GetProcessHeap(),0,bufsize + dsb->buflen); if (!dsb->buffer) { IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } /* Allocate system memory for buffer */ - dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen); - if (!dsb->buffer->memory) { - WARN("out of memory\n"); - IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); - return DSERR_OUTOFMEMORY; - } + dsb->buffer->memory = (BYTE *)dsb->buffer + bufsize; dsb->buffer->ref = 1; dsb->buffer->lockedbytes = 0; @@ -1136,10 +1133,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) This->buffer->ref--; list_remove(&This->entry); - if (This->buffer->ref == 0) { - HeapFree(GetProcessHeap(), 0, This->buffer->memory); + if (This->buffer->ref == 0) HeapFree(GetProcessHeap(), 0, This->buffer); - } HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0e779618a2..2bf87eb857 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1161,7 +1161,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) /* broken apps like Asuka 120% Return BURNING Fest, pass the pointer to GlobalHandle. */ HGLOBAL hmem = GlobalHandle(buf); - todo_wine ok(!hmem,"GlobalHandle should return NULL " + ok(!hmem,"GlobalHandle should return NULL " "for buffer %p, got %p\n",buf,hmem); } ZeroMemory(buf,bufsize);

1 0

Akihiro Sagawa : dsound/tests: Add a test whether the buffer is a valid global memory.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: e28638afccdfda3ee44121405d9097d201b61445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e28638afccdfda3ee4412140… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 6 21:52:44 2020 +0900 dsound/tests: Add a test whether the buffer is a valid global memory. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/dsound.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 7fdac9144e..0e779618a2 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1157,6 +1157,13 @@ static HRESULT test_duplicate(LPGUID lpGuid) ok(rc==DS_OK && buf!=NULL, "IDirectSoundBuffer_Lock failed to lock the buffer %08x\n",rc); if (rc==DS_OK && buf!=NULL) { + if (sizeof(void*)==4) { /* crashes on 64-bit */ + /* broken apps like Asuka 120% Return BURNING Fest, + pass the pointer to GlobalHandle. */ + HGLOBAL hmem = GlobalHandle(buf); + todo_wine ok(!hmem,"GlobalHandle should return NULL " + "for buffer %p, got %p\n",buf,hmem); + } ZeroMemory(buf,bufsize); rc=IDirectSoundBuffer_Unlock(original,buf,bufsize, NULL,0);

1 0

Gabriel Ivăncescu : jscript: Don't lookup global members for bytecodes with a named item.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 5b28c43dd4c0a21fd65752b7bbf39f55e10be8dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b28c43dd4c0a21fd65752b7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 10 18:48:42 2020 +0100 jscript: Don't lookup global members for bytecodes with a named item. 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/jscript/engine.c | 4 +++- dlls/jscript/tests/jscript.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5b9689505c..5a627ea2be 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3019,6 +3019,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { + BOOL lookup_globals = (flags & EXEC_GLOBAL) && !bytecode->named_item; + for(i=0; i < function->var_cnt; i++) { TRACE("[%d] %s %d\n", i, debugstr_w(function->variables[i].name), function->variables[i].func_id); if(function->variables[i].func_id != -1) { @@ -3030,7 +3032,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = jsdisp_propput_name(variable_obj, function->variables[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); - }else if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i].name, NULL)) { + }else if(!lookup_globals || !lookup_global_members(ctx, function->variables[i].name, NULL)) { DISPID id = 0; hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 5de933e935..ed56f8ce11 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1301,7 +1301,6 @@ static void test_named_items(void) SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript); - SET_EXPECT(GetIDsOfNames); hr = IActiveScriptParse_ParseScriptText(parse, L"" "var testVar = 42;\n" "testVar_global = 5;\n" @@ -1310,7 +1309,6 @@ static void test_named_items(void) ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); - todo_wine CHECK_NOT_CALLED(GetIDsOfNames); SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript);

1 0

Alexandre Julliard : ntdll: Reimplement remaining string functions to avoid depending on wine/unicode.h.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 982f99d3d9740a3d0c7f390e9e614e9d67ec48cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=982f99d3d9740a3d0c7f390e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 09:30:49 2020 +0100 ntdll: Reimplement remaining string functions to avoid depending on wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/wcstring.c | 84 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 01c4bd0296..858c6fc538 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -29,8 +29,9 @@ #include <stdio.h> #include "windef.h" +#include "winbase.h" +#include "winnls.h" #include "winternl.h" -#include "wine/unicode.h" static const unsigned short wctypes[256] = { @@ -152,56 +153,65 @@ LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str ) /*********************************************************************** - * wcscat (NTDLL.@) + * wcscpy (NTDLL.@) */ -LPWSTR __cdecl NTDLL_wcscat( LPWSTR dst, LPCWSTR src ) +LPWSTR __cdecl NTDLL_wcscpy( LPWSTR dst, LPCWSTR src ) { - return strcatW( dst, src ); + WCHAR *p = dst; + while ((*p++ = *src++)); + return dst; } -/********************************************************************* - * wcschr (NTDLL.@) +/*********************************************************************** + * wcslen (NTDLL.@) */ -LPWSTR __cdecl NTDLL_wcschr( LPCWSTR str, WCHAR ch ) +INT __cdecl NTDLL_wcslen( LPCWSTR str ) { - return strchrW( str, ch ); + const WCHAR *s = str; + while (*s) s++; + return s - str; } -/********************************************************************* - * wcscmp (NTDLL.@) +/*********************************************************************** + * wcscat (NTDLL.@) */ -INT __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 ) +LPWSTR __cdecl NTDLL_wcscat( LPWSTR dst, LPCWSTR src ) { - return strcmpW( str1, str2 ); + NTDLL_wcscpy( dst + NTDLL_wcslen(dst), src ); + return dst; } -/*********************************************************************** - * wcscpy (NTDLL.@) +/********************************************************************* + * wcschr (NTDLL.@) */ -LPWSTR __cdecl NTDLL_wcscpy( LPWSTR dst, LPCWSTR src ) +LPWSTR __cdecl NTDLL_wcschr( LPCWSTR str, WCHAR ch ) { - return strcpyW( dst, src ); + do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); + return NULL; } /********************************************************************* - * wcscspn (NTDLL.@) + * wcscmp (NTDLL.@) */ -INT __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject ) +INT __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 ) { - return strcspnW( str, reject ); + while (*str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; } -/*********************************************************************** - * wcslen (NTDLL.@) +/********************************************************************* + * wcscspn (NTDLL.@) */ -INT __cdecl NTDLL_wcslen( LPCWSTR str ) +INT __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject ) { - return strlenW( str ); + const WCHAR *ptr; + for (ptr = str; *ptr; ptr++) if (NTDLL_wcschr( reject, *ptr )) break; + return ptr - str; } @@ -223,7 +233,9 @@ LPWSTR __cdecl NTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, INT n ) */ INT __cdecl NTDLL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) { - return strncmpW( str1, str2, n ); + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; } @@ -244,7 +256,8 @@ LPWSTR __cdecl NTDLL_wcsncpy( LPWSTR s1, LPCWSTR s2, INT n ) */ LPWSTR __cdecl NTDLL_wcspbrk( LPCWSTR str, LPCWSTR accept ) { - return strpbrkW( str, accept ); + for ( ; *str; str++) if (NTDLL_wcschr( accept, *str )) return (WCHAR *)(ULONG_PTR)str; + return NULL; } @@ -253,7 +266,9 @@ LPWSTR __cdecl NTDLL_wcspbrk( LPCWSTR str, LPCWSTR accept ) */ LPWSTR __cdecl NTDLL_wcsrchr( LPWSTR str, WCHAR ch ) { - return strrchrW( str, ch ); + WCHAR *ret = NULL; + do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); + return ret; } @@ -262,7 +277,9 @@ LPWSTR __cdecl NTDLL_wcsrchr( LPWSTR str, WCHAR ch ) */ INT __cdecl NTDLL_wcsspn( LPCWSTR str, LPCWSTR accept ) { - return strspnW( str, accept ); + const WCHAR *ptr; + for (ptr = str; *ptr; ptr++) if (!NTDLL_wcschr( accept, *ptr )) break; + return ptr - str; } @@ -271,7 +288,14 @@ INT __cdecl NTDLL_wcsspn( LPCWSTR str, LPCWSTR accept ) */ LPWSTR __cdecl NTDLL_wcsstr( LPCWSTR str, LPCWSTR sub ) { - return strstrW( str, sub ); + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) return (WCHAR *)str; + str++; + } + return NULL; } @@ -305,13 +329,13 @@ INT __cdecl NTDLL_wcstombs( LPSTR dst, LPCWSTR src, INT n ) if (!dst) { - RtlUnicodeToMultiByteSize( &len, src, strlenW(src)*sizeof(WCHAR) ); + RtlUnicodeToMultiByteSize( &len, src, NTDLL_wcslen(src) * sizeof(WCHAR) ); return len; } else { if (n <= 0) return 0; - RtlUnicodeToMultiByteN( dst, n, &len, src, strlenW(src)*sizeof(WCHAR) ); + RtlUnicodeToMultiByteN( dst, n, &len, src, NTDLL_wcslen(src) * sizeof(WCHAR) ); if (len < n) dst[len] = 0; } return len;

1 0

Alexandre Julliard : ntdll: Reimplement wcstol/wcstoul using the msvcrt code.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 295660b98595a4e8a54124a51ff95f058a115366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=295660b98595a4e8a54124a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 09:29:24 2020 +0100 ntdll: Reimplement wcstol/wcstoul using the msvcrt code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 72 +++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 130 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 183 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index d6de1b2909..8280942db5 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -22,6 +22,7 @@ */ #include <stdlib.h> +#include <limits.h> #include "ntdll_test.h" #include "winnls.h" @@ -47,6 +48,8 @@ static LPSTR (__cdecl *p_ui64toa)(ULONGLONG, LPSTR, INT); static int (__cdecl *p_wtoi)(LPCWSTR); static LONG (__cdecl *p_wtol)(LPCWSTR); static LONGLONG (__cdecl *p_wtoi64)(LPCWSTR); +static LONG (__cdecl *pwcstol)(LPCWSTR,LPWSTR*,INT); +static ULONG (__cdecl *pwcstoul)(LPCWSTR,LPWSTR*,INT); static LPWSTR (__cdecl *p_itow)(int, LPWSTR, int); static LPWSTR (__cdecl *p_ltow)(LONG, LPWSTR, INT); static LPWSTR (__cdecl *p_ultow)(ULONG, LPWSTR, INT); @@ -102,6 +105,8 @@ static void InitFunctionPtrs(void) X(_wtoi); X(_wtol); X(_wtoi64); + X(wcstol); + X(wcstoul); X(_itow); X(_ltow); X(_ultow); @@ -1153,6 +1158,72 @@ static void test_wtoi64(void) ok( result == 0, "got %s\n", wine_dbgstr_longlong(result) ); } +static void test_wcstol(void) +{ + static const struct { WCHAR str[24]; LONG res; ULONG ures; int base; } tests[] = + { + { L"9", 9, 9, 10 }, + { L" ", 0, 0 }, + { L"-1234", -1234, -1234 }, + { L"\x09\x0a\x0b\x0c\x0d -123", -123, -123 }, + { L"\xa0 +44", 44, 44 }, + { L"\x2002\x2003 +55", 0, 0 }, + { L"\x3000 +66", 0, 0 }, + { { 0x3231 }, 0, 0 }, /* PARENTHESIZED IDEOGRAPH STOCK */ + { { 0x4e00 }, 0, 0 }, /* CJK Ideograph, First */ + { { 0x0bef }, 0, 0 }, /* TAMIL DIGIT NINE */ + { { 0x0e59 }, 9, 9 }, /* THAI DIGIT NINE */ + { { 0xff19 }, 9, 9 }, /* FULLWIDTH DIGIT NINE */ + { { 0x00b9 }, 0, 0 }, /* SUPERSCRIPT ONE */ + { { '-',0x0e50,'x',0xff19,'1' }, -0x91, -0x91 }, + { { '+',0x0e50,0xff17,'1' }, 071, 071 }, + { { 0xff19,'f',0x0e59,0xff46 }, 0x9f9, 0x9f9, 16 }, + { L"2147483647", 2147483647, 2147483647 }, + { L"2147483648", LONG_MAX, 2147483648 }, + { L"4294967295", LONG_MAX, 4294967295 }, + { L"4294967296", LONG_MAX, ULONG_MAX }, + { L"9223372036854775807", LONG_MAX, ULONG_MAX }, + { L"-2147483647", -2147483647, -2147483647 }, + { L"-2147483648", LONG_MIN, LONG_MIN }, + { L"-4294967295", LONG_MIN, 1 }, + { L"-4294967296", LONG_MIN, 1 }, + { L"-9223372036854775807", LONG_MIN, 1 }, + }; + static const WCHAR zeros[] = + { + 0x0660, 0x06f0, 0x0966, 0x09e6, 0x0a66, 0x0ae6, 0x0b66, 0x0c66, 0x0ce6, + 0x0d66, 0x0e50, 0x0ed0, 0x0f20, 0x1040, 0x17e0, 0x1810, 0xff10 + }; + unsigned int i; + LONG res; + ULONG ures; + WCHAR *endpos; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + res = pwcstol( tests[i].str, &endpos, tests[i].base ); + ok( res == tests[i].res, "%u: %s res %08x\n", i, wine_dbgstr_w(tests[i].str), res ); + if (!res) ok( endpos == tests[i].str, "%u: wrong endpos %p/%p\n", i, endpos, tests[i].str ); + ures = pwcstoul( tests[i].str, &endpos, tests[i].base ); + ok( ures == tests[i].ures, "%u: %s res %08x\n", i, wine_dbgstr_w(tests[i].str), ures ); + } + + /* Test various unicode digits */ + for (i = 0; i < ARRAY_SIZE(zeros); ++i) + { + WCHAR tmp[] = { zeros[i] + 4, zeros[i], zeros[i] + 5, 0 }; + res = pwcstol(tmp, NULL, 0); + ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], res); + ures = pwcstoul(tmp, NULL, 0); + ok(ures == 405, "with zero = U+%04X: got %u, expected 405\n", zeros[i], ures); + tmp[1] = zeros[i] + 10; + res = pwcstol(tmp, NULL, 16); + ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], res); + ures = pwcstoul(tmp, NULL, 16); + ok(ures == 4, "with zero = U+%04X: got %u, expected 4\n", zeros[i], ures); + } +} + static void test_wcschr(void) { static const WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; @@ -1670,6 +1741,7 @@ START_TEST(string) test_wtoi(); test_wtol(); test_wtoi64(); + test_wcstol(); test_wcschr(); test_wcsrchr(); test_wcslwrupr(); diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 0acad184f9..01c4bd0296 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -23,7 +23,6 @@ #include "config.h" #include <ctype.h> -#include <limits.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> @@ -340,24 +339,6 @@ INT __cdecl NTDLL_mbstowcs( LPWSTR dst, LPCSTR src, INT n ) } -/********************************************************************* - * wcstol (NTDLL.@) - */ -LONG __cdecl NTDLL_wcstol(LPCWSTR s, LPWSTR *end, INT base) -{ - return strtolW( s, end, base ); -} - - -/********************************************************************* - * wcstoul (NTDLL.@) - */ -ULONG __cdecl NTDLL_wcstoul(LPCWSTR s, LPWSTR *end, INT base) -{ - return strtoulW( s, end, base ); -} - - /********************************************************************* * iswctype (NTDLL.@) */ @@ -442,6 +423,117 @@ INT __cdecl NTDLL_iswxdigit( WCHAR wc ) } +static int wctoint( WCHAR c ) +{ + /* NOTE: MAP_FOLDDIGITS supports too many things. */ + /* Unicode points that contain digits 0-9; keep this sorted! */ + static const WCHAR zeros[] = + { + 0x0660, 0x06f0, 0x0966, 0x09e6, 0x0a66, 0x0ae6, 0x0b66, 0x0c66, 0x0ce6, + 0x0d66, 0x0e50, 0x0ed0, 0x0f20, 0x1040, 0x17e0, 0x1810, 0xff10 + }; + int i; + + if ('0' <= c && c <= '9') return c - '0'; + if ('A' <= c && c <= 'Z') return c - 'A' + 10; + if ('a' <= c && c <= 'z') return c - 'a' + 10; + for (i = 0; i < ARRAY_SIZE(zeros) && c >= zeros[i]; i++) + if (zeros[i] <= c && c <= zeros[i] + 9) return c - zeros[i]; + + return -1; +} + +/********************************************************************* + * wcstol (NTDLL.@) + */ +LONG __cdecl NTDLL_wcstol(LPCWSTR s, LPWSTR *end, INT base) +{ + BOOL negative = FALSE, empty = TRUE; + LONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (NTDLL_iswspace(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && !wctoint( *s ) && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = wctoint( *s ) ? 10 : 8; + + while (*s) + { + int v = wctoint( *s ); + if (v < 0 || v >= base) break; + if (negative) v = -v; + s++; + empty = FALSE; + + if (!negative && (ret > MAXLONG / base || ret * base > MAXLONG - v)) + ret = MAXLONG; + else if (negative && (ret < (LONG)MINLONG / base || ret * base < (LONG)(MINLONG - v))) + ret = MINLONG; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return ret; +} + + +/********************************************************************* + * wcstoul (NTDLL.@) + */ +ULONG __cdecl NTDLL_wcstoul(LPCWSTR s, LPWSTR *end, INT base) +{ + BOOL negative = FALSE, empty = TRUE; + ULONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (NTDLL_iswspace(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && !wctoint( *s ) && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = wctoint( *s ) ? 10 : 8; + + while (*s) + { + int v = wctoint( *s ); + if (v < 0 || v >= base) break; + s++; + empty = FALSE; + + if (ret > MAXDWORD / base || ret * base > MAXDWORD - v) + ret = MAXDWORD; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return negative ? -ret : ret; +} + + /********************************************************************* * _ultow (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Don't handle the full Unicode character range in isw* functions.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 650c8e14347a19688c11242742c0d2ec207b695e URL: https://source.winehq.org/git/wine.git/?a=commit;h=650c8e14347a19688c112427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 20:54:50 2020 +0100 ntdll: Don't handle the full Unicode character range in isw* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/wcstring.c | 87 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 159 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=650c8e14347a19688c11…

1 0

Alexandre Julliard : ntdll: Don't handle the full Unicode character range in wcsicmp/wcsnicmp.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 19863285434484b5adf75b9f4d1be77a0967b9d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19863285434484b5adf75b9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 20:04:20 2020 +0100 ntdll: Don't handle the full Unicode character range in wcsicmp/wcsnicmp. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 18 ++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 1ec5f3a278..dcccb5a55f 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -57,6 +57,8 @@ static LPWSTR (__cdecl *p_wcslwr)(LPWSTR); static LPWSTR (__cdecl *p_wcsupr)(LPWSTR); static WCHAR (__cdecl *ptowlower)(WCHAR); static WCHAR (__cdecl *ptowupper)(WCHAR); +static int (__cdecl *p_wcsicmp)(LPCWSTR,LPCWSTR); +static int (__cdecl *p_wcsnicmp)(LPCWSTR,LPCWSTR,int); static LPWSTR (__cdecl *pwcschr)(LPCWSTR, WCHAR); static LPWSTR (__cdecl *pwcsrchr)(LPCWSTR, WCHAR); @@ -102,6 +104,8 @@ static void InitFunctionPtrs(void) X(_wcsupr); X(towlower); X(towupper); + X(_wcsicmp); + X(_wcsnicmp); X(wcschr); X(wcsrchr); X(qsort); @@ -1196,6 +1200,28 @@ static void test_wcslwrupr(void) ok( buffer[i - 1] == (i >= 'a' && i <= 'z' ? i - 32 : i), "%04x: got %04x\n", i, buffer[i-1] ); } +static void test_wcsicmp(void) +{ + WCHAR buf_a[2], buf_b[2]; + int i, j, ret; + + buf_a[1] = buf_b[1] = 0; + for (i = 0; i < 0x300; i++) + { + int lwr_a = (i >= 'A' && i <= 'Z') ? i + 32 : i; + buf_a[0] = i; + for (j = 0; j < 0x300; j++) + { + int lwr_b = (j >= 'A' && j <= 'Z') ? j + 32 : j; + buf_b[0] = j; + ret = p_wcsicmp( buf_a, buf_b ); + ok( ret == lwr_a - lwr_b, "%04x:%04x: strings differ %d\n", i, j, ret ); + ret = p_wcsnicmp( buf_a, buf_b, 2 ); + ok( ret == lwr_a - lwr_b, "%04x:%04x: strings differ %d\n", i, j, ret ); + } + } +} + static int __cdecl intcomparefunc(const void *a, const void *b) { const int *p = a, *q = b; @@ -1567,5 +1593,6 @@ START_TEST(string) test_tolower(); test_toupper(); test__strnicmp(); + test_wcsicmp(); test_sscanf(); } diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 15a6a15531..58fc0715a7 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -38,7 +38,14 @@ */ INT __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 ) { - return strcmpiW( str1, str2 ); + for (;;) + { + WCHAR ch1 = (*str1 >= 'A' && *str1 <= 'Z') ? *str1 + 32 : *str1; + WCHAR ch2 = (*str2 >= 'A' && *str2 <= 'Z') ? *str2 + 32 : *str2; + if (ch1 != ch2 || !*str1) return ch1 - ch2; + str1++; + str2++; + } } @@ -64,7 +71,14 @@ LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str ) */ INT __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n ) { - return strncmpiW( str1, str2, n ); + int ret = 0; + for ( ; n > 0; n--, str1++, str2++) + { + WCHAR ch1 = (*str1 >= 'A' && *str1 <= 'Z') ? *str1 + 32 : *str1; + WCHAR ch2 = (*str2 >= 'A' && *str2 <= 'Z') ? *str2 + 32 : *str2; + if ((ret = ch1 - ch2) || !*str1) break; + } + return ret; }

1 0

Alexandre Julliard : ntdll: Don't handle the full Unicode character range in wcslwr/wcsupr.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 5a4cc97a3bcbae46e5645deb2231f464fd553ed7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a4cc97a3bcbae46e5645deb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 14:32:37 2020 +0100 ntdll: Don't handle the full Unicode character range in wcslwr/wcsupr. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 13 +++++++++++++ dlls/ntdll/wcstring.c | 20 ++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index b9dfda7c19..1ec5f3a278 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1157,6 +1157,7 @@ static void test_wcslwrupr(void) static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; static WCHAR emptyW[] = {0}; static const WCHAR constemptyW[] = {0}; + WCHAR buffer[65536]; int i; if (0) /* crashes on native */ @@ -1181,6 +1182,18 @@ static void test_wcslwrupr(void) ok( ptowlower( i ) == lwr, "%04x: towlower got %04x expected %04x\n", i, ptowlower( i ), lwr ); ok( ptowupper( i ) == upr, "%04x: towupper got %04x expected %04x\n", i, ptowupper( i ), upr ); } + + for (i = 1; i < 65536; i++) buffer[i - 1] = i; + buffer[65535] = 0; + p_wcslwr( buffer ); + for (i = 1; i < 65536; i++) + ok( buffer[i - 1] == (i >= 'A' && i <= 'Z' ? i + 32 : i), "%04x: got %04x\n", i, buffer[i-1] ); + + for (i = 1; i < 65536; i++) buffer[i - 1] = i; + buffer[65535] = 0; + p_wcsupr( buffer ); + for (i = 1; i < 65536; i++) + ok( buffer[i - 1] == (i >= 'a' && i <= 'z' ? i - 32 : i), "%04x: got %04x\n", i, buffer[i-1] ); } static int __cdecl intcomparefunc(const void *a, const void *b) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index fe18af7170..15a6a15531 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -47,7 +47,15 @@ INT __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 ) */ LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str ) { - return strlwrW( str ); + WCHAR *ret = str; + + while (*str) + { + WCHAR ch = *str; + if (ch >= 'A' && ch <= 'Z') ch += 32; + *str++ = ch; + } + return ret; } @@ -65,7 +73,15 @@ INT __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n ) */ LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str ) { - return struprW( str ); + WCHAR *ret = str; + + while (*str) + { + WCHAR ch = *str; + if (ch >= 'a' && ch <= 'z') ch -= 32; + *str++ = ch; + } + return ret; }

1 0

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 March 2020