August 2017 - Wine-Commits - list.winehq.org

Hugh McMaster : regedit: Allow editing of all hex data types.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: efb8d0b497abe771d4da264c6ff6b504a3ad8500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb8d0b497abe771d4da264c6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 7 12:29:01 2017 +0000 regedit: Allow editing of all hex data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index c72f39d..3694627 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -303,14 +303,6 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) } heap_free(valueA); } - } else if ( type == REG_BINARY ) { - struct edit_params params; - params.hKey = hKey; - params.lpszValueName = valueName; - params.pData = stringValueData; - params.cbData = len; - result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, - bin_modify_dlgproc, (LPARAM)&params); } else if ( type == REG_MULTI_SZ ) { WCHAR char1 = '\r', char2 = '\n'; WCHAR *tmpValueData = NULL; @@ -362,8 +354,17 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); } - } else { - error_code_messagebox(hwnd, IDS_UNSUPPORTED_TYPE, type); + } + else /* hex data types */ + { + struct edit_params params; + + params.hKey = hKey; + params.lpszValueName = valueName; + params.pData = stringValueData; + params.cbData = len; + result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, + bin_modify_dlgproc, (LPARAM)&params); } /* Update the listview item with the new data string */

1 0

Nikolay Sivov : dmloader: Use safe list iterator when clearing the cache ( Coverity).
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: 96fd03b269cbd991e6609f0fa2ce4c12984cfd43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fd03b269cbd991e6609f0fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 7 10:34:50 2017 +0300 dmloader: Use safe list iterator when clearing the cache (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index e44d2b9..10a2151 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -776,11 +776,11 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 * static HRESULT WINAPI IDirectMusicLoaderImpl_ClearCache(IDirectMusicLoader8 *iface, REFGUID class) { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - struct cache_entry *obj; + struct cache_entry *obj, *obj2; TRACE("(%p, %s)\n", This, debugstr_dmguid(class)); - LIST_FOR_EACH_ENTRY(obj, &This->cache, struct cache_entry, entry) { + LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &This->cache, struct cache_entry, entry) { if ((IsEqualGUID(class, &GUID_DirectMusicAllTypes) || IsEqualGUID(class, &obj->Desc.guidClass)) && (obj->Desc.dwValidData & DMUS_OBJ_LOADED)) { /* basically, wrap to ReleaseObject for each object found */

1 0

Józef Kucia : wined3d: Add support for initial UAV counters values.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: e7f1559a8d332598b5b894b28a27aece1be2d8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f1559a8d332598b5b894b28… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 4 19:53:50 2017 +0200 wined3d: Add support for initial UAV counters values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 23 ++++++----------------- dlls/d3d11/tests/d3d11.c | 10 +++++----- dlls/wined3d/cs.c | 7 ++++++- dlls/wined3d/device.c | 19 ++++++++++--------- dlls/wined3d/view.c | 17 +++++++++++++++++ dlls/wined3d/wined3d.spec | 4 ++-- dlls/wined3d/wined3d_private.h | 5 ++++- include/wine/wined3d.h | 4 ++-- 8 files changed, 52 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7f1559a8d332598b5b89…

1 0

Piotr Caban : msvcrt: Fix strcpy implementation so it works on overlapping buffers.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: 395a65bdc6c576a084c8008e42c95b9750421e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395a65bdc6c576a084c8008e4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Aug 5 18:23:13 2017 +0200 msvcrt: Fix strcpy implementation so it works on overlapping buffers. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 10 ++++++++++ dlls/msvcrt/tests/string.c | 15 +++++++++++++-- dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7379774..b6b10ba 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1800,7 +1800,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0a307ec..b36cb3a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2158,7 +2158,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 81bef04..77daf09 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2368,7 +2368,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 962ec06..bbfbea1 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -813,7 +813,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index b32aac4..f9c5afe 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -809,7 +809,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 744eb64..5bfa4ac 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1480,7 +1480,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e405b2d..e39fdee 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1453,7 +1453,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index bdef9be..c23c72b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1421,7 +1421,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3e765d0..8d6b48c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -697,6 +697,16 @@ char* __cdecl MSVCRT_strncpy(char *dst, const char *src, MSVCRT_size_t len) } /********************************************************************* + * strcpy (MSVCRT.@) + */ +char* CDECL MSVCRT_strcpy(char *dst, const char *src) +{ + char *ret = dst; + while ((*dst++ = *src++)); + return ret; +} + +/********************************************************************* * strcpy_s (MSVCRT.@) */ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8de2f43..04e20c1 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -56,6 +56,7 @@ static void* (__cdecl *pmemcpy)(void *, const void *, size_t n); static int (__cdecl *p_memcpy_s)(void *, size_t, const void *, size_t); static int (__cdecl *p_memmove_s)(void *, size_t, const void *, size_t); static int* (__cdecl *pmemcmp)(void *, const void *, size_t n); +static int (__cdecl *p_strcpy)(char *dst, const char *src); static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbscat_s)(unsigned char *dst, size_t size, const unsigned char *src); @@ -493,8 +494,8 @@ static void test_strdup(void) static void test_strcpy_s(void) { char dest[8]; - const char *small = "small"; - const char *big = "atoolongstringforthislittledestination"; + const char small[] = "small"; + const char big[] = "atoolongstringforthislittledestination"; int ret; if(!pstrcpy_s) @@ -543,6 +544,15 @@ static void test_strcpy_s(void) ret = pstrcpy_s(NULL, sizeof(dest), small); ok(ret == EINVAL, "Copying a big string a NULL dest returned %d, expected EINVAL\n", ret); + + /* strcpy overlapping buffers test */ + memset(dest, 'X', sizeof(dest)); + memcpy(dest+1, small, sizeof(small)); + p_strcpy(dest, dest+1); + ok(dest[0] == 's' && dest[1] == 'm' && dest[2] == 'a' && dest[3] == 'l' && + dest[4] == 'l' && dest[5] == '\0' && dest[6] == '\0' && dest[7] == 'X', + "Unexpected return data from strcpy: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } #define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) @@ -3199,6 +3209,7 @@ START_TEST(string) SET(pmemcmp,"memcmp"); SET(p_mbctype,"_mbctype"); SET(p__mb_cur_max,"__mb_cur_max"); + SET(p_strcpy, "strcpy"); pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbscat_s = (void*)GetProcAddress( hMsvcrt, "_mbscat_s" ); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a8e4e21..7a07b71 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2499,7 +2499,7 @@ @ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror

1 0

Paul Gofman : d3dx9: Avoid an extra indirection in is_const_tab_input_dirty().
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: d6f36ca18fc47cfd0fc1353feae0886c94f6bd5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f36ca18fc47cfd0fc1353fe… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 19 16:43:08 2017 +0300 d3dx9: Avoid an extra indirection in is_const_tab_input_dirty(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 11 ++++++++--- dlls/d3dx9_36/preshader.c | 9 ++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 55b7431..2727463 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -339,14 +339,19 @@ static inline ULONG64 next_update_version(ULONG64 *version_counter) return ++*version_counter; } -static inline BOOL is_param_dirty(struct d3dx_parameter *param, ULONG64 update_version) +static inline BOOL is_top_level_param_dirty(struct d3dx_top_level_parameter *param, ULONG64 update_version) { struct d3dx_shared_data *shared_data; - if ((shared_data = param->top_level_param->shared_data)) + if ((shared_data = param->shared_data)) return update_version < shared_data->update_version; else - return update_version < param->top_level_param->update_version; + return update_version < param->update_version; +} + +static inline BOOL is_param_dirty(struct d3dx_parameter *param, ULONG64 update_version) +{ + return is_top_level_param_dirty(param->top_level_param, update_version); } struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index f39ddc2..29846a0 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -941,6 +941,12 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab goto cleanup; } } + if (!is_top_level_parameter(inputs_param[index])) + { + WARN("Expected top level parameter '%s'.\n", debugstr_a(cdesc[index].Name)); + hr = E_FAIL; + goto cleanup; + } for (j = 0; j < skip_constants_count; ++j) { @@ -1618,7 +1624,8 @@ static BOOL is_const_tab_input_dirty(struct d3dx_const_tab *ctab, ULONG64 update update_version = ctab->update_version; for (i = 0; i < ctab->input_count; ++i) { - if (is_param_dirty(ctab->inputs_param[i], update_version)) + if (is_top_level_param_dirty(top_level_parameter_from_parameter(ctab->inputs_param[i]), + update_version)) return TRUE; } return FALSE;

1 0

Paul Gofman : d3dx9: Return NULL for child parameter' s annotation in get_parameter_by_name().
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: f09bf52d5d2fec66b968bffbdd9a5b3a9027604c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09bf52d5d2fec66b968bffbd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 19 16:43:05 2017 +0300 d3dx9: Return NULL for child parameter's annotation in get_parameter_by_name(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 937536a..48f5546 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -931,7 +931,9 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_annotation_by_name(temp_parameter->annotation_count, temp_parameter->annotations, part); + return parameter ? NULL + : get_annotation_by_name(temp_parameter->annotation_count, + temp_parameter->annotations, part); case '[': return get_parameter_element_by_name(temp_parameter, part);

1 0

Akihiro Sagawa : msvcrt: Fix mbstowcs with empty strings.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: 967fb744e4af99b61e6af9a7c2ddde4640b54ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=967fb744e4af99b61e6af9a7c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 4 23:06:39 2017 +0900 msvcrt: Fix mbstowcs with empty strings. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 14 ++++++++------ dlls/msvcrt/tests/string.c | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 93bb1a7..49d6678 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2278,12 +2278,14 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, size += (MSVCRT__isleadbyte_l((unsigned char)mbstr[size], locale) ? 2 : 1); } - size = MultiByteToWideChar(locinfo->lc_codepage, 0, - mbstr, size, wcstr, count); - if(!size) { - if(count) wcstr[0] = '\0'; - *MSVCRT__errno() = MSVCRT_EILSEQ; - return -1; + if(size) { + size = MultiByteToWideChar(locinfo->lc_codepage, 0, + mbstr, size, wcstr, count); + if(!size) { + if(count) wcstr[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EILSEQ; + return -1; + } } if(size<count && wcstr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 87e387a..8de2f43 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1900,7 +1900,7 @@ static void test_mbstowcs(void) ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); ret = mbstowcs(wOut, mEmpty, 6); - todo_wine ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); + ok(ret == 0, "mbstowcs did not return 0, got %d\n", (int)ret); ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); ret = wcstombs(mOut, wHiragana, 6); @@ -1928,8 +1928,8 @@ static void test_mbstowcs(void) ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); err = pmbstowcs_s(&ret, wOut, 6, mEmpty, _TRUNCATE); - todo_wine ok(err == 0, "err = %d\n", err); - todo_wine ok(ret == 1, "mbstowcs_s did not return 1, got %d\n", (int)ret); + ok(err == 0, "err = %d\n", err); + ok(ret == 1, "mbstowcs_s did not return 1, got %d\n", (int)ret); ok(!memcmp(wOut, wEmpty, sizeof(wEmpty)), "wOut = %s\n", wine_dbgstr_w(wOut)); err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1);

1 0

Zebediah Figura : ole32: Store proxy/stub CLSIDs per process, not per apartment.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: a56bc8f93bca9a0f99cf4c5b9459c75bc082ef0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56bc8f93bca9a0f99cf4c5b9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 3 16:48:04 2017 -0500 ole32: Store proxy/stub CLSIDs per process, not per apartment. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 60 ++++++++++++++++++++++++++------------- dlls/ole32/compobj_private.h | 1 - dlls/ole32/tests/compobj.c | 67 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 105 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a56bc8f93bca9a0f99cf4…

1 0

Józef Kucia : wined3d: Change wined3d_buffer_copy() return type to void.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: 2100e140ca1652adad3409fcca86dcfed7c85172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2100e140ca1652adad3409fcc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 4 19:53:51 2017 +0200 wined3d: Change wined3d_buffer_copy() return type to void. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 +--- dlls/wined3d/cs.c | 5 ++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b299fe7..e953e9a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1191,7 +1191,7 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) } } -HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, +void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) { struct wined3d_bo_address dst, src; @@ -1213,8 +1213,6 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ context_release(context); wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); - - return WINED3D_OK; } void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bc1bf17..a76598f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1952,10 +1952,9 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * if (op->dst_resource->type == WINED3D_RTYPE_BUFFER) { - if (FAILED(wined3d_buffer_copy(buffer_from_resource(op->dst_resource), op->dst_box.left, + wined3d_buffer_copy(buffer_from_resource(op->dst_resource), op->dst_box.left, buffer_from_resource(op->src_resource), op->src_box.left, - op->src_box.right - op->src_box.left))) - ERR("Failed to copy buffer.\n"); + op->src_box.right - op->src_box.left); } else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_2D) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f17cc76..f8aeb62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3568,7 +3568,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; -HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, +void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Implement copying UAV counters.
by Alexandre Julliard Aug. 8, 2017

Aug. 8, 2017

Module: wine Branch: master Commit: 24c39103be95d6fab75be663800ef90c180260c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c39103be95d6fab75be6638… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 4 19:53:48 2017 +0200 wined3d: Implement copying UAV counters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 9 +++++++++ dlls/wined3d/view.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 4 ++++ include/wine/wined3d.h | 2 ++ 6 files changed, 76 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c785b72..307cb57 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -70,6 +70,7 @@ enum wined3d_cs_op WINED3D_CS_OP_UPDATE_SUB_RESOURCE, WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION, WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW, + WINED3D_CS_OP_COPY_UAV_COUNTER, WINED3D_CS_OP_STOP, }; @@ -418,6 +419,14 @@ struct wined3d_cs_clear_unordered_access_view struct wined3d_uvec4 clear_value; }; +struct wined3d_cs_copy_uav_counter +{ + enum wined3d_cs_op opcode; + struct wined3d_buffer *buffer; + unsigned int offset; + struct wined3d_unordered_access_view *view; +}; + struct wined3d_cs_stop { enum wined3d_cs_op opcode; @@ -2228,6 +2237,35 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } +static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_copy_uav_counter *op = data; + struct wined3d_unordered_access_view *view = op->view; + struct wined3d_context *context; + + context = context_acquire(cs->device, NULL, 0); + wined3d_unordered_access_view_copy_counter(view, op->buffer, op->offset, context); + context_release(context); + + wined3d_resource_release(&op->buffer->resource); +} + +void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, + unsigned int offset, struct wined3d_unordered_access_view *uav) +{ + struct wined3d_cs_copy_uav_counter *op; + + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_COPY_UAV_COUNTER; + op->buffer = dst_buffer; + op->offset = offset; + op->view = uav; + + wined3d_resource_acquire(&dst_buffer->resource); + + cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); +} + static void wined3d_cs_emit_stop(struct wined3d_cs *cs) { struct wined3d_cs_stop *op; @@ -2285,6 +2323,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_UPDATE_SUB_RESOURCE */ wined3d_cs_exec_update_sub_resource, /* WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION */ wined3d_cs_exec_add_dirty_texture_region, /* WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW */ wined3d_cs_exec_clear_unordered_access_view, + /* WINED3D_CS_OP_COPY_UAV_COUNTER */ wined3d_cs_exec_copy_uav_counter, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size, enum wined3d_cs_queue_id queue_id) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3d12e41..18e1b01 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3959,6 +3959,15 @@ float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) return 0.0f; } +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) +{ + TRACE("device %p, dst_buffer %p, offset %u, uav %p.\n", + device, dst_buffer, offset, uav); + + wined3d_cs_emit_copy_uav_counter(device->cs, dst_buffer, offset, uav); +} + void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index adb43dd..da915ea 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -898,6 +898,27 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi checkGLcall("clear unordered access view"); } +void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, + struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) +{ + struct wined3d_bo_address dst, src; + DWORD dst_location; + + if (!view->counter_bo) + return; + + dst_location = wined3d_buffer_get_memory(buffer, &dst, buffer->locations); + dst.addr += offset; + + src.buffer_object = view->counter_bo; + src.addr = NULL; + + context_copy_bo_address(context, &dst, buffer->buffer_type_hint, + &src, GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint)); + + wined3d_buffer_invalidate_location(buffer, ~dst_location); +} + static void wined3d_unordered_access_view_cs_init(void *object) { struct wined3d_unordered_access_view *view = object; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 43ec7aa..fa33c57 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -38,6 +38,7 @@ @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr) +@ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_dispatch_compute(ptr long long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2270ae0..7d3e697 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3426,6 +3426,8 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; +void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, + unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, @@ -3648,6 +3650,8 @@ struct wined3d_unordered_access_view void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, + struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, DWORD location) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d176ab1..f83217b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2209,6 +2209,8 @@ HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *d struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box); +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, UINT adapter_idx, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent, struct wined3d_device **device);

1 0