- wine-devel - winehq.org

Re: [PATCH] webservices: Make alloc_float_text() static. (try2)
by Hans Leidekker 04 Jan '18

04 Jan '18

On Thu, 2018-01-04 at 16:04 +0100, Francois Gouget wrote: > I sent this patch back in september but I don't remember getting a reply > (I apologize if I forgot). It's possible the intention was to call this > function elsewhere at some point but it does not seem to have happened. > So I'm resubmitting. Here's my reply to that patch: http://wine.1045685.n8.nabble.com/Re-webservices-Make-alloc-float-text-stat…

1 0

[PATCH v3] msvcrt: _Gettnames() should respect user overrides.
by Zebediah Figura 04 Jan '18

04 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msvcrt/locale.c | 12 ++--- dlls/msvcrt/tests/locale.c | 122 +++++++++++++-------------------------------- 2 files changed, 40 insertions(+), 94 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6e16311..95fec0a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1493,6 +1493,8 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lc_handle[MSVCRT_LC_TIME] = old_locinfo->lc_handle[MSVCRT_LC_TIME]; locinfo->lc_id[MSVCRT_LC_TIME].wCodePage = old_locinfo->lc_id[MSVCRT_LC_TIME].wCodePage; } else { + DWORD flags = lcid[MSVCRT_LC_TIME] ? 0 : LOCALE_NOUSEROVERRIDE; + if(lcid[MSVCRT_LC_TIME] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_TIME)) { if(update_threadlocinfo_category(lcid[MSVCRT_LC_TIME], cp[MSVCRT_LC_TIME], locinfo, MSVCRT_LC_TIME)) { @@ -1515,16 +1517,14 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW); }else { - ret = GetLocaleInfoA(lcid_tmp, time_data[i] - |LOCALE_NOUSEROVERRIDE, NULL, 0); + ret = GetLocaleInfoA(lcid_tmp, time_data[i]|flags, NULL, 0); if(!ret) { free_locinfo(locinfo); return NULL; } size += ret; - ret = GetLocaleInfoW(lcid_tmp, time_data[i] - |LOCALE_NOUSEROVERRIDE, NULL, 0); + ret = GetLocaleInfoW(lcid_tmp, time_data[i]|flags, NULL, 0); if(!ret) { free_locinfo(locinfo); return NULL; @@ -1555,7 +1555,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, memcpy(&locinfo->lc_time_curr->data[ret], cloc_time, sizeof(cloc_time)); ret += sizeof(cloc_time); }else { - ret += GetLocaleInfoA(lcid_tmp, time_data[i]|LOCALE_NOUSEROVERRIDE, + ret += GetLocaleInfoA(lcid_tmp, time_data[i]|flags, &locinfo->lc_time_curr->data[ret], size-ret); } } @@ -1571,7 +1571,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, memcpy(&locinfo->lc_time_curr->data[ret], cloc_timeW, sizeof(cloc_timeW)); ret += sizeof(cloc_timeW); }else { - ret += GetLocaleInfoW(lcid_tmp, time_data[i]|LOCALE_NOUSEROVERRIDE, + ret += GetLocaleInfoW(lcid_tmp, time_data[i]|flags, (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); } } diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 89761dd..f87a791 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -663,6 +663,24 @@ static void test_crtGetStringTypeW(void) static void test__Gettnames(void) { + static const DWORD time_data[] = { + LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, + LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, + LOCALE_SABBREVDAYNAME6, + LOCALE_SDAYNAME7, LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, + LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6, + LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3, + LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9, + LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12, + LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3, LOCALE_SMONTHNAME4, + LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6, LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, + LOCALE_SMONTHNAME9, LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12, + LOCALE_S1159, LOCALE_S2359, + LOCALE_SSHORTDATE, LOCALE_SLONGDATE, + LOCALE_STIMEFORMAT + }; + struct { char *str[43]; LCID lcid; @@ -672,6 +690,7 @@ static void test__Gettnames(void) } *ret; int size; char buf[64]; + int i; if(!setlocale(LC_ALL, "english")) return; @@ -686,100 +705,27 @@ static void test__Gettnames(void) else ok(size==0x164 || broken(size==0xb8), "structure size: %x\n", size); - ok(!strcmp(ret->str[0], "Sun"), "ret->str[0] = %s\n", ret->str[0]); - ok(!strcmp(ret->str[1], "Mon"), "ret->str[1] = %s\n", ret->str[1]); - ok(!strcmp(ret->str[2], "Tue"), "ret->str[2] = %s\n", ret->str[2]); - ok(!strcmp(ret->str[3], "Wed"), "ret->str[3] = %s\n", ret->str[3]); - ok(!strcmp(ret->str[4], "Thu"), "ret->str[4] = %s\n", ret->str[4]); - ok(!strcmp(ret->str[5], "Fri"), "ret->str[5] = %s\n", ret->str[5]); - ok(!strcmp(ret->str[6], "Sat"), "ret->str[6] = %s\n", ret->str[6]); - ok(!strcmp(ret->str[7], "Sunday"), "ret->str[7] = %s\n", ret->str[7]); - ok(!strcmp(ret->str[8], "Monday"), "ret->str[8] = %s\n", ret->str[8]); - ok(!strcmp(ret->str[9], "Tuesday"), "ret->str[9] = %s\n", ret->str[9]); - ok(!strcmp(ret->str[10], "Wednesday"), "ret->str[10] = %s\n", ret->str[10]); - ok(!strcmp(ret->str[11], "Thursday"), "ret->str[11] = %s\n", ret->str[11]); - ok(!strcmp(ret->str[12], "Friday"), "ret->str[12] = %s\n", ret->str[12]); - ok(!strcmp(ret->str[13], "Saturday"), "ret->str[13] = %s\n", ret->str[13]); - ok(!strcmp(ret->str[14], "Jan"), "ret->str[14] = %s\n", ret->str[14]); - ok(!strcmp(ret->str[15], "Feb"), "ret->str[15] = %s\n", ret->str[15]); - ok(!strcmp(ret->str[16], "Mar"), "ret->str[16] = %s\n", ret->str[16]); - ok(!strcmp(ret->str[17], "Apr"), "ret->str[17] = %s\n", ret->str[17]); - ok(!strcmp(ret->str[18], "May"), "ret->str[18] = %s\n", ret->str[18]); - ok(!strcmp(ret->str[19], "Jun"), "ret->str[19] = %s\n", ret->str[19]); - ok(!strcmp(ret->str[20], "Jul"), "ret->str[20] = %s\n", ret->str[20]); - ok(!strcmp(ret->str[21], "Aug"), "ret->str[21] = %s\n", ret->str[21]); - ok(!strcmp(ret->str[22], "Sep"), "ret->str[22] = %s\n", ret->str[22]); - ok(!strcmp(ret->str[23], "Oct"), "ret->str[23] = %s\n", ret->str[23]); - ok(!strcmp(ret->str[24], "Nov"), "ret->str[24] = %s\n", ret->str[24]); - ok(!strcmp(ret->str[25], "Dec"), "ret->str[25] = %s\n", ret->str[25]); - ok(!strcmp(ret->str[26], "January"), "ret->str[26] = %s\n", ret->str[26]); - ok(!strcmp(ret->str[27], "February"), "ret->str[27] = %s\n", ret->str[27]); - ok(!strcmp(ret->str[28], "March"), "ret->str[28] = %s\n", ret->str[28]); - ok(!strcmp(ret->str[29], "April"), "ret->str[29] = %s\n", ret->str[29]); - ok(!strcmp(ret->str[30], "May"), "ret->str[30] = %s\n", ret->str[30]); - ok(!strcmp(ret->str[31], "June"), "ret->str[31] = %s\n", ret->str[31]); - ok(!strcmp(ret->str[32], "July"), "ret->str[32] = %s\n", ret->str[32]); - ok(!strcmp(ret->str[33], "August"), "ret->str[33] = %s\n", ret->str[33]); - ok(!strcmp(ret->str[34], "September"), "ret->str[34] = %s\n", ret->str[34]); - ok(!strcmp(ret->str[35], "October"), "ret->str[35] = %s\n", ret->str[35]); - ok(!strcmp(ret->str[36], "November"), "ret->str[36] = %s\n", ret->str[36]); - ok(!strcmp(ret->str[37], "December"), "ret->str[37] = %s\n", ret->str[37]); - ok(!strcmp(ret->str[38], "AM"), "ret->str[38] = %s\n", ret->str[38]); - ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); - ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, - "ret->str[40] = %s\n", ret->str[40]); - size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), - LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, buf, sizeof(buf)); - ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); - ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); + for (i = 0; i < sizeof(time_data)/sizeof(time_data[0]); i++) + { + size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), + time_data[i], buf, sizeof(buf)); + ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf); + } + free(ret); if(!setlocale(LC_TIME, "german")) return; ret = _Gettnames(); - ok(!strcmp(ret->str[0], "So"), "ret->str[0] = %s\n", ret->str[0]); - ok(!strcmp(ret->str[1], "Mo"), "ret->str[1] = %s\n", ret->str[1]); - ok(!strcmp(ret->str[2], "Di"), "ret->str[2] = %s\n", ret->str[2]); - ok(!strcmp(ret->str[3], "Mi"), "ret->str[3] = %s\n", ret->str[3]); - ok(!strcmp(ret->str[4], "Do"), "ret->str[4] = %s\n", ret->str[4]); - ok(!strcmp(ret->str[5], "Fr"), "ret->str[5] = %s\n", ret->str[5]); - ok(!strcmp(ret->str[6], "Sa"), "ret->str[6] = %s\n", ret->str[6]); - ok(!strcmp(ret->str[7], "Sonntag"), "ret->str[7] = %s\n", ret->str[7]); - ok(!strcmp(ret->str[8], "Montag"), "ret->str[8] = %s\n", ret->str[8]); - ok(!strcmp(ret->str[9], "Dienstag"), "ret->str[9] = %s\n", ret->str[9]); - ok(!strcmp(ret->str[10], "Mittwoch"), "ret->str[10] = %s\n", ret->str[10]); - ok(!strcmp(ret->str[11], "Donnerstag"), "ret->str[11] = %s\n", ret->str[11]); - ok(!strcmp(ret->str[12], "Freitag"), "ret->str[12] = %s\n", ret->str[12]); - ok(!strcmp(ret->str[13], "Samstag"), "ret->str[13] = %s\n", ret->str[13]); - ok(!strcmp(ret->str[14], "Jan"), "ret->str[14] = %s\n", ret->str[14]); - ok(!strcmp(ret->str[15], "Feb"), "ret->str[15] = %s\n", ret->str[15]); - ok(!strcmp(ret->str[16], "Mrz"), "ret->str[16] = %s\n", ret->str[16]); - ok(!strcmp(ret->str[17], "Apr"), "ret->str[17] = %s\n", ret->str[17]); - ok(!strcmp(ret->str[18], "Mai"), "ret->str[18] = %s\n", ret->str[18]); - ok(!strcmp(ret->str[19], "Jun"), "ret->str[19] = %s\n", ret->str[19]); - ok(!strcmp(ret->str[20], "Jul"), "ret->str[20] = %s\n", ret->str[20]); - ok(!strcmp(ret->str[21], "Aug"), "ret->str[21] = %s\n", ret->str[21]); - ok(!strcmp(ret->str[22], "Sep"), "ret->str[22] = %s\n", ret->str[22]); - ok(!strcmp(ret->str[23], "Okt"), "ret->str[23] = %s\n", ret->str[23]); - ok(!strcmp(ret->str[24], "Nov"), "ret->str[24] = %s\n", ret->str[24]); - ok(!strcmp(ret->str[25], "Dez"), "ret->str[25] = %s\n", ret->str[25]); - ok(!strcmp(ret->str[26], "Januar"), "ret->str[26] = %s\n", ret->str[26]); - ok(!strcmp(ret->str[27], "Februar"), "ret->str[27] = %s\n", ret->str[27]); - ok(!strcmp(ret->str[29], "April"), "ret->str[29] = %s\n", ret->str[29]); - ok(!strcmp(ret->str[30], "Mai"), "ret->str[30] = %s\n", ret->str[30]); - ok(!strcmp(ret->str[31], "Juni"), "ret->str[31] = %s\n", ret->str[31]); - ok(!strcmp(ret->str[32], "Juli"), "ret->str[32] = %s\n", ret->str[32]); - ok(!strcmp(ret->str[33], "August"), "ret->str[33] = %s\n", ret->str[33]); - ok(!strcmp(ret->str[34], "September"), "ret->str[34] = %s\n", ret->str[34]); - ok(!strcmp(ret->str[35], "Oktober"), "ret->str[35] = %s\n", ret->str[35]); - ok(!strcmp(ret->str[36], "November"), "ret->str[36] = %s\n", ret->str[36]); - ok(!strcmp(ret->str[37], "Dezember"), "ret->str[37] = %s\n", ret->str[37]); - ok(!strcmp(ret->str[38], ""), "ret->str[38] = %s\n", ret->str[38]); - ok(!strcmp(ret->str[39], ""), "ret->str[39] = %s\n", ret->str[39]); - ok(!strcmp(ret->str[40], "dd.MM.yyyy") || broken(!strcmp(ret->str[40], "dd.MM.yy"))/*NT*/, - "ret->str[40] = %s\n", ret->str[40]); - ok(!strcmp(ret->str[41], "dddd, d. MMMM yyyy"), "ret->str[41] = %s\n", ret->str[41]); + for (i = 0; i < sizeof(time_data)/sizeof(time_data[0]); i++) + { + size = GetLocaleInfoA(MAKELCID(LANG_GERMAN, SORT_DEFAULT), + time_data[i], buf, sizeof(buf)); + ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf); + } free(ret); setlocale(LC_ALL, "C"); -- 2.7.4

2 1

[PATCH v2] winex11: Escape non-UTF-8 characters in string literals
by Alex Henrie 04 Jan '18

04 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Explicitly terminated the hexadecimal number when necessary. The revised script is: import re from sys import stdout in_escape_sequence = False for char in open('dlls/winex11.drv/keyboard.c', 'rb').read(): if char <= 0x7F: char = chr(char) if in_escape_sequence and re.fullmatch('[0-9a-fA-F]', char): stdout.write('""') stdout.write(char) in_escape_sequence = False else: stdout.write('\\' + hex(char)[1:]) in_escape_sequence = True dlls/winex11.drv/keyboard.c | 334 ++++++++++++++++++++++---------------------- 1 file changed, 167 insertions(+), 167 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 37e51b2592..62c115c8ca 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -275,7 +275,7 @@ static const char main_key_US_dvorak[MAIN_LEN][4] = /*** British keyboard layout */ static const char main_key_UK[MAIN_LEN][4] = { - "`","1!","2\"","3�","4$","5%","6^","7&","8*","9(","0)","-_","=+", + "`","1!","2\"","3\xa3","4$","5%","6^","7&","8*","9(","0)","-_","=+", "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}", "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'@","#~", "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", @@ -285,20 +285,20 @@ static const char main_key_UK[MAIN_LEN][4] = /*** French keyboard layout (setxkbmap fr) */ static const char main_key_FR[MAIN_LEN][4] = { - "�","&1","�2","\"3","'4","(5","-6","�7","_8","�9","�0",")�","=+", - "aA","zZ","eE","rR","tT","yY","uU","iI","oO","pP","^�","$�", - "qQ","sS","dD","fF","gG","hH","jJ","kK","lL","mM","�%","*�", - "wW","xX","cC","vV","bB","nN",",?",";.",":/","!�", + "\xb2","&1","\xe9""2","\"3","'4","(5","-6","\xe8""7","_8","\xe7""9","\xe0""0",")\xb0","=+", + "aA","zZ","eE","rR","tT","yY","uU","iI","oO","pP","^\xa8","$\xa3", + "qQ","sS","dD","fF","gG","hH","jJ","kK","lL","mM","\xf9%","*\xb5", + "wW","xX","cC","vV","bB","nN",",?",";.",":/","!\xa7", "<>" }; /*** Icelandic keyboard layout (setxkbmap is) */ static const char main_key_IS[MAIN_LEN][4] = { - "�","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","��","-_", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","'?", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","+*", - "zZ","xX","cC","vV","bB","nN","mM",",;",".:","��", + "\xb0","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","\xf6\xd6","-_", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xf0\xd0","'?", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe6\xc6","\xb4\xc4","+*", + "zZ","xX","cC","vV","bB","nN","mM",",;",".:","\xfe\xde", "<>" }; @@ -319,9 +319,9 @@ static const char main_key_IS[MAIN_LEN][4] = /*** German keyboard layout (setxkbmap de [-variant nodeadkeys|deadacute etc.]) */ static const char main_key_DE[MAIN_LEN][4] = { - "^�","1!","2\"","3�","4$","5%","6&","7/","8(","9)","0=","�?","", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","+*", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","#'", + "^\xb0","1!","2\"","3\xa7","4$","5%","6&","7/","8(","9)","0=","\xdf?","", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -329,9 +329,9 @@ static const char main_key_DE[MAIN_LEN][4] = /*** Swiss German keyboard layout (setxkbmap ch -variant de) */ static const char main_key_SG[MAIN_LEN][4] = { - "��","1+","2\"","3*","4�","5%","6&","7/","8(","9)","0=","'?","^`", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","�!", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","$�", + "\xa7\xb0","1+","2\"","3*","4\xe7","5%","6&","7/","8(","9)","0=","'?","^`", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xe8","\xa8!", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xe9","\xe4\xe0","$\xa3", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -339,19 +339,19 @@ static const char main_key_SG[MAIN_LEN][4] = /*** Swiss French keyboard layout (setxkbmap ch -variant fr) */ static const char main_key_SF[MAIN_LEN][4] = { - "��","1+","2\"","3*","4�","5%","6&","7/","8(","9)","0=","'?","^`", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","�!", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","$�", + "\xa7\xb0","1+","2\"","3*","4\xe7","5%","6&","7/","8(","9)","0=","'?","^`", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xe8\xfc","\xa8!", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe9\xf6","\xe0\xe4","$\xa3", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; -/*** Norwegian keyboard layout (contributed by Ove K�ven) */ +/*** Norwegian keyboard layout (contributed by Ove Kåven) */ static const char main_key_NO[MAIN_LEN][4] = { - "|�","1!","2\"@","3#�","4�$","5%","6&","7/{","8([","9)]","0=}","+?","\\`�", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","�^~", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","'*", + "|\xa7","1!","2\"@","3#\xa3","4\xa4$","5%","6&","7/{","8([","9)]","0=}","+?","\\`\xb4", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xe5\xc5","\xa8^~", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf8\xd8","\xe6\xc6","'*", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -359,9 +359,9 @@ static const char main_key_NO[MAIN_LEN][4] = /*** Danish keyboard layout (setxkbmap dk) */ static const char main_key_DA[MAIN_LEN][4] = { - "��","1!","2\"","3#","4�","5%","6&","7/","8(","9)","0=","+?","�`", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","�^", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","'*", + "\xbd\xa7","1!","2\"","3#","4\xa4","5%","6&","7/","8(","9)","0=","+?","\xb4`", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xe5\xc5","\xa8^", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe6\xc6","\xf8\xd8","'*", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -369,9 +369,9 @@ static const char main_key_DA[MAIN_LEN][4] = /*** Swedish keyboard layout (setxkbmap se) */ static const char main_key_SE[MAIN_LEN][4] = { - "��","1!","2\"","3#","4�","5%","6&","7/","8(","9)","0=","+?","�`", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","�^", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","'*", + "\xa7\xbd","1!","2\"","3#","4\xa4","5%","6&","7/","8(","9)","0=","+?","\xb4`", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xe5\xc5","\xa8^", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","'*", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -379,9 +379,9 @@ static const char main_key_SE[MAIN_LEN][4] = /*** Estonian keyboard layout (setxkbmap ee) */ static const char main_key_ET[MAIN_LEN][4] = { - "�~","1!","2\"","3#","4�","5%","6&","7/","8(","9)","0=","+?","�`", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","��", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","'*", + "\xb7~","1!","2\"","3#","4\xa4","5%","6&","7/","8(","9)","0=","+?","\xb4`", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xfc\xdc","\xf5\xd5", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","'*", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -389,39 +389,39 @@ static const char main_key_ET[MAIN_LEN][4] = /*** Canadian French keyboard layout (setxkbmap ca_enhanced) */ static const char main_key_CF[MAIN_LEN][4] = { - "#|\\","1!�","2\"@","3/�","4$�","5%�","6?�","7&�","8*�","9(�","0)�","-_�","=+�", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO�","pP�","^^[","��]", + "#|\\","1!\xb1","2\"@","3/\xa3","4$\xa2","5%\xa4","6?\xac","7&\xa6","8*\xb2","9(\xb3","0)\xbc","-_\xbd","=+\xbe", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO\xa7","pP\xb6","^^[","\xb8\xa8]", "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:~","``{","<>}", - "zZ","xX","cC","vV","bB","nN","mM",",'-",".","��", - "��" + "zZ","xX","cC","vV","bB","nN","mM",",'-",".","\xe9\xc9", + "\xab\xbb\xb0" }; /*** Canadian French keyboard layout (setxkbmap ca -variant fr) */ static const char main_key_CA_fr[MAIN_LEN][4] = { "#|","1!","2\"","3/","4$","5%","6?","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","^^","��", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","^^","\xb8\xa8", "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","``","<>", - "zZ","xX","cC","vV","bB","nN","mM",",'",".","��", - "��" + "zZ","xX","cC","vV","bB","nN","mM",",'",".","\xe9\xc9", + "\xab\xbb" }; /*** Canadian keyboard layout (setxkbmap ca) */ static const char main_key_CA[MAIN_LEN][4] = { - "/\\","1!��","2@�","3#��","4$��","5%�","6?�","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO��","pP��","^��","��~", - "aA��","sSߧ","dD��","fF","gG","hH","jJ","kK","lL",";:�","��","��", - "zZ","xX","cC��","vV","bB","nN","mM��",",'",".\"��","��", - "��" + "/\\","1!\xb9\xa1","2@\xb2","3#\xb3\xa3","4$\xbc\xa4","5%\xbd","6?\xbe","7&","8*","9(","0)","-_","=+", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO\xf8\xd8","pP\xfe\xde","^\xa8\xa8","\xe7\xc7~", + "aA\xe6\xc6","sS\xdf\xa7","dD\xf0\xd0","fF","gG","hH","jJ","kK","lL",";:\xb4","\xe8\xc8","\xe0\xc0", + "zZ","xX","cC\xa2\xa9","vV","bB","nN","mM\xb5\xba",",'",".\"\xb7\xf7","\xe9\xc9", + "\xf9\xd9" }; /*** Portuguese keyboard layout (setxkbmap pt) */ static const char main_key_PT[MAIN_LEN][4] = { - "\\|","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","��", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","+*","�`", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","~^", + "\\|","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","\xab\xbb", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","+*","\xb4`", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe7\xc7","\xba\xaa","~^", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -429,9 +429,9 @@ static const char main_key_PT[MAIN_LEN][4] = /*** Italian keyboard layout (setxkbmap it) */ static const char main_key_IT[MAIN_LEN][4] = { - "\\|","1!","2\"","3�","4$","5%","6&","7/","8(","9)","0=","'?","�^", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","+*", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","�","��", + "\\|","1!","2\"","3\xa3","4$","5%","6&","7/","8(","9)","0=","'?","\xec^", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xe8\xe9","+*", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf2\xe7","\xe0\xb0","\xf9\xa7", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -439,9 +439,9 @@ static const char main_key_IT[MAIN_LEN][4] = /*** Finnish keyboard layout (setxkbmap fi) */ static const char main_key_FI[MAIN_LEN][4] = { - "��","1!","2\"","3#","4�","5%","6&","7/","8(","9)","0=","+?","�`", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","�^", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","'*", + "\xa7\xbd","1!","2\"","3#","4\xa4","5%","6&","7/","8(","9)","0=","+?","\xb4`", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xe5\xc5","\xa8^", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","'*", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -450,19 +450,19 @@ static const char main_key_FI[MAIN_LEN][4] = static const char main_key_BG_bds[MAIN_LEN][4] = { "`~()","1!","2@2?","3#3+","4$4\"","5%","6^6=","7&7:","8*8/","9(","0)","-_-I","=+.V", - "qQ,�","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]};", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|'�", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?��", + "qQ,\xfb","wW\xf3\xd3","eE\xe5\xc5","rR\xe8\xc8","tT\xf8\xd8","yY\xf9\xd9","uU\xea\xca","iI\xf1\xd1","oO\xe4\xc4","pP\xe7\xc7","[{\xf6\xd6","]};", + "aA\xfc\xdc","sS\xff\xdf","dD\xe0\xc0","fF\xee\xce","gG\xe6\xc6","hH\xe3\xc3","jJ\xf2\xd2","kK\xed\xcd","lL\xe2\xc2",";:\xec\xcc","'\"\xf7\xd7","\\|'\xdb", + "zZ\xfe\xde","xX\xe9\xc9","cC\xfa\xda","vV\xfd\xdd","bB\xf4\xd4","nN\xf5\xd5","mM\xef\xcf",",<\xf0\xd0",".>\xeb\xcb","/?\xe1\xc1", "<>" /* the phantom key */ }; /*** Bulgarian phonetic keyboard layout */ static const char main_key_BG_phonetic[MAIN_LEN][4] = { - "`~��","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:","'\"","\\|��", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<",".>","/?", + "`~\xf7\xd7","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", + "qQ\xff\xdf","wW\xe2\xc2","eE\xe5\xc5","rR\xf0\xd0","tT\xf2\xd2","yY\xfa\xda","uU\xf3\xd3","iI\xe8\xc8","oO\xee\xce","pP\xef\xcf","[{\xf8\xd8","]}\xf9\xd9", + "aA\xe0\xc0","sS\xf1\xd1","dD\xe4\xc4","fF\xf4\xd4","gG\xe3\xc3","hH\xf5\xd5","jJ\xe9\xc9","kK\xea\xca","lL\xeb\xcb",";:","'\"","\\|\xfe\xde", + "zZ\xe7\xc7","xX\xfc\xdc","cC\xf6\xd6","vV\xe6\xc6","bB\xe1\xc1","nN\xed\xcd","mM\xec\xcc",",<",".>","/?", "<>" /* the phantom key */ }; @@ -470,10 +470,10 @@ static const char main_key_BG_phonetic[MAIN_LEN][4] = /*** It matches Belarusian layout for XKB from Alexander Mikhailian */ static const char main_key_BY[MAIN_LEN][4] = { - "`~��","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}''", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|/|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?.,", "<>|�", + "`~\xa3\xb3","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", + "qQ\xca\xea","wW\xc3\xe3","eE\xd5\xf5","rR\xcb\xeb","tT\xc5\xe5","yY\xce\xee","uU\xc7\xe7","iI\xdb\xfb","oO\xae\xbe","pP\xda\xfa","[{\xc8\xe8","]}''", + "aA\xc6\xe6","sS\xd9\xf9","dD\xd7\xf7","fF\xc1\xe1","gG\xd0\xf0","hH\xd2\xf2","jJ\xcf\xef","kK\xcc\xec","lL\xc4\xe4",";:\xd6\xf6","'\"\xdc\xfc","\\|/|", + "zZ\xd1\xf1","xX\xde\xfe","cC\xd3\xf3","vV\xcd\xed","bB\xa6\xb6","nN\xd4\xf4","mM\xd8\xf8",",<\xc2\xe2",".>\xc0\xe0","/?.,", "<>|\xa6", }; @@ -481,18 +481,18 @@ static const char main_key_BY[MAIN_LEN][4] = static const char main_key_RU[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?" + "qQ\xca\xea","wW\xc3\xe3","eE\xd5\xf5","rR\xcb\xeb","tT\xc5\xe5","yY\xce\xee","uU\xc7\xe7","iI\xdb\xfb","oO\xdd\xfd","pP\xda\xfa","[{\xc8\xe8","]}\xdf\xff", + "aA\xc6\xe6","sS\xd9\xf9","dD\xd7\xf7","fF\xc1\xe1","gG\xd0\xf0","hH\xd2\xf2","jJ\xcf\xef","kK\xcc\xec","lL\xc4\xe4",";:\xd6\xf6","'\"\xdc\xfc","\\|", + "zZ\xd1\xf1","xX\xde\xfe","cC\xd3\xf3","vV\xcd\xed","bB\xc9\xe9","nN\xd4\xf4","mM\xd8\xf8",",<\xc2\xe2",".>\xc0\xe0","/?" }; /*** Russian keyboard layout (phantom key version) */ static const char main_key_RU_phantom[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?", + "qQ\xca\xea","wW\xc3\xe3","eE\xd5\xf5","rR\xcb\xeb","tT\xc5\xe5","yY\xce\xee","uU\xc7\xe7","iI\xdb\xfb","oO\xdd\xfd","pP\xda\xfa","[{\xc8\xe8","]}\xdf\xff", + "aA\xc6\xe6","sS\xd9\xf9","dD\xd7\xf7","fF\xc1\xe1","gG\xd0\xf0","hH\xd2\xf2","jJ\xcf\xef","kK\xcc\xec","lL\xc4\xe4",";:\xd6\xf6","'\"\xdc\xfc","\\|", + "zZ\xd1\xf1","xX\xde\xfe","cC\xd3\xf3","vV\xcd\xed","bB\xc9\xe9","nN\xd4\xf4","mM\xd8\xf8",",<\xc2\xe2",".>\xc0\xe0","/?", "<>" /* the phantom key */ }; @@ -500,9 +500,9 @@ static const char main_key_RU_phantom[MAIN_LEN][4] = static const char main_key_RU_koi8r[MAIN_LEN][4] = { "()","1!","2\"","3/","4$","5:","6,","7.","8;","9?","0%","-_","=+", - "��","��","��","��","��","��","��","��","��","��","��","��", - "��","��","��","��","��","��","��","��","��","��","��","\\|", - "��","��","��","��","��","��","��","��","��","/?", + "\xca\xea","\xc3\xe3","\xd5\xf5","\xcb\xeb","\xc5\xe5","\xce\xee","\xc7\xe7","\xdb\xfb","\xdd\xfd","\xda\xfa","\xc8\xe8","\xdf\xff", + "\xc6\xe6","\xd9\xf9","\xd7\xf7","\xc1\xe1","\xd0\xf0","\xd2\xf2","\xcf\xef","\xcc\xec","\xc4\xe4","\xd6\xf6","\xdc\xfc","\\|", + "\xd1\xf1","\xde\xfe","\xd3\xf3","\xcd\xed","\xc9\xe9","\xd4\xf4","\xd8\xf8","\xc2\xe2","\xc0\xe0","/?", "<>" /* the phantom key */ }; @@ -510,9 +510,9 @@ static const char main_key_RU_koi8r[MAIN_LEN][4] = static const char main_key_RU_cp1251[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?", + "qQ\xe9\xc9","wW\xf6\xd6","eE\xf3\xd3","rR\xea\xca","tT\xe5\xc5","yY\xed\xcd","uU\xe3\xc3","iI\xf8\xd8","oO\xf9\xd9","pP\xe7\xc7","[{\xf5\xd5","]}\xfa\xda", + "aA\xf4\xd4","sS\xfb\xdb","dD\xe2\xc2","fF\xe0\xc0","gG\xef\xcf","hH\xf0\xd0","jJ\xee\xce","kK\xeb\xcb","lL\xe4\xc4",";:\xe6\xc6","'\"\xfd\xdd","\\|", + "zZ\xff\xdf","xX\xf7\xd7","cC\xf1\xd1","vV\xec\xcc","bB\xe8\xc8","nN\xf2\xd2","mM\xfc\xdc",",<\xe1\xc1",".>\xfe\xde","/?", "<>" /* the phantom key */ }; @@ -520,19 +520,19 @@ static const char main_key_RU_cp1251[MAIN_LEN][4] = static const char main_key_RU_phonetic[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:","'\"","\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<",".>","/?", + "qQ\xd1\xf1","wW\xd7\xf7","eE\xc5\xe5","rR\xd2\xf2","tT\xd4\xf4","yY\xd9\xf9","uU\xd5\xf5","iI\xc9\xe9","oO\xcf\xef","pP\xd0\xf0","[{\xdb\xfb","]}\xdd\xfd", + "aA\xc1\xe1","sS\xd3\xf3","dD\xc4\xe4","fF\xc6\xe6","gG\xc7\xe7","hH\xc8\xe8","jJ\xca\xea","kK\xcb\xeb","lL\xcc\xec",";:","'\"","\\|", + "zZ\xda\xfa","xX\xd8\xf8","cC\xc3\xe3","vV\xd6\xf6","bB\xc2\xe2","nN\xce\xee","mM\xcd\xed",",<",".>","/?", "<>" /* the phantom key */ }; /*** Ukrainian keyboard layout KOI8-U */ static const char main_key_UA[MAIN_LEN][4] = { - "`~��","1!1!","2@2\"","3#3'","4$4*","5%5:","6^6,","7&7.","8*8;","9(9(","0)0)","-_-_","=+=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?/?", + "`~\xad\xbd","1!1!","2@2\"","3#3'","4$4*","5%5:","6^6,","7&7.","8*8;","9(9(","0)0)","-_-_","=+=+", + "qQ\xca\xea","wW\xc3\xe3","eE\xd5\xf5","rR\xcb\xeb","tT\xc5\xe5","yY\xce\xee","uU\xc7\xe7","iI\xdb\xfb","oO\xdd\xfd","pP\xda\xfa","[{\xc8\xe8","]}\xa7\xb7", + "aA\xc6\xe6","sS\xa6\xb6","dD\xd7\xf7","fF\xc1\xe1","gG\xd0\xf0","hH\xd2\xf2","jJ\xcf\xef","kK\xcc\xec","lL\xc4\xe4",";:\xd6\xf6","'\"\xa4\xb4","\\|\\|", + "zZ\xd1\xf1","xX\xde\xfe","cC\xd3\xf3","vV\xcd\xed","bB\xc9\xe9","nN\xd4\xf4","mM\xd8\xf8",",<\xc2\xe2",".>\xc0\xe0","/?/?", "<>" /* the phantom key */ }; @@ -540,29 +540,29 @@ static const char main_key_UA[MAIN_LEN][4] = /*** (as it appears on most of keyboards sold today) */ static const char main_key_UA_std[MAIN_LEN][4] = { - "��","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+", - "��","��","��","��","��","��","��","��","��","��","��","��", - "��","��","��","��","��","��","��","��","��","��","��","\\/", - "��","��","��","��","��","��","��","��","��",".,", + "\xad\xbd","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+", + "\xca\xea","\xc3\xe3","\xd5\xf5","\xcb\xeb","\xc5\xe5","\xce\xee","\xc7\xe7","\xdb\xfb","\xdd\xfd","\xda\xfa","\xc8\xe8","\xa7\xb7", + "\xc6\xe6","\xa6\xb6","\xd7\xf7","\xc1\xe1","\xd0\xf0","\xd2\xf2","\xcf\xef","\xcc\xec","\xc4\xe4","\xd6\xf6","\xa4\xb4","\\/", + "\xd1\xf1","\xde\xfe","\xd3\xf3","\xcd\xed","\xc9\xe9","\xd4\xf4","\xd8\xf8","\xc2\xe2","\xc0\xe0",".,", "<>" /* the phantom key */ }; /*** Russian keyboard layout KOI8-R (pair to the previous) */ static const char main_key_RU_std[MAIN_LEN][4] = { - "��","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+", - "��","��","��","��","��","��","��","��","��","��","��","��", - "��","��","��","��","��","��","��","��","��","��","��","\\/", - "��","��","��","��","��","��","��","��","��",".,", + "\xa3\xb3","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+", + "\xca\xea","\xc3\xe3","\xd5\xf5","\xcb\xeb","\xc5\xe5","\xce\xee","\xc7\xe7","\xdb\xfb","\xdd\xfd","\xda\xfa","\xc8\xe8","\xdf\xff", + "\xc6\xe6","\xd9\xf9","\xd7\xf7","\xc1\xe1","\xd0\xf0","\xd2\xf2","\xcf\xef","\xcc\xec","\xc4\xe4","\xd6\xf6","\xdc\xfc","\\/", + "\xd1\xf1","\xde\xfe","\xd3\xf3","\xcd\xed","\xc9\xe9","\xd4\xf4","\xd8\xf8","\xc2\xe2","\xc0\xe0",".,", "<>" /* the phantom key */ }; /*** Spanish keyboard layout (setxkbmap es) */ static const char main_key_ES[MAIN_LEN][4] = { - "��","1!","2\"","3�","4$","5%","6&","7/","8(","9)","0=","'?","��", + "\xba\xaa","1!","2\"","3\xb7","4$","5%","6&","7/","8(","9)","0=","'?","\xa1\xbf", "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","`^","+*", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","��", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf1\xd1","\xb4\xa8","\xe7\xc7", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -570,9 +570,9 @@ static const char main_key_ES[MAIN_LEN][4] = /*** Belgian keyboard layout ***/ static const char main_key_BE[MAIN_LEN][4] = { - "","&1|","�2@","\"3#","'4","(5","�6^","�7","!8","�9{","�0}",")�","-_", - "aA","zZ","eE�","rR","tT","yY","uU","iI","oO","pP","^�[","$*]", - "qQ","sS�","dD","fF","gG","hH","jJ","kK","lL","mM","�%�","��`", + "","&1|","\xe9""2@","\"3#","'4","(5","\xa7""6^","\xe8""7","!8","\xe7""9{","\xe0""0}",")\xb0","-_", + "aA","zZ","eE\xa4","rR","tT","yY","uU","iI","oO","pP","^\xa8[","$*]", + "qQ","sS\xdf","dD","fF","gG","hH","jJ","kK","lL","mM","\xf9%\xb4","\xb5\xa3`", "wW","xX","cC","vV","bB","nN",",?",";.",":/","=+~", "<>\\" }; @@ -580,29 +580,29 @@ static const char main_key_BE[MAIN_LEN][4] = /*** Hungarian keyboard layout (setxkbmap hu) */ static const char main_key_HU[MAIN_LEN][4] = { - "0�","1'","2\"","3+","4!","5%","6/","7=","8(","9)","��","��","��", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","��", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","��", + "0\xa7","1'","2\"","3+","4!","5%","6/","7=","8(","9)","\xf6\xd6","\xfc\xdc","\xf3\xd3", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xf5\xd5","\xfa\xda", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe9\xc9","\xe1\xc1","\xfb\xdb", "yY","xX","cC","vV","bB","nN","mM",",?",".:","-_", - "��" + "\xed\xcd" }; /*** Polish (programmer's) keyboard layout ***/ static const char main_key_PL[MAIN_LEN][4] = { - "`~","1!","2@","3#","4$","5%","6^","7&�","8*","9(","0)","-_","=+", - "qQ","wW","eE��","rR","tT","yY","uU","iI","oO��","pP","[{","]}", - "aA��","sS��","dD","fF","gG","hH","jJ","kK","lL��",";:","'\"","\\|", - "zZ��","xX��","cC��","vV","bB","nN��","mM",",<",".>","/?", + "`~","1!","2@","3#","4$","5%","6^","7&\xa7","8*","9(","0)","-_","=+", + "qQ","wW","eE\xea\xca","rR","tT","yY","uU","iI","oO\xf3\xd3","pP","[{","]}", + "aA\xb1\xa1","sS\xb6\xa6","dD","fF","gG","hH","jJ","kK","lL\xb3\xa3",";:","'\"","\\|", + "zZ\xbf\xaf","xX\xbc\xac","cC\xe6\xc6","vV","bB","nN\xf1\xd1","mM",",<",".>","/?", "<>|" }; /*** Slovenian keyboard layout (setxkbmap si) ***/ static const char main_key_SI[MAIN_LEN][4] = { - "��","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","+*", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","��", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","��", + "\xb8\xa8","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","+*", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xb9\xa9","\xf0\xd0", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe8\xc8","\xe6\xc6","\xbe\xae", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -611,9 +611,9 @@ static const char main_key_SI[MAIN_LEN][4] = static const char main_key_SR[MAIN_LEN][4] = { "`~","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","+*", - "��","��","��","��","��","��","��","��","��","��","��","[]", - "��","��","��","��","��","��","��","��","��","��","��","-_", - "��","��","��","��","��","��","��",",;",".:","��", + "\xa9\xb9","\xaa\xba","\xc5\xe5","\xd2\xf2","\xd4\xf4","\xda\xfa","\xd5\xf5","\xc9\xe9","\xcf\xef","\xd0\xf0","\xdb\xfb","[]", + "\xc1\xe1","\xd3\xf3","\xc4\xe4","\xc6\xe6","\xc7\xe7","\xc8\xe8","\xa8\xb8","\xcb\xeb","\xcc\xec","\xde\xfe","\xab\xbb","-_", + "\xa1\xb1","\xaf\xbf","\xc3\xe3","\xd7\xf7","\xc2\xe2","\xce\xee","\xcd\xed",",;",".:","\xd6\xf6", "<>" /* the phantom key */ }; @@ -621,9 +621,9 @@ static const char main_key_SR[MAIN_LEN][4] = static const char main_key_US_SR[MAIN_LEN][4] = { "`~","1!","2@2\"","3#","4$","5%","6^6&","7&7/","8*8(","9(9)","0)0=","-_'?","=++*", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}[]", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|-_", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<,;",".>.:","/?��", + "qQ\xa9\xb9","wW\xaa\xba","eE\xc5\xe5","rR\xd2\xf2","tT\xd4\xf4","yY\xda\xfa","uU\xd5\xf5","iI\xc9\xe9","oO\xcf\xef","pP\xd0\xf0","[{\xdb\xfb","]}[]", + "aA\xc1\xe1","sS\xd3\xf3","dD\xc4\xe4","fF\xc6\xe6","gG\xc7\xe7","hH\xc8\xe8","jJ\xa8\xb8","kK\xcb\xeb","lL\xcc\xec",";:\xde\xfe","'\"\xab\xbb","\\|-_", + "zZ\xa1\xb1","xX\xaf\xbf","cC\xc3\xe3","vV\xd7\xf7","bB\xc2\xe2","nN\xce\xee","mM\xcd\xed",",<,;",".>.:","/?\xd6\xf6", "<>" /* the phantom key */ }; @@ -631,8 +631,8 @@ static const char main_key_US_SR[MAIN_LEN][4] = static const char main_key_HR_jelly[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{��","]}��", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:��","'\"��","\\|��", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{\xb9\xa9","]}\xf0\xd0", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:\xe8\xc8","'\"\xe6\xc6","\\|\xbe\xae", "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", "<>|" }; @@ -640,9 +640,9 @@ static const char main_key_HR_jelly[MAIN_LEN][4] = /*** Croatian keyboard layout (setxkbmap hr) ***/ static const char main_key_HR[MAIN_LEN][4] = { - "��","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","+*", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","��", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","��", + "\xb8\xa8","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","+*", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xb9\xa9","\xf0\xd0", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe8\xc8","\xe6\xc6","\xbe\xae", "yY","xX","cC","vV","bB","nN","mM",",;",".:","/?", "<>" }; @@ -679,9 +679,9 @@ static const char main_key_JA_pc98x1[MAIN_LEN][4] = /*** Brazilian ABNT-2 keyboard layout (contributed by Raul Gomes Fernandes) */ static const char main_key_PT_br[MAIN_LEN][4] = { - "'\"","1!","2@","3#","4$","5%","6�","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","�`","[{", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","~^","]}", + "'\"","1!","2@","3#","4$","5%","6\xa8","7&","8*","9(","0)","-_","=+", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xb4`","[{", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe7\xc7","~^","]}", "\\|","zZ","xX","cC","vV","bB","nN","mM",",<",".>",";:","/?", }; @@ -708,9 +708,9 @@ static const char main_key_US_intl[MAIN_LEN][4] = - brokenbar replaced with bar */ static const char main_key_SK[MAIN_LEN][4] = { - ";0","+1","�2","�3","�4","�5","�6","�7","�8","�9","�0","=%","'v", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","�/","�(", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","�\"","�!","�)", + ";0","+1","\xb5""2","\xb9""3","\xe8""4","\xbb""5","\xbe""6","\xfd""7","\xe1""8","\xed""9","\xe9""0","=%","'v", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xfa/","\xe4(", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf4\"","\xa7!","\xf2)", "zZ","xX","cC","vV","bB","nN","mM",",?",".:","-_", "<>" }; @@ -718,9 +718,9 @@ static const char main_key_SK[MAIN_LEN][4] = /*** Czech keyboard layout (setxkbmap cz) */ static const char main_key_CZ[MAIN_LEN][4] = { - ";","+1","�2","�3","�4","�5","�6","�7","�8","�9","�0","=%","��", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","�/",")(", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","�\"","�!","�'", + ";","+1","\xec""2","\xb9""3","\xe8""4","\xf8""5","\xbe""6","\xfd""7","\xe1""8","\xed""9","\xe9""0","=%","\xb4\xb7", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfa/",")(", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf9\"","\xa7!","\xa8'", "yY","xX","cC","vV","bB","nN","mM",",?",".:","-_", "\\" }; @@ -728,9 +728,9 @@ static const char main_key_CZ[MAIN_LEN][4] = /*** Czech keyboard layout (setxkbmap cz_qwerty) */ static const char main_key_CZ_qwerty[MAIN_LEN][4] = { - ";","+1","�2","�3","�4","�5","�6","�7","�8","�9","�0","=%","��", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","�/",")(", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","�\"","�!","�'", + ";","+1","\xec""2","\xb9""3","\xe8""4","\xf8""5","\xbe""6","\xfd""7","\xe1""8","\xed""9","\xe9""0","=%","\xb4\xb7", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xfa/",")(", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf9\"","\xa7!","\xa8'", "zZ","xX","cC","vV","bB","nN","mM",",?",".:","-_", "\\" }; @@ -739,18 +739,18 @@ static const char main_key_CZ_qwerty[MAIN_LEN][4] = static const char main_key_SK_prog[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{","]}", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:","'\"","\\|", - "zZ��","xX�","cC��","vV��","bB","nN��","mM��",",<",".>","/?", + "qQ\xe4\xc4","wW\xec\xcc","eE\xe9\xc9","rR\xf8\xd8","tT\xbb\xab","yY\xfd\xdd","uU\xf9\xd9","iI\xed\xcd","oO\xf3\xd3","pP\xf6\xd6","[{","]}", + "aA\xe1\xc1","sS\xb9\xa9","dD\xef\xcf","fF\xeb\xcb","gG\xe0\xc0","hH\xfa\xda","jJ\xfc\xdc","kK\xf4\xd4","lL\xb5\xa5",";:","'\"","\\|", + "zZ\xbe\xae","xX\xa4","cC\xe8\xc8","vV\xe7\xc7","bB","nN\xf2\xd2","mM\xe5\xc5",",<",".>","/?", "<>" }; /*** Czech keyboard layout (see cssk_ibm(cs_qwerty) in xkbsel) */ static const char main_key_CS[MAIN_LEN][4] = { - ";","+1","�2","�3","�4","�5","�6","�7","�8","�9","�0�)","=%","", - "qQ\\","wW|","eE","rR","tT","yY","uU","iI","oO","pP","�/[{",")(]}", - "aA","sS�","dD�","fF[","gG]","hH","jJ","kK�","lL�","�\"$","�!�","�'", + ";","+1","\xec""2","\xb9""3","\xe8""4","\xf8""5","\xbe""6","\xfd""7","\xe1""8","\xed""9","\xe9""0\xbd)","=%","", + "qQ\\","wW|","eE","rR","tT","yY","uU","iI","oO","pP","\xfa/[{",")(]}", + "aA","sS\xf0","dD\xd0","fF[","gG]","hH","jJ","kK\xb3","lL\xa3","\xf9\"$","\xa7!\xdf","\xa8'", "zZ>","xX#","cC&","vV@","bB{","nN}","mM",",?<",".:>","-_*", "<>\\|" }; @@ -758,9 +758,9 @@ static const char main_key_CS[MAIN_LEN][4] = /*** Latin American keyboard layout (contributed by Gabriel Orlando Garcia) */ static const char main_key_LA[MAIN_LEN][4] = { - "|�","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","��", - "qQ@","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","+*", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","{[^","}]", + "|\xb0","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","\xbf\xa1", + "qQ@","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xb4\xa8","+*", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf1\xd1","{[^","}]", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -768,29 +768,29 @@ static const char main_key_LA[MAIN_LEN][4] = /*** Lithuanian keyboard layout (setxkbmap lt) */ static const char main_key_LT_B[MAIN_LEN][4] = { - "`~","��","��","��","��","��","��","��","��","�(","�)","-_","��", + "`~","\xe0\xc0","\xe8\xc8","\xe6\xc6","\xeb\xcb","\xe1\xc1","\xf0\xd0","\xf8\xd8","\xfb\xdb","\xa5(","\xb4)","-_","\xfe\xde", "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}", "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"","\\|", "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", - "��" + "\xaa\xac" }; /*** Turkish keyboard Layout */ static const char main_key_TK[MAIN_LEN][4] = { -"\"�","1!","2'","3^#","4+$","5%","6&","7/{","8([","9)]","0=}","*?\\","-_", -"qQ@","wW","eE","rR","tT","yY","uU","�I�","oO","pP","��","��~", -"aA�","sS�","dD","fF","gG","hH","jJ","kK","lL","��","i�",",;`", -"zZ","xX","cC","vV","bB","nN","mM","��","��",".:" +"\"\xe9","1!","2'","3^#","4+$","5%","6&","7/{","8([","9)]","0=}","*?\\","-_", +"qQ@","wW","eE","rR","tT","yY","uU","\xfdI\xee","oO","pP","\xf0\xd0","\xfc\xdc~", +"aA\xe6","sS\xdf","dD","fF","gG","hH","jJ","kK","lL","\xfe\xde","i\xdd",",;`", +"zZ","xX","cC","vV","bB","nN","mM","\xf6\xd6","\xe7\xc7",".:" }; /*** Turkish keyboard layout (setxkbmap tr) */ static const char main_key_TR[MAIN_LEN][4] = { "\"\\","1!","2'","3^","4+","5%","6&","7/","8(","9)","0=","*?","-_", -"qQ","wW","eE","rR","tT","yY","uU","\xb9I","oO","pP","\xbb\xab","��", +"qQ","wW","eE","rR","tT","yY","uU","\xb9I","oO","pP","\xbb\xab","\xfc\xdc", "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xba\xaa","i\0",",;", -"zZ","xX","cC","vV","bB","nN","mM","��","��",".:", +"zZ","xX","cC","vV","bB","nN","mM","\xf6\xd6","\xe7\xc7",".:", "<>" }; @@ -799,8 +799,8 @@ static const char main_key_TR_F[MAIN_LEN][4] = { "+*","1!","2\"","3^#","4$","5%","6&","7'","8(","9)","0=","/?","-_", "fF","gG","\xbb\xab","\xb9I","oO","dD","rR","nN","hH","pP","qQ","wW", -"uU","i\0","eE","aA","��","tT","kK","mM","lL","yY","\xba\xaa","xX", -"jJ","��","vV","cC","��","zZ","sS","bB",".:",",;", +"uU","i\0","eE","aA","\xfc\xdc","tT","kK","mM","lL","yY","\xba\xaa","xX", +"jJ","\xf6\xd6","vV","cC","\xe7\xc7","zZ","sS","bB",".:",",;", "<>" }; @@ -808,9 +808,9 @@ static const char main_key_TR_F[MAIN_LEN][4] = static const char main_key_IL[MAIN_LEN][4] = { "`~;","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ/","wW'","eE�","rR�","tT�","yY�","uU�","iI�","oO�","pP�","[{","]}", - "aA�","sS�","dD�","fF�","gG�","hH�","jJ�","kK�","lL�",";:�","\'\",","\\|", - "zZ�","xX�","cC�","vV�","bB�","nN�","mM�",",<�",".>�","/?.", + "qQ/","wW'","eE\xf7","rR\xf8","tT\xe0","yY\xe8","uU\xe5","iI\xef","oO\xed","pP\xf4","[{","]}", + "aA\xf9","sS\xe3","dD\xe2","fF\xeb","gG\xf2","hH\xe9","jJ\xe7","kK\xec","lL\xea",";:\xf3","\'\",","\\|", + "zZ\xe6","xX\xf1","cC\xe1","vV\xe4","bB\xf0","nN\xee","mM\xf6",",<\xfa",".>\xf5","/?.", "<>" }; @@ -818,9 +818,9 @@ static const char main_key_IL[MAIN_LEN][4] = static const char main_key_IL_phonetic[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ�","wW�","eE�","rR�","tT�","yY�","uU�","iI�","oO�","pP�","[{","]}", - "aA�","sS�","dD�","fF�","gG�","hH�","jJ�","kK�","lL�",";:","'\"","\\|", - "zZ�","xX�","cC�","vV�","bB�","nN�","mM�",",<",".>","/?", + "qQ\xf7","wW\xe5","eE\xe0","rR\xf8","tT\xfa","yY\xf2","uU\xe5","iI\xe9","oO\xf1","pP\xf4","[{","]}", + "aA\xe0","sS\xf9","dD\xe3","fF\xf4","gG\xe2","hH\xe4","jJ\xe9","kK\xeb","lL\xec",";:","'\"","\\|", + "zZ\xe6","xX\xe7","cC\xf6","vV\xe5","bB\xe1","nN\xf0","mM\xee",",<",".>","/?", "<>" }; @@ -828,9 +828,9 @@ static const char main_key_IL_phonetic[MAIN_LEN][4] = static const char main_key_IL_saharon[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ�","wW�","eE","rR�","tT�","yY�","uU","iI","oO","pP�","[{","]}", - "aA�","sS�","dD�","fF�","gG�","hH�","jJ�","kK�","lL�",";:","'\"","\\|", - "zZ�","xX�","cC�","vV�","bB�","nN�","mM�",",<",".>","/?", + "qQ\xf7","wW\xf1","eE","rR\xf8","tT\xe8","yY\xe3","uU","iI","oO","pP\xf4","[{","]}", + "aA\xe0","sS\xe5","dD\xec","fF\xfa","gG\xe2","hH\xe4","jJ\xf9","kK\xeb","lL\xe9",";:","'\"","\\|", + "zZ\xe6","xX\xe7","cC\xf6","vV\xf2","bB\xe1","nN\xf0","mM\xee",",<",".>","/?", "<>" }; @@ -840,19 +840,19 @@ static const char main_key_IL_saharon[MAIN_LEN][4] = static const char main_key_EL[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ;:","wW","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{","]}", - "aA��","sS","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"","\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<",".>","/?", + "qQ;:","wW","eE\xe5\xc5","rR\xf1\xd1","tT\xf4\xd4","yY\xf5\xd5","uU\xe8\xc8","iI\xe9\xc9","oO\xef\xcf","pP\xf0\xd0","[{","]}", + "aA\xe1\xc1","sS","dD\xe4\xc4","fF\xf6\xd6","gG\xe3\xc3","hH\xe7\xc7","jJ\xee\xce","kK\xea\xca","lL\xeb\xcb",";:\xb4\xa8","'\"","\\|", + "zZ\xe6\xc6","xX\xf7\xd7","cC\xf8\xd8","vV\xf9\xd9","bB\xe2\xc2","nN\xed\xcd","mM\xec\xcc",",<",".>","/?", "<>" }; /*** Thai (Kedmanee) keyboard layout by Supphachoke Suntiwichaya <mrchoke(a)opentle.org> */ static const char main_key_th[MAIN_LEN][4] = { - "`~_%","1!�+","2@/�","3#-�","4$��","5%��","6^��","7&��","8*��","9(��","0)��","-_��","=+��", - "qQ��","wW�\"","eEӮ","rR��","tTи","yY��","uU��","iIó","oO��","pP","[{��","]}�,", - "aA��","sS˦","dD��","fF��","gG�","hH��","jJ��","kK��","lL��",";:ǫ","\'\"�.","\\|��", - "zZ�(","xX�)","cC�","vV��","bB�","nN��","mM�?",",<��",".>��","/?��" + "`~_%","1!\xe5+","2@/\xf1","3#-\xf2","4$\xc0\xf3","5%\xb6\xf4","6^\xd8\xd9","7&\xd6\xdf","8*\xa4\xf5","9(\xb5\xf6","0)\xa8\xf7","-_\xa2\xf8","=+\xaa\xf9", + "qQ\xe6\xf0","wW\xe4\"","eE\xd3\xae","rR\xbe\xb1","tT\xd0\xb8","yY\xd1\xed","uU\xd5\xea","iI\xc3\xb3","oO\xb9\xcf","pP\xc2\xad","[{\xba\xb0","]}\xc5,", + "aA\xbf\xc4","sS\xcb\xa6","dD\xa1\xaf","fF\xb4\xe2","gG\xe0\xac","hH\xe9\xe7","jJ\xe8\xeb","kK\xd2\xc9","lL\xca\xc8",";:\xc7\xab","\'\"\xa7.","\\|\xa3\xa5", + "zZ\xbc(","xX\xbb)","cC\xe1\xa9","vV\xcd\xce","bB\xda","nN\xd7\xec","mM\xb7?",",<\xc1\xb2",".>\xe3\xcc","/?\xbd\xc6" }; /*** VNC keyboard layout */ @@ -879,9 +879,9 @@ static const char main_key_vnc[MAIN_LEN][4] = /*** Dutch keyboard layout (setxkbmap nl) ***/ static const char main_key_NL[MAIN_LEN][4] = { - "@�","1!","2\"","3#","4$","5%","6&","7_","8(","9)","0'","/?","�~", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","�~","*|", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","+�","'`","<>", + "@\xa7","1!","2\"","3#","4$","5%","6&","7_","8(","9)","0'","/?","\xb0~", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xa8~","*|", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","+\xb1","'`","<>", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-=", "[]" }; -- 2.15.1

1 0

[PATCH] shell32: Make some strings static constants
by Nikolay Sivov 04 Jan '18

04 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/control.c | 10 +++++----- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shlfileop.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index b3931544e4..748b2d28e1 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -194,8 +194,8 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) static BOOL Control_CreateListView (CPanel *panel) { + static const WCHAR empty_string[] = {0}; RECT ws, sb; - WCHAR empty_string[] = {0}; WCHAR buf[MAX_STRING_LEN]; LVCOLUMNW lvc; @@ -431,8 +431,8 @@ static CPlItem* Control_GetCPlItem_From_ListView(CPanel *panel) static void Control_StartApplet(HWND hWnd, CPlItem *item) { - WCHAR verbOpen[] = {'c','p','l','o','p','e','n',0}; - WCHAR format[] = {'@','%','d',0}; + static const WCHAR verbOpen[] = {'c','p','l','o','p','e','n',0}; + static const WCHAR format[] = {'@','%','d',0}; WCHAR param[MAX_PATH]; /* execute the applet if item is valid */ @@ -610,11 +610,11 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) { + static const WCHAR className[] = {'S','h','e','l','l','_','C','o','n','t','r','o', + 'l','_','W','n','d','C','l','a','s','s',0}; WNDCLASSEXW wc; MSG msg; WCHAR appName[MAX_STRING_LEN]; - const WCHAR className[] = {'S','h','e','l','l','_','C','o','n','t','r','o', - 'l','_','W','n','d','C','l','a','s','s',0}; LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, sizeof(appName) / sizeof(appName[0])); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 1fb4f1b2f6..0e52fc1c40 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1085,7 +1085,7 @@ ISFHelper_fnGetUniqueName (ISFHelper * iface, LPWSTR pwszName, UINT uLen) HRESULT hr; WCHAR wszText[MAX_PATH]; WCHAR wszNewFolder[25]; - const WCHAR wszFormat[] = {'%','s',' ','%','d',0 }; + static const WCHAR wszFormat[] = {'%','s',' ','%','d',0 }; TRACE ("(%p)(%p %u)\n", This, pwszName, uLen); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 8d4160d90c..24f5e05dbc 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1309,8 +1309,8 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE { if (flFrom->dwNumFiles > 1) { + static const WCHAR format[] = {'%','d',0}; WCHAR tmp[8]; - const WCHAR format[] = {'%','d',0}; wnsprintfW(tmp, sizeof(tmp)/sizeof(tmp[0]), format, flFrom->dwNumFiles); return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_MULTIPLE_ITEM:ASK_DELETE_MULTIPLE_ITEM), tmp, NULL); -- 2.15.1

1 0

[PATCH] Revert "msi: Store the current script in the package."
by Hans Leidekker 04 Jan '18

04 Jan '18

Commit 036f007e241b95498964c53365300a3332a92c5a (which reverts 86bc556f9fd4a964cbaa66bc1fd67e4603ecd450) is not sufficient to fix the Office installers because MsiGetMode(MSIRUNMODE_SCHEDULED) no longer does the right thing after the revert. That is caused by "msi: Store the current script in the package.", which, in hindsight, should have been part of the first commit. This reverts e1e668d41fce1dbd0270cd9de0d880a236ddb869. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 25 ++++++++++--------------- dlls/msi/custom.c | 16 ++++++++++++++-- dlls/msi/dialog.c | 2 +- dlls/msi/install.c | 8 ++++---- dlls/msi/msi.c | 6 +++--- dlls/msi/msipriv.h | 8 +++++--- dlls/msi/package.c | 1 - 7 files changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 58a831e7e6..54295a351c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -510,7 +510,7 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } - rc = ACTION_PerformAction(package, action); + rc = ACTION_PerformAction(package, action, SCRIPT_NONE); msi_dialog_check_messages( NULL ); @@ -604,7 +604,7 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) /******************************************************** * ACTION helper functions and functions that perform the actions *******************************************************/ -static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action) +static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script) { UINT arc; INT uirc; @@ -613,7 +613,7 @@ static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action) if (uirc == IDCANCEL) return ERROR_INSTALL_USEREXIT; ui_actioninfo(package, action, TRUE, 0); - arc = ACTION_CustomAction(package, action); + arc = ACTION_CustomAction( package, action, script ); uirc = !arc; if (arc == ERROR_FUNCTION_NOT_CALLED && needs_ui_sequence(package)) @@ -1546,13 +1546,11 @@ static UINT execute_script( MSIPACKAGE *package, UINT script ) TRACE("executing script %u\n", script); - package->script = script; - if (script == SCRIPT_ROLLBACK) { for (i = package->script_actions_count[script]; i > 0; i--) { - rc = ACTION_PerformAction(package, package->script_actions[script][i-1]); + rc = ACTION_PerformAction(package, package->script_actions[script][i-1], script); if (rc != ERROR_SUCCESS) { ERR("Execution of script %i halted; action %s returned %u\n", @@ -1565,7 +1563,7 @@ static UINT execute_script( MSIPACKAGE *package, UINT script ) { for (i = 0; i < package->script_actions_count[script]; i++) { - rc = ACTION_PerformAction(package, package->script_actions[script][i]); + rc = ACTION_PerformAction(package, package->script_actions[script][i], script); if (rc != ERROR_SUCCESS) { ERR("Execution of script %i halted; action %s returned %u\n", @@ -1574,9 +1572,6 @@ static UINT execute_script( MSIPACKAGE *package, UINT script ) } } } - - package->script = SCRIPT_NONE; - msi_free_action_script(package, script); return rc; } @@ -5658,7 +5653,7 @@ static UINT ACTION_ExecuteAction(MSIPACKAGE *package) msiobj_release(&uirow->hdr); } else - rc = ACTION_PerformAction(package, action); + rc = ACTION_PerformAction(package, action, SCRIPT_NONE); /* Send all set properties. */ if (!MSI_OpenQuery(package->db, &view, prop_query)) @@ -7897,7 +7892,7 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) return rc; } -UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action) +UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) { UINT rc; @@ -7907,7 +7902,7 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action) rc = ACTION_HandleStandardAction(package, action); if (rc == ERROR_FUNCTION_NOT_CALLED) - rc = ACTION_HandleCustomAction(package, action); + rc = ACTION_HandleCustomAction(package, action, script); if (rc == ERROR_FUNCTION_NOT_CALLED) WARN("unhandled msi action %s\n", debugstr_w(action)); @@ -7960,7 +7955,7 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) return ERROR_FUNCTION_FAILED; } - rc = ACTION_PerformAction(package, action); + rc = ACTION_PerformAction(package, action, SCRIPT_NONE); msiobj_release(&row->hdr); } @@ -8049,7 +8044,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_set_property( package->db, szRollbackDisabled, szOne, -1 ); } - rc = ACTION_PerformAction(package, action); + rc = ACTION_PerformAction(package, action, SCRIPT_NONE); /* process the ending type action */ if (rc == ERROR_SUCCESS) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index f67a7dd2a9..851c5030e2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1186,7 +1186,7 @@ static UINT defer_custom_action( MSIPACKAGE *package, const WCHAR *action, UINT return ERROR_SUCCESS; } -UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action ) +UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action, UINT script ) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', @@ -1226,7 +1226,7 @@ UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action ) if (type & msidbCustomActionTypeNoImpersonate) WARN("msidbCustomActionTypeNoImpersonate not handled\n"); - if (!action_type_matches_script( type, package->script )) + if (!action_type_matches_script( type, script )) { rc = defer_custom_action( package, action, type ); goto end; @@ -1235,6 +1235,15 @@ UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action ) { LPWSTR actiondata = msi_dup_property( package->db, action ); + if (type & msidbCustomActionTypeInScript) + package->scheduled_action_running = TRUE; + + if (type & msidbCustomActionTypeCommit) + package->commit_action_running = TRUE; + + if (type & msidbCustomActionTypeRollback) + package->rollback_action_running = TRUE; + if (deferred_data) set_deferred_action_props(package, deferred_data); else if (actiondata) @@ -1316,6 +1325,9 @@ UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action ) } end: + package->scheduled_action_running = FALSE; + package->commit_action_running = FALSE; + package->rollback_action_running = FALSE; msiobj_release(&row->hdr); return rc; } diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index bc41403c3b..8825c28de0 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4366,7 +4366,7 @@ static UINT event_spawn_wait_dialog( msi_dialog *dialog, const WCHAR *argument ) static UINT event_do_action( msi_dialog *dialog, const WCHAR *argument ) { - ACTION_PerformAction( dialog->package, argument ); + ACTION_PerformAction( dialog->package, argument, SCRIPT_NONE ); return ERROR_SUCCESS; } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 6ab3f0dfbc..261a259f3f 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -105,7 +105,7 @@ UINT WINAPI MsiDoActionW( MSIHANDLE hInstall, LPCWSTR szAction ) return ERROR_SUCCESS; } - ret = ACTION_PerformAction( package, szAction ); + ret = ACTION_PerformAction( package, szAction, SCRIPT_NONE ); msiobj_release( &package->hdr ); return ret; @@ -736,15 +736,15 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) break; case MSIRUNMODE_SCHEDULED: - r = (package->script == SCRIPT_INSTALL); + r = package->scheduled_action_running; break; case MSIRUNMODE_ROLLBACK: - r = (package->script == SCRIPT_ROLLBACK); + r = package->rollback_action_running; break; case MSIRUNMODE_COMMIT: - r = (package->script == SCRIPT_COMMIT); + r = package->commit_action_running; break; case MSIRUNMODE_MAINTENANCE: diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f8ecfb8f41..7e5e23fc51 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3747,7 +3747,7 @@ UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct) if (!package) return ERROR_CALL_NOT_IMPLEMENTED; - rc = ACTION_PerformAction(package, szFirstRun); + rc = ACTION_PerformAction(package, szFirstRun, SCRIPT_NONE); msiobj_release( &package->hdr ); MsiCloseHandle(handle); @@ -3773,7 +3773,7 @@ UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct) if (!package) return ERROR_CALL_NOT_IMPLEMENTED; - rc = ACTION_PerformAction(package, szFirstRun); + rc = ACTION_PerformAction(package, szFirstRun, SCRIPT_NONE); msiobj_release( &package->hdr ); MsiCloseHandle(handle); @@ -3854,7 +3854,7 @@ UINT WINAPI MsiConfigureFeatureW(LPCWSTR szProduct, LPCWSTR szFeature, INSTALLST MsiSetInternalUI( INSTALLUILEVEL_BASIC, NULL ); - r = ACTION_PerformAction( package, szCostInitialize ); + r = ACTION_PerformAction( package, szCostInitialize, SCRIPT_NONE ); if (r != ERROR_SUCCESS) goto end; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 25c346bd78..ea65e2af55 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -412,7 +412,6 @@ typedef struct tagMSIPACKAGE struct list mimes; struct list appids; - enum script script; LPWSTR *script_actions[SCRIPT_MAX]; int script_actions_count[SCRIPT_MAX]; LPWSTR *unique_actions; @@ -442,6 +441,9 @@ typedef struct tagMSIPACKAGE struct list sourcelist_info; struct list sourcelist_media; + unsigned char scheduled_action_running : 1; + unsigned char commit_action_running : 1; + unsigned char rollback_action_running : 1; unsigned char need_reboot_at_end : 1; unsigned char need_reboot_now : 1; unsigned char need_rollback : 1; @@ -973,9 +975,9 @@ extern WCHAR *gszLogFile DECLSPEC_HIDDEN; extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN; /* action related functions */ -extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action) DECLSPEC_HIDDEN; +extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) DECLSPEC_HIDDEN; extern void ACTION_FinishCustomActions( const MSIPACKAGE* package) DECLSPEC_HIDDEN; -extern UINT ACTION_CustomAction(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; +extern UINT ACTION_CustomAction(MSIPACKAGE *, const WCHAR *, UINT) DECLSPEC_HIDDEN; /* actions in other modules */ extern UINT ACTION_AppSearch(MSIPACKAGE *package) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2f6027b815..477fa0ff50 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1098,7 +1098,6 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) msi_load_admin_properties( package ); package->log_file = INVALID_HANDLE_VALUE; - package->script = SCRIPT_NONE; } return package; } -- 2.11.0

1 0

[website] German translation for release 2.0.4
by Julian Rüger 04 Jan '18

04 Jan '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] include: add RtlCompareMemory declaration to winnt.h
by Stefan Leichter 04 Jan '18

04 Jan '18

Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[website] German translation for release 3.0-rc4
by Julian Rüger 04 Jan '18

04 Jan '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.0-rc3
by Julian Rüger 04 Jan '18

04 Jan '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.0-rc2
by Julian Rüger 04 Jan '18

04 Jan '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] winex11: Escape non-UTF-8 characters in string literals
by Alex Henrie 04 Jan '18

04 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This is the only file in the Wine codebase that uses a character encoding other than UTF-8, and even so it still uses UTF-8 characters in its comments. Because practically no editor supports mixing encodings within the same file and because all patch submissions are assumed to be in git-send-email's default encoding (UTF-8), it is necessary to use UTF-8 consistently throughout the file to avoid mangled characters. I used this bit of Python to escape the characters, then I manually undid the changes in comments: from sys import stdout for char in open('dlls/winex11.drv/keyboard.c', 'rb').read(): if char <= 0x7F: stdout.write(chr(char)) else: stdout.write('\\' + hex(char)[1:]) dlls/winex11.drv/keyboard.c | 334 ++++++++++++++++++++++---------------------- 1 file changed, 167 insertions(+), 167 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 37e51b2592..7c6a94f85e 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -275,7 +275,7 @@ static const char main_key_US_dvorak[MAIN_LEN][4] = /*** British keyboard layout */ static const char main_key_UK[MAIN_LEN][4] = { - "`","1!","2\"","3�","4$","5%","6^","7&","8*","9(","0)","-_","=+", + "`","1!","2\"","3\xa3","4$","5%","6^","7&","8*","9(","0)","-_","=+", "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}", "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'@","#~", "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", @@ -285,20 +285,20 @@ static const char main_key_UK[MAIN_LEN][4] = /*** French keyboard layout (setxkbmap fr) */ static const char main_key_FR[MAIN_LEN][4] = { - "�","&1","�2","\"3","'4","(5","-6","�7","_8","�9","�0",")�","=+", - "aA","zZ","eE","rR","tT","yY","uU","iI","oO","pP","^�","$�", - "qQ","sS","dD","fF","gG","hH","jJ","kK","lL","mM","�%","*�", - "wW","xX","cC","vV","bB","nN",",?",";.",":/","!�", + "\xb2","&1","\xe92","\"3","'4","(5","-6","\xe87","_8","\xe79","\xe00",")\xb0","=+", + "aA","zZ","eE","rR","tT","yY","uU","iI","oO","pP","^\xa8","$\xa3", + "qQ","sS","dD","fF","gG","hH","jJ","kK","lL","mM","\xf9%","*\xb5", + "wW","xX","cC","vV","bB","nN",",?",";.",":/","!\xa7", "<>" }; /*** Icelandic keyboard layout (setxkbmap is) */ static const char main_key_IS[MAIN_LEN][4] = { - "�","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","��","-_", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","'?", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","+*", - "zZ","xX","cC","vV","bB","nN","mM",",;",".:","��", + "\xb0","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","\xf6\xd6","-_", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xf0\xd0","'?", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe6\xc6","\xb4\xc4","+*", + "zZ","xX","cC","vV","bB","nN","mM",",;",".:","\xfe\xde", "<>" }; @@ -319,9 +319,9 @@ static const char main_key_IS[MAIN_LEN][4] = /*** German keyboard layout (setxkbmap de [-variant nodeadkeys|deadacute etc.]) */ static const char main_key_DE[MAIN_LEN][4] = { - "^�","1!","2\"","3�","4$","5%","6&","7/","8(","9)","0=","�?","", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","+*", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","#'", + "^\xb0","1!","2\"","3\xa7","4$","5%","6&","7/","8(","9)","0=","\xdf?","", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xdc","+*", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","#'", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -329,9 +329,9 @@ static const char main_key_DE[MAIN_LEN][4] = /*** Swiss German keyboard layout (setxkbmap ch -variant de) */ static const char main_key_SG[MAIN_LEN][4] = { - "��","1+","2\"","3*","4�","5%","6&","7/","8(","9)","0=","'?","^`", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","�!", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","$�", + "\xa7\xb0","1+","2\"","3*","4\xe7","5%","6&","7/","8(","9)","0=","'?","^`", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfc\xe8","\xa8!", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xe9","\xe4\xe0","$\xa3", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -339,19 +339,19 @@ static const char main_key_SG[MAIN_LEN][4] = /*** Swiss French keyboard layout (setxkbmap ch -variant fr) */ static const char main_key_SF[MAIN_LEN][4] = { - "��","1+","2\"","3*","4�","5%","6&","7/","8(","9)","0=","'?","^`", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","�!", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","$�", + "\xa7\xb0","1+","2\"","3*","4\xe7","5%","6&","7/","8(","9)","0=","'?","^`", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xe8\xfc","\xa8!", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe9\xf6","\xe0\xe4","$\xa3", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; -/*** Norwegian keyboard layout (contributed by Ove K�ven) */ +/*** Norwegian keyboard layout (contributed by Ove Kåven) */ static const char main_key_NO[MAIN_LEN][4] = { - "|�","1!","2\"@","3#�","4�$","5%","6&","7/{","8([","9)]","0=}","+?","\\`�", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","�^~", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","'*", + "|\xa7","1!","2\"@","3#\xa3","4\xa4$","5%","6&","7/{","8([","9)]","0=}","+?","\\`\xb4", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xe5\xc5","\xa8^~", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf8\xd8","\xe6\xc6","'*", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -359,9 +359,9 @@ static const char main_key_NO[MAIN_LEN][4] = /*** Danish keyboard layout (setxkbmap dk) */ static const char main_key_DA[MAIN_LEN][4] = { - "��","1!","2\"","3#","4�","5%","6&","7/","8(","9)","0=","+?","�`", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","�^", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","'*", + "\xbd\xa7","1!","2\"","3#","4\xa4","5%","6&","7/","8(","9)","0=","+?","\xb4`", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xe5\xc5","\xa8^", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe6\xc6","\xf8\xd8","'*", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -369,9 +369,9 @@ static const char main_key_DA[MAIN_LEN][4] = /*** Swedish keyboard layout (setxkbmap se) */ static const char main_key_SE[MAIN_LEN][4] = { - "��","1!","2\"","3#","4�","5%","6&","7/","8(","9)","0=","+?","�`", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","�^", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","'*", + "\xa7\xbd","1!","2\"","3#","4\xa4","5%","6&","7/","8(","9)","0=","+?","\xb4`", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xe5\xc5","\xa8^", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","'*", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -379,9 +379,9 @@ static const char main_key_SE[MAIN_LEN][4] = /*** Estonian keyboard layout (setxkbmap ee) */ static const char main_key_ET[MAIN_LEN][4] = { - "�~","1!","2\"","3#","4�","5%","6&","7/","8(","9)","0=","+?","�`", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","��", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","'*", + "\xb7~","1!","2\"","3#","4\xa4","5%","6&","7/","8(","9)","0=","+?","\xb4`", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xfc\xdc","\xf5\xd5", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","'*", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -389,39 +389,39 @@ static const char main_key_ET[MAIN_LEN][4] = /*** Canadian French keyboard layout (setxkbmap ca_enhanced) */ static const char main_key_CF[MAIN_LEN][4] = { - "#|\\","1!�","2\"@","3/�","4$�","5%�","6?�","7&�","8*�","9(�","0)�","-_�","=+�", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO�","pP�","^^[","��]", + "#|\\","1!\xb1","2\"@","3/\xa3","4$\xa2","5%\xa4","6?\xac","7&\xa6","8*\xb2","9(\xb3","0)\xbc","-_\xbd","=+\xbe", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO\xa7","pP\xb6","^^[","\xb8\xa8]", "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:~","``{","<>}", - "zZ","xX","cC","vV","bB","nN","mM",",'-",".","��", - "��" + "zZ","xX","cC","vV","bB","nN","mM",",'-",".","\xe9\xc9", + "\xab\xbb\xb0" }; /*** Canadian French keyboard layout (setxkbmap ca -variant fr) */ static const char main_key_CA_fr[MAIN_LEN][4] = { "#|","1!","2\"","3/","4$","5%","6?","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","^^","��", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","^^","\xb8\xa8", "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","``","<>", - "zZ","xX","cC","vV","bB","nN","mM",",'",".","��", - "��" + "zZ","xX","cC","vV","bB","nN","mM",",'",".","\xe9\xc9", + "\xab\xbb" }; /*** Canadian keyboard layout (setxkbmap ca) */ static const char main_key_CA[MAIN_LEN][4] = { - "/\\","1!��","2@�","3#��","4$��","5%�","6?�","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO��","pP��","^��","��~", - "aA��","sSߧ","dD��","fF","gG","hH","jJ","kK","lL",";:�","��","��", - "zZ","xX","cC��","vV","bB","nN","mM��",",'",".\"��","��", - "��" + "/\\","1!\xb9\xa1","2@\xb2","3#\xb3\xa3","4$\xbc\xa4","5%\xbd","6?\xbe","7&","8*","9(","0)","-_","=+", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO\xf8\xd8","pP\xfe\xde","^\xa8\xa8","\xe7\xc7~", + "aA\xe6\xc6","sS\xdf\xa7","dD\xf0\xd0","fF","gG","hH","jJ","kK","lL",";:\xb4","\xe8\xc8","\xe0\xc0", + "zZ","xX","cC\xa2\xa9","vV","bB","nN","mM\xb5\xba",",'",".\"\xb7\xf7","\xe9\xc9", + "\xf9\xd9" }; /*** Portuguese keyboard layout (setxkbmap pt) */ static const char main_key_PT[MAIN_LEN][4] = { - "\\|","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","��", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","+*","�`", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","~^", + "\\|","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","\xab\xbb", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","+*","\xb4`", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe7\xc7","\xba\xaa","~^", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -429,9 +429,9 @@ static const char main_key_PT[MAIN_LEN][4] = /*** Italian keyboard layout (setxkbmap it) */ static const char main_key_IT[MAIN_LEN][4] = { - "\\|","1!","2\"","3�","4$","5%","6&","7/","8(","9)","0=","'?","�^", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","+*", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","�","��", + "\\|","1!","2\"","3\xa3","4$","5%","6&","7/","8(","9)","0=","'?","\xec^", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xe8\xe9","+*", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf2\xe7","\xe0\xb0","\xf9\xa7", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -439,9 +439,9 @@ static const char main_key_IT[MAIN_LEN][4] = /*** Finnish keyboard layout (setxkbmap fi) */ static const char main_key_FI[MAIN_LEN][4] = { - "��","1!","2\"","3#","4�","5%","6&","7/","8(","9)","0=","+?","�`", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","�^", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","'*", + "\xa7\xbd","1!","2\"","3#","4\xa4","5%","6&","7/","8(","9)","0=","+?","\xb4`", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xe5\xc5","\xa8^", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf6\xd6","\xe4\xc4","'*", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -450,19 +450,19 @@ static const char main_key_FI[MAIN_LEN][4] = static const char main_key_BG_bds[MAIN_LEN][4] = { "`~()","1!","2@2?","3#3+","4$4\"","5%","6^6=","7&7:","8*8/","9(","0)","-_-I","=+.V", - "qQ,�","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]};", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|'�", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?��", + "qQ,\xfb","wW\xf3\xd3","eE\xe5\xc5","rR\xe8\xc8","tT\xf8\xd8","yY\xf9\xd9","uU\xea\xca","iI\xf1\xd1","oO\xe4\xc4","pP\xe7\xc7","[{\xf6\xd6","]};", + "aA\xfc\xdc","sS\xff\xdf","dD\xe0\xc0","fF\xee\xce","gG\xe6\xc6","hH\xe3\xc3","jJ\xf2\xd2","kK\xed\xcd","lL\xe2\xc2",";:\xec\xcc","'\"\xf7\xd7","\\|'\xdb", + "zZ\xfe\xde","xX\xe9\xc9","cC\xfa\xda","vV\xfd\xdd","bB\xf4\xd4","nN\xf5\xd5","mM\xef\xcf",",<\xf0\xd0",".>\xeb\xcb","/?\xe1\xc1", "<>" /* the phantom key */ }; /*** Bulgarian phonetic keyboard layout */ static const char main_key_BG_phonetic[MAIN_LEN][4] = { - "`~��","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:","'\"","\\|��", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<",".>","/?", + "`~\xf7\xd7","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", + "qQ\xff\xdf","wW\xe2\xc2","eE\xe5\xc5","rR\xf0\xd0","tT\xf2\xd2","yY\xfa\xda","uU\xf3\xd3","iI\xe8\xc8","oO\xee\xce","pP\xef\xcf","[{\xf8\xd8","]}\xf9\xd9", + "aA\xe0\xc0","sS\xf1\xd1","dD\xe4\xc4","fF\xf4\xd4","gG\xe3\xc3","hH\xf5\xd5","jJ\xe9\xc9","kK\xea\xca","lL\xeb\xcb",";:","'\"","\\|\xfe\xde", + "zZ\xe7\xc7","xX\xfc\xdc","cC\xf6\xd6","vV\xe6\xc6","bB\xe1\xc1","nN\xed\xcd","mM\xec\xcc",",<",".>","/?", "<>" /* the phantom key */ }; @@ -470,10 +470,10 @@ static const char main_key_BG_phonetic[MAIN_LEN][4] = /*** It matches Belarusian layout for XKB from Alexander Mikhailian */ static const char main_key_BY[MAIN_LEN][4] = { - "`~��","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}''", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|/|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?.,", "<>|�", + "`~\xa3\xb3","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", + "qQ\xca\xea","wW\xc3\xe3","eE\xd5\xf5","rR\xcb\xeb","tT\xc5\xe5","yY\xce\xee","uU\xc7\xe7","iI\xdb\xfb","oO\xae\xbe","pP\xda\xfa","[{\xc8\xe8","]}''", + "aA\xc6\xe6","sS\xd9\xf9","dD\xd7\xf7","fF\xc1\xe1","gG\xd0\xf0","hH\xd2\xf2","jJ\xcf\xef","kK\xcc\xec","lL\xc4\xe4",";:\xd6\xf6","'\"\xdc\xfc","\\|/|", + "zZ\xd1\xf1","xX\xde\xfe","cC\xd3\xf3","vV\xcd\xed","bB\xa6\xb6","nN\xd4\xf4","mM\xd8\xf8",",<\xc2\xe2",".>\xc0\xe0","/?.,", "<>|\xa6", }; @@ -481,18 +481,18 @@ static const char main_key_BY[MAIN_LEN][4] = static const char main_key_RU[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?" + "qQ\xca\xea","wW\xc3\xe3","eE\xd5\xf5","rR\xcb\xeb","tT\xc5\xe5","yY\xce\xee","uU\xc7\xe7","iI\xdb\xfb","oO\xdd\xfd","pP\xda\xfa","[{\xc8\xe8","]}\xdf\xff", + "aA\xc6\xe6","sS\xd9\xf9","dD\xd7\xf7","fF\xc1\xe1","gG\xd0\xf0","hH\xd2\xf2","jJ\xcf\xef","kK\xcc\xec","lL\xc4\xe4",";:\xd6\xf6","'\"\xdc\xfc","\\|", + "zZ\xd1\xf1","xX\xde\xfe","cC\xd3\xf3","vV\xcd\xed","bB\xc9\xe9","nN\xd4\xf4","mM\xd8\xf8",",<\xc2\xe2",".>\xc0\xe0","/?" }; /*** Russian keyboard layout (phantom key version) */ static const char main_key_RU_phantom[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?", + "qQ\xca\xea","wW\xc3\xe3","eE\xd5\xf5","rR\xcb\xeb","tT\xc5\xe5","yY\xce\xee","uU\xc7\xe7","iI\xdb\xfb","oO\xdd\xfd","pP\xda\xfa","[{\xc8\xe8","]}\xdf\xff", + "aA\xc6\xe6","sS\xd9\xf9","dD\xd7\xf7","fF\xc1\xe1","gG\xd0\xf0","hH\xd2\xf2","jJ\xcf\xef","kK\xcc\xec","lL\xc4\xe4",";:\xd6\xf6","'\"\xdc\xfc","\\|", + "zZ\xd1\xf1","xX\xde\xfe","cC\xd3\xf3","vV\xcd\xed","bB\xc9\xe9","nN\xd4\xf4","mM\xd8\xf8",",<\xc2\xe2",".>\xc0\xe0","/?", "<>" /* the phantom key */ }; @@ -500,9 +500,9 @@ static const char main_key_RU_phantom[MAIN_LEN][4] = static const char main_key_RU_koi8r[MAIN_LEN][4] = { "()","1!","2\"","3/","4$","5:","6,","7.","8;","9?","0%","-_","=+", - "��","��","��","��","��","��","��","��","��","��","��","��", - "��","��","��","��","��","��","��","��","��","��","��","\\|", - "��","��","��","��","��","��","��","��","��","/?", + "\xca\xea","\xc3\xe3","\xd5\xf5","\xcb\xeb","\xc5\xe5","\xce\xee","\xc7\xe7","\xdb\xfb","\xdd\xfd","\xda\xfa","\xc8\xe8","\xdf\xff", + "\xc6\xe6","\xd9\xf9","\xd7\xf7","\xc1\xe1","\xd0\xf0","\xd2\xf2","\xcf\xef","\xcc\xec","\xc4\xe4","\xd6\xf6","\xdc\xfc","\\|", + "\xd1\xf1","\xde\xfe","\xd3\xf3","\xcd\xed","\xc9\xe9","\xd4\xf4","\xd8\xf8","\xc2\xe2","\xc0\xe0","/?", "<>" /* the phantom key */ }; @@ -510,9 +510,9 @@ static const char main_key_RU_koi8r[MAIN_LEN][4] = static const char main_key_RU_cp1251[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?", + "qQ\xe9\xc9","wW\xf6\xd6","eE\xf3\xd3","rR\xea\xca","tT\xe5\xc5","yY\xed\xcd","uU\xe3\xc3","iI\xf8\xd8","oO\xf9\xd9","pP\xe7\xc7","[{\xf5\xd5","]}\xfa\xda", + "aA\xf4\xd4","sS\xfb\xdb","dD\xe2\xc2","fF\xe0\xc0","gG\xef\xcf","hH\xf0\xd0","jJ\xee\xce","kK\xeb\xcb","lL\xe4\xc4",";:\xe6\xc6","'\"\xfd\xdd","\\|", + "zZ\xff\xdf","xX\xf7\xd7","cC\xf1\xd1","vV\xec\xcc","bB\xe8\xc8","nN\xf2\xd2","mM\xfc\xdc",",<\xe1\xc1",".>\xfe\xde","/?", "<>" /* the phantom key */ }; @@ -520,19 +520,19 @@ static const char main_key_RU_cp1251[MAIN_LEN][4] = static const char main_key_RU_phonetic[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:","'\"","\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<",".>","/?", + "qQ\xd1\xf1","wW\xd7\xf7","eE\xc5\xe5","rR\xd2\xf2","tT\xd4\xf4","yY\xd9\xf9","uU\xd5\xf5","iI\xc9\xe9","oO\xcf\xef","pP\xd0\xf0","[{\xdb\xfb","]}\xdd\xfd", + "aA\xc1\xe1","sS\xd3\xf3","dD\xc4\xe4","fF\xc6\xe6","gG\xc7\xe7","hH\xc8\xe8","jJ\xca\xea","kK\xcb\xeb","lL\xcc\xec",";:","'\"","\\|", + "zZ\xda\xfa","xX\xd8\xf8","cC\xc3\xe3","vV\xd6\xf6","bB\xc2\xe2","nN\xce\xee","mM\xcd\xed",",<",".>","/?", "<>" /* the phantom key */ }; /*** Ukrainian keyboard layout KOI8-U */ static const char main_key_UA[MAIN_LEN][4] = { - "`~��","1!1!","2@2\"","3#3'","4$4*","5%5:","6^6,","7&7.","8*8;","9(9(","0)0)","-_-_","=+=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}��", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<��",".>��","/?/?", + "`~\xad\xbd","1!1!","2@2\"","3#3'","4$4*","5%5:","6^6,","7&7.","8*8;","9(9(","0)0)","-_-_","=+=+", + "qQ\xca\xea","wW\xc3\xe3","eE\xd5\xf5","rR\xcb\xeb","tT\xc5\xe5","yY\xce\xee","uU\xc7\xe7","iI\xdb\xfb","oO\xdd\xfd","pP\xda\xfa","[{\xc8\xe8","]}\xa7\xb7", + "aA\xc6\xe6","sS\xa6\xb6","dD\xd7\xf7","fF\xc1\xe1","gG\xd0\xf0","hH\xd2\xf2","jJ\xcf\xef","kK\xcc\xec","lL\xc4\xe4",";:\xd6\xf6","'\"\xa4\xb4","\\|\\|", + "zZ\xd1\xf1","xX\xde\xfe","cC\xd3\xf3","vV\xcd\xed","bB\xc9\xe9","nN\xd4\xf4","mM\xd8\xf8",",<\xc2\xe2",".>\xc0\xe0","/?/?", "<>" /* the phantom key */ }; @@ -540,29 +540,29 @@ static const char main_key_UA[MAIN_LEN][4] = /*** (as it appears on most of keyboards sold today) */ static const char main_key_UA_std[MAIN_LEN][4] = { - "��","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+", - "��","��","��","��","��","��","��","��","��","��","��","��", - "��","��","��","��","��","��","��","��","��","��","��","\\/", - "��","��","��","��","��","��","��","��","��",".,", + "\xad\xbd","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+", + "\xca\xea","\xc3\xe3","\xd5\xf5","\xcb\xeb","\xc5\xe5","\xce\xee","\xc7\xe7","\xdb\xfb","\xdd\xfd","\xda\xfa","\xc8\xe8","\xa7\xb7", + "\xc6\xe6","\xa6\xb6","\xd7\xf7","\xc1\xe1","\xd0\xf0","\xd2\xf2","\xcf\xef","\xcc\xec","\xc4\xe4","\xd6\xf6","\xa4\xb4","\\/", + "\xd1\xf1","\xde\xfe","\xd3\xf3","\xcd\xed","\xc9\xe9","\xd4\xf4","\xd8\xf8","\xc2\xe2","\xc0\xe0",".,", "<>" /* the phantom key */ }; /*** Russian keyboard layout KOI8-R (pair to the previous) */ static const char main_key_RU_std[MAIN_LEN][4] = { - "��","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+", - "��","��","��","��","��","��","��","��","��","��","��","��", - "��","��","��","��","��","��","��","��","��","��","��","\\/", - "��","��","��","��","��","��","��","��","��",".,", + "\xa3\xb3","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+", + "\xca\xea","\xc3\xe3","\xd5\xf5","\xcb\xeb","\xc5\xe5","\xce\xee","\xc7\xe7","\xdb\xfb","\xdd\xfd","\xda\xfa","\xc8\xe8","\xdf\xff", + "\xc6\xe6","\xd9\xf9","\xd7\xf7","\xc1\xe1","\xd0\xf0","\xd2\xf2","\xcf\xef","\xcc\xec","\xc4\xe4","\xd6\xf6","\xdc\xfc","\\/", + "\xd1\xf1","\xde\xfe","\xd3\xf3","\xcd\xed","\xc9\xe9","\xd4\xf4","\xd8\xf8","\xc2\xe2","\xc0\xe0",".,", "<>" /* the phantom key */ }; /*** Spanish keyboard layout (setxkbmap es) */ static const char main_key_ES[MAIN_LEN][4] = { - "��","1!","2\"","3�","4$","5%","6&","7/","8(","9)","0=","'?","��", + "\xba\xaa","1!","2\"","3\xb7","4$","5%","6&","7/","8(","9)","0=","'?","\xa1\xbf", "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","`^","+*", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","��", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf1\xd1","\xb4\xa8","\xe7\xc7", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -570,9 +570,9 @@ static const char main_key_ES[MAIN_LEN][4] = /*** Belgian keyboard layout ***/ static const char main_key_BE[MAIN_LEN][4] = { - "","&1|","�2@","\"3#","'4","(5","�6^","�7","!8","�9{","�0}",")�","-_", - "aA","zZ","eE�","rR","tT","yY","uU","iI","oO","pP","^�[","$*]", - "qQ","sS�","dD","fF","gG","hH","jJ","kK","lL","mM","�%�","��`", + "","&1|","\xe92@","\"3#","'4","(5","\xa76^","\xe87","!8","\xe79{","\xe00}",")\xb0","-_", + "aA","zZ","eE\xa4","rR","tT","yY","uU","iI","oO","pP","^\xa8[","$*]", + "qQ","sS\xdf","dD","fF","gG","hH","jJ","kK","lL","mM","\xf9%\xb4","\xb5\xa3`", "wW","xX","cC","vV","bB","nN",",?",";.",":/","=+~", "<>\\" }; @@ -580,29 +580,29 @@ static const char main_key_BE[MAIN_LEN][4] = /*** Hungarian keyboard layout (setxkbmap hu) */ static const char main_key_HU[MAIN_LEN][4] = { - "0�","1'","2\"","3+","4!","5%","6/","7=","8(","9)","��","��","��", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","��", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","��", + "0\xa7","1'","2\"","3+","4!","5%","6/","7=","8(","9)","\xf6\xd6","\xfc\xdc","\xf3\xd3", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xf5\xd5","\xfa\xda", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe9\xc9","\xe1\xc1","\xfb\xdb", "yY","xX","cC","vV","bB","nN","mM",",?",".:","-_", - "��" + "\xed\xcd" }; /*** Polish (programmer's) keyboard layout ***/ static const char main_key_PL[MAIN_LEN][4] = { - "`~","1!","2@","3#","4$","5%","6^","7&�","8*","9(","0)","-_","=+", - "qQ","wW","eE��","rR","tT","yY","uU","iI","oO��","pP","[{","]}", - "aA��","sS��","dD","fF","gG","hH","jJ","kK","lL��",";:","'\"","\\|", - "zZ��","xX��","cC��","vV","bB","nN��","mM",",<",".>","/?", + "`~","1!","2@","3#","4$","5%","6^","7&\xa7","8*","9(","0)","-_","=+", + "qQ","wW","eE\xea\xca","rR","tT","yY","uU","iI","oO\xf3\xd3","pP","[{","]}", + "aA\xb1\xa1","sS\xb6\xa6","dD","fF","gG","hH","jJ","kK","lL\xb3\xa3",";:","'\"","\\|", + "zZ\xbf\xaf","xX\xbc\xac","cC\xe6\xc6","vV","bB","nN\xf1\xd1","mM",",<",".>","/?", "<>|" }; /*** Slovenian keyboard layout (setxkbmap si) ***/ static const char main_key_SI[MAIN_LEN][4] = { - "��","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","+*", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","��", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","��", + "\xb8\xa8","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","+*", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xb9\xa9","\xf0\xd0", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe8\xc8","\xe6\xc6","\xbe\xae", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -611,9 +611,9 @@ static const char main_key_SI[MAIN_LEN][4] = static const char main_key_SR[MAIN_LEN][4] = { "`~","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","+*", - "��","��","��","��","��","��","��","��","��","��","��","[]", - "��","��","��","��","��","��","��","��","��","��","��","-_", - "��","��","��","��","��","��","��",",;",".:","��", + "\xa9\xb9","\xaa\xba","\xc5\xe5","\xd2\xf2","\xd4\xf4","\xda\xfa","\xd5\xf5","\xc9\xe9","\xcf\xef","\xd0\xf0","\xdb\xfb","[]", + "\xc1\xe1","\xd3\xf3","\xc4\xe4","\xc6\xe6","\xc7\xe7","\xc8\xe8","\xa8\xb8","\xcb\xeb","\xcc\xec","\xde\xfe","\xab\xbb","-_", + "\xa1\xb1","\xaf\xbf","\xc3\xe3","\xd7\xf7","\xc2\xe2","\xce\xee","\xcd\xed",",;",".:","\xd6\xf6", "<>" /* the phantom key */ }; @@ -621,9 +621,9 @@ static const char main_key_SR[MAIN_LEN][4] = static const char main_key_US_SR[MAIN_LEN][4] = { "`~","1!","2@2\"","3#","4$","5%","6^6&","7&7/","8*8(","9(9)","0)0=","-_'?","=++*", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{��","]}[]", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"��","\\|-_", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<,;",".>.:","/?��", + "qQ\xa9\xb9","wW\xaa\xba","eE\xc5\xe5","rR\xd2\xf2","tT\xd4\xf4","yY\xda\xfa","uU\xd5\xf5","iI\xc9\xe9","oO\xcf\xef","pP\xd0\xf0","[{\xdb\xfb","]}[]", + "aA\xc1\xe1","sS\xd3\xf3","dD\xc4\xe4","fF\xc6\xe6","gG\xc7\xe7","hH\xc8\xe8","jJ\xa8\xb8","kK\xcb\xeb","lL\xcc\xec",";:\xde\xfe","'\"\xab\xbb","\\|-_", + "zZ\xa1\xb1","xX\xaf\xbf","cC\xc3\xe3","vV\xd7\xf7","bB\xc2\xe2","nN\xce\xee","mM\xcd\xed",",<,;",".>.:","/?\xd6\xf6", "<>" /* the phantom key */ }; @@ -631,8 +631,8 @@ static const char main_key_US_SR[MAIN_LEN][4] = static const char main_key_HR_jelly[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{��","]}��", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:��","'\"��","\\|��", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{\xb9\xa9","]}\xf0\xd0", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:\xe8\xc8","'\"\xe6\xc6","\\|\xbe\xae", "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", "<>|" }; @@ -640,9 +640,9 @@ static const char main_key_HR_jelly[MAIN_LEN][4] = /*** Croatian keyboard layout (setxkbmap hr) ***/ static const char main_key_HR[MAIN_LEN][4] = { - "��","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","+*", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","��", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","��", + "\xb8\xa8","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","+*", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xb9\xa9","\xf0\xd0", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe8\xc8","\xe6\xc6","\xbe\xae", "yY","xX","cC","vV","bB","nN","mM",",;",".:","/?", "<>" }; @@ -679,9 +679,9 @@ static const char main_key_JA_pc98x1[MAIN_LEN][4] = /*** Brazilian ABNT-2 keyboard layout (contributed by Raul Gomes Fernandes) */ static const char main_key_PT_br[MAIN_LEN][4] = { - "'\"","1!","2@","3#","4$","5%","6�","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","�`","[{", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","~^","]}", + "'\"","1!","2@","3#","4$","5%","6\xa8","7&","8*","9(","0)","-_","=+", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xb4`","[{", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xe7\xc7","~^","]}", "\\|","zZ","xX","cC","vV","bB","nN","mM",",<",".>",";:","/?", }; @@ -708,9 +708,9 @@ static const char main_key_US_intl[MAIN_LEN][4] = - brokenbar replaced with bar */ static const char main_key_SK[MAIN_LEN][4] = { - ";0","+1","�2","�3","�4","�5","�6","�7","�8","�9","�0","=%","'v", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","�/","�(", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","�\"","�!","�)", + ";0","+1","\xb52","\xb93","\xe84","\xbb5","\xbe6","\xfd7","\xe18","\xed9","\xe90","=%","'v", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xfa/","\xe4(", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf4\"","\xa7!","\xf2)", "zZ","xX","cC","vV","bB","nN","mM",",?",".:","-_", "<>" }; @@ -718,9 +718,9 @@ static const char main_key_SK[MAIN_LEN][4] = /*** Czech keyboard layout (setxkbmap cz) */ static const char main_key_CZ[MAIN_LEN][4] = { - ";","+1","�2","�3","�4","�5","�6","�7","�8","�9","�0","=%","��", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","�/",")(", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","�\"","�!","�'", + ";","+1","\xec2","\xb93","\xe84","\xf85","\xbe6","\xfd7","\xe18","\xed9","\xe90","=%","\xb4\xb7", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","\xfa/",")(", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf9\"","\xa7!","\xa8'", "yY","xX","cC","vV","bB","nN","mM",",?",".:","-_", "\\" }; @@ -728,9 +728,9 @@ static const char main_key_CZ[MAIN_LEN][4] = /*** Czech keyboard layout (setxkbmap cz_qwerty) */ static const char main_key_CZ_qwerty[MAIN_LEN][4] = { - ";","+1","�2","�3","�4","�5","�6","�7","�8","�9","�0","=%","��", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","�/",")(", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","�\"","�!","�'", + ";","+1","\xec2","\xb93","\xe84","\xf85","\xbe6","\xfd7","\xe18","\xed9","\xe90","=%","\xb4\xb7", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xfa/",")(", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf9\"","\xa7!","\xa8'", "zZ","xX","cC","vV","bB","nN","mM",",?",".:","-_", "\\" }; @@ -739,18 +739,18 @@ static const char main_key_CZ_qwerty[MAIN_LEN][4] = static const char main_key_SK_prog[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ��","wW��","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{","]}", - "aA��","sS��","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:","'\"","\\|", - "zZ��","xX�","cC��","vV��","bB","nN��","mM��",",<",".>","/?", + "qQ\xe4\xc4","wW\xec\xcc","eE\xe9\xc9","rR\xf8\xd8","tT\xbb\xab","yY\xfd\xdd","uU\xf9\xd9","iI\xed\xcd","oO\xf3\xd3","pP\xf6\xd6","[{","]}", + "aA\xe1\xc1","sS\xb9\xa9","dD\xef\xcf","fF\xeb\xcb","gG\xe0\xc0","hH\xfa\xda","jJ\xfc\xdc","kK\xf4\xd4","lL\xb5\xa5",";:","'\"","\\|", + "zZ\xbe\xae","xX\xa4","cC\xe8\xc8","vV\xe7\xc7","bB","nN\xf2\xd2","mM\xe5\xc5",",<",".>","/?", "<>" }; /*** Czech keyboard layout (see cssk_ibm(cs_qwerty) in xkbsel) */ static const char main_key_CS[MAIN_LEN][4] = { - ";","+1","�2","�3","�4","�5","�6","�7","�8","�9","�0�)","=%","", - "qQ\\","wW|","eE","rR","tT","yY","uU","iI","oO","pP","�/[{",")(]}", - "aA","sS�","dD�","fF[","gG]","hH","jJ","kK�","lL�","�\"$","�!�","�'", + ";","+1","\xec2","\xb93","\xe84","\xf85","\xbe6","\xfd7","\xe18","\xed9","\xe90\xbd)","=%","", + "qQ\\","wW|","eE","rR","tT","yY","uU","iI","oO","pP","\xfa/[{",")(]}", + "aA","sS\xf0","dD\xd0","fF[","gG]","hH","jJ","kK\xb3","lL\xa3","\xf9\"$","\xa7!\xdf","\xa8'", "zZ>","xX#","cC&","vV@","bB{","nN}","mM",",?<",".:>","-_*", "<>\\|" }; @@ -758,9 +758,9 @@ static const char main_key_CS[MAIN_LEN][4] = /*** Latin American keyboard layout (contributed by Gabriel Orlando Garcia) */ static const char main_key_LA[MAIN_LEN][4] = { - "|�","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","��", - "qQ@","wW","eE","rR","tT","yY","uU","iI","oO","pP","��","+*", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","{[^","}]", + "|\xb0","1!","2\"","3#","4$","5%","6&","7/","8(","9)","0=","'?","\xbf\xa1", + "qQ@","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xb4\xa8","+*", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf1\xd1","{[^","}]", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-_", "<>" }; @@ -768,29 +768,29 @@ static const char main_key_LA[MAIN_LEN][4] = /*** Lithuanian keyboard layout (setxkbmap lt) */ static const char main_key_LT_B[MAIN_LEN][4] = { - "`~","��","��","��","��","��","��","��","��","�(","�)","-_","��", + "`~","\xe0\xc0","\xe8\xc8","\xe6\xc6","\xeb\xcb","\xe1\xc1","\xf0\xd0","\xf8\xd8","\xfb\xdb","\xa5(","\xb4)","-_","\xfe\xde", "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","[{","]}", "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","'\"","\\|", "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", - "��" + "\xaa\xac" }; /*** Turkish keyboard Layout */ static const char main_key_TK[MAIN_LEN][4] = { -"\"�","1!","2'","3^#","4+$","5%","6&","7/{","8([","9)]","0=}","*?\\","-_", -"qQ@","wW","eE","rR","tT","yY","uU","�I�","oO","pP","��","��~", -"aA�","sS�","dD","fF","gG","hH","jJ","kK","lL","��","i�",",;`", -"zZ","xX","cC","vV","bB","nN","mM","��","��",".:" +"\"\xe9","1!","2'","3^#","4+$","5%","6&","7/{","8([","9)]","0=}","*?\\","-_", +"qQ@","wW","eE","rR","tT","yY","uU","\xfdI\xee","oO","pP","\xf0\xd0","\xfc\xdc~", +"aA\xe6","sS\xdf","dD","fF","gG","hH","jJ","kK","lL","\xfe\xde","i\xdd",",;`", +"zZ","xX","cC","vV","bB","nN","mM","\xf6\xd6","\xe7\xc7",".:" }; /*** Turkish keyboard layout (setxkbmap tr) */ static const char main_key_TR[MAIN_LEN][4] = { "\"\\","1!","2'","3^","4+","5%","6&","7/","8(","9)","0=","*?","-_", -"qQ","wW","eE","rR","tT","yY","uU","\xb9I","oO","pP","\xbb\xab","��", +"qQ","wW","eE","rR","tT","yY","uU","\xb9I","oO","pP","\xbb\xab","\xfc\xdc", "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xba\xaa","i\0",",;", -"zZ","xX","cC","vV","bB","nN","mM","��","��",".:", +"zZ","xX","cC","vV","bB","nN","mM","\xf6\xd6","\xe7\xc7",".:", "<>" }; @@ -799,8 +799,8 @@ static const char main_key_TR_F[MAIN_LEN][4] = { "+*","1!","2\"","3^#","4$","5%","6&","7'","8(","9)","0=","/?","-_", "fF","gG","\xbb\xab","\xb9I","oO","dD","rR","nN","hH","pP","qQ","wW", -"uU","i\0","eE","aA","��","tT","kK","mM","lL","yY","\xba\xaa","xX", -"jJ","��","vV","cC","��","zZ","sS","bB",".:",",;", +"uU","i\0","eE","aA","\xfc\xdc","tT","kK","mM","lL","yY","\xba\xaa","xX", +"jJ","\xf6\xd6","vV","cC","\xe7\xc7","zZ","sS","bB",".:",",;", "<>" }; @@ -808,9 +808,9 @@ static const char main_key_TR_F[MAIN_LEN][4] = static const char main_key_IL[MAIN_LEN][4] = { "`~;","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ/","wW'","eE�","rR�","tT�","yY�","uU�","iI�","oO�","pP�","[{","]}", - "aA�","sS�","dD�","fF�","gG�","hH�","jJ�","kK�","lL�",";:�","\'\",","\\|", - "zZ�","xX�","cC�","vV�","bB�","nN�","mM�",",<�",".>�","/?.", + "qQ/","wW'","eE\xf7","rR\xf8","tT\xe0","yY\xe8","uU\xe5","iI\xef","oO\xed","pP\xf4","[{","]}", + "aA\xf9","sS\xe3","dD\xe2","fF\xeb","gG\xf2","hH\xe9","jJ\xe7","kK\xec","lL\xea",";:\xf3","\'\",","\\|", + "zZ\xe6","xX\xf1","cC\xe1","vV\xe4","bB\xf0","nN\xee","mM\xf6",",<\xfa",".>\xf5","/?.", "<>" }; @@ -818,9 +818,9 @@ static const char main_key_IL[MAIN_LEN][4] = static const char main_key_IL_phonetic[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ�","wW�","eE�","rR�","tT�","yY�","uU�","iI�","oO�","pP�","[{","]}", - "aA�","sS�","dD�","fF�","gG�","hH�","jJ�","kK�","lL�",";:","'\"","\\|", - "zZ�","xX�","cC�","vV�","bB�","nN�","mM�",",<",".>","/?", + "qQ\xf7","wW\xe5","eE\xe0","rR\xf8","tT\xfa","yY\xf2","uU\xe5","iI\xe9","oO\xf1","pP\xf4","[{","]}", + "aA\xe0","sS\xf9","dD\xe3","fF\xf4","gG\xe2","hH\xe4","jJ\xe9","kK\xeb","lL\xec",";:","'\"","\\|", + "zZ\xe6","xX\xe7","cC\xf6","vV\xe5","bB\xe1","nN\xf0","mM\xee",",<",".>","/?", "<>" }; @@ -828,9 +828,9 @@ static const char main_key_IL_phonetic[MAIN_LEN][4] = static const char main_key_IL_saharon[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ�","wW�","eE","rR�","tT�","yY�","uU","iI","oO","pP�","[{","]}", - "aA�","sS�","dD�","fF�","gG�","hH�","jJ�","kK�","lL�",";:","'\"","\\|", - "zZ�","xX�","cC�","vV�","bB�","nN�","mM�",",<",".>","/?", + "qQ\xf7","wW\xf1","eE","rR\xf8","tT\xe8","yY\xe3","uU","iI","oO","pP\xf4","[{","]}", + "aA\xe0","sS\xe5","dD\xec","fF\xfa","gG\xe2","hH\xe4","jJ\xf9","kK\xeb","lL\xe9",";:","'\"","\\|", + "zZ\xe6","xX\xe7","cC\xf6","vV\xf2","bB\xe1","nN\xf0","mM\xee",",<",".>","/?", "<>" }; @@ -840,19 +840,19 @@ static const char main_key_IL_saharon[MAIN_LEN][4] = static const char main_key_EL[MAIN_LEN][4] = { "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", - "qQ;:","wW","eE��","rR��","tT��","yY��","uU��","iI��","oO��","pP��","[{","]}", - "aA��","sS","dD��","fF��","gG��","hH��","jJ��","kK��","lL��",";:��","'\"","\\|", - "zZ��","xX��","cC��","vV��","bB��","nN��","mM��",",<",".>","/?", + "qQ;:","wW","eE\xe5\xc5","rR\xf1\xd1","tT\xf4\xd4","yY\xf5\xd5","uU\xe8\xc8","iI\xe9\xc9","oO\xef\xcf","pP\xf0\xd0","[{","]}", + "aA\xe1\xc1","sS","dD\xe4\xc4","fF\xf6\xd6","gG\xe3\xc3","hH\xe7\xc7","jJ\xee\xce","kK\xea\xca","lL\xeb\xcb",";:\xb4\xa8","'\"","\\|", + "zZ\xe6\xc6","xX\xf7\xd7","cC\xf8\xd8","vV\xf9\xd9","bB\xe2\xc2","nN\xed\xcd","mM\xec\xcc",",<",".>","/?", "<>" }; /*** Thai (Kedmanee) keyboard layout by Supphachoke Suntiwichaya <mrchoke(a)opentle.org> */ static const char main_key_th[MAIN_LEN][4] = { - "`~_%","1!�+","2@/�","3#-�","4$��","5%��","6^��","7&��","8*��","9(��","0)��","-_��","=+��", - "qQ��","wW�\"","eEӮ","rR��","tTи","yY��","uU��","iIó","oO��","pP","[{��","]}�,", - "aA��","sS˦","dD��","fF��","gG�","hH��","jJ��","kK��","lL��",";:ǫ","\'\"�.","\\|��", - "zZ�(","xX�)","cC�","vV��","bB�","nN��","mM�?",",<��",".>��","/?��" + "`~_%","1!\xe5+","2@/\xf1","3#-\xf2","4$\xc0\xf3","5%\xb6\xf4","6^\xd8\xd9","7&\xd6\xdf","8*\xa4\xf5","9(\xb5\xf6","0)\xa8\xf7","-_\xa2\xf8","=+\xaa\xf9", + "qQ\xe6\xf0","wW\xe4\"","eE\xd3\xae","rR\xbe\xb1","tT\xd0\xb8","yY\xd1\xed","uU\xd5\xea","iI\xc3\xb3","oO\xb9\xcf","pP\xc2\xad","[{\xba\xb0","]}\xc5,", + "aA\xbf\xc4","sS\xcb\xa6","dD\xa1\xaf","fF\xb4\xe2","gG\xe0\xac","hH\xe9\xe7","jJ\xe8\xeb","kK\xd2\xc9","lL\xca\xc8",";:\xc7\xab","\'\"\xa7.","\\|\xa3\xa5", + "zZ\xbc(","xX\xbb)","cC\xe1\xa9","vV\xcd\xce","bB\xda","nN\xd7\xec","mM\xb7?",",<\xc1\xb2",".>\xe3\xcc","/?\xbd\xc6" }; /*** VNC keyboard layout */ @@ -879,9 +879,9 @@ static const char main_key_vnc[MAIN_LEN][4] = /*** Dutch keyboard layout (setxkbmap nl) ***/ static const char main_key_NL[MAIN_LEN][4] = { - "@�","1!","2\"","3#","4$","5%","6&","7_","8(","9)","0'","/?","�~", - "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","�~","*|", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","+�","'`","<>", + "@\xa7","1!","2\"","3#","4$","5%","6&","7_","8(","9)","0'","/?","\xb0~", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xa8~","*|", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","+\xb1","'`","<>", "zZ","xX","cC","vV","bB","nN","mM",",;",".:","-=", "[]" }; -- 2.15.1

2 1

[PATCH] webservices/tests: Fix resource leak.
by Andrey Gusev 04 Jan '18

04 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/webservices/tests/channel.c | 4 ++++ dlls/webservices/tests/proxy.c | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 32820fed1f..17a0b58ac8 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -976,6 +976,7 @@ START_TEST(channel) thread = start_listener( &info ); test_message_read_write( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; info.binding = WS_TCP_CHANNEL_BINDING; @@ -984,6 +985,7 @@ START_TEST(channel) thread = start_listener( &info ); test_duplex_session( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); info.type = WS_CHANNEL_TYPE_DUPLEX; info.binding = WS_UDP_CHANNEL_BINDING; @@ -992,6 +994,7 @@ START_TEST(channel) thread = start_listener( &info ); test_WsAcceptChannel( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; info.binding = WS_TCP_CHANNEL_BINDING; @@ -999,6 +1002,7 @@ START_TEST(channel) thread = start_listener( &info ); test_WsAcceptChannel( &info ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); if (firewall_enabled) set_firewall( APP_REMOVE ); } diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index bc7ef81db7..3899665873 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -729,6 +729,7 @@ START_TEST(proxy) info.event = CreateEventW( NULL, 0, 0, NULL ); thread = CreateThread( NULL, 0, server_proc, &info, 0, NULL ); ok( thread != NULL, "failed to create server thread %u\n", GetLastError() ); + CloseHandle(thread); ret = WaitForSingleObject( info.event, 3000 ); ok(ret == WAIT_OBJECT_0, "failed to start test server %u\n", GetLastError()); -- 2.13.6

2 1

[PATCH] oledb32/tests: Add DataConvert DBTYPE_BSTR->DBTYPE_DBTIMESTAMP test
by Alistair Leslie-Hughes 04 Jan '18

04 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/tests/convert.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 6b0dd55..0825624 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3608,7 +3608,10 @@ static void test_converttovar(void) static void test_converttotimestamp(void) { static const WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0}; + static const WCHAR strFullW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2', + '.','0','1','7','0','0','0','0','0','0',0}; DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; + DBTIMESTAMP ts1 = {2013, 5, 14, 2, 4, 12, 17000000}; DBTIMESTAMP dst; DBSTATUS dst_status; DBLENGTH dst_len; @@ -3635,6 +3638,15 @@ static void test_converttotimestamp(void) ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); SysFreeString(bstr); + bstr = SysAllocString(strFullW); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + V_VT(&var) = VT_NULL; dst_len = 77; hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBTIMESTAMP, sizeof(var), &dst_len, &var, &dst, 2, 0, &dst_status, 0, 0, 0); -- 1.9.1

2 1

[PATCH] shell32: Fix return value for CreateWindowExW.
by Andrey Gusev 04 Jan '18

04 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/shell32/control.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index b3931544e4..72b213261d 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -634,12 +634,13 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) if (!RegisterClassExW(&wc)) return; - CreateWindowExW(0, wc.lpszClassName, appName, - WS_OVERLAPPEDWINDOW | WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - hWnd, NULL, hInst, panel); - if (!panel->hWnd) return; + panel->hWnd = CreateWindowExW(0, wc.lpszClassName, appName, + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + hWnd, NULL, hInst, panel); + if (!panel->hWnd) + return FALSE; while (GetMessageW(&msg, panel->hWnd, 0, 0)) { TranslateMessage(&msg); -- 2.13.6

3 2

[PATCH] advapi32/tests: Fix resource leak.
by Andrey Gusev 04 Jan '18

04 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/advapi32/tests/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 51dcf90851..4e584eb08f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3036,6 +3036,7 @@ static void test_process_security_child(void) handle = OpenProcess( PROCESS_VM_READ, FALSE, GetCurrentProcessId() ); todo_wine ok(handle == NULL, "OpenProcess(PROCESS_VM_READ) should have failed\n"); + CloseHandle( handle ); handle = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); todo_wine ok(handle == NULL, "OpenProcess(PROCESS_ALL_ACCESS) should have failed\n"); -- 2.13.6

2 1

[PATCH tools] patches: Title the third column "Submitter" rather than "Author"
by Alex Henrie 04 Jan '18

04 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- The person who sent the patch is not necessarily the person who wrote it. patches/update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/update b/patches/update index 03af078..6d58ad9 100755 --- a/patches/update +++ b/patches/update @@ -144,7 +144,7 @@ print INDEX "<div id=\"logo_blurb\">Wine source repository – Patch status< print INDEX "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; print INDEX "<table id=\"main_table\" class=\"main\"><thead><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", - "<th colspan=\"2\" class=\"author\">Author</th>", + "<th colspan=\"2\" class=\"author\">Submitter</th>", "<th class=\"subject\">Subject</th>", "<th class=\"author\">Reviewer</th>", "<th class=\"status\">Sign</th>", -- 2.15.1

2 1

[PATCH] ntdll/tests: Fix resource leak.
by Andrey Gusev 04 Jan '18

04 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ntdll/tests/atom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 972a54ea9c..a481758ee6 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -179,6 +179,7 @@ static void test_NtAtom(void) testThread = CreateThread(NULL, 0, RtlAtomTestThread, &AtomTable, 0, NULL); WaitForSingleObject(testThread, INFINITE); + CloseHandle(testThread); Len = 64; res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, &RefCount, &PinCount, Name, &Len); -- 2.13.6

1 0

[PATCH] wtsapi32: fix copy/paste error in comment
by Louis Lenders 04 Jan '18

04 Jan '18

1 0

[PATCH 1/2] ws2_32/tests: Drop socket test workarounds for Windows <= 2000
by Alex Henrie 04 Jan '18

04 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 222 ++++++++++++++--------------------------------- 1 file changed, 65 insertions(+), 157 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cb8b7cead7..22b733123a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1270,8 +1270,7 @@ static void test_WithWSAStartup(void) WSASetLastError(0xdeadbeef); res = WSACleanup(); error = WSAGetLastError(); - ok ( (res == SOCKET_ERROR && error == WSANOTINITIALISED) || - broken(res == 0), /* WinME */ + ok ( res == SOCKET_ERROR && error == WSANOTINITIALISED, "WSACleanup returned %d WSAGetLastError is %d\n", res, error); } @@ -1656,10 +1655,8 @@ todo_wine trace("provider name '%s', family %d, type %d, proto %d\n", infoA.szProtocol, prottest[i].family, prottest[i].type, prottest[i].proto); - ok(infoA.szProtocol[0] || broken(!infoA.szProtocol[0]) /* NT4 */, - "WSAPROTOCOL_INFOA was not filled\n"); - ok(infoW.szProtocol[0] || broken(!infoA.szProtocol[0]) /* NT4 */, - "WSAPROTOCOL_INFOW was not filled\n"); + ok(infoA.szProtocol[0], "WSAPROTOCOL_INFOA was not filled\n"); + ok(infoW.szProtocol[0], "WSAPROTOCOL_INFOW was not filled\n"); WideCharToMultiByte(CP_ACP, 0, infoW.szProtocol, -1, providername, sizeof(providername), NULL, NULL); @@ -2951,10 +2948,6 @@ static void test_WSAEnumNetworkEvents(void) struct sockaddr_in address; HANDLE event; WSANETWORKEVENTS net_events; - /* Windows 2000 Pro without SP installed (testbot) will crash if - * WSAEnumNetworkEvents have a NULL event, so skip this test in <= 2000 */ - DWORD ver = GetVersion() & 0xFFFF; - BOOL supports_null = ((ver & 0xFF) << 8 | (ver >> 8)) > 0x0500; memset(&address, 0, sizeof(address)); address.sin_addr.s_addr = htonl(INADDR_ANY); @@ -2963,8 +2956,6 @@ static void test_WSAEnumNetworkEvents(void) /* This test follows the steps from bugs 10204 and 24946 */ for (l = 0; l < 2; l++) { - if (l == 1 && !supports_null && broken(1)) continue; - for (i = 0; i < sizeof(sock_type) / sizeof(sock_type[0]); i++) { if (i == 2) @@ -3048,13 +3039,8 @@ static void test_WSAAddressToStringA(void) CHAR expect6_1[] = "::1"; CHAR expect6_2[] = "20ab::1"; CHAR expect6_3[] = "[20ab::2001]:33274"; - CHAR expect6_3_nt[] = "20ab::2001@33274"; - CHAR expect6_3_w2k[] = "20ab::2001"; CHAR expect6_3_2[] = "[20ab::2001%4660]:33274"; - CHAR expect6_3_2_nt[] = "4660/20ab::2001@33274"; - CHAR expect6_3_2_w2k[] = "20ab::2001%4660"; CHAR expect6_3_3[] = "20ab::2001%4660"; - CHAR expect6_3_3_nt[] = "4660/20ab::2001"; len = 0; @@ -3157,14 +3143,8 @@ static void test_WSAAddressToStringA(void) ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !strcmp( address6, expect6_3 ) || - broken( !strcmp( address6, expect6_3_nt ) ) || /* NT4 */ - broken( !strcmp( address6, expect6_3_w2k ) ), /* Win2000 */ - "Expected: %s, got: %s\n", expect6_3, address6 ); - ok( len == sizeof(expect6_3) || - broken( len == sizeof(expect6_3_nt) ) || /* NT4 */ - broken( len == sizeof(expect6_3_w2k) ), /* Win2000 */ - "Got size %d\n", len); + ok( !strcmp( address6, expect6_3 ), "Expected: %s, got: %s\n", expect6_3, address6 ); + ok( len == sizeof(expect6_3), "Got size %d\n", len ); /* Test IPv6 address, port number and scope_id */ len = sizeof(address6); @@ -3176,14 +3156,8 @@ static void test_WSAAddressToStringA(void) ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !strcmp( address6, expect6_3_2 ) || - broken( !strcmp( address6, expect6_3_2_nt ) ) || /* NT4 */ - broken( !strcmp( address6, expect6_3_2_w2k ) ), /* Win2000 */ - "Expected: %s, got: %s\n", expect6_3_2, address6 ); - ok( len == sizeof(expect6_3_2) || - broken( len == sizeof(expect6_3_2_nt) ) || /* NT4 */ - broken( len == sizeof(expect6_3_2_w2k) ), /* Win2000 */ - "Got size %d\n", len); + ok( !strcmp( address6, expect6_3_2 ), "Expected: %s, got: %s\n", expect6_3_2, address6 ); + ok( len == sizeof(expect6_3_2), "Got size %d\n", len ); /* Test IPv6 address and scope_id */ len = sizeof(address6); @@ -3195,12 +3169,8 @@ static void test_WSAAddressToStringA(void) ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !strcmp( address6, expect6_3_3 ) || - broken( !strcmp( address6, expect6_3_3_nt ) ), /* NT4 */ - "Expected: %s, got: %s\n", expect6_3_3, address6 ); - ok( len == sizeof(expect6_3_3) || - broken( len == sizeof(expect6_3_3_nt) ), /* NT4 */ - "Got size %d\n", len); + ok( !strcmp( address6, expect6_3_3 ), "Expected: %s, got: %s\n", expect6_3_3, address6 ); + ok( len == sizeof(expect6_3_3), "Got size %d\n", len ); end: if (v6 != INVALID_SOCKET) @@ -3232,13 +3202,8 @@ static void test_WSAAddressToStringW(void) WCHAR expect6_1[] = {':',':','1',0}; WCHAR expect6_2[] = {'2','0','a','b',':',':','1',0}; WCHAR expect6_3[] = {'[','2','0','a','b',':',':','2','0','0','1',']',':','3','3','2','7','4',0}; - WCHAR expect6_3_nt[] = {'2','0','a','b',':',':','2','0','0','1','@','3','3','2','7','4',0}; - WCHAR expect6_3_w2k[] = {'2','0','a','b',':',':','2','0','0','1',0}; WCHAR expect6_3_2[] = {'[','2','0','a','b',':',':','2','0','0','1','%','4','6','6','0',']',':','3','3','2','7','4',0}; - WCHAR expect6_3_2_nt[] = {'4','6','6','0','/','2','0','a','b',':',':','2','0','0','1','@','3','3','2','7','4',0}; - WCHAR expect6_3_2_w2k[] = {'2','0','a','b',':',':','2','0','0','1','%','4','6','6','0',0}; WCHAR expect6_3_3[] = {'2','0','a','b',':',':','2','0','0','1','%','6','5','5','3','4',0}; - WCHAR expect6_3_3_nt[] = {'6','5','5','3','4','/','2','0','a','b',':',':','2','0','0','1',0}; len = 0; @@ -3343,15 +3308,9 @@ static void test_WSAAddressToStringW(void) ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_3 ) || - broken( !lstrcmpW( address6, expect6_3_nt ) ) || /* NT4 */ - broken( !lstrcmpW( address6, expect6_3_w2k ) ), /* Win2000 */ - "Expected: %s, got: %s\n", wine_dbgstr_w(expect6_3), - wine_dbgstr_w(address6) ); - ok( len == sizeof(expect6_3)/sizeof(WCHAR) || - broken(len == sizeof(expect6_3_nt)/sizeof(WCHAR) ) || /* NT4 */ - broken(len == sizeof(expect6_3_w2k)/sizeof(WCHAR) ), /* Win2000 */ - "Got %d\n", len); + ok( !lstrcmpW( address6, expect6_3 ), + "Expected: %s, got: %s\n", wine_dbgstr_w(expect6_3), wine_dbgstr_w(address6) ); + ok( len == sizeof(expect6_3)/sizeof(WCHAR), "Got %d\n", len ); /* Test IPv6 address, port number and scope_id */ len = sizeof(address6)/sizeof(WCHAR); @@ -3363,15 +3322,9 @@ static void test_WSAAddressToStringW(void) ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_3_2 ) || - broken( !lstrcmpW( address6, expect6_3_2_nt ) ) || /* NT4 */ - broken( !lstrcmpW( address6, expect6_3_2_w2k ) ), /* Win2000 */ - "Expected: %s, got: %s\n", wine_dbgstr_w(expect6_3_2), - wine_dbgstr_w(address6) ); - ok( len == sizeof(expect6_3_2)/sizeof(WCHAR) || - broken( len == sizeof(expect6_3_2_nt)/sizeof(WCHAR) ) || /* NT4 */ - broken( len == sizeof(expect6_3_2_w2k)/sizeof(WCHAR) ), /* Win2000 */ - "Got %d\n", len); + ok( !lstrcmpW( address6, expect6_3_2 ), + "Expected: %s, got: %s\n", wine_dbgstr_w(expect6_3_2), wine_dbgstr_w(address6) ); + ok( len == sizeof(expect6_3_2)/sizeof(WCHAR), "Got %d\n", len ); /* Test IPv6 address and scope_id */ len = sizeof(address6)/sizeof(WCHAR); @@ -3383,13 +3336,9 @@ static void test_WSAAddressToStringW(void) ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_3_3 ) || - broken( !lstrcmpW( address6, expect6_3_3_nt ) ), /* NT4 */ - "Expected: %s, got: %s\n", wine_dbgstr_w(expect6_3_3), - wine_dbgstr_w(address6) ); - ok( len == sizeof(expect6_3_3)/sizeof(WCHAR) || - broken( len == sizeof(expect6_3_3_nt)/sizeof(WCHAR) ), /* NT4 */ - "Got %d\n", len); + ok( !lstrcmpW( address6, expect6_3_3 ), + "Expected: %s, got: %s\n", wine_dbgstr_w(expect6_3_3), wine_dbgstr_w(address6) ); + ok( len == sizeof(expect6_3_3)/sizeof(WCHAR), "Got %d\n", len ); end: if (v6 != INVALID_SOCKET) @@ -3600,9 +3549,7 @@ static void test_WSAStringToAddressW(void) ok( (ret == 0 && sin->sin_addr.s_addr == 0xffffffff && sin->sin_port == 0xffff) || (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); - ok( len == sizeof(SOCKADDR_IN) || - broken(len == sizeof(SOCKADDR_STORAGE)) /* NT4/2k */, - "unexpected length %d\n", len ); + ok( len == sizeof(SOCKADDR_IN), "unexpected length %d\n", len ); len = sizeof(sockaddr); @@ -3887,9 +3834,7 @@ static void test_select(void) ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret); WaitForSingleObject (thread_handle, 1000); - ok ( (thread_params.ReadKilled) || - broken(thread_params.ReadKilled == 0), /*Win98*/ - "closesocket did not wakeup select\n"); + ok ( thread_params.ReadKilled, "closesocket did not wake up select\n"); ret = recv(fdRead, &buffer, 1, MSG_PEEK); ok( (ret == -1), "peek at closed socket expected -1 got %d\n", ret); @@ -4094,14 +4039,11 @@ static void test_select(void) tmp_buf[0] = 0xAF; SetLastError(0xdeadbeef); ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), MSG_OOB); - if (ret == SOCKET_ERROR) /* can't recv with MSG_OOB if OOBINLINED */ - { - ok(GetLastError() == WSAEINVAL, "expected 10022, got %d\n", GetLastError()); - ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); - ok(ret == 1, "expected 1, got %d\n", ret); - ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); - } - else ok(broken(ret == 1) /* <= NT4 */, "expected error, got 1\n"); + ok(ret == SOCKET_ERROR, "expected SOCKET_ERROR, got %d\n", ret); + ok(GetLastError() == WSAEINVAL, "expected 10022, got %d\n", GetLastError()); + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); /* When the connection is closed the socket is set in the read descriptor */ ret = closesocket(fdRead); @@ -4347,8 +4289,7 @@ static void test_accept(void) } WaitForSingleObject(thread_handle, 1000); - ok(thread_params.ReadKilled || broken(!thread_params.ReadKilled) /* Win98/ME, after accept */, - "closesocket did not wakeup accept\n"); + ok(thread_params.ReadKilled, "closesocket did not wake up accept\n"); closesocket(accepted); closesocket(connector); @@ -4620,8 +4561,7 @@ static void test_getsockname(void) } ret = memcmp(sa_get.sin_zero, null_padding, 8); - ok(ret == 0 || broken(ret != 0), /* NT4 */ - "getsockname did not zero the sockaddr_in structure\n"); + ok(ret == 0, "getsockname did not zero the sockaddr_in structure\n"); closesocket(sock); @@ -5239,30 +5179,29 @@ static void test_ioctlsocket(void) ret = WSAGetLastError(); ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); - /* broken used to catch W95, W98, NT4 */ make_keepalive(kalive, 0, 0, 0); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); - ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + ok(ret == 0, "WSAIoctl failed unexpectedly\n"); make_keepalive(kalive, 1, 0, 0); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); - ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + ok(ret == 0, "WSAIoctl failed unexpectedly\n"); make_keepalive(kalive, 1, 1000, 1000); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); - ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + ok(ret == 0, "WSAIoctl failed unexpectedly\n"); make_keepalive(kalive, 1, 10000, 10000); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); - ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + ok(ret == 0, "WSAIoctl failed unexpectedly\n"); make_keepalive(kalive, 1, 100, 100); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); - ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + ok(ret == 0, "WSAIoctl failed unexpectedly\n"); make_keepalive(kalive, 0, 100, 100); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); - ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + ok(ret == 0, "WSAIoctl failed unexpectedly\n"); closesocket(sock); @@ -5305,18 +5244,15 @@ static void test_ioctlsocket(void) i = MSG_OOB; SetLastError(0xdeadbeef); ret = recv(dst, &data, 1, i); - if (ret == SOCKET_ERROR) - { - ret = GetLastError(); - ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); - bufs.len = sizeof(char); - bufs.buf = &data; - ret = WSARecv(dst, &bufs, 1, &bytes_rec, &i, NULL, NULL); - ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); - ret = GetLastError(); - ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); - } - else ok(broken(ret == 1) /* <= NT4 */, "expected error, got 1\n"); + ok(ret == SOCKET_ERROR, "expected SOCKET_ERROR, got %d\n", ret); + ret = GetLastError(); + ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); + bufs.len = sizeof(char); + bufs.buf = &data; + ret = WSARecv(dst, &bufs, 1, &bytes_rec, &i, NULL, NULL); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); + ret = GetLastError(); + ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); closesocket(dst); optval = 0xdeadbeef; @@ -5445,7 +5381,7 @@ static void test_send(void) if (dwRet == WAIT_OBJECT_0) { bret = GetOverlappedResult((HANDLE)dst, &ov, &bytes_sent, FALSE); - ok((bret && bytes_sent == buflen) || broken(!bret && GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */, + ok(bret && bytes_sent == buflen, "Got %d instead of %d (%d - %d)\n", bytes_sent, buflen, bret, GetLastError()); } @@ -6145,11 +6081,6 @@ static void test_events(int useMessages) "Got %d instead of 1 (%d - %d)\n", bytesReturned, bret, GetLastError()); ok(buffer[0] == '2', "Got %c instead of 2\n", buffer[0]); } - else if (dwRet == WAIT_TIMEOUT) - { - /* this happens on win98. We get an FD_READ later on the next test */ - CancelIo((HANDLE) src); - } if (0) { ret = recv(src, buffer, 1, MSG_OOB); @@ -8289,14 +8220,12 @@ todo_wine bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && - (WSAGetLastError() == WSAEINVAL || - broken(WSAGetLastError() == WSAEFAULT)), /* NT4 */ + todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEFAULT, "AcceptEx on NULL buffer returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && (WSAGetLastError() == ERROR_IO_PENDING || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx on too small local address size returned %d + errno %d\n", bret, WSAGetLastError()); bret = CancelIo((HANDLE) listener); @@ -8312,12 +8241,12 @@ todo_wine bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, 0, &bytesReturned, &overlapped); - ok(bret == FALSE && (WSAGetLastError() == WSAEFAULT || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + ok(bret == FALSE && WSAGetLastError() == WSAEFAULT, "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 15, &bytesReturned, &overlapped); - ok(bret == FALSE && (WSAGetLastError() == ERROR_IO_PENDING || broken(WSAGetLastError() == WSAEINVAL)) /* NT4 */, + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); bret = CancelIo((HANDLE) listener); ok(bret, "Failed to cancel pending accept socket\n"); @@ -8346,7 +8275,7 @@ todo_wine bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - todo_wine ok((bret == FALSE && WSAGetLastError() == WSAEINVAL) || broken(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING) /* NT4 */, + todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on already pending socket returned %d + errno %d\n", bret, WSAGetLastError()); if (bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING) { /* We need to cancel this call, otherwise things fail */ @@ -8362,7 +8291,7 @@ todo_wine } iret = connect(acceptor, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - todo_wine ok((iret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL) || broken(!iret) /* NT4 */, + todo_wine ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "connecting to acceptex acceptor succeeded? return %d + errno %d\n", iret, WSAGetLastError()); if (!iret || (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)) { /* We need to cancel this call, otherwise things fail */ @@ -8631,7 +8560,7 @@ todo_wine closesocket(acceptor); dwret = WaitForSingleObject(overlapped.hEvent, 1000); - todo_wine ok(dwret == WAIT_OBJECT_0 || broken(dwret == WAIT_TIMEOUT) /* NT4/2000 */, + todo_wine ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); if (dwret != WAIT_TIMEOUT) { @@ -9064,8 +8993,7 @@ static void test_getpeername(void) ret = getpeername(sock, NULL, NULL); ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); - ok(WSAGetLastError() == WSAENOTCONN || - broken(WSAGetLastError() == WSAEFAULT), /* Win9x and WinMe */ + ok(WSAGetLastError() == WSAENOTCONN, "Expected WSAGetLastError() to return WSAENOTCONN, got %d\n", WSAGetLastError()); memset(&sa, 0, sizeof(sa)); @@ -9080,8 +9008,7 @@ static void test_getpeername(void) ret = getpeername(sock, NULL, NULL); ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); - ok(WSAGetLastError() == WSAENOTCONN || - broken(WSAGetLastError() == WSAEFAULT), /* Win9x and WinMe */ + ok(WSAGetLastError() == WSAENOTCONN, "Expected WSAGetLastError() to return WSAENOTCONN, got %d\n", WSAGetLastError()); ret = connect(sock, (struct sockaddr*)&sa, sizeof(sa)); @@ -9155,40 +9082,27 @@ static void test_sioRoutingInterfaceQuery(void) "expected WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - ok(ret == SOCKET_ERROR && - (WSAGetLastError() == WSAEFAULT /* Win98 */ || - WSAGetLastError() == WSAEINVAL /* NT4 */|| - WSAGetLastError() == WSAEAFNOSUPPORT), - "expected WSAEFAULT or WSAEINVAL or WSAEAFNOSUPPORT, got %d\n", - WSAGetLastError()); + todo_wine ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEAFNOSUPPORT, + "expected WSAEAFNOSUPPORT, got %d\n", WSAGetLastError()); sin.sin_family = AF_INET; ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - ok(ret == SOCKET_ERROR && - (WSAGetLastError() == WSAEFAULT /* Win98 */ || - WSAGetLastError() == WSAEINVAL), - "expected WSAEFAULT or WSAEINVAL, got %d\n", WSAGetLastError()); + todo_wine ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, + "expected WSAEINVAL, got %d\n", WSAGetLastError()); sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - ok(ret == SOCKET_ERROR && - (WSAGetLastError() == WSAEINVAL /* NT4 */ || - WSAGetLastError() == WSAEFAULT), - "expected WSAEINVAL or WSAEFAULT, got %d\n", WSAGetLastError()); + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "expected WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), &sout, sizeof(sout), &bytesReturned, NULL, NULL); - ok(!ret || broken(WSAGetLastError() == WSAEINVAL /* NT4 */), - "WSAIoctl failed: %d\n", WSAGetLastError()); - if (!ret) - { - ok(sout.sin_family == AF_INET, "expected AF_INET, got %d\n", - sout.sin_family); - /* We expect the source address to be INADDR_LOOPBACK as well, but - * there's no guarantee that a route to the loopback address exists, - * so rather than introduce spurious test failures we do not test the - * source address. - */ - } + ok(!ret, "WSAIoctl failed: %d\n", WSAGetLastError()); + ok(sout.sin_family == AF_INET, "expected AF_INET, got %d\n", sout.sin_family); + /* We expect the source address to be INADDR_LOOPBACK as well, but + * there's no guarantee that a route to the loopback address exists, + * so rather than introduce spurious test failures we do not test the + * source address. + */ closesocket(sock); } @@ -10445,12 +10359,6 @@ static void test_address_list_query(void) bytes_returned = 0; ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, 0, &bytes_returned, NULL, NULL); ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); - if(WSAGetLastError() == WSAEINVAL) - { - win_skip("Windows <= NT4 is not supported in this test\n"); - closesocket(s); - return; - } ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); ok(bytes_returned >= FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0]), "Got unexpected bytes_returned %u.\n", bytes_returned); -- 2.15.1

2 2

[PATCH] d3dx9/tests: Use true spherical light values and relax expectations
by Alex Henrie 04 Jan '18

04 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- 64-bit Wine on Linux produces values that are slightly closer to the true values than Windows, but far enough from the Windows values to not be able to resolve the failures by only relaxing the test stringency. dlls/d3dx9_36/tests/math.c | 126 ++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 0e9853abe3..b687e5d6dd 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3121,68 +3121,68 @@ static void test_D3DXSHEvalSphericalLight(void) static const float table[] = { /* Red colour. */ - 3.01317239e+00f, -9.77240324e-01f, 2.24765277e+00f, -8.95803630e-01f, -1.22213947e-07f, 3.06645916e-07f, - -3.36369283e-07f, 2.81092071e-07f, 1.06474305e-08f, 6.29281402e-02f, -4.27374065e-01f, 6.19212627e-01f, - -3.04508984e-01f, 5.67611575e-01f, 3.72333601e-02f, -8.19167346e-02f, -4.70457762e-09f, -7.94764006e-08f, - 3.32868979e-07f, -3.08902315e-07f, 5.30925970e-10f, -2.83160460e-07f, -2.89999580e-08f, 1.03458447e-07f, - -2.67952434e-08f, 1.24992710e-02f, -1.37487827e-02f, -1.48109317e-01f, 4.34345961e-01f, -2.45986164e-01f, - -1.51757941e-01f, -2.25487292e-01f, -3.78407575e-02f, 1.92801371e-01f, -7.83071220e-02f, 7.97894225e-03f, - - 4.02519643e-01f, -2.43653327e-01f, 5.60402632e-01f, -2.23348871e-01f, 1.62046894e-01f, -4.06590402e-01f, - 4.46001410e-01f, -3.72707844e-01f, -1.41177261e-02f, -4.31995131e-02f, 2.93387860e-01f, -4.25083041e-01f, - 2.09042251e-01f, -3.89659435e-01f, -2.55603138e-02f, 5.62349856e-02f, -4.68822848e-03f, -7.92002082e-02f, - 3.31712216e-01f, -3.07828844e-01f, 5.29080920e-04f, -2.82176435e-01f, -2.88991798e-02f, 1.03098914e-01f, - -2.67021265e-02f, 7.24340184e-03f, -7.96750095e-03f, -8.58302265e-02f, 2.51706064e-01f, -1.42550439e-01f, - -8.79446268e-02f, -1.30671218e-01f, -2.19289437e-02f, 1.11729540e-01f, -4.53794412e-02f, 4.62384429e-03f, - - 1.95445275e+00f, -8.56593668e-01f, 1.97016549e+00f, -7.85210848e-01f, 2.31033459e-01f, -5.79683959e-01f, - 6.35873020e-01f, -5.31376958e-01f, -2.01279204e-02f, 2.11104341e-02f, -1.43370718e-01f, 2.07726598e-01f, - -1.02153301e-01f, 1.90416038e-01f, 1.24906348e-02f, -2.74805184e-02f, 6.33162493e-03f, 1.06962793e-01f, - -4.47989494e-01f, 4.15734142e-01f, -7.14543217e-04f, 3.81089628e-01f, 3.90294008e-02f, -1.39238864e-01f, - 3.60621996e-02f, -4.47360286e-03f, 4.92081419e-03f, 5.30096702e-02f, -1.55456364e-01f, 8.80406797e-02f, - 5.43155447e-02f, 8.07039514e-02f, 1.35435509e-02f, -6.90053627e-02f, 2.80268304e-02f, -2.85573583e-03f, + 3.01317163e+00f, -9.77240128e-01f, 2.24765220e+00f, -8.95803434e-01f, 3.25255224e-35f, -8.16094904e-35f, + 8.95199460e-35f, -7.48086982e-35f, -2.83366352e-36f, 6.29281376e-02f, -4.27374053e-01f, 6.19212543e-01f, + -3.04508915e-01f, 5.67611487e-01f, 3.72333533e-02f, -8.19167317e-02f, 1.25205729e-36f, 2.11515287e-35f, + -8.85884025e-35f, 8.22100105e-35f, -1.41290744e-37f, 7.53591749e-35f, 7.71793061e-36f, -2.75340121e-35f, + 7.13117824e-36f, 1.24992691e-02f, -1.37487792e-02f, -1.48109290e-01f, 4.34345843e-01f, -2.45986100e-01f, + -1.51757946e-01f, -2.25487254e-01f, -3.78407442e-02f, 1.92801335e-01f, -7.83071154e-02f, 7.97894137e-03f, + + 4.02519645e-01f, -2.43653315e-01f, 5.60402600e-01f, -2.23348868e-01f, 1.62046875e-01f, -4.06590330e-01f, + 4.46001368e-01f, -3.72707796e-01f, -1.41177231e-02f, -4.31995198e-02f, 2.93387896e-01f, -4.25083048e-01f, + 2.09042241e-01f, -3.89659453e-01f, -2.55603144e-02f, 5.62349945e-02f, -4.68822967e-03f, -7.92002290e-02f, + 3.31712278e-01f, -3.07828893e-01f, 5.29052032e-04f, -2.82176480e-01f, -2.88991817e-02f, 1.03098934e-01f, + -2.67021338e-02f, 7.24339502e-03f, -7.96749298e-03f, -8.58301461e-02f, 2.51705799e-01f, -1.42550295e-01f, + -8.79445626e-02f, -1.30671101e-01f, -2.19289189e-02f, 1.11729432e-01f, -4.53794030e-02f, 4.62384030e-03f, + + 1.95445306e+00f, -8.56593659e-01f, 1.97016533e+00f, -7.85210840e-01f, 2.31033385e-01f, -5.79683751e-01f, + 6.35872835e-01f, -5.31376762e-01f, -2.01279127e-02f, 2.11104646e-02f, -1.43370917e-01f, 2.07726860e-01f, + -1.02153423e-01f, 1.90416285e-01f, 1.24906507e-02f, -2.74805568e-02f, 6.33162467e-03f, 1.06962790e-01f, + -4.47989495e-01f, 4.15734115e-01f, -7.14504011e-04f, 3.81089599e-01f, 3.90293960e-02f, -1.39238860e-01f, + 3.60622028e-02f, -4.47359268e-03f, 4.92080277e-03f, 5.30095505e-02f, -1.55456001e-01f, 8.80404774e-02f, + 5.43154350e-02f, 8.07037695e-02f, 1.35435180e-02f, -6.90052063e-02f, 2.80267699e-02f, -2.85572968e-03f, /* Green colour. */ - 4.60838127e+00f, -1.49460280e+00f, 3.43758631e+00f, -1.37005258e+00f, -1.86915443e-07f, 4.68987878e-07f, - -5.14447095e-07f, 4.29905526e-07f, 1.62843055e-08f, 9.62430239e-02f, -6.53630912e-01f, 9.47031021e-01f, - -4.65719581e-01f, 8.68111789e-01f, 5.69451340e-02f, -1.25284418e-01f, -7.19523641e-09f, -1.21552148e-07f, - 5.09093695e-07f, -4.72438842e-07f, 8.12004408e-10f, -4.33068919e-07f, -4.43528769e-08f, 1.58230563e-07f, - -4.09809608e-08f, 1.91165321e-02f, -2.10275482e-02f, -2.26520121e-01f, 6.64293766e-01f, -3.76214117e-01f, - -2.32100368e-01f, -3.44862908e-01f, -5.78740984e-02f, 2.94872671e-01f, -1.19763829e-01f, 1.22030871e-02f, - - 6.15618229e-01f, -3.72646272e-01f, 8.57086360e-01f, -3.41592401e-01f, 2.47836411e-01f, -6.21844113e-01f, - 6.82119787e-01f, -5.70023775e-01f, -2.15918161e-02f, -6.60698414e-02f, 4.48710799e-01f, -6.50126934e-01f, - 3.19711655e-01f, -5.95949709e-01f, -3.90922427e-02f, 8.60064477e-02f, -7.17023155e-03f, -1.21129729e-01f, - 5.07324517e-01f, -4.70797032e-01f, 8.09182529e-04f, -4.31563944e-01f, -4.41987440e-02f, 1.57680690e-01f, - -4.08385433e-02f, 1.10781426e-02f, -1.21855885e-02f, -1.31269753e-01f, 3.84962171e-01f, -2.18018293e-01f, - -1.34503528e-01f, -1.99850082e-01f, -3.35383788e-02f, 1.70880452e-01f, -6.94038495e-02f, 7.07176095e-03f, - - 2.98916292e+00f, -1.31008446e+00f, 3.01319408e+00f, -1.20091069e+00f, 3.53345245e-01f, -8.86575401e-01f, - 9.72511649e-01f, -8.12694073e-01f, -3.07838768e-02f, 3.22865434e-02f, -2.19272852e-01f, 3.17699492e-01f, - -1.56234443e-01f, 2.91224509e-01f, 1.91033222e-02f, -4.20290269e-02f, 9.68366116e-03f, 1.63590148e-01f, - -6.85160398e-01f, 6.35828674e-01f, -1.09283067e-03f, 5.82842946e-01f, 5.96920252e-02f, -2.12953553e-01f, - 5.51539510e-02f, -6.84198039e-03f, 7.52595067e-03f, 8.10736120e-02f, -2.37756789e-01f, 1.34650454e-01f, - 8.30708295e-02f, 1.23429567e-01f, 2.07136646e-02f, -1.05537608e-01f, 4.28645648e-02f, -4.36759600e-03f, + 4.60837984e+00f, -1.49460245e+00f, 3.43758549e+00f, -1.37005222e+00f, 4.97449134e-35f, -1.24814507e-34f, + 1.36912850e-34f, -1.14413296e-34f, -4.33383805e-36f, 9.62430278e-02f, -6.53630863e-01f, 9.47030887e-01f, + -4.65719486e-01f, 8.68111630e-01f, 5.69451249e-02f, -1.25284405e-01f, 1.91491103e-36f, 3.23493947e-35f, + -1.35488136e-34f, 1.25732949e-34f, -2.16091711e-37f, 1.15255201e-34f, 1.18038931e-35f, -4.21108392e-35f, + 1.09065072e-35f, 1.91165280e-02f, -2.10275433e-02f, -2.26520076e-01f, 6.64293599e-01f, -3.76214011e-01f, + -2.32100374e-01f, -3.44862837e-01f, -5.78740756e-02f, 2.94872611e-01f, -1.19763816e-01f, 1.22030860e-02f, + + 6.15618240e-01f, -3.72646222e-01f, 8.57086273e-01f, -3.41592364e-01f, 2.47836381e-01f, -6.21843994e-01f, + 6.82119695e-01f, -5.70023651e-01f, -2.15918104e-02f, -6.60698496e-02f, 4.48710870e-01f, -6.50126972e-01f, + 3.19711642e-01f, -5.95949713e-01f, -3.90922430e-02f, 8.60064566e-02f, -7.17023314e-03f, -1.21129754e-01f, + 5.07324627e-01f, -4.70797100e-01f, 8.09138350e-04f, -4.31564000e-01f, -4.41987457e-02f, 1.57680712e-01f, + -4.08385549e-02f, 1.10781328e-02f, -1.21855767e-02f, -1.31269627e-01f, 3.84961785e-01f, -2.18018084e-01f, + -1.34503440e-01f, -1.99849906e-01f, -3.35383443e-02f, 1.70880296e-01f, -6.94037884e-02f, 7.07175529e-03f, + + 2.98916331e+00f, -1.31008433e+00f, 3.01319384e+00f, -1.20091062e+00f, 3.53345154e-01f, -8.86575090e-01f, + 9.72511332e-01f, -8.12693818e-01f, -3.07838645e-02f, 3.22865908e-02f, -2.19273153e-01f, 3.17699883e-01f, + -1.56234637e-01f, 2.91224888e-01f, 1.91033469e-02f, -4.20290842e-02f, 9.68366064e-03f, 1.63590138e-01f, + -6.85160360e-01f, 6.35828606e-01f, -1.09277077e-03f, 5.82842878e-01f, 5.96920135e-02f, -2.12953537e-01f, + 5.51539537e-02f, -6.84196484e-03f, 7.52593316e-03f, 8.10734249e-02f, -2.37756221e-01f, 1.34650133e-01f, + 8.30706600e-02f, 1.23429287e-01f, 2.07136145e-02f, -1.05537368e-01f, 4.28644688e-02f, -4.36758628e-03f, /* Blue colour. */ - 6.20359039e+00f, -2.01196527e+00f, 4.62752008e+00f, -1.84430146e+00f, -2.51616967e-07f, 6.31329840e-07f, - -6.92524964e-07f, 5.78718982e-07f, 2.19211813e-08f, 1.29557922e-01f, -8.79887760e-01f, 1.27484941e+00f, - -6.26930237e-01f, 1.16861200e+00f, 7.66569078e-02f, -1.68652087e-01f, -9.68589564e-09f, -1.63627888e-07f, - 6.85318469e-07f, -6.35975368e-07f, 1.09308285e-09f, -5.82977407e-07f, -5.97057976e-08f, 2.13002679e-07f, - -5.51666766e-08f, 2.57337932e-02f, -2.83063166e-02f, -3.04930955e-01f, 8.94241691e-01f, -5.06442070e-01f, - -3.12442809e-01f, -4.64238554e-01f, -7.79074430e-02f, 3.96944016e-01f, -1.61220551e-01f, 1.64272338e-02f, - - 8.28716874e-01f, -5.01639187e-01f, 1.15377009e+00f, -4.59835887e-01f, 3.33625972e-01f, -8.37097943e-01f, - 9.18238282e-01f, -7.67339706e-01f, -2.90659070e-02f, -8.89401734e-02f, 6.04033828e-01f, -8.75170946e-01f, - 4.30381119e-01f, -8.02240014e-01f, -5.26241735e-02f, 1.15777917e-01f, -9.65223555e-03f, -1.63059264e-01f, - 6.82936907e-01f, -6.33765280e-01f, 1.08928420e-03f, -5.80951512e-01f, -5.94983101e-02f, 2.12262481e-01f, - -5.49749658e-02f, 1.49128847e-02f, -1.64036769e-02f, -1.76709279e-01f, 5.18218338e-01f, -2.93486178e-01f, - -1.81062460e-01f, -2.69028962e-01f, -4.51478213e-02f, 2.30031401e-01f, -9.34282616e-02f, 9.51967947e-03f, - - 4.02387333e+00f, -1.76357520e+00f, 4.05622292e+00f, -1.61661065e+00f, 4.75657105e-01f, -1.19346702e+00f, - 1.30915034e+00f, -1.09401131e+00f, -4.14398350e-02f, 4.34626564e-02f, -2.95174986e-01f, 4.27672386e-01f, - -2.10315600e-01f, 3.92033011e-01f, 2.57160105e-02f, -5.65775372e-02f, 1.30356979e-02f, 2.20217496e-01f, - -9.22331274e-01f, 8.55923176e-01f, -1.47111830e-03f, 7.84596264e-01f, 8.03546458e-02f, -2.86668241e-01f, - 7.42457062e-02f, -9.21035837e-03f, 1.01310881e-02f, 1.09137557e-01f, -3.20057213e-01f, 1.81260213e-01f, - 1.11826122e-01f, 1.66155189e-01f, 2.78837811e-02f, -1.42069861e-01f, 5.77022992e-02f, -5.87945618e-03f, + 6.20358848e+00f, -2.01196491e+00f, 4.62751910e+00f, -1.84430114e+00f, 6.69643089e-35f, -1.68019534e-34f, + 1.84305766e-34f, -1.54017904e-34f, -5.83401297e-36f, 1.29557927e-01f, -8.79887732e-01f, 1.27484932e+00f, + -6.26930101e-01f, 1.16861185e+00f, 7.66569017e-02f, -1.68652090e-01f, 2.57776494e-36f, 4.35472637e-35f, + -1.82387882e-34f, 1.69255899e-34f, -2.90892699e-37f, 1.55151238e-34f, 1.58898567e-35f, -5.66876703e-35f, + 1.46818371e-35f, 2.57337886e-02f, -2.83063093e-02f, -3.04930882e-01f, 8.94241416e-01f, -5.06441957e-01f, + -3.12442822e-01f, -4.64238452e-01f, -7.79074123e-02f, 3.96943914e-01f, -1.61220527e-01f, 1.64272318e-02f, + + 8.28716892e-01f, -5.01639163e-01f, 1.15377003e+00f, -4.59835891e-01f, 3.33625909e-01f, -8.37097715e-01f, + 9.18238085e-01f, -7.67339558e-01f, -2.90658997e-02f, -8.89401854e-02f, 6.04033886e-01f, -8.75170956e-01f, + 4.30381072e-01f, -8.02240028e-01f, -5.26241753e-02f, 1.15777927e-01f, -9.65223728e-03f, -1.63059290e-01f, + 6.82937023e-01f, -6.33765350e-01f, 1.08922474e-03f, -5.80951560e-01f, -5.94983136e-02f, 2.12262505e-01f, + -5.49749798e-02f, 1.49128717e-02f, -1.64036616e-02f, -1.76709119e-01f, 5.18217807e-01f, -2.93485893e-01f, + -1.81062330e-01f, -2.69028730e-01f, -4.51477729e-02f, 2.30031176e-01f, -9.34281801e-02f, 9.51967094e-03f, + + 4.02387383e+00f, -1.76357513e+00f, 4.05622263e+00f, -1.61661051e+00f, 4.75656955e-01f, -1.19346651e+00f, + 1.30914992e+00f, -1.09401095e+00f, -4.14398191e-02f, 4.34627200e-02f, -2.95175409e-01f, 4.27672935e-01f, + -2.10315865e-01f, 3.92033517e-01f, 2.57160448e-02f, -5.65776154e-02f, 1.30356975e-02f, 2.20217502e-01f, + -9.22331288e-01f, 8.55923154e-01f, -1.47103763e-03f, 7.84596211e-01f, 8.03546365e-02f, -2.86668233e-01f, + 7.42457096e-02f, -9.21033762e-03f, 1.01310642e-02f, 1.09137307e-01f, -3.20056463e-01f, 1.81259801e-01f, + 1.11825893e-01f, 1.66154815e-01f, 2.78837128e-02f, -1.42069538e-01f, 5.77021717e-02f, -5.87944329e-03f, }; const struct { @@ -3229,7 +3229,7 @@ static void test_D3DXSHEvalSphericalLight(void) expected = j + test[l].roffset; else expected = test[l].red_expected[j]; - equal = compare_float(expected, test[l].red_received[j], 2048); + equal = compare_float(expected, test[l].red_received[j], 4096); ok(equal || (fabs(expected) < 1.0e-6f && fabs(test[l].red_received[j]) < 1.0e-6f), "Red: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", l, order, j, expected, test[l].red_received[j]); @@ -3240,7 +3240,7 @@ static void test_D3DXSHEvalSphericalLight(void) expected = j + test[l].goffset; else expected = test[l].green_expected[j]; - equal = compare_float(expected, test[l].green_received[j], 2048); + equal = compare_float(expected, test[l].green_received[j], 4096); ok(equal || (fabs(expected) < 1.0e-6f && fabs(test[l].green_received[j]) < 1.0e-6f), "Green: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", l, order, j, expected, test[l].green_received[j]); @@ -3252,7 +3252,7 @@ static void test_D3DXSHEvalSphericalLight(void) expected = j + test[l].boffset; else expected = test[l].blue_expected[j]; - equal = compare_float(expected, test[l].blue_received[j], 2048); + equal = compare_float(expected, test[l].blue_received[j], 4096); ok(equal || (fabs(expected) < 1.0e-6f && fabs(test[l].blue_received[j]) < 1.0e-6f), "Blue: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", l, order, j, expected, test[l].blue_received[j]); -- 2.15.1

2 2

[PATCH] vbscript/tests: Fix first-day-of-week test on mixed locales
by Alex Henrie 03 Jan '18

03 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- One of the test VMs uses the German language (first day Monday) but Inuktitut dates (first day Sunday). When determining the first day of the week, Inuktitut needs to take precedence, which it does when LOCALE_USER_DEFAULT is used. dlls/vbscript/tests/run.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 7c97db2a9b..ee811c6e5b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -219,8 +219,7 @@ static void detect_locale(void) PRIMARYLANGID(GetUserDefaultUILanguage()) == LANG_ENGLISH && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH); - GetLocaleInfoA(pGetThreadUILanguage ? pGetThreadUILanguage() : GetUserDefaultUILanguage(), - LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, + GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, (void*)&first_day_of_week, sizeof(first_day_of_week)); first_day_of_week = 1 + (first_day_of_week + 1) % 7; } -- 2.15.1

2 1

[PATCH] advapi: Fix return value for QueryServiceConfig2W
by Andrew Eikum 03 Jan '18

03 Jan '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/advapi32/service.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 3f2fb93d68..ddd6a21429 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1607,7 +1607,11 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe switch (dwLevel) { case SERVICE_CONFIG_DESCRIPTION: - if (!(bufptr = heap_alloc( size ))) return ERROR_OUTOFMEMORY; + if (!(bufptr = heap_alloc( size ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } break; case SERVICE_CONFIG_PRESHUTDOWN_INFO: -- 2.15.1

1 0

[PATCH v2] msvcrt: _Gettnames() should respect user overrides.
by Zebediah Figura 03 Jan '18

03 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: retain override for C locale. dlls/msvcrt/locale.c | 12 ++++---- dlls/msvcrt/tests/locale.c | 73 +++++++++++++++++----------------------------- 2 files changed, 33 insertions(+), 52 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6e16311..95fec0a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1493,6 +1493,8 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lc_handle[MSVCRT_LC_TIME] = old_locinfo->lc_handle[MSVCRT_LC_TIME]; locinfo->lc_id[MSVCRT_LC_TIME].wCodePage = old_locinfo->lc_id[MSVCRT_LC_TIME].wCodePage; } else { + DWORD flags = lcid[MSVCRT_LC_TIME] ? 0 : LOCALE_NOUSEROVERRIDE; + if(lcid[MSVCRT_LC_TIME] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_TIME)) { if(update_threadlocinfo_category(lcid[MSVCRT_LC_TIME], cp[MSVCRT_LC_TIME], locinfo, MSVCRT_LC_TIME)) { @@ -1515,16 +1517,14 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW); }else { - ret = GetLocaleInfoA(lcid_tmp, time_data[i] - |LOCALE_NOUSEROVERRIDE, NULL, 0); + ret = GetLocaleInfoA(lcid_tmp, time_data[i]|flags, NULL, 0); if(!ret) { free_locinfo(locinfo); return NULL; } size += ret; - ret = GetLocaleInfoW(lcid_tmp, time_data[i] - |LOCALE_NOUSEROVERRIDE, NULL, 0); + ret = GetLocaleInfoW(lcid_tmp, time_data[i]|flags, NULL, 0); if(!ret) { free_locinfo(locinfo); return NULL; @@ -1555,7 +1555,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, memcpy(&locinfo->lc_time_curr->data[ret], cloc_time, sizeof(cloc_time)); ret += sizeof(cloc_time); }else { - ret += GetLocaleInfoA(lcid_tmp, time_data[i]|LOCALE_NOUSEROVERRIDE, + ret += GetLocaleInfoA(lcid_tmp, time_data[i]|flags, &locinfo->lc_time_curr->data[ret], size-ret); } } @@ -1571,7 +1571,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, memcpy(&locinfo->lc_time_curr->data[ret], cloc_timeW, sizeof(cloc_timeW)); ret += sizeof(cloc_timeW); }else { - ret += GetLocaleInfoW(lcid_tmp, time_data[i]|LOCALE_NOUSEROVERRIDE, + ret += GetLocaleInfoW(lcid_tmp, time_data[i]|flags, (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); } } diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 89761dd..31540ab 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -663,6 +663,24 @@ static void test_crtGetStringTypeW(void) static void test__Gettnames(void) { + static const DWORD time_data[] = { + LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, + LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, + LOCALE_SABBREVDAYNAME6, + LOCALE_SDAYNAME7, LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, + LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6, + LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3, + LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9, + LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12, + LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3, LOCALE_SMONTHNAME4, + LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6, LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, + LOCALE_SMONTHNAME9, LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12, + LOCALE_S1159, LOCALE_S2359, + LOCALE_SSHORTDATE, LOCALE_SLONGDATE, + LOCALE_STIMEFORMAT + }; + struct { char *str[43]; LCID lcid; @@ -672,6 +690,7 @@ static void test__Gettnames(void) } *ret; int size; char buf[64]; + int i; if(!setlocale(LC_ALL, "english")) return; @@ -686,52 +705,14 @@ static void test__Gettnames(void) else ok(size==0x164 || broken(size==0xb8), "structure size: %x\n", size); - ok(!strcmp(ret->str[0], "Sun"), "ret->str[0] = %s\n", ret->str[0]); - ok(!strcmp(ret->str[1], "Mon"), "ret->str[1] = %s\n", ret->str[1]); - ok(!strcmp(ret->str[2], "Tue"), "ret->str[2] = %s\n", ret->str[2]); - ok(!strcmp(ret->str[3], "Wed"), "ret->str[3] = %s\n", ret->str[3]); - ok(!strcmp(ret->str[4], "Thu"), "ret->str[4] = %s\n", ret->str[4]); - ok(!strcmp(ret->str[5], "Fri"), "ret->str[5] = %s\n", ret->str[5]); - ok(!strcmp(ret->str[6], "Sat"), "ret->str[6] = %s\n", ret->str[6]); - ok(!strcmp(ret->str[7], "Sunday"), "ret->str[7] = %s\n", ret->str[7]); - ok(!strcmp(ret->str[8], "Monday"), "ret->str[8] = %s\n", ret->str[8]); - ok(!strcmp(ret->str[9], "Tuesday"), "ret->str[9] = %s\n", ret->str[9]); - ok(!strcmp(ret->str[10], "Wednesday"), "ret->str[10] = %s\n", ret->str[10]); - ok(!strcmp(ret->str[11], "Thursday"), "ret->str[11] = %s\n", ret->str[11]); - ok(!strcmp(ret->str[12], "Friday"), "ret->str[12] = %s\n", ret->str[12]); - ok(!strcmp(ret->str[13], "Saturday"), "ret->str[13] = %s\n", ret->str[13]); - ok(!strcmp(ret->str[14], "Jan"), "ret->str[14] = %s\n", ret->str[14]); - ok(!strcmp(ret->str[15], "Feb"), "ret->str[15] = %s\n", ret->str[15]); - ok(!strcmp(ret->str[16], "Mar"), "ret->str[16] = %s\n", ret->str[16]); - ok(!strcmp(ret->str[17], "Apr"), "ret->str[17] = %s\n", ret->str[17]); - ok(!strcmp(ret->str[18], "May"), "ret->str[18] = %s\n", ret->str[18]); - ok(!strcmp(ret->str[19], "Jun"), "ret->str[19] = %s\n", ret->str[19]); - ok(!strcmp(ret->str[20], "Jul"), "ret->str[20] = %s\n", ret->str[20]); - ok(!strcmp(ret->str[21], "Aug"), "ret->str[21] = %s\n", ret->str[21]); - ok(!strcmp(ret->str[22], "Sep"), "ret->str[22] = %s\n", ret->str[22]); - ok(!strcmp(ret->str[23], "Oct"), "ret->str[23] = %s\n", ret->str[23]); - ok(!strcmp(ret->str[24], "Nov"), "ret->str[24] = %s\n", ret->str[24]); - ok(!strcmp(ret->str[25], "Dec"), "ret->str[25] = %s\n", ret->str[25]); - ok(!strcmp(ret->str[26], "January"), "ret->str[26] = %s\n", ret->str[26]); - ok(!strcmp(ret->str[27], "February"), "ret->str[27] = %s\n", ret->str[27]); - ok(!strcmp(ret->str[28], "March"), "ret->str[28] = %s\n", ret->str[28]); - ok(!strcmp(ret->str[29], "April"), "ret->str[29] = %s\n", ret->str[29]); - ok(!strcmp(ret->str[30], "May"), "ret->str[30] = %s\n", ret->str[30]); - ok(!strcmp(ret->str[31], "June"), "ret->str[31] = %s\n", ret->str[31]); - ok(!strcmp(ret->str[32], "July"), "ret->str[32] = %s\n", ret->str[32]); - ok(!strcmp(ret->str[33], "August"), "ret->str[33] = %s\n", ret->str[33]); - ok(!strcmp(ret->str[34], "September"), "ret->str[34] = %s\n", ret->str[34]); - ok(!strcmp(ret->str[35], "October"), "ret->str[35] = %s\n", ret->str[35]); - ok(!strcmp(ret->str[36], "November"), "ret->str[36] = %s\n", ret->str[36]); - ok(!strcmp(ret->str[37], "December"), "ret->str[37] = %s\n", ret->str[37]); - ok(!strcmp(ret->str[38], "AM"), "ret->str[38] = %s\n", ret->str[38]); - ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); - ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, - "ret->str[40] = %s\n", ret->str[40]); - size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), - LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, buf, sizeof(buf)); - ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); - ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); + for (i = 0; i < sizeof(time_data)/sizeof(time_data[0]); i++) + { + size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), + time_data[i], buf, sizeof(buf)); + ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf); + } + free(ret); if(!setlocale(LC_TIME, "german")) -- 2.7.4

2 2

[PATCH] msvcr100/tests: Fix resource leak.
by Andrey Gusev 03 Jan '18

03 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/msvcr100/tests/msvcr100.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index b2346a89b5..f02f5ea89e 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -936,6 +936,7 @@ static void test_ExternalContextBase(void) thread = CreateThread(NULL, 0, external_context_thread, NULL, 0, NULL); ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); } static void test_Scheduler(void) -- 2.13.6

2 1

[PATCH v2] msvcrt: Don't include MSVC 8.0+ environment functions in SOs for older DLLs
by Alex Henrie 03 Jan '18

03 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Added missing comment to #endif dlls/msvcrt/data.c | 4 ++++ dlls/msvcrt/environ.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 5a0241885a..06e16a865e 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -626,6 +626,8 @@ void CDECL MSVCRT___set_app_type(int app_type) MSVCRT_app_type = app_type; } +#if _MSVCR_VER>=140 + /********************************************************************* * _get_initial_narrow_environment (UCRTBASE.@) */ @@ -732,6 +734,8 @@ MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void) return wide_command_line = s; } +#endif /* _MSVCR_VER>=140 */ + /********************************************************************* * _get_winmajor (MSVCRT.@) */ diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 1370fbbb70..f48eabf7e8 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -207,8 +207,10 @@ int CDECL _wputenv_s(const MSVCRT_wchar_t *name, const MSVCRT_wchar_t *value) return ret; } +#if _MSVCR_VER>=80 + /****************************************************************** - * _dupenv_s (MSVCRT.@) + * _dupenv_s (MSVCR80.@) */ int CDECL _dupenv_s(char **buffer, MSVCRT_size_t *numberOfElements, const char *varname) { @@ -232,7 +234,7 @@ int CDECL _dupenv_s(char **buffer, MSVCRT_size_t *numberOfElements, const char * } /****************************************************************** - * _wdupenv_s (MSVCRT.@) + * _wdupenv_s (MSVCR80.@) */ int CDECL _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements, const MSVCRT_wchar_t *varname) @@ -256,6 +258,8 @@ int CDECL _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements, return 0; } +#endif /* _MSVCR_VER>=80 */ + /****************************************************************** * getenv_s (MSVCRT.@) */ -- 2.15.1

2 1

[PATCH] msvcrt: Fix _wcstod_l specfile entries
by Alex Henrie 03 Jan '18

03 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index e055c21fc2..bb9a67751d 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -50,7 +50,7 @@ @ cdecl _ultoa_s(long ptr long long) ucrtbase._ultoa_s @ cdecl _ultow(long ptr long) ucrtbase._ultow @ cdecl _ultow_s(long ptr long long) ucrtbase._ultow_s -@ cdecl _wcstod_l(wstr ptr) ucrtbase._wcstod_l +@ cdecl _wcstod_l(wstr ptr long) ucrtbase._wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) ucrtbase._wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) ucrtbase._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) ucrtbase._wcstoi64_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 685e11bd74..557ae59fea 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1511,7 +1511,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ae866784d6..717106713a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1869,7 +1869,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 969451febc..2463b154d0 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1887,7 +1887,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 8c3d96e41e..c513f521fb 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1580,7 +1580,7 @@ @ cdecl _wcsrev(wstr) msvcr120._wcsrev @ cdecl _wcsset(wstr long) msvcr120._wcsset @ cdecl _wcsset_s(wstr long long) msvcr120._wcsset_s -@ cdecl _wcstod_l(wstr ptr) msvcr120._wcstod_l +@ cdecl _wcstod_l(wstr ptr long) msvcr120._wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) msvcr120._wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) msvcr120._wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcr120._wcstoi64_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5aa93e510b..73832c1f3a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1190,7 +1190,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4f67f1468e..d962479a35 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1166,7 +1166,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7878acbda8..b142a1732f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2036,7 +2036,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl _wcstod_l(wstr ptr long) MSVCRT__wcstod_l @ cdecl _wcstof_l(wstr ptr ptr) MSVCRT__wcstof_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l -- 2.15.1

2 4

[PATCH] user32/tests: Fix resource leak.
by Andrey Gusev 03 Jan '18

03 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/user32/tests/input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 030592b02f..e52f7d215f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2055,6 +2055,7 @@ static void test_Input_mouse(void) } SetEvent(thread_data.end_event); WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); ok(!got_button_down, "unexpected WM_RBUTTONDOWN message\n"); ok(!got_button_up, "unexpected WM_RBUTTONUP message\n"); -- 2.13.6

1 0

[PATCH] kernel32/tests: Fix resource leak.
by Andrey Gusev 03 Jan '18

03 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/tests/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 5918a58e29..5fb19f0992 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1653,6 +1653,7 @@ static WORD get_thread_fpu_cw(void) res = CloseHandle(ctx.finished); ok(!!res, "Failed to close event handle, last error %#x.\n", GetLastError()); + CloseHandle(thread); return ctx.cw; } -- 2.13.6

1 0

[PATCH 5/5] d3d9/tests: Introduce a test for vertex buffer map synchronisation.
by Henri Verbeet 03 Jan '18

03 Jan '18

Based on a patch by Patrick Rudolph from a while ago. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 55047d0f4b5..4a257c3e034 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -23044,6 +23044,223 @@ static void test_null_format(void) IDirect3D9_Release(d3d); } +static void test_map_synchronisation(void) +{ + LARGE_INTEGER frequency, diff, ts[3]; + unsigned int i, j, tri_count, size; + D3DADAPTER_IDENTIFIER9 identifier; + IDirect3DVertexBuffer9 *buffer; + IDirect3DDevice9 *device; + BOOL unsynchronised, ret; + IDirect3D9 *d3d; + D3DCOLOR colour; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + static const struct + { + unsigned int flags; + BOOL unsynchronised; + } + tests[] = + { + {0, FALSE}, + {D3DLOCK_NOOVERWRITE, TRUE}, + {D3DLOCK_DISCARD, FALSE}, + {D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, TRUE}, + }; + + static const struct quad + { + struct + { + struct vec3 position; + DWORD diffuse; + } strip[4]; + } + quad1 = + { + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + } + }, + quad2 = + { + { + {{-1.0f, -1.0f, 0.0f}, 0xffffff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffffff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffffff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffff00}, + } + }; + struct quad *quads; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + /* Maps are always synchronised on WARP. */ + if (adapter_is_warp(&identifier)) + { + skip("Running on WARP, skipping test.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + tri_count = 0x1000; + if (tri_count > caps.MaxPrimitiveCount) + { + skip("Device supports only %u primitives, skipping test.\n", caps.MaxPrimitiveCount); + goto done; + } + size = (tri_count + 2) * sizeof(*quad1.strip); + + ret = QueryPerformanceFrequency(&frequency); + ok(ret, "Failed to get performance counter frequency.\n"); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, size, + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, size, (void **)&quads, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (j = 0; j < size / sizeof(*quads); ++j) + { + quads[j] = quad1; + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*quads->strip)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + + /* Initial draw to initialise states, compile shaders, etc. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri_count); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* Read the result to ensure the GPU has finished drawing. */ + colour = getPixelColor(device, 320, 240); + + /* Time drawing tri_count triangles. */ + ret = QueryPerformanceCounter(&ts[0]); + ok(ret, "Failed to read performance counter.\n"); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri_count); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + /* Time drawing a single triangle. */ + ret = QueryPerformanceCounter(&ts[1]); + ok(ret, "Failed to read performance counter.\n"); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 1); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ret = QueryPerformanceCounter(&ts[2]); + ok(ret, "Failed to read performance counter.\n"); + + IDirect3DVertexBuffer9_Release(buffer); + + /* Estimate the number of triangles we can draw in 100ms. */ + diff.QuadPart = ts[1].QuadPart - ts[0].QuadPart + ts[1].QuadPart - ts[2].QuadPart; + tri_count = (tri_count * frequency.QuadPart) / (diff.QuadPart * 10); + tri_count = ((tri_count + 2 + 3) & ~3) - 2; + if (tri_count > caps.MaxPrimitiveCount) + { + skip("Would need to draw %u triangles, but the device only supports %u primitives.\n", + tri_count, caps.MaxPrimitiveCount); + goto done; + } + size = (tri_count + 2) * sizeof(*quad1.strip); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3DDevice9_CreateVertexBuffer(device, size, + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, size, (void **)&quads, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (j = 0; j < size / sizeof(*quads); ++j) + { + quads[j] = quad1; + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*quads->strip)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + + /* Start a draw operation. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri_count); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + /* Map the last quad while the draw is in progress. */ + hr = IDirect3DVertexBuffer9_Lock(buffer, size - sizeof(quad2), + sizeof(quad2), (void **)&quads, tests[i].flags); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + *quads = quad2; + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + unsynchronised = color_match(colour, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00), 1); + ok(tests[i].unsynchronised == unsynchronised, "Expected %s map for flags %#x.\n", + tests[i].unsynchronised ? "unsynchronised" : "synchronised", tests[i].flags); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(buffer); + } + +done: + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -23176,4 +23393,5 @@ START_TEST(visual) test_vertex_texture(); test_mvp_software_vertex_shaders(); test_null_format(); + test_map_synchronisation(); } -- 2.11.0

1 0

[PATCH 4/5] d3d8/tests: Introduce a test for vertex buffer map synchronisation.
by Henri Verbeet 03 Jan '18

03 Jan '18

Based on a patch by Patrick Rudolph from a while ago. Thanks to Stefan Dösinger for making this test work with AMD drivers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 588a6293c72..b64f08c8a15 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9915,6 +9915,223 @@ static void test_drawindexedprimitiveup(void) DestroyWindow(window); } +static void test_map_synchronisation(void) +{ + LARGE_INTEGER frequency, diff, ts[3]; + unsigned int i, j, tri_count, size; + D3DADAPTER_IDENTIFIER8 identifier; + IDirect3DVertexBuffer8 *buffer; + IDirect3DDevice8 *device; + BOOL unsynchronised, ret; + IDirect3D8 *d3d; + D3DCOLOR colour; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + + static const struct + { + unsigned int flags; + BOOL unsynchronised; + } + tests[] = + { + {0, FALSE}, + {D3DLOCK_NOOVERWRITE, TRUE}, + {D3DLOCK_DISCARD, FALSE}, + {D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, TRUE}, + }; + + static const struct quad + { + struct + { + struct vec3 position; + DWORD diffuse; + } strip[4]; + } + quad1 = + { + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + } + }, + quad2 = + { + { + {{-1.0f, -1.0f, 0.0f}, 0xffffff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffffff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffffff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffff00}, + } + }; + struct quad *quads; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + /* Maps are always synchronised on WARP. */ + if (adapter_is_warp(&identifier)) + { + skip("Running on WARP, skipping test.\n"); + goto done; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + tri_count = 0x1000; + if (tri_count > caps.MaxPrimitiveCount) + { + skip("Device supports only %u primitives, skipping test.\n", caps.MaxPrimitiveCount); + goto done; + } + size = (tri_count + 2) * sizeof(*quad1.strip); + + ret = QueryPerformanceFrequency(&frequency); + ok(ret, "Failed to get performance counter frequency.\n"); + + hr = IDirect3DDevice8_CreateVertexBuffer(device, size, + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &buffer); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, size, (BYTE **)&quads, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (j = 0; j < size / sizeof(*quads); ++j) + { + quads[j] = quad1; + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*quads->strip)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + + /* Initial draw to initialise states, compile shaders, etc. */ + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri_count); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* Read the result to ensure the GPU has finished drawing. */ + colour = getPixelColor(device, 320, 240); + + /* Time drawing tri_count triangles. */ + ret = QueryPerformanceCounter(&ts[0]); + ok(ret, "Failed to read performance counter.\n"); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri_count); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + /* Time drawing a single triangle. */ + ret = QueryPerformanceCounter(&ts[1]); + ok(ret, "Failed to read performance counter.\n"); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 1); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ret = QueryPerformanceCounter(&ts[2]); + ok(ret, "Failed to read performance counter.\n"); + + IDirect3DVertexBuffer8_Release(buffer); + + /* Estimate the number of triangles we can draw in 100ms. */ + diff.QuadPart = ts[1].QuadPart - ts[0].QuadPart + ts[1].QuadPart - ts[2].QuadPart; + tri_count = (tri_count * frequency.QuadPart) / (diff.QuadPart * 10); + tri_count = ((tri_count + 2 + 3) & ~3) - 2; + if (tri_count > caps.MaxPrimitiveCount) + { + skip("Would need to draw %u triangles, but the device only supports %u primitives.\n", + tri_count, caps.MaxPrimitiveCount); + goto done; + } + size = (tri_count + 2) * sizeof(*quad1.strip); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3DDevice8_CreateVertexBuffer(device, size, + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &buffer); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, size, (BYTE **)&quads, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (j = 0; j < size / sizeof(*quads); ++j) + { + quads[j] = quad1; + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*quads->strip)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + + /* Start a draw operation. */ + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri_count); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + /* Map the last quad while the draw is in progress. */ + hr = IDirect3DVertexBuffer8_Lock(buffer, size - sizeof(quad2), + sizeof(quad2), (BYTE **)&quads, tests[i].flags); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + *quads = quad2; + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + unsynchronised = color_match(colour, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00), 1); + ok(tests[i].unsynchronised == unsynchronised, "Expected %s map for flags %#x.\n", + tests[i].unsynchronised ? "unsynchronised" : "synchronised", tests[i].flags); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(buffer); + } + +done: + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -9986,4 +10203,5 @@ START_TEST(visual) test_max_index16(); test_backbuffer_resize(); test_drawindexedprimitiveup(); + test_map_synchronisation(); } -- 2.11.0

1 0

[PATCH 3/5] ddraw/tests: Introduce a test for vertex buffer map synchronisation.
by Henri Verbeet 03 Jan '18

03 Jan '18

Based on a patch by Patrick Rudolph from a while ago. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw4.c | 197 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 199 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 396 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b280628f567..c86fcc58851 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14011,6 +14011,202 @@ static void test_compute_sphere_visibility(void) DestroyWindow(window); } +static void test_map_synchronisation(void) +{ + LARGE_INTEGER frequency, diff, ts[3]; + IDirect3DVertexBuffer *buffer; + IDirect3DViewport3 *viewport; + unsigned int i, j, tri_count; + D3DVERTEXBUFFERDESC vb_desc; + IDirect3DDevice3 *device; + BOOL unsynchronised, ret; + IDirectDrawSurface4 *rt; + IDirect3D3 *d3d; + D3DCOLOR colour; + ULONG refcount; + HWND window; + HRESULT hr; + + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + + /* DDLOCK_DISCARDCONTENTS and DDLOCK_NOOVERWRITE were introduced with + * ddraw7 and are ignored in earlier versions. */ + static const struct + { + unsigned int flags; + BOOL unsynchronised; + } + tests[] = + { + {0, FALSE}, + {DDLOCK_NOOVERWRITE, FALSE}, + {DDLOCK_DISCARDCONTENTS, FALSE}, + {DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS, FALSE}, + }; + + static const struct quad + { + struct + { + struct vec3 position; + DWORD diffuse; + } strip[4]; + } + quad1 = + { + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + } + }, + quad2 = + { + { + {{-1.0f, -1.0f, 0.0f}, 0xffffff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffffff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffffff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffff00}, + } + }; + struct quad *quads; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + tri_count = 0x1000; + + ret = QueryPerformanceFrequency(&frequency); + ok(ret, "Failed to get performance counter frequency.\n"); + + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwCaps = D3DVBCAPS_WRITEONLY; + vb_desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; + vb_desc.dwNumVertices = tri_count + 2; + hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&quads, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (j = 0; j < vb_desc.dwNumVertices / 4; ++j) + { + quads[j] = quad1; + } + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + /* Initial draw to initialise states, compile shaders, etc. */ + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, vb_desc.dwNumVertices, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* Read the result to ensure the GPU has finished drawing. */ + colour = get_surface_color(rt, 320, 240); + + /* Time drawing tri_count triangles. */ + ret = QueryPerformanceCounter(&ts[0]); + ok(ret, "Failed to read performance counter.\n"); + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, vb_desc.dwNumVertices, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + colour = get_surface_color(rt, 320, 240); + /* Time drawing a single triangle. */ + ret = QueryPerformanceCounter(&ts[1]); + ok(ret, "Failed to read performance counter.\n"); + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, 3, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + colour = get_surface_color(rt, 320, 240); + ret = QueryPerformanceCounter(&ts[2]); + ok(ret, "Failed to read performance counter.\n"); + + IDirect3DVertexBuffer_Release(buffer); + + /* Estimate the number of triangles we can draw in 100ms. */ + diff.QuadPart = ts[1].QuadPart - ts[0].QuadPart + ts[1].QuadPart - ts[2].QuadPart; + tri_count = (tri_count * frequency.QuadPart) / (diff.QuadPart * 10); + tri_count = ((tri_count + 2 + 3) & ~3) - 2; + vb_desc.dwNumVertices = tri_count + 2; + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&quads, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (j = 0; j < vb_desc.dwNumVertices / 4; ++j) + { + quads[j] = quad1; + } + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + /* Start a draw operation. */ + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, vb_desc.dwNumVertices, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + /* Map the last quad while the draw is in progress. */ + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_WAIT | tests[i].flags, (void **)&quads, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + quads[(vb_desc.dwNumVertices / 4) - 1] = quad2; + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + colour = get_surface_color(rt, 320, 240); + unsynchronised = compare_color(colour, 0x00ffff00, 1); + ok(tests[i].unsynchronised == unsynchronised, "Expected %s map for flags %#x.\n", + tests[i].unsynchronised ? "unsynchronised" : "synchronised", tests[i].flags); + + IDirect3DVertexBuffer_Release(buffer); + } + + destroy_viewport(device, viewport); + IDirectDrawSurface4_Release(rt); + IDirect3D3_Release(d3d); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -14129,4 +14325,5 @@ START_TEST(ddraw4) test_ck_operation(); test_vb_refcount(); test_compute_sphere_visibility(); + test_map_synchronisation(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 846a83de08e..f776efaa33e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13387,6 +13387,204 @@ static void test_clip_planes_limits(void) DestroyWindow(window); } +static void test_map_synchronisation(void) +{ + LARGE_INTEGER frequency, diff, ts[3]; + IDirect3DVertexBuffer7 *buffer; + unsigned int i, j, tri_count; + D3DVERTEXBUFFERDESC vb_desc; + IDirect3DDevice7 *device; + BOOL unsynchronised, ret; + IDirectDrawSurface7 *rt; + IDirectDraw7 *ddraw; + IDirect3D7 *d3d; + D3DCOLOR colour; + ULONG refcount; + HWND window; + HRESULT hr; + + static const struct + { + unsigned int flags; + BOOL unsynchronised; + } + tests[] = + { + {0, FALSE}, + {DDLOCK_NOOVERWRITE, TRUE}, + {DDLOCK_DISCARDCONTENTS, FALSE}, + {DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS, TRUE}, + }; + + static const struct quad + { + struct + { + struct vec3 position; + DWORD diffuse; + } strip[4]; + } + quad1 = + { + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + } + }, + quad2 = + { + { + {{-1.0f, -1.0f, 0.0f}, 0xffffff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffffff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffffff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffff00}, + } + }; + struct quad *quads; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + /* Maps are always synchronised on WARP. */ + if (ddraw_is_warp(ddraw)) + { + skip("Running on WARP, skipping test.\n"); + goto done; + } + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + tri_count = 0x1000; + + ret = QueryPerformanceFrequency(&frequency); + ok(ret, "Failed to get performance counter frequency.\n"); + + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwCaps = D3DVBCAPS_WRITEONLY; + vb_desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; + vb_desc.dwNumVertices = tri_count + 2; + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&quads, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (j = 0; j < vb_desc.dwNumVertices / 4; ++j) + { + quads[j] = quad1; + } + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + /* Initial draw to initialise states, compile shaders, etc. */ + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, vb_desc.dwNumVertices, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* Read the result to ensure the GPU has finished drawing. */ + colour = get_surface_color(rt, 320, 240); + + /* Time drawing tri_count triangles. */ + ret = QueryPerformanceCounter(&ts[0]); + ok(ret, "Failed to read performance counter.\n"); + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, vb_desc.dwNumVertices, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + colour = get_surface_color(rt, 320, 240); + /* Time drawing a single triangle. */ + ret = QueryPerformanceCounter(&ts[1]); + ok(ret, "Failed to read performance counter.\n"); + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, 3, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + colour = get_surface_color(rt, 320, 240); + ret = QueryPerformanceCounter(&ts[2]); + ok(ret, "Failed to read performance counter.\n"); + + IDirect3DVertexBuffer7_Release(buffer); + + /* Estimate the number of triangles we can draw in 100ms. */ + diff.QuadPart = ts[1].QuadPart - ts[0].QuadPart + ts[1].QuadPart - ts[2].QuadPart; + tri_count = (tri_count * frequency.QuadPart) / (diff.QuadPart * 10); + tri_count = ((tri_count + 2 + 3) & ~3) - 2; + vb_desc.dwNumVertices = tri_count + 2; + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &buffer, 0); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&quads, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (j = 0; j < vb_desc.dwNumVertices / 4; ++j) + { + quads[j] = quad1; + } + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + /* Start a draw operation. */ + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, vb_desc.dwNumVertices, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + /* Map the last quad while the draw is in progress. */ + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_WAIT | tests[i].flags, (void **)&quads, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + quads[(vb_desc.dwNumVertices / 4) - 1] = quad2; + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + colour = get_surface_color(rt, 320, 240); + unsynchronised = compare_color(colour, 0x00ffff00, 1); + ok(tests[i].unsynchronised == unsynchronised, "Expected %s map for flags %#x.\n", + tests[i].unsynchronised ? "unsynchronised" : "synchronised", tests[i].flags); + + IDirect3DVertexBuffer7_Release(buffer); + } + + IDirectDrawSurface7_Release(rt); +done: + IDirectDraw7_Release(ddraw); + IDirect3D7_Release(d3d); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -13515,4 +13713,5 @@ START_TEST(ddraw7) test_vb_refcount(); test_compute_sphere_visibility(); test_clip_planes_limits(); + test_map_synchronisation(); } -- 2.11.0

1 0

[PATCH 2/5] ddraw: Only respect DDLOCK_NOOVERWRITE and DDLOCK_DISCARDCONTENTS on version 7 vertex buffers.
by Henri Verbeet 03 Jan '18

03 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/vertexbuffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 07f1257cf9c..cc676f39859 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -164,6 +164,9 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, flags, data, data_size); + if (buffer->version != 7) + flags &= ~(DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS); + /* Writeonly: Pointless. Event: Unsupported by native according to the sdk * nosyslock: Not applicable */ -- 2.11.0

1 0

[PATCH 1/5] wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE.
by Henri Verbeet 03 Jan '18

03 Jan '18

This fixes a performance issue exposed by commit afb2aa2512d4c5ffa7256ce5137bc2c142a5d065. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 40890cc99e8..dcaa0727075 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -335,17 +335,19 @@ static DWORD wined3d_resource_sanitise_map_flags(const struct wined3d_resource * return 0; } } - else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) { - WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); - return 0; - } - else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) - && !(resource->usage & WINED3DUSAGE_DYNAMIC)) - { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); - return 0; + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + { + WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + return 0; + } + if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + { + WARN("WINED3D_MAP_NOOVERWRITE used with WINED3D_MAP_DISCARD, ignoring WINED3D_MAP_DISCARD.\n"); + flags &= ~WINED3D_MAP_DISCARD; + } } return flags; -- 2.11.0

1 0

[PATCH 1/3] PATCHv1: Add generic function to retrieve HKEY string representation.
by Piyush Raj 03 Jan '18

03 Jan '18

--- programs/reg/reg.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 8d510f7f7e..405cc2a8be 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -814,6 +814,75 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } +static const WCHAR HKCR_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'C', 'L', 'A', 'S', 'S', 'E', 'S', '_', 'R', 'O', 'O', 'T', 0}; +static DWORD HKCR_WSTR_SZ = sizeof(HKCR_WSTR); +static const WCHAR HKLM_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'L', 'O', 'C', 'A', 'L', '_', 'M', 'A', 'C', 'H', 'I', 'N', 'E', 0}; +static DWORD HKLM_WSTR_SZ = sizeof(HKLM_WSTR); +static const WCHAR HKCU_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'C', 'U', 'R', 'R', 'E', 'N', 'T', '_', 'U', 'S', 'E', 'R', 0}; +static DWORD HKCU_WSTR_SZ = sizeof(HKCU_WSTR); +static const WCHAR HKU_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'U', 'S', 'E', 'R', 'S', 0}; +static DWORD HKU_WSTR_SZ = sizeof(HKU_WSTR); + +/* + * Given hkey, return its string representation into buf, who is + * assumed to hold at least (buf_sz * sizeof(*buf)) bytes + * + * Return 0 if successful, other value otherwise + */ +static LONG hkey_to_wstring(HKEY hkey, WCHAR *buf, DWORD buf_sz) +{ + if (hkey == HKEY_LOCAL_MACHINE) + { + if (buf_sz >= HKLM_WSTR_SZ) + { + memcpy(buf, HKLM_WSTR, HKLM_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + else if (hkey == HKEY_CURRENT_USER) + { + if (buf_sz >= HKCU_WSTR_SZ) + { + memcpy(buf, HKCU_WSTR, HKCU_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + else if (hkey == HKEY_USERS) + { + if (buf_sz >= HKU_WSTR_SZ) + { + memcpy(buf, HKU_WSTR, HKU_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + else if (hkey == HKEY_CLASSES_ROOT) + { + if (buf_sz >= HKCR_WSTR_SZ) + { + memcpy(buf, HKCR_WSTR, HKCR_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + + return -2; +} + static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { -- 2.11.0.windows.1

3 4

[PATCH] winhttp/tests: Remove redundant comparison.
by Andrey Gusev 03 Jan '18

03 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4fc9c2cc28..e06661c31e 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -996,7 +996,7 @@ static void test_secure_connection(void) protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); err = GetLastError(); - ok(ret || (!ret && err == ERROR_INVALID_PARAMETER) /* < win7 */, "failed to set protocols %u\n", err); + ok(ret || err == ERROR_INVALID_PARAMETER /* < win7 */, "failed to set protocols %u\n", err); con = WinHttpConnect(ses, test_winehq, 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); -- 2.13.6

2 1

[PATCH] testbot: Clarify a TestBot error message.
by Francois Gouget 03 Jan '18

03 Jan '18

TestBot users want to know that it's a TestBot process that crashed rather than their test executable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Tasks.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 1f91d266..e0b51922 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -163,7 +163,7 @@ sub UpdateStatus($$) my $TaskDir = $self->CreateDir(); if (open TASKLOG, ">>$TaskDir/err") { - print TASKLOG "Child process died unexpectedly\n"; + print TASKLOG "TestBot process died unexpectedly\n"; close TASKLOG; } umask($OldUMask); -- 2.15.1

1 0

[PATCH] testbot: Show the generation time of the job index page.
by Francois Gouget 03 Jan '18

03 Jan '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This matches the Activity and Stats pages. It's mostly there to help keep an eye on things. testbot/web/index.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index deacf909..427d7f6b 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -189,6 +189,7 @@ use ObjectModel::CGI::Page; use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Jobs; +use WineTestBot::Log; use WineTestBot::VMs; @StatusPage::ISA = qw(ObjectModel::CGI::Page); @@ -197,6 +198,7 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + $self->{start} = Time(); $self->SUPER::_initialize($Request, $RequiredRole); } @@ -297,6 +299,8 @@ EOF my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); $VMsCollectionBlock->GenerateList(); print "</div>\n"; + + print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } package main; -- 2.15.1

1 0

[PATCH] testbot/web: Fix display of time.count statistics.
by Francois Gouget 03 Jan '18

03 Jan '18

This fixes the 'Task count' statistic. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 424d33e0..d9f43814 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -122,7 +122,7 @@ sub _GetStatStr($$;$$) return "n/a" if (!$AllStats->{elapsed}); return sprintf('%.1f%', 100 * $Value / $AllStats->{elapsed}); } - if ($StatKey =~ /(?:\belapsed|\.time)\b/) + if ($StatKey =~ /(?:\belapsed|\.time(?!\.count))/) { return _GetDuration($Value, $Flags & $NO_TIME); } -- 2.15.1

1 0

[PATCH] msxml3: Output libxml2/libxslt version on initialization
by Nikolay Sivov 03 Jan '18

03 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 1905f57be4..a1b9dddbfc 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -169,6 +169,7 @@ void* libxslt_handle = NULL; DECL_FUNCPTR(xsltApplyStylesheet); DECL_FUNCPTR(xsltApplyStylesheetUser); DECL_FUNCPTR(xsltCleanupGlobals); +DECL_FUNCPTR(xsltEngineVersion); DECL_FUNCPTR(xsltFreeStylesheet); DECL_FUNCPTR(xsltFreeTransformContext); DECL_FUNCPTR(xsltNewTransformContext); @@ -195,6 +196,7 @@ static void init_libxslt(void) LOAD_FUNCPTR(xsltApplyStylesheet, 1); LOAD_FUNCPTR(xsltApplyStylesheetUser, 1); LOAD_FUNCPTR(xsltCleanupGlobals, 1); + LOAD_FUNCPTR(xsltEngineVersion, 1); LOAD_FUNCPTR(xsltFreeStylesheet, 1); LOAD_FUNCPTR(xsltFreeTransformContext, 1); LOAD_FUNCPTR(xsltNewTransformContext, 1); @@ -204,6 +206,8 @@ static void init_libxslt(void) LOAD_FUNCPTR(xsltSaveResultTo, 1); #undef LOAD_FUNCPTR + TRACE("Libxslt version is %s.\n", *pxsltEngineVersion); + if (pxsltInit) pxsltInit(); return; @@ -222,7 +226,6 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; @@ -231,6 +234,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { case DLL_PROCESS_ATTACH: #ifdef HAVE_LIBXML2 + TRACE("Libxml2 version is %s.\n", xmlParserVersion); + xmlInitParser(); /* Set the default indent character to a single tab, -- 2.15.1

1 0

[v3 PATCH] oledb32: Coerce Variant to VT_DATE when converting data
by Alistair Leslie-Hughes 03 Jan '18

03 Jan '18

v2: Correct Parameters passed to VariantChangeType. V3: Added tests Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 8 ++++++-- dlls/oledb32/tests/convert.c | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 267de1b..22609ae 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -475,10 +475,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; case DBTYPE_VARIANT: - if( V_VT((VARIANT*)src) == VT_DATE) + { + VariantInit(&tmp); + + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_DATE)) == S_OK) { SYSTEMTIME st; - hr = (VariantTimeToSystemTime( V_DATE((VARIANT*)src), &st) ? S_OK : E_FAIL); + hr = (VariantTimeToSystemTime( V_DATE(&tmp), &st) ? S_OK : E_FAIL); d->year = st.wYear; d->month = st.wMonth; d->day = st.wDay; @@ -489,6 +492,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return E_NOTIMPL; } break; + } default: FIXME("Unimplemented conversion %04x -> DBDATE\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 1d55e7f..6b0dd55 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3357,6 +3357,25 @@ static void test_converttodbdate(void) ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + V_VT(&var) = VT_R8; + V_R8(&var) = 41408.086250; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBDATE, sizeof(var), &dst_len, &var, &dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBDATE, sizeof(var), &dst_len, &var, &dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + VariantClear(&var); + dst_len = 0; bstr = SysAllocString(strW); hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBDATE, 0, &dst_len, &bstr, &dst, 2, 0, &dst_status, 0, 0, 0); -- 1.9.1

2 1

[PATCH 1/9] wined3d: Add WINED3D_RTYPE_TEXTURE_1D.
by Sven Hesse 03 Jan '18

03 Jan '18

Signed-off-by: Sven Hesse <shesse(a)codeweavers.com> --- dlls/wined3d/context.c | 6 ++++-- dlls/wined3d/device.c | 4 +++- dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/resource.c | 1 + dlls/wined3d/utils.c | 1 + include/wine/wined3d.h | 5 +++-- 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e12d75213..53f177980d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -392,10 +392,11 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co struct wined3d_resource *resource = render_target->resource; struct wined3d_texture *texture; + if (resource && (resource->type == WINED3D_RTYPE_BUFFER || resource->type == WINED3D_RTYPE_TEXTURE_1D)) + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + if (!resource || resource->format->id == WINED3DFMT_NULL || resource->type == WINED3D_RTYPE_BUFFER) { - if (resource && resource->type == WINED3D_RTYPE_BUFFER) - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); key->objects[idx].object = 0; key->objects[idx].target = 0; key->objects[idx].level = key->objects[idx].layer = 0; @@ -1017,6 +1018,7 @@ void context_resource_released(const struct wined3d_device *device, switch (type) { + case WINED3D_RTYPE_TEXTURE_1D: case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: texture = texture_from_resource(resource); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a25b98d749..2b7d515af4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4239,7 +4239,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str height = 1; depth = 1; } - else if (resource->type == WINED3D_RTYPE_TEXTURE_2D || resource->type == WINED3D_RTYPE_TEXTURE_3D) + else if (resource->type == WINED3D_RTYPE_TEXTURE_1D || resource->type == WINED3D_RTYPE_TEXTURE_2D + || resource->type == WINED3D_RTYPE_TEXTURE_3D) { struct wined3d_texture *texture = texture_from_resource(resource); unsigned int level; @@ -5003,6 +5004,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso switch (type) { + case WINED3D_RTYPE_TEXTURE_1D: case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1586bdc821..abab0b1024 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5300,6 +5300,20 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; + case WINED3D_RTYPE_TEXTURE_1D: + allowed_usage = WINED3DUSAGE_AUTOGENMIPMAP + | WINED3DUSAGE_DYNAMIC + | WINED3DUSAGE_SOFTWAREPROCESSING + | WINED3DUSAGE_TEXTURE + | WINED3DUSAGE_QUERY_FILTER + | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING + | WINED3DUSAGE_QUERY_SRGBREAD + | WINED3DUSAGE_QUERY_SRGBWRITE + | WINED3DUSAGE_QUERY_VERTEXTEXTURE + | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_1D; + break; + case WINED3D_RTYPE_TEXTURE_2D: allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 40890cc99e..6260abb2f4 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -95,6 +95,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource_types[] = { {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, + {WINED3D_RTYPE_TEXTURE_1D, 0, WINED3D_GL_RES_TYPE_TEX_1D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b3003f1302..daf7e7cba6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4217,6 +4217,7 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) #define WINED3D_TO_STR(x) case x: return #x WINED3D_TO_STR(WINED3D_RTYPE_NONE); WINED3D_TO_STR(WINED3D_RTYPE_BUFFER); + WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_1D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_2D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_3D); #undef WINED3D_TO_STR diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a519e94bb3..af89a7465f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -672,8 +672,9 @@ enum wined3d_resource_type { WINED3D_RTYPE_NONE = 0, WINED3D_RTYPE_BUFFER = 1, - WINED3D_RTYPE_TEXTURE_2D = 2, - WINED3D_RTYPE_TEXTURE_3D = 3, + WINED3D_RTYPE_TEXTURE_1D = 2, + WINED3D_RTYPE_TEXTURE_2D = 3, + WINED3D_RTYPE_TEXTURE_3D = 4, }; enum wined3d_pool -- 2.15.1

2 9

[PATCH] oledb32: Silence interfaces for IDataSourceLocator QI
by Alistair Leslie-Hughes 03 Jan '18

03 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 15 +++++++++++++++ dlls/oledb32/tests/database.c | 12 ++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 5c4bdad..f530d2e 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -78,6 +78,21 @@ static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID TRACE("IID_IRunnableObject returning NULL\n"); return E_NOINTERFACE; } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + TRACE("IID_IProvideClassInfo returning NULL\n"); + return E_NOINTERFACE; + } + else if (IsEqualIID(riid, &IID_IMarshal)) + { + TRACE("IID_IMarshal returning NULL\n"); + return E_NOINTERFACE; + } + else if (IsEqualIID(riid, &IID_IRpcOptions)) + { + TRACE("IID_IRpcOptions returning NULL\n"); + return E_NOINTERFACE; + } if(*ppvoid) { diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index b8c0e61..8ff55b9 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -886,6 +886,9 @@ static void test_dslocator(void) { IDataInitialize *datainit, *datainit2; IRunnableObject *runable; + IProvideClassInfo *info; + IMarshal *marshal; + IRpcOptions *opts; COMPATIBLE_LONG hwnd = 0; if (0) /* Crashes under Window 7 */ @@ -928,6 +931,15 @@ static void test_dslocator(void) hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRunnableObject, (void **)&runable); ok(hr == E_NOINTERFACE, "got %08x\n", hr); + hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IMarshal, (void **)&marshal); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IProvideClassInfo, (void **)&info); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRpcOptions, (void **)&opts); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + IDataInitialize_Release(datainit2); IDataInitialize_Release(datainit); -- 1.9.1

1 0

[PATCH] gdi32/tests: Fix resource leak.
by Andrey Gusev 02 Jan '18

02 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/gdi32/tests/bitmap.c | 23 ++++++++++++++++++++++- dlls/gdi32/tests/brush.c | 7 +++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a4002c83b5..aa833e3a63 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -143,8 +143,10 @@ static void test_createdibitmap(void) hbm = CreateDIBitmap(hdc, NULL, CBM_INIT, NULL, NULL, 0); ok(hbm == NULL, "CreateDIBitmap should fail\n"); + DeleteObject(hbm); hbm = CreateDIBitmap(hdc, NULL, 0, NULL, NULL, 0); ok(hbm == NULL, "CreateDIBitmap should fail\n"); + DeleteObject(hbm); /* First create an un-initialised bitmap. The depth of the bitmap should match that of the hdc and not that supplied in bmih. @@ -472,11 +474,13 @@ static void test_dibsections(void) bits = (BYTE*)0xdeadbeef; hdib = CreateDIBSection(hdc, NULL, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hdib == NULL && bits == NULL, "CreateDIBSection failed for invalid parameter: bmi == 0x0\n"); + DeleteObject(hdib); hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); ok(GetObjectW(hdib, sizeof(DIBSECTION), &dibsec) != 0, "GetObject failed for DIBSection\n"); ok(dibsec.dsBm.bmBits == bits, "dibsec.dsBits %p != bits %p\n", dibsec.dsBm.bmBits, bits); + DeleteObject(hdib); /* test the DIB memory */ ok(VirtualQuery(bits, &info, sizeof(info)) == sizeof(info), @@ -492,7 +496,6 @@ static void test_dibsections(void) test_dib_bits_access( hdib, bits ); test_dib_info(hdib, bits, &pbmi->bmiHeader); - DeleteObject(hdib); /* Test a top-down DIB. */ pbmi->bmiHeader.biHeight = -100; @@ -508,6 +511,7 @@ static void test_dibsections(void) hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hdib == NULL, "CreateDIBSection should fail when asked to create a compressed DIB section\n"); ok(GetLastError() == 0xdeadbeef, "wrong error %d\n", GetLastError()); + DeleteObject(hdib); pbmi->bmiHeader.biBitCount = 16; pbmi->bmiHeader.biCompression = BI_BITFIELDS; @@ -1079,6 +1083,7 @@ static void test_dib_formats(void) hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); + DeleteObject( hdib ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); ok( !ret, "SetDIBits succeeded with null bitfields\n" ); /* other functions don't check */ @@ -1107,6 +1112,7 @@ static void test_dib_formats(void) *(DWORD *)&bi->bmiColors[2] = 7; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); + DeleteObject( hdib ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); ok( !ret, "SetDIBits succeeded with null bitfields\n" ); @@ -1126,8 +1132,10 @@ static void test_dib_formats(void) bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with negative width\n" ); + DeleteObject( hdib ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib == NULL, "CreateDIBitmap succeeded with negative width\n" ); + DeleteObject( hdib ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); ok( !ret, "SetDIBits succeeded with negative width\n" ); ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); @@ -1149,6 +1157,7 @@ static void test_dib_formats(void) bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with zero width\n" ); + DeleteObject( hdib ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib != NULL, "CreateDIBitmap failed with zero width\n" ); DeleteObject( hdib ); @@ -1173,6 +1182,7 @@ static void test_dib_formats(void) bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with zero height\n" ); + DeleteObject( hdib ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib != NULL, "CreateDIBitmap failed with zero height\n" ); DeleteObject( hdib ); @@ -1199,6 +1209,7 @@ static void test_dib_formats(void) bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_PAL_COLORS+1, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with DIB_PAL_COLORS+1\n" ); + DeleteObject( hdib ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_PAL_COLORS+1 ); ok( hdib != NULL, "CreateDIBitmap failed with DIB_PAL_COLORS+1\n" ); DeleteObject( hdib ); @@ -1223,6 +1234,7 @@ static void test_dib_formats(void) bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_PAL_COLORS+2, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with DIB_PAL_COLORS+2\n" ); + DeleteObject( hdib ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_PAL_COLORS+2 ); ok( hdib == NULL, "CreateDIBitmap succeeded with DIB_PAL_COLORS+2\n" ); DeleteObject( hdib ); @@ -1255,6 +1267,7 @@ static void test_dib_formats(void) bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with size overflow\n" ); + DeleteObject( hdib ); bi->bmiHeader.biWidth = 1; bi->bmiHeader.biHeight = 0x40000001; @@ -1262,6 +1275,7 @@ static void test_dib_formats(void) bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with size overflow\n" ); + DeleteObject( hdib ); bi->bmiHeader.biWidth = 2; bi->bmiHeader.biHeight = 0x40000001; @@ -1269,6 +1283,7 @@ static void test_dib_formats(void) bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with size overflow\n" ); + DeleteObject( hdib ); bi->bmiHeader.biWidth = 0x40000001; bi->bmiHeader.biHeight = 1; @@ -1276,6 +1291,7 @@ static void test_dib_formats(void) bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with size overflow\n" ); + DeleteObject( hdib ); bi->bmiHeader.biWidth = 0x40000001; bi->bmiHeader.biHeight = 4; @@ -1283,6 +1299,7 @@ static void test_dib_formats(void) bi->bmiHeader.biCompression = BI_RGB; hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with size overflow\n" ); + DeleteObject( hdib ); DeleteDC( memdc ); DeleteObject( hbmp ); @@ -2615,6 +2632,7 @@ static void test_GetDIBits_BI_BITFIELDS(void) dibinfo->bmiHeader.biClrImportant = 0; hbm = CreateDIBSection( hdc, dibinfo, DIB_RGB_COLORS, &ptr, NULL, 0 ); ok( hbm == 0, "creating 24-bpp BI_BITFIELDS dibsection should fail\n" ); + DeleteObject( hbm ); dibinfo->bmiHeader.biCompression = BI_RGB; hbm = CreateDIBSection( hdc, dibinfo, DIB_RGB_COLORS, &ptr, NULL, 0 ); ok( hbm != 0, "failed to create bitmap\n" ); @@ -2876,6 +2894,7 @@ static void test_bitmapinfoheadersize(void) hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); ok(hdib == NULL, "CreateDIBSection succeeded\n"); + DeleteObject(hdib); bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -2937,6 +2956,7 @@ static void test_bitmapinfoheadersize(void) hdib = CreateDIBSection(hdc, (BITMAPINFO *)&bci, 0, NULL, NULL, 0); ok(hdib == NULL, "CreateDIBSection succeeded\n"); + DeleteObject(hdib); bci.bmciHeader.bcSize = sizeof(BITMAPCOREHEADER); @@ -2949,6 +2969,7 @@ static void test_bitmapinfoheadersize(void) hdib = CreateDIBSection(hdc, (BITMAPINFO *)&bci, 0, NULL, NULL, 0); ok(hdib == NULL, "CreateDIBSection succeeded\n"); + DeleteObject(hdib); bci.bmciHeader.bcSize = sizeof(BITMAPCOREINFO); diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 1a10429c05..ec5819f042 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -237,36 +237,43 @@ static void test_pattern_brush(void) DeleteObject( brush ); brush = CreateDIBPatternBrushPt( info, DIB_PAL_COLORS + 2 ); ok( !brush, "CreateDIBPatternBrushPt succeeded\n" ); + DeleteObject( brush ); brush = CreateDIBPatternBrushPt( info, DIB_PAL_COLORS + 3 ); ok( !brush, "CreateDIBPatternBrushPt succeeded\n" ); + DeleteObject( brush ); info->bmiHeader.biBitCount = 8; info->bmiHeader.biCompression = BI_RLE8; brush = CreateDIBPatternBrushPt( info, DIB_RGB_COLORS ); ok( !brush, "CreateDIBPatternBrushPt succeeded\n" ); + DeleteObject( brush ); info->bmiHeader.biBitCount = 4; info->bmiHeader.biCompression = BI_RLE4; brush = CreateDIBPatternBrushPt( info, DIB_RGB_COLORS ); ok( !brush, "CreateDIBPatternBrushPt succeeded\n" ); + DeleteObject( brush ); br.lbStyle = BS_DIBPATTERN8X8; br.lbColor = DIB_RGB_COLORS; br.lbHatch = (ULONG_PTR)mem; brush = CreateBrushIndirect( &br ); ok( !brush, "CreatePatternBrush succeeded\n" ); + DeleteObject( brush ); br.lbStyle = BS_MONOPATTERN; br.lbColor = DIB_RGB_COLORS; br.lbHatch = (ULONG_PTR)mem; brush = CreateBrushIndirect( &br ); ok( !brush, "CreatePatternBrush succeeded\n" ); + DeleteObject( brush ); br.lbStyle = BS_INDEXED; br.lbColor = DIB_RGB_COLORS; br.lbHatch = (ULONG_PTR)mem; brush = CreateBrushIndirect( &br ); ok( !brush, "CreatePatternBrush succeeded\n" ); + DeleteObject( brush ); GlobalFree( mem ); } -- 2.13.6

3 2

[PATCH] ddraw/tests: Mark GetDC() failures on VMware as broken.
by Henri Verbeet 02 Jan '18

02 Jan '18

From: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2c4410af783..52c5e858f91 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9071,7 +9071,7 @@ static void test_getdc(void) dc = (void *)0x1234; hr = IDirectDrawSurface_GetDC(surface, &dc); if (test_data[i].getdc_supported) - ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result), + ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result || ddraw_is_vmware(ddraw)), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); else ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 89d0d7e4be3..e87244bb143 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10205,7 +10205,7 @@ static void test_getdc(void) dc = (void *)0x1234; hr = IDirectDrawSurface_GetDC(surface, &dc); if (test_data[i].getdc_supported) - ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result), + ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result || ddraw_is_vmware(ddraw)), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); else ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index fa1178d0361..b280628f567 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11767,7 +11767,7 @@ static void test_getdc(void) dc = (void *)0x1234; hr = IDirectDrawSurface4_GetDC(surface, &dc); if (test_data[i].getdc_supported) - ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result), + ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); else ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fdfac696cfc..846a83de08e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11718,7 +11718,7 @@ static void test_getdc(void) dc = (void *)0x1234; hr = IDirectDrawSurface7_GetDC(surface, &dc); if (test_data[i].getdc_supported) - ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result), + ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); else ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); -- 2.11.0

2 1

[PATCH] d3d8/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 02 Jan '18

02 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/device.c | 52 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 8743a24..a9188f0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1207,7 +1207,7 @@ static void test_display_formats(void) d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); - for (display = 0; display < sizeof(formats) / sizeof(*formats); ++display) + for (display = 0; display < ARRAY_SIZE(formats); ++display) { for (i = 0, has_modes = FALSE; SUCCEEDED(IDirect3D8_EnumAdapterModes(d3d8, D3DADAPTER_DEFAULT, i, &mode)); ++i) { @@ -1220,7 +1220,7 @@ static void test_display_formats(void) for (windowed = 0; windowed <= 1; ++windowed) { - for (backbuffer = 0; backbuffer < sizeof(formats) / sizeof(*formats); ++backbuffer) + for (backbuffer = 0; backbuffer < ARRAY_SIZE(formats); ++backbuffer) { should_pass = FALSE; @@ -4543,7 +4543,7 @@ static void test_vb_lock_flags(void) hr = IDirect3DDevice8_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); - for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &data, test_data[i].flags); ok(hr == test_data[i].result, "Got unexpected hr %#x for %s.\n", @@ -4948,7 +4948,7 @@ static void test_lockrect_invalid(void) return; } - for (r = 0; r < sizeof(resources) / sizeof(*resources); ++r) + for (r = 0; r < ARRAY_SIZE(resources); ++r) { texture = NULL; cube_texture = NULL; @@ -4988,7 +4988,7 @@ static void test_lockrect_invalid(void) hr = IDirect3DSurface8_UnlockRect(surface); ok(hr == expected_hr, "Got hr %#x, expected %#x, type %s.\n", hr, expected_hr, resources[r].name); - for (i = 0; i < (sizeof(valid) / sizeof(*valid)); ++i) + for (i = 0; i < ARRAY_SIZE(valid); ++i) { const RECT *rect = &valid[i]; @@ -5038,7 +5038,7 @@ static void test_lockrect_invalid(void) } } - for (i = 0; i < (sizeof(invalid) / sizeof(*invalid)); ++i) + for (i = 0; i < ARRAY_SIZE(invalid); ++i) { const RECT *rect = &invalid[i]; @@ -5509,7 +5509,7 @@ static void test_surface_double_unlock(void) return; } - for (i = 0; i < (sizeof(pools) / sizeof(*pools)); ++i) + for (i = 0; i < ARRAY_SIZE(pools); ++i) { switch (pools[i]) { @@ -5671,7 +5671,7 @@ static void test_surface_blocks(void) tex_pow2 = !(caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL); cube_pow2 = !!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2); - for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { BOOL tex_support, cube_support, surface_support, format_known; @@ -5707,7 +5707,7 @@ static void test_surface_blocks(void) size_is_pow2 = !(w & (w - 1) || h & (h - 1)); - for (j = 0; j < sizeof(create_tests) / sizeof(*create_tests); j++) + for (j = 0; j < ARRAY_SIZE(create_tests); j++) { BOOL support, pow2; HRESULT expect_hr; @@ -5802,7 +5802,7 @@ static void test_surface_blocks(void) continue; } - for (j = 0; j < (sizeof(pools) / sizeof(*pools)); ++j) + for (j = 0; j < ARRAY_SIZE(pools); ++j) { hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, pools[j].pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0, @@ -5866,7 +5866,7 @@ static void test_surface_blocks(void) } } - for (k = 0; k < sizeof(invalid) / sizeof(*invalid); ++k) + for (k = 0; k < ARRAY_SIZE(invalid); ++k) { hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &invalid[k], 0); ok(FAILED(hr) == !pools[j].success, "Invalid lock %s(%#x), expected %s, format %s, pool %s, case %u.\n", @@ -5950,7 +5950,7 @@ static void test_set_palette(void) return; } - for (i = 0; i < sizeof(pal) / sizeof(*pal); i++) + for (i = 0; i < ARRAY_SIZE(pal); i++) { pal[i].peRed = i; pal[i].peGreen = i; @@ -5962,7 +5962,7 @@ static void test_set_palette(void) hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - for (i = 0; i < sizeof(pal) / sizeof(*pal); i++) + for (i = 0; i < ARRAY_SIZE(pal); i++) { pal[i].peRed = i; pal[i].peGreen = i; @@ -6194,7 +6194,7 @@ static void test_npot_textures(void) ok(cube_pow2 == tex_pow2, "Cube texture and 2d texture pow2 restrictions mismatch.\n"); ok(vol_pow2 == tex_pow2, "Volume texture and 2d texture pow2 restrictions mismatch.\n"); - for (i = 0; i < sizeof(pools) / sizeof(*pools); i++) + for (i = 0; i < ARRAY_SIZE(pools); i++) { for (levels = 0; levels <= 2; levels++) { @@ -6317,7 +6317,7 @@ static void test_volume_locking(void) goto out; } - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { hr = IDirect3DDevice8_CreateVolumeTexture(device, 4, 4, 4, 1, tests[i].usage, D3DFMT_A8R8G8B8, tests[i].pool, &texture); @@ -6424,7 +6424,7 @@ static void test_update_volumetexture(void) goto out; } - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { DWORD src_usage = tests[i].src_pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0; DWORD dst_usage = tests[i].dst_pool == D3DPOOL_DEFAULT ? D3DUSAGE_DYNAMIC : 0; @@ -6465,7 +6465,7 @@ static void test_update_volumetexture(void) goto out; } - for (i = 0; i < sizeof(tests2) / sizeof(*tests2); i++) + for (i = 0; i < ARRAY_SIZE(tests2); i++) { hr = IDirect3DDevice8_CreateVolumeTexture(device, tests2[i].src_size, tests2[i].src_size, tests2[i].src_size, @@ -6636,7 +6636,7 @@ static void test_volume_blocks(void) ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); pow2 = !!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2); - for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) + for (i = 0; i < ARRAY_SIZE(formats); i++) { hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, formats[i].fmt); @@ -6658,7 +6658,7 @@ static void test_volume_blocks(void) size_is_pow2 = !((w & (w - 1)) || (h & (h - 1)) || (d & (d - 1))); - for (j = 0; j < sizeof(create_tests) / sizeof(*create_tests); j++) + for (j = 0; j < ARRAY_SIZE(create_tests); j++) { BOOL may_succeed = FALSE; @@ -6706,7 +6706,7 @@ static void test_volume_blocks(void) ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); /* Test lockrect offset */ - for (j = 0; j < sizeof(offset_tests) / sizeof(*offset_tests); j++) + for (j = 0; j < ARRAY_SIZE(offset_tests); j++) { unsigned int bytes_per_pixel; bytes_per_pixel = formats[i].block_size / (formats[i].block_width * formats[i].block_height); @@ -6954,7 +6954,7 @@ static void test_lockbox_invalid(void) hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); - for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { unsigned int offset, expected_offset; const D3DBOX *box = &test_data[i].box; @@ -7811,7 +7811,7 @@ static void test_resource_priority(void) return; } - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++) + for (i = 0; i < ARRAY_SIZE(test_data); i++) { hr = IDirect3DDevice8_CreateTexture(device, 16, 16, 0, 0, D3DFMT_X8R8G8B8, test_data[i].pool, &texture); @@ -7943,7 +7943,7 @@ static void test_swapchain_parameters(void) present_parameters_windowed.Windowed = TRUE; present_parameters_windowed.BackBufferCount = 1; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { UINT bb_count = tests[i].backbuffer_count ? tests[i].backbuffer_count : 1; @@ -8123,7 +8123,7 @@ static void test_miptree_layout(void) base_dimension = 256; } - for (format_idx = 0; format_idx < sizeof(formats) / sizeof(*formats); ++format_idx) + for (format_idx = 0; format_idx < ARRAY_SIZE(formats); ++format_idx) { if (FAILED(hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, formats[format_idx].format))) @@ -8132,7 +8132,7 @@ static void test_miptree_layout(void) continue; } - for (pool_idx = 0; pool_idx < sizeof(pools) / sizeof(*pools); ++pool_idx) + for (pool_idx = 0; pool_idx < ARRAY_SIZE(pools); ++pool_idx) { hr = IDirect3DDevice8_CreateTexture(device, base_dimension, base_dimension, 0, 0, formats[format_idx].format, pools[pool_idx].pool, &texture_2d); @@ -8169,7 +8169,7 @@ static void test_miptree_layout(void) continue; } - for (pool_idx = 0; pool_idx < sizeof(pools) / sizeof(*pools); ++pool_idx) + for (pool_idx = 0; pool_idx < ARRAY_SIZE(pools); ++pool_idx) { hr = IDirect3DDevice8_CreateCubeTexture(device, base_dimension, 0, 0, formats[format_idx].format, pools[pool_idx].pool, &texture_cube); -- 2.9.5

2 1

[PATCH 1/3] PATCHv1: Add generic function to retrieve HKEY string representation.
by Piyush Raj 02 Jan '18

02 Jan '18

--- programs/reg/reg.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 8d510f7f7e..405cc2a8be 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -814,6 +814,75 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } +static const WCHAR HKCR_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'C', 'L', 'A', 'S', 'S', 'E', 'S', '_', 'R', 'O', 'O', 'T', 0}; +static DWORD HKCR_WSTR_SZ = sizeof(HKCR_WSTR); +static const WCHAR HKLM_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'L', 'O', 'C', 'A', 'L', '_', 'M', 'A', 'C', 'H', 'I', 'N', 'E', 0}; +static DWORD HKLM_WSTR_SZ = sizeof(HKLM_WSTR); +static const WCHAR HKCU_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'C', 'U', 'R', 'R', 'E', 'N', 'T', '_', 'U', 'S', 'E', 'R', 0}; +static DWORD HKCU_WSTR_SZ = sizeof(HKCU_WSTR); +static const WCHAR HKU_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'U', 'S', 'E', 'R', 'S', 0}; +static DWORD HKU_WSTR_SZ = sizeof(HKU_WSTR); + +/* + * Given hkey, return its string representation into buf, who is + * assumed to hold at least (buf_sz * sizeof(*buf)) bytes + * + * Return 0 if successful, other value otherwise + */ +static LONG hkey_to_wstring(HKEY hkey, WCHAR *buf, DWORD buf_sz) +{ + if (hkey == HKEY_LOCAL_MACHINE) + { + if (buf_sz >= HKLM_WSTR_SZ) + { + memcpy(buf, HKLM_WSTR, HKLM_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + else if (hkey == HKEY_CURRENT_USER) + { + if (buf_sz >= HKCU_WSTR_SZ) + { + memcpy(buf, HKCU_WSTR, HKCU_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + else if (hkey == HKEY_USERS) + { + if (buf_sz >= HKU_WSTR_SZ) + { + memcpy(buf, HKU_WSTR, HKU_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + else if (hkey == HKEY_CLASSES_ROOT) + { + if (buf_sz >= HKCR_WSTR_SZ) + { + memcpy(buf, HKCR_WSTR, HKCR_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + + return -2; +} + static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { -- 2.11.0.windows.1

1 2

[PATCH] mshtml: Don't dispatch load event if document is already detached from its window.
by Jacek Caban 02 Jan '18

02 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsevents.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)

1 0

[PATCH 1/3] PATCHv1: Add generic function to retrieve HKEY string representation.
by Piyush Raj 02 Jan '18

02 Jan '18

--- programs/reg/reg.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 8d510f7f7e..405cc2a8be 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -814,6 +814,75 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } +static const WCHAR HKCR_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'C', 'L', 'A', 'S', 'S', 'E', 'S', '_', 'R', 'O', 'O', 'T', 0}; +static DWORD HKCR_WSTR_SZ = sizeof(HKCR_WSTR); +static const WCHAR HKLM_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'L', 'O', 'C', 'A', 'L', '_', 'M', 'A', 'C', 'H', 'I', 'N', 'E', 0}; +static DWORD HKLM_WSTR_SZ = sizeof(HKLM_WSTR); +static const WCHAR HKCU_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'C', 'U', 'R', 'R', 'E', 'N', 'T', '_', 'U', 'S', 'E', 'R', 0}; +static DWORD HKCU_WSTR_SZ = sizeof(HKCU_WSTR); +static const WCHAR HKU_WSTR[] = {'H', 'K', 'E', 'Y', '_', 'U', 'S', 'E', 'R', 'S', 0}; +static DWORD HKU_WSTR_SZ = sizeof(HKU_WSTR); + +/* + * Given hkey, return its string representation into buf, who is + * assumed to hold at least (buf_sz * sizeof(*buf)) bytes + * + * Return 0 if successful, other value otherwise + */ +static LONG hkey_to_wstring(HKEY hkey, WCHAR *buf, DWORD buf_sz) +{ + if (hkey == HKEY_LOCAL_MACHINE) + { + if (buf_sz >= HKLM_WSTR_SZ) + { + memcpy(buf, HKLM_WSTR, HKLM_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + else if (hkey == HKEY_CURRENT_USER) + { + if (buf_sz >= HKCU_WSTR_SZ) + { + memcpy(buf, HKCU_WSTR, HKCU_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + else if (hkey == HKEY_USERS) + { + if (buf_sz >= HKU_WSTR_SZ) + { + memcpy(buf, HKU_WSTR, HKU_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + else if (hkey == HKEY_CLASSES_ROOT) + { + if (buf_sz >= HKCR_WSTR_SZ) + { + memcpy(buf, HKCR_WSTR, HKCR_WSTR_SZ); + return 0; + } + else + { + return -1; + } + } + + return -2; +} + static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { -- 2.11.0.windows.1

1 2

[PATCH] msvcrt: Don't include MSVC 8.0+ heap functions in SOs for older DLLs
by Alex Henrie 02 Jan '18

02 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/heap.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index ed41253304..7ea80a3a50 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -373,8 +373,9 @@ MSVCRT_size_t CDECL _msize(void* mem) return size; } +#if _MSVCR_VER>=80 /********************************************************************* - * _aligned_msize (MSVCR100.@) + * _aligned_msize (MSVCR80.@) */ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offset) { @@ -388,6 +389,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs alloc_ptr = SAVED_PTR(p); return _msize(*alloc_ptr)-alignment-sizeof(void*); } +#endif /********************************************************************* * calloc (MSVCRT.@) @@ -405,6 +407,7 @@ void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) return msvcrt_heap_alloc(HEAP_ZERO_MEMORY, bytes); } +#if _MSVCR_VER>=140 /********************************************************************* * _calloc_base (UCRTBASE.@) */ @@ -412,6 +415,7 @@ void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size) { return MSVCRT_calloc(count, size); } +#endif /********************************************************************* * free (MSVCRT.@) @@ -421,6 +425,7 @@ void CDECL MSVCRT_free(void* ptr) msvcrt_heap_free(ptr); } +#if _MSVCR_VER>=140 /********************************************************************* * _free_base (UCRTBASE.@) */ @@ -428,6 +433,7 @@ void CDECL _free_base(void* ptr) { msvcrt_heap_free(ptr); } +#endif /********************************************************************* * malloc (MSVCRT.@) @@ -440,6 +446,7 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) return ret; } +#if _MSVCR_VER>=140 /********************************************************************* * _malloc_base (UCRTBASE.@) */ @@ -447,6 +454,7 @@ void* CDECL _malloc_base(MSVCRT_size_t size) { return MSVCRT_malloc(size); } +#endif /********************************************************************* * realloc (MSVCRT.@) @@ -459,6 +467,7 @@ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) return NULL; } +#if _MSVCR_VER>=140 /********************************************************************* * _realloc_base (UCRTBASE.@) */ @@ -466,9 +475,11 @@ void* CDECL _realloc_base(void* ptr, MSVCRT_size_t size) { return MSVCRT_realloc(ptr, size); } +#endif +#if _MSVCR_VER>=80 /********************************************************************* - * _recalloc (MSVCR100.@) + * _recalloc (MSVCR80.@) */ void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size) { @@ -491,6 +502,7 @@ void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size) memset((BYTE*)ret+old_size, 0, size-old_size); return ret; } +#endif /********************************************************************* * __p__amblksiz (MSVCRT.@) @@ -739,6 +751,7 @@ int CDECL MSVCRT_memmove_s(void *dest, MSVCRT_size_t numberOfElements, const voi return 0; } +#if _MSVCR_VER>=100 /********************************************************************* * wmemmove_s (MSVCR100.@) */ @@ -761,6 +774,7 @@ int CDECL wmemmove_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements, memmove(dest, src, sizeof(MSVCRT_wchar_t)*count); return 0; } +#endif /********************************************************************* * memcpy_s (MSVCRT.@) @@ -788,6 +802,7 @@ int CDECL MSVCRT_memcpy_s(void *dest, MSVCRT_size_t numberOfElements, const void return 0; } +#if _MSVCR_VER>=100 /********************************************************************* * wmemcpy_s (MSVCR100.@) */ @@ -813,6 +828,7 @@ int CDECL wmemcpy_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements, memcpy(dest, src, sizeof(MSVCRT_wchar_t)*count); return 0; } +#endif /********************************************************************* * strncpy_s (MSVCRT.@) -- 2.15.1

2 3

[PATCH] msvcrt: _Gettnames() should respect user overrides.
by Zebediah Figura 02 Jan '18

02 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msvcrt/locale.c | 10 +++---- dlls/msvcrt/tests/locale.c | 73 +++++++++++++++++----------------------------- 2 files changed, 31 insertions(+), 52 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6e16311..d49fa45 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1515,16 +1515,14 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW); }else { - ret = GetLocaleInfoA(lcid_tmp, time_data[i] - |LOCALE_NOUSEROVERRIDE, NULL, 0); + ret = GetLocaleInfoA(lcid_tmp, time_data[i], NULL, 0); if(!ret) { free_locinfo(locinfo); return NULL; } size += ret; - ret = GetLocaleInfoW(lcid_tmp, time_data[i] - |LOCALE_NOUSEROVERRIDE, NULL, 0); + ret = GetLocaleInfoW(lcid_tmp, time_data[i], NULL, 0); if(!ret) { free_locinfo(locinfo); return NULL; @@ -1555,7 +1553,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, memcpy(&locinfo->lc_time_curr->data[ret], cloc_time, sizeof(cloc_time)); ret += sizeof(cloc_time); }else { - ret += GetLocaleInfoA(lcid_tmp, time_data[i]|LOCALE_NOUSEROVERRIDE, + ret += GetLocaleInfoA(lcid_tmp, time_data[i], &locinfo->lc_time_curr->data[ret], size-ret); } } @@ -1571,7 +1569,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, memcpy(&locinfo->lc_time_curr->data[ret], cloc_timeW, sizeof(cloc_timeW)); ret += sizeof(cloc_timeW); }else { - ret += GetLocaleInfoW(lcid_tmp, time_data[i]|LOCALE_NOUSEROVERRIDE, + ret += GetLocaleInfoW(lcid_tmp, time_data[i], (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); } } diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 89761dd..31540ab 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -663,6 +663,24 @@ static void test_crtGetStringTypeW(void) static void test__Gettnames(void) { + static const DWORD time_data[] = { + LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, + LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, + LOCALE_SABBREVDAYNAME6, + LOCALE_SDAYNAME7, LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, + LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6, + LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3, + LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9, + LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12, + LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3, LOCALE_SMONTHNAME4, + LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6, LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, + LOCALE_SMONTHNAME9, LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12, + LOCALE_S1159, LOCALE_S2359, + LOCALE_SSHORTDATE, LOCALE_SLONGDATE, + LOCALE_STIMEFORMAT + }; + struct { char *str[43]; LCID lcid; @@ -672,6 +690,7 @@ static void test__Gettnames(void) } *ret; int size; char buf[64]; + int i; if(!setlocale(LC_ALL, "english")) return; @@ -686,52 +705,14 @@ static void test__Gettnames(void) else ok(size==0x164 || broken(size==0xb8), "structure size: %x\n", size); - ok(!strcmp(ret->str[0], "Sun"), "ret->str[0] = %s\n", ret->str[0]); - ok(!strcmp(ret->str[1], "Mon"), "ret->str[1] = %s\n", ret->str[1]); - ok(!strcmp(ret->str[2], "Tue"), "ret->str[2] = %s\n", ret->str[2]); - ok(!strcmp(ret->str[3], "Wed"), "ret->str[3] = %s\n", ret->str[3]); - ok(!strcmp(ret->str[4], "Thu"), "ret->str[4] = %s\n", ret->str[4]); - ok(!strcmp(ret->str[5], "Fri"), "ret->str[5] = %s\n", ret->str[5]); - ok(!strcmp(ret->str[6], "Sat"), "ret->str[6] = %s\n", ret->str[6]); - ok(!strcmp(ret->str[7], "Sunday"), "ret->str[7] = %s\n", ret->str[7]); - ok(!strcmp(ret->str[8], "Monday"), "ret->str[8] = %s\n", ret->str[8]); - ok(!strcmp(ret->str[9], "Tuesday"), "ret->str[9] = %s\n", ret->str[9]); - ok(!strcmp(ret->str[10], "Wednesday"), "ret->str[10] = %s\n", ret->str[10]); - ok(!strcmp(ret->str[11], "Thursday"), "ret->str[11] = %s\n", ret->str[11]); - ok(!strcmp(ret->str[12], "Friday"), "ret->str[12] = %s\n", ret->str[12]); - ok(!strcmp(ret->str[13], "Saturday"), "ret->str[13] = %s\n", ret->str[13]); - ok(!strcmp(ret->str[14], "Jan"), "ret->str[14] = %s\n", ret->str[14]); - ok(!strcmp(ret->str[15], "Feb"), "ret->str[15] = %s\n", ret->str[15]); - ok(!strcmp(ret->str[16], "Mar"), "ret->str[16] = %s\n", ret->str[16]); - ok(!strcmp(ret->str[17], "Apr"), "ret->str[17] = %s\n", ret->str[17]); - ok(!strcmp(ret->str[18], "May"), "ret->str[18] = %s\n", ret->str[18]); - ok(!strcmp(ret->str[19], "Jun"), "ret->str[19] = %s\n", ret->str[19]); - ok(!strcmp(ret->str[20], "Jul"), "ret->str[20] = %s\n", ret->str[20]); - ok(!strcmp(ret->str[21], "Aug"), "ret->str[21] = %s\n", ret->str[21]); - ok(!strcmp(ret->str[22], "Sep"), "ret->str[22] = %s\n", ret->str[22]); - ok(!strcmp(ret->str[23], "Oct"), "ret->str[23] = %s\n", ret->str[23]); - ok(!strcmp(ret->str[24], "Nov"), "ret->str[24] = %s\n", ret->str[24]); - ok(!strcmp(ret->str[25], "Dec"), "ret->str[25] = %s\n", ret->str[25]); - ok(!strcmp(ret->str[26], "January"), "ret->str[26] = %s\n", ret->str[26]); - ok(!strcmp(ret->str[27], "February"), "ret->str[27] = %s\n", ret->str[27]); - ok(!strcmp(ret->str[28], "March"), "ret->str[28] = %s\n", ret->str[28]); - ok(!strcmp(ret->str[29], "April"), "ret->str[29] = %s\n", ret->str[29]); - ok(!strcmp(ret->str[30], "May"), "ret->str[30] = %s\n", ret->str[30]); - ok(!strcmp(ret->str[31], "June"), "ret->str[31] = %s\n", ret->str[31]); - ok(!strcmp(ret->str[32], "July"), "ret->str[32] = %s\n", ret->str[32]); - ok(!strcmp(ret->str[33], "August"), "ret->str[33] = %s\n", ret->str[33]); - ok(!strcmp(ret->str[34], "September"), "ret->str[34] = %s\n", ret->str[34]); - ok(!strcmp(ret->str[35], "October"), "ret->str[35] = %s\n", ret->str[35]); - ok(!strcmp(ret->str[36], "November"), "ret->str[36] = %s\n", ret->str[36]); - ok(!strcmp(ret->str[37], "December"), "ret->str[37] = %s\n", ret->str[37]); - ok(!strcmp(ret->str[38], "AM"), "ret->str[38] = %s\n", ret->str[38]); - ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); - ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, - "ret->str[40] = %s\n", ret->str[40]); - size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), - LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, buf, sizeof(buf)); - ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); - ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); + for (i = 0; i < sizeof(time_data)/sizeof(time_data[0]); i++) + { + size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), + time_data[i], buf, sizeof(buf)); + ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf); + } + free(ret); if(!setlocale(LC_TIME, "german")) -- 2.7.4

2 1

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-devel