December 2012 - Wine-Commits

Piotr Caban : msvcr100: Added _aligned_msize implementation.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 6e38d5beef8fe9787004c014baec6a2f78102a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e38d5beef8fe9787004c014b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 21 13:38:34 2012 +0100 msvcr100: Added _aligned_msize implementation. --- dlls/msvcr100/msvcr100.c | 20 ++++++++++++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 33 +++++++++++++++++++++++++++++++++ dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index f571aee..aeab2ad 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -483,6 +483,26 @@ int CDECL _get_timezone(LONG *timezone) return 0; } +/* copied from dlls/msvcrt/heap.c */ +#define SAVED_PTR(x) ((void *)((DWORD_PTR)((char *)x - sizeof(void *)) & \ + ~(sizeof(void *) - 1))) + +/********************************************************************* + * _aligned_msize (MSVCR100.@) + */ +size_t CDECL _aligned_msize(void *p, size_t alignment, size_t offset) +{ + void **alloc_ptr; + + if(!CHECK_PMT(p)) return -1; + + if(alignment < sizeof(void*)) + alignment = sizeof(void*); + + alloc_ptr = SAVED_PTR(p); + return _msize(*alloc_ptr)-alignment-sizeof(void*); +} + /********************************************************************* * DllMain (MSVCR100.@) */ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 38ae28a..a09b142 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -678,7 +678,7 @@ @ extern _acmdln msvcrt._acmdln @ cdecl _aligned_free(ptr) msvcrt._aligned_free @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc -@ stub _aligned_msize +@ cdecl _aligned_msize(ptr long long) @ cdecl _aligned_offset_malloc(long long long) msvcrt._aligned_offset_malloc @ cdecl _aligned_offset_realloc(ptr long long long) msvcrt._aligned_offset_realloc @ stub _aligned_offset_recalloc diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 143979d..99834dd 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -72,6 +72,9 @@ static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const static FILE* (__cdecl *p_fopen)(const char*,const char*); static int (__cdecl *p_fclose)(FILE*); static size_t (__cdecl *p_fread_s)(void*,size_t,size_t,size_t,FILE*); +static void* (__cdecl *p__aligned_offset_malloc)(size_t, size_t, size_t); +static void (__cdecl *p__aligned_free)(void*); +static size_t (__cdecl *p__aligned_msize)(void*, size_t, size_t); /* make sure we use the correct errno */ #undef errno @@ -98,6 +101,9 @@ static BOOL init(void) SET(p_fopen, "fopen"); SET(p_fclose, "fclose"); SET(p_fread_s, "fread_s"); + SET(p__aligned_offset_malloc, "_aligned_offset_malloc"); + SET(p__aligned_free, "_aligned_free"); + SET(p__aligned_msize, "_aligned_msize"); return TRUE; } @@ -326,6 +332,32 @@ static void test_fread_s(void) unlink(test_file); } +static void test__aligned_msize(void) +{ + void *mem; + int ret; + + mem = p__aligned_offset_malloc(23, 16, 7); + ret = p__aligned_msize(mem, 16, 7); + ok(ret == 23, "_aligned_msize returned %d\n", ret); + ret = p__aligned_msize(mem, 15, 7); + ok(ret == 24, "_aligned_msize returned %d\n", ret); + ret = p__aligned_msize(mem, 11, 7); + ok(ret == 28, "_aligned_msize returned %d\n", ret); + ret = p__aligned_msize(mem, 1, 7); + ok(ret == 39-sizeof(void*), "_aligned_msize returned %d\n", ret); + ret = p__aligned_msize(mem, 8, 0); + todo_wine ok(ret == 32, "_aligned_msize returned %d\n", ret); + p__aligned_free(mem); + + mem = p__aligned_offset_malloc(3, 16, 0); + ret = p__aligned_msize(mem, 16, 0); + ok(ret == 3, "_aligned_msize returned %d\n", ret); + ret = p__aligned_msize(mem, 11, 0); + ok(ret == 8, "_aligned_msize returned %d\n", ret); + p__aligned_free(mem); +} + START_TEST(msvcr100) { if (!init()) @@ -334,4 +366,5 @@ START_TEST(msvcr100) test_wmemcpy_s(); test_wmemmove_s(); test_fread_s(); + test__aligned_msize(); } diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c9469e7..4457c2c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -334,7 +334,7 @@ @ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _aligned_free(ptr) msvcrt._aligned_free @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc -@ stub _aligned_msize +@ cdecl _aligned_msize(ptr long long) msvcr100._aligned_msize @ cdecl _aligned_offset_malloc(long long long) msvcrt._aligned_offset_malloc @ cdecl _aligned_offset_realloc(ptr long long long) msvcrt._aligned_offset_realloc @ stub _aligned_offset_recalloc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bf54f0a..c20c5fd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -326,7 +326,7 @@ @ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _aligned_free(ptr) msvcrt._aligned_free @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc -@ stub _aligned_msize +@ cdecl _aligned_msize(ptr long long) msvcr100._aligned_msize @ cdecl _aligned_offset_malloc(long long long) msvcrt._aligned_offset_malloc @ cdecl _aligned_offset_realloc(ptr long long long) msvcrt._aligned_offset_realloc @ stub _aligned_offset_recalloc

1 0

Alexandre Julliard : winspool.drv: Remove a todo that succeeds now.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 4289bd44dee6e805400ca0da4513089a71da6947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4289bd44dee6e805400ca0da4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 13:43:09 2012 +0100 winspool.drv: Remove a todo that succeeds now. --- dlls/winspool.drv/tests/info.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 6d051d6..4da39c8 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2853,7 +2853,6 @@ static void test_DeviceCapabilities(void) fields = DeviceCapabilities(device, port, DC_FIELDS, NULL, NULL); ok(fields != (DWORD)-1, "DeviceCapabilities DC_FIELDS failed\n"); - todo_wine ok(fields == (dm->dmFields | DM_FORMNAME) || fields == ((dm->dmFields | DM_FORMNAME | DM_PAPERSIZE) & ~(DM_PAPERLENGTH|DM_PAPERWIDTH)) || broken(fields == dm->dmFields), /* Win9x/WinMe */

1 0

Ken Thomases : winemac: Implement GetDeviceCaps().
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: fd269e4dcad17a0537a7973c6fe691ce6567e7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd269e4dcad17a0537a7973c6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:07 2012 -0600 winemac: Implement GetDeviceCaps(). --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/gdi.c | 321 ++++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/macdrv.h | 101 +++++++++++++ 3 files changed, 415 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd269e4dcad17a0537a79…

1 0

Jacek Caban : jscript: Added null and undefined values support to to_object .
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 99d1a8529beb450aa1eaa46ecdb49ccb532549c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d1a8529beb450aa1eaa46ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 21 16:21:03 2012 +0100 jscript: Added null and undefined values support to to_object. --- dlls/jscript/jsutils.c | 7 ++++--- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 91e0397..5527724 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -820,6 +820,10 @@ HRESULT to_object(script_ctx_t *ctx, jsval_t val, IDispatch **disp) *disp = to_disp(dispex); break; + case JSV_UNDEFINED: + case JSV_NULL: + WARN("object expected\n"); + return throw_type_error(ctx, JS_E_OBJECT_EXPECTED, NULL); case JSV_VARIANT: switch(V_VT(get_variant(val))) { case VT_ARRAY|VT_VARIANT: @@ -835,9 +839,6 @@ HRESULT to_object(script_ctx_t *ctx, jsval_t val, IDispatch **disp) return E_NOTIMPL; } break; - default: - FIXME("unsupported %s\n", debugstr_jsval(val)); - return E_NOTIMPL; } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 5d45777..eb16176 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2300,6 +2300,8 @@ testException(function() {+nullDisp.prop;}, "E_OBJECT_REQUIRED"); testException(function() {+nullDisp["prop"];}, "E_OBJECT_REQUIRED"); testException(function() {delete (new Object());}, "E_INVALID_DELETE"); testException(function() {delete false;}, "E_INVALID_DELETE"); +testException(function() {undefined.toString();}, "E_OBJECT_EXPECTED"); +testException(function() {null.toString();}, "E_OBJECT_EXPECTED"); obj = new Object(); obj.prop = 1;

1 0

Hans Leidekker : winhttp/tests: Make sure proxy settings are restored.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: ec1ae3b6e64642e03fde382bd83e07aa1856c2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1ae3b6e64642e03fde382bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 21 13:55:41 2012 +0100 winhttp/tests: Make sure proxy settings are restored. --- dlls/winhttp/tests/winhttp.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5fcdef6..05e7804 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1070,23 +1070,23 @@ static void test_set_default_proxy_config(void) info.lpszProxy = wideString; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); - ok((!ret && GetLastError() == ERROR_INVALID_PARAMETER) || - broken(ret), /* Earlier winhttp versions on W2K/XP */ - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + skip("couldn't set default proxy configuration: access denied\n"); + else + ok((!ret && GetLastError() == ERROR_INVALID_PARAMETER) || + broken(ret), /* Earlier winhttp versions on W2K/XP */ + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); info.lpszProxy = normalString; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); - if (ret) - { - ok(ret, "always true\n"); - set_default_proxy_reg_value( saved_proxy_settings, len, type ); - } - else if (GetLastError() == ERROR_ACCESS_DENIED) + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) skip("couldn't set default proxy configuration: access denied\n"); else ok(ret, "WinHttpSetDefaultProxyConfiguration failed: %d\n", GetLastError()); + + set_default_proxy_reg_value( saved_proxy_settings, len, type ); } static void test_Timeouts (void)

1 0

Hans Leidekker : pdh: Accept the local machine name in counter paths.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 4933dc78c6aeef024c6f240945968d05a51d4670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4933dc78c6aeef024c6f24094… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 21 13:56:23 2012 +0100 pdh: Accept the local machine name in counter paths. --- dlls/pdh/pdh_main.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 69f0d71..f1a34e7 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -220,14 +220,27 @@ static const struct source counter_sources[] = { 674, path_uptime, collect_uptime, TYPE_UPTIME, -3, 1000 } }; +static BOOL is_local_machine( const WCHAR *name, DWORD len ) +{ + WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD buflen = sizeof(buf) / sizeof(buf[0]); + + if (!GetComputerNameW( buf, &buflen )) return FALSE; + return len == buflen && !memicmpW( name, buf, buflen ); +} + static BOOL pdh_match_path( LPCWSTR fullpath, LPCWSTR path ) { const WCHAR *p; - if (strchrW( path, '\\')) p = fullpath; + if (path[0] == '\\' && path[1] == '\\' && (p = strchrW( path + 2, '\\' )) && + is_local_machine( path + 2, p - path - 2 )) + { + path += p - path; + } + if (strchrW( path, '\\' )) p = fullpath; else p = strrchrW( fullpath, '\\' ) + 1; - if (strcmpW( p, path )) return FALSE; - return TRUE; + return !strcmpW( p, path ); } /***********************************************************************

1 0

Hans Leidekker : wmiutils: Rename wmiutils.idl to wmiutils_classes.idl.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: d010497474f2419671faa93ef4b413b2a057b7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d010497474f2419671faa93ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 21 13:57:07 2012 +0100 wmiutils: Rename wmiutils.idl to wmiutils_classes.idl. --- dlls/wmiutils/Makefile.in | 2 +- .../{wmiutils.idl => wmiutils_classes.idl} | 0 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in index f12461f..c6ef892 100644 --- a/dlls/wmiutils/Makefile.in +++ b/dlls/wmiutils/Makefile.in @@ -5,6 +5,6 @@ C_SRCS = \ main.c \ statuscode.c -IDL_R_SRCS = wmiutils.idl +IDL_R_SRCS = wmiutils_classes.idl @MAKE_DLL_RULES@ diff --git a/dlls/wmiutils/wmiutils.idl b/dlls/wmiutils/wmiutils_classes.idl similarity index 100% rename from dlls/wmiutils/wmiutils.idl rename to dlls/wmiutils/wmiutils_classes.idl

1 0

Piotr Caban : wininet: Fixed CreateUrlCacheEntryW behaviour on URLs without '\' and '/' characters.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 2f35659035db8085ceb512c340353e0e9c773983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f35659035db8085ceb512c34… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 21 17:06:16 2012 +0100 wininet: Fixed CreateUrlCacheEntryW behaviour on URLs without '\' and '/' characters. --- dlls/wininet/urlcache.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 8fb62de..c5201b4 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2901,6 +2901,9 @@ BOOL WINAPI CreateUrlCacheEntryW( break; } } + if(!bFound) + lpszUrlPart++; + if (!lstrcmpW(lpszUrlPart, szWWW)) { lpszUrlPart += lstrlenW(szWWW);

1 0

Piotr Caban : wininet: NULL terminate cookie data in load_persistent_cookie function.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: a62e3f64425e5f42d6e3bb6357b2a82bf49774a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62e3f64425e5f42d6e3bb635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 21 17:06:33 2012 +0100 wininet: NULL terminate cookie data in load_persistent_cookie function. --- dlls/wininet/cookie.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 42c7525..0dd93d9 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -170,11 +170,12 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) if(!cookie) return FALSE; - if(!(str = heap_alloc(size)) || !ReadUrlCacheEntryStream(cookie, 0, str, &size, 0)) { + if(!(str = heap_alloc(size+1)) || !ReadUrlCacheEntryStream(cookie, 0, str, &size, 0)) { UnlockUrlCacheEntryStream(cookie, 0); heap_free(str); return FALSE; } + str[size] = 0; UnlockUrlCacheEntryStream(cookie, 0); LIST_FOR_EACH(iter, &domain_list)

1 0

Ken Thomases : configure: Only enable the Mac driver on Mac OS X 10. 6 or later.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 10c6f8436c28f75c03bc57c2e7c3ee9246e2bb62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c6f8436c28f75c03bc57c2e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:00 2012 -0600 configure: Only enable the Mac driver on Mac OS X 10.6 or later. --- configure | 16 ++++++++++++++-- configure.ac | 12 ++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 976bd9b..063c25d 100755 --- a/configure +++ b/configure @@ -6669,12 +6669,24 @@ done else as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported." fi - if test "$ac_cv_header_Carbon_Carbon_h" = "yes" + if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then CARBONLIB="-framework Carbon" - enable_winemac_drv=${enable_winemac_drv:-yes} fi + + if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes" + then + ac_save_LIBS="$LIBS" + LIBS="$LIBS $APPLICATIONSERVICESLIB" + ac_fn_c_check_func "$LINENO" "CGDisplayModeGetWidth" "ac_cv_func_CGDisplayModeGetWidth" +if test "x$ac_cv_func_CGDisplayModeGetWidth" = xyes; then : + enable_winemac_drv=${enable_winemac_drv:-yes} +fi + + LIBS="$ac_save_LIBS" + fi + if test "x$enable_win16" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 16-bit code can be built correctly" >&5 diff --git a/configure.ac b/configure.ac index 5e59e90..2a0a1b6 100644 --- a/configure.ac +++ b/configure.ac @@ -796,12 +796,20 @@ case $host_os in else WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) fi - dnl Enable Mac driver on Mac OS X if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then AC_SUBST(CARBONLIB,"-framework Carbon") - enable_winemac_drv=${enable_winemac_drv:-yes} fi + + dnl Enable Mac driver on Mac OS X 10.6 or later + if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes" + then + ac_save_LIBS="$LIBS" + LIBS="$LIBS $APPLICATIONSERVICESLIB" + AC_CHECK_FUNC(CGDisplayModeGetWidth,enable_winemac_drv=${enable_winemac_drv:-yes}) + LIBS="$ac_save_LIBS" + fi + dnl Check for Xcode 3.x broken 16-bit support if test "x$enable_win16" = "xyes" then

1 0