January 2016 - Wine-Commits

Piotr Caban : msvcr110: Fix __lc_time_data definition.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: d4450b9195bd2209f5a874b31e2e82420cf5dd38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4450b9195bd2209f5a874b31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 11:42:08 2016 +0100 msvcr110: Fix __lc_time_data definition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 9 +++++++++ dlls/msvcrt/msvcrt.h | 5 +++++ dlls/msvcrt/time.c | 22 ++++++++++++++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b00bc78..e1a0fbe 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1528,6 +1528,9 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, size += ret*sizeof(MSVCRT_wchar_t); } } +#if _MSVCR_VER >= 110 + size += LCIDToLocaleName(lcid[MSVCRT_LC_TIME], NULL, 0, 0)*sizeof(MSVCRT_wchar_t); +#endif locinfo->lc_time_curr = MSVCRT_malloc(size); if(!locinfo->lc_time_curr) { @@ -1568,7 +1571,13 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); } } +#if _MSVCR_VER >= 110 + locinfo->lc_time_curr->locname = (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret]; + LCIDToLocaleName(lcid[MSVCRT_LC_TIME], locinfo->lc_time_curr->locname, + (size-ret)/sizeof(MSVCRT_wchar_t), 0); +#else locinfo->lc_time_curr->lcid = lcid[MSVCRT_LC_TIME]; +#endif } return locinfo; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e30e675..aff1741 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -132,7 +132,9 @@ typedef struct { char *time; } names; } str; +#if _MSVCR_VER < 110 LCID lcid; +#endif int unk[2]; union { MSVCRT_wchar_t *wstr[43]; @@ -148,6 +150,9 @@ typedef struct { MSVCRT_wchar_t *time; } names; } wstr; +#if _MSVCR_VER >= 110 + MSVCRT_wchar_t *locname; +#endif char data[1]; } MSVCRT___lc_time_data; diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 7fed3b3..50a27ec 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -946,6 +946,7 @@ static inline BOOL strftime_date(char *str, MSVCRT_size_t *pos, MSVCRT_size_t ma char *format; SYSTEMTIME st; MSVCRT_size_t ret; + LCID lcid; st.wYear = mstm->tm_year + 1900; st.wMonth = mstm->tm_mon + 1; @@ -956,10 +957,16 @@ static inline BOOL strftime_date(char *str, MSVCRT_size_t *pos, MSVCRT_size_t ma st.wSecond = mstm->tm_sec; st.wMilliseconds = 0; +#if _MSVCR_VER < 110 + lcid = time_data->lcid; +#else + lcid = LocaleNameToLCID(time_data->locname, 0); +#endif + format = alternate ? time_data->str.names.date : time_data->str.names.short_date; - ret = GetDateFormatA(time_data->lcid, 0, &st, format, NULL, 0); + ret = GetDateFormatA(lcid, 0, &st, format, NULL, 0); if(ret && ret<max-*pos) - ret = GetDateFormatA(time_data->lcid, 0, &st, format, str+*pos, max-*pos); + ret = GetDateFormatA(lcid, 0, &st, format, str+*pos, max-*pos); if(!ret) { *str = 0; *MSVCRT__errno() = MSVCRT_EINVAL; @@ -978,6 +985,7 @@ static inline BOOL strftime_time(char *str, MSVCRT_size_t *pos, MSVCRT_size_t ma { SYSTEMTIME st; MSVCRT_size_t ret; + LCID lcid; st.wYear = mstm->tm_year + 1900; st.wMonth = mstm->tm_mon + 1; @@ -988,9 +996,15 @@ static inline BOOL strftime_time(char *str, MSVCRT_size_t *pos, MSVCRT_size_t ma st.wSecond = mstm->tm_sec; st.wMilliseconds = 0; - ret = GetTimeFormatA(time_data->lcid, 0, &st, time_data->str.names.time, NULL, 0); +#if _MSVCR_VER < 110 + lcid = time_data->lcid; +#else + lcid = LocaleNameToLCID(time_data->locname, 0); +#endif + + ret = GetTimeFormatA(lcid, 0, &st, time_data->str.names.time, NULL, 0); if(ret && ret<max-*pos) - ret = GetTimeFormatA(time_data->lcid, 0, &st, time_data->str.names.time, + ret = GetTimeFormatA(lcid, 0, &st, time_data->str.names.time, str+*pos, max-*pos); if(!ret) { *str = 0;

1 0

Piotr Caban : msvcr110: Add _W_Gettnames implementation.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 59ed8c593c8c5d7d7de2ecde6a283d9d4276661f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ed8c593c8c5d7d7de2ecde6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 11:42:14 2016 +0100 msvcr110: Add _W_Gettnames implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 53 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/locale.c | 8 ++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 80b79cb..2939b95 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -4,7 +4,7 @@ @ cdecl _Strftime(str long str ptr ptr) ucrtbase._Strftime @ cdecl _W_Getdays() ucrtbase._W_Getdays @ cdecl _W_Getmonths() ucrtbase._W_Getmonths -@ stub _W_Gettnames +@ cdecl _W_Gettnames() ucrtbase._W_Gettnames @ stub _Wcsftime @ cdecl __daylight() ucrtbase.__daylight @ cdecl __dstbias() ucrtbase.__dstbias diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index dd23c75..c1ee3a2 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -866,7 +866,7 @@ @ stub _Unlock_shared_ptr_spin_lock @ cdecl _W_Getdays() @ cdecl _W_Getmonths() -@ stub _W_Gettnames +@ cdecl _W_Gettnames() @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) @ cdecl __AdjustPointer(ptr ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 461b529..9931820 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -850,7 +850,7 @@ @ cdecl _Strftime(str long str ptr ptr) @ cdecl _W_Getdays() @ cdecl _W_Getmonths() -@ stub _W_Gettnames +@ cdecl _W_Gettnames() @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) @ cdecl __AdjustPointer(ptr ptr) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 708fada..aa78c4f 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include "wine/test.h" #include <locale.h> @@ -80,6 +81,8 @@ static int (CDECL *p__fdsign)(float); static int (__cdecl *p__dpcomp)(double x, double y); static wchar_t** (CDECL *p____lc_locale_name_func)(void); static unsigned int (CDECL *p__GetConcurrency)(void); +static void* (CDECL *p__W_Gettnames)(void); +static void (CDECL *p_free)(void*); static BOOL init(void) { @@ -100,6 +103,8 @@ static BOOL init(void) p__dpcomp = (void*)GetProcAddress(module, "_dpcomp"); p____lc_locale_name_func = (void*)GetProcAddress(module, "___lc_locale_name_func"); p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency(a)details@Concurrency@@YAIXZ"); + p__W_Gettnames = (void*)GetProcAddress(module, "_W_Gettnames"); + p_free = (void*)GetProcAddress(module, "free"); return TRUE; } @@ -269,6 +274,53 @@ static void test__GetConcurrency(void) ok(c == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, c); } +static void test__W_Gettnames(void) +{ + static const char *str[] = { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", + "Sunday", "Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday", + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", + "January", "February", "March", "April", "May", "June", "July", + "August", "September", "October", "November", "December", + "AM", "PM", "M/d/yyyy" + }; + + struct { + char *str[43]; + int unk[2]; + wchar_t *wstr[43]; + wchar_t *locname; + char data[1]; + } *ret; + int i, size; + WCHAR buf[64]; + + if(!p_setlocale(LC_ALL, "english")) + return; + + ret = p__W_Gettnames(); + size = ret->str[0]-(char*)ret; + if(sizeof(void*) == 8) + ok(size==0x2c0, "structure size: %x\n", size); + else + ok(size==0x164, "structure size: %x\n", size); + + for(i=0; i<sizeof(str)/sizeof(*str); i++) { + ok(!strcmp(ret->str[i], str[i]), "ret->str[%d] = %s, expected %s\n", + i, ret->str[i], str[i]); + + MultiByteToWideChar(CP_ACP, 0, str[i], strlen(str[i])+1, + buf, sizeof(buf)/sizeof(*buf)); + ok(!lstrcmpW(ret->wstr[i], buf), "ret->wstr[%d] = %s, expected %s\n", + i, wine_dbgstr_w(ret->wstr[i]), wine_dbgstr_w(buf)); + } + p_free(ret); + + p_setlocale(LC_ALL, "C"); +} + START_TEST(msvcr120) { if (!init()) return; @@ -277,4 +329,5 @@ START_TEST(msvcr120) test__dpcomp(); test____lc_locale_name_func(); test__GetConcurrency(); + test__W_Gettnames(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 425c839..50066ed 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -844,7 +844,7 @@ @ cdecl _Strftime(str long str ptr ptr) msvcr120._Strftime @ cdecl _W_Getdays() msvcr120._W_Getdays @ cdecl _W_Getmonths() msvcr120._W_Getmonths -@ stub _W_Gettnames +@ cdecl _W_Gettnames() msvcr120._W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) msvcr120._XcptFilter @ cdecl __AdjustPointer(ptr ptr) msvcr120.__AdjustPointer diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e1a0fbe..a1551c2 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -580,6 +580,14 @@ void* CDECL _Gettnames(void) } /********************************************************************* + * _W_Gettnames (MSVCR110.@) + */ +void* CDECL _W_Gettnames(void) +{ + return _Gettnames(); +} + +/********************************************************************* * __crtLCMapStringA (MSVCRT.@) */ int CDECL __crtLCMapStringA( diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e59e26f..e809596 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -43,7 +43,7 @@ @ cdecl _Strftime(str long str ptr ptr) @ cdecl _W_Getdays() @ cdecl _W_Getmonths() -@ stub _W_Gettnames +@ cdecl _W_Gettnames() @ stub _Wcsftime @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject

1 0

Alexandre Julliard : ntdll/tests: Fix a test failure on restricted Windows.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 29e0178cf51594240553b292aabe1fb1de3ddf21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29e0178cf51594240553b292a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 20 21:36:28 2016 +0900 ntdll/tests: Fix a test failure on restricted Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a736c1e..58333d1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -516,9 +516,13 @@ static void test_name_limits(void) } str.Length = sizeof(registryW) + 256 * sizeof(WCHAR); status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); - ok( status == STATUS_SUCCESS, "%u: NtCreateKey failed %x\n", str.Length, status ); - pNtDeleteKey( ret ); - pNtClose( ret ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "%u: NtCreateKey failed %x\n", str.Length, status ); + if (!status) + { + pNtDeleteKey( ret ); + pNtClose( ret ); + } str.Length++; status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); ok( status == STATUS_OBJECT_NAME_INVALID ||

1 0

Hans Leidekker : webservices: Avoid some casts.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: adcdb4c2bdae36169fdd38646605c96ab549c95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=adcdb4c2bdae36169fdd38646… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 20 14:53:39 2016 +0100 webservices: Avoid some casts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 66 +++++++++++++++++----------------- dlls/webservices/webservices_private.h | 4 +-- dlls/webservices/writer.c | 22 ++++++------ 3 files changed, 46 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adcdb4c2bdae36169fdd3…

1 0

Alexandre Julliard : kernel32/tests: Avoid sizeof in a trace.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: b23ab91e66d788a6a28c618a467b9e2ff11f35e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23ab91e66d788a6a28c618a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 20 16:42:45 2016 +0900 kernel32/tests: Avoid sizeof in a trace. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b760e9a..385e8e4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4678,7 +4678,7 @@ static void test_GetSystemPreferredUILanguages(void) buffer = HeapAlloc(GetProcessHeap(), 0, size_buffer * sizeof(WCHAR)); if (!buffer) { - skip("Failed to allocate memory with size %d\n", size_buffer * sizeof(WCHAR)); + skip("Failed to allocate memory for %d chars\n", size_buffer); return; }

1 0

Nikolay Sivov : dwrite: Underline reading direction matches run direction.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 6024656f9877a27a1dc47b6c5ea9a0f3323d266f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6024656f9877a27a1dc47b6c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 19 23:23:01 2016 +0300 dwrite: Underline reading direction matches run direction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 6b5bec7..9109924 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1546,7 +1546,8 @@ static HRESULT layout_add_underline(struct dwrite_textlayout *layout, struct lay however Y grows from baseline down for horizontal baseline. */ u->u.offset = -offset; u->u.runHeight = 0.0f; /* FIXME */ - u->u.readingDirection = layout->format.readingdir; + u->u.readingDirection = is_run_rtl(cur) ? DWRITE_READING_DIRECTION_RIGHT_TO_LEFT : + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; u->u.flowDirection = layout->format.flow; u->u.localeName = cur->run->u.regular.descr.localeName; u->u.measuringMode = layout->measuringmode;

1 0

Huw Davies : ole32: The type of the size of IMalloc'ed blocks is SIZE_T.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: bf5dca19763f31c6c5abc2d57db944e4549c5a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5dca19763f31c6c5abc2d57… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 19 16:19:09 2016 +0000 ole32: The type of the size of IMalloc'ed blocks is SIZE_T. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 6 +++--- dlls/mapi32/imalloc.c | 10 +++++----- dlls/ole32/ifs.c | 48 +++++++++++++++++++++++++----------------------- include/objbase.h | 4 ++-- include/objidl.idl | 18 +++++++++--------- 5 files changed, 44 insertions(+), 42 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 94fb558..d63da8c 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2821,7 +2821,7 @@ static ULONG WINAPI MimeAlloc_Release( static LPVOID WINAPI MimeAlloc_Alloc( IMimeAllocator* iface, - ULONG cb) + SIZE_T cb) { return CoTaskMemAlloc(cb); } @@ -2829,7 +2829,7 @@ static LPVOID WINAPI MimeAlloc_Alloc( static LPVOID WINAPI MimeAlloc_Realloc( IMimeAllocator* iface, LPVOID pv, - ULONG cb) + SIZE_T cb) { return CoTaskMemRealloc(pv, cb); } @@ -2841,7 +2841,7 @@ static void WINAPI MimeAlloc_Free( CoTaskMemFree(pv); } -static ULONG WINAPI MimeAlloc_GetSize( +static SIZE_T WINAPI MimeAlloc_GetSize( IMimeAllocator* iface, LPVOID pv) { diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index 90f29a1..3e95a6c 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -112,9 +112,9 @@ static ULONG WINAPI IMAPIMalloc_fnRelease(LPMALLOC iface) /************************************************************************** * IMAPIMalloc_Alloc */ -static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb) +static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, SIZE_T cb) { - TRACE("(%p)->(%d)\n", iface, cb); + TRACE("(%p)->(%ld)\n", iface, cb); return LocalAlloc(LMEM_FIXED, cb); } @@ -122,9 +122,9 @@ static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb) /************************************************************************** * IMAPIMalloc_Realloc */ -static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) +static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, SIZE_T cb) { - TRACE("(%p)->(%p, %d)\n", iface, pv, cb); + TRACE("(%p)->(%p, %ld)\n", iface, pv, cb); if (!pv) return LocalAlloc(LMEM_FIXED, cb); @@ -148,7 +148,7 @@ static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv) /************************************************************************** * IMAPIMalloc_GetSize */ -static DWORD WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) +static SIZE_T WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) { TRACE("(%p)->(%p)\n", iface, pv); return LocalSize(pv); diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 18fd1fd..6868897 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -143,8 +143,8 @@ static BOOL RemoveMemoryLocation(LPCVOID pMem) /****************************************************************************** * IMalloc32_QueryInterface [VTABLE] */ -static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVOID *obj) { - +static HRESULT WINAPI IMalloc_fnQueryInterface(IMalloc *iface, REFIID refiid, void **obj) +{ TRACE("(%s,%p)\n",debugstr_guid(refiid),obj); if (IsEqualIID(&IID_IUnknown,refiid) || IsEqualIID(&IID_IMalloc,refiid)) { @@ -157,21 +157,22 @@ static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVO /****************************************************************************** * IMalloc32_AddRefRelease [VTABLE] */ -static ULONG WINAPI IMalloc_fnAddRefRelease (LPMALLOC iface) { +static ULONG WINAPI IMalloc_fnAddRefRelease(IMalloc *iface) +{ return 1; } /****************************************************************************** * IMalloc32_Alloc [VTABLE] */ -static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, DWORD cb) { - - LPVOID addr; +static void * WINAPI IMalloc_fnAlloc(IMalloc *iface, SIZE_T cb) +{ + void *addr; - TRACE("(%d)\n",cb); + TRACE("(%ld)\n",cb); if(Malloc32.pSpy) { - DWORD preAllocResult; + SIZE_T preAllocResult; EnterCriticalSection(&IMalloc32_SpyCS); preAllocResult = IMallocSpy_PreAlloc(Malloc32.pSpy, cb); @@ -198,14 +199,14 @@ static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, DWORD cb) { /****************************************************************************** * IMalloc32_Realloc [VTABLE] */ -static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { - - LPVOID pNewMemory; +static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb) +{ + void *pNewMemory; - TRACE("(%p,%d)\n",pv,cb); + TRACE("(%p,%ld)\n",pv,cb); if(Malloc32.pSpy) { - LPVOID pRealMemory; + void *pRealMemory; BOOL fSpyed; EnterCriticalSection(&IMalloc32_SpyCS); @@ -250,8 +251,8 @@ static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { /****************************************************************************** * IMalloc32_Free [VTABLE] */ -static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) { - +static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) +{ BOOL fSpyed = FALSE; TRACE("(%p)\n",pv); @@ -286,9 +287,9 @@ static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) { * win95: size allocated (4 byte boundarys) * win2k: size originally requested !!! (allocated on 8 byte boundarys) */ -static DWORD WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) { - - DWORD cb; +static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) +{ + SIZE_T cb; BOOL fSpyed = FALSE; TRACE("(%p)\n",pv); @@ -311,8 +312,8 @@ static DWORD WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) { /****************************************************************************** * IMalloc32_DidAlloc [VTABLE] */ -static INT WINAPI IMalloc_fnDidAlloc(LPMALLOC iface,LPVOID pv) { - +static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *pv) +{ BOOL fSpyed = FALSE; int didAlloc; @@ -335,7 +336,8 @@ static INT WINAPI IMalloc_fnDidAlloc(LPMALLOC iface,LPVOID pv) { /****************************************************************************** * IMalloc32_HeapMinimize [VTABLE] */ -static VOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) { +static void WINAPI IMalloc_fnHeapMinimize(IMalloc *iface) +{ TRACE("()\n"); if(Malloc32.pSpy) { @@ -398,7 +400,7 @@ HRESULT WINAPI CoGetMalloc(DWORD context, IMalloc **imalloc) * Success: Pointer to newly allocated memory block. * Failure: NULL. */ -LPVOID WINAPI CoTaskMemAlloc(ULONG size) +LPVOID WINAPI CoTaskMemAlloc(SIZE_T size) { return IMalloc_Alloc(&Malloc32.IMalloc_iface,size); } @@ -432,7 +434,7 @@ VOID WINAPI CoTaskMemFree(LPVOID ptr) * Success: Pointer to newly allocated memory block. * Failure: NULL. */ -LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size) +LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, SIZE_T size) { return IMalloc_Realloc(&Malloc32.IMalloc_iface, pvOld, size); } diff --git a/include/objbase.h b/include/objbase.h index 23594ac..d73f220 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -304,9 +304,9 @@ HRESULT WINAPI CoGetInstanceFromFile(COSERVERINFO* pServerInfo, CLSID* pClsid, I HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, IStorage* pstg, DWORD dwCount, MULTI_QI* pResults); HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC* lpMalloc); -LPVOID WINAPI CoTaskMemAlloc(ULONG size) __WINE_ALLOC_SIZE(1); +LPVOID WINAPI CoTaskMemAlloc(SIZE_T size) __WINE_ALLOC_SIZE(1); void WINAPI CoTaskMemFree(LPVOID ptr); -LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, ULONG size); +LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, SIZE_T size); HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy); HRESULT WINAPI CoRevokeMallocSpy(void); diff --git a/include/objidl.idl b/include/objidl.idl index c18442f..335282d 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -162,16 +162,16 @@ interface IMalloc : IUnknown typedef [unique] IMalloc *LPMALLOC; LPVOID Alloc( - [in] ULONG cb); + [in] SIZE_T cb); LPVOID Realloc( [in] LPVOID pv, - [in] ULONG cb); + [in] SIZE_T cb); void Free( [in] LPVOID pv); - ULONG GetSize( + SIZE_T GetSize( [in] LPVOID pv); int DidAlloc(LPVOID pv); @@ -188,8 +188,8 @@ interface IMallocSpy : IUnknown { typedef [unique] IMallocSpy *LPMALLOCSPY; - ULONG PreAlloc( - [in] ULONG cbRequest); + SIZE_T PreAlloc( + [in] SIZE_T cbRequest); LPVOID PostAlloc( [in] LPVOID pActual); @@ -201,9 +201,9 @@ interface IMallocSpy : IUnknown void PostFree( [in] BOOL fSpyed); - ULONG PreRealloc( + SIZE_T PreRealloc( [in] LPVOID pRequest, - [in] ULONG cbRequest, + [in] SIZE_T cbRequest, [out] LPVOID *ppNewRequest, [in] BOOL fSpyed); @@ -215,8 +215,8 @@ interface IMallocSpy : IUnknown [in] LPVOID pRequest, [in] BOOL fSpyed); - ULONG PostGetSize( - [in] ULONG cbActual, + SIZE_T PostGetSize( + [in] SIZE_T cbActual, [in] BOOL fSpyed); LPVOID PreDidAlloc(

1 0

Andrew Eikum : xaudio2_9: Add xaudio2_9.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 121a69e028b98b5b976c972e10bcb1f1c90dd770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=121a69e028b98b5b976c972e1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 19 12:29:29 2016 -0600 xaudio2_9: Add xaudio2_9. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xaudio2_7/compat.c | 8 ++++++++ dlls/xaudio2_7/xaudio_dll.c | 1 + dlls/xaudio2_9/Makefile.in | 13 +++++++++++++ dlls/xaudio2_9/xaudio2_9.spec | 6 ++++++ include/xaudio2.idl | 7 +++++-- 7 files changed, 38 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d82731e..a17ad55 100755 --- a/configure +++ b/configure @@ -1408,6 +1408,7 @@ enable_xaudio2_5 enable_xaudio2_6 enable_xaudio2_7 enable_xaudio2_8 +enable_xaudio2_9 enable_xinput1_1 enable_xinput1_2 enable_xinput1_3 @@ -13720,6 +13721,7 @@ then enable_xaudio2_6=${enable_xaudio2_6:-no} enable_xaudio2_7=${enable_xaudio2_7:-no} enable_xaudio2_8=${enable_xaudio2_8:-no} + enable_xaudio2_9=${enable_xaudio2_9:-no} fi if test "$ac_cv_header_kstat_h" = "yes" @@ -18035,6 +18037,7 @@ wine_fn_config_dll xaudio2_6 enable_xaudio2_6 clean wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean wine_fn_config_test dlls/xaudio2_7/tests xaudio2_7_test wine_fn_config_dll xaudio2_8 enable_xaudio2_8 clean +wine_fn_config_dll xaudio2_9 enable_xaudio2_9 clean wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput diff --git a/configure.ac b/configure.ac index d2eac29..23fee7b 100644 --- a/configure.ac +++ b/configure.ac @@ -1685,6 +1685,7 @@ then enable_xaudio2_6=${enable_xaudio2_6:-no} enable_xaudio2_7=${enable_xaudio2_7:-no} enable_xaudio2_8=${enable_xaudio2_8:-no} + enable_xaudio2_9=${enable_xaudio2_9:-no} fi dnl **** Check for libkstat **** @@ -3401,6 +3402,7 @@ WINE_CONFIG_DLL(xaudio2_6,,[clean]) WINE_CONFIG_DLL(xaudio2_7,,[clean]) WINE_CONFIG_TEST(dlls/xaudio2_7/tests) WINE_CONFIG_DLL(xaudio2_8,,[clean]) +WINE_CONFIG_DLL(xaudio2_9,,[clean]) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput]) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 9488529..f2f7cd8 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -78,6 +78,14 @@ * Change parameter of IXAudio2::CreateMasteringVoice * Add Flags parameter to IXAudio2SourceVoice::GetState * Add IXAudio2MasteringVoice::GetChannelMask + * Add DisableLateField member to XAUDIO2FX_REVERB_PARAMETERS + * + * 2.9 + * Change IID_IXAudio2 + * New flags: XAUDIO2_STOP_ENGINE_WHEN_IDLE, XAUDIO2_1024_QUANTUM, + * XAUDIO2_NO_VIRTUAL_AUDIO_CLIENT + * ABI break: + * Add SideDelay member to XAUDIO2FX_REVERB_PARAMETERS */ #include "config.h" diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index ac1b2fe..4f0a11f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1192,6 +1192,7 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IXAudio28) || IsEqualGUID(riid, &IID_IXAudio2)) *ppvObject = &This->IXAudio2_iface; else if(IsEqualGUID(riid, &IID_IXAudio27)){ diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in new file mode 100644 index 0000000..ceb2216 --- /dev/null +++ b/dlls/xaudio2_9/Makefile.in @@ -0,0 +1,13 @@ +EXTRADEFS = -DXAUDIO2_VER=9 +MODULE = xaudio2_9.dll +IMPORTS = advapi32 ole32 user32 uuid +EXTRALIBS = $(OPENAL_LIBS) +PARENTSRC = ../xaudio2_7 + +C_SRCS = \ + compat.c \ + x3daudio.c \ + xapofx.c \ + xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_9/xaudio2_9.spec b/dlls/xaudio2_9/xaudio2_9.spec new file mode 100644 index 0000000..0b9f238 --- /dev/null +++ b/dlls/xaudio2_9/xaudio2_9.spec @@ -0,0 +1,6 @@ +@ stdcall XAudio2Create(ptr long long) +@ stdcall CreateAudioVolumeMeter(ptr) +@ stdcall CreateAudioReverb(ptr) +@ cdecl CreateFX(ptr ptr ptr long) +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) +@ cdecl X3DAudioInitialize(long float ptr) diff --git a/include/xaudio2.idl b/include/xaudio2.idl index 58cbe0a..9d8ace2 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -1001,11 +1001,14 @@ interface IXAudio27 : IUnknown [in, defaultvalue(NULL)] void* pReserved); } +/* XAudio2 2.8's IXAudio2 is identical to 2.9's */ +cpp_quote("DEFINE_GUID(IID_IXAudio28, 0x60d8dac8, 0x5aa1, 0x4e8e, 0xb5, 0x97, 0x2f, 0x5e, 0x28, 0x83, 0xd4, 0x84);") + [ object, - uuid(60d8dac8-5aa1-4e8e-b597-2f5e2883d484), + uuid(2b02e3cf-2e0b-4ec3-be45-1b2a3fe7210d) ] -/* XAudio2 2.8's IXAudio2 interface. */ +/* XAudio2 2.9's IXAudio2 interface. */ interface IXAudio2 : IUnknown { HRESULT RegisterForCallbacks([in] IXAudio2EngineCallback* pCallback);

1 0

Nikolay Sivov : d3dx9/tests: Fix some test failures.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: 7b38f204586c6441d3666e8082d170fc341bd0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b38f204586c6441d3666e808… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 00:17:48 2016 +0300 d3dx9/tests: Fix some test failures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 7c86190..1afba18 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -11109,21 +11109,25 @@ static void D3DXCreateAnimationControllerTest(void) hr = D3DXCreateAnimationController(0, 0, 0, 0, NULL); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + animation = (void*)0xdeadbeef; hr = D3DXCreateAnimationController(0, 1, 1, 1, &animation); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); - ok(!animation, "Got unexpected animation %p.\n", animation); + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); + animation = (void*)0xdeadbeef; hr = D3DXCreateAnimationController(1, 0, 1, 1, &animation); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); - ok(!animation, "Got unexpected animation %p.\n", animation); + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); + animation = (void*)0xdeadbeef; hr = D3DXCreateAnimationController(1, 1, 0, 1, &animation); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); - ok(!animation, "Got unexpected animation %p.\n", animation); + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); + animation = (void*)0xdeadbeef; hr = D3DXCreateAnimationController(1, 1, 1, 0, &animation); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); - ok(!animation, "Got unexpected animation %p.\n", animation); + ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation); hr = D3DXCreateAnimationController(1, 1, 1, 1, &animation); ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr);

1 0

Nikolay Sivov : dwrite: Underline origin is always at the left run boundary.
by Alexandre Julliard Jan. 20, 2016

Jan. 20, 2016

Module: wine Branch: master Commit: adfd1ad2ce17f651274b49b848f2ec7119cca2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfd1ad2ce17f651274b49b84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 19 23:23:00 2016 +0300 dwrite: Underline origin is always at the left run boundary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f765dc6..6b5bec7 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -428,6 +428,11 @@ static HRESULT format_set_optical_alignment(struct dwrite_textformat_data *forma return S_OK; } +static BOOL is_run_rtl(const struct layout_effective_run *run) +{ + return run->run->u.regular.run.bidiLevel & 1; +} + static struct layout_run *alloc_layout_run(enum layout_run_kind kind) { struct layout_run *ret; @@ -3144,7 +3149,8 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, LIST_FOR_EACH_ENTRY(u, &This->underlines, struct layout_underline, entry) { IDWriteTextRenderer_DrawUnderline(renderer, context, - u->run->origin_x + run->align_dx + origin_x, + /* horizontal underline always grows from left to right, width is always added to origin regardless of run direction */ + (is_run_rtl(u->run) ? u->run->origin_x - u->run->width : u->run->origin_x) + run->align_dx + origin_x, SNAP_COORD(u->run->origin_y + origin_y), &u->u, u->run->effect);

1 0