wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Dmitry Timoshkov : include/winbase.h: MSC compiler implements interlocked* APIs as intrinsics in x86_64 mode.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 61c0dcdb8b9b64ec3b405acb884f5dc1def4c73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c0dcdb8b9b64ec3b405acb8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 31 12:38:32 2012 +0900 include/winbase.h: MSC compiler implements interlocked* APIs as intrinsics in x86_64 mode. --- include/winbase.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index bc765f1..619120e 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2435,6 +2435,10 @@ WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGL #else /* __i386__ */ +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedCompareExchange) +#endif + static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2442,12 +2446,18 @@ static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedCompareExchange( dest, xchg, compare ); #else extern int interlocked_cmpxchg( int *dest, int xchg, int compare ); return interlocked_cmpxchg( (int *)dest, xchg, compare ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedCompareExchangePointer) +#endif + static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2455,12 +2465,18 @@ static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatil __asm__ __volatile__( "lock; cmpxchgq %2,(%1)" : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedCompareExchangePointer( dest, xchg, compare ); #else extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); return interlocked_cmpxchg_ptr( (void **)dest, xchg, compare ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedCompareExchange64) +#endif + static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2468,12 +2484,18 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati __asm__ __volatile__( "lock; cmpxchgq %2,(%1)" : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedCompareExchange64( dest, xchg, compare ); #else extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); return interlocked_cmpxchg64( (__int64 *)dest, xchg, compare ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedExchange) +#endif + static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2481,12 +2503,18 @@ static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG va __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedExchange( dest, val ); #else extern int interlocked_xchg( int *dest, int val ); return interlocked_xchg( (int *)dest, val ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedExchangePointer) +#endif + static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2494,12 +2522,18 @@ static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedExchangePointer( dest, val ); #else extern void *interlocked_xchg_ptr( void **dest, void *val ); return interlocked_xchg_ptr( (void **)dest, val ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedExchangeAdd) +#endif + static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2507,20 +2541,38 @@ static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG __asm__ __volatile__( "lock; xaddl %0,(%1)" : "=r" (ret) : "r" (dest), "0" (incr) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedExchangeAdd( dest, incr ); #else extern int interlocked_xchg_add( int *dest, int incr ); return interlocked_xchg_add( (int *)dest, incr ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedIncrement) +#endif + static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) { +#if defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedIncrement( dest ); +#else return InterlockedExchangeAdd( dest, 1 ) + 1; +#endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedDecrement) +#endif + static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { +#if defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedDecrement( dest ); +#else return InterlockedExchangeAdd( dest, -1 ) - 1; +#endif } #endif /* __i386__ */

1 0

Dmitry Timoshkov : include/winnt.h: MSC compiler doesn' t support __asm keyword in x86_64 mode.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 9d9496058fea447a30956695e93a795c556e8daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9496058fea447a30956695e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 31 12:38:24 2012 +0900 include/winnt.h: MSC compiler doesn't support __asm keyword in x86_64 mode. --- include/winnt.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index c19eb47..2f78820 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2221,14 +2221,6 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm__(".byte 0x65\n\tmovq (0x30),%0" : "=r" (teb)); return teb; } -#elif defined(__x86_64__) && defined (_MSC_VER) -static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) -{ - struct _TEB *teb; - __asm mov rax, gs:[0x30]; - __asm mov teb, rax; - return teb; -} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Detlef Riekenberg : advapi32/tests: Simple tests for TokenIntegrityLevel.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 92bcd0bf10b7c643680762d8855803268a9271de URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bcd0bf10b7c643680762d88… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jul 31 00:09:02 2012 +0200 advapi32/tests: Simple tests for TokenIntegrityLevel. --- dlls/advapi32/tests/security.c | 62 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 57 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 28e43ec..291c99d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -167,6 +167,8 @@ static void init(void) pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); + pConvertSidToStringSidA = (void *)GetProcAddress(hmod, "ConvertSidToStringSidA"); + pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -211,12 +213,11 @@ static void test_sid(void) BOOL r; LPSTR str = NULL; - pConvertSidToStringSidA = (void *)GetProcAddress( hmod, "ConvertSidToStringSidA" ); - if( !pConvertSidToStringSidA ) - return; - pConvertStringSidToSidA = (void *)GetProcAddress( hmod, "ConvertStringSidToSidA" ); - if( !pConvertStringSidToSidA ) + if( !pConvertSidToStringSidA || !pConvertStringSidToSidA ) + { + win_skip("ConvertSidToStringSidA or ConvertStringSidToSidA not available\n"); return; + } r = pConvertStringSidToSidA( NULL, NULL ); ok( !r, "expected failure with NULL parameters\n" ); @@ -4274,6 +4275,56 @@ static void test_kernel_objects_security(void) CloseHandle(token); } +static void test_TokenIntegrityLevel(void) +{ + TOKEN_MANDATORY_LABEL *tml; + BYTE buffer[64]; /* using max. 28 byte in win7 x64 */ + HANDLE token; + DWORD size; + DWORD res; + char *sidname = NULL; + static SID medium_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_HIGH_RID}}; + static SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_MEDIUM_RID}}; + + SetLastError(0xdeadbeef); + res = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(res, "got %d with %d (expected TRUE)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = GetTokenInformation(token, TokenIntegrityLevel, buffer, sizeof(buffer), &size); + + /* not supported before Vista */ + if (!res && (GetLastError() == ERROR_INVALID_PARAMETER)) + { + win_skip("TokenIntegrityLevel not supported\n"); + CloseHandle(token); + return; + } + + ok(res, "got %u with %u (expected TRUE)\n", res, GetLastError()); + if (!res) + { + CloseHandle(token); + return; + } + + tml = (TOKEN_MANDATORY_LABEL*) buffer; + ok(tml->Label.Attributes == (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED), + "got 0x%x (expected 0x%x)\n", tml->Label.Attributes, (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED)); + + SetLastError(0xdeadbeef); + res = pConvertSidToStringSidA(tml->Label.Sid, &sidname); + ok(res, "got %u and %u\n", res, GetLastError()); + + ok(EqualSid(tml->Label.Sid, &medium_level) || EqualSid(tml->Label.Sid, &high_level), + "got %s (expected 'S-1-16-8192' or 'S-1-16-12288')\n", sidname); + + LocalFree(sidname); + CloseHandle(token); +} + START_TEST(security) { init(); @@ -4311,4 +4362,5 @@ START_TEST(security) test_GetUserNameA(); test_GetUserNameW(); test_CreateRestrictedToken(); + test_TokenIntegrityLevel(); }

1 0

Detlef Riekenberg : ntdll: Support TokenIntegrityLevel.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 5c3e919b1080ad3f988467f49b530d9331ac3890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3e919b1080ad3f988467f49… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 30 18:08:34 2012 +0200 ntdll: Support TokenIntegrityLevel. --- dlls/ntdll/nt.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index cc35815..775b6f1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -276,7 +276,7 @@ NTSTATUS WINAPI NtQueryInformationToken( 0, /* TokenAccessInformation */ 0, /* TokenVirtualizationAllowed */ 0, /* TokenVirtualizationEnabled */ - 0, /* TokenIntegrityLevel */ + sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */ 0, /* TokenUIAccess */ 0, /* TokenMandatoryPolicy */ 0 /* TokenLogonSid */ @@ -507,6 +507,20 @@ NTSTATUS WINAPI NtQueryInformationToken( FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); } break; + case TokenIntegrityLevel: + { + /* report always "S-1-16-12288" (high mandatory level) for now */ + static const SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_HIGH_RID}}; + + TOKEN_MANDATORY_LABEL *tml = tokeninfo; + PSID psid = tml + 1; + + tml->Label.Sid = psid; + tml->Label.Attributes = SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED; + memcpy(psid, &high_level, sizeof(SID)); + } + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass);

1 0

Detlef Riekenberg : include: Add TOKEN_MANDATORY_LEVEL definitions.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: d5e5b43cec784f92a26fbfb8e6370e7d78cb4d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e5b43cec784f92a26fbfb8e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 30 18:08:33 2012 +0200 include: Add TOKEN_MANDATORY_LEVEL definitions. --- include/winnt.h | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b679017..c19eb47 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3748,13 +3748,16 @@ typedef struct _ACL_SIZE_INFORMATION #define SE_IMPERSONATE_NAME TEXT("SeImpersonatePrivilege") #define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege") -#define SE_GROUP_MANDATORY 0x00000001 -#define SE_GROUP_ENABLED_BY_DEFAULT 0x00000002 -#define SE_GROUP_ENABLED 0x00000004 -#define SE_GROUP_OWNER 0x00000008 -#define SE_GROUP_USE_FOR_DENY_ONLY 0x00000010 -#define SE_GROUP_LOGON_ID 0xC0000000 -#define SE_GROUP_RESOURCE 0x20000000 +#define SE_GROUP_MANDATORY 0x00000001 +#define SE_GROUP_ENABLED_BY_DEFAULT 0x00000002 +#define SE_GROUP_ENABLED 0x00000004 +#define SE_GROUP_OWNER 0x00000008 +#define SE_GROUP_USE_FOR_DENY_ONLY 0x00000010 +#define SE_GROUP_INTEGRITY 0x00000020 +#define SE_GROUP_INTEGRITY_ENABLED 0x00000040 +#define SE_GROUP_LOGON_ID 0xC0000000 +#define SE_GROUP_RESOURCE 0x20000000 +#define SE_GROUP_VALID_ATTRIBUTES 0xE000007F #define SE_PRIVILEGE_ENABLED_BY_DEFAULT 0x00000001 #define SE_PRIVILEGE_ENABLED 0x00000002 @@ -4228,6 +4231,9 @@ typedef struct _TOKEN_ELEVATION { DWORD TokenIsElevated; } TOKEN_ELEVATION, * PTOKEN_ELEVATION; +typedef struct _TOKEN_MANDATORY_LABEL { + SID_AND_ATTRIBUTES Label; +} TOKEN_MANDATORY_LABEL, * PTOKEN_MANDATORY_LABEL; /* * ACLs of NT

1 0

Alex Henrie : wininet: Support ICU_ENCODE_PERCENT, ICU_ENCODE_SPACES_ONLY, and ICU_NO_META.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 0b64d319c9190bbfaedd6ffd411bc9279f85e2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b64d319c9190bbfaedd6ffd4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 29 23:42:36 2012 -0600 wininet: Support ICU_ENCODE_PERCENT, ICU_ENCODE_SPACES_ONLY, and ICU_NO_META. --- dlls/wininet/internet.c | 92 ++++++++++++++++------------------------------ dlls/wininet/tests/url.c | 42 +++++++++++++++++++++ include/wininet.h | 1 + 3 files changed, 75 insertions(+), 60 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2b659da..9091ce8 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1963,6 +1963,32 @@ DWORD WINAPI InternetAttemptConnect(DWORD dwReserved) /*********************************************************************** + * convert_url_canonicalization_flags + * + * Helper for InternetCanonicalizeUrl + * + * PARAMS + * dwFlags [I] Flags suitable for InternetCanonicalizeUrl + * + * RETURNS + * Flags suitable for UrlCanonicalize + */ +static DWORD convert_url_canonicalization_flags(DWORD dwFlags) +{ + DWORD dwUrlFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE; + + if (dwFlags & ICU_BROWSER_MODE) dwUrlFlags |= URL_BROWSER_MODE; + if (dwFlags & ICU_DECODE) dwUrlFlags |= URL_UNESCAPE; + if (dwFlags & ICU_ENCODE_PERCENT) dwUrlFlags |= URL_ESCAPE_PERCENT; + if (dwFlags & ICU_ENCODE_SPACES_ONLY) dwUrlFlags |= URL_ESCAPE_SPACES_ONLY; + /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ + if (dwFlags & ICU_NO_ENCODE) dwUrlFlags ^= URL_ESCAPE_UNSAFE; + if (dwFlags & ICU_NO_META) dwUrlFlags |= URL_NO_META; + + return dwUrlFlags; +} + +/*********************************************************************** * InternetCanonicalizeUrlA (WININET.@) * * Escape unsafe characters and spaces @@ -1976,43 +2002,16 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer, LPDWORD lpdwBufferLength, DWORD dwFlags) { HRESULT hr; - DWORD dwURLFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE; TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_a(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); - if(dwFlags & ICU_DECODE) - { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_DECODE; - } - - if(dwFlags & ICU_ESCAPE) - { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_ESCAPE; - } - - if(dwFlags & ICU_BROWSER_MODE) - { - dwURLFlags |= URL_BROWSER_MODE; - dwFlags &= ~ICU_BROWSER_MODE; - } - - if(dwFlags & ICU_NO_ENCODE) - { - /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ - dwURLFlags ^= URL_ESCAPE_UNSAFE; - dwFlags &= ~ICU_NO_ENCODE; - } - - if (dwFlags) FIXME("Unhandled flags 0x%08x\n", dwFlags); - - hr = UrlCanonicalizeA(lpszUrl, lpszBuffer, lpdwBufferLength, dwURLFlags); + dwFlags = convert_url_canonicalization_flags(dwFlags); + hr = UrlCanonicalizeA(lpszUrl, lpszBuffer, lpdwBufferLength, dwFlags); if (hr == E_POINTER) SetLastError(ERROR_INSUFFICIENT_BUFFER); if (hr == E_INVALIDARG) SetLastError(ERROR_INVALID_PARAMETER); - return (hr == S_OK) ? TRUE : FALSE; + return hr == S_OK; } /*********************************************************************** @@ -2029,43 +2028,16 @@ BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR lpszUrl, LPWSTR lpszBuffer, LPDWORD lpdwBufferLength, DWORD dwFlags) { HRESULT hr; - DWORD dwURLFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE; TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_w(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); - if(dwFlags & ICU_DECODE) - { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_DECODE; - } - - if(dwFlags & ICU_ESCAPE) - { - dwURLFlags |= URL_UNESCAPE; - dwFlags &= ~ICU_ESCAPE; - } - - if(dwFlags & ICU_BROWSER_MODE) - { - dwURLFlags |= URL_BROWSER_MODE; - dwFlags &= ~ICU_BROWSER_MODE; - } - - if(dwFlags & ICU_NO_ENCODE) - { - /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */ - dwURLFlags ^= URL_ESCAPE_UNSAFE; - dwFlags &= ~ICU_NO_ENCODE; - } - - if (dwFlags) FIXME("Unhandled flags 0x%08x\n", dwFlags); - - hr = UrlCanonicalizeW(lpszUrl, lpszBuffer, lpdwBufferLength, dwURLFlags); + dwFlags = convert_url_canonicalization_flags(dwFlags); + hr = UrlCanonicalizeW(lpszUrl, lpszBuffer, lpdwBufferLength, dwFlags); if (hr == E_POINTER) SetLastError(ERROR_INSUFFICIENT_BUFFER); if (hr == E_INVALIDARG) SetLastError(ERROR_INVALID_PARAMETER); - return (hr == S_OK) ? TRUE : FALSE; + return hr == S_OK; } /* #################################################### */ diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index a391aa6..8559aae 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -1098,6 +1098,47 @@ static void InternetCreateUrlA_test(void) HeapFree(GetProcessHeap(), 0, szUrl); } +static void InternetCanonicalizeUrl_test(void) +{ + char src[] = "http://www.winehq.org/%27/ /./>/#> "; + char dst[64]; + DWORD dstlen; + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, 0); + ok(strcmp(dst, "http://www.winehq.org/%27/%20/%3E/#>") == 0, "Got \"%s\"\n", dst); + + /* despite what MSDN says, ICU_BROWSER_MODE seems to be ignored */ + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_BROWSER_MODE); + ok(strcmp(dst, "http://www.winehq.org/%27/%20/%3E/#>") == 0, "Got \"%s\"\n", dst); + + /* ICU_ESCAPE is supposed to be ignored */ + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_ESCAPE); + ok(strcmp(dst, "http://www.winehq.org/%27/%20/%3E/#>") == 0, "Got \"%s\"\n", dst); + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_DECODE); + ok(strcmp(dst, "http://www.winehq.org/'/%20/%3E/#>") == 0, "Got \"%s\"\n", dst); + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_ENCODE_PERCENT); + ok(strcmp(dst, "http://www.winehq.org/%2527/%20/%3E/#>") == 0, "Got \"%s\"\n", dst); + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_ENCODE_SPACES_ONLY); + ok(strcmp(dst, "http://www.winehq.org/%27/%20/>/#>") == 0, "Got \"%s\"\n", dst); + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_NO_ENCODE); + ok(strcmp(dst, "http://www.winehq.org/%27/ />/#>") == 0, "Got \"%s\"\n", dst); + + dstlen = sizeof(dst); + InternetCanonicalizeUrlA(src, dst, &dstlen, ICU_NO_META); + ok(strcmp(dst, "http://www.winehq.org/%27/%20/./%3E/#>") == 0, "Got \"%s\"\n", dst); +} + START_TEST(url) { int i; @@ -1113,4 +1154,5 @@ START_TEST(url) InternetCrackUrl_test(); InternetCrackUrlW_test(); InternetCreateUrlA_test(); + InternetCanonicalizeUrl_test(); } diff --git a/include/wininet.h b/include/wininet.h index 530a693..4c47902 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -421,6 +421,7 @@ BOOLAPI InternetCombineUrlW(LPCWSTR ,LPCWSTR ,LPWSTR ,LPDWORD ,DWORD); #define ICU_NO_META 0x08000000 #define ICU_ENCODE_SPACES_ONLY 0x04000000 #define ICU_BROWSER_MODE 0x02000000 +#define ICU_ENCODE_PERCENT 0x00001000 INTERNETAPI HINTERNET WINAPI InternetOpenA(LPCSTR ,DWORD ,LPCSTR ,LPCSTR ,DWORD); INTERNETAPI HINTERNET WINAPI InternetOpenW(LPCWSTR ,DWORD ,LPCWSTR ,LPCWSTR ,DWORD);

1 0

André Hentschel : winspool.drv: Update allowed driver version.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 882977eed95b4204927a555ab81263a4de2d6762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882977eed95b4204927a555ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 29 16:34:46 2012 +0200 winspool.drv: Update allowed driver version. --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index a86f6ef..6d051d6 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2581,8 +2581,8 @@ static void test_GetPrinterDriver(void) HANDLE hf; /* MSDN is wrong: The Drivers on the win9x-CD's have cVersion=0x0400 - NT351: 1, NT4.0+w2k(Kernelmode): 2, w2k and above(Usermode): 3 */ - ok( (di_2->cVersion <= 3) || + NT351: 1, NT4.0+w2k(Kernelmode): 2, w2k-win7(Usermode): 3, win8 and above(Usermode): 4 */ + ok( (di_2->cVersion <= 4) || (di_2->cVersion == 0x0400), "di_2->cVersion = %d\n", di_2->cVersion); ok(di_2->pName != NULL, "not expected NULL ptr\n"); ok(di_2->pEnvironment != NULL, "not expected NULL ptr\n");

1 0

Vincent Povirk : msi: Stub Migrate10CachedPackagesW.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: b8812afd333728c29561c5af7c9a7ebd39be6c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8812afd333728c29561c5af7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 30 14:34:20 2012 -0500 msi: Stub Migrate10CachedPackagesW. --- dlls/msi/msi.c | 6 ++++++ dlls/msi/msi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 973bebd..68e9f81 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4207,3 +4207,9 @@ UINT WINAPI MsiEndTransaction( DWORD state ) FIXME("%u\n", state); return ERROR_SUCCESS; } + +UINT WINAPI Migrate10CachedPackagesW(void* a, void* b, void* c, DWORD d) +{ + FIXME("%p,%p,%p,%08x\n", a, b, c, d); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 8dc884a..c1e6e7f 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -229,7 +229,7 @@ 233 stub MsiDeleteUserDataA 234 stub MsiDeleteUserDataW 235 stub Migrate10CachedPackagesA -236 stub Migrate10CachedPackagesW +236 stdcall Migrate10CachedPackagesW(ptr ptr ptr long) 237 stub MsiRemovePatchesA 238 stub MsiRemovePatchesW 239 stdcall MsiApplyMultiplePatchesA(str str str)

1 0

Detlef Riekenberg : wer: Return S_OK from the WerRepostSubmit stub.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: a7f9191af6f73e6e59aad10cc4d15d45ac2ff2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f9191af6f73e6e59aad10cc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jul 28 10:03:43 2012 +0200 wer: Return S_OK from the WerRepostSubmit stub. --- dlls/wer/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index a01479c..80880c3 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -366,7 +366,7 @@ HRESULT WINAPI WerReportSubmit(HREPORT hreport, WER_CONSENT consent, DWORD flags return E_INVALIDARG; *presult = WerDisabled; - return E_NOTIMPL; + return S_OK; } /***********************************************************************

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 15f5ad3af39c70d7bde315b406a5ad3ae9565655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f5ad3af39c70d7bde315b40… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Tue Jul 31 09:42:44 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 48140e5..bc75d8c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-07 00:06+0800\n" +"PO-Revision-Date: 2012-07-28 00:06+0800\n" "Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" "Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" "Language: Chinese (Taiwan)\n" @@ -3409,16 +3409,16 @@ msgid "Test Force Feedback" msgstr "測試應力回饋" #: joy.rc:63 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "可用格式" +msgstr "可用效果" #: joy.rc:65 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"請按下控制器中的任何按鈕以啟用所選的效果。效果的方向可以利用控制器的軸向來變" +"更。" #: joy.rc:28 msgid "Game Controllers" @@ -6894,7 +6894,7 @@ msgstr "表格" #: oleacc.rc:52 msgid "column header" -msgstr "欄首" +msgstr "行首" #: oleacc.rc:53 msgid "row header" @@ -6902,7 +6902,7 @@ msgstr "列首" #: oleacc.rc:54 msgid "column" -msgstr "欄" +msgstr "行" #: oleacc.rc:55 msgid "row" @@ -7231,27 +7231,27 @@ msgstr "正在掃描… 請稍候" #: sane.rc:31 msgctxt "unit: pixels" msgid "px" -msgstr "px" +msgstr "像素" #: sane.rc:32 msgctxt "unit: bits" msgid "b" -msgstr "b" +msgstr "位元" #: sane.rc:34 winecfg.rc:174 msgctxt "unit: dots/inch" msgid "dpi" -msgstr "dpi" +msgstr "點/英吋" #: sane.rc:35 msgctxt "unit: percent" msgid "%" -msgstr "%" +msgstr "百分比" #: sane.rc:36 msgctxt "unit: microseconds" msgid "us" -msgstr "µs" +msgstr "微秒" #: serialui.rc:25 msgid "Settings for %s" @@ -7446,7 +7446,7 @@ msgstr "列(&R)" #: shdoclc.rc:104 msgid "&Column" -msgstr "欄(&O)" +msgstr "行(&O)" #: shdoclc.rc:105 msgid "&Table" @@ -11439,7 +11439,7 @@ msgstr "暫停(&P)" #: taskmgr.rc:68 taskmgr.rc:256 msgid "&Select Columns..." -msgstr "選擇欄(&S)…" +msgstr "選擇行(&S)…" #: taskmgr.rc:69 taskmgr.rc:258 msgid "&CPU History" @@ -11753,12 +11753,12 @@ msgstr "CPU 31" #: taskmgr.rc:514 msgid "Select Columns" -msgstr "選擇顯示欄" +msgstr "選擇顯示行" #: taskmgr.rc:519 msgid "" "Select the columns that will appear on the Process page of the Task Manager." -msgstr "請選擇工作管理員中進程分頁的顯示欄。" +msgstr "請選擇工作管理員中進程分頁的顯示行。" #: taskmgr.rc:521 msgid "&Image Name" @@ -11954,7 +11954,7 @@ msgstr "顯示 16-位元工作及有關的ntvdm.exe" #: taskmgr.rc:216 msgid "Select which columns will be visible on the Process page" -msgstr "選擇在進程分頁的顯示欄" +msgstr "選擇在進程分頁的顯示行" #: taskmgr.rc:217 msgid "Displays kernel time in the performance graphs" @@ -13394,11 +13394,11 @@ msgstr "Copyright 2000 Joshua Thielen" #: winhlp32.rc:32 msgid "Printer &setup..." -msgstr "印表機設定(&S)..." +msgstr "印表機設定(&S)…" #: winhlp32.rc:39 msgid "&Annotate..." -msgstr "註釋(&A)..." +msgstr "註釋(&A)…" #: winhlp32.rc:41 msgid "&Bookmark" @@ -13406,7 +13406,7 @@ msgstr "書籤(&B)" #: winhlp32.rc:42 msgid "&Define..." -msgstr "定義(&D)..." +msgstr "定義(&D)…" #: winhlp32.rc:46 winhlp32.rc:67 msgid "Fonts" @@ -13438,7 +13438,7 @@ msgstr "關於 Wine 說明(&A)" #: winhlp32.rc:64 msgid "Annotation..." -msgstr "註釋..." +msgstr "註釋…" #: winhlp32.rc:65 msgid "Copy"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012