June 2016 - Wine-Commits - list.winehq.org

Huw Davies : include: Add flags for the EM_AUTOURLDETECT message.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 0bdf9e5817497784bf9a791c4fe34fc73b7af5f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bdf9e5817497784bf9a791c4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 12:35:36 2016 +0100 include: Add flags for the EM_AUTOURLDETECT message. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/richedit.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/richedit.h b/include/richedit.h index ce2c145..f0ae57e 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -1070,6 +1070,14 @@ typedef struct _settextex { #define ST_NEWCHARS 0x00000004 #define ST_UNICODE 0x00000008 +/* Flags for EM_AUTOURLDETECT message */ +#define AURL_ENABLEURL 0x00000001 +#define AURL_ENABLEMAILADDR 0x00000002 +#define AURL_ENABLETELNO 0x00000004 +#define AURL_ENABLEEAURLS 0x00000008 +#define AURL_ENABLEDRIVELETTERS 0x00000010 +#define AURL_DISABLEMIXEDLGC 0x00000020 + #ifdef __cplusplus } #endif

1 0

Hans Leidekker : webservices: Add support for encoded UTF-8 characters in WsDecodeUrl.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 20686f47af224e9b5d56909213aa3670cdcf75c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20686f47af224e9b5d5690921… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 1 12:37:19 2016 +0200 webservices: Add support for encoded UTF-8 characters in WsDecodeUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/url.c | 7 ++- dlls/webservices/url.c | 106 ++++++++++++++++++++++++++++++------------- 2 files changed, 79 insertions(+), 34 deletions(-) diff --git a/dlls/webservices/tests/url.c b/dlls/webservices/tests/url.c index 3e11b5c..82059a0 100644 --- a/dlls/webservices/tests/url.c +++ b/dlls/webservices/tests/url.c @@ -54,8 +54,10 @@ static void test_WsDecodeUrl(void) '%','2','0','2',0}; static WCHAR url26[] = {'h','t','t','p',':','/','/','h','o','s','t','#','f','r','a','g', '%','2','0','2',0}; + static WCHAR url27[] = {'h','t','t','p',':','/','/','h','o','s','t','/','%','c','3','%','a','b','/',0}; static WCHAR host2[] = {'h','o','s','t',' ','2'}; static WCHAR path2[] = {'/','p','a','t','h',' ','2'}; + static WCHAR path3[] = {'/',0xeb,'/'}; static WCHAR query2[] = {'q','u','e','r','y',' ','2'}; static WCHAR frag2[] = {'f','r','a','g',' ','2'}; static const struct @@ -103,8 +105,9 @@ static void test_WsDecodeUrl(void) url22 + 12, 4 }, { url23, S_OK, WS_URL_HTTP_SCHEME_TYPE, host2, 6, 80 }, { url24, S_OK, WS_URL_HTTP_SCHEME_TYPE, url24 + 7, 4, 80, NULL, 0, path2, 7 }, - { url25, S_OK, WS_URL_HTTP_SCHEME_TYPE, url24 + 7, 4, 80, NULL, 0, NULL, 0, query2, 7 }, - { url26, S_OK, WS_URL_HTTP_SCHEME_TYPE, url24 + 7, 4, 80, NULL, 0, NULL, 0, NULL, 0, frag2, 6 }, + { url25, S_OK, WS_URL_HTTP_SCHEME_TYPE, url25 + 7, 4, 80, NULL, 0, NULL, 0, query2, 7 }, + { url26, S_OK, WS_URL_HTTP_SCHEME_TYPE, url26 + 7, 4, 80, NULL, 0, NULL, 0, NULL, 0, frag2, 6 }, + { url27, S_OK, WS_URL_HTTP_SCHEME_TYPE, url27 + 7, 4, 80, NULL, 0, path3, 3 }, }; WS_HEAP *heap; WS_STRING str; diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 6951cd6..d28c669 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -71,11 +71,36 @@ static USHORT default_port( WS_URL_SCHEME_TYPE scheme ) } } +static unsigned char *strdup_utf8( const WCHAR *str, ULONG len, ULONG *ret_len ) +{ + unsigned char *ret; + *ret_len = WideCharToMultiByte( CP_UTF8, 0, str, len, NULL, 0, NULL, NULL ); + if ((ret = heap_alloc( *ret_len ))) + WideCharToMultiByte( CP_UTF8, 0, str, len, (char *)ret, *ret_len, NULL, NULL ); + return ret; +} + +static inline int url_decode_byte( char c1, char c2 ) +{ + int ret; + + if (c1 >= '0' && c1 <= '9') ret = (c1 - '0') * 16; + else if (c1 >= 'a' && c1 <= 'f') ret = (c1 - 'a' + 10) * 16; + else ret = (c1 - 'A' + 10) * 16; + + if (c2 >= '0' && c2 <= '9') ret += c2 - '0'; + else if (c2 >= 'a' && c2 <= 'f') ret += c2 - 'a' + 10; + else ret += c2 - 'A' + 10; + + return ret; +} + static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) { WCHAR *p = str, *q, *ret; - BOOL decode = FALSE; - ULONG i, val; + BOOL decode = FALSE, convert = FALSE; + ULONG i, len_utf8, len_left; + unsigned char *utf8, *r; *ret_len = len; for (i = 0; i < len; i++, p++) @@ -84,36 +109,62 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) if (p[0] == '%' && isxdigitW( p[1] ) && isxdigitW( p[2] )) { decode = TRUE; + if (url_decode_byte( p[1], p[2] ) > 159) + { + convert = TRUE; + break; + } *ret_len -= 2; } } if (!decode) return str; - - if (!(q = ret = ws_alloc( heap, *ret_len * sizeof(WCHAR) ))) return NULL; - p = str; - while (len) + if (!convert) { - if (len >= 3 && p[0] == '%' && isxdigitW( p[1] ) && isxdigitW( p[2] )) + if (!(q = ret = ws_alloc( heap, *ret_len * sizeof(WCHAR) ))) return NULL; + p = str; + while (len) { - if (p[1] >= '0' && p[1] <= '9') val = (p[1] - '0') * 16; - else if (p[1] >= 'a' && p[1] <= 'f') val = (p[1] - 'a') * 16; - else val = (p[1] - 'A') * 16; - - if (p[2] >= '0' && p[2] <= '9') val += p[2] - '0'; - else if (p[1] >= 'a' && p[1] <= 'f') val += p[2] - 'a'; - else val += p[1] - 'A'; - - *q++ = val; - p += 3; - len -= 3; + if (len >= 3 && p[0] == '%' && isxdigitW( p[1] ) && isxdigitW( p[2] )) + { + *q++ = url_decode_byte( p[1], p[2] ); + p += 3; + len -= 3; + } + else + { + *q++ = *p++; + len -= 1; + } } - else + return ret; + } + + if (!(r = utf8 = strdup_utf8( str, len, &len_utf8 ))) return NULL; + len_left = len_utf8; + while (len_left) + { + if (len_left >= 3 && r[0] == '%' && isxdigit( r[1] ) && isxdigit( r[2] )) { - *q++ = *p++; - len -= 1; + r[0] = url_decode_byte( r[1], r[2] ); + len_left -= 3; + memmove( r + 1, r + 3, len_left ); + len_utf8 -= 2; } + else len_left -= 1; + r++; + } + + if (!(*ret_len = MultiByteToWideChar( CP_UTF8, MB_ERR_INVALID_CHARS, (char *)utf8, + len_utf8, NULL, 0 ))) + { + WARN( "invalid UTF-8 sequence\n" ); + heap_free( utf8 ); + return NULL; } + if ((ret = ws_alloc( heap, *ret_len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_UTF8, 0, (char *)utf8, len_utf8, ret, *ret_len ); + heap_free( utf8 ); return ret; } @@ -276,20 +327,11 @@ static inline ULONG escape_size( unsigned char ch, const char *except ) } } -static char *strdup_utf8( const WCHAR *str, ULONG len, ULONG *ret_len ) -{ - char *ret; - *ret_len = WideCharToMultiByte( CP_UTF8, 0, str, len, NULL, 0, NULL, NULL ); - if ((ret = heap_alloc( *ret_len ))) - WideCharToMultiByte( CP_UTF8, 0, str, len, ret, *ret_len, NULL, NULL ); - return ret; -} - static HRESULT url_encode_size( const WCHAR *str, ULONG len, const char *except, ULONG *ret_len ) { ULONG i, len_utf8; BOOL convert = FALSE; - char *utf8; + unsigned char *utf8; *ret_len = 0; for (i = 0; i < len; i++) @@ -339,7 +381,7 @@ static HRESULT url_encode( const WCHAR *str, ULONG len, WCHAR *buf, const char * ULONG i, len_utf8, len_enc; BOOL convert = FALSE; WCHAR *p = buf; - char *utf8; + unsigned char *utf8; *ret_len = 0; for (i = 0; i < len; i++)

1 0

Alexandre Julliard : makefiles: Remove some obsolete import libraries.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: e76142d055f96abe3f501ca8d5737af4abeabac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76142d055f96abe3f501ca8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 1 15:16:10 2016 +0900 makefiles: Remove some obsolete import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 ++++++++-------- configure.ac | 16 ++++++++-------- dlls/crtdll/Makefile.in | 1 - dlls/ctl3d32/Makefile.in | 1 - dlls/d3dim/Makefile.in | 1 - dlls/dmusic32/Makefile.in | 1 - dlls/dplay/Makefile.in | 1 - dlls/msvcrt20/Makefile.in | 1 - dlls/msvcrt40/Makefile.in | 1 - dlls/serialui/Makefile.in | 1 - 10 files changed, 16 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 9d0663a..432e501 100755 --- a/configure +++ b/configure @@ -17537,7 +17537,7 @@ wine_fn_config_dll comsvcs enable_comsvcs implib wine_fn_config_dll connect enable_connect wine_fn_config_dll credui enable_credui clean,implib wine_fn_config_test dlls/credui/tests credui_test -wine_fn_config_dll crtdll enable_crtdll implib +wine_fn_config_dll crtdll enable_crtdll wine_fn_config_dll crypt32 enable_crypt32 clean,implib wine_fn_config_test dlls/crypt32/tests crypt32_test wine_fn_config_dll cryptdlg enable_cryptdlg clean @@ -17549,7 +17549,7 @@ wine_fn_config_dll cryptui enable_cryptui clean,implib wine_fn_config_test dlls/cryptui/tests cryptui_test wine_fn_config_dll ctapi32 enable_ctapi32 wine_fn_config_dll ctl3d.dll16 enable_win16 -wine_fn_config_dll ctl3d32 enable_ctl3d32 implib +wine_fn_config_dll ctl3d32 enable_ctl3d32 wine_fn_config_dll ctl3dv2.dll16 enable_win16 wine_fn_config_dll d2d1 enable_d2d1 implib wine_fn_config_test dlls/d2d1/tests d2d1_test @@ -17579,7 +17579,7 @@ wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 implib d3dcompiler wine_fn_config_test dlls/d3dcompiler_43/tests d3dcompiler_43_test wine_fn_config_dll d3dcompiler_46 enable_d3dcompiler_46 wine_fn_config_dll d3dcompiler_47 enable_d3dcompiler_47 -wine_fn_config_dll d3dim enable_d3dim implib +wine_fn_config_dll d3dim enable_d3dim wine_fn_config_dll d3drm enable_d3drm implib wine_fn_config_test dlls/d3drm/tests d3drm_test wine_fn_config_dll d3dx10_33 enable_d3dx10_33 @@ -17656,10 +17656,10 @@ wine_fn_config_dll dmsynth enable_dmsynth clean wine_fn_config_test dlls/dmsynth/tests dmsynth_test wine_fn_config_dll dmusic enable_dmusic clean wine_fn_config_test dlls/dmusic/tests dmusic_test -wine_fn_config_dll dmusic32 enable_dmusic32 implib +wine_fn_config_dll dmusic32 enable_dmusic32 wine_fn_config_dll dnsapi enable_dnsapi implib wine_fn_config_test dlls/dnsapi/tests dnsapi_test -wine_fn_config_dll dplay enable_dplay implib +wine_fn_config_dll dplay enable_dplay wine_fn_config_dll dplayx enable_dplayx clean,implib wine_fn_config_test dlls/dplayx/tests dplayx_test wine_fn_config_dll dpnaddr enable_dpnaddr @@ -17868,8 +17868,8 @@ wine_fn_config_dll msvcr90 enable_msvcr90 implib wine_fn_config_test dlls/msvcr90/tests msvcr90_test wine_fn_config_dll msvcrt enable_msvcrt implib wine_fn_config_test dlls/msvcrt/tests msvcrt_test -wine_fn_config_dll msvcrt20 enable_msvcrt20 implib -wine_fn_config_dll msvcrt40 enable_msvcrt40 implib +wine_fn_config_dll msvcrt20 enable_msvcrt20 +wine_fn_config_dll msvcrt40 enable_msvcrt40 wine_fn_config_dll msvcrtd enable_msvcrtd implib wine_fn_config_test dlls/msvcrtd/tests msvcrtd_test wine_fn_config_dll msvfw32 enable_msvfw32 clean,implib @@ -17990,7 +17990,7 @@ wine_fn_config_dll secur32 enable_secur32 implib wine_fn_config_test dlls/secur32/tests secur32_test wine_fn_config_dll security enable_security wine_fn_config_dll sensapi enable_sensapi implib -wine_fn_config_dll serialui enable_serialui clean,implib +wine_fn_config_dll serialui enable_serialui clean wine_fn_config_test dlls/serialui/tests serialui_test wine_fn_config_dll setupapi enable_setupapi clean,implib wine_fn_config_test dlls/setupapi/tests setupapi_test diff --git a/configure.ac b/configure.ac index e42e35d..bf3fb1f 100644 --- a/configure.ac +++ b/configure.ac @@ -2783,7 +2783,7 @@ WINE_CONFIG_DLL(comsvcs,,[implib]) WINE_CONFIG_DLL(connect) WINE_CONFIG_DLL(credui,,[clean,implib]) WINE_CONFIG_TEST(dlls/credui/tests) -WINE_CONFIG_DLL(crtdll,,[implib]) +WINE_CONFIG_DLL(crtdll) WINE_CONFIG_DLL(crypt32,,[clean,implib]) WINE_CONFIG_TEST(dlls/crypt32/tests) WINE_CONFIG_DLL(cryptdlg,,[clean]) @@ -2795,7 +2795,7 @@ WINE_CONFIG_DLL(cryptui,,[clean,implib]) WINE_CONFIG_TEST(dlls/cryptui/tests) WINE_CONFIG_DLL(ctapi32) WINE_CONFIG_DLL(ctl3d.dll16,enable_win16) -WINE_CONFIG_DLL(ctl3d32,,[implib]) +WINE_CONFIG_DLL(ctl3d32) WINE_CONFIG_DLL(ctl3dv2.dll16,enable_win16) WINE_CONFIG_DLL(d2d1,,[implib]) WINE_CONFIG_TEST(dlls/d2d1/tests) @@ -2825,7 +2825,7 @@ WINE_CONFIG_DLL(d3dcompiler_43,,[implib],[d3dcompiler]) WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) WINE_CONFIG_DLL(d3dcompiler_46) WINE_CONFIG_DLL(d3dcompiler_47) -WINE_CONFIG_DLL(d3dim,,[implib]) +WINE_CONFIG_DLL(d3dim) WINE_CONFIG_DLL(d3drm,,[implib]) WINE_CONFIG_TEST(dlls/d3drm/tests) WINE_CONFIG_DLL(d3dx10_33) @@ -2902,10 +2902,10 @@ WINE_CONFIG_DLL(dmsynth,,[clean]) WINE_CONFIG_TEST(dlls/dmsynth/tests) WINE_CONFIG_DLL(dmusic,,[clean]) WINE_CONFIG_TEST(dlls/dmusic/tests) -WINE_CONFIG_DLL(dmusic32,,[implib]) +WINE_CONFIG_DLL(dmusic32) WINE_CONFIG_DLL(dnsapi,,[implib]) WINE_CONFIG_TEST(dlls/dnsapi/tests) -WINE_CONFIG_DLL(dplay,,[implib]) +WINE_CONFIG_DLL(dplay) WINE_CONFIG_DLL(dplayx,,[clean,implib]) WINE_CONFIG_TEST(dlls/dplayx/tests) WINE_CONFIG_DLL(dpnaddr) @@ -3114,8 +3114,8 @@ WINE_CONFIG_DLL(msvcr90,,[implib]) WINE_CONFIG_TEST(dlls/msvcr90/tests) WINE_CONFIG_DLL(msvcrt,,[implib]) WINE_CONFIG_TEST(dlls/msvcrt/tests) -WINE_CONFIG_DLL(msvcrt20,,[implib]) -WINE_CONFIG_DLL(msvcrt40,,[implib]) +WINE_CONFIG_DLL(msvcrt20) +WINE_CONFIG_DLL(msvcrt40) WINE_CONFIG_DLL(msvcrtd,,[implib]) WINE_CONFIG_TEST(dlls/msvcrtd/tests) WINE_CONFIG_DLL(msvfw32,,[clean,implib]) @@ -3236,7 +3236,7 @@ WINE_CONFIG_DLL(secur32,,[implib]) WINE_CONFIG_TEST(dlls/secur32/tests) WINE_CONFIG_DLL(security) WINE_CONFIG_DLL(sensapi,,[implib]) -WINE_CONFIG_DLL(serialui,,[clean,implib]) +WINE_CONFIG_DLL(serialui,,[clean]) WINE_CONFIG_TEST(dlls/serialui/tests) WINE_CONFIG_DLL(setupapi,,[clean,implib]) WINE_CONFIG_TEST(dlls/setupapi/tests) diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index 3d99961..cc10afb 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -1,5 +1,4 @@ MODULE = crtdll.dll -IMPORTLIB = crtdll IMPORTS = msvcrt C_SRCS = \ diff --git a/dlls/ctl3d32/Makefile.in b/dlls/ctl3d32/Makefile.in index b5deb1f..eb4b2ba 100644 --- a/dlls/ctl3d32/Makefile.in +++ b/dlls/ctl3d32/Makefile.in @@ -1,5 +1,4 @@ MODULE = ctl3d32.dll -IMPORTLIB = ctl3d32 IMPORTS = user32 C_SRCS = ctl3d32.c diff --git a/dlls/d3dim/Makefile.in b/dlls/d3dim/Makefile.in index b0e2881..d1334bb 100644 --- a/dlls/d3dim/Makefile.in +++ b/dlls/d3dim/Makefile.in @@ -1,5 +1,4 @@ MODULE = d3dim.dll -IMPORTLIB = d3dim C_SRCS = d3dim_main.c diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in index 6aa72b7..0b0e250 100644 --- a/dlls/dmusic32/Makefile.in +++ b/dlls/dmusic32/Makefile.in @@ -1,5 +1,4 @@ MODULE = dmusic32.dll -IMPORTLIB = dmusic32 IMPORTS = uuid C_SRCS = \ diff --git a/dlls/dplay/Makefile.in b/dlls/dplay/Makefile.in index 7b5da87..b13c0c0 100644 --- a/dlls/dplay/Makefile.in +++ b/dlls/dplay/Makefile.in @@ -1,5 +1,4 @@ MODULE = dplay.dll -IMPORTLIB = dplay IMPORTS = dplayx RC_SRCS = version.rc diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in index b8a8f63..17861a6 100644 --- a/dlls/msvcrt20/Makefile.in +++ b/dlls/msvcrt20/Makefile.in @@ -1,6 +1,5 @@ EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt20.dll -IMPORTLIB = msvcrt20 IMPORTS = msvcrt C_SRCS = msvcrt20.c diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 6c2df22..57bca5b 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -1,6 +1,5 @@ EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt40.dll -IMPORTLIB = msvcrt40 IMPORTS = msvcrt C_SRCS = \ diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 9ac3707..6c22afd 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -1,5 +1,4 @@ MODULE = serialui.dll -IMPORTLIB = serialui IMPORTS = user32 advapi32 C_SRCS = \

1 0

Nikolay Sivov : include: Added missing ASSOCF enum members.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 784a74c93326f58c3dd222634abfafe9b0f439fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=784a74c93326f58c3dd222634… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 21:06:24 2016 +0300 include: Added missing ASSOCF enum members. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 20 ++++++++++---------- include/shlwapi.h | 28 ++++++++++++++++------------ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index c425038..67f7d32 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -109,10 +109,10 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok_(__FILE__, line)(hr == S_OK, "failed to create IQueryAssociations, 0x%x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, assocName, progIdKey, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, assocName, progIdKey, NULL); ok_(__FILE__, line)(hr == S_OK, "IQueryAssociations::Init failed, 0x%x\n", hr); - hr = IQueryAssociations_GetString(assoc, 0, str, NULL, NULL, &len); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, NULL, &len); if (hr != S_FALSE) { if (expected_string) { ok_(__FILE__, line)(SUCCEEDED(hr), "GetString returned 0x%x, expected success\n", hr); @@ -123,7 +123,7 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); - hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, buffer, &len); if (expected_string) { ok_(__FILE__, line)(lstrcmpW(buffer, expected_string) == 0, "GetString returned %s, expected %s\n", @@ -182,11 +182,11 @@ static void test_IQueryAssociations_GetString(void) hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, httpW, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, httpW, NULL, NULL); ok(hr == S_OK, "Init failed, 0x%x\n", hr); len = 0; - hr = IQueryAssociations_GetString(assoc, 0, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(len > 0, "got wrong needed length, %d\n", len); @@ -195,7 +195,7 @@ static void test_IQueryAssociations_GetString(void) WCHAR buffW[MAX_PATH]; DWORD len; - hr = IQueryAssociations_Init(assoc, 0, ptr->key, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, ptr->key, NULL, NULL); ok(hr == S_OK, "%d: Init failed, 0x%x\n", i, hr); len = ptr->len; @@ -232,17 +232,17 @@ static void test_IQueryAssociations_Init(void) hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, NULL, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "Init failed, 0x%08x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, httpW, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, httpW, NULL, NULL); ok(hr == S_OK, "Init failed, 0x%08x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, badW, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, badW, NULL, NULL); ok(hr == S_OK || broken(hr == S_FALSE) /* pre-vista */, "Init failed, 0x%08x\n", hr); len = 0; - hr = IQueryAssociations_GetString(assoc, 0, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || broken(hr == E_FAIL) /* pre-vista */, "got 0x%08x\n", hr); IQueryAssociations_Release(assoc); diff --git a/include/shlwapi.h b/include/shlwapi.h index e3b14b3..4c91c1c 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -210,18 +210,22 @@ int WINAPI SHRegGetIntW(HKEY,LPCWSTR,int); /* IQueryAssociation and helpers */ enum { - ASSOCF_INIT_NOREMAPCLSID = 0x001, /* Don't map clsid->progid */ - ASSOCF_INIT_BYEXENAME = 0x002, /* .exe name given */ - ASSOCF_OPEN_BYEXENAME = 0x002, /* Synonym */ - ASSOCF_INIT_DEFAULTTOSTAR = 0x004, /* Use * as base */ - ASSOCF_INIT_DEFAULTTOFOLDER = 0x008, /* Use folder as base */ - ASSOCF_NOUSERSETTINGS = 0x010, /* No HKCU reads */ - ASSOCF_NOTRUNCATE = 0x020, /* Don't truncate return */ - ASSOCF_VERIFY = 0x040, /* Verify data */ - ASSOCF_REMAPRUNDLL = 0x080, /* Get rundll args */ - ASSOCF_NOFIXUPS = 0x100, /* Don't fixup errors */ - ASSOCF_IGNOREBASECLASS = 0x200, /* Don't read baseclass */ - ASSOCF_INIT_IGNOREUNKNOWN = 0x400, /* Fail for unknown progid */ + ASSOCF_NONE = 0x0000, + ASSOCF_INIT_NOREMAPCLSID = 0x0001, /* Don't map clsid->progid */ + ASSOCF_INIT_BYEXENAME = 0x0002, /* .exe name given */ + ASSOCF_OPEN_BYEXENAME = 0x0002, /* Synonym */ + ASSOCF_INIT_DEFAULTTOSTAR = 0x0004, /* Use * as base */ + ASSOCF_INIT_DEFAULTTOFOLDER = 0x0008, /* Use folder as base */ + ASSOCF_NOUSERSETTINGS = 0x0010, /* No HKCU reads */ + ASSOCF_NOTRUNCATE = 0x0020, /* Don't truncate return */ + ASSOCF_VERIFY = 0x0040, /* Verify data */ + ASSOCF_REMAPRUNDLL = 0x0080, /* Get rundll args */ + ASSOCF_NOFIXUPS = 0x0100, /* Don't fixup errors */ + ASSOCF_IGNOREBASECLASS = 0x0200, /* Don't read baseclass */ + ASSOCF_INIT_IGNOREUNKNOWN = 0x0400, /* Fail for unknown progid */ + ASSOCF_INIT_FIXED_PROGID = 0x0800, /* Used passed string as progid, don't try to map it */ + ASSOCF_IS_PROTOCOL = 0x1000, /* Treat as protocol, that should be mapped */ + ASSOCF_INIT_FOR_FILE = 0x2000, /* progid is for file extension association */ }; typedef DWORD ASSOCF;

1 0

Jacek Caban : wininet: Correctly handle the last proxy override in HTTP_ShouldBypassProxy.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: fff5dca78786060e8c9741fa7d41b153b937be6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff5dca78786060e8c9741fa7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 19:42:53 2016 +0200 wininet: Correctly handle the last proxy override in HTTP_ShouldBypassProxy. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ed5105d..a468a84 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1771,7 +1771,7 @@ static BOOL HTTP_ShouldBypassProxy(appinfo_t *lpwai, LPCWSTR server) if (!ptr) ptr = strchrW( tmp, ' ' ); if (!ptr) - ptr = tmp + strlenW(ptr); + ptr = tmp + strlenW(tmp); ret = HTTP_DomainMatches( server, substr(tmp, ptr-tmp) ); if (ret || !*ptr) break;

1 0

Nikolay Sivov : gdiplus/tests: Fix a font leak (Valgrind).
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: b18ecadef70725a9b70807554a0b785a202bb644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18ecadef70725a9b70807554… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 30 22:52:50 2016 +0300 gdiplus/tests: Fix a font leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 39b539b..1b442cc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -781,6 +781,7 @@ static void test_font_substitution(void) expect(Ok, status); strcpy(fallback_font,lf.lfFaceName); trace("fallback font %s\n", fallback_font); + GdipDeleteFont(font); lstrcpyA(lf.lfFaceName, "ThisFontShouldNotExist"); status = GdipCreateFontFromLogfontA(hdc, &lf, &font);

1 0

Józef Kucia : d3d10core/tests: Add test for input assembler.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 40e36b79eee80d777fa1f083172d72689a80e51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e36b79eee80d777fa1f0831… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 31 23:29:52 2016 +0200 d3d10core/tests: Add test for input assembler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 356 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40e36b79eee80d777fa1f…

1 0

Józef Kucia : d3d11/tests: Add test for input assembler.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 846b3ac60c39e364b86e5933fb81915d7195695b URL: http://source.winehq.org/git/wine.git/?a=commit;h=846b3ac60c39e364b86e5933f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 31 23:29:51 2016 +0200 d3d11/tests: Add test for input assembler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 358 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=846b3ac60c39e364b86e5…

1 0

Józef Kucia : wined3d: Use pure integer vertex attributes for SM4+ shaders.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 4dfd79d336902f98eafd4c77dc2a0a8381fa033e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfd79d336902f98eafd4c77d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 31 23:29:50 2016 +0200 wined3d: Use pure integer vertex attributes for SM4+ shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 33 +++++++++++++++++++++++++++ dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/state.c | 56 ++++++++++++++++++++++++++-------------------- include/wine/wined3d.h | 9 +++++++- 5 files changed, 77 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dfd79d336902f98eafd4…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 947fbfee68ef517e1c191bd6833d80c717ea530d URL: http://source.winehq.org/git/wine.git/?a=commit;h=947fbfee68ef517e1c191bd68… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 1 11:19:34 2016 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index ef6db29..d8f4c6f 100644 --- a/po/de.po +++ b/po/de.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: 2016-05-10 18:09+0200\n" +"PO-Revision-Date: 2016-06-01 11:19+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -11626,6 +11626,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Aufruf:\n" +" REG [Operation] [Parameter]\n" +"\n" +"Unterstützte Operationen:\n" +" ADD | DELETE | QUERY\n" +"\n" +"Hilfe für eine spezifische Operation:\n" +" REG [Operation] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11729,24 +11738,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Suche abgeschlossen. Gefundene Übereinstimmungen: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: Ungültiger Schlüsselname\n" +msgstr "reg: Ungültige Syntax. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "Uninstaller: Ungültige Option [%1]\n" +msgstr "reg: Ungültige Option [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Geben Sie \"REG /?\" ein, um Hilfe zu erhalten.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Geben Sie \"REG %1 /?\" ein, um Hilfe zu erhalten.\n" #: regedit.rc:34 msgid "&Registry"

1 0