October 2015 - Wine-commits

Daniel Lehman : msvcp120: Implement _Thrd_equal/lt.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 95cde2c8b8e1af1b58223a40e2dac9beb320183c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95cde2c8b8e1af1b58223a40e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 27 23:21:07 2015 -0700 msvcp120: Implement _Thrd_equal/lt. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/misc.c | 20 +++++++++++++ 5 files changed, 84 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index b8d21eb..9fb938a 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3859,10 +3859,10 @@ @ stub _Thrd_create @ stub _Thrd_current @ stub _Thrd_detach -@ stub _Thrd_equal +@ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ stub _Thrd_join -@ stub _Thrd_lt +@ cdecl _Thrd_lt(ptr ptr) @ stub _Thrd_sleep @ stub _Thrd_start @ stub _Thrd_yield diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0458b01..c25e2e4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3806,10 +3806,10 @@ @ stub _Thrd_create @ stub _Thrd_current @ stub _Thrd_detach -@ stub _Thrd_equal +@ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ stub _Thrd_join -@ stub _Thrd_lt +@ cdecl _Thrd_lt(ptr ptr) @ stub _Thrd_sleep @ stub _Thrd_start @ stub _Thrd_yield diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index d754191..fc69fd0 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -130,6 +130,16 @@ static enum file_type (__cdecl *p_tr2_sys__Lstat)(char const*, int *); static __int64 (__cdecl *p_tr2_sys__Last_write_time)(char const*); static void (__cdecl *p_tr2_sys__Last_write_time_set)(char const*, __int64); +/* thrd */ +typedef struct +{ + HANDLE hnd; + DWORD id; +} _Thrd_t; + +static int (__cdecl *p__Thrd_equal)(_Thrd_t, _Thrd_t); +static int (__cdecl *p__Thrd_lt)(_Thrd_t, _Thrd_t); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -253,6 +263,10 @@ static BOOL init(void) SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z"); } + SET(p__Thrd_equal, + "_Thrd_equal"); + SET(p__Thrd_lt, + "_Thrd_lt"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -1120,6 +1134,47 @@ static void test_tr2_sys__Last_write_time(void) ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static void test_thrd(void) +{ + int ret, i; + struct test { + _Thrd_t a; + _Thrd_t b; + int r; + }; + const HANDLE hnd1 = (HANDLE)0xcccccccc; + const HANDLE hnd2 = (HANDLE)0xdeadbeef; + + struct test testeq[] = { + { {0, 0}, {0, 0}, 1 }, + { {0, 1}, {0, 0}, 0 }, + { {hnd1, 0}, {hnd1, 1}, 0 }, + { {hnd1, 0}, {hnd2, 0}, 1 } + }; + + struct test testlt[] = { + { {0, 0}, {0, 0}, 0 }, + { {0, 0}, {0, 1}, 1 }, + { {0, 1}, {0, 0}, 0 }, + { {hnd1, 0}, {hnd2, 0}, 0 }, + { {hnd1, 0}, {hnd2, 1}, 1 } + }; + + /* test for equal */ + for(i=0; i<sizeof(testeq)/sizeof(testeq[0]); i++) { + ret = p__Thrd_equal(testeq[i].a, testeq[i].b); + ok(ret == testeq[i].r, "(%p %u) = (%p %u) expected %d, got %d\n", + testeq[i].a.hnd, testeq[i].a.id, testeq[i].b.hnd, testeq[i].b.id, testeq[i].r, ret); + } + + /* test for less than */ + for(i=0; i<sizeof(testlt)/sizeof(testlt[0]); i++) { + ret = p__Thrd_lt(testlt[i].a, testlt[i].b); + ok(ret == testlt[i].r, "(%p %u) < (%p %u) expected %d, got %d\n", + testlt[i].a.hnd, testlt[i].a.id, testlt[i].b.hnd, testlt[i].b.id, testlt[i].r, ret); + } +} + START_TEST(msvcp120) { if(!init()) return; @@ -1143,5 +1198,8 @@ START_TEST(msvcp120) test_tr2_sys__Statvfs(); test_tr2_sys__Stat(); test_tr2_sys__Last_write_time(); + + test_thrd(); + FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 2598904..6fd94ae 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3806,10 +3806,10 @@ @ stub _Thrd_create @ stub _Thrd_current @ stub _Thrd_detach -@ stub _Thrd_equal +@ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal @ stub _Thrd_exit @ stub _Thrd_join -@ stub _Thrd_lt +@ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt @ stub _Thrd_sleep @ stub _Thrd_start @ stub _Thrd_yield diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 6501ff9..2ec34fe 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -683,3 +683,23 @@ void init_misc(void *base) iostream_category_ctor(&iostream_category); #endif } + +#if _MSVCP_VER >= 110 +typedef struct +{ + HANDLE hnd; + DWORD id; +} _Thrd_t; + +int __cdecl _Thrd_equal(_Thrd_t a, _Thrd_t b) +{ + TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); + return a.id == b.id; +} + +int __cdecl _Thrd_lt(_Thrd_t a, _Thrd_t b) +{ + TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); + return a.id < b.id; +} +#endif

1 0

Jacek Caban : kernel32: Pass SYNCHRONIZE access flag to NtCreateFile.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 0c8edbcc80846f9523ac7164a78517c103edd43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8edbcc80846f9523ac7164a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 29 11:52:06 2015 +0100 kernel32: Pass SYNCHRONIZE access flag to NtCreateFile. Office clicktorun patched ntdll functions expect them to be set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 8 ++++---- dlls/kernel32/path.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index ee43b10..5ea024f 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1574,7 +1574,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; - status = NtCreateFile( &ret, access, &attr, &io, NULL, attributes, + status = NtCreateFile( &ret, access | SYNCHRONIZE, &attr, &io, NULL, attributes, sharing, nt_disposition[creation - CREATE_NEW], options, NULL, 0 ); if (status) @@ -1683,7 +1683,7 @@ BOOL WINAPI DeleteFileW( LPCWSTR path ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtCreateFile(&hFile, GENERIC_READ | GENERIC_WRITE | DELETE, + status = NtCreateFile(&hFile, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE | DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0); @@ -1826,7 +1826,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa } attr.ObjectName = &nt_backup_name; /* Open the backup with permissions to write over it */ - status = NtCreateFile(&hBackup, GENERIC_WRITE, + status = NtCreateFile(&hBackup, GENERIC_WRITE | SYNCHRONIZE, &attr, &io, NULL, replaced_info.FileAttributes, FILE_SHARE_WRITE, FILE_OPEN_IF, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE, @@ -2835,7 +2835,7 @@ HANDLE WINAPI OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTOR id, DWORD access attr.SecurityQualityOfService = NULL; if (sec_attr && sec_attr->bInheritHandle) attr.Attributes |= OBJ_INHERIT; - status = NtCreateFile( &result, access, &attr, &io, NULL, flags, + status = NtCreateFile( &result, access | SYNCHRONIZE, &attr, &io, NULL, flags, share, OPEN_EXISTING, options, NULL, 0 ); if (status != STATUS_SUCCESS) { diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 09b8b7f..271bcf4 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1562,7 +1562,7 @@ BOOL WINAPI CreateDirectoryW( LPCWSTR path, LPSECURITY_ATTRIBUTES sa ) attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; - status = NtCreateFile( &handle, GENERIC_READ, &attr, &io, NULL, + status = NtCreateFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );

1 0

Alistair Leslie-Hughes : vbscript/tests: Show IActiveScriptSite OnScriptError is called on error.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: ae119b4205121d3bdcfcfb270700093ac9a22deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae119b4205121d3bdcfcfb270… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 29 19:11:47 2015 +1100 vbscript/tests: Show IActiveScriptSite OnScriptError is called on error. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index a86711a..d8c5467 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -100,6 +100,7 @@ DEFINE_EXPECT(Next); DEFINE_EXPECT(GetWindow); DEFINE_EXPECT(GetUIBehavior); DEFINE_EXPECT(EnableModeless); +DEFINE_EXPECT(OnScriptError); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -138,6 +139,7 @@ static const char *test_name = "(null)"; static int test_counter; static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; static IDispatchEx testObj; +static HRESULT onerror_hres = E_NOTIMPL; static BSTR a2bstr(const char *str) { @@ -1623,7 +1625,12 @@ static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, S static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *pscripterror) { - return E_NOTIMPL; + HRESULT hr = onerror_hres; + CHECK_EXPECT(OnScriptError); + + onerror_hres = E_NOTIMPL; + + return hr; } static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) @@ -1927,18 +1934,22 @@ static void test_msgbox(void) SET_EXPECT(GetUIBehavior); SET_EXPECT(GetWindow); SET_EXPECT(EnableModeless); + SET_EXPECT(OnScriptError); hres = parse_script_ar("MsgBox \"testing...\""); ok(FAILED(hres), "script not failed\n"); CHECK_CALLED(GetUIBehavior); CHECK_CALLED(GetWindow); CHECK_CALLED(EnableModeless); + todo_wine CHECK_CALLED(OnScriptError); uic_handling = SCRIPTUICHANDLING_NOUIERROR; SET_EXPECT(GetUIBehavior); + SET_EXPECT(OnScriptError); hres = parse_script_ar("MsgBox \"testing...\""); ok(FAILED(hres), "script not failed\n"); CHECK_CALLED(GetUIBehavior); + todo_wine CHECK_CALLED(OnScriptError); } static HRESULT test_global_vars_ref(BOOL use_close) @@ -2184,8 +2195,10 @@ static void run_tests(void) parse_htmlscript_a("\n"); parse_htmlscript_a("\n\n"); + SET_EXPECT(OnScriptError); hres = parse_script_ar("<!--"); ok(FAILED(hres), "script didn't fail\n"); + todo_wine CHECK_CALLED(OnScriptError); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); @@ -2208,19 +2221,39 @@ static void run_tests(void) test_global_vars_ref(TRUE); test_global_vars_ref(FALSE); + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h80080008&)"); ok(hres == 0x80080008, "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); /* DISP_E_BADINDEX */ + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h8002000b&)"); ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h800a0009&)"); ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + + onerror_hres = S_OK; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwInt(&h800a0009&)"); + todo_wine ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); /* E_NOTIMPL */ + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h80004001&)"); ok(hres == MAKE_VBSERROR(445), "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + + onerror_hres = S_OK; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwInt(&h80004001&)"); + todo_wine ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); SET_EXPECT(global_testoptionalarg_i); parse_script_a("call testOptionalArg(1,,2)"); @@ -2255,8 +2288,10 @@ static void run_tests(void) parse_script_a("x = y\n" "Call ok(getVT(x) = \"VT_EMPTY*\", \"getVT(x) = \" & getVT(x))\n" "Call ok(getVT(y) = \"VT_EMPTY*\", \"getVT(y) = \" & getVT(y))"); + SET_EXPECT(OnScriptError); hres = parse_script_ar("x = y(\"a\")"); ok(FAILED(hres), "script didn't fail\n"); + todo_wine CHECK_CALLED(OnScriptError); run_from_res("lang.vbs"); run_from_res("api.vbs");

1 0

Martin Storsjo : ucrtbase: Implement vsscanf.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 436eb3639c34c93d55685396be0e1b7d50d76fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=436eb3639c34c93d55685396b… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Oct 29 12:39:44 2015 +0200 ucrtbase: Implement vsscanf. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 15 +++++++++++++++ dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 75549a7..2db8222 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf_s -@ stub __stdio_common_vsscanf +@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ stub __stdio_common_vswprintf_s diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 5dc6915..9a0150f 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -661,6 +661,21 @@ int CDECL MSVCRT__snscanf_s_l(char *input, MSVCRT_size_t length, return res; } + +/********************************************************************* + * __stdio_common_vsscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, + const char *input, MSVCRT_size_t length, + const char *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + if (options != 2) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return MSVCRT_vsnscanf_l(input, length, format, locale, valist); +} + /********************************************************************* * _snwscanf (MSVCRT.@) */ diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 9e672f3..c1677ca 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ mbcs.c \ misc.c \ process.c \ + scanf.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 067ab23..6877bef 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -159,7 +159,7 @@ @ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf_s -@ stub __stdio_common_vsscanf +@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ stub __stdio_common_vswprintf_s

1 0

Stefan Dösinger : wined3d: Prepare GL resources before calling context_apply_fbo_state.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 1ca9dfc8ee25f4ae188fdacd4d3d56046cef8003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca9dfc8ee25f4ae188fdacd4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 28 15:29:17 2015 +0100 wined3d: Prepare GL resources before calling context_apply_fbo_state. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 ------- dlls/wined3d/device.c | 13 ++++++++---- dlls/wined3d/drawprim.c | 20 ++++++++++++------ dlls/wined3d/surface.c | 46 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 54 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ca9dfc8ee25f4ae188fd…

1 0

Sebastian Lackner : gdiplus: Use helper function for HeapAlloc calls.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: ff1b209be898d665ce03053bcb5b7208195f3503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1b209be898d665ce03053bc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 21 00:53:12 2015 +0200 gdiplus: Use helper function for HeapAlloc calls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/gdiplus_private.h | 6 ++++++ dlls/gdiplus/image.c | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index cd9041e..dffba1e 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1612,7 +1612,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if (fonts->allocated == fonts->count) { INT new_alloc_count = fonts->allocated+50; - GpFontFamily** new_family_list = HeapAlloc(GetProcessHeap(), 0, new_alloc_count*sizeof(void*)); + GpFontFamily** new_family_list = heap_alloc(new_alloc_count*sizeof(void*)); if (!new_family_list) return 0; diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 4b7e4c8..d0faac2 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -48,6 +48,12 @@ #define GIF_DISPOSE_RESTORE_TO_BKGND 2 #define GIF_DISPOSE_RESTORE_TO_PREV 3 +static void *heap_alloc(size_t len) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + static void *heap_alloc_zero(size_t len) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc_zero(size_t len) { diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1cef100..f475f9b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -92,7 +92,7 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT UINT count; IWICPalette_GetColorCount(wic_palette, &count); - palette = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(UINT) + count * sizeof(ARGB)); + palette = heap_alloc(2 * sizeof(UINT) + count * sizeof(ARGB)); IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count); IWICPalette_GetType(wic_palette, &type); @@ -1692,7 +1692,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) { if (iinfo.hbmMask) { - BYTE *bits = HeapAlloc(GetProcessHeap(), 0, height * stride); + BYTE *bits = heap_alloc(height * stride); /* read alpha data from the mask */ if (iinfo.hbmColor) @@ -2874,7 +2874,7 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, item_size = propvariant_size(&value); if (item_size) { - item = HeapAlloc(GetProcessHeap(), 0, item_size + sizeof(*item)); + item = heap_alloc(item_size + sizeof(*item)); propvariant_to_item(&value, item, item_size + sizeof(*item), id.u.uiVal); buf[i].id = item->id;

1 0

Sebastian Lackner : gdiplus: Use helper function for HeapReAlloc calls.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 1250af4986c6d9ebb6a26726db09f2ffe818d209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1250af4986c6d9ebb6a26726d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 21 00:53:31 2015 +0200 gdiplus: Use helper function for HeapReAlloc calls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.c | 6 ++---- dlls/gdiplus/gdiplus_private.h | 6 ++++++ dlls/gdiplus/stringformat.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 32f20d8..1281455 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -420,12 +420,10 @@ BOOL lengthen_path(GpPath *path, INT len) while(path->datalen - path->pathdata.Count < len) path->datalen *= 2; - path->pathdata.Points = HeapReAlloc(GetProcessHeap(), 0, - path->pathdata.Points, path->datalen * sizeof(PointF)); + path->pathdata.Points = heap_realloc(path->pathdata.Points, path->datalen * sizeof(PointF)); if(!path->pathdata.Points) return FALSE; - path->pathdata.Types = HeapReAlloc(GetProcessHeap(), 0, - path->pathdata.Types, path->datalen); + path->pathdata.Types = heap_realloc(path->pathdata.Types, path->datalen); if(!path->pathdata.Types) return FALSE; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d0faac2..1af0bd0 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -60,6 +60,12 @@ static inline void *heap_alloc_zero(size_t len) return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } +static void *heap_realloc(void *mem, size_t len) __WINE_ALLOC_SIZE(2); +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 8791ceb..b89458b 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -291,7 +291,7 @@ GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat *format, REAL fir /* reallocation */ if((format->tabcount < count) && (format->tabcount > 0)){ REAL *ptr; - ptr = HeapReAlloc(GetProcessHeap(), 0, format->tabs, sizeof(REAL)*count); + ptr = heap_realloc(format->tabs, sizeof(REAL)*count); if(!ptr) return OutOfMemory; format->tabs = ptr;

1 0

Sebastian Lackner : gdiplus: Use helper function for remaining HeapFree calls.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: ffa467691df932f0a346c5fba943f32cf77baecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa467691df932f0a346c5fba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 21 00:53:48 2015 +0200 gdiplus: Use helper function for remaining HeapFree calls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 4 ++-- dlls/gdiplus/image.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index dffba1e..63eaed2 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1590,7 +1590,7 @@ void free_installed_fonts(void) { while (installedFontCollection.count) GdipDeleteFontFamily(installedFontCollection.FontFamilies[--installedFontCollection.count]); - HeapFree(GetProcessHeap(), 0, installedFontCollection.FontFamilies); + heap_free(installedFontCollection.FontFamilies); installedFontCollection.FontFamilies = NULL; installedFontCollection.allocated = 0; } @@ -1618,7 +1618,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, return 0; memcpy(new_family_list, fonts->FontFamilies, fonts->count*sizeof(void*)); - HeapFree(GetProcessHeap(), 0, fonts->FontFamilies); + heap_free(fonts->FontFamilies); fonts->FontFamilies = new_family_list; fonts->allocated = new_alloc_count; } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f475f9b..53ace05 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1716,7 +1716,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) dst_row += lockeddata.Stride; } - HeapFree(GetProcessHeap(), 0, bits); + heap_free(bits); } else { @@ -2884,7 +2884,7 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, memcpy(item_value, item->value, item_size); item_value += item_size; - HeapFree(GetProcessHeap(), 0, item); + heap_free(item); } PropVariantClear(&id);

1 0

Jacek Caban : ws2_32: Added GetAddrInfoExW stub.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 9d452e2ccdebd8dfd579eeeb2603879315e60ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d452e2ccdebd8dfd579eeeb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 16:51:51 2015 +0100 ws2_32: Added GetAddrInfoExW stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1cad112..9e8510d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6542,6 +6542,18 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) } /*********************************************************************** + * GetAddrInfoExW (WS2_32.@) + */ +int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namespace, GUID *namespace_id, + const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct timeval *timeout, OVERLAPPED *overlapped, + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle) +{ + FIXME("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, + debugstr_guid(namespace_id), hints, result, timeout, overlapped, completion_routine, handle); + return WSAHOST_NOT_FOUND; +} + +/*********************************************************************** * GetAddrInfoW (WS2_32.@) */ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 1b096b5..6de888f 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -51,6 +51,7 @@ 500 stub WEP @ stdcall FreeAddrInfoW(ptr) +@ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) @ stdcall InetPtonW(long wstr ptr)

1 0

Jacek Caban : ws2def.h: Fixed ADDRINFOEX declaration.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 22fca3a11041e136f4cc7867426179635db5d295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22fca3a11041e136f4cc78674… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 17:55:51 2015 +0100 ws2def.h: Fixed ADDRINFOEX declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2def.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/ws2def.h b/include/ws2def.h index 5ea8ff3..cbd6f74 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -115,11 +115,11 @@ typedef struct addrinfoexA { int ai_family; int ai_socktype; int ai_protocol; - size_t ai_addrlen; + SIZE_T ai_addrlen; char *ai_canonname; - struct sockaddr *ai_addr; + struct WS(sockaddr) *ai_addr; void *ai_blob; - size_t ai_bloblen; + SIZE_T ai_bloblen; GUID *ai_provider; struct addrinfoexA *ai_next; } ADDRINFOEXA, *PADDRINFOEXA, *LPADDRINFOEXA; @@ -129,11 +129,11 @@ typedef struct addrinfoexW { int ai_family; int ai_socktype; int ai_protocol; - size_t ai_addrlen; + SIZE_T ai_addrlen; WCHAR *ai_canonname; - struct sockaddr *ai_addr; + struct WS(sockaddr) *ai_addr; void *ai_blob; - size_t ai_bloblen; + SIZE_T ai_bloblen; GUID *ai_provider; struct addrinfoexW *ai_next; } ADDRINFOEXW, *PADDRINFOEXW, *LPADDRINFOEXW;

1 0