May 2019 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : urlmon: Add GetIUriPriv stub.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 39cc1216403a8d286c713fff92f2316742929c64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39cc1216403a8d286c713fff… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 17 15:04:47 2019 +0800 urlmon: Add GetIUriPriv stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/urlmon.spec | 1 + dlls/urlmon/urlmon_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index b651018..0f9f075 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -53,6 +53,7 @@ @ stdcall GetClassFileOrMime(ptr wstr ptr long wstr long ptr) @ stub GetClassURL @ stub GetComponentIDFromCLSSPEC +@ stdcall GetIUriPriv(ptr ptr) @ stub GetMarkOfTheWeb @ stdcall GetSoftwareUpdateInfo(wstr ptr) @ stub HlinkGoBack diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 53d5d29..5dc0d24 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -838,3 +838,15 @@ BOOL WINAPI ShouldShowIntranetWarningSecband(DWORD unk) FIXME("%x: stub\n", unk); return FALSE; } + +/*********************************************************************** + * GetIUriPriv (urlmon.@) + * + * Not documented. + */ +HRESULT WINAPI GetIUriPriv(IUri *uri, void **p) +{ + FIXME("(%p,%p): stub\n", uri, p); + *p = NULL; + return E_NOTIMPL; +}

1 0

Michael Stefaniuc : msctf: Remove useless cast to self.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 61aea5a9879f41224022d4775cce28d28618ea89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61aea5a9879f41224022d477… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 17 20:34:39 2019 +0200 msctf: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 452895c..ff67d38 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -852,7 +852,7 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, /*TODO: implement ITfEditRecord */ SINK_FOR_EACH(cursor, &This->pTextEditSink, ITfTextEditSink, sink) { - ITfTextEditSink_OnEndEdit(sink, (ITfContext*) &This->ITfContext_iface, sc, NULL); + ITfTextEditSink_OnEndEdit(sink, &This->ITfContext_iface, sc, NULL); } sinkcookie = remove_Cookie(sc); }

1 0

Alistair Leslie-Hughes : dinput: Improve returned flags in Mouse GetObjectInfo.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: c4debff5db617fc7c66d0e536caf0178560f99c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4debff5db617fc7c66d0e53… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 17 02:25:31 2019 +0000 dinput: Improve returned flags in Mouse GetObjectInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 3 +++ dlls/dinput/tests/mouse.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 199ed03..52a766b 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -730,6 +730,9 @@ static HRESULT WINAPI SysMouseWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, else if (pdidoi->dwType & DIDFT_BUTTON) wsprintfW(pdidoi->tszName, buttonW, DIDFT_GETINSTANCE(pdidoi->dwType) - 3); + if(pdidoi->dwType & DIDFT_AXIS) + pdidoi->dwFlags |= DIDOI_ASPECTPOSITION; + _dump_OBJECTINSTANCEW(pdidoi); return res; } diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index c1a7ff7..c5cb684 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -227,6 +227,36 @@ static void test_GetDeviceInfo(IDirectInputA *pDI) if (pMouse) IUnknown_Release(pMouse); } +static BOOL CALLBACK EnumAxes(const DIDEVICEOBJECTINSTANCEA *pdidoi, void *pContext) +{ + if (IsEqualIID(&pdidoi->guidType, &GUID_XAxis) || + IsEqualIID(&pdidoi->guidType, &GUID_YAxis) || + IsEqualIID(&pdidoi->guidType, &GUID_ZAxis)) + { + ok(pdidoi->dwFlags & DIDOI_ASPECTPOSITION, "Missing DIDOI_ASPECTPOSITION, flags are 0x%x\n", + pdidoi->dwFlags); + } + else + ok(pdidoi->dwFlags == 0, "Flags are 0x%x\n", pdidoi->dwFlags); + + return DIENUM_CONTINUE; +} + +static void test_mouse_EnumObjects(IDirectInputA *pDI) +{ + HRESULT hr; + IDirectInputDeviceA *pMouse = NULL; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInputDevice_EnumObjects(pMouse, EnumAxes, NULL, DIDFT_ALL); + ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %08x\n", hr); + + if (pMouse) IUnknown_Release(pMouse); +} + static void mouse_tests(void) { HRESULT hr; @@ -254,6 +284,7 @@ static void mouse_tests(void) test_set_coop(pDI, hwnd); test_acquire(pDI, hwnd); test_GetDeviceInfo(pDI); + test_mouse_EnumObjects(pDI); DestroyWindow(hwnd); }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_level_box() in wined3d_device_update_texture().
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 099b05ce6feb507b6a158ef4074d0817d4a0b1d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=099b05ce6feb507b6a158ef4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:17 2019 +0430 wined3d: Use wined3d_texture_get_level_box() in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5272e2e..5a94d03 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3821,7 +3821,6 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, unsigned int src_size, dst_size, src_skip_levels = 0; unsigned int src_level_count, dst_level_count; unsigned int layer_count, level_count, i, j; - unsigned int width, height, depth; enum wined3d_resource_type type; struct wined3d_box box; @@ -3892,11 +3891,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, /* Update every surface level of the texture. */ for (i = 0; i < level_count; ++i) { - width = wined3d_texture_get_level_width(dst_texture, i); - height = wined3d_texture_get_level_height(dst_texture, i); - depth = wined3d_texture_get_level_depth(dst_texture, i); - wined3d_box_set(&box, 0, 0, width, height, 0, depth); - + wined3d_texture_get_level_box(dst_texture, i, &box); for (j = 0; j < layer_count; ++j) { wined3d_cs_emit_blt_sub_resource(device->cs,

1 0

Nikolay Sivov : kernelbase: Add some more string handling functions from shlwapi.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 9959e4144f57e39ab4a9475a9142620d10572621 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9959e4144f57e39ab4a9475a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 17 14:28:20 2019 +0300 kernelbase: Add some more string handling functions from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 24 ++-- dlls/kernelbase/string.c | 302 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 314 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9959e4144f57e39ab4a9…

1 0

Nikolay Sivov : kernelbase: Add LoadString() exports.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 44a6b495777fb471686144b474e7485d4927b104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a6b495777fb471686144b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 17 14:28:19 2019 +0300 kernelbase: Add LoadString() exports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 4 +-- dlls/kernelbase/string.c | 80 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 0ecc029..02278fe 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -929,10 +929,10 @@ @ stdcall LoadLibraryW(wstr) kernel32.LoadLibraryW # @ stub LoadPackagedLibrary @ stdcall LoadResource(long long) kernel32.LoadResource -@ stdcall LoadStringA(long long ptr long) user32.LoadStringA +@ stdcall LoadStringA(long long ptr long) @ stub LoadStringBaseExW @ stub LoadStringByReference -@ stdcall LoadStringW(long long ptr long) user32.LoadStringW +@ stdcall LoadStringW(long long ptr long) @ stdcall LocalAlloc(long long) kernel32.LocalAlloc @ stdcall LocalFileTimeToFileTime(ptr ptr) kernel32.LocalFileTimeToFileTime @ stdcall LocalFree(long) kernel32.LocalFree diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 3d2766a..fb7bda8 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "winnls.h" #include "shlwapi.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/exception.h" @@ -738,3 +739,82 @@ LPWSTR WINAPI CharUpperW(WCHAR *str) return (LPWSTR)(UINT_PTR)ch; } } + +INT WINAPI DECLSPEC_HOTPATCH LoadStringW(HINSTANCE instance, UINT resource_id, LPWSTR buffer, INT buflen) +{ + int string_num, i; + HGLOBAL hmem; + HRSRC hrsrc; + WCHAR *p; + + TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n", instance, resource_id, buffer, buflen); + + if (!buffer) + return 0; + + /* Use loword (incremented by 1) as resourceid */ + hrsrc = FindResourceW(instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING); + if (!hrsrc) return 0; + hmem = LoadResource(instance, hrsrc); + if (!hmem) return 0; + + p = LockResource(hmem); + string_num = resource_id & 0x000f; + for (i = 0; i < string_num; i++) + p += *p + 1; + + TRACE("strlen = %d\n", (int)*p ); + + /*if buflen == 0, then return a read-only pointer to the resource itself in buffer + it is assumed that buffer is actually a (LPWSTR *) */ + if (buflen == 0) + { + *((LPWSTR *)buffer) = p + 1; + return *p; + } + + i = min(buflen - 1, *p); + if (i > 0) + { + memcpy(buffer, p + 1, i * sizeof (WCHAR)); + buffer[i] = 0; + } + else + { + if (buflen > 1) + { + buffer[0] = 0; + return 0; + } + } + + TRACE("returning %s\n", debugstr_w(buffer)); + return i; +} + +INT WINAPI DECLSPEC_HOTPATCH LoadStringA(HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen) +{ + DWORD retval = 0; + HGLOBAL hmem; + HRSRC hrsrc; + + TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n", instance, resource_id, buffer, buflen); + + if (!buflen) return -1; + + /* Use loword (incremented by 1) as resourceid */ + if ((hrsrc = FindResourceW(instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING )) && + (hmem = LoadResource(instance, hrsrc))) + { + const WCHAR *p = LockResource(hmem); + unsigned int id = resource_id & 0x000f; + + while (id--) p += *p + 1; + + if (buflen != 1) + RtlUnicodeToMultiByteN(buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR)); + } + buffer[retval] = 0; + TRACE("returning %s\n", debugstr_a(buffer)); + return retval; +}

1 0

Nikolay Sivov : kernelbase: Add string handling functions from user32.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 40d2b25ac23f2c60c314380d6da554bde82e0cae URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d2b25ac23f2c60c314380d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 17 14:28:18 2019 +0300 kernelbase: Add string handling functions from user32. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 44 ++++---- dlls/kernelbase/string.c | 226 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9739644..0ecc029 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -109,20 +109,20 @@ @ stdcall CancelWaitableTimer(long) kernel32.CancelWaitableTimer # @ stub CeipIsOptedIn @ stdcall ChangeTimerQueueTimer(ptr ptr long long) kernel32.ChangeTimerQueueTimer -@ stdcall CharLowerA(str) user32.CharLowerA -@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA -@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW -@ stdcall CharLowerW(wstr) user32.CharLowerW -@ stdcall CharNextA(str) user32.CharNextA -@ stdcall CharNextExA(long str long) user32.CharNextExA -@ stdcall CharNextW(wstr) user32.CharNextW -@ stdcall CharPrevA(str str) user32.CharPrevA -@ stdcall CharPrevExA(long str str long) user32.CharPrevExA -@ stdcall CharPrevW(wstr wstr) user32.CharPrevW -@ stdcall CharUpperA(str) user32.CharUpperA -@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA -@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW -@ stdcall CharUpperW(wstr) user32.CharUpperW +@ stdcall CharLowerA(str) +@ stdcall CharLowerBuffA(str long) +@ stdcall CharLowerBuffW(wstr long) +@ stdcall CharLowerW(wstr) +@ stdcall CharNextA(str) +@ stdcall CharNextExA(long str long) +@ stdcall CharNextW(wstr) +@ stdcall CharPrevA(str str) +@ stdcall CharPrevExA(long str str long) +@ stdcall CharPrevW(wstr wstr) +@ stdcall CharUpperA(str) +@ stdcall CharUpperBuffA(str long) +@ stdcall CharUpperBuffW(wstr long) +@ stdcall CharUpperW(wstr) # @ stub CheckAllowDecryptedRemoteDestinationPolicy @ stub CheckGroupPolicyEnabled # @ stub CheckIfStateChangeNotificationExists @@ -839,20 +839,20 @@ # @ stub InternetTimeToSystemTimeW # @ stub InvalidateAppModelVersionCache @ stub InvalidateTzSpecificCache -@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA -@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA -@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW -@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW +@ stdcall IsCharAlphaA(long) +@ stdcall IsCharAlphaNumericA(long) +@ stdcall IsCharAlphaNumericW(long) +@ stdcall IsCharAlphaW(long) @ stdcall IsCharBlankW(long) @ stdcall IsCharCntrlW(long) @ stdcall IsCharDigitW(long) -@ stdcall IsCharLowerA(long) user32.IsCharLowerA -@ stdcall IsCharLowerW(long) user32.IsCharLowerW +@ stdcall IsCharLowerA(long) +@ stdcall IsCharLowerW(long) @ stdcall IsCharPunctW(long) @ stdcall IsCharSpaceA(long) @ stdcall IsCharSpaceW(long) -@ stdcall IsCharUpperA(long) user32.IsCharUpperA -@ stdcall IsCharUpperW(long) user32.IsCharUpperW +@ stdcall IsCharUpperA(long) +@ stdcall IsCharUpperW(long) @ stdcall IsCharXDigitW(long) @ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte @ stdcall IsDBCSLeadByteEx(long long) kernel32.IsDBCSLeadByteEx diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 6f38fc3..3d2766a 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -24,6 +24,7 @@ #include "shlwapi.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(string); @@ -101,6 +102,54 @@ BOOL WINAPI IsCharXDigitW(WCHAR wc) return !!(get_char_type(wc) & C1_XDIGIT); } +BOOL WINAPI IsCharAlphaA(CHAR x) +{ + WCHAR wch; + MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); + return IsCharAlphaW(wch); +} + +BOOL WINAPI IsCharAlphaW(WCHAR ch) +{ + return !!(get_char_type(ch) & C1_ALPHA); +} + +BOOL WINAPI IsCharLowerA(CHAR x) +{ + WCHAR wch; + MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); + return IsCharLowerW(wch); +} + +BOOL WINAPI IsCharLowerW(WCHAR ch) +{ + return !!(get_char_type(ch) & C1_LOWER); +} + +BOOL WINAPI IsCharAlphaNumericA(CHAR x) +{ + WCHAR wch; + MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); + return IsCharAlphaNumericW(wch); +} + +BOOL WINAPI IsCharAlphaNumericW(WCHAR ch) +{ + return !!(get_char_type(ch) & (C1_ALPHA | C1_DIGIT)); +} + +BOOL WINAPI IsCharUpperA(CHAR x) +{ + WCHAR wch; + MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); + return IsCharUpperW(wch); +} + +BOOL WINAPI IsCharUpperW(WCHAR ch) +{ + return !!(get_char_type(ch) & C1_UPPER); +} + WCHAR * WINAPI StrChrW(const WCHAR *str, WCHAR ch) { TRACE("%s, %#x\n", wine_dbgstr_w(str), ch); @@ -512,3 +561,180 @@ WCHAR * WINAPI StrCpyNXW(WCHAR *dst, const WCHAR *src, int len) return dst; } + +LPSTR WINAPI CharLowerA(char *str) +{ + if (IS_INTRESOURCE(str)) + { + char ch = LOWORD(str); + CharLowerBuffA( &ch, 1 ); + return (LPSTR)(UINT_PTR)(BYTE)ch; + } + + __TRY + { + CharLowerBuffA( str, strlen(str) ); + } + __EXCEPT_PAGE_FAULT + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + __ENDTRY + return str; +} + +DWORD WINAPI CharLowerBuffA(char *str, DWORD len) +{ + DWORD lenW; + WCHAR buffer[32]; + WCHAR *strW = buffer; + + if (!str) return 0; /* YES */ + + lenW = MultiByteToWideChar(CP_ACP, 0, str, len, NULL, 0); + if (lenW > ARRAY_SIZE(buffer)) + { + strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); + if (!strW) return 0; + } + MultiByteToWideChar(CP_ACP, 0, str, len, strW, lenW); + CharLowerBuffW(strW, lenW); + len = WideCharToMultiByte(CP_ACP, 0, strW, lenW, str, len, NULL, NULL); + if (strW != buffer) HeapFree(GetProcessHeap(), 0, strW); + return len; +} + +DWORD WINAPI CharLowerBuffW(WCHAR *str, DWORD len) +{ + if (!str) return 0; /* YES */ + return LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, str, len, str, len); +} + +LPWSTR WINAPI CharLowerW(WCHAR *str) +{ + if (!IS_INTRESOURCE(str)) + { + CharLowerBuffW(str, lstrlenW(str)); + return str; + } + else + { + WCHAR ch = LOWORD(str); + CharLowerBuffW(&ch, 1); + return (LPWSTR)(UINT_PTR)ch; + } +} + +LPSTR WINAPI CharNextA(const char *ptr) +{ + if (!*ptr) return (LPSTR)ptr; + if (IsDBCSLeadByte( ptr[0] ) && ptr[1]) return (LPSTR)(ptr + 2); + return (LPSTR)(ptr + 1); +} + +LPSTR WINAPI CharNextExA(WORD codepage, const char *ptr, DWORD flags) +{ + if (!*ptr) return (LPSTR)ptr; + if (IsDBCSLeadByteEx( codepage, ptr[0] ) && ptr[1]) return (LPSTR)(ptr + 2); + return (LPSTR)(ptr + 1); +} + +LPWSTR WINAPI CharNextW(const WCHAR *x) +{ + if (*x) x++; + + return (WCHAR *)x; +} + +LPSTR WINAPI CharPrevA(const char *start, const char *ptr) +{ + while (*start && (start < ptr)) + { + LPCSTR next = CharNextA(start); + if (next >= ptr) break; + start = next; + } + return (LPSTR)start; +} + +LPSTR WINAPI CharPrevExA(WORD codepage, const char *start, const char *ptr, DWORD flags) +{ + while (*start && (start < ptr)) + { + LPCSTR next = CharNextExA(codepage, start, flags); + if (next >= ptr) break; + start = next; + } + return (LPSTR)start; +} + +LPWSTR WINAPI CharPrevW(const WCHAR *start, const WCHAR *x) +{ + if (x > start) return (LPWSTR)(x - 1); + else return (LPWSTR)x; +} + +LPSTR WINAPI CharUpperA(LPSTR str) +{ + if (IS_INTRESOURCE(str)) + { + char ch = LOWORD(str); + CharUpperBuffA(&ch, 1); + return (LPSTR)(UINT_PTR)(BYTE)ch; + } + + __TRY + { + CharUpperBuffA(str, strlen(str)); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + __ENDTRY + return str; +} + +DWORD WINAPI CharUpperBuffA(LPSTR str, DWORD len) +{ + DWORD lenW; + WCHAR buffer[32]; + WCHAR *strW = buffer; + + if (!str) return 0; /* YES */ + + lenW = MultiByteToWideChar(CP_ACP, 0, str, len, NULL, 0); + if (lenW > ARRAY_SIZE(buffer)) + { + strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); + if (!strW) return 0; + } + MultiByteToWideChar(CP_ACP, 0, str, len, strW, lenW); + CharUpperBuffW(strW, lenW); + len = WideCharToMultiByte(CP_ACP, 0, strW, lenW, str, len, NULL, NULL); + if (strW != buffer) HeapFree(GetProcessHeap(), 0, strW); + return len; +} + +DWORD WINAPI CharUpperBuffW(WCHAR *str, DWORD len) +{ + if (!str) return 0; /* YES */ + return LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_UPPERCASE, str, len, str, len); +} + +LPWSTR WINAPI CharUpperW(WCHAR *str) +{ + if (!IS_INTRESOURCE(str)) + { + CharUpperBuffW(str, lstrlenW(str)); + return str; + } + else + { + WCHAR ch = LOWORD(str); + CharUpperBuffW(&ch, 1); + return (LPWSTR)(UINT_PTR)ch; + } +}

1 0

Andreas Maier : jscript/tests: Add more Enumerator tests.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: f010569c3d8e84b9c38e768c7e3e3c834688807d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f010569c3d8e84b9c38e768c… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Fri May 17 16:39:32 2019 +0200 jscript/tests: Add more Enumerator tests. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 15 ++++ dlls/jscript/tests/run.c | 169 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 183 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 40d6422..40a1b2d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2452,6 +2452,7 @@ var exception_array = { E_OBJECT_EXPECTED: { type: "TypeError", number: -2146823281 }, E_OBJECT_REQUIRED: { type: "TypeError", number: -2146827864 }, E_UNSUPPORTED_ACTION: { type: "TypeError", number: -2146827843 }, + E_NOT_ENUMERATOR: { type: "TypeError", number: -2146823273 }, E_NOT_VBARRAY: { type: "TypeError", number: -2146823275 }, E_INVALID_DELETE: { type: "TypeError", number: -2146823276 }, E_UNDEFINED: { type: "TypeError", number: -2146823279 }, @@ -2717,6 +2718,15 @@ testArrayHostThis("join"); testArrayHostThis("pop"); testArrayHostThis("sort"); +function testEnumeratorThis(func) { + testThisExcept(Enumerator.prototype[func], "E_NOT_ENUMERATOR"); +} + +testEnumeratorThis("atEnd"); +testEnumeratorThis("item"); +testEnumeratorThis("moveFirst"); +testEnumeratorThis("moveNext"); + function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object"); ok(obj instanceof constr, "obj is not instance of its constructor"); @@ -3009,4 +3019,9 @@ ok(tmp.toArray() == "2,3,12,13,22,23,32,33,42,43", "tmp.toArray() = " + tmp.toAr ok(createArray().toArray() == "2,3,12,13,22,23,32,33,42,43", "createArray.toArray()=" + createArray().toArray()); +obj = new Enumerator(); +ok(obj.atEnd(), "atEnd() = " + obj.atEnd()); +obj.moveFirst(); +ok(obj.atEnd(), "atEnd() = " + obj.atEnd()); + reportSuccess(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index aadb317..c8a143b 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -106,6 +106,10 @@ DEFINE_EXPECT(testobj_noprop_d); DEFINE_EXPECT(testobj_onlydispid_d); DEFINE_EXPECT(testobj_onlydispid_i); DEFINE_EXPECT(testobj_notexists_d); +DEFINE_EXPECT(testobj_newenum); +DEFINE_EXPECT(enumvariant_next_0); +DEFINE_EXPECT(enumvariant_next_1); +DEFINE_EXPECT(enumvariant_reset); DEFINE_EXPECT(GetItemInfo_testVal); DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); @@ -144,6 +148,7 @@ DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_TESTPROPPUTREF 0x101b #define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c #define DISPID_GLOBAL_BINDEVENTHANDLER 0x101d +#define DISPID_GLOBAL_TESTENUMOBJ 0x101e #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -219,6 +224,101 @@ static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) ok_(__FILE__,line)(grfdex == expect, "grfdex = %x, expected %x\n", grfdex, expect); } +static HRESULT WINAPI EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualGUID(riid, &IID_IEnumVARIANT)) + *ppv = iface; + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + return 2; +} + +static ULONG WINAPI EnumVARIANT_Release(IEnumVARIANT *iface) +{ + return 1; +} + +static int EnumVARIANT_index = 0; +static int EnumVARIANT_next_0_count = 0; +static HRESULT WINAPI EnumVARIANT_Next( + IEnumVARIANT *This, + ULONG celt, + VARIANT *rgVar, + ULONG *pCeltFetched) +{ + ok(rgVar != NULL, "rgVar is NULL\n"); + ok(celt == 1, "celt = %d\n", celt); + ok(pCeltFetched == NULL, "pCeltFetched is not NULL\n"); + + if (!rgVar) + return S_FALSE; + + if (EnumVARIANT_index == 0) + { + EnumVARIANT_next_0_count--; + if (EnumVARIANT_next_0_count <= 0) + CHECK_EXPECT(enumvariant_next_0); + + V_VT(rgVar) = VT_I4; + V_I4(rgVar) = 123; + + if (pCeltFetched) + *pCeltFetched = 1; + EnumVARIANT_index++; + return S_OK; + } + + CHECK_EXPECT(enumvariant_next_1); + + if (pCeltFetched) + *pCeltFetched = 0; + return S_FALSE; + +} + +static HRESULT WINAPI EnumVARIANT_Skip( + IEnumVARIANT *This, + ULONG celt) +{ + ok(0, "EnumVariant_Skip: unexpected call\n"); + return E_NOTIMPL; +} +static HRESULT WINAPI EnumVARIANT_Reset( + IEnumVARIANT *This) +{ + CHECK_EXPECT(enumvariant_reset); + EnumVARIANT_index = 0; + return S_OK; +} + +static HRESULT WINAPI EnumVARIANT_Clone( + IEnumVARIANT *This, + IEnumVARIANT **ppEnum) +{ + ok(0, "EnumVariant_Clone: unexpected call\n"); + return E_NOTIMPL; +} + +static IEnumVARIANTVtbl testEnumVARIANTVtbl = { + EnumVARIANT_QueryInterface, + EnumVARIANT_AddRef, + EnumVARIANT_Release, + EnumVARIANT_Next, + EnumVARIANT_Skip, + EnumVARIANT_Reset, + EnumVARIANT_Clone +}; + +static IEnumVARIANT testEnumVARIANT = { &testEnumVARIANTVtbl }; + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -320,6 +420,28 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown return E_NOTIMPL; } +static HRESULT WINAPI testObj_Invoke(IDispatchEx *iface, DISPID id, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, UINT *puArgErr) +{ + switch(id) { + case DISPID_NEWENUM: + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei == NULL, "pei != NULL\n"); + + CHECK_EXPECT(testobj_newenum); + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&testEnumVARIANT; + return S_OK; + } + + ok(0, "unexpected call %x\n", id); + return DISP_E_MEMBERNOTFOUND; +} + static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "prop")) { @@ -453,7 +575,7 @@ static IDispatchExVtbl testObjVtbl = { DispatchEx_GetTypeInfoCount, DispatchEx_GetTypeInfo, DispatchEx_GetIDsOfNames, - DispatchEx_Invoke, + testObj_Invoke, testObj_GetDispID, testObj_InvokeEx, testObj_DeleteMemberByName, @@ -861,6 +983,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "testEnumObj")) { + *pid = DISPID_GLOBAL_TESTENUMOBJ; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -2682,6 +2809,46 @@ static BOOL run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + EnumVARIANT_index = 0; + EnumVARIANT_next_0_count = 1; + SET_EXPECT(testobj_newenum); + SET_EXPECT(enumvariant_next_0); + parse_script_a("new Enumerator(testObj);"); + CHECK_CALLED(testobj_newenum); + CHECK_CALLED(enumvariant_next_0); + + EnumVARIANT_index = 0; + EnumVARIANT_next_0_count = 2; + SET_EXPECT(testobj_newenum); + SET_EXPECT(enumvariant_next_0); + SET_EXPECT(enumvariant_reset); + parse_script_a("(function () {" + " var testEnumObj = new Enumerator(testObj);" + " var tmp = testEnumObj.moveFirst();" + " ok(tmp == undefined, \"testEnumObj.moveFirst() = \" + tmp);" + "})()"); + CHECK_CALLED(testobj_newenum); + CHECK_CALLED(enumvariant_next_0); + CHECK_CALLED(enumvariant_reset); + + EnumVARIANT_index = 0; + EnumVARIANT_next_0_count = 1; + SET_EXPECT(testobj_newenum); + SET_EXPECT(enumvariant_next_0); + SET_EXPECT(enumvariant_next_1); + parse_script_a("(function () {" + " var testEnumObj = new Enumerator(testObj);" + " while (!testEnumObj.atEnd())" + " {" + " ok(testEnumObj.item() == 123, " + " \"testEnumObj.item() = \"+testEnumObj.item());" + " testEnumObj.moveNext();" + " }" + "})()"); + CHECK_CALLED(testobj_newenum); + CHECK_CALLED(enumvariant_next_0); + CHECK_CALLED(enumvariant_next_1); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Andreas Maier : jscript: Implement Enumerator object.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: a015c626438dc8cba445242c68d4175f381b2128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a015c626438dc8cba445242c… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Fri May 17 16:26:36 2019 +0200 jscript: Implement Enumerator object. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/enumerator.c | 262 +++++++++++++++++++++++++++++++++++++--------- dlls/jscript/jscript.h | 3 +- dlls/jscript/object.c | 2 +- dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 6 +- 5 files changed, 217 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a015c626438dc8cba445…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_compute_state().
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 376c84252634ec1884db3562d859ec728668c7ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=376c84252634ec1884db3562… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:16 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_compute_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 54 ++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bd30c14..5735d02 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4037,51 +4037,51 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, return TRUE; } -static void context_apply_compute_state(struct wined3d_context *context, +static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device, const struct wined3d_state *state) { - const struct wined3d_state_entry *state_table = context->state_table; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_state_entry *state_table = context_gl->c.state_table; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int state_id, i; - context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); - context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], + context_load_shader_resources(&context_gl->c, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + context_load_unordered_access_resources(&context_gl->c, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); - for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context->dirty_compute_states); ++i) + for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context_gl->c.dirty_compute_states); ++i) { - unsigned int dirty_mask = context->dirty_compute_states[i]; + unsigned int dirty_mask = context_gl->c.dirty_compute_states[i]; + while (dirty_mask) { unsigned int current_state_id = state_id + wined3d_bit_scan(&dirty_mask); - state_table[current_state_id].apply(context, state, current_state_id); + state_table[current_state_id].apply(&context_gl->c, state, current_state_id); } - state_id += sizeof(*context->dirty_compute_states) * CHAR_BIT; + state_id += sizeof(*context_gl->c.dirty_compute_states) * CHAR_BIT; } - memset(context->dirty_compute_states, 0, sizeof(*context->dirty_compute_states)); + memset(context_gl->c.dirty_compute_states, 0, sizeof(*context_gl->c.dirty_compute_states)); - if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) + if (context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) { - device->shader_backend->shader_select_compute(device->shader_priv, context, state); - context->shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); + device->shader_backend->shader_select_compute(device->shader_priv, &context_gl->c, state); + context_gl->c.shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); } - if (context->update_compute_shader_resource_bindings) + if (context_gl->c.update_compute_shader_resource_bindings) { - wined3d_context_gl_bind_shader_resources(wined3d_context_gl(context), state, WINED3D_SHADER_TYPE_COMPUTE); - context->update_compute_shader_resource_bindings = 0; + wined3d_context_gl_bind_shader_resources(context_gl, state, WINED3D_SHADER_TYPE_COMPUTE); + context_gl->c.update_compute_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) - context->update_shader_resource_bindings = 1; + context_gl->c.update_shader_resource_bindings = 1; } - if (context->update_compute_unordered_access_view_bindings) + if (context_gl->c.update_compute_unordered_access_view_bindings) { - context_bind_unordered_access_views(context, + context_bind_unordered_access_views(&context_gl->c, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); - context->update_compute_unordered_access_view_bindings = 0; - context->update_unordered_access_view_bindings = 1; + context_gl->c.update_compute_unordered_access_view_bindings = 0; + context_gl->c.update_unordered_access_view_bindings = 1; } /* Updates to currently bound render targets aren't necessarily coherent @@ -4092,10 +4092,10 @@ static void context_apply_compute_state(struct wined3d_context *context, * Without this, the bloom effect in Nier:Automata is too bright on the * Mesa radeonsi driver, and presumably on other Mesa based drivers. */ wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); - context_invalidate_state(context, STATE_FRAMEBUFFER); + context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER); - context->last_was_blit = FALSE; - context->last_was_ffp_blit = FALSE; + context_gl->c.last_was_blit = FALSE; + context_gl->c.last_was_ffp_blit = FALSE; } static BOOL use_transform_feedback(const struct wined3d_state *state) @@ -4311,6 +4311,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state const struct wined3d_dispatch_parameters *parameters) { const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; context = context_acquire(device, NULL, 0); @@ -4320,6 +4321,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state WARN("Invalid context, skipping dispatch.\n"); return; } + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (!gl_info->supported[ARB_COMPUTE_SHADER]) @@ -4332,7 +4334,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state if (parameters->indirect) wined3d_buffer_load(parameters->u.indirect.buffer, context, state); - context_apply_compute_state(context, device, state); + wined3d_context_gl_apply_compute_state(context_gl, device, state); if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) {

1 0