wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

André Hentschel : iphlpapi/tests: Add simple tests for the Get*StatisticsEx functions.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: d2581e6229f94571193c96ffd6819faf6228a868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2581e6229f94571193c96ffd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 27 22:11:07 2012 +0200 iphlpapi/tests: Add simple tests for the Get*StatisticsEx functions. --- dlls/iphlpapi/tests/iphlpapi.c | 231 ++++++++++++++++++++++++++++++++++++++++ include/ipmib.h | 13 +++ 2 files changed, 244 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2581e6229f94571193c9…

1 0

André Hentschel : winapi: Remove ALPHA from the architecture list.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 50e7090a005294428b2420d51de6a85a98d4c2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e7090a005294428b2420d51… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 27 21:40:55 2012 +0200 winapi: Remove ALPHA from the architecture list. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 04d52a1..2ce998f 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -279,7 +279,7 @@ sub parse_spec_file($$) { } my $ordinal; - my $ARCHES="alpha|arm|i386|powerpc|sparc|win32|win64|x86_64"; + my $ARCHES="arm|i386|powerpc|sparc|win32|win64|x86_64"; if(/^(\d+|@)\s+ (cdecl|pascal|stdcall|varargs|thiscall)\s+ ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x)

1 0

André Hentschel : wine.inf: Start the spool service when needed.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: f9d91a7dc49e423eacdaf16a9eb1b34b3a41e052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d91a7dc49e423eacdaf16a9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 27 19:18:06 2012 +0200 wine.inf: Start the spool service when needed. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 463ecfd..0002b9f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3001,7 +3001,7 @@ Description="Loads files to memory for later printing" DisplayName="Print Spooler" ServiceBinary="%11%\spoolsv.exe" ServiceType=0x110 -StartType=4 +StartType=3 ErrorControl=1 LoadOrderGroup="SpoolerGroup"

1 0

André Hentschel : rpcrt4: Avoid shadowing pProcHeader.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: fc2c0160fb0bffd8716de1a6dcdf27d51d81fd8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2c0160fb0bffd8716de1a6d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 27 17:13:44 2012 +0200 rpcrt4: Avoid shadowing pProcHeader. --- dlls/rpcrt4/ndr_es.c | 6 +++--- dlls/rpcrt4/ndr_stubless.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index cd0967d..7381181 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -348,9 +348,9 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { - const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; - stack_size = pProcHeader->stack_size; - pEsMsg->ProcNumber = pProcHeader->proc_num; + const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; + stack_size = header_rpc->stack_size; + pEsMsg->ProcNumber = header_rpc->proc_num; pFormat += sizeof(NDR_PROC_HEADER_RPC); } else diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 88aae7a..db41a1a 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -626,9 +626,9 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { - const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; - stack_size = pProcHeader->stack_size; - procedure_number = pProcHeader->proc_num; + const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; + stack_size = header_rpc->stack_size; + procedure_number = header_rpc->proc_num; pFormat += sizeof(NDR_PROC_HEADER_RPC); } else @@ -1231,8 +1231,8 @@ LONG WINAPI NdrStubCall2( if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { - const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; - stack_size = pProcHeader->stack_size; + const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; + stack_size = header_rpc->stack_size; pFormat += sizeof(NDR_PROC_HEADER_RPC); } @@ -1519,9 +1519,9 @@ LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { - const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; - async_call_data->stack_size = pProcHeader->stack_size; - procedure_number = pProcHeader->proc_num; + const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; + async_call_data->stack_size = header_rpc->stack_size; + procedure_number = header_rpc->proc_num; pFormat += sizeof(NDR_PROC_HEADER_RPC); } else

1 0

Jeff Muizelaar : gdi32: Improve performance of common case of AlphaBlend.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 2da2f001cf56f99d6575170c4755e20ce1fa4d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da2f001cf56f99d6575170c4… Author: Jeff Muizelaar <jmuizelaar(a)mozilla.com> Date: Sat Apr 28 11:29:40 2012 -0400 gdi32: Improve performance of common case of AlphaBlend. --- dlls/gdi32/dibdrv/primitives.c | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 21381ec..85e04e9 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -3776,7 +3776,7 @@ static inline BYTE blend_color(BYTE dst, BYTE src, DWORD alpha) return (src * alpha + dst * (255 - alpha) + 127) / 255; } -static inline DWORD blend_argb( DWORD dst, DWORD src, DWORD alpha ) +static inline DWORD blend_argb_constant_alpha( DWORD dst, DWORD src, DWORD alpha ) { return (blend_color( dst, src, alpha ) | blend_color( dst >> 8, src >> 8, alpha ) << 8 | @@ -3784,6 +3784,18 @@ static inline DWORD blend_argb( DWORD dst, DWORD src, DWORD alpha ) blend_color( dst >> 24, src >> 24, alpha ) << 24); } +static inline DWORD blend_argb( DWORD dst, DWORD src ) +{ + BYTE b = (BYTE)src; + BYTE g = (BYTE)(src >> 8); + BYTE r = (BYTE)(src >> 16); + DWORD alpha = (BYTE)(src >> 24); + return ((b + ((BYTE)dst * (255 - alpha) + 127) / 255) | + (g + ((BYTE)(dst >> 8) * (255 - alpha) + 127) / 255) << 8 | + (r + ((BYTE)(dst >> 16) * (255 - alpha) + 127) / 255) << 16 | + (alpha + ((BYTE)(dst >> 24) * (255 - alpha) + 127) / 255) << 24); +} + static inline DWORD blend_argb_alpha( DWORD dst, DWORD src, DWORD alpha ) { BYTE b = ((BYTE)src * alpha + 127) / 255; @@ -3822,13 +3834,20 @@ static void blend_rect_8888(const dib_info *dst, const RECT *rc, int x, y; if (blend.AlphaFormat & AC_SRC_ALPHA) - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) - for (x = 0; x < rc->right - rc->left; x++) - dst_ptr[x] = blend_argb_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); + { + if (blend.SourceConstantAlpha == 255) + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + for (x = 0; x < rc->right - rc->left; x++) + dst_ptr[x] = blend_argb( dst_ptr[x], src_ptr[x] ); + else + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + for (x = 0; x < rc->right - rc->left; x++) + dst_ptr[x] = blend_argb_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); + } else - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) - for (x = 0; x < rc->right - rc->left; x++) - dst_ptr[x] = blend_argb( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + for (x = 0; x < rc->right - rc->left; x++) + dst_ptr[x] = blend_argb_constant_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); } static void blend_rect_32(const dib_info *dst, const RECT *rc,

1 0

Austin English : user32: Make a few more functions hotpatchable.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 6f40cb83e95137ccf118c8cefd7f9e0c867caac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f40cb83e95137ccf118c8cef… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 30 12:16:29 2012 -0500 user32: Make a few more functions hotpatchable. --- dlls/user32/nonclient.c | 4 ++-- dlls/user32/win.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 82a571d..08ce674 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -367,7 +367,7 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, /*********************************************************************** * AdjustWindowRect (USER32.@) */ -BOOL WINAPI AdjustWindowRect( LPRECT rect, DWORD style, BOOL menu ) +BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRect( LPRECT rect, DWORD style, BOOL menu ) { return AdjustWindowRectEx( rect, style, menu, 0 ); } @@ -376,7 +376,7 @@ BOOL WINAPI AdjustWindowRect( LPRECT rect, DWORD style, BOOL menu ) /*********************************************************************** * AdjustWindowRectEx (USER32.@) */ -BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exStyle ) +BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exStyle ) { if (style & WS_ICONIC) return TRUE; style &= ~(WS_HSCROLL | WS_VSCROLL); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 1cad8aa..cc8461a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2413,7 +2413,7 @@ WORD WINAPI SetWindowWord( HWND hwnd, INT offset, WORD newval ) * * See SetWindowLongW. */ -LONG WINAPI SetWindowLongA( HWND hwnd, INT offset, LONG newval ) +LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval ) { return WIN_SetWindowLong( hwnd, offset, sizeof(LONG), newval, FALSE ); }

1 0

Piotr Caban : kernel32/tests: Added IdnToUnicode tests.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 30aea19e3b1166fecc2fd6a7a7b1e7debd18942c URL: http://source.winehq.org/git/wine.git/?a=commit;h=30aea19e3b1166fecc2fd6a7a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 30 17:28:20 2012 +0200 kernel32/tests: Added IdnToUnicode tests. --- dlls/kernel32/tests/locale.c | 82 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 033da36..3216ef9 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -78,6 +78,7 @@ static INT (WINAPI *pFoldStringW)(DWORD, LPCWSTR, INT, LPWSTR, INT); static BOOL (WINAPI *pIsValidLanguageGroup)(LGRPID, DWORD); static INT (WINAPI *pIdnToNameprepUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pIdnToAscii)(DWORD, LPCWSTR, INT, LPWSTR, INT); +static INT (WINAPI *pIdnToUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void InitFunctionPointers(void) { @@ -93,6 +94,7 @@ static void InitFunctionPointers(void) pEnumSystemLocalesEx = (void*)GetProcAddress(hKernel32, "EnumSystemLocalesEx"); pIdnToNameprepUnicode = (void*)GetProcAddress(hKernel32, "IdnToNameprepUnicode"); pIdnToAscii = (void*)GetProcAddress(hKernel32, "IdnToAscii"); + pIdnToUnicode = (void*)GetProcAddress(hKernel32, "IdnToUnicode"); } #define eq(received, expected, label, type) \ @@ -3033,7 +3035,12 @@ static void test_IdnToAscii(void) 35, {'x','n','-','-','b','e','a','2','a','1','6','3','1','a','v','b','a', 'v','4','4','t','y','h','a','3','2','b','9','1','e','g','s','2','t',0}, 0, 0xdeadbeef - } + }, + { + 2, {0x221,0}, + 8, {'x','n','-','-','6','l','a',0}, + IDN_ALLOW_UNASSIGNED, 0xdeadbeef + }, }; WCHAR buf[1024]; @@ -3058,6 +3065,78 @@ static void test_IdnToAscii(void) } } +static void test_IdnToUnicode(void) +{ + struct { + DWORD in_len; + const WCHAR in[64]; + DWORD ret; + const WCHAR out[64]; + DWORD flags; + DWORD err; + } test_data[] = { + { + 5, {'T','e','s','.',0}, + 5, {'T','e','s','.',0}, + 0, 0xdeadbeef + }, + { + 2, {0x105,0}, + 0, {0}, + 0, ERROR_INVALID_NAME + }, + { + 33, {'x','n','-','-','4','d','b','c','a','g','d','a','h','y','m','b', + 'x','e','k','h','e','h','6','e','0','a','7','f','e','i','0','b',0}, + 23, {0x05dc,0x05de,0x05d4,0x05d4,0x05dd,0x05e4,0x05e9,0x05d5,0x05d8, + 0x05dc,0x05d0,0x05de,0x05d3,0x05d1,0x05e8,0x05d9,0x05dd,0x05e2, + 0x05d1,0x05e8,0x05d9,0x05ea,0}, + 0, 0xdeadbeef + }, + { + 34, {'t','e','s','t','.','x','n','-','-','k','d','a','9','a','g','5','e', + '9','j','n','f','s','j','.','x','n','-','-','p','d','-','f','n','a'}, + 16, {'t','e','s','t','.',0x0105,0x0119,0x015b,0x0107, + 0x0142,0x00f3,0x017c,'.','p',0x0119,'d'}, + 0, 0xdeadbeef + }, + { + 64, {'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a', + 'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a', + 'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a', + 'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a'}, + 0, {0}, + 0, ERROR_INVALID_NAME + }, + { + 8, {'x','n','-','-','6','l','a',0}, + 2, {0x221,0}, + IDN_ALLOW_UNASSIGNED, 0xdeadbeef + }, + }; + + WCHAR buf[1024]; + DWORD i, ret, err; + + if (!pIdnToUnicode) + { + win_skip("IdnToUnicode is not available\n"); + return; + } + + for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) + { + SetLastError(0xdeadbeef); + ret = pIdnToUnicode(test_data[i].flags, test_data[i].in, + test_data[i].in_len, buf, sizeof(buf)); + err = GetLastError(); + ok(ret == test_data[i].ret, "%d) ret = %d\n", i, ret); + ok(err == test_data[i].err, "%d) err = %d\n", i, err); + ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), + "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -3087,6 +3166,7 @@ START_TEST(locale) test_GetStringTypeW(); test_IdnToNameprepUnicode(); test_IdnToAscii(); + test_IdnToUnicode(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Piotr Caban : kernel32: Added IdnToUnicode implementation.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: e2f0463963c45e06789454e1bebc0a71800fe48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f0463963c45e06789454e1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 30 17:28:08 2012 +0200 kernel32: Added IdnToUnicode implementation. --- dlls/kernel32/locale.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 146 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index fbc3ae2..b506f15 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4263,8 +4263,151 @@ INT WINAPI IdnToNameprepUnicode(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cch INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, LPWSTR lpUnicodeCharStr, INT cchUnicodeChar) { - FIXME("%x %p %d %p %d\n", dwFlags, lpASCIICharStr, cchASCIIChar, + extern const unsigned short nameprep_char_type[]; + + INT i, label_start, label_end, out_label, out = 0; + WCHAR ch; + + TRACE("%x %p %d %p %d\n", dwFlags, lpASCIICharStr, cchASCIIChar, lpUnicodeCharStr, cchUnicodeChar); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + + for(label_start=0; label_start<cchASCIIChar;) { + INT n = INIT_N, pos = 0, old_pos, w, k, bias = INIT_BIAS, delim=0, digit, t; + + out_label = out; + for(i=label_start; i<cchASCIIChar; i++) { + ch = lpASCIICharStr[i]; + + if(ch>0x7f || (i!=cchASCIIChar-1 && !ch)) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if(!ch || ch=='.') + break; + if(ch == '-') + delim = i; + + if((dwFlags&IDN_USE_STD3_ASCII_RULES) == 0) + continue; + if((ch>='a' && ch<='z') || (ch>='A' && ch<='Z') + || (ch>='0' && ch<='9') || ch=='-') + continue; + + SetLastError(ERROR_INVALID_NAME); + return 0; + } + label_end = i; + /* last label may be empty */ + if(label_start==label_end && ch) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if((dwFlags&IDN_USE_STD3_ASCII_RULES) && (lpUnicodeCharStr[label_start]=='-' || + lpUnicodeCharStr[label_end-1]=='-')) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + if(label_end-label_start > 63) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if(label_end-label_start<4 || + tolowerW(lpASCIICharStr[label_start])!='x' || + tolowerW(lpASCIICharStr[label_start+1])!='n' || + lpASCIICharStr[label_start+2]!='-' || lpASCIICharStr[label_start+3]!='-') { + if(label_end < cchUnicodeChar) + label_end++; + + if(!lpUnicodeCharStr) { + out += label_end-label_start; + }else if(out+label_end-label_start <= cchUnicodeChar) { + memcpy(lpUnicodeCharStr+out, lpASCIICharStr+label_start, + (label_end-label_start)*sizeof(WCHAR)); + out += label_end-label_start; + }else { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + + label_start = label_end; + continue; + } + + if(delim == label_start+3) + delim++; + if(!lpUnicodeCharStr) { + out += delim-label_start-4; + }else if(out+delim-label_start-4 <= cchUnicodeChar) { + memcpy(lpUnicodeCharStr+out, lpASCIICharStr+label_start+4, + (delim-label_start-4)*sizeof(WCHAR)); + out += delim-label_start-4; + }else { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if(out != out_label) + delim++; + + for(i=delim; i<label_end;) { + old_pos = pos; + w = 1; + for(k=BASE; ; k+=BASE) { + ch = i<label_end ? tolowerW(lpASCIICharStr[i++]) : 0; + if((ch<'a' || ch>'z') && (ch<'0' || ch>'9')) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + digit = ch<='9' ? ch-'0'+'z'-'a'+1 : ch-'a'; + pos += digit*w; + t = k<=bias ? TMIN : k>=bias+TMAX ? TMAX : k-bias; + if(digit < t) + break; + w *= BASE-t; + } + bias = adapt(pos-old_pos, out-out_label+1, old_pos==0); + n += pos/(out-out_label+1); + pos %= out-out_label+1; + + if((dwFlags&IDN_ALLOW_UNASSIGNED)==0 && + get_table_entry(nameprep_char_type, n)==1/*UNASSIGNED*/) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + if(!lpUnicodeCharStr) { + out++; + }else if(out+1 <= cchASCIIChar) { + memmove(lpUnicodeCharStr+out_label+pos+1, + lpUnicodeCharStr+out_label+pos, + (out-out_label-pos)*sizeof(WCHAR)); + lpUnicodeCharStr[out_label+pos] = n; + out++; + }else { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + pos++; + } + + if(out-out_label > 63) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if(label_end < cchASCIIChar) { + if(!lpUnicodeCharStr) { + out++; + }else if(out+1 <= cchUnicodeChar) { + lpUnicodeCharStr[out++] = lpASCIICharStr[label_end]; + }else { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + } + label_start = label_end+1; + } + + return out; }

1 0

Piotr Caban : kernel32/tests: Added IdnToAscii tests.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 03b58f580c537f189ef0226801fbab2adac5caf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b58f580c537f189ef022680… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 30 17:27:56 2012 +0200 kernel32/tests: Added IdnToAscii tests. --- dlls/kernel32/locale.c | 5 ++- dlls/kernel32/tests/locale.c | 68 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 73eebd4..fbc3ae2 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3938,7 +3938,8 @@ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeCha INT delta = 0, b = 0, h; out_label = out; - for(i=label_start; i<norm_len && norm_str[i]!='.' && norm_str[i]!='\0'; i++) + for(i=label_start; i<norm_len && norm_str[i]!='.' && + norm_str[i]!=0x3002 && norm_str[i]!='\0'; i++) if(norm_str[i] < 0x80) b++; label_end = i; @@ -4027,7 +4028,7 @@ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeCha if(!lpASCIICharStr) { out++; }else if(out+1 <= cchASCIIChar) { - lpASCIICharStr[out++] = norm_str[label_end]; + lpASCIICharStr[out++] = norm_str[label_end] ? '.' : 0; }else { HeapFree(GetProcessHeap(), 0, norm_str); SetLastError(ERROR_INSUFFICIENT_BUFFER); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index bec24fa..033da36 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -77,6 +77,7 @@ static INT (WINAPI *pFoldStringA)(DWORD, LPCSTR, INT, LPSTR, INT); static INT (WINAPI *pFoldStringW)(DWORD, LPCWSTR, INT, LPWSTR, INT); static BOOL (WINAPI *pIsValidLanguageGroup)(LGRPID, DWORD); static INT (WINAPI *pIdnToNameprepUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); +static INT (WINAPI *pIdnToAscii)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void InitFunctionPointers(void) { @@ -91,6 +92,7 @@ static void InitFunctionPointers(void) pEnumUILanguagesA = (void*)GetProcAddress(hKernel32, "EnumUILanguagesA"); pEnumSystemLocalesEx = (void*)GetProcAddress(hKernel32, "EnumSystemLocalesEx"); pIdnToNameprepUnicode = (void*)GetProcAddress(hKernel32, "IdnToNameprepUnicode"); + pIdnToAscii = (void*)GetProcAddress(hKernel32, "IdnToAscii"); } #define eq(received, expected, label, type) \ @@ -2991,6 +2993,71 @@ static void test_IdnToNameprepUnicode(void) } } +static void test_IdnToAscii(void) +{ + struct { + DWORD in_len; + const WCHAR in[64]; + DWORD ret; + const WCHAR out[64]; + DWORD flags; + DWORD err; + } test_data[] = { + { + 5, {'T','e','s','t',0}, + 5, {'T','e','s','t',0}, + 0, 0xdeadbeef + }, + { + 5, {'T','e',0x017c,'s','t',0}, + 12, {'x','n','-','-','t','e','s','t','-','c','b','b',0}, + 0, 0xdeadbeef + }, + { + 12, {'t','e',0x0105,'s','t','.','t','e',0x017c,'s','t',0}, + 26, {'x','n','-','-','t','e','s','t','-','c','t','a','.','x','n','-','-','t','e','s','t','-','c','b','b',0}, + 0, 0xdeadbeef + }, + { + 3, {0x0105,'.',0}, + 9, {'x','n','-','-','2','d','a','.',0}, + 0, 0xdeadbeef + }, + { + 10, {'h','t','t','p',':','/','/','t',0x0106,0}, + 17, {'x','n','-','-','h','t','t','p',':','/','/','t','-','7','8','a',0}, + 0, 0xdeadbeef + }, + { + 10, {0x4e3a,0x8bf4,0x4e0d,0x4ed6,0x5011,0x10d,0x11b,0x305c,0x306a,0}, + 35, {'x','n','-','-','b','e','a','2','a','1','6','3','1','a','v','b','a', + 'v','4','4','t','y','h','a','3','2','b','9','1','e','g','s','2','t',0}, + 0, 0xdeadbeef + } + }; + + WCHAR buf[1024]; + DWORD i, ret, err; + + if (!pIdnToAscii) + { + win_skip("IdnToAscii is not available\n"); + return; + } + + for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) + { + SetLastError(0xdeadbeef); + ret = pIdnToAscii(test_data[i].flags, test_data[i].in, + test_data[i].in_len, buf, sizeof(buf)); + err = GetLastError(); + ok(ret == test_data[i].ret, "%d) ret = %d\n", i, ret); + ok(err == test_data[i].err, "%d) err = %d\n", i, err); + ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), + "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -3019,6 +3086,7 @@ START_TEST(locale) test_GetCPInfo(); test_GetStringTypeW(); test_IdnToNameprepUnicode(); + test_IdnToAscii(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Piotr Caban : kernel32: Added IdnToAscii implementation.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 04ad71ee05a76507906b5e4f064bf9e0d2b0bb62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ad71ee05a76507906b5e4f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 30 17:27:46 2012 +0200 kernel32: Added IdnToAscii implementation. --- dlls/kernel32/locale.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 151 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e546000..73eebd4 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3881,16 +3881,164 @@ BOOL WINAPI IsNormalizedString(NORM_FORM NormForm, LPCWSTR lpString, INT cwLengt return FALSE; } +enum { + BASE = 36, + TMIN = 1, + TMAX = 26, + SKEW = 38, + DAMP = 700, + INIT_BIAS = 72, + INIT_N = 128 +}; + +static inline INT adapt(INT delta, INT numpoints, BOOL firsttime) +{ + INT k; + + delta /= (firsttime ? DAMP : 2); + delta += delta/numpoints; + + for(k=0; delta>((BASE-TMIN)*TMAX)/2; k+=BASE) + delta /= BASE-TMIN; + return k+((BASE-TMIN+1)*delta)/(delta+SKEW); +} + /****************************************************************************** * IdnToAscii (KERNEL32.@) + * Implementation of Punycode based on RFC 3492. */ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeChar, LPWSTR lpASCIICharStr, INT cchASCIIChar) { - FIXME("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, + static const WCHAR prefixW[] = {'x','n','-','-'}; + + WCHAR *norm_str; + INT i, label_start, label_end, norm_len, out_label, out = 0; + + TRACE("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, lpASCIICharStr, cchASCIIChar); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + + norm_len = IdnToNameprepUnicode(dwFlags, lpUnicodeCharStr, cchUnicodeChar, NULL, 0); + if(!norm_len) + return 0; + norm_str = HeapAlloc(GetProcessHeap(), 0, norm_len*sizeof(WCHAR)); + if(!norm_str) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + norm_len = IdnToNameprepUnicode(dwFlags, lpUnicodeCharStr, + cchUnicodeChar, norm_str, norm_len); + if(!norm_len) { + HeapFree(GetProcessHeap(), 0, norm_str); + return 0; + } + + for(label_start=0; label_start<norm_len;) { + INT n = INIT_N, bias = INIT_BIAS; + INT delta = 0, b = 0, h; + + out_label = out; + for(i=label_start; i<norm_len && norm_str[i]!='.' && norm_str[i]!='\0'; i++) + if(norm_str[i] < 0x80) + b++; + label_end = i; + + if(b == label_end-label_start) { + if(label_end < norm_len) + b++; + if(!lpASCIICharStr) { + out += b; + }else if(out+b <= cchASCIIChar) { + memcpy(lpASCIICharStr+out, norm_str+label_start, b*sizeof(WCHAR)); + out += b; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + label_start = label_end+1; + continue; + } + + if(!lpASCIICharStr) { + out += 5+b; /* strlen(xn--...-) */ + }else if(out+5+b <= cchASCIIChar) { + memcpy(lpASCIICharStr+out, prefixW, sizeof(prefixW)); + out += 4; + for(i=label_start; i<label_end; i++) + if(norm_str[i] < 0x80) + lpASCIICharStr[out++] = norm_str[i]; + lpASCIICharStr[out++] = '-'; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if(!b) + out--; + + for(h=b; h<label_end-label_start;) { + INT m = 0xffff, q, k; + + for(i=label_start; i<label_end; i++) { + if(norm_str[i]>=n && m>norm_str[i]) + m = norm_str[i]; + } + delta += (m-n)*(h+1); + n = m; + + for(i=label_start; i<label_end; i++) { + if(norm_str[i] < n) { + delta++; + }else if(norm_str[i] == n) { + for(q=delta, k=BASE; ; k+=BASE) { + INT t = k<=bias ? TMIN : k>=bias+TMAX ? TMAX : k-bias; + INT disp = q<t ? q : t+(q-t)%(BASE-t); + if(!lpASCIICharStr) { + out++; + }else if(out+1 <= cchASCIIChar) { + lpASCIICharStr[out++] = disp<='z'-'a' ? + 'a'+disp : '0'+disp-'z'+'a'-1; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if(q < t) + break; + q = (q-t)/(BASE-t); + } + bias = adapt(delta, h+1, h==b); + delta = 0; + h++; + } + } + delta++; + n++; + } + + if(out-out_label > 63) { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if(label_end < norm_len) { + if(!lpASCIICharStr) { + out++; + }else if(out+1 <= cchASCIIChar) { + lpASCIICharStr[out++] = norm_str[label_end]; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + } + label_start = label_end+1; + } + + HeapFree(GetProcessHeap(), 0, norm_str); + return out; } /******************************************************************************

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 April 2012