December 2010 - Wine-commits

Jacek Caban : jscript: Don't unescape '\v'.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 48202ee09ea0ab7a93920252276e3bf8cc170888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48202ee09ea0ab7a939202522… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 29 16:01:56 2010 +0100 jscript: Don't unescape '\v'. --- dlls/jscript/lex.c | 3 --- dlls/jscript/tests/lang.js | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 0329fa4..723f0ef 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -266,9 +266,6 @@ static BOOL unescape(WCHAR *str) case 'n': c = '\n'; break; - case 'v': - c = '\v'; - break; case 'f': c = '\f'; break; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bdf039a..5a361d7 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -942,6 +942,30 @@ ok((Infinity != NaN) === true, "(Infinity != NaN) !== true"); ok((Infinity != NaN) === true, "(Infinity != NaN) !== true"); ok((0 == NaN) === false, "(0 === NaN) != false"); +// escape tests +var escapeTests = [ + ["\'", "\\'", 39], + ["\"", "\\\"", 34], + ["\\", "\\\\", 92], + ["\b", "\\b", 8], + ["\t", "\\t", 9], + ["\n", "\\n", 10], + ["\v", "\\v", 118], + ["\f", "\\f", 12], + ["\r", "\\r", 13], + ["\xf3", "\\xf3", 0xf3], + ["\u1234", "\\u1234", 0x1234], + ["\a", "\\a", 97], + ["\?", "\\?", 63] +]; + +for(i=0; i<escapeTests.length; i++) { + tmp = escapeTests[i][0].charCodeAt(0); + ok(tmp === escapeTests[i][2], "escaped '" + escapeTests[i][1] + "' = " + tmp + " expected " + escapeTests[i][2]); +} + +tmp = !+"\v1"; +ok(tmp === true, '!+"\v1" = ' + tmp); ok(typeof(testFunc2) === "function", "typeof(testFunc2) = " + typeof(testFunc2)); tmp = testFunc2(1);

1 0

Jacek Caban : appwiz.cpl: Added checksum validation of downloaded file.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: b00117d4b65e55461b7c54f36ffbf9c0cdf825a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00117d4b65e55461b7c54f36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 29 00:53:38 2010 +0100 appwiz.cpl: Added checksum validation of downloaded file. --- dlls/appwiz.cpl/En.rc | 1 + dlls/appwiz.cpl/addons.c | 68 +++++++++++++++++++++++++++++++++++++++++++++- dlls/appwiz.cpl/res.h | 1 + 3 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index f7ffa02..0c5cf76 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -46,6 +46,7 @@ STRINGTABLE { IDS_DOWNLOADING "Downloading..." IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." } IDD_MAIN DIALOG 0, 0, 320, 220 diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4478719..d19af66 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <fcntl.h> +#include <stdio.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -53,10 +54,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #ifdef __i386__ #define ARCH_STRING "x86" +#define GECKO_SHA "1b6c637207b6f032ae8a52841db9659433482714" #elif defined(__x86_64__) #define ARCH_STRING "x86_64" +#define GECKO_SHA "55b4b60cd2a48631d6236fb411c3a94d806d9906" #else #define ARCH_STRING "" +#define GECKO_SHA "???" #endif #define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".cab" @@ -82,6 +86,67 @@ static inline char *heap_strdupWtoA(LPCWSTR str) return ret; } +/* SHA definitions are copied from advapi32. They aren't available in headers. */ + +typedef struct { + ULONG Unknown[6]; + ULONG State[5]; + ULONG Count[2]; + UCHAR Buffer[64]; +} SHA_CTX, *PSHA_CTX; + +void WINAPI A_SHAInit(PSHA_CTX); +void WINAPI A_SHAUpdate(PSHA_CTX,const unsigned char*,UINT); +void WINAPI A_SHAFinal(PSHA_CTX,PULONG); + +static BOOL sha_check(const WCHAR *file_name) +{ + const unsigned char *file_map; + HANDLE file, map; + ULONG sha[5]; + char buf[2*sizeof(sha)+1]; + SHA_CTX ctx; + DWORD size, i; + + file = CreateFileW(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + if(file == INVALID_HANDLE_VALUE) + return FALSE; + + size = GetFileSize(file, NULL); + + map = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(file); + if(!map) + return FALSE; + + file_map = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); + CloseHandle(map); + if(!file_map) + return FALSE; + + A_SHAInit(&ctx); + A_SHAUpdate(&ctx, file_map, size); + A_SHAFinal(&ctx, sha); + + UnmapViewOfFile(file_map); + + for(i=0; i < sizeof(sha); i++) + sprintf(buf + i*2, "%02x", *((unsigned char*)sha+i)); + + if(strcmp(buf, GECKO_SHA)) { + WCHAR message[256]; + + WARN("Got %s, expected %s\n", buf, GECKO_SHA); + + if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) + MessageBoxW(NULL, message, NULL, MB_ICONERROR); + + return FALSE; + } + + return TRUE; +} + static void set_status(DWORD id) { HWND status = GetDlgItem(install_dialog, ID_DWL_STATUS); @@ -447,7 +512,8 @@ static DWORD WINAPI download_proc(PVOID arg) return 0; } - install_cab(tmp_file); + if(sha_check(tmp_file)) + install_cab(tmp_file); DeleteFileW(tmp_file); EndDialog(install_dialog, 0); return 0; diff --git a/dlls/appwiz.cpl/res.h b/dlls/appwiz.cpl/res.h index 390c292..3bda4b6 100644 --- a/dlls/appwiz.cpl/res.h +++ b/dlls/appwiz.cpl/res.h @@ -68,3 +68,4 @@ #define IDS_MODIFY_REMOVE 11 #define IDS_DOWNLOADING 12 #define IDS_INSTALLING 13 +#define IDS_INVALID_SHA 14

1 0

Greg Geldorp : setupapi/tests: Uninstall .pnf if uninstall of .inf failed.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: f6990085ccc7d1f485a3738eed238c83d3815f8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6990085ccc7d1f485a3738ee… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Wed Dec 29 00:07:26 2010 +0100 setupapi/tests: Uninstall .pnf if uninstall of .inf failed. --- dlls/setupapi/tests/misc.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 59a8d6b..493e6cb 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -312,17 +312,34 @@ static void test_SetupCopyOEMInf(void) if (pSetupUninstallOEMInfA) { + char pnf[MAX_PATH]; + char *pnffile; char *destfile = strrchr(dest, '\\') + 1; + strcpy(pnf, dest); + *(strrchr(pnf, '.') + 1) = 'p'; + pnffile = strrchr(pnf, '\\') + 1; + SetLastError(0xdeadbeef); res = pSetupUninstallOEMInfA(destfile, 0, NULL); - ok(res, "Failed to uninstall '%s' : %d\n", destfile, GetLastError()); if(!res) + res = pSetupUninstallOEMInfA(pnffile, 0, NULL); + ok(res, "Failed to uninstall '%s'/'%s' : %d\n", destfile, + pnffile, GetLastError()); + todo_wine ok(!file_exists(dest), "Expected inf '%s' to not exist\n", dest); + if(file_exists(dest)) { SetLastError(0xdeadbeef); res = DeleteFileA(dest); ok(res, "Failed to delete file '%s' : %d\n", dest, GetLastError()); } + ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); + if(file_exists(pnf)) + { + SetLastError(0xdeadbeef); + res = DeleteFileA(pnf); + ok(res, "Failed to delete file '%s' : %d\n", pnf, GetLastError()); + } } else {

1 0

Eryk Wieliczko : msvcrt: Implement _ftime64_s and _ftime32_s.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: b6acca66965bcb285de12fd0644ae06e5c8a7680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6acca66965bcb285de12fd06… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Tue Dec 28 14:24:04 2010 +0100 msvcrt: Implement _ftime64_s and _ftime32_s. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/time.c | 28 ++++++++++++++++++++++++++++ 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 64dc69a..0d1ffa1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -659,9 +659,9 @@ @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock @ cdecl _ftime32(ptr) msvcrt._ftime32 -@ stub _ftime32_s +@ cdecl _ftime32_s(ptr) msvcrt._ftime32_s @ cdecl _ftime64(ptr) msvcrt._ftime64 -@ stub _ftime64_s +@ cdecl _ftime64_s(ptr) msvcrt._ftime64_s @ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e28079a..da36e24 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -500,9 +500,9 @@ @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock @ cdecl _ftime32(ptr) msvcrt._ftime32 -@ stub _ftime32_s +@ cdecl _ftime32_s(ptr) msvcrt._ftime32_s @ cdecl _ftime64(ptr) msvcrt._ftime64 -@ stub _ftime64_s +@ cdecl _ftime64_s(ptr) msvcrt._ftime64_s @ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 94e32ff..578e6fb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -492,9 +492,9 @@ @ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock @ cdecl _ftime32(ptr) msvcrt._ftime32 -@ stub _ftime32_s +@ cdecl _ftime32_s(ptr) msvcrt._ftime32_s @ cdecl _ftime64(ptr) msvcrt._ftime64 -@ stub _ftime64_s +@ cdecl _ftime64_s(ptr) msvcrt._ftime64_s @ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a12941e..efec11f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -444,9 +444,9 @@ @ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl _ftime(ptr) MSVCRT__ftime @ cdecl _ftime32(ptr) MSVCRT__ftime32 -# stub _ftime32_s +@ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s @ cdecl _ftime64(ptr) MSVCRT__ftime64 -# stub _ftime64_s +@ cdecl _ftime64_s(ptr) MSVCRT__ftime64_s @ cdecl -ret64 _ftol() ntdll._ftol @ cdecl -ret64 _ftol2() ntdll._ftol @ cdecl -ret64 _ftol2_sse() ntdll._ftol #FIXME: SSE variant should be implemented diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4150156..9dc2a3e 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -602,6 +602,20 @@ void CDECL MSVCRT__ftime64(struct MSVCRT___timeb64 *buf) } /********************************************************************* + * _ftime64_s (MSVCRT.@) + */ +int CDECL MSVCRT__ftime64_s(struct MSVCRT___timeb64 *buf) +{ + if( !MSVCRT_CHECK_PMT( buf != NULL ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + MSVCRT__ftime64(buf); + return 0; +} + +/********************************************************************* * _ftime32 (MSVCRT.@) */ void CDECL MSVCRT__ftime32(struct MSVCRT___timeb32 *buf) @@ -616,6 +630,20 @@ void CDECL MSVCRT__ftime32(struct MSVCRT___timeb32 *buf) } /********************************************************************* + * _ftime32_s (MSVCRT.@) + */ +int CDECL MSVCRT__ftime32_s(struct MSVCRT___timeb32 *buf) +{ + if( !MSVCRT_CHECK_PMT( buf != NULL ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + MSVCRT__ftime32(buf); + return 0; +} + +/********************************************************************* * _ftime (MSVCRT.@) */ #ifdef _WIN64

1 0

Michael Stefaniuc : hnetcfg: Use an iface instead of a vtbl pointer in hnetcfg_cf.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 3dd2c0d832008906757e38a52b9dfa5e203ecb23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd2c0d832008906757e38a52… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:53:08 2010 +0100 hnetcfg: Use an iface instead of a vtbl pointer in hnetcfg_cf. --- dlls/hnetcfg/hnetcfg.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index e2ab50e..1bb1e8f 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -37,13 +37,13 @@ typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); typedef struct { - const struct IClassFactoryVtbl *vtbl; + IClassFactory IClassFactory_iface; fnCreateInstance pfnCreateInstance; } hnetcfg_cf; static inline hnetcfg_cf *impl_from_IClassFactory( IClassFactory *iface ) { - return (hnetcfg_cf *)((char *)iface - FIELD_OFFSET( hnetcfg_cf, vtbl )); + return CONTAINING_RECORD(iface, hnetcfg_cf, IClassFactory_iface); } static HRESULT WINAPI hnetcfg_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) @@ -110,8 +110,8 @@ static const struct IClassFactoryVtbl hnetcfg_cf_vtbl = hnetcfg_cf_LockServer }; -static hnetcfg_cf fw_manager_cf = { &hnetcfg_cf_vtbl, NetFwMgr_create }; -static hnetcfg_cf fw_app_cf = { &hnetcfg_cf_vtbl, NetFwAuthorizedApplication_create }; +static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; +static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -138,11 +138,11 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) if (IsEqualGUID( rclsid, &CLSID_NetFwMgr )) { - cf = (IClassFactory *)&fw_manager_cf.vtbl; + cf = &fw_manager_cf.IClassFactory_iface; } else if (IsEqualGUID( rclsid, &CLSID_NetFwAuthorizedApplication )) { - cf = (IClassFactory *)&fw_app_cf.vtbl; + cf = &fw_app_cf.IClassFactory_iface; } if (!cf) return CLASS_E_CLASSNOTAVAILABLE;

1 0

Michael Stefaniuc : sti: Use an iface instead of a vtbl pointer in sti_cf.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: bae6528247dc1319876e3597afabea7fab294101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae6528247dc1319876e3597a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:53:33 2010 +0100 sti: Use an iface instead of a vtbl pointer in sti_cf. --- dlls/sti/sti_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index 30d9d3d..c532ffb 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -43,13 +43,13 @@ typedef HRESULT (*fnCreateInstance)(REFIID riid, IUnknown *pUnkOuter, LPVOID *pp typedef struct { - const struct IClassFactoryVtbl *vtbl; + IClassFactory IClassFactory_iface; fnCreateInstance pfnCreateInstance; } sti_cf; static inline sti_cf *impl_from_IClassFactory( IClassFactory *iface ) { - return (sti_cf *)((char *)iface - FIELD_OFFSET( sti_cf, vtbl )); + return CONTAINING_RECORD(iface, sti_cf, IClassFactory_iface); } static HRESULT sti_create( REFIID riid, IUnknown *pUnkOuter, LPVOID *ppObj ) @@ -131,7 +131,7 @@ static const struct IClassFactoryVtbl sti_cf_vtbl = sti_cf_LockServer }; -static sti_cf the_sti_cf = { &sti_cf_vtbl, sti_create }; +static sti_cf the_sti_cf = { { &sti_cf_vtbl }, sti_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -153,7 +153,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) if (IsEqualGUID( rclsid, &CLSID_Sti )) { - cf = (IClassFactory *)&the_sti_cf.vtbl; + cf = &the_sti_cf.IClassFactory_iface; } if (cf)

1 0

Michael Stefaniuc : oleaut32/tests: COM cleanup for usrmarshal.c.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 74ce3e53d41802a27f12fea2b6e94ec4c8ab464e URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ce3e53d41802a27f12fea2b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:53:23 2010 +0100 oleaut32/tests: COM cleanup for usrmarshal.c. --- dlls/oleaut32/tests/usrmarshal.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 1aae0f5..def1c15 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <stdarg.h> @@ -669,10 +670,15 @@ static void test_marshal_BSTR(void) typedef struct { - const IUnknownVtbl *lpVtbl; + IUnknown IUnknown_iface; ULONG refs; } HeapUnknown; +static inline HeapUnknown *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, HeapUnknown, IUnknown_iface); +} + static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -687,13 +693,13 @@ static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, v static ULONG WINAPI HeapUnknown_AddRef(IUnknown *iface) { - HeapUnknown *This = (HeapUnknown *)iface; + HeapUnknown *This = impl_from_IUnknown(iface); return InterlockedIncrement((LONG*)&This->refs); } static ULONG WINAPI HeapUnknown_Release(IUnknown *iface) { - HeapUnknown *This = (HeapUnknown *)iface; + HeapUnknown *This = impl_from_IUnknown(iface); ULONG refs = InterlockedDecrement((LONG*)&This->refs); if (!refs) HeapFree(GetProcessHeap(), 0, This); return refs; @@ -1437,12 +1443,12 @@ static void test_marshal_VARIANT(void) /*** UNKNOWN ***/ heap_unknown = HeapAlloc(GetProcessHeap(), 0, sizeof(*heap_unknown)); - heap_unknown->lpVtbl = &HeapUnknown_Vtbl; + heap_unknown->IUnknown_iface.lpVtbl = &HeapUnknown_Vtbl; heap_unknown->refs = 1; VariantInit(&v); VariantInit(&v2); V_VT(&v) = VT_UNKNOWN; - V_UNKNOWN(&v) = (IUnknown *)heap_unknown; + V_UNKNOWN(&v) = &heap_unknown->IUnknown_iface; rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v); ok(stubMsg.BufferLength > 32, "size %d\n", stubMsg.BufferLength); @@ -1471,7 +1477,7 @@ static void test_marshal_VARIANT(void) VARIANT v3; VariantInit(&v3); V_VT(&v3) = VT_UNKNOWN; - V_UNKNOWN(&v3) = (IUnknown *)heap_unknown; + V_UNKNOWN(&v3) = &heap_unknown->IUnknown_iface; IUnknown_AddRef(V_UNKNOWN(&v3)); stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v3); @@ -1479,7 +1485,7 @@ static void test_marshal_VARIANT(void) ok(V_UNKNOWN(&v) == V_UNKNOWN(&v3), "got %p expect %p\n", V_UNKNOWN(&v), V_UNKNOWN(&v3)); VARIANT_UserFree(&umcb.Flags, &v3); ok(heap_unknown->refs == 1, "%d refcounts of IUnknown leaked\n", heap_unknown->refs - 1); - IUnknown_Release((IUnknown *)heap_unknown); + IUnknown_Release(&heap_unknown->IUnknown_iface); } HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1509,7 +1515,7 @@ static void test_marshal_VARIANT(void) /*** UNKNOWN BYREF ***/ heap_unknown = HeapAlloc(GetProcessHeap(), 0, sizeof(*heap_unknown)); - heap_unknown->lpVtbl = &HeapUnknown_Vtbl; + heap_unknown->IUnknown_iface.lpVtbl = &HeapUnknown_Vtbl; heap_unknown->refs = 1; VariantInit(&v); VariantInit(&v2); @@ -1545,7 +1551,7 @@ static void test_marshal_VARIANT(void) VARIANT v3; VariantInit(&v3); V_VT(&v3) = VT_UNKNOWN; - V_UNKNOWN(&v3) = (IUnknown *)heap_unknown; + V_UNKNOWN(&v3) = &heap_unknown->IUnknown_iface; IUnknown_AddRef(V_UNKNOWN(&v3)); stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v3); @@ -1553,7 +1559,7 @@ static void test_marshal_VARIANT(void) ok(*V_UNKNOWNREF(&v) == *V_UNKNOWNREF(&v3), "got %p expect %p\n", *V_UNKNOWNREF(&v), *V_UNKNOWNREF(&v3)); VARIANT_UserFree(&umcb.Flags, &v3); ok(heap_unknown->refs == 1, "%d refcounts of IUnknown leaked\n", heap_unknown->refs - 1); - IUnknown_Release((IUnknown *)heap_unknown); + IUnknown_Release(&heap_unknown->IUnknown_iface); } HeapFree(GetProcessHeap(), 0, oldbuffer); }

1 0

Arno Teigseth : msvcrt: Added _ui64tow_s.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 01b9fd3679ed5411d2f90af3e9fd88b93c0acff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b9fd3679ed5411d2f90af3e… Author: Arno Teigseth <arnotixe(a)gmail.com> Date: Wed Dec 29 02:13:53 2010 -0500 msvcrt: Added _ui64tow_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 82606e2..64dc69a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1197,7 +1197,7 @@ @ cdecl _ui64toa(int64 ptr long) msvcrt._ui64toa @ cdecl _ui64toa_s(int64 ptr long long) msvcrt._ui64toa_s @ cdecl _ui64tow(int64 ptr long) msvcrt._ui64tow -@ stub _ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) msvcrt._ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa @ cdecl _ultoa_s(long ptr long long) msvcrt._ultoa_s @ cdecl _ultow(long ptr long) msvcrt._ultow diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e54eea6..e28079a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1050,7 +1050,7 @@ @ cdecl _ui64toa(int64 ptr long) msvcrt._ui64toa @ cdecl _ui64toa_s(int64 ptr long long) msvcrt._ui64toa_s @ cdecl _ui64tow(int64 ptr long) msvcrt._ui64tow -@ stub _ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) msvcrt._ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa @ cdecl _ultoa_s(long ptr long long) msvcrt._ultoa_s @ cdecl _ultow(long ptr long) msvcrt._ultow diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5baee98..94e32ff 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1037,7 +1037,7 @@ @ cdecl _ui64toa(int64 ptr long) msvcrt._ui64toa @ cdecl _ui64toa_s(int64 ptr long long) msvcrt._ui64toa_s @ cdecl _ui64tow(int64 ptr long) msvcrt._ui64tow -@ stub _ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) msvcrt._ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa @ cdecl _ultoa_s(long ptr long long) msvcrt._ultoa_s @ cdecl _ultow(long ptr long) msvcrt._ultow diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ba8c9ea..a12941e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -976,7 +976,7 @@ @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa @ cdecl _ui64toa_s(int64 ptr long long) MSVCRT__ui64toa_s @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow -# stub _ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s @ cdecl _ultoa(long ptr long) ntdll._ultoa @ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) ntdll._ultow diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 11ad5a0..6be2237 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -919,6 +919,43 @@ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, } /********************************************************************* + * _ui64tow_s (MSVCRT.@) + */ +int CDECL MSVCRT__ui64tow_s( unsigned __int64 value, MSVCRT_wchar_t *str, + MSVCRT_size_t size, int radix ) +{ + MSVCRT_wchar_t buffer[65], *pos; + int digit; + + if (!MSVCRT_CHECK_PMT(str != NULL) || !MSVCRT_CHECK_PMT(size > 0) || + !MSVCRT_CHECK_PMT(radix>=2) || !MSVCRT_CHECK_PMT(radix<=36)) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + pos = &buffer[64]; + *pos = '\0'; + + do { + digit = value % radix; + value = value / radix; + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } while (value != 0); + + if(buffer-pos+65 > size) { + MSVCRT_INVALID_PMT("str[size] is too small"); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + memcpy(str, pos, buffer-pos+65); + return 0; +} + +/********************************************************************* * _ultoa_s (MSVCRT.@) */ int CDECL _ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix)

1 0

Adam Martinson : configure: Fix OpenCL includes on systems with only CL/cl. h.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 2eb2f71c03e8df1007ce36ccf14af39f0291e45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb2f71c03e8df1007ce36ccf… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Tue Dec 28 12:46:09 2010 -0600 configure: Fix OpenCL includes on systems with only CL/cl.h. --- configure | 6 +++--- configure.ac | 6 +++--- dlls/opencl/opencl.c | 4 ++-- include/config.h.in | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure b/configure index c73e024..d75cb53 100755 --- a/configure +++ b/configure @@ -2641,7 +2641,7 @@ fi # Check whether --with-opencl was given. if test "${with_opencl+set}" = set; then : - withval=$with_opencl; if test "x$withval" = "xno"; then ac_cv_header_CL_opencl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi + withval=$with_opencl; if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi fi @@ -5760,7 +5760,7 @@ for ac_header in \ AL/al.h \ AudioToolbox/AudioConverter.h \ AudioUnit/AudioUnit.h \ - CL/opencl.h \ + CL/cl.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ DiskArbitration/DiskArbitration.h \ @@ -9064,7 +9064,7 @@ Use the --without-x option if you really want this." "$LINENO" 5 ;; esac fi -if test "$ac_cv_header_CL_opencl_h" = "yes" +if test "$ac_cv_header_CL_cl_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clGetPlatformInfo in -lOpenCL" >&5 $as_echo_n "checking for clGetPlatformInfo in -lOpenCL... " >&6; } diff --git a/configure.ac b/configure.ac index 773a727..5ea8356 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ AC_ARG_WITH(nas, AS_HELP_STRING([--without-nas],[do not use the NAS sound AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi]) AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), - [if test "x$withval" = "xno"; then ac_cv_header_CL_opencl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi]) + [if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi]) AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]), [if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi]) @@ -370,7 +370,7 @@ AC_CHECK_HEADERS(\ AL/al.h \ AudioToolbox/AudioConverter.h \ AudioUnit/AudioUnit.h \ - CL/opencl.h \ + CL/cl.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ DiskArbitration/DiskArbitration.h \ @@ -1107,7 +1107,7 @@ without X support, which probably isn't what you want. You will need to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.]) dnl **** Check for OpenCL **** -if test "$ac_cv_header_CL_opencl_h" = "yes" +if test "$ac_cv_header_CL_cl_h" = "yes" then AC_CHECK_LIB(OpenCL,clGetPlatformInfo,[AC_SUBST(LIBOPENCL,["-lOpenCL"])]) fi diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 7552e79..62e2355 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -30,8 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); -#if defined(HAVE_CL_OPENCL_H) -#include <CL/opencl.h> +#if defined(HAVE_CL_CL_H) +#include <CL/cl.h> #elif defined(HAVE_OPENCL_OPENCL_H) #include <OpenCL/opencl.h> #endif diff --git a/include/config.h.in b/include/config.h.in index c7bf082..58767a0 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -54,8 +54,8 @@ /* Define to 1 if you have the `chsize' function. */ #undef HAVE_CHSIZE -/* Define to 1 if you have the <CL/opencl.h> header file. */ -#undef HAVE_CL_OPENCL_H +/* Define to 1 if you have the <CL/cl.h> header file. */ +#undef HAVE_CL_CL_H /* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */ #undef HAVE_COREAUDIO_COREAUDIO_H

1 0

Michael Stefaniuc : wbemprox: Use an iface instead of a vtbl pointer in wbemprox_cf.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 17b4de2bba7ed2cb2ffa9ea6a3da9b1b2d696c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b4de2bba7ed2cb2ffa9ea6a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:53:40 2010 +0100 wbemprox: Use an iface instead of a vtbl pointer in wbemprox_cf. --- dlls/wbemprox/main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 5f32bd2..c6bb240 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -40,13 +40,13 @@ typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); typedef struct { - const struct IClassFactoryVtbl *vtbl; + IClassFactory IClassFactory_iface; fnCreateInstance pfnCreateInstance; } wbemprox_cf; static inline wbemprox_cf *impl_from_IClassFactory( IClassFactory *iface ) { - return (wbemprox_cf *)((char *)iface - FIELD_OFFSET( wbemprox_cf, vtbl )); + return CONTAINING_RECORD(iface, wbemprox_cf, IClassFactory_iface); } static HRESULT WINAPI wbemprox_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) @@ -113,7 +113,7 @@ static const struct IClassFactoryVtbl wbemprox_cf_vtbl = wbemprox_cf_LockServer }; -static wbemprox_cf wbem_locator_cf = { &wbemprox_cf_vtbl, WbemLocator_create }; +static wbemprox_cf wbem_locator_cf = { { &wbemprox_cf_vtbl }, WbemLocator_create }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -141,7 +141,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) if (IsEqualGUID( rclsid, &CLSID_WbemLocator )) { - cf = (IClassFactory *)&wbem_locator_cf.vtbl; + cf = &wbem_locator_cf.IClassFactory_iface; } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv );

1 0