September 2016 - Wine-commits

Bruno Jesus : xinput1_3: Test proper no new data error from XInputGetKeystroke.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: cb855d98d50c21136b6743b958842fdc24909f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb855d98d50c21136b6743b95… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 10 18:46:27 2016 -0300 xinput1_3: Test proper no new data error from XInputGetKeystroke. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index ef11b50..17884e1 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -133,7 +133,8 @@ static void test_get_keystroke(void) ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); result = pXInputGetKeystroke(controllerNum, XINPUT_FLAG_GAMEPAD, &keystroke); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetKeystroke failed with (%d)\n", result); + ok(result == ERROR_EMPTY || result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, + "XInputGetKeystroke failed with (%d)\n", result); if (ERROR_DEVICE_NOT_CONNECTED == result) {

1 0

André Hentschel : kernel32/tests: Don' t test CloseHandle.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 6231d475a11550448ee9cd1f9e6b1f3e30515de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6231d475a11550448ee9cd1f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Sep 10 17:49:53 2016 +0200 kernel32/tests: Don't test CloseHandle. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c88db6a..d8584c4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -957,7 +957,7 @@ static void testWaitForConsoleInput(HANDLE input_handle) ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); /* Clean up */ - ok(CloseHandle(complete_event), "Failed to close event handle, last error %d\n", GetLastError()); + CloseHandle(complete_event); } static void test_GetSetConsoleInputExeName(void)

1 0

Sebastian Lackner : jscript: Properly handle \0 characters in Array join method.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 79f18d027f7b9e537e79c22625ad4feaa5fa055e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f18d027f7b9e537e79c2262… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 11 18:46:41 2016 +0200 jscript: Properly handle \0 characters in Array join method. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 17 +++++++++-------- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 66655f5..eda49cb 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -238,7 +238,8 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi return S_OK; } -static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, const WCHAR *sep, jsval_t *r) +static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, const WCHAR *sep, + unsigned seplen, jsval_t *r) { jsstr_t **str_tab, *ret = NULL; jsval_t val; @@ -272,9 +273,7 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons } if(SUCCEEDED(hres)) { - DWORD seplen = 0, len = 0; - - seplen = strlenW(sep); + DWORD len = 0; if(str_tab[0]) len = jsstr_length(str_tab[0]); @@ -350,11 +349,11 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne if(FAILED(hres)) return hres; - hres = array_join(ctx, jsthis, length, sep, r); + hres = array_join(ctx, jsthis, length, sep, jsstr_length(sep_str), r); jsstr_release(sep_str); }else { - hres = array_join(ctx, jsthis, length, default_separatorW, r); + hres = array_join(ctx, jsthis, length, default_separatorW, strlenW(default_separatorW), r); } return hres; @@ -935,7 +934,8 @@ static HRESULT Array_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(!array) return throw_type_error(ctx, JS_E_ARRAY_EXPECTED, NULL); - return array_join(ctx, &array->dispex, array->length, default_separatorW, r); + return array_join(ctx, &array->dispex, array->length, default_separatorW, + strlenW(default_separatorW), r); } static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, @@ -1011,7 +1011,8 @@ static HRESULT Array_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) TRACE("\n"); - return array_join(ctx, &array->dispex, array->length, default_separatorW, r); + return array_join(ctx, &array->dispex, array->length, default_separatorW, + strlenW(default_separatorW), r); } static void Array_destructor(jsdisp_t *dispex) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 083da93..b365f3f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -933,6 +933,11 @@ ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); tmp = arr.toString("test"); ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); +arr = ["a", "b"]; + +tmp = arr.join(String.fromCharCode(0)); +ok(tmp === "a" + String.fromCharCode(0) + "b", "arr.join(String.fromCharCode(0)) = " + tmp); + arr = new Object(); arr.length = 3; arr[0] = "aa";

1 0

Sebastian Lackner : jscript: Allocate string of correct size in Date toLocaleDateString method.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 4d67ffd57e471f50bd96edc9e4e08030db1ffa86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d67ffd57e471f50bd96edc9e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 11 18:47:57 2016 +0200 jscript: Allocate string of correct size in Date toLocaleDateString method. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 36 +++++++++--------------------------- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index fdc3051..6553e80 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -769,9 +769,10 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) BOOL formatAD = TRUE; WCHAR week[64], month[64]; + WCHAR buf[192]; jsstr_t *date_str; DOUBLE time; - int len, size, year, day; + int year, day; DWORD lcid_en; if(isnan(date->time)) { @@ -783,46 +784,27 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) time = local_time(date->time, date); if(r) { - WCHAR *ptr; - - len = 5; - lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); - assert(size); - len += size-1; + week[0] = 0; + GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); - size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); - assert(size); - len += size-1; - - year = year_from_time(time); - if(year<0) - year = -year+1; - do { - year /= 10; - len++; - } while(year); + month[0] = 0; + GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); year = year_from_time(time); if(year<0) { formatAD = FALSE; year = -year+1; - len += 5; } day = date_from_time(time); - do { - day /= 10; - len++; - } while(day); - day = date_from_time(time); - date_str = jsstr_alloc_buf(len, &ptr); + sprintfW(buf, formatAD ? formatADW : formatBCW, week, month, day, year); + + date_str = jsstr_alloc(buf); if(!date_str) return E_OUTOFMEMORY; - sprintfW(ptr, formatAD?formatADW:formatBCW, week, month, day, year); *r = jsval_string(date_str); } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b365f3f..e986294 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2153,6 +2153,8 @@ ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 201 tmp = (new Date()).toLocaleDateString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date(1600, 1, 1, 0, 0, 0, 0)).toLocaleDateString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toLocaleTimeString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toTimeString();

1 0

Sebastian Lackner : jscript: Simplify date_to_string and add basic tests.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 20d5bbaa638f6ab5ab3366cec362848cd80a27c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d5bbaa638f6ab5ab3366cec… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 11 18:48:54 2016 +0200 jscript: Simplify date_to_string and add basic tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 48 ++++++++++++++--------------------------------- dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 6553e80..a9d2ab4 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -494,8 +494,9 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, BOOL formatAD = TRUE; WCHAR week[64], month[64]; + WCHAR buf[192]; jsstr_t *date_jsstr; - int len, size, year, day; + int year, day; DWORD lcid_en; WCHAR sign = '-'; @@ -506,66 +507,45 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, } if(r) { - WCHAR *date_str; - - len = 21; - lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); - assert(size); - len += size-1; - - size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); - len += size-1; + week[0] = 0; + GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); - year = year_from_time(time); - if(year<0) - year = -year+1; - do { - year /= 10; - len++; - } while(year); + month[0] = 0; + GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); year = year_from_time(time); if(year<0) { formatAD = FALSE; year = -year+1; - len += 5; } day = date_from_time(time); - do { - day /= 10; - len++; - } while(day); - day = date_from_time(time); - if(!show_offset) len -= 9; - else if(offset == 0) len -= 5; - else if(offset < 0) { + if(offset < 0) { sign = '+'; offset = -offset; } - date_jsstr = jsstr_alloc_buf(len, &date_str); - if(!date_jsstr) - return E_OUTOFMEMORY; - if(!show_offset) - sprintfW(date_str, formatNoOffsetW, week, month, day, + sprintfW(buf, formatNoOffsetW, week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), year, formatAD?ADW:BCW); else if(offset) - sprintfW(date_str, formatW, week, month, day, + sprintfW(buf, formatW, week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60, year, formatAD?ADW:BCW); else - sprintfW(date_str, formatUTCW, week, month, day, + sprintfW(buf, formatUTCW, week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), year, formatAD?ADW:BCW); + date_jsstr = jsstr_alloc(buf); + if(!date_jsstr) + return E_OUTOFMEMORY; + *r = jsval_string(date_jsstr); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e986294..40a749b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2155,8 +2155,12 @@ tmp = (new Date()).toLocaleDateString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date(1600, 1, 1, 0, 0, 0, 0)).toLocaleDateString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date(1600, 1, 1, 0, 0, 0, 0)).toLocaleString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toLocaleTimeString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date()).toString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toTimeString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte");

1 0

Sebastian Lackner : jscript: Simplify create_utc_string and add basic tests.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 57291c4bfd7a3478cc679ea48ee15e942921ec45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57291c4bfd7a3478cc679ea48… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 11 18:50:26 2016 +0200 jscript: Simplify create_utc_string and add basic tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 39 +++++++++++---------------------------- dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index a9d2ab4..a66a286 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -654,9 +654,10 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva BOOL formatAD = TRUE; WCHAR week[64], month[64]; + WCHAR buf[192]; DateInstance *date; jsstr_t *date_str; - int len, size, year, day; + int year, day; DWORD lcid_en; if(!(date = date_this(jsthis))) @@ -669,48 +670,30 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva } if(r) { - WCHAR *ptr; - - len = 17; - lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(date->time)], week, sizeof(week)/sizeof(*week)); - len += size-1; - - size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(date->time)], month, sizeof(month)/sizeof(*month)); - len += size-1; + week[0] = 0; + GetLocaleInfoW(lcid_en, week_ids[(int)week_day(date->time)], week, sizeof(week)/sizeof(*week)); - year = year_from_time(date->time); - if(year<0) - year = -year+1; - do { - year /= 10; - len++; - } while(year); + month[0] = 0; + GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(date->time)], month, sizeof(month)/sizeof(*month)); year = year_from_time(date->time); if(year<0) { formatAD = FALSE; year = -year+1; - len += 5; } day = date_from_time(date->time); - do { - day /= 10; - len++; - } while(day); - day = date_from_time(date->time); - - date_str = jsstr_alloc_buf(len, &ptr); - if(!date_str) - return E_OUTOFMEMORY; - sprintfW(ptr, formatAD?formatADW:formatBCW, week, day, month, year, + sprintfW(buf, formatAD ? formatADW : formatBCW, week, day, month, year, (int)hour_from_time(date->time), (int)min_from_time(date->time), (int)sec_from_time(date->time)); + date_str = jsstr_alloc(buf); + if(!date_str) + return E_OUTOFMEMORY; + *r = jsval_string(date_str); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 40a749b..5a78b3a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2151,6 +2151,8 @@ ok(Date.parse("Tue, 22 Mar 2016 09:57:55 -0300") === Date.parse("Tue, 22 Mar 201 ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 2016 09:57:55 UTC+0400"), "Date.parse(\"Tue, 22 Mar 2016 09:57:55 +0400\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 +0400")); +tmp = (new Date()).toGMTString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toLocaleDateString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date(1600, 1, 1, 0, 0, 0, 0)).toLocaleDateString(); @@ -2163,6 +2165,8 @@ tmp = (new Date()).toString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toTimeString(); ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date()).toUTCString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Michael Stefaniuc : msi: Use CONTAINING_RECORD() to get from a field to a struct.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: c0a6f0f7a87e28019a1e78732869c99f229134e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a6f0f7a87e28019a1e78732… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 22:21:04 2016 +0200 msi: Use CONTAINING_RECORD() to get from a field to a struct. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/automation.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index b94fa84..06ad2f9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1031,7 +1031,7 @@ static HRESULT list_invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - ListObject *list = (ListObject*)This; + ListObject *list = CONTAINING_RECORD(This, ListObject, autoobj); IUnknown *pUnk = NULL; HRESULT hr; @@ -1079,7 +1079,7 @@ static HRESULT list_invoke( static void list_free(AutomationObject *This) { - ListObject *list = (ListObject*)This; + ListObject *list = CONTAINING_RECORD(This, ListObject, autoobj); int i; for (i = 0; i < list->count; i++) @@ -1367,7 +1367,7 @@ static HRESULT session_invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - SessionObject *session = (SessionObject*)This; + SessionObject *session = CONTAINING_RECORD(This, SessionObject, autoobj); WCHAR *szString; DWORD dwLen = 0; MSIHANDLE msiHandle;

1 0

Michael Stefaniuc : quartz: Use the proper COM method wrappers.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: ddfc1a2e88250f92c075728f9fe6061b02f00dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfc1a2e88250f92c075728f9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 12 10:18:29 2016 +0200 quartz: Use the proper COM method wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 8 ++++---- dlls/quartz/filesource.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 49b998b..9e8f69c 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -667,7 +667,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) if (!pDSoundRender->blocked || FAILED(hr)) { - IUnknown_Release((IUnknown *)pDSoundRender); + IBaseFilter_Release(&pDSoundRender->renderer.filter.IBaseFilter_iface); return HRESULT_FROM_WIN32(GetLastError()); } @@ -1281,17 +1281,17 @@ static const IAMDirectSoundVtbl IAMDirectSound_Vtbl = static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); + return IBaseFilter_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_AddRef((IUnknown*)This); + return IBaseFilter_AddRef(&This->renderer.filter.IBaseFilter_iface); } static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_Release((IUnknown*)This); + return IBaseFilter_Release(&This->renderer.filter.IBaseFilter_iface); } static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 269dd13..1024bd0 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1434,17 +1434,17 @@ static const IAsyncReaderVtbl FileAsyncReader_Vtbl = static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { AsyncReader *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { AsyncReader *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_AddRef((IUnknown*)This); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { AsyncReader *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_Release((IUnknown*)This); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) {

1 0

Andrey Gusev : api-ms-win-core-sidebyside-l1-1-0: Add dll.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: a1a8cddfde144a0eaa58aba8f3a96d32f25811a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a8cddfde144a0eaa58aba8f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 12 11:55:16 2016 +0300 api-ms-win-core-sidebyside-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-sidebyside-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-sidebyside-l1-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 5e33a01..488bc00 100755 --- a/configure +++ b/configure @@ -936,6 +936,7 @@ enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 +enable_api_ms_win_core_sidebyside_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 enable_api_ms_win_core_string_obsolete_l1_1_0 @@ -17590,6 +17591,7 @@ wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtls wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-1-0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 +wine_fn_config_dll api-ms-win-core-sidebyside-l1-1-0 enable_api_ms_win_core_sidebyside_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 wine_fn_config_dll api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core_string_obsolete_l1_1_0 diff --git a/configure.ac b/configure.ac index 8007469..c838b7d 100644 --- a/configure.ac +++ b/configure.ac @@ -2712,6 +2712,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-sidebyside-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-obsolete-l1-1-0) diff --git a/dlls/api-ms-win-core-sidebyside-l1-1-0/Makefile.in b/dlls/api-ms-win-core-sidebyside-l1-1-0/Makefile.in new file mode 100644 index 0000000..6c84fdb --- /dev/null +++ b/dlls/api-ms-win-core-sidebyside-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-sidebyside-l1-1-0.dll diff --git a/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec new file mode 100644 index 0000000..bad0023 --- /dev/null +++ b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stdcall ActivateActCtx(ptr ptr) kernel32.ActivateActCtx +@ stdcall AddRefActCtx(ptr) kernel32.AddRefActCtx +@ stdcall CreateActCtxW(ptr) kernel32.CreateActCtxW +@ stdcall DeactivateActCtx(long ptr) kernel32.DeactivateActCtx +@ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) kernel32.FindActCtxSectionGuid +@ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) kernel32.FindActCtxSectionStringW +@ stdcall GetCurrentActCtx(ptr) kernel32.GetCurrentActCtx +@ stub QueryActCtxSettingsW +@ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) kernel32.QueryActCtxW +@ stdcall ReleaseActCtx(ptr) kernel32.ReleaseActCtx +@ stdcall ZombifyActCtx(ptr) kernel32.ZombifyActCtx diff --git a/tools/make_specfiles b/tools/make_specfiles index 68274f8..8fa7729 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -136,6 +136,7 @@ my @dll_groups = "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", + "api-ms-win-core-sidebyside-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-string-obsolete-l1-1-0", "api-ms-win-core-sysinfo-l1-1-0",

1 0

Andrey Gusev : api-ms-win-core-stringansi-l1-1-0: Add dll.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 09c40f67df8d90951d5d93b1d9b98dd8b2993a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c40f67df8d90951d5d93b1d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 12 11:57:23 2016 +0300 api-ms-win-core-stringansi-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-stringansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-stringansi-l1-1-0.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index 488bc00..941ae9e 100755 --- a/configure +++ b/configure @@ -940,6 +940,7 @@ enable_api_ms_win_core_sidebyside_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 enable_api_ms_win_core_string_obsolete_l1_1_0 +enable_api_ms_win_core_stringansi_l1_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_1_0 @@ -17595,6 +17596,7 @@ wine_fn_config_dll api-ms-win-core-sidebyside-l1-1-0 enable_api_ms_win_core_side wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 wine_fn_config_dll api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core_string_obsolete_l1_1_0 +wine_fn_config_dll api-ms-win-core-stringansi-l1-1-0 enable_api_ms_win_core_stringansi_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-1-0 enable_api_ms_win_core_sysinfo_l1_1_0 diff --git a/configure.ac b/configure.ac index c838b7d..ab0feca 100644 --- a/configure.ac +++ b/configure.ac @@ -2716,6 +2716,7 @@ WINE_CONFIG_DLL(api-ms-win-core-sidebyside-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-obsolete-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-stringansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-1-0) diff --git a/dlls/api-ms-win-core-stringansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-stringansi-l1-1-0/Makefile.in new file mode 100644 index 0000000..7cfc591 --- /dev/null +++ b/dlls/api-ms-win-core-stringansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-stringansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec b/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec new file mode 100644 index 0000000..2c58a16 --- /dev/null +++ b/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec @@ -0,0 +1,12 @@ +@ stdcall CharLowerA(str) user32.CharLowerA +@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA +@ stdcall CharNextA(str) user32.CharNextA +@ stdcall CharNextExA(long str long) user32.CharNextExA +@ stdcall CharPrevA(str str) user32.CharPrevA +@ stdcall CharPrevExA(long str str long) user32.CharPrevExA +@ stdcall CharUpperA(str) user32.CharUpperA +@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA +@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA +@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA +@ stdcall IsCharLowerA(long) user32.IsCharLowerA +@ stdcall IsCharUpperA(long) user32.IsCharUpperA diff --git a/tools/make_specfiles b/tools/make_specfiles index 8fa7729..a45bb7d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -232,6 +232,7 @@ my @dll_groups = ], [ "user32", + "api-ms-win-core-stringansi-l1-1-0", "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0",

1 0