- wine-devel - winehq.org

[PATCH 2/2] wininet: Check null pointer in InternetGetSecurityInfoByURLW
by Wei Xie 05 Jan '18

05 Jan '18

The test will crash before apply this patch ------------------ 武汉深之度科技有限公司 Wuhan Deepin Technology Co., Ltd. 　　谢威手机：18038104349 武汉：武汉市光谷大道77号光谷金融港B18栋6楼北京：北京市西城区新街口外大街28号院普天德胜B座603室上海：上海市长宁区愚园路1258号15A01室官网：www.deepin.org　　官博：深度操作系统

1 0

Re: [PATCH] kernel32/tests: A spelling fix in a comment.
by Alex Henrie 04 Jan '18

04 Jan '18

- /* Setup the remote process enviornment */ + /* Setup the remote process environment */ While you're at it, this should be "Set up" (the verb), not "Setup" (the noun). -Alex

2 1

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

04 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

3 15

[PATCH v2] 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 | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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..95f980a2ff 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -732,7 +732,11 @@ START_TEST(proxy) ret = WaitForSingleObject( info.event, 3000 ); ok(ret == WAIT_OBJECT_0, "failed to start test server %u\n", GetLastError()); - if (ret != WAIT_OBJECT_0) return; + if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); + return; + } test_WsSendMessage( info.port, &test1 ); test_WsReceiveMessage( info.port ); @@ -741,4 +745,5 @@ START_TEST(proxy) test_WsSendMessage( info.port, &quit ); WaitForSingleObject( thread, 3000 ); + CloseHandle(thread); } -- 2.13.6

2 1

Re: [PATCH] gdiplus/tests: Add a trailing '\n' to ok() calls.
by Vincent Povirk 04 Jan '18

04 Jan '18

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>

1 0

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

[PATCH] server: Pass proper async object to queue_irp in device_file_flush.
by Jacek Caban 02 Jan '18

02 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 5/6] msvcrt/tests: Don't test function directly when reporting GetLastError()
by André Hentschel 02 Jan '18

02 Jan '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/msvcrt/tests/time.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index bc1c6c8..a5a2df1 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -878,9 +878,10 @@ static void test_clock(void) static const int THRESH = 100; FILETIME start, cur; int c, expect; + BOOL ret; - ok(GetProcessTimes(GetCurrentProcess(), &start, &cur, &cur, &cur), - "GetProcessTimes failed with error: %d\n", GetLastError()); + ret = GetProcessTimes(GetCurrentProcess(), &start, &cur, &cur, &cur); + ok(ret, "GetProcessTimes failed with error: %d\n", GetLastError()); GetSystemTimeAsFileTime(&cur); expect = (((LONGLONG)cur.dwHighDateTime<<32)+cur.dwLowDateTime - ((LONGLONG)start.dwHighDateTime<<32)-start.dwLowDateTime) / 10000; -- 2.7.4

2 1

[PATCH 3/3] glu32: Don't cast return value from HeapAlloc
by André Hentschel 02 Jan '18

02 Jan '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/glu32/mipmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/glu32/mipmap.c b/dlls/glu32/mipmap.c index 87d4770..2eff558 100644 --- a/dlls/glu32/mipmap.c +++ b/dlls/glu32/mipmap.c @@ -4169,7 +4169,7 @@ static int gluBuild2DMipmapLevelsCore(GLenum target, GLint internalFormat, case GL_UNSIGNED_INT_8_8_8_8_REV: case GL_UNSIGNED_INT_10_10_10_2: case GL_UNSIGNED_INT_2_10_10_10_REV: - dstImage = (GLuint *)HeapAlloc(GetProcessHeap(), 0, memreq); + dstImage = HeapAlloc(GetProcessHeap(), 0, memreq); break; default: return GLU_INVALID_ENUM; -- 2.7.4

1 0

[PATCH 2/3] shell32: Don't cast return value from DPA_GetPtr
by André Hentschel 02 Jan '18

02 Jan '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shell32/iconcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 0ea2eb9..fc4e703 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -129,7 +129,7 @@ HRESULT SIC_get_location( int list_idx, WCHAR *file, DWORD *size, int *res_idx ) dpa_idx = DPA_Search( sic_hdpa, &seek, 0, SIC_CompareEntries, SIC_COMPARE_LISTINDEX, 0 ); if (dpa_idx != -1) { - found = (SIC_ENTRY *)DPA_GetPtr( sic_hdpa, dpa_idx ); + found = DPA_GetPtr( sic_hdpa, dpa_idx ); needed = (strlenW( found->sSourceFile ) + 1) * sizeof(WCHAR); if (needed <= *size) { -- 2.7.4

1 0

[PATCH 1/3] advapi32/tests: Don't cast return value from HeapAlloc
by André Hentschel 02 Jan '18

02 Jan '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/tests/eventlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 8c78dcf..e6b2de5 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1157,7 +1157,7 @@ static void test_start_trace(void) LONG ret; buffersize = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname) + sizeof(filepath); - properties = (EVENT_TRACE_PROPERTIES *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffersize); + properties = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffersize); properties->Wnode.BufferSize = buffersize; properties->Wnode.Flags = WNODE_FLAG_TRACED_GUID; properties->LogFileMode = EVENT_TRACE_FILE_MODE_NONE; -- 2.7.4

1 0

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

02 Jan '18

v2: Correct Parameters passed to VariantChangeType. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 8 ++++++-- 1 file changed, 6 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; -- 1.9.1

2 1

[PATCH] advapi32/tests: Skip tests modifying HKLM if limited.
by Zebediah Figura 02 Jan '18

02 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/registry.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index e5de323..9f1874d 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2507,6 +2507,12 @@ static void test_redirection(void) } } + if (limited_user) + { + skip("not enough privileges to modify HKLM\n"); + return; + } + err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, KEY_WOW64_64KEY | KEY_ALL_ACCESS, NULL, &root64, NULL ); ok( err == ERROR_SUCCESS, "RegCreateKeyExA failed: %u\n", err ); -- 2.7.4

1 0

[PATCH] kernel32/tests: Update product type test.
by Zebediah Figura 02 Jan '18

02 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 4182c06..7b13598 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -87,7 +87,7 @@ static void test_GetProductInfo(void) res = pGetProductInfo(entry[0], entry[1], entry[2], entry[3], &product); if (entry[0] >= 6) - ok(res && (product > PRODUCT_UNDEFINED) && (product <= PRODUCT_PROFESSIONAL_WMC), + ok(res && (product > PRODUCT_UNDEFINED) && (product <= PRODUCT_ENTERPRISE_S_N_EVALUATION), "got %d and 0x%x (expected TRUE and a valid PRODUCT_* value)\n", res, product); else ok(!res && !product && (GetLastError() == 0xdeadbeef), -- 2.7.4

1 0

[PATCH] mpr/tests: Fix drive search loop.
by Zebediah Figura 02 Jan '18

02 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mpr/tests/mpr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index a6af1b5..330e66b 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -284,8 +284,9 @@ static void test_WNetUseConnection(void) strcpy(netRes->lpRemoteName, "\\\\127.0.0.1\\c$"); bufSize = 0; ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, NULL, &bufSize, &outRes); - if (ret == ERROR_ALREADY_ASSIGNED) continue; + if (ret != ERROR_ALREADY_ASSIGNED) break; } + if (ret == ERROR_ALREADY_ASSIGNED) goto end; /* no drives available */ todo_wine ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); @@ -310,6 +311,7 @@ static void test_WNetUseConnection(void) ok(bufSize == 4, "Unexpected buffer size: %u\n", bufSize); if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); +end: HeapFree(GetProcessHeap(), 0, netRes); } -- 2.7.4

1 0

[PATCH] gdi32/tests: Expect English font names even on non-English locales
by Alex Henrie 01 Jan '18

01 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes numerous test VM failures dlls/gdi32/tests/font.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 117a14f153..f1b7e9a91c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5477,8 +5477,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "%s: FAMILY (family name) could not be read\n", FamilyName); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); @@ -5488,8 +5487,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "FULL_NAME (face name) could not be read\n"); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); @@ -5499,8 +5497,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "%s: SUBFAMILY (style name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(StyleName, bufA), "%s: style names don't match: returned %s, expect %s\n", FamilyName, StyleName, bufA); @@ -5509,8 +5506,7 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "%s: UNIQUE_ID (full name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; -- 2.15.1

2 2

[PATCH] user32/tests: Add missing return value test (Coverity)
by Nikolay Sivov 01 Jan '18

01 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index f7aae80c9c..afc3473df3 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1476,7 +1476,8 @@ static void test_DialogBoxParam(void) ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestDefButtonDlgProc, 0); ok(ret == IDOK, "Expected IDOK\n"); - DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); + ok(ret == 0, "Unexpected ret value %ld.\n", ret); /* WM_SETTEXT handling in case of A/W dialog procedures vs A/W dialog window. */ ret = DialogBoxParamW(GetModuleHandleA(NULL), nameW, 0, test_aw_conversion_dlgproc, 0); -- 2.15.1

1 0

[PATCH] psapi/tests: Increase GetPerformanceInfo error margins for Windows 8
by Alex Henrie 01 Jan '18

01 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes the intermittent failures on Windows 8 dlls/psapi/tests/psapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 50dfdd903c..cd07ce727a 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -230,11 +230,11 @@ static void test_GetPerformanceInfo(void) /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ - ok(check_with_margin(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, 64), + ok(check_with_margin(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, 256), "expected approximately %ld but got %d\n", info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage); - ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 64), + ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 256), "expected approximately %ld but got %d\n", info.KernelPaged, sys_performance_info->PagedPoolUsage); ok(check_with_margin(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage, 16), -- 2.15.1

1 0

[PATCH] po: Fix Catalan spelling and grammar (Softcatalà quality check)
by Alex Henrie 01 Jan '18

01 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ca.po b/po/ca.po index 0fdec04444..ce9601561c 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-17 18:14-0700\n" +"PO-Revision-Date: 2017-12-31 19:18-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -6913,7 +6913,7 @@ msgstr "S'està assignant espai en el registre" #: msi.rc:91 msgid "Searching for installed applications" -msgstr "S'estan cercant aplicacions instalades" +msgstr "S'estan cercant aplicacions instal·lades" #: msi.rc:92 msgid "Binding executables" @@ -6969,7 +6969,7 @@ msgstr "S'està instal·lant el catàleg de sistema" #: msi.rc:107 msgid "Validating install" -msgstr "S'està validant l'instalació" +msgstr "S'està validant l'instal·lació" #: msi.rc:108 msgid "Evaluating launch conditions" @@ -6987,7 +6987,7 @@ msgstr "S'estan movent fixters" #: msi.rc:111 msgid "Publishing assembly information" -msgstr "S'està publicant informació de assemblatge" +msgstr "S'està publicant informació d'assemblatge" #: msi.rc:112 msgid "Unpublishing assembly information" @@ -10640,7 +10640,7 @@ msgid "" "Specifying no open command after the equal sign removes the command string\n" "associated to the specified file type.\n" msgstr "" -"FTYPE mostra o modifica les ordres d'obertura associats amb els tipus de\n" +"FTYPE mostra o modifica les ordres d'obertura associades amb els tipus de\n" "fitxers.\n" "\n" "Sintaxi: FTYPE [tipusDeFitxer[=[ordreDeObertura]]]\n" -- 2.15.1

1 0

[PATCH] v2 pt_PO.pt
by Fernando 31 Dec '17

31 Dec '17

This patch supersedes my previous patch sent to wine-patches on 2018-12-26, which was pending due to lack of "authorship", and can be discarded. I translated all the changes tagged "fuzzy", plus some empty translations, plus several corrections. I have added some comments at the top of the file to indicate some translations used to help with future consistency. I have filled in the field last-translator in pt_PT.po and added the header signed-off to the patch. I hope all is well. For feedback, it would be better if you address my email directly. Regards and best wishes to 2018. Fernando Martins

1 0

po: Update Swedish translation
by Anders Jonsson 31 Dec '17

31 Dec '17

1 0

[PATCH 1/6] shell32/tests: Don't test functions directly when reporting DdeGetLastError()
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shell32/tests/progman_dde.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index bfa9f65..28dad2c 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -460,6 +460,7 @@ START_TEST(progman_dde) UINT err; HSZ hszProgman; HCONV hConv; + BOOL ret; init_function_pointers(); init_strings(); @@ -472,7 +473,8 @@ START_TEST(progman_dde) hszProgman = DdeCreateStringHandleA(instance, "PROGMAN", CP_WINANSI); ok(hszProgman != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance)); hConv = DdeConnect(instance, hszProgman, hszProgman, NULL); - ok(DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); + ret = DdeFreeStringHandle(instance, hszProgman); + ok(ret, "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); /* Seeing failures on early versions of Windows Connecting to progman, exit if connection fails */ if (hConv == NULL) { @@ -485,8 +487,10 @@ START_TEST(progman_dde) test_request_groups(instance, hConv); /* Cleanup & Exit */ - ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); - ok(DdeUninitialize(instance), "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); + ret = DdeDisconnect(hConv); + ok(ret, "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ret = DdeUninitialize(instance); + ok(ret, "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); /* 2nd Instance (Followup Tests) */ /* Initialize DDE Instance */ @@ -499,12 +503,15 @@ START_TEST(progman_dde) ok(hszProgman != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance)); hConv = DdeConnect(instance, hszProgman, hszProgman, NULL); ok(hConv != NULL, "DdeConnect() failed: %u\n", DdeGetLastError(instance)); - ok(DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); + ret = DdeFreeStringHandle(instance, hszProgman); + ok(ret, "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); /* Run Tests */ test_progman_dde2(instance, hConv); /* Cleanup & Exit */ - ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); - ok(DdeUninitialize(instance), "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); + ret = DdeDisconnect(hConv); + ok(ret, "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ret = DdeUninitialize(instance); + ok(ret, "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); } -- 2.7.4

2 1

[PATCH 6/6] wsdapi/tests: Don't test function directly when reporting WSAGetLastError()
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/wsdapi/tests/address.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 1dbe266..66293e7 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -246,6 +246,7 @@ static void GetSetSockaddr_udp_tests(void) IWSDUdpAddress *udpAddress = NULL; LPCWSTR returnedAddress = NULL; char addressBuffer[MAX_PATH]; + const char *cret; WSADATA wsaData; WORD port = 0; HRESULT rc; @@ -294,7 +295,8 @@ static void GetSetSockaddr_udp_tests(void) /* Windows however doesn't set the port number */ ok(sockAddr6Ptr->sin6_port == 0, "returnedStorage.sin6_port != 0 (%d)\n", sockAddr6Ptr->sin6_port); - ok(inet_ntop(returnedStorage.ss_family, &sockAddr6Ptr->sin6_addr, addressBuffer, MAX_PATH) != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); + cret = inet_ntop(returnedStorage.ss_family, &sockAddr6Ptr->sin6_addr, addressBuffer, MAX_PATH); + ok(cret != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); ok(strcmp(addressBuffer, ipv6Address) == 0, "returnedStorage.sin6_addr != '%s' ('%s')\n", ipv6Address, addressBuffer); /* Release the object and create a new one */ -- 2.7.4

1 0

[PATCH 4/6] inetcomm/tests: Don't test function directly when reporting GetLastError()
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/inetcomm/tests/mimeole.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 4915f99..4c40c11 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -1416,6 +1416,7 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) HRESULT hres; HANDLE file; DWORD size; + BOOL ret; p = file_name + GetCurrentDirectoryA(sizeof(file_name), file_name); *p++ = '\\'; @@ -1454,7 +1455,8 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) CHECK_CALLED(ReportResult); IInternetProtocol_Release(protocol); - ok(DeleteFileA("winetest.mht"), "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA("winetest.mht"); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); } static const struct { -- 2.7.4

1 0

[PATCH 3/6] kernel32/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/process.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 07067ab..d0d623f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3035,7 +3035,7 @@ static void test_SuspendProcessNewThread(void) PVOID exe_base, exit_thread_ptr; IMAGE_NT_HEADERS nt_header; HANDLE thread_handle = NULL; - DWORD exit_code = 0; + DWORD dret, exit_code = 0; CONTEXT ctx; exit_thread_ptr = GetProcAddress(hkernel32, "ExitThread"); @@ -3097,8 +3097,10 @@ static void test_SuspendProcessNewThread(void) #endif ResumeThread( thread_handle ); - ok(WaitForSingleObject(thread_handle, 60000) == WAIT_OBJECT_0, "Waiting for remote thread failed (%d)\n", GetLastError()); - ok(GetExitCodeThread(thread_handle, &exit_code), "Failed to retrieve remote thread exit code (%d)\n", GetLastError()); + dret = WaitForSingleObject(thread_handle, 60000); + ok(dret == WAIT_OBJECT_0, "Waiting for remote thread failed (%d)\n", GetLastError()); + ret = GetExitCodeThread(thread_handle, &exit_code); + ok(ret, "Failed to retrieve remote thread exit code (%d)\n", GetLastError()); ok(exit_code == 0x1234, "Invalid remote thread exit code\n"); ret = are_imports_resolved(pi.hProcess, exe_base, &nt_header); -- 2.7.4

1 0

[PATCH 2/6] shell32/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shell32/tests/shelldispatch.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index ce3b1a3..64a695d 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -387,6 +387,7 @@ static void test_items(void) HANDLE file; BSTR bstr; char cstr[64]; + BOOL ret; int i; r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (void**)&sd); @@ -397,7 +398,8 @@ static void test_items(void) GetTempPathW(MAX_PATH, path); GetCurrentDirectoryW(MAX_PATH, orig_dir); SetCurrentDirectoryW(path); - ok(CreateDirectoryW(winetestW, NULL), "CreateDirectory failed: %08x\n", GetLastError()); + ret = CreateDirectoryW(winetestW, NULL); + ok(ret, "CreateDirectory failed: %08x\n", GetLastError()); GetFullPathNameW(winetestW, MAX_PATH, path, NULL); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(path); @@ -673,7 +675,8 @@ static void test_items(void) VariantClear(&str_index2); /* delete the file in the subdirectory */ - ok(DeleteFileA(cstr), "file_defs[%d]: DeleteFile failed: %08x\n", i, GetLastError()); + ret = DeleteFileA(cstr); + ok(ret, "file_defs[%d]: DeleteFile failed: %08x\n", i, GetLastError()); /* test that getting an item object via a relative path fails */ strcpy(cstr, file_defs[i].name); @@ -690,11 +693,13 @@ static void test_items(void) VariantClear(&str_index2); /* remove the directory */ - ok(RemoveDirectoryA(file_defs[i].name), "file_defs[%d]: RemoveDirectory failed: %08x\n", i, GetLastError()); + ret = RemoveDirectoryA(file_defs[i].name); + ok(ret, "file_defs[%d]: RemoveDirectory failed: %08x\n", i, GetLastError()); } else { - ok(DeleteFileA(file_defs[i].name), "file_defs[%d]: DeleteFile failed: %08x\n", i, GetLastError()); + ret = DeleteFileA(file_defs[i].name); + ok(ret, "file_defs[%d]: DeleteFile failed: %08x\n", i, GetLastError()); } /* test that the folder item is still accessible by integer index */ @@ -789,7 +794,8 @@ todo_wine /* remove the temporary directory and restore the original working directory */ GetTempPathW(MAX_PATH, path); SetCurrentDirectoryW(path); - ok(RemoveDirectoryW(winetestW), "RemoveDirectory failed: %08x\n", GetLastError()); + ret = RemoveDirectoryW(winetestW); + ok(ret, "RemoveDirectory failed: %08x\n", GetLastError()); SetCurrentDirectoryW(orig_dir); /* test that everything stops working after the directory has been removed */ -- 2.7.4

1 0

[PATCH] wsdapi: Fix WSDXMLGetValueFromAny spec file entry
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/wsdapi/wsdapi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 22457c9..95ee072 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -42,4 +42,4 @@ @ stdcall WSDXMLCleanupElement(ptr) @ stdcall WSDXMLCreateContext(ptr) @ stub WSDXMLGetNameFromBuiltinNamespace -@ stdcall WSDXMLGetValueFromAny(wstr wstr ptr wstr) +@ stdcall WSDXMLGetValueFromAny(wstr wstr ptr ptr) -- 2.7.4

1 0

[PATCH] d3dx9/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 Dec '17

29 Dec '17

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 6 +++--- dlls/d3dx9_36/tests/mesh.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 96b21f0..d65f072 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1325,7 +1325,7 @@ static void test_effect_parameter_value_GetMatrix(const struct test_effect_param ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrix failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); - for (l = 0; l < sizeof(fvalue) / sizeof(*fvalue); ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (l = 0; l < ARRAY_SIZE(fvalue); ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; } ok(!err, "%u - %s: GetMatrix failed with %u errors\n", i, res_full_name, err); } @@ -1498,7 +1498,7 @@ static void test_effect_parameter_value_GetMatrixTranspose(const struct test_eff ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); - for (l = 0; l < sizeof(fvalue) / sizeof(*fvalue); ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (l = 0; l < ARRAY_SIZE(fvalue); ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; } ok(!err, "%u - %s: GetMatrixTranspose failed with %u errors\n", i, res_full_name, err); } @@ -1675,7 +1675,7 @@ static void test_effect_parameter_value_ResetValue(const struct test_effect_para static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; - UINT effect_count = sizeof(test_effect_parameter_value_data) / sizeof(*test_effect_parameter_value_data); + UINT effect_count = ARRAY_SIZE(test_effect_parameter_value_data); for (i = 0; i < effect_count; ++i) { diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d0b1adb..a92b7ea 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -818,7 +818,7 @@ static void test_fvf_decl_conversion(void) }; unsigned int i; - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { test_decl_to_fvf(test_data[i].decl, test_data[i].fvf, D3D_OK, __LINE__, i); test_fvf_to_decl(test_data[i].fvf, test_data[i].decl, D3D_OK, __LINE__, i); @@ -1268,7 +1268,7 @@ static void D3DXCreateMeshTest(void) if (hr == D3D_OK) { - size = sizeof(decl1) / sizeof(decl1[0]); + size = ARRAY_SIZE(decl1); for (i = 0; i < size - 1; i++) { ok(test_decl[i].Stream == decl1[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl1[i].Stream); @@ -1329,7 +1329,7 @@ static void D3DXCreateMeshTest(void) if (hr == D3D_OK) { - size = sizeof(decl2) / sizeof(decl2[0]); + size = ARRAY_SIZE(decl2); for (i = 0; i < size - 1; i++) { ok(test_decl[i].Stream == decl2[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl2[i].Stream); @@ -1453,7 +1453,7 @@ static void D3DXCreateMeshFVFTest(void) if (hr == D3D_OK) { - size = sizeof(decl) / sizeof(decl[0]); + size = ARRAY_SIZE(decl); for (i = 0; i < size - 1; i++) { ok(test_decl[i].Stream == decl[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl[i].Stream); -- 2.9.5

2 1

[PATCH v2] quartz/tests: Fix resource leak.
by Andrey Gusev 29 Dec '17

29 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e66dc40a3a..5fd3107208 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -486,6 +486,7 @@ static void test_render_with_multithread(void) IFilterGraph2_Release(filter_graph); IGraphBuilder_Release(graph_builder); IClassFactory_Release(classfactory); + CloseHandle(thread); CoUninitialize(); return; } -- 2.13.6

1 0

Re: update of pt_PT.po
by Fernando 29 Dec '17

29 Dec '17

Hi, I got the message below in reply to a translation patch. I used the script winepo to checkout the po file and obtain a diff. There is an "authorship" issue but I'm not sure how to proceed. I see: "Last-Translator: Automatically generated\n" in the po file. Shall I fill it in manually? Regards, Fernando Martins On 27 December 2017 at 21:46:26 +01:00, Marvin <testbot(a)winehq.org> wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Authorship". > > This means that there are some authorship issues with your patch. The > author's full name, email address, or Signed-off-by headers are > missing or incorrectly formatted. You need to resend a patch with > corrected author information. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email. >

2 1

[PATCH v2] ddraw/tests: Mark GetDC failures on VMware as broken
by Alex Henrie 29 Dec '17

29 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Removed workarounds for DirectDraw 4 and 7, since VMWare already passes the tests for those versions. dlls/ddraw/tests/ddraw1.c | 12 ++++++------ dlls/ddraw/tests/ddraw2.c | 12 ++++++------ dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2c4410af78..90cd0b73b4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8999,15 +8999,15 @@ static void test_getdc(void) test_data[] = { {"D3DFMT_A8R8G8B8", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X8R8G8B8", {sizeof(test_data->format), DDPF_RGB, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_R5G6B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X1R5G5B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A1R5G5B5", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A4R4G4B4", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, {0x00000f00}, {0x000000f0}, {0x0000000f}, {0x0000f000}}, TRUE, DDERR_CANTCREATEDC /* Vista+ */}, {"D3DFMT_X4R4G4B4", {sizeof(test_data->format), DDPF_RGB, 0, {16}, @@ -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), "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 89d0d7e4be..6d3e090fff 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10133,15 +10133,15 @@ static void test_getdc(void) test_data[] = { {"D3DFMT_A8R8G8B8", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X8R8G8B8", {sizeof(test_data->format), DDPF_RGB, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_R5G6B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X1R5G5B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A1R5G5B5", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A4R4G4B4", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, {0x00000f00}, {0x000000f0}, {0x0000000f}, {0x0000f000}}, TRUE, DDERR_CANTCREATEDC /* Vista+ */}, {"D3DFMT_X4R4G4B4", {sizeof(test_data->format), DDPF_RGB, 0, {16}, @@ -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), "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 fa1178d036..b280628f56 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 fdfac696cf..846a83de08 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.15.1

1 0

[PATCH] user32/tests: Recognize undefined characters in OemKeyScan tests
by Alex Henrie 29 Dec '17

29 Dec '17

This reverts commit 72ab2d5b078d0ebad70a0baed29a80ce6b6c86ad. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- My previous attempt did not resolve any of the test failures. It seems that the problem is actually that OemToCharBuff always returns TRUE and changes unmappable characters to question marks. However, because the question mark character is character 3F in all OEM code pages, we can safely assume that a question mark returned by OemToCharBuff for a different OEM character indicates a character that cannot be mapped. dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/input.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index c71cbe2547..7149dc824e 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 imm32 +IMPORTS = user32 gdi32 advapi32 C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index a15a64420d..030592b02f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -54,7 +54,6 @@ #include "winbase.h" #include "winuser.h" #include "winnls.h" -#include "imm.h" #include "wine/test.h" @@ -2516,23 +2515,23 @@ static void test_OemKeyScan(void) DWORD ret, expect, vkey, scan; WCHAR oem, wchr; char oem_char; - BOOL ime = ImmIsIME(GetKeyboardLayout(0)); for (oem = 0; oem < 0x200; oem++) { ret = OemKeyScan( oem ); oem_char = LOBYTE( oem ); - if (!OemToCharBuffW( &oem_char, &wchr, 1 )) + /* OemKeyScan returns -1 for any character that cannot be mapped, + * whereas OemToCharBuff changes unmappable characters to question + * marks. The ASCII characters 0-127, including the real question mark + * character, are all mappable and are the same in all OEM codepages. */ + if (!OemToCharBuffW( &oem_char, &wchr, 1 ) || (wchr == '?' && oem_char < 0)) expect = -1; else { vkey = VkKeyScanW( wchr ); scan = MapVirtualKeyW( LOBYTE( vkey ), MAPVK_VK_TO_VSC ); - /* OemKeyScan returns -1 for any character that has to go through - * the IME, whereas VkKeyScan returns the virtual key code for the - * question mark key */ - if (!scan || (ime && wchr != '?' && vkey == VkKeyScanW( '?' ))) + if (!scan) expect = -1; else { -- 2.15.1

1 0

[PATCH] ddraw/tests: Mark GetDC failures on VMware as broken
by Alex Henrie 29 Dec '17

29 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 12 ++++++------ dlls/ddraw/tests/ddraw2.c | 12 ++++++------ dlls/ddraw/tests/ddraw4.c | 12 ++++++------ dlls/ddraw/tests/ddraw7.c | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2c4410af78..90cd0b73b4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8999,15 +8999,15 @@ static void test_getdc(void) test_data[] = { {"D3DFMT_A8R8G8B8", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X8R8G8B8", {sizeof(test_data->format), DDPF_RGB, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_R5G6B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X1R5G5B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A1R5G5B5", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A4R4G4B4", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, {0x00000f00}, {0x000000f0}, {0x0000000f}, {0x0000f000}}, TRUE, DDERR_CANTCREATEDC /* Vista+ */}, {"D3DFMT_X4R4G4B4", {sizeof(test_data->format), DDPF_RGB, 0, {16}, @@ -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), "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 89d0d7e4be..6d3e090fff 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10133,15 +10133,15 @@ static void test_getdc(void) test_data[] = { {"D3DFMT_A8R8G8B8", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X8R8G8B8", {sizeof(test_data->format), DDPF_RGB, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_R5G6B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X1R5G5B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A1R5G5B5", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A4R4G4B4", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, {0x00000f00}, {0x000000f0}, {0x0000000f}, {0x0000f000}}, TRUE, DDERR_CANTCREATEDC /* Vista+ */}, {"D3DFMT_X4R4G4B4", {sizeof(test_data->format), DDPF_RGB, 0, {16}, @@ -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), "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 fa1178d036..6e68681f87 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11694,15 +11694,15 @@ static void test_getdc(void) test_data[] = { {"D3DFMT_A8R8G8B8", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X8R8G8B8", {sizeof(test_data->format), DDPF_RGB, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_R5G6B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X1R5G5B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A1R5G5B5", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A4R4G4B4", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, {0x00000f00}, {0x000000f0}, {0x0000000f}, {0x0000f000}}, TRUE, DDERR_CANTCREATEDC /* Vista+ */}, {"D3DFMT_X4R4G4B4", {sizeof(test_data->format), DDPF_RGB, 0, {16}, @@ -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 fdfac696cf..789e8308d8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11645,15 +11645,15 @@ static void test_getdc(void) test_data[] = { {"D3DFMT_A8R8G8B8", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X8R8G8B8", {sizeof(test_data->format), DDPF_RGB, 0, {32}, - {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE}, + {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_R5G6B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_X1R5G5B5", {sizeof(test_data->format), DDPF_RGB, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A1R5G5B5", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, - {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE}, + {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000}}, TRUE, DDERR_CANTCREATEDC /* VMware */}, {"D3DFMT_A4R4G4B4", {sizeof(test_data->format), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, {0x00000f00}, {0x000000f0}, {0x0000000f}, {0x0000f000}}, TRUE, DDERR_CANTCREATEDC /* Vista+ */}, {"D3DFMT_X4R4G4B4", {sizeof(test_data->format), DDPF_RGB, 0, {16}, @@ -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.15.1

1 0

[PATCH] testbot: Record and show status changes initiated by the administrator.
by Francois Gouget 28 Dec '17

28 Dec '17

This allows marking them as initiated by the administrator (which is obvious when going in/out of maintenance but not otherwise). Merge these records with the one the scheduler adds on its own to keep the activity page clean. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 10 +++++++++- testbot/lib/WineTestBot/Activity.pm | 12 +++++++++++- testbot/web/admin/VMDetails.pl | 21 +++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index fb743a00..7489f835 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -358,7 +358,7 @@ sub SaveProperty($$$) die "Pure virtual function FormPage::SaveProperty called"; } -sub Save($) +sub SaveProperties($) { my ($self) = @_; @@ -389,6 +389,14 @@ sub Save($) } } } + return 1; +} + +sub Save($) +{ + my ($self) = @_; + + return !1 if (!$self->SaveProperties()); my $ErrKey; ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index d66109c0..c5d3b532 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -233,7 +233,17 @@ sub GetActivity($) my $VMStatus = $StatusVMs->{$VM->Name}; if ($VMStatus) { - $LastVMStatus->{end} = $VMStatus->{start} if ($LastVMStatus); + if ($LastVMStatus and $LastVMStatus->{status} eq $VMStatus->{status} and + ($LastVMStatus->{details} || "") eq "administrator") + { + $VMStatus = $StatusVMs->{$VM->Name} = $LastVMStatus; + $LastStatusVMs{$VM->Name}->{$VM->Name} = {merged => 1, vmstatus => $VMStatus}; + $VMStatus->{rows}++; + } + else + { + $LastVMStatus->{end} = $VMStatus->{start} if ($LastVMStatus); + } } elsif ($LastVMStatus and $LastVMStatus->{status} ne "engine") { diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index f5e5520b..7b562a74 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -42,6 +42,27 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } +sub Save($) +{ + my ($self) = @_; + + my $OldStatus = $self->{Item}->Status || ""; + return !1 if (!$self->SaveProperties()); + + if ($OldStatus ne $self->{Item}->Status) + { + my ($ErrProperty, $ErrMessage) = $self->{Item}->Validate(); + if (!defined $ErrMessage) + { + $self->{Item}->RecordStatus(undef, $self->{Item}->Status ." administrator"); + } + } + + my $ErrKey; + ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); + return ! defined($self->{ErrMessage}); +} + package main; my $Request = shift; -- 2.15.1

1 0

[PATCH] testbot/web: Add a statistics page.
by Francois Gouget 28 Dec '17

28 Dec '17

This can help figuring out how busy the TestBot is, whether the VMs must be rebalanced to lighten the load on a VM host, whether reverts are getting slow, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 165 ++++++++++++++- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/web/Stats.pl | 361 ++++++++++++++++++++++++++++++++ testbot/web/WineTestBot.css | 2 + 4 files changed, 528 insertions(+), 1 deletion(-) create mode 100644 testbot/web/Stats.pl diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index c5d3b532..5a5d2328 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -35,7 +35,7 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -@EXPORT = qw(&GetActivity); +@EXPORT = qw(&GetActivity &GetStatistics); =pod @@ -289,4 +289,167 @@ sub GetActivity($) return ($Activity, $Counters); } +sub _AddFullStat($$$;$) +{ + my ($Stats, $StatKey, $Value, $Source) = @_; + + $Stats->{"$StatKey.count"}++; + $Stats->{$StatKey} += $Value; + my $MaxKey = "$StatKey.max"; + if (!exists $Stats->{$MaxKey} or $Stats->{$MaxKey} < $Value) + { + $Stats->{$MaxKey} = $Value; + $Stats->{"$MaxKey.source"} = $Source if ($Source); + } +} + +sub GetStatistics($) +{ + my ($VMs) = @_; + + my ($GlobalStats, $HostsStats, $VMsStats) = ({}, {}, {}); + + my @JobTimes; + my $Jobs = CreateJobs(); + foreach my $Job (@{$Jobs->GetItems()}) + { + $GlobalStats->{"jobs.count"}++; + + my $IsSpecialJob; + my $Steps = $Job->Steps; + foreach my $Step (@{$Steps->GetItems()}) + { + my $StepType = $Step->Type; + $IsSpecialJob = 1 if ($StepType =~ /^(?:reconfig|suite)$/); + + my $Tasks = $Step->Tasks; + foreach my $Task (@{$Tasks->GetItems()}) + { + $GlobalStats->{"tasks.count"}++; + if ($Task->Started and $Task->Ended and + $Task->Status !~ /^(?:queued|running|canceled)$/) + { + my $Time = $Task->Ended - $Task->Started; + _AddFullStat($GlobalStats, "$StepType.time", $Time, $Task); + } + if ($IsSpecialJob) + { + my $ReportFileName = $Task->GetDir() . "/log"; + if (-f $ReportFileName) + { + my $ReportSize = -s $ReportFileName; + _AddFullStat($GlobalStats, "$StepType.size", $ReportSize, $Task); + if ($VMs->ItemExists($Task->VM->GetKey())) + { + my $VMStats = ($VMsStats->{items}->{$Task->VM->Name} ||= {}); + _AddFullStat($VMStats, "report.size", $ReportSize, $Task); + } + } + } + } + } + + if (!$IsSpecialJob and$Job->Ended and + $Job->Status !~ /^(?:queued|running|canceled)$/) + { + my $Time = $Job->Ended - $Job->Submitted; + _AddFullStat($GlobalStats, "jobs.time", $Time, $Job); + push @JobTimes, $Time; + + if (!exists $GlobalStats->{start} or $GlobalStats->{start} > $Job->Submitted) + { + $GlobalStats->{start} = $Job->Submitted; + } + if (!exists $GlobalStats->{end} or $GlobalStats->{end} < $Job->Ended) + { + $GlobalStats->{end} = $Job->Ended; + } + } + } + + my $JobCount = $GlobalStats->{"jobs.time.count"}; + if ($JobCount) + { + @JobTimes = sort { $a <=> $b } @JobTimes; + $GlobalStats->{"jobs.time.p10"} = $JobTimes[int($JobCount * 0.1)]; + $GlobalStats->{"jobs.time.p50"} = $JobTimes[int($JobCount * 0.5)]; + $GlobalStats->{"jobs.time.p90"} = $JobTimes[int($JobCount * 0.9)]; + @JobTimes = (); # free early + } + + my ($Activity, $Counters) = GetActivity($VMs); + $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; + $GlobalStats->{"records.count"} = $Counters->{records}; + foreach my $Group (values %$Activity) + { + if (!$VMsStats->{start} or $VMsStats->{start} > $Group->{start}) + { + $VMsStats->{start} = $Group->{start}; + } + if (!$VMsStats->{end} or $VMsStats->{end} < $Group->{end}) + { + $VMsStats->{end} = $Group->{end}; + } + next if (!$Group->{statusvms}); + + my ($IsGroupBusy, %IsHostBusy); + foreach my $VM (@{$VMs->GetItems()}) + { + my $VMStatus = $Group->{statusvms}->{$VM->Name}; + my $Host = $VMStatus->{vmstatus}->{host} || $VM->GetHost(); + my $HostStats = ($HostsStats->{items}->{$Host} ||= {}); + + if (!$VMStatus->{merged}) + { + my $VMStats = ($VMsStats->{items}->{$VM->Name} ||= {}); + my $Status = $VMStatus->{status}; + + my $Time = $VMStatus->{end} - $VMStatus->{start}; + _AddFullStat($VMStats, "$Status.time", $Time); + _AddFullStat($HostStats, "$Status.time", $Time); + if ($Status =~ /^(?:reverting|sleeping|running|dirty)$/) + { + $VMStats->{"busy.elapsed"} += $Time; + } + + if ($VMStatus->{result} =~ /^(?:boterror|error|timeout)$/) + { + $VMStats->{"$VMStatus->{result}.count"}++; + $HostStats->{"$VMStatus->{result}.count"}++; + $GlobalStats->{"$VMStatus->{result}.count"}++; + } + elsif ($VMStatus->{task} and + ($VMStatus->{result} eq "completed" or + $VMStatus->{result} eq "failed")) + { + my $StepType = $VMStatus->{step}->Type; + _AddFullStat($VMStats, "$StepType.time", $Time, $VMStatus->{task}); + _AddFullStat($HostStats, "$StepType.time", $Time, $VMStatus->{task}); + } + } + + $VMStatus = $VMStatus->{vmstatus}; + if (!$IsHostBusy{$Host} and + $VMStatus->{status} =~ /^(?:reverting|sleeping|running|dirty)$/) + { + # Note that we cannot simply sum the VMs busy wall clock times to get + # the host busy wall clock time because this would count periods where + # more than one VM is busy multiple times. + $HostStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; + $IsHostBusy{$Host} = 1; + $IsGroupBusy = 1; + } + } + if ($IsGroupBusy) + { + $GlobalStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; + } + } + $GlobalStats->{elapsed} = $GlobalStats->{end} - $GlobalStats->{start}; + $HostsStats->{elapsed} = + $VMsStats->{elapsed} = $VMsStats->{end} - $VMsStats->{start}; + + return { global => $GlobalStats, hosts => $HostsStats, vms => $VMsStats }; +} + 1; diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index fe03a47e..14900904 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -266,6 +266,7 @@ EOF print " <li><p><a href='", MakeSecureURL("/Submit.pl"), "'>Submit job</a></p></li>\n"; print " <li><p><a href='/Activity.pl'>Activity</a></p></li>\n"; + print " <li><p><a href='/Stats.pl'>Statistics</a></p></li>\n"; print " <li class='divider'> </li>\n"; print " <li><p><a href='", MakeSecureURL("/Logout.pl"), "'>Log out"; if (defined($Session)) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl new file mode 100644 index 00000000..424d33e0 --- /dev/null +++ b/testbot/web/Stats.pl @@ -0,0 +1,361 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Shows TestBot statistics +# +# Copyright 2017 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package StatsPage; + +use ObjectModel::CGI::Page; +use ObjectModel::Collection; +use WineTestBot::Config; +use WineTestBot::Activity; +use WineTestBot::Log; +use WineTestBot::VMs; + +@StatsPage::ISA = qw(ObjectModel::CGI::Page); + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + $self->{start} = Time(); + $self->SUPER::_initialize($Request, $RequiredRole); +} + +sub _GetDuration($;$) +{ + my ($Secs, $Raw) = @_; + + return "n/a" if (!defined $Secs); + + my @Parts; + if (!$Raw) + { + my $Mins = int($Secs / 60); + my $Hours = int($Mins / 60); + my $Days = int($Hours / 24); + push @Parts, "${Days}d" if ($Days); + my $Part = $Hours - 24 * $Days; + push @Parts, "${Part}h" if ($Part); + $Part = $Mins - 60 * $Hours; + push @Parts, "${Part}m" if ($Part); + $Secs = $Secs - 60 * $Mins; + } + push @Parts, (@Parts or int($Secs) == $Secs) ? + int($Secs) ."s" : + sprintf('%.1fs', $Secs); + return join(" ", @Parts); +} + +sub _CompareVMs() +{ + my ($aHost, $bHost) = ($a->GetHost(), $b->GetHost()); + if ($PrettyHostNames) + { + $aHost = $PrettyHostNames->{$aHost} || $aHost; + $bHost = $PrettyHostNames->{$bHost} || $bHost; + } + return $aHost cmp $bHost || $a->Name cmp $b->Name; +} + +sub _AddRate($$;$) +{ + my ($Stats, $StatKey, $AllStats) = @_; + + my $RateKey = $StatKey; + $RateKey =~ s/(?:\.time)?\.count$/.rate/; + $AllStats ||= $Stats; + $Stats->{$RateKey} = $AllStats->{elapsed} ? + 3600 * $Stats->{$StatKey} / $AllStats->{elapsed} : + "n/a"; +} + +sub _GetAverage($$) +{ + my ($Stats, $Key) = @_; + return "n/a" if (!$Stats->{"$Key.count"}); + return $Stats->{$Key} / $Stats->{"$Key.count"}; +} + +my $NO_AVERAGE = 1; +my $NO_PERCENTAGE = 2; +my $NO_TIME = 4; + +sub _GetStatStr($$;$$) +{ + my ($Stats, $StatKey, $AllStats, $Flags) = @_; + + if ($StatKey =~ /\.time$/ and !($Flags & $NO_AVERAGE) and + exists $Stats->{"$StatKey.count"}) + { + my $Avg = _GetAverage($Stats, $StatKey); + return $Avg eq "n/a" ? "n/a" : _GetDuration($Avg, $Flags & $NO_TIME); + } + + if ($StatKey =~ /\.size$/ and !($Flags & $NO_AVERAGE) and + exists $Stats->{"$StatKey.count"}) + { + my $Avg = _GetAverage($Stats, $StatKey); + return $Avg eq "n/a" ? "n/a" : int($Avg); + } + + my $Value = $Stats->{$StatKey}; + if ($StatKey =~ /\.elapsed$/ and !($Flags & $NO_PERCENTAGE)) + { + $AllStats ||= $Stats; + return "n/a" if (!$AllStats->{elapsed}); + return sprintf('%.1f%', 100 * $Value / $AllStats->{elapsed}); + } + if ($StatKey =~ /(?:\belapsed|\.time)\b/) + { + return _GetDuration($Value, $Flags & $NO_TIME); + } + if ($StatKey =~ /\.rate$/) + { + return sprintf('%.1f / h', $Value); + } + return "0" if (!exists $Stats->{$StatKey}); + return $Value if ($Value == int($Value)); + return sprintf('%.1f', $Value); +} + +sub _GetStatHtml($$;$$) +{ + my ($Stats, $StatKey, $AllStats, $Flags) = @_; + + my $Value = _GetStatStr($Stats, $StatKey, $AllStats, $Flags); + return $Value if (!$Stats->{"$StatKey.source"}); + + my $SrcObj = $Stats->{"$StatKey.source"}; + my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); + if (defined $TaskNo) + { + my $Key = "$JobId#k". ($StepNo * 100 + $TaskNo); + return "<a href='/JobDetails.pl?Key=$Key'>$Value</a>"; + } + return "<a href='/index.pl#job$JobId'>$Value</a>"; +} + +sub _GenGlobalLine($$$;$$) +{ + my ($Stats, $StatKey, $Label, $Description, $Flags) = @_; + + my $Value = _GetStatHtml($Stats, $StatKey, undef, $Flags); + print "<tr><td>$Label</td><td>$Value</td><td>$Description</td></tr>\n"; +} + +sub _GenStatsLine($$$$;$) +{ + my ($RowStats, $StatKey, $Label, $ColumnKeys, $Flags) = @_; + + print "<tr><td>$Label</td>\n"; + foreach my $Col (@$ColumnKeys) + { + my $Stats = $RowStats->{items}->{$Col}; + my $Value = _GetStatHtml($Stats, $StatKey, $RowStats, $Flags); + print "<td>$Value</td>\n"; + } + print "</tr>\n"; +} + +sub GenerateBody($) +{ + my ($self) = @_; + + print "<h1>${ProjectName} Test Bot activity statistics</h1>\n"; + print "<div class='Content'>\n"; + + ### Get the sorted VMs list + + my $VMs = CreateVMs(); + $VMs->FilterEnabledRole(); + my @SortedVMs = sort _CompareVMs @{$VMs->GetItems()}; + my $Stats = GetStatistics($VMs); + + ### Show global statistics + + my $GlobalStats = $Stats->{global}; + print "<h2>General statistics</h2>\n"; + print "<div class='CollectionBlock'><table>\n"; + + print "<thead><tr><th>Stat</th><th>Value</th><th>Description</th></thead>\n"; + print "<tbody>\n"; + + _GenGlobalLine($GlobalStats, "elapsed", "Job history", "How far back the job history goes."); + + _GenGlobalLine($GlobalStats, "jobs.count", "Job count", "The number of jobs in the job history."); + _AddRate($GlobalStats, "jobs.count"); + _GenGlobalLine($GlobalStats, "jobs.rate", "Job rate", "How fast new jobs are coming in."); + _GenGlobalLine($GlobalStats, "tasks.count", "Task count", "The number of tasks."); + _AddRate($GlobalStats, "tasks.count"); + _GenGlobalLine($GlobalStats, "tasks.rate", "Task rate", "How fast new tasks are coming in."); + _GenGlobalLine($GlobalStats, "busy.elapsed", "Busy time", "How much wall clock time was spent running jobs.", $NO_PERCENTAGE); + _GenGlobalLine($GlobalStats, "busy.elapsed", "Busy \%", "The percentage of wall clock time where the TestBot was busy running jobs."); + + print "<tr><td class='StatSeparator'>Job times</td><td colspan='2'><hr></td></tr>\n"; + _GenGlobalLine($GlobalStats, "jobs.time.p10", "10%", "10% of the jobs completed within this time."); + _GenGlobalLine($GlobalStats, "jobs.time.p50", "50%", "50% of the jobs completed within this time."); + _GenGlobalLine($GlobalStats, "jobs.time.p90", "90%", "90% of the jobs completed within this time."); + _GenGlobalLine($GlobalStats, "jobs.time.max", "Max", "The slowest job took this long. Note that this is heavily influenced by test storms."); + + print "<tr><td class='StatSeparator'>Average times</td><td colspan='2'><hr></td></tr>\n"; + _GenGlobalLine($GlobalStats, "jobs.time", "Job completion", "How long it takes to complete a regular job (excluding canceled ones). Note that this is heavily influenced by test storms."); + _GenGlobalLine($GlobalStats, "reconfig.time", "Wine update", "How long the daily Wine update takes."); + _GenGlobalLine($GlobalStats, "suite.time", "WineTest", "Average time for a WineTest run."); + _GenGlobalLine($GlobalStats, "build.time", "Build", "Average patch build time."); + _GenGlobalLine($GlobalStats, "single.time", "Test", "Average test run time. Note that this very much depends on the tests and how many time out on a given day."); + + print "<tr><td class='StatSeparator'>WineTest reports</td><td colspan='2'><hr></td></tr>\n"; + _GenGlobalLine($GlobalStats, "suite.size", "Average size", "Average WineTest report size."); + _GenGlobalLine($GlobalStats, "suite.size.max", "Max size", "Maximum WineTest report size."); + + print "<tr><td class='StatSeparator'>Errors</td><td colspan='2'><hr></td></tr>\n"; + _GenGlobalLine($GlobalStats, "timeout.count", "Timeouts", "How many timeouts occurred, either because of a test bug or a TestBot performance issue."); + _GenGlobalLine($GlobalStats, "boterror.count", "TestBot errors", "How many tasks failed due to a TestBot error."); + _GenGlobalLine($GlobalStats, "error.count", "Transient errors", "How many transient (network?) errors happened and caused the task to be re-run."); + + print "<tr><td class='StatSeparator'>Activity</td><td colspan='2'><hr></td></tr>\n"; + my $VMsStats = $Stats->{vms}; + _GenGlobalLine($VMsStats, "elapsed", "Activity history", "How far the activity records go. This is used for the VM and VM host tables."); + _GenGlobalLine($GlobalStats, "records.count", "Record count", "The number of activity records."); + + print "</tbody></table></div>\n"; + + ### Generate a table with the VM host statistics + + print "<p></p>\n"; + print "<h2>VM host statistics</h2>\n"; + print "<div class='CollectionBlock'><table>\n"; + + print "<thead><tr><th>Stat</th>\n"; + my $HostsStats = $Stats->{hosts}; + my $SortedHosts = [ sort keys %{$Stats->{hosts}->{items}} ]; + foreach my $Host (@$SortedHosts) + { + my $DisplayHost = $Host; + if ($PrettyHostNames and defined $PrettyHostNames->{$Host}) + { + $DisplayHost = $PrettyHostNames->{$Host}; + } + $DisplayHost ||= "localhost"; + print "<th>$DisplayHost</th>\n"; + + _AddRate($HostsStats->{items}->{$Host}, "reverting.time.count", $HostsStats); + _AddRate($HostsStats->{items}->{$Host}, "running.time.count", $HostsStats); + } + print "</tr></thead>\n"; + + print "<tbody>\n"; + _GenStatsLine($HostsStats, "reverting.time.count", "Revert count", $SortedHosts); + _GenStatsLine($HostsStats, "reverting.rate", "Revert rate", $SortedHosts); + _GenStatsLine($HostsStats, "running.time.count", "Task count", $SortedHosts); + _GenStatsLine($HostsStats, "running.rate", "Task rate", $SortedHosts); + _GenStatsLine($HostsStats, "busy.elapsed", "Busy time", $SortedHosts, $NO_PERCENTAGE); + _GenStatsLine($HostsStats, "busy.elapsed", "Busy \%", $SortedHosts); + + print "<tr><td class='StatSeparator'>Average times</td><td colspan='", scalar(@$SortedHosts),"'><hr></td></tr>\n"; + _GenStatsLine($HostsStats, "reverting.time", "Revert", $SortedHosts); + _GenStatsLine($HostsStats, "sleeping.time", "Sleep", $SortedHosts); + _GenStatsLine($HostsStats, "running.time", "Run", $SortedHosts); + _GenStatsLine($HostsStats, "dirty.time", "Dirty", $SortedHosts); + _GenStatsLine($HostsStats, "offline.time", "Offline", $SortedHosts); + _GenStatsLine($HostsStats, "suite.time", "WineTest", $SortedHosts); + + print "<tr><td class='StatSeparator'>Maximum times</td><td colspan='", scalar(@$SortedHosts),"'><hr></td></tr>\n"; + _GenStatsLine($HostsStats, "reverting.time.max", "Revert", $SortedHosts); + _GenStatsLine($HostsStats, "sleeping.time.max", "Sleep", $SortedHosts); + _GenStatsLine($HostsStats, "running.time.max", "Run", $SortedHosts); + _GenStatsLine($HostsStats, "dirty.time.max", "Dirty", $SortedHosts); + _GenStatsLine($HostsStats, "offline.time.max", "Offline", $SortedHosts); + _GenStatsLine($HostsStats, "suite.time.max", "WineTest", $SortedHosts); + + print "<tr><td class='StatSeparator'>Errors</td><td colspan='", scalar(@$SortedHosts),"'><hr></td></tr>\n"; + _GenStatsLine($HostsStats, "timeout.count", "Timeouts", $SortedHosts); + _GenStatsLine($HostsStats, "boterror.count", "TestBot errors", $SortedHosts); + _GenStatsLine($HostsStats, "error.count", "Transient errors", $SortedHosts); + + print "</tbody></table></div>\n"; + + ### Generate a table with the VM statistics + + print "<p></p>\n"; + print "<h2>VM statistics</h2>\n"; + print "<div class='CollectionBlock'><table>\n"; + + print "<thead><tr><th>Stat</th>\n"; + my $SortedVMKeys; + foreach my $VM (@SortedVMs) + { + my $Host = $VM->GetHost(); + if ($PrettyHostNames and defined $PrettyHostNames->{$Host}) + { + $Host = $PrettyHostNames->{$Host}; + } + $Host = " on $Host" if ($Host ne ""); + print "<th>", $VM->Name, "$Host</th>\n"; + push @$SortedVMKeys, $VM->Name; + + _AddRate($VMsStats->{items}->{$VM->Name}, "reverting.time.count", $VMsStats); + _AddRate($VMsStats->{items}->{$VM->Name}, "running.time.count", $VMsStats); + } + print "</tr></thead>\n"; + + print "<tbody>\n"; + _GenStatsLine($VMsStats, "reverting.time.count", "Revert count", $SortedVMKeys); + _GenStatsLine($VMsStats, "reverting.rate", "Revert rate", $SortedVMKeys); + _GenStatsLine($VMsStats, "running.time.count", "Task count", $SortedVMKeys); + _GenStatsLine($VMsStats, "running.rate", "Task rate", $SortedVMKeys); + _GenStatsLine($VMsStats, "busy.elapsed", "Busy time", $SortedVMKeys, $NO_PERCENTAGE); + _GenStatsLine($VMsStats, "busy.elapsed", "Busy \%", $SortedVMKeys); + + print "<tr><td class='StatSeparator'>Average times</td><td colspan='", scalar(@$SortedVMKeys),"'><hr></td></tr>\n"; + _GenStatsLine($VMsStats, "reverting.time", "Revert", $SortedVMKeys); + _GenStatsLine($VMsStats, "sleeping.time", "Sleep", $SortedVMKeys); + _GenStatsLine($VMsStats, "running.time", "Run", $SortedVMKeys); + _GenStatsLine($VMsStats, "dirty.time", "Dirty", $SortedVMKeys); + _GenStatsLine($VMsStats, "offline.time", "Offline", $SortedVMKeys); + _GenStatsLine($VMsStats, "suite.time", "WineTest", $SortedVMKeys); + + print "<tr><td class='StatSeparator'>Maximum times</td><td colspan='", scalar(@$SortedVMKeys),"'><hr></td></tr>\n"; + _GenStatsLine($VMsStats, "reverting.time.max", "Revert", $SortedVMKeys); + _GenStatsLine($VMsStats, "sleeping.time.max", "Sleep", $SortedVMKeys); + _GenStatsLine($VMsStats, "running.time.max", "Run", $SortedVMKeys); + _GenStatsLine($VMsStats, "dirty.time.max", "Dirty", $SortedVMKeys); + _GenStatsLine($VMsStats, "offline.time.max", "Offline", $SortedVMKeys); + _GenStatsLine($VMsStats, "suite.time.max", "WineTest", $SortedVMKeys); + + print "<tr><td class='StatSeparator'>WineTest/Reconfig reports</td><td colspan='", scalar(@$SortedVMKeys),"'><hr></td></tr>\n"; + _GenStatsLine($VMsStats, "report.size", "Average size", $SortedVMKeys); + _GenStatsLine($VMsStats, "report.size.max", "Max size", $SortedVMKeys); + + print "<tr><td class='StatSeparator'>Errors</td><td colspan='", scalar(@$SortedVMKeys),"'><hr></td></tr>\n"; + _GenStatsLine($VMsStats, "timeout.count", "Timeouts", $SortedVMKeys); + _GenStatsLine($VMsStats, "boterror.count", "TestBot errors", $SortedVMKeys); + _GenStatsLine($VMsStats, "error.count", "Transient errors", $SortedVMKeys); + + print "</tbody></table></div>\n"; + print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; +} + +package main; + +my $Request = shift; + +my $StatsPage = StatsPage->new($Request, "wine-devel"); +$StatsPage->GeneratePage(); diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 4afbe31c..2ccce246 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -376,3 +376,5 @@ td.Record { text-align: center; } .Record.Record-error { border-left: thick solid #990000; border-right: thick solid #990000; } .Record.Record-timeout { border-left: thick solid blue; border-right: thick solid blue; } .Record.Record-miss { border-top: thick dashed #ff6600; } + +td.StatSeparator { color: #601919; font-weight: bold; } -- 2.15.1

1 0

[PATCH] quartz: Enhancement for AVISplitter_create.
by Andrey Gusev 28 Dec '17

28 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/quartz/avisplit.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index f3eccedcfc..24180aa9cc 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1442,13 +1442,20 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) /* Note: This memory is managed by the transform filter once created */ This = CoTaskMemAlloc(sizeof(AVISplitterImpl)); - This->streams = NULL; - This->oldindex = NULL; + if (!This) + return E_OUTOFMEMORY; + ZeroMemory(This, sizeof(AVISplitterImpl)); hr = Parser_Create(&(This->Parser), &AVISplitterImpl_Vtbl, &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Flush, AVISplitter_Disconnect, AVISplitter_first_request, AVISplitter_done_process, NULL, AVISplitter_seek, NULL); if (FAILED(hr)) + { + CoTaskMemFree(This); return hr; + } + + This->streams = NULL; + This->oldindex = NULL; *ppv = &This->Parser.filter.IBaseFilter_iface; -- 2.13.6

2 1

[PATCH] quartz/tests: Fix resource leak.
by Andrey Gusev 28 Dec '17

28 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e66dc40a3a..0a8ac2c9bf 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -487,7 +487,7 @@ static void test_render_with_multithread(void) IGraphBuilder_Release(graph_builder); IClassFactory_Release(classfactory); CoUninitialize(); - return; + return thread; } static void test_graph_builder(void) -- 2.13.6

2 1

[PATCH appdb] Show additional application links
by Rosanne DiMesio 28 Dec '17

28 Dec '17

Fixes bug 44186. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/application.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/application.php b/include/application.php index f6c90b8..320ad5a 100644 --- a/include/application.php +++ b/include/application.php @@ -895,6 +895,11 @@ class Application { </div> EOT; + // URLs + if($sUrls = url::display(NULL, $this->iAppId)) + { + echo $sUrls; + } echo "<p>For more details and user comments, view the versions of this application</p>\n"; // display versions -- 2.12.3

1 0

[PATCH] user32/tests: Fix OemKeyScan failures with input method editors
by Alex Henrie 28 Dec '17

28 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This should fix the failures on Korean Windows. dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/input.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 7149dc824e..c71cbe2547 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 imm32 C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 793590ef71..a15a64420d 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -54,6 +54,7 @@ #include "winbase.h" #include "winuser.h" #include "winnls.h" +#include "imm.h" #include "wine/test.h" @@ -2515,6 +2516,7 @@ static void test_OemKeyScan(void) DWORD ret, expect, vkey, scan; WCHAR oem, wchr; char oem_char; + BOOL ime = ImmIsIME(GetKeyboardLayout(0)); for (oem = 0; oem < 0x200; oem++) { @@ -2527,7 +2529,10 @@ static void test_OemKeyScan(void) { vkey = VkKeyScanW( wchr ); scan = MapVirtualKeyW( LOBYTE( vkey ), MAPVK_VK_TO_VSC ); - if (!scan) + /* OemKeyScan returns -1 for any character that has to go through + * the IME, whereas VkKeyScan returns the virtual key code for the + * question mark key */ + if (!scan || (ime && wchr != '?' && vkey == VkKeyScanW( '?' ))) expect = -1; else { -- 2.15.1

1 0

[PATCH] quartz: Enhancement for WAVEParser_create.
by Andrey Gusev 28 Dec '17

28 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/quartz/waveparser.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index f6bea2c704..f8afc527b1 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -431,10 +431,17 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) /* Note: This memory is managed by the transform filter once created */ This = CoTaskMemAlloc(sizeof(WAVEParserImpl)); + if (!This) + return E_OUTOFMEMORY; + + ZeroMemory(This, sizeof(WAVEParserImpl)); hr = Parser_Create(&(This->Parser), &WAVEParser_Vtbl, &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL); if (FAILED(hr)) + { + CoTaskMemFree(This); return hr; + } *ppv = &This->Parser.filter.IBaseFilter_iface; -- 2.13.6

1 0

[PATCH] user32/tests: Add some tests for A/W auto conversion in case of mismatching window vs dialog procedure types
by Nikolay Sivov 28 Dec '17

28 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 198 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 8bf76f112c..511f0c5723 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1236,8 +1236,195 @@ static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, return FALSE; } -static void test_DialogBoxParamA(void) +static const WCHAR testtextW[] = {'W','n','d','T','e','x','t',0}; +static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + if (msg == WM_SETTEXT) + { + if (IsWindowUnicode(hdlg)) + { + WCHAR *text = (WCHAR *)lparam; + todo_wine + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + } + else + { + char *textA = (char *)lparam; + todo_wine + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } + } + + return DefWindowProcW(hdlg, msg, wparam, lparam); +} + +static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_SETTEXT) + { + if (IsWindowUnicode(hdlg)) + { + WCHAR *text = (WCHAR *)lparam; + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + } + else + { + char *textA = (char *)lparam; + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } + } + + return DefWindowProcA(hdlg, msg, wparam, lparam); +} + +static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + ULONG_PTR dlgproc, originalproc; + WCHAR buffW[64]; + char buff[64]; + BOOL ret; + INT len; + + switch (msg) + { + case WM_INITDIALOG: + ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); + + originalproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(originalproc == (ULONG_PTR)test_aw_conversion_dlgproc, "Unexpected dlg proc %#lx.\n", originalproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgproc, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = SetWindowLongPtrA(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocA); + ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); + + dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc); + + ret = SetWindowTextW(hdlg, testtextW); + todo_wine + ok(ret, "Failed to set window text.\n"); + + memset(buff, 'A', sizeof(buff)); + len = GetWindowTextA(hdlg, buff, sizeof(buff)); + todo_wine + ok(buff[0] == 0 && buff[1] == 'A' && len == 0, "Unexpected window text %hhx, %hhx, len %d\n", + buff[0], buff[1], len); + + memset(buffW, 0xff, sizeof(buffW)); + len = GetWindowTextW(hdlg, buffW, 64); + todo_wine + ok(!lstrcmpW(buffW, testtextW) && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len); + + dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocW); + ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); + + dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc); + + ret = SetWindowTextA(hdlg, "WndText"); + todo_wine + ok(ret, "Failed to set window text.\n"); + + memset(buff, 'A', sizeof(buff)); + len = GetWindowTextA(hdlg, buff, sizeof(buff)); + ok(buff[0] == 0 && buff[1] == 'A' && len == 0, "Unexpected window text %hhx, %hhx, len %d\n", + buff[0], buff[1], len); + + memset(buffW, 0xff, sizeof(buffW)); + len = GetWindowTextW(hdlg, buffW, sizeof(buffW)/sizeof(buffW[0])); + ok(buffW[0] == 'W' && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", + buffW[0], buffW[1], len); + + SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc); + EndDialog(hdlg, -123); + return TRUE; + } + return FALSE; +} + +static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + ULONG_PTR dlgproc, originalproc; + WCHAR buffW[64]; + char buff[64]; + BOOL ret; + INT len; + + switch (msg) + { + case WM_INITDIALOG: + ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n"); + + originalproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(originalproc != (ULONG_PTR)test_aw_conversion_dlgproc2, "Unexpected dlg proc %#lx.\n", originalproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgproc2, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = SetWindowLongPtrA(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocW); + ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n"); + + dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc); + + ret = SetWindowTextA(hdlg, "WndText"); + todo_wine + ok(ret, "Failed to set window text.\n"); + + memset(buff, 'A', sizeof(buff)); + len = GetWindowTextA(hdlg, buff, sizeof(buff)); + ok(!strcmp(buff, "WndText") && len == 0, "Unexpected window text %s, len %d\n", buff, len); + + memset(buffW, 0xff, sizeof(buffW)); + len = GetWindowTextW(hdlg, buffW, 64); + ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %s, len %d\n", + wine_dbgstr_w(buffW), len); + + dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocA); + ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n"); + + dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc); + + ret = SetWindowTextW(hdlg, testtextW); + todo_wine + ok(ret, "Failed to set window text.\n"); + + memset(buff, 'A', sizeof(buff)); + len = GetWindowTextA(hdlg, buff, sizeof(buff)); + todo_wine + ok(!strcmp(buff, "WndText") && len == 0, "Unexpected window text %s, len %d\n", buff, len); + + memset(buffW, 0xff, sizeof(buffW)); + len = GetWindowTextW(hdlg, buffW, sizeof(buffW)/sizeof(buffW[0])); + todo_wine + ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", + buffW[0], buffW[1], len); + + SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc); + EndDialog(hdlg, -123); + return TRUE; + } + return FALSE; +} + +static void test_DialogBoxParam(void) +{ + static const WCHAR nameW[] = {'T','E','S','T','_','E','M','P','T','Y','_','D','I','A','L','O','G',0}; INT_PTR ret; HWND hwnd_invalid = (HWND)0x4444; @@ -1290,6 +1477,13 @@ static void test_DialogBoxParamA(void) ok(ret == IDOK, "Expected IDOK\n"); DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); + + /* WM_SETTEXT handling in case of A/W dialog procedures vs A/W dialog window. */ + ret = DialogBoxParamW(GetModuleHandleA(NULL), nameW, 0, test_aw_conversion_dlgproc, 0); + ok(ret == -123, "Unexpected ret value %ld.\n", ret); + + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, test_aw_conversion_dlgproc2, 0); + ok(ret == -123, "Unexpected ret value %ld.\n", ret); } static void test_DisabledDialogTest(void) @@ -1580,7 +1774,7 @@ START_TEST(dialog) test_focus(); test_GetDlgItem(); test_GetDlgItemText(); - test_DialogBoxParamA(); + test_DialogBoxParam(); test_DisabledDialogTest(); test_MessageBoxFontTest(); test_SaveRestoreFocus(); -- 2.15.1

1 0

[PATCH] comctl32/tests: Test some return values (Coverity)
by Nikolay Sivov 28 Dec '17

28 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index e0251a9601..d72e22a6b3 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -836,8 +836,11 @@ static const IStreamVtbl Test_Stream_Vtbl = static void init_memstream(struct memstream *stream) { + HRESULT hr; + stream->IStream_iface.lpVtbl = &Test_Stream_Vtbl; - CreateStreamOnHGlobal(NULL, TRUE, &stream->stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream->stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); } static void cleanup_memstream(struct memstream *stream) @@ -995,7 +998,8 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN hr = GetHGlobalFromStream(stream.stream, &hglobal); ok(hr == S_OK, "%s: Failed to get hglobal, %#x\n", comment, hr); - IStream_Stat(stream.stream, &stat, STATFLAG_NONAME); + hr = IStream_Stat(stream.stream, &stat, STATFLAG_NONAME); + ok(hr == S_OK, "Stat() failed, hr %#x.\n", hr); data = GlobalLock(hglobal); -- 2.15.1

1 0

[PATCH] msvcrt: Remove unused variables
by Piotr Caban 28 Dec '17

28 Dec '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/data.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)

1 0

[PATCH] shell32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 27 Dec '17

27 Dec '17

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 387eecb..f667431 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1898,7 +1898,7 @@ static const struct knownFolderDef known_folders[] = { { 0 } }; #undef KNOWN_FOLDER -BOOL known_folder_found[sizeof(known_folders)/sizeof(known_folders[0])-1]; +BOOL known_folder_found[ARRAY_SIZE(known_folders)-1]; static BOOL is_in_strarray(const WCHAR *needle, const char *hay) { @@ -1914,7 +1914,7 @@ static BOOL is_in_strarray(const WCHAR *needle, const char *hay) if(strcmp(hay, "(null)") == 0 && !needle) return TRUE; - ret = MultiByteToWideChar(CP_ACP, 0, hay, -1, wstr, sizeof(wstr)/sizeof(wstr[0])); + ret = MultiByteToWideChar(CP_ACP, 0, hay, -1, wstr, ARRAY_SIZE(wstr)); if(ret == 0) { ok(0, "Failed to convert string\n"); @@ -1967,7 +1967,7 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId ok_(__FILE__, known_folder->line)(hr == S_OK, "cannot get known folder definition for %s\n", known_folder->sFolderId); if(SUCCEEDED(hr)) { - ret = MultiByteToWideChar(CP_ACP, 0, known_folder->sName, -1, sName, sizeof(sName)/sizeof(sName[0])); + ret = MultiByteToWideChar(CP_ACP, 0, known_folder->sName, -1, sName, ARRAY_SIZE(sName)); ok_(__FILE__, known_folder->line)(ret != 0, "cannot convert known folder name \"%s\" to wide characters\n", known_folder->sName); ok_(__FILE__, known_folder->line)(lstrcmpW(kfd.pszName, sName)==0, "invalid known folder name returned for %s: %s expected, but %s retrieved\n", known_folder->sFolderId, wine_dbgstr_w(sName), wine_dbgstr_w(kfd.pszName)); @@ -2063,10 +2063,10 @@ static void test_knownFolders(void) GetWindowsDirectoryW( sWinDir, MAX_PATH ); - GetTempPathW(sizeof(sExamplePath)/sizeof(sExamplePath[0]), sExamplePath); + GetTempPathW(ARRAY_SIZE(sExamplePath), sExamplePath); lstrcatW(sExamplePath, sExample); - GetTempPathW(sizeof(sExample2Path)/sizeof(sExample2Path[0]), sExample2Path); + GetTempPathW(ARRAY_SIZE(sExample2Path), sExample2Path); lstrcatW(sExample2Path, sExample2); lstrcpyW(sSubFolderPath, sExamplePath); @@ -2172,7 +2172,7 @@ static void test_knownFolders(void) ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); ok(folder == NULL, "got %p\n", folder); - for(i=0; i<sizeof(known_folder_found)/sizeof(known_folder_found[0]); ++i) + for(i=0; i < ARRAY_SIZE(known_folder_found); ++i) known_folder_found[i] = FALSE; hr = IKnownFolderManager_GetFolderIds(mgr, &folders, &nCount); @@ -2180,7 +2180,7 @@ static void test_knownFolders(void) for(i=0;i<nCount;++i) check_known_folder(mgr, &folders[i]); - for(i=0; i<sizeof(known_folder_found)/sizeof(known_folder_found[0]); ++i) + for(i=0; i < ARRAY_SIZE(known_folder_found); ++i) if(!known_folder_found[i]) trace("Known folder %s not found on current platform\n", known_folders[i].sFolderId); @@ -2554,7 +2554,7 @@ static void test_DoEnvironmentSubst(void) memset(bufferA, '#', MAX_PATH - 1); bufferA[MAX_PATH - 1] = 0; lstrcpyA(bufferA, names[i]); - MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW)); res2 = ExpandEnvironmentStringsA(names[i], expectedA, MAX_PATH); res = DoEnvironmentSubstA(bufferA, MAX_PATH); @@ -2585,7 +2585,7 @@ static void test_DoEnvironmentSubst(void) memset(bufferA, '#', MAX_PATH - 1); bufferA[len + 2] = 0; lstrcpyA(bufferA, names[i]); - MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW)); res2 = ExpandEnvironmentStringsA(bufferA, expectedA, MAX_PATH); res = DoEnvironmentSubstA(bufferA, len + 1); @@ -2606,7 +2606,7 @@ static void test_DoEnvironmentSubst(void) memset(bufferA, '#', MAX_PATH - 1); bufferA[len + 2] = 0; lstrcpyA(bufferA, names[i]); - MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW)); /* ANSI version failed without an extra byte, as documented on msdn */ res = DoEnvironmentSubstA(bufferA, len); @@ -2629,7 +2629,7 @@ static void test_DoEnvironmentSubst(void) memset(bufferA, '#', MAX_PATH - 1); bufferA[len + 2] = 0; lstrcpyA(bufferA, names[i]); - MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW)); res = DoEnvironmentSubstA(bufferA, len - 1); ok(!HIWORD(res) && (LOWORD(res) == (len - 1)), @@ -2650,7 +2650,7 @@ static void test_DoEnvironmentSubst(void) memset(bufferA, '#', MAX_PATH - 1); bufferA[MAX_PATH - 1] = 0; lstrcpyA(bufferA, does_not_existA); - MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW)); res2 = lstrlenA(does_not_existA) + 1; res = DoEnvironmentSubstA(bufferA, MAX_PATH); @@ -2701,7 +2701,7 @@ if (0) ok(!ret, "got %d\n", ret); } - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); /* Using short name only first */ nameW[0] = 0; -- 2.9.5

1 0

[PATCH 3/3] ddraw/tests: Recognise E_NOTIMPL returned from UpdateOverlay() on VMware as broken.
by Henri Verbeet 27 Dec '17

27 Dec '17

From: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 12 +++++++++++- dlls/ddraw/tests/ddraw2.c | 12 +++++++++++- dlls/ddraw/tests/ddraw4.c | 12 +++++++++++- dlls/ddraw/tests/ddraw7.c | 12 +++++++++++- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index db54abd4165..2c4410af783 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -123,6 +123,15 @@ static BOOL ddraw_is_intel(IDirectDraw *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw *ddraw) +{ + DDDEVICEIDENTIFIER identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -8666,7 +8675,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d2382d153be..89d0d7e4be3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -125,6 +125,15 @@ static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw2 *ddraw) +{ + DDDEVICEIDENTIFIER identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -9800,7 +9809,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index caa3ced1728..fa1178d0361 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -131,6 +131,15 @@ static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw4 *ddraw) +{ + DDDEVICEIDENTIFIER identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -11262,7 +11271,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface4_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f1568bb9d07..fdfac696cfc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -145,6 +145,15 @@ static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw7 *ddraw) +{ + DDDEVICEIDENTIFIER2 identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -11220,7 +11229,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ -- 2.11.0

1 0

[PATCH 2/3] ddraw/tests: Print driver and device information before running the tests.
by Henri Verbeet 27 Dec '17

27 Dec '17

Analogous to the d3d8 and d3d9 tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 59 ++++++++++++++++++++++------------------------- dlls/ddraw/tests/ddraw2.c | 59 ++++++++++++++++++++++------------------------- dlls/ddraw/tests/ddraw4.c | 51 ++++++++++++++++++++++------------------ dlls/ddraw/tests/ddraw7.c | 55 +++++++++++++++++++++++-------------------- 4 files changed, 114 insertions(+), 110 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 109910b8205..db54abd4165 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -82,58 +82,45 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL ddraw_is_warp(IDirectDraw *ddraw) +static BOOL ddraw_get_identifier(IDirectDraw *ddraw, DDDEVICEIDENTIFIER *identifier) { IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; HRESULT hr; - if (!strcmp(winetest_platform, "wine")) - return FALSE; - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); + hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); IDirectDraw4_Release(ddraw4); - return !!strstr(identifier.szDriver, "warp"); + return SUCCEEDED(hr); } -static BOOL ddraw_is_nvidia(IDirectDraw *ddraw) +static BOOL ddraw_is_warp(IDirectDraw *ddraw) { - IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; - HRESULT hr; - if (!strcmp(winetest_platform, "wine")) - return FALSE; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && strstr(identifier.szDriver, "warp"); +} - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); +static BOOL ddraw_is_nvidia(IDirectDraw *ddraw) +{ + DDDEVICEIDENTIFIER identifier; - return identifier.dwVendorId == 0x10de; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw *ddraw) { - IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; - HRESULT hr; - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - - return identifier.dwVendorId == 0x8086; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x8086; } static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw, @@ -10784,8 +10771,9 @@ done: START_TEST(ddraw1) { - IDirectDraw *ddraw; + DDDEVICEIDENTIFIER identifier; DEVMODEW current_mode; + IDirectDraw *ddraw; HMODULE dwmapi; if (!(ddraw = create_ddraw())) @@ -10793,6 +10781,15 @@ START_TEST(ddraw1) skip("Failed to create a ddraw object, skipping tests.\n"); return; } + + if (ddraw_get_identifier(ddraw, &identifier)) + { + trace("Driver string: \"%s\"\n", identifier.szDriver); + trace("Description string: \"%s\"\n", identifier.szDescription); + trace("Driver version %d.%d.%d.%d\n", + HIWORD(U(identifier.liDriverVersion).HighPart), LOWORD(U(identifier.liDriverVersion).HighPart), + HIWORD(U(identifier.liDriverVersion).LowPart), LOWORD(U(identifier.liDriverVersion).LowPart)); + } IDirectDraw_Release(ddraw); memset(&current_mode, 0, sizeof(current_mode)); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1db7ad9329f..d2382d153be 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -84,58 +84,45 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) +static BOOL ddraw_get_identifier(IDirectDraw2 *ddraw, DDDEVICEIDENTIFIER *identifier) { IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; HRESULT hr; - if (!strcmp(winetest_platform, "wine")) - return FALSE; - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); + hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); IDirectDraw4_Release(ddraw4); - return !!strstr(identifier.szDriver, "warp"); + return SUCCEEDED(hr); } -static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw) +static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) { - IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; - HRESULT hr; - if (!strcmp(winetest_platform, "wine")) - return FALSE; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && strstr(identifier.szDriver, "warp"); +} - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); +static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw) +{ + DDDEVICEIDENTIFIER identifier; - return identifier.dwVendorId == 0x10de; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) { - IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; - HRESULT hr; - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - - return identifier.dwVendorId == 0x8086; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x8086; } static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw, @@ -12160,8 +12147,9 @@ done: START_TEST(ddraw2) { - IDirectDraw2 *ddraw; + DDDEVICEIDENTIFIER identifier; DEVMODEW current_mode; + IDirectDraw2 *ddraw; HMODULE dwmapi; if (!(ddraw = create_ddraw())) @@ -12169,6 +12157,15 @@ START_TEST(ddraw2) skip("Failed to create a ddraw object, skipping tests.\n"); return; } + + if (ddraw_get_identifier(ddraw, &identifier)) + { + trace("Driver string: \"%s\"\n", identifier.szDriver); + trace("Description string: \"%s\"\n", identifier.szDescription); + trace("Driver version %d.%d.%d.%d\n", + HIWORD(U(identifier.liDriverVersion).HighPart), LOWORD(U(identifier.liDriverVersion).HighPart), + HIWORD(U(identifier.liDriverVersion).LowPart), LOWORD(U(identifier.liDriverVersion).LowPart)); + } IDirectDraw2_Release(ddraw); memset(&current_mode, 0, sizeof(current_mode)); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 98c86d0bf01..caa3ced1728 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -94,46 +94,41 @@ static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } -static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) +static BOOL ddraw_get_identifier(IDirectDraw4 *ddraw, DDDEVICEIDENTIFIER *identifier) { - DDDEVICEIDENTIFIER identifier; HRESULT hr; - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); + hr = IDirectDraw4_GetDeviceIdentifier(ddraw, identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - return !!strstr(identifier.szDriver, "warp"); + return SUCCEEDED(hr); } -static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw) +static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) { DDDEVICEIDENTIFIER identifier; - HRESULT hr; - if (!strcmp(winetest_platform, "wine")) - return FALSE; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && strstr(identifier.szDriver, "warp"); +} - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); +static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw) +{ + DDDEVICEIDENTIFIER identifier; - return identifier.dwVendorId == 0x10de; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) { DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - return identifier.dwVendorId == 0x8086; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x8086; } static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw, @@ -14008,8 +14003,9 @@ static void test_compute_sphere_visibility(void) START_TEST(ddraw4) { - IDirectDraw4 *ddraw; + DDDEVICEIDENTIFIER identifier; DEVMODEW current_mode; + IDirectDraw4 *ddraw; HMODULE dwmapi; if (!(ddraw = create_ddraw())) @@ -14017,6 +14013,15 @@ START_TEST(ddraw4) skip("Failed to create a ddraw object, skipping tests.\n"); return; } + + if (ddraw_get_identifier(ddraw, &identifier)) + { + trace("Driver string: \"%s\"\n", identifier.szDriver); + trace("Description string: \"%s\"\n", identifier.szDescription); + trace("Driver version %d.%d.%d.%d\n", + HIWORD(U(identifier.liDriverVersion).HighPart), LOWORD(U(identifier.liDriverVersion).HighPart), + HIWORD(U(identifier.liDriverVersion).LowPart), LOWORD(U(identifier.liDriverVersion).LowPart)); + } IDirectDraw4_Release(ddraw); memset(&current_mode, 0, sizeof(current_mode)); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7c6264bd557..f1568bb9d07 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -108,46 +108,41 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } -static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) +static BOOL ddraw_get_identifier(IDirectDraw7 *ddraw, DDDEVICEIDENTIFIER2 *identifier) { - DDDEVICEIDENTIFIER2 identifier; HRESULT hr; - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); + hr = IDirectDraw7_GetDeviceIdentifier(ddraw, identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - return !!strstr(identifier.szDriver, "warp"); + return SUCCEEDED(hr); } -static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw) +static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) { DDDEVICEIDENTIFIER2 identifier; - HRESULT hr; - if (!strcmp(winetest_platform, "wine")) - return FALSE; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && strstr(identifier.szDriver, "warp"); +} - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); +static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw) +{ + DDDEVICEIDENTIFIER2 identifier; - return identifier.dwVendorId == 0x10de; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) { DDDEVICEIDENTIFIER2 identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - return identifier.dwVendorId == 0x8086; + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x8086; } static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw, @@ -13384,11 +13379,12 @@ static void test_clip_planes_limits(void) START_TEST(ddraw7) { - HMODULE module = GetModuleHandleA("ddraw.dll"); - HMODULE dwmapi; - IDirectDraw7 *ddraw; + DDDEVICEIDENTIFIER2 identifier; + HMODULE module, dwmapi; DEVMODEW current_mode; + IDirectDraw7 *ddraw; + module = GetModuleHandleA("ddraw.dll"); if (!(pDirectDrawCreateEx = (void *)GetProcAddress(module, "DirectDrawCreateEx"))) { win_skip("DirectDrawCreateEx not available, skipping tests.\n"); @@ -13400,6 +13396,15 @@ START_TEST(ddraw7) skip("Failed to create a ddraw object, skipping tests.\n"); return; } + + if (ddraw_get_identifier(ddraw, &identifier)) + { + trace("Driver string: \"%s\"\n", identifier.szDriver); + trace("Description string: \"%s\"\n", identifier.szDescription); + trace("Driver version %d.%d.%d.%d\n", + HIWORD(U(identifier.liDriverVersion).HighPart), LOWORD(U(identifier.liDriverVersion).HighPart), + HIWORD(U(identifier.liDriverVersion).LowPart), LOWORD(U(identifier.liDriverVersion).LowPart)); + } IDirectDraw7_Release(ddraw); memset(&current_mode, 0, sizeof(current_mode)); -- 2.11.0

1 0

[PATCH 1/3] ddraw/tests: Introduce an ARRAY_SIZE macro to ddraw7 as well.
by Henri Verbeet 27 Dec '17

27 Dec '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw7.c | 167 +++++++++++++++++++++++----------------------- 1 file changed, 82 insertions(+), 85 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 91822281d06..7c6264bd557 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -32,6 +32,10 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + struct vec2 { float x, y; @@ -1519,7 +1523,7 @@ static void test_ck_rgba(void) hr = IDirect3DDevice7_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_COLORKEYENABLE, tests[i].color_key); ok(SUCCEEDED(hr), "Failed to enable color keying, hr %#x.\n", hr); @@ -1998,7 +2002,7 @@ static void test_surface_qi(void) hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); - test_qi("surface_qi", (IUnknown *)surface, &IID_IDirectDrawSurface7, tests, sizeof(tests) / sizeof(*tests)); + test_qi("surface_qi", (IUnknown *)surface, &IID_IDirectDrawSurface7, tests, ARRAY_SIZE(tests)); IDirectDrawSurface7_Release(surface); IDirectDraw7_Release(ddraw); @@ -2064,7 +2068,7 @@ static void test_device_qi(void) return; } - test_qi("device_qi", (IUnknown *)device, &IID_IDirect3DDevice7, tests, sizeof(tests) / sizeof(*tests)); + test_qi("device_qi", (IUnknown *)device, &IID_IDirect3DDevice7, tests, ARRAY_SIZE(tests)); IDirect3DDevice7_Release(device); DestroyWindow(window); @@ -3732,7 +3736,7 @@ static void test_lighting(void) hr = IDirect3DDevice7_LightEnable(device, 0, TRUE); ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, tests[i].world_matrix); ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); @@ -3944,22 +3948,14 @@ static void test_specular_lighting(void) } tests[] = { - {&directional, FALSE, 30.0f, expected_directional, - sizeof(expected_directional) / sizeof(expected_directional[0])}, - {&directional, TRUE, 30.0f, expected_directional_local, - sizeof(expected_directional_local) / sizeof(expected_directional_local[0])}, - {&point, FALSE, 30.0f, expected_point, - sizeof(expected_point) / sizeof(expected_point[0])}, - {&point, TRUE, 30.0f, expected_point_local, - sizeof(expected_point_local) / sizeof(expected_point_local[0])}, - {&spot, FALSE, 30.0f, expected_spot, - sizeof(expected_spot) / sizeof(expected_spot[0])}, - {&spot, TRUE, 30.0f, expected_spot_local, - sizeof(expected_spot_local) / sizeof(expected_spot_local[0])}, - {&point_range, FALSE, 30.0f, expected_point_range, - sizeof(expected_point_range) / sizeof(expected_point_range[0])}, - {&point_side, TRUE, 0.0f, expected_point_side, - sizeof(expected_point_side) / sizeof(expected_point_side[0])}, + {&directional, FALSE, 30.0f, expected_directional, ARRAY_SIZE(expected_directional)}, + {&directional, TRUE, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)}, + {&point, FALSE, 30.0f, expected_point, ARRAY_SIZE(expected_point)}, + {&point, TRUE, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, + {&spot, FALSE, 30.0f, expected_spot, ARRAY_SIZE(expected_spot)}, + {&spot, TRUE, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, + {&point_range, FALSE, 30.0f, expected_point_range, ARRAY_SIZE(expected_point_range)}, + {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, }; IDirect3DDevice7 *device; IDirectDrawSurface7 *rt; @@ -4032,7 +4028,7 @@ static void test_specular_lighting(void) hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_SPECULARENABLE, TRUE); ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice7_SetLight(device, 0, tests[i].light); ok(SUCCEEDED(hr), "Failed to set light parameters, hr %#x.\n", hr); @@ -4320,7 +4316,7 @@ static void test_fog_special(void) hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGEND, conv.d); ok(SUCCEEDED(hr), "Failed to set fog end, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x000000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); @@ -4512,7 +4508,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to get specularenable render state, hr %#x.\n", hr); ok(rs == FALSE, "Initial D3DRENDERSTATE_SPECULARENABLE is %#x, expected FALSE.\n", rs); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff202020, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); @@ -4748,7 +4744,7 @@ static void test_texturemanage(void) return; } - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); @@ -4954,7 +4950,7 @@ static void test_block_formats_creation(void) ok(SUCCEEDED(hr), "Failed to get fourcc codes %#x.\n", hr); for (i = 0; i < num_fourcc_codes; i++) { - for (j = 0; j < sizeof(formats) / sizeof(*formats); j++) + for (j = 0; j < ARRAY_SIZE(formats); ++j) { if (fourcc_codes[i] == formats[j].fourcc) supported_overlay_fmts |= formats[j].support_flag; @@ -4969,9 +4965,9 @@ static void test_block_formats_creation(void) mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 2 * 2 * 16 + 1); - for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { - for (j = 0; j < sizeof(types) / sizeof(*types); j++) + for (j = 0; j < ARRAY_SIZE(types); ++j) { BOOL support; @@ -5035,7 +5031,7 @@ static void test_block_formats_creation(void) if (formats[i].overlay) continue; - for (j = 0; j < sizeof(user_mem_tests) / sizeof(*user_mem_tests); ++j) + for (j = 0; j < ARRAY_SIZE(user_mem_tests); ++j) { memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); @@ -5164,13 +5160,13 @@ static void test_unsupported_formats(void) ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); IDirect3D7_Release(d3d); - for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { struct format_support_check check = {&formats[i].fmt, FALSE}; hr = IDirect3DDevice7_EnumTextureFormats(device, test_unsupported_formats_cb, &check); ok(SUCCEEDED(hr), "Failed to enumerate texture formats %#x.\n", hr); - for (j = 0; j < sizeof(caps) / sizeof(*caps); j++) + for (j = 0; j < ARRAY_SIZE(caps); ++j) { memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); @@ -5441,7 +5437,7 @@ static void test_rt_caps(void) hr = IDirectDraw7_CreatePalette(ddraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, palette_entries, &palette, NULL); ok(SUCCEEDED(hr), "Failed to create palette, hr %#x.\n", hr); - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { IDirectDrawSurface7 *surface, *rt, *expected_rt, *tmp; DDSURFACEDESC2 surface_desc; @@ -5663,7 +5659,7 @@ static void test_primary_caps(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, test_data[i].coop_level); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); @@ -5860,7 +5856,7 @@ static void test_surface_lock(void) IDirectDrawSurface7_Release(surface); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { if (!cubemap_supported && tests[i].caps2 & DDSCAPS2_CUBEMAP) continue; @@ -5962,7 +5958,7 @@ static void test_surface_discard(void) hr = IDirect3DDevice7_GetRenderTarget(device, &target); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { BOOL discarded; @@ -6076,7 +6072,7 @@ static void test_flip(void) hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { /* Creating a flippable texture induces a BSoD on some versions of the * Intel graphics driver. At least Intel GMA 950 with driver version @@ -6580,8 +6576,9 @@ static void test_set_surface_desc(void) /* SetSurfaceDesc needs systemmemory surfaces. * - * As a sidenote, fourcc surfaces aren't allowed in sysmem, thus testing DDSD_LINEARSIZE is moot. */ - for (i = 0; i < sizeof(invalid_caps_tests) / sizeof(*invalid_caps_tests); i++) + * As a sidenote, fourcc surfaces aren't allowed in sysmem, thus testing + * DDSD_LINEARSIZE is moot. */ + for (i = 0; i < ARRAY_SIZE(invalid_caps_tests); ++i) { reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_CAPS; @@ -7612,7 +7609,7 @@ static void test_create_surface_pitch(void) mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((63 * 4) + 8) * 63); - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -7725,7 +7722,7 @@ static void test_mipmap(void) return; } - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -8004,7 +8001,7 @@ static void test_p8_blit(void) if (SUCCEEDED(hr)) { - for (x = 0; x < sizeof(expected) / sizeof(*expected); x++) + for (x = 0; x < ARRAY_SIZE(expected); ++x) { color = get_surface_color(dst, x, 0); todo_wine ok(compare_color(color, expected[x], 0), @@ -8174,16 +8171,16 @@ static void test_palette_gdi(void) "Got unexpected palette %p, expected %p.\n", ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE)); - i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); - ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); - for (i = 0; i < sizeof(expected1) / sizeof(*expected1); i++) + i = GetDIBColorTable(dc, 0, ARRAY_SIZE(rgbquad), rgbquad); + ok(i == ARRAY_SIZE(rgbquad), "Expected count 255, got %u.\n", i); + for (i = 0; i < ARRAY_SIZE(expected1); ++i) { ok(!memcmp(&rgbquad[i], &expected1[i], sizeof(rgbquad[i])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[i].rgbRed, rgbquad[i].rgbGreen, rgbquad[i].rgbBlue, expected1[i].rgbRed, expected1[i].rgbGreen, expected1[i].rgbBlue); } - for (; i < sizeof(rgbquad) / sizeof(*rgbquad); i++) + for (; i < ARRAY_SIZE(rgbquad); ++i) { ok(!memcmp(&rgbquad[i], &rgb_zero, sizeof(rgbquad[i])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=0 g=0 b=0.\n", @@ -8223,16 +8220,16 @@ static void test_palette_gdi(void) /* Refresh the DC. This updates the palette. */ hr = IDirectDrawSurface7_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); - i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); - ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); - for (i = 0; i < sizeof(expected2) / sizeof(*expected2); i++) + i = GetDIBColorTable(dc, 0, ARRAY_SIZE(rgbquad), rgbquad); + ok(i == ARRAY_SIZE(rgbquad), "Expected count 255, got %u.\n", i); + for (i = 0; i < ARRAY_SIZE(expected2); ++i) { ok(!memcmp(&rgbquad[i], &expected2[i], sizeof(rgbquad[i])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[i].rgbRed, rgbquad[i].rgbGreen, rgbquad[i].rgbBlue, expected2[i].rgbRed, expected2[i].rgbGreen, expected2[i].rgbBlue); } - for (; i < sizeof(rgbquad) / sizeof(*rgbquad); i++) + for (; i < ARRAY_SIZE(rgbquad); ++i) { ok(!memcmp(&rgbquad[i], &rgb_zero, sizeof(rgbquad[i])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=0 g=0 b=0.\n", @@ -8296,16 +8293,16 @@ static void test_palette_gdi(void) * the system palette are not included pending an application that depends on this. * The relation between those causes problems on Windows Vista and newer for games * like Age of Empires or StarcCaft. Don't emulate it without a real need. */ - i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); - ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); - for (i = 0; i < sizeof(expected2) / sizeof(*expected2); i++) + i = GetDIBColorTable(dc, 0, ARRAY_SIZE(rgbquad), rgbquad); + ok(i == ARRAY_SIZE(rgbquad), "Expected count 255, got %u.\n", i); + for (i = 0; i < ARRAY_SIZE(expected2); ++i) { ok(!memcmp(&rgbquad[i], &expected2[i], sizeof(rgbquad[i])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[i].rgbRed, rgbquad[i].rgbGreen, rgbquad[i].rgbBlue, expected2[i].rgbRed, expected2[i].rgbGreen, expected2[i].rgbBlue); } - for (; i < sizeof(rgbquad) / sizeof(*rgbquad); i++) + for (; i < ARRAY_SIZE(rgbquad); ++i) { ok(!memcmp(&rgbquad[i], &rgb_zero, sizeof(rgbquad[i])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=0 g=0 b=0.\n", @@ -8327,16 +8324,16 @@ static void test_palette_gdi(void) * but in all likelihood it is actually the system palette. */ hr = IDirectDrawSurface7_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); - i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); - ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); - for (i = 0; i < sizeof(expected2) / sizeof(*expected2); i++) + i = GetDIBColorTable(dc, 0, ARRAY_SIZE(rgbquad), rgbquad); + ok(i == ARRAY_SIZE(rgbquad), "Expected count 255, got %u.\n", i); + for (i = 0; i < ARRAY_SIZE(expected2); ++i) { ok(!memcmp(&rgbquad[i], &expected2[i], sizeof(rgbquad[i])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[i].rgbRed, rgbquad[i].rgbGreen, rgbquad[i].rgbBlue, expected2[i].rgbRed, expected2[i].rgbGreen, expected2[i].rgbBlue); } - for (; i < sizeof(rgbquad) / sizeof(*rgbquad); i++) + for (; i < ARRAY_SIZE(rgbquad); ++i) { ok(!memcmp(&rgbquad[i], &rgb_zero, sizeof(rgbquad[i])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=0 g=0 b=0.\n", @@ -8367,16 +8364,16 @@ static void test_palette_gdi(void) * palette. */ hr = IDirectDrawSurface7_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); - i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); - ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); - for (i = 0; i < sizeof(expected3) / sizeof(*expected3); i++) + i = GetDIBColorTable(dc, 0, ARRAY_SIZE(rgbquad), rgbquad); + ok(i == ARRAY_SIZE(rgbquad), "Expected count 255, got %u.\n", i); + for (i = 0; i < ARRAY_SIZE(expected3); ++i) { ok(!memcmp(&rgbquad[i], &expected3[i], sizeof(rgbquad[i])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[i].rgbRed, rgbquad[i].rgbGreen, rgbquad[i].rgbBlue, expected3[i].rgbRed, expected3[i].rgbGreen, expected3[i].rgbBlue); } - for (; i < sizeof(rgbquad) / sizeof(*rgbquad); i++) + for (; i < ARRAY_SIZE(rgbquad); ++i) { ok(!memcmp(&rgbquad[i], &rgb_zero, sizeof(rgbquad[i])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=0 g=0 b=0.\n", @@ -8483,7 +8480,7 @@ static void test_palette_alpha(void) ok(palette_entries[3].peFlags == 0x00, "Got unexpected peFlags 0x%02x, expected 0x00.\n", palette_entries[3].peFlags); - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -8587,7 +8584,7 @@ static void test_vb_writeonly(void) desc.dwSize = sizeof(desc); desc.dwCaps = D3DVBCAPS_WRITEONLY; desc.dwFVF = D3DFVF_XYZRHW; - desc.dwNumVertices = sizeof(quad) / sizeof(*quad); + desc.dwNumVertices = ARRAY_SIZE(quad); hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &buffer, 0); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); @@ -8856,7 +8853,7 @@ static void test_resource_priority(void) goto done; } - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -9089,9 +9086,9 @@ static void test_fog_interpolation(void) hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_TEXTUREFACTOR, 0x000000ff); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if(!(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) && tests[i].tfog) + if (!(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) && tests[i].tfog) continue; hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00808080, 0.0f, 0); @@ -9238,7 +9235,7 @@ static void test_negative_fixedfunction_fog(void) hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { if (!(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) && tests[i].tfog) continue; @@ -9356,7 +9353,7 @@ static void test_table_fog_zw(void) hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGTABLEMODE, D3DFOG_LINEAR); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); @@ -9519,7 +9516,7 @@ static void test_signed_formats(void) hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLORARG2, D3DTA_TFACTOR); ok(SUCCEEDED(hr), "Failed to set texture stage state, hr %#x.\n", hr); - for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { for (width = 1; width < 5; width += 3) { @@ -9822,7 +9819,7 @@ static void test_color_fill(void) if (!(supported_fmts & (SUPPORT_YUY2 | SUPPORT_UYVY)) || !(hal_caps.dwCaps & DDCAPS_OVERLAY)) skip("Overlays or some YUV formats not supported, skipping YUV colorfill tests.\n"); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { DWORD expected_broken = tests[i].result; @@ -10049,7 +10046,7 @@ static void test_color_fill(void) hr = IDirectDrawSurface7_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_ROP | DDBLT_WAIT, &fx); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < sizeof(rops) / sizeof(*rops); i++) + for (i = 0; i < ARRAY_SIZE(rops); ++i) { fx.dwROP = rops[i].rop; hr = IDirectDrawSurface7_Blt(surface, NULL, surface2, NULL, DDBLT_ROP | DDBLT_WAIT, &fx); @@ -10450,7 +10447,7 @@ static void test_colorkey_precision(void) memset(&lock_desc, 0, sizeof(lock_desc)); lock_desc.dwSize = sizeof(lock_desc); - for (t = 0; t < sizeof(tests) / sizeof(*tests); ++t) + for (t = 0; t < ARRAY_SIZE(tests); ++t) { if (is_nvidia && tests[t].skip_nv) { @@ -10824,7 +10821,7 @@ static void test_shademode(void) desc.dwSize = sizeof(desc); desc.dwCaps = D3DVBCAPS_WRITEONLY; desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; - desc.dwNumVertices = sizeof(quad_strip) / sizeof(*quad_strip); + desc.dwNumVertices = ARRAY_SIZE(quad_strip); hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &vb_strip, 0); ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); hr = IDirect3DVertexBuffer7_Lock(vb_strip, 0, &data, NULL); @@ -10833,7 +10830,7 @@ static void test_shademode(void) hr = IDirect3DVertexBuffer7_Unlock(vb_strip); ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); - desc.dwNumVertices = sizeof(quad_list) / sizeof(*quad_list); + desc.dwNumVertices = ARRAY_SIZE(quad_list); hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &vb_list, 0); ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); hr = IDirect3DVertexBuffer7_Lock(vb_list, 0, &data, NULL); @@ -10845,7 +10842,7 @@ static void test_shademode(void) /* Try it first with a TRIANGLESTRIP. Do it with different geometry because * the color fixups we have to do for FLAT shading will be dependent on that. */ - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); @@ -10949,7 +10946,7 @@ static void test_lockrect_invalid(void) goto done; } - for (r = 0; r < sizeof(resources) / sizeof(*resources); ++r) + for (r = 0; r < ARRAY_SIZE(resources); ++r) { memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -10980,7 +10977,7 @@ static void test_lockrect_invalid(void) ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); */ - for (i = 0; i < sizeof(valid) / sizeof(*valid); ++i) + for (i = 0; i < ARRAY_SIZE(valid); ++i) { RECT *rect = &valid[i]; @@ -10995,7 +10992,7 @@ static void test_lockrect_invalid(void) ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, type %s.\n", hr, resources[r].name); } - for (i = 0; i < sizeof(invalid) / sizeof(*invalid); ++i) + for (i = 0; i < ARRAY_SIZE(invalid); ++i) { RECT *rect = &invalid[i]; @@ -11408,7 +11405,7 @@ static void test_blt(void) hr = IDirectDrawSurface7_Blt(surface, NULL, rt, NULL, 0, NULL); ok(SUCCEEDED(hr), "Failed to blit, 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 = IDirectDrawSurface7_Blt(surface, &test_data[i].dst_rect, surface, &test_data[i].src_rect, DDBLT_WAIT, NULL); @@ -11509,7 +11506,7 @@ static void test_blt_z_alpha(void) fx.dwAlphaSrcConstBitDepth = 8; U4(fx).dwAlphaSrcConst = 0x22; - for (i = 0; i < sizeof(blt_flags) / sizeof(*blt_flags); ++i) + for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { fx.dwFillColor = 0x3300ff00; hr = IDirectDrawSurface7_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); @@ -11692,7 +11689,7 @@ static void test_getdc(void) hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -12411,7 +12408,7 @@ static void test_surface_desc_size(void) hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - for (i = 0; i < sizeof(surface_caps) / sizeof(*surface_caps); ++i) + for (i = 0; i < ARRAY_SIZE(surface_caps); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -12430,7 +12427,7 @@ static void test_surface_desc_size(void) ok(hr == DD_OK, "Failed to query IDirectDrawSurface3, hr %#x, type %s.\n", hr, surface_caps[i].name); /* GetSurfaceDesc() */ - for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + for (j = 0; j < ARRAY_SIZE(desc_sizes); ++j) { memset(&desc, 0, sizeof(desc)); desc.dwSize = desc_sizes[j]; @@ -12455,7 +12452,7 @@ static void test_surface_desc_size(void) } /* Lock() */ - for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + for (j = 0; j < ARRAY_SIZE(desc_sizes); ++j) { const BOOL ignore_size = surface_caps[i].caps & DDSCAPS_TEXTURE && !(surface_caps[i].caps & DDSCAPS_VIDEOMEMORY); @@ -12547,7 +12544,7 @@ static void test_surface_desc_size(void) } /* GetDisplayMode() */ - for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + for (j = 0; j < ARRAY_SIZE(desc_sizes); ++j) { memset(&desc, 0xcc, sizeof(desc)); desc.dwSize = desc_sizes[j]; @@ -13292,7 +13289,7 @@ static void test_compute_sphere_visibility(void) IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &identity); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, tests[i].view); IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, tests[i].proj); -- 2.11.0

1 0

[PATCH 1/2] ddraw/tests: Sync test_clear with d3d8/9.
by Stefan Dösinger 27 Dec '17

27 Dec '17

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- This is merely a port of the existing test back to ddraw. The next patch will address the WARP test failure. --- dlls/ddraw/tests/ddraw1.c | 187 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 176 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 134 +++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 47 ----------- 5 files changed, 694 insertions(+), 47 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 109910b820..671beeaa8e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10782,6 +10782,192 @@ done: DestroyWindow(window); } +static void test_clear(void) +{ + IDirectDraw *ddraw; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + ULONG refcount; + HWND window; + HRESULT hr; + D3DRECT rect[2]; + D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}}; + D3DCOLOR color; + IDirect3DViewport *viewport, *viewport2, *viewport3; + IDirect3DMaterial *white, *red, *green, *blue; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + + white = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + red = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + green = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 1.0f); + blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative + * rectangles, but it will not clear them either. */ + viewport_set_background(device, viewport, red); + hr = IDirect3DViewport_Clear(viewport, 2, rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here.*/ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + viewport_set_background(device, viewport, green); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color); + + /* Test how the viewport affects clears */ + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport2 = create_viewport(device, 160, 120, 160, 120); + viewport_set_background(device, viewport2, blue); + hr = IDirect3DViewport_Clear(viewport2, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport3 = create_viewport(device, 320, 240, 320, 240); + viewport_set_background(device, viewport3, green); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + hr = IDirect3DViewport_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color); + + /* The clear rectangle is rendertarget absolute, not relative to the viewport. */ + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + U1(rect[0]).x1 = 330; + U2(rect[0]).y1 = 250; + U3(rect[0]).x2 = 340; + U4(rect[0]).y2 = 260; + hr = IDirect3DViewport_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 328, 248); + ok(compare_color(color, 0x00ffffff, 0), "(328,248) has color %08x\n", color); + color = get_surface_color(rt, 332, 248); + ok(compare_color(color, 0x00ffffff, 0), "(332,248) has color %08x\n", color); + color = get_surface_color(rt, 328, 252); + ok(compare_color(color, 0x00ffffff, 0), "(328,252) has color %08x\n", color); + color = get_surface_color(rt, 332, 252); + ok(compare_color(color, 0x0000ff00, 0), "(332,252) has color %08x\n", color); + + color = get_surface_color(rt, 338, 248); + ok(compare_color(color, 0x00ffffff, 0), "(338,248) has color %08x\n", color); + color = get_surface_color(rt, 342, 248); + ok(compare_color(color, 0x00ffffff, 0), "(342,248) has color %08x\n", color); + color = get_surface_color(rt, 338, 252); + ok(compare_color(color, 0x0000ff00, 0), "(338,252) has color %08x\n", color); + color = get_surface_color(rt, 342, 252); + ok(compare_color(color, 0x00ffffff, 0), "(342,252) has color %08x\n", color); + + color = get_surface_color(rt, 328, 258); + ok(compare_color(color, 0x00ffffff, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 332, 258); + ok(compare_color(color, 0x0000ff00, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 328, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 332, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + color = get_surface_color(rt, 338, 258); + ok(compare_color(color, 0x0000ff00, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 342, 258); + ok(compare_color(color, 0x00ffffff, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 338, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 342, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d1. */ + + IDirect3DViewport_Release(viewport3); + IDirect3DViewport_Release(viewport2); + IDirect3DViewport_Release(viewport); + IDirect3DMaterial_Release(white); + IDirect3DMaterial_Release(red); + IDirect3DMaterial_Release(green); + IDirect3DMaterial_Release(blue); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "Ddraw object has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { IDirectDraw *ddraw; @@ -10870,4 +11056,5 @@ START_TEST(ddraw1) test_surface_desc_size(); test_texture_load(); test_ck_operation(); + test_clear(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1db7ad9329..6a13764859 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12158,6 +12158,202 @@ done: DestroyWindow(window); } +static void test_clear(void) +{ + IDirectDraw2 *ddraw; + IDirect3DDevice2 *device; + IDirectDrawSurface *rt; + ULONG refcount; + HWND window; + HRESULT hr; + D3DRECT rect[2]; + D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}}; + D3DCOLOR color; + IDirect3DViewport2 *viewport, *viewport2, *viewport3; + IDirect3DMaterial2 *white, *red, *green, *blue; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + white = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + red = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + green = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 1.0f); + blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative + * rectangles, but it will not clear them either. */ + viewport_set_background(device, viewport, red); + hr = IDirect3DViewport2_Clear(viewport, 2, rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here.*/ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + viewport_set_background(device, viewport, green); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color); + + /* Test how the viewport affects clears */ + viewport_set_background(device, viewport, white); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport2 = create_viewport(device, 160, 120, 160, 120); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + viewport_set_background(device, viewport2, blue); + hr = IDirect3DViewport2_Clear(viewport2, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport3 = create_viewport(device, 320, 240, 320, 240); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport3); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + viewport_set_background(device, viewport3, green); + hr = IDirect3DViewport2_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color); + + /* The clear rectangle is rendertarget absolute, not relative to the viewport. */ + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + U1(rect[0]).x1 = 330; + U2(rect[0]).y1 = 250; + U3(rect[0]).x2 = 340; + U4(rect[0]).y2 = 260; + hr = IDirect3DViewport2_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 328, 248); + ok(compare_color(color, 0x00ffffff, 0), "(328,248) has color %08x\n", color); + color = get_surface_color(rt, 332, 248); + ok(compare_color(color, 0x00ffffff, 0), "(332,248) has color %08x\n", color); + color = get_surface_color(rt, 328, 252); + ok(compare_color(color, 0x00ffffff, 0), "(328,252) has color %08x\n", color); + color = get_surface_color(rt, 332, 252); + ok(compare_color(color, 0x0000ff00, 0), "(332,252) has color %08x\n", color); + + color = get_surface_color(rt, 338, 248); + ok(compare_color(color, 0x00ffffff, 0), "(338,248) has color %08x\n", color); + color = get_surface_color(rt, 342, 248); + ok(compare_color(color, 0x00ffffff, 0), "(342,248) has color %08x\n", color); + color = get_surface_color(rt, 338, 252); + ok(compare_color(color, 0x0000ff00, 0), "(338,252) has color %08x\n", color); + color = get_surface_color(rt, 342, 252); + ok(compare_color(color, 0x00ffffff, 0), "(342,252) has color %08x\n", color); + + color = get_surface_color(rt, 328, 258); + ok(compare_color(color, 0x00ffffff, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 332, 258); + ok(compare_color(color, 0x0000ff00, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 328, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 332, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + color = get_surface_color(rt, 338, 258); + ok(compare_color(color, 0x0000ff00, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 342, 258); + ok(compare_color(color, 0x00ffffff, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 338, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 342, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d2. */ + + IDirect3DViewport2_Release(viewport3); + IDirect3DViewport2_Release(viewport2); + IDirect3DViewport2_Release(viewport); + IDirect3DMaterial2_Release(white); + IDirect3DMaterial2_Release(red); + IDirect3DMaterial2_Release(green); + IDirect3DMaterial2_Release(blue); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirectDraw2_Release(ddraw); + ok(!refcount, "Ddraw object has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw2) { IDirectDraw2 *ddraw; @@ -12254,4 +12450,5 @@ START_TEST(ddraw2) test_display_mode_surface_pixel_format(); test_surface_desc_size(); test_ck_operation(); + test_clear(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 98c86d0bf0..b79e6c67a2 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14006,6 +14006,181 @@ static void test_compute_sphere_visibility(void) DestroyWindow(window); } +static void test_clear(void) +{ + IDirect3DDevice3 *device; + IDirectDrawSurface4 *rt; + ULONG refcount; + HWND window; + HRESULT hr; + D3DRECT rect[2]; + D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}}; + D3DCOLOR color; + IDirect3DViewport3 *viewport, *viewport2, *viewport3; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + 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); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative + * rectangles, but it will not clear them either. */ + hr = IDirect3DViewport3_Clear2(viewport, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here.*/ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color); + + /* Test how the viewport affects clears */ + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport2 = create_viewport(device, 160, 120, 160, 120); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport2); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport2, 1, &rect_full, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + viewport3 = create_viewport(device, 320, 240, 320, 240); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + hr = IDirect3DViewport3_Clear2(viewport3, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color); + + /* The clear rectangle is rendertarget absolute, not relative to the viewport. */ + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + U1(rect[0]).x1 = 330; + U2(rect[0]).y1 = 250; + U3(rect[0]).x2 = 340; + U4(rect[0]).y2 = 260; + hr = IDirect3DViewport3_Clear2(viewport3, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 328, 248); + ok(compare_color(color, 0x00ffffff, 0), "(328,248) has color %08x\n", color); + color = get_surface_color(rt, 332, 248); + ok(compare_color(color, 0x00ffffff, 0), "(332,248) has color %08x\n", color); + color = get_surface_color(rt, 328, 252); + ok(compare_color(color, 0x00ffffff, 0), "(328,252) has color %08x\n", color); + color = get_surface_color(rt, 332, 252); + ok(compare_color(color, 0x0000ff00, 0), "(332,252) has color %08x\n", color); + + color = get_surface_color(rt, 338, 248); + ok(compare_color(color, 0x00ffffff, 0), "(338,248) has color %08x\n", color); + color = get_surface_color(rt, 342, 248); + ok(compare_color(color, 0x00ffffff, 0), "(342,248) has color %08x\n", color); + color = get_surface_color(rt, 338, 252); + ok(compare_color(color, 0x0000ff00, 0), "(338,252) has color %08x\n", color); + color = get_surface_color(rt, 342, 252); + ok(compare_color(color, 0x00ffffff, 0), "(342,252) has color %08x\n", color); + + color = get_surface_color(rt, 328, 258); + ok(compare_color(color, 0x00ffffff, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 332, 258); + ok(compare_color(color, 0x0000ff00, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 328, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 332, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + color = get_surface_color(rt, 338, 258); + ok(compare_color(color, 0x0000ff00, 0), "(328,258 has color %08x\n", color); + color = get_surface_color(rt, 342, 258); + ok(compare_color(color, 0x00ffffff, 0), "(332,258) has color %08x\n", color); + color = get_surface_color(rt, 338, 262); + ok(compare_color(color, 0x00ffffff, 0), "(328,262) has color %08x\n", color); + color = get_surface_color(rt, 342, 262); + ok(compare_color(color, 0x00ffffff, 0), "(332,262) has color %08x\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d3. */ + + IDirect3DViewport3_Release(viewport3); + IDirect3DViewport3_Release(viewport2); + IDirect3DViewport3_Release(viewport); + IDirectDrawSurface4_Release(rt); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { IDirectDraw4 *ddraw; @@ -14114,4 +14289,5 @@ START_TEST(ddraw4) test_ck_operation(); test_vb_refcount(); test_compute_sphere_visibility(); + test_clear(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 91822281d0..ebcb972034 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13385,6 +13385,139 @@ static void test_clip_planes_limits(void) DestroyWindow(window); } +static void test_clear(void) +{ + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + ULONG refcount; + HWND window; + HRESULT hr; + D3DRECT rect[2]; + D3DRECT rect_negneg; + D3DCOLOR color; + D3DVIEWPORT7 vp, old_vp; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Positive x, negative y. */ + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; + + /* Positive x, positive y. */ + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; + + /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not refuse negative + * rectangles, but it will not clear them either. */ + hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* negative x, negative y. + * + * FIXME: WARP seems to clear the entire screen here.*/ + rect_negneg.x1 = 640; + rect_negneg.y1 = 240; + rect_negneg.x2 = 320; + rect_negneg.y2 = 0; + hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + color = get_surface_color(rt, 160, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3(pos, neg) has color %08x.\n", color); + color = get_surface_color(rt, 160, 120); + ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1(pos, pos) has color %08x.\n", color); + color = get_surface_color(rt, 480, 360); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(NULL) has color %08x.\n", color); + color = get_surface_color(rt, 480, 120); + ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4(neg, neg) has color %08x.\n", color); + + /* Test how the viewport affects clears */ + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetViewport(device, &old_vp); + ok(hr == D3D_OK, "Failed to get viewport, hr %#x.\n", hr); + + vp.dwX = 160; + vp.dwY = 120; + vp.dwWidth = 160; + vp.dwHeight = 120; + vp.dvMinZ = 0.0; + vp.dvMaxZ = 1.0; + hr = IDirect3DDevice7_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + vp.dwX = 320; + vp.dwY = 240; + vp.dwWidth = 320; + vp.dwHeight = 240; + vp.dvMinZ = 0.0; + vp.dvMaxZ = 1.0; + hr = IDirect3DDevice7_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + U1(rect[0]).x1 = 160; + U2(rect[0]).y1 = 120; + U3(rect[0]).x2 = 480; + U4(rect[0]).y2 = 360; + hr = IDirect3DDevice7_Clear(device, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetViewport(device, &old_vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + color = get_surface_color(rt, 158, 118); + ok(compare_color(color, 0x00ffffff, 0), "(158,118) has color %08x\n", color); + color = get_surface_color(rt, 162, 118); + ok(compare_color(color, 0x00ffffff, 0), "(162,118) has color %08x\n", color); + color = get_surface_color(rt, 158, 122); + ok(compare_color(color, 0x00ffffff, 0), "(158,122) has color %08x\n", color); + color = get_surface_color(rt, 162, 122); + ok(compare_color(color, 0x000000ff, 0), "(162,122) has color %08x\n", color); + + color = get_surface_color(rt, 318, 238); + ok(compare_color(color, 0x000000ff, 0), "(318,238) has color %08x\n", color); + color = get_surface_color(rt, 322, 238); + ok(compare_color(color, 0x00ffffff, 0), "(322,328) has color %08x\n", color); + color = get_surface_color(rt, 318, 242); + ok(compare_color(color, 0x00ffffff, 0), "(318,242) has color %08x\n", color); + color = get_surface_color(rt, 322, 242); + ok(compare_color(color, 0x0000ff00, 0), "(322,242) has color %08x\n", color); + + color = get_surface_color(rt, 478, 358); + ok(compare_color(color, 0x0000ff00, 0), "(478,358 has color %08x\n", color); + color = get_surface_color(rt, 482, 358); + ok(compare_color(color, 0x00ffffff, 0), "(482,358) has color %08x\n", color); + color = get_surface_color(rt, 478, 362); + ok(compare_color(color, 0x00ffffff, 0), "(478,362) has color %08x\n", color); + color = get_surface_color(rt, 482, 362); + ok(compare_color(color, 0x00ffffff, 0), "(482,362) has color %08x\n", color); + + /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist in d3d7. */ + + IDirectDrawSurface7_Release(rt); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -13503,4 +13636,5 @@ START_TEST(ddraw7) test_vb_refcount(); test_compute_sphere_visibility(); test_clip_planes_limits(); + test_clear(); } diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 4f6213354d..2cb1c89231 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -267,52 +267,6 @@ static void set_viewport_size(IDirect3DDevice7 *device) return; } -static void clear_test(IDirect3DDevice7 *device) -{ - /* Tests the correctness of clearing parameters */ - HRESULT hr; - D3DRECT rect[2]; - D3DRECT rect_negneg; - DWORD color; - - hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); - - /* Positive x, negative y */ - U1(rect[0]).x1 = 0; - U2(rect[0]).y1 = 480; - U3(rect[0]).x2 = 320; - U4(rect[0]).y2 = 240; - - /* Positive x, positive y */ - U1(rect[1]).x1 = 0; - U2(rect[1]).y1 = 0; - U3(rect[1]).x2 = 320; - U4(rect[1]).y2 = 240; - /* Clear 2 rectangles with one call. Shows that a positive value is returned, but the negative rectangle - * is ignored, the positive is still cleared afterwards - */ - hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); - - /* negative x, negative y */ - U1(rect_negneg).x1 = 640; - U2(rect_negneg).y1 = 240; - U3(rect_negneg).x2 = 320; - U4(rect_negneg).y2 = 0; - hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); - - color = getPixelColor(device, 160, 360); /* lower left quad */ - ok(color == 0x00ffffff, "Clear rectangle 3(pos, neg) has color %08x\n", color); - color = getPixelColor(device, 160, 120); /* upper left quad */ - ok(color == 0x00ff0000, "Clear rectangle 1(pos, pos) has color %08x\n", color); - color = getPixelColor(device, 480, 360); /* lower right quad */ - ok(color == 0x00ffffff, "Clear rectangle 4(NULL) has color %08x\n", color); - color = getPixelColor(device, 480, 120); /* upper right quad */ - ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color); -} - static void fog_test(IDirect3DDevice7 *device) { HRESULT hr; @@ -1681,7 +1635,6 @@ START_TEST(visual) /* Now run the tests */ depth_clamp_test(Direct3DDevice); - clear_test(Direct3DDevice); fog_test(Direct3DDevice); offscreen_test(Direct3DDevice); test_blend(Direct3DDevice); -- 2.13.6

3 3

[PATCH] usp10/tests: Add missing return value tests (Coverity)
by Nikolay Sivov 27 Dec '17

27 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 55bec7f74f..35cdec545b 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3150,6 +3150,7 @@ static void test_ScriptXtoX(void) WORD clust = 0; INT advance = 16; hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP() failed, hr %#x.\n", hr); ok(piCP==0 && piTrailing==1,"%i should return 0(%i) and 1(%i)\n",iX,piCP,piTrailing); } for (iX = 9; iX < 16; iX++) @@ -3157,6 +3158,7 @@ static void test_ScriptXtoX(void) WORD clust = 0; INT advance = 16; hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP() failed, hr %#x.\n", hr); ok(piCP==0 && piTrailing==0,"%i should return 0(%i) and 0(%i)\n",iX,piCP,piTrailing); } -- 2.15.1

2 1

[PATCH v3] msvcrt: Add _get_[winmajor|winminor|osver].
by Gijs Vermeulen 27 Dec '17

27 Dec '17

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Superseeds 139803. This patchset fixes the Zoo Tycoon 2 demo. Reported here: https://bugs.winehq.org/show_bug.cgi?id=26851#c14. V2: merged patches as functions are almost identical, added annotations. V3: standardized functions names (forgot MSVCRT_, sorry for the noise). dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcrt/data.c | 30 ++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 6 +++--- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index dd80131464..5aa93e510b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -548,7 +548,7 @@ @ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -@ stub _get_osver +@ cdecl _get_osver(ptr) MSVCRT__get_osver @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @@ -558,8 +558,8 @@ @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected -@ stub _get_winmajor -@ stub _get_winminor +@ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor +@ cdecl _get_winminor(ptr) MSVCRT__get_winminor @ stub _get_winver @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 5de80f419a..712b330372 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -746,3 +746,33 @@ MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void) return wide_command_line = s; } + +/********************************************************************* + * _get_winmajor (MSVCRT.@) + */ +int CDECL MSVCRT__get_winmajor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winmajor; + return 0; +} + +/********************************************************************* + * _get_winminor (MSVCRT.@) + */ +int CDECL MSVCRT__get_winminor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winminor; + return 0; +} + +/********************************************************************* + * _get_osver (MSVCRT.@) + */ +int CDECL MSVCRT__get_osver(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__osver; + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2f20699d3b..15d9ffc91c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -508,13 +508,13 @@ @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -# stub _get_osver(ptr) +@ cdecl _get_osver(ptr) MSVCRT__get_osver @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() # stub _get_wenviron(ptr) -# stub _get_winmajor(ptr) -# stub _get_winminor(ptr) +@ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor +@ cdecl _get_winminor(ptr) MSVCRT__get_winminor # stub _get_winver(ptr) @ cdecl _get_wpgmptr(ptr) @ cdecl _get_terminate() MSVCRT__get_terminate -- 2.15.1

2 1

[PATCH] testbot: Add a history record when a child process died.
by Francois Gouget 27 Dec '17

27 Dec '17

The Job scheduler may notice that a VM's child process died. In such a case add a history record so the VM's previous status record can be anotated appropriately. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index a2427cc9..4ed6e03f 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -519,6 +519,7 @@ sub ScheduleOnHost($$$$) { if (!$VM->HasRunningChild()) { + $VM->RecordResult($Records, "boterror process died"); my $ErrMessage = $VM->RunMonitor(); return $ErrMessage if (defined $ErrMessage); } diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 11f087f1..1f91d266 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -179,6 +179,7 @@ sub UpdateStatus($$) $VM->Status('dirty'); $VM->ChildPid(undef); $VM->Save(); + $VM->RecordResult(undef, "boterror process died"); } # else it looks like this is not our VM anymore -- 2.15.1

1 0

[PATCH] testbot: Add a history record when a task is canceled.
by Francois Gouget 27 Dec '17

27 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 73fc34eb..a2427cc9 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -258,6 +258,7 @@ sub Cancel($) $VM->KillChild(); ($EProperty, $EMessage) = $VM->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); + $VM->RecordResult(undef, "canceled"); } } } -- 2.15.1

1 0

[PATCH] scrrun/tests: Add some tests for ReadLine()
by Nikolay Sivov 27 Dec '17

27 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/tests/filesystem.c | 78 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index d0c448c085..fd8d0bc5ad 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2217,6 +2217,83 @@ static void test_GetSpecialFolder(void) IFolder_Release(folder); } +static void test_ReadLine(void) +{ + static const WCHAR testW[] = {'a','\r','\n','b','c','\n','d','\r','e','\n','\r','f',0}; + static const WCHAR line1W[] = {'a',0}; + static const WCHAR line2W[] = {'b','c',0}; + static const WCHAR line3W[] = {'d','\r','e',0}; + static const WCHAR line4W[] = {'\r','f',0}; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; + ITextStream *stream; + BSTR str, name; + HRESULT hr; + BOOL ret; + + get_temp_filepath(testfileW, pathW, dirW); + + ret = CreateDirectoryW(dirW, NULL); + ok(ret, "Failed to create test directory, error %d\n", GetLastError()); + + name = SysAllocString(pathW); + hr = IFileSystem3_CreateTextFile(fs3, name, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + + str = SysAllocString(testW); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "Failed to write to the stream, hr %#x.\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "Failed to open file stream, hr %#x.\n", hr); + +todo_wine { + str = NULL; + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "Failed to read text line, hr %#x.\n", hr); + ok(str != NULL, "got %p\n", str); + ok(!lstrcmpW(line1W, str), "Unexpected line %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "Failed to read text line, hr %#x.\n", hr); + ok(str != NULL, "got %p\n", str); + ok(!lstrcmpW(line2W, str), "Unexpected line %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "Failed to read text line, hr %#x.\n", hr); + ok(str != NULL, "got %p\n", str); + ok(!lstrcmpW(line3W, str), "Unexpected line %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_FALSE, "Failed to read text line, hr %#x.\n", hr); + ok(str != NULL, "got %p\n", str); + ok(!lstrcmpW(line4W, str), "Unexpected line %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + hr = ITextStream_ReadLine(stream, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + str = (void *)0xdeadbeef; + hr = ITextStream_ReadLine(stream, &str); +todo_wine + ok(hr == CTL_E_ENDOFFILE, "Unexpected hr %#x.\n", hr); + ok(!str, "Unexpected str %s\n", wine_dbgstr_w(str)); + + ITextStream_Release(stream); + + DeleteFileW(name); + RemoveDirectoryW(dirW); + SysFreeString(name); +} + START_TEST(filesystem) { HRESULT hr; @@ -2255,6 +2332,7 @@ START_TEST(filesystem) test_SerialNumber(); test_GetExtensionName(); test_GetSpecialFolder(); + test_ReadLine(); IFileSystem3_Release(fs3); -- 2.15.1

2 1

[PATCH] comctl32/tests: Enable tests for version 6 imagelist serialization format
by Nikolay Sivov 27 Dec '17

27 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 259 +++++++++++++++++++++++----------------- 1 file changed, 148 insertions(+), 111 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 566b3b5a83..e0251a9601 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -98,6 +98,11 @@ static void force_redraw(HWND hwnd) Sleep(1000); } +static BOOL is_v6_test(void) +{ + return pHIMAGELIST_QueryInterface != NULL; +} + /* These macros build cursor/bitmap data in 4x4 pixel blocks */ #define B(x,y) ((x?0xf0:0)|(y?0xf:0)) #define ROW1(a,b,c,d,e,f,g,h) B(a,b),B(c,d),B(e,f),B(g,h) @@ -739,11 +744,23 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_Write(IStream *iface, const void *p return IStream_Write(stream->stream, pv, cb, pcbWritten); } -static HRESULT STDMETHODCALLTYPE Test_Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, - DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +static HRESULT STDMETHODCALLTYPE Test_Stream_Seek(IStream *iface, LARGE_INTEGER offset, DWORD origin, + ULARGE_INTEGER *new_pos) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + struct memstream *stream = impl_from_IStream(iface); + + if (is_v6_test()) + { + ok(origin == STREAM_SEEK_CUR, "Unexpected origin %d.\n", origin); + ok(offset.QuadPart == 0, "Unexpected offset %s.\n", wine_dbgstr_longlong(offset.QuadPart)); + ok(new_pos != NULL, "Unexpected out position pointer.\n"); + return IStream_Seek(stream->stream, offset, origin, new_pos); + } + else + { + ok(0, "unexpected call\n"); + return E_NOTIMPL; + } } static HRESULT STDMETHODCALLTYPE Test_Stream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) @@ -828,15 +845,13 @@ static void cleanup_memstream(struct memstream *stream) IStream_Release(stream->stream); } - static INT DIB_GetWidthBytes( int width, int bpp ) { return ((width * bpp + 31) / 8) & ~3; } -static ULONG check_bitmap_data(const char *bm_data, ULONG bm_data_size, - INT width, INT height, INT bpp, - const char *comment) +static ULONG check_bitmap_data(const ILHEAD *header, const char *bm_data, + ULONG bm_data_size, const SIZE *bmpsize, INT bpp, const char *comment) { const BITMAPFILEHEADER *bmfh = (const BITMAPFILEHEADER *)bm_data; const BITMAPINFOHEADER *bmih = (const BITMAPINFOHEADER *)(bm_data + sizeof(*bmfh)); @@ -852,13 +867,13 @@ static ULONG check_bitmap_data(const char *bm_data, ULONG bm_data_size, ok(bmfh->bfOffBits == hdr_size, "wrong bfOffBits 0x%02x\n", bmfh->bfOffBits); ok(bmih->biSize == sizeof(*bmih), "wrong biSize %d\n", bmih->biSize); - ok(bmih->biWidth == width, "wrong biWidth %d (expected %d)\n", bmih->biWidth, width); - ok(bmih->biHeight == height, "wrong biHeight %d (expected %d)\n", bmih->biHeight, height); ok(bmih->biPlanes == 1, "wrong biPlanes %d\n", bmih->biPlanes); ok(bmih->biBitCount == bpp, "wrong biBitCount %d\n", bmih->biBitCount); image_size = DIB_GetWidthBytes(bmih->biWidth, bmih->biBitCount) * bmih->biHeight; ok(bmih->biSizeImage == image_size, "wrong biSizeImage %u\n", bmih->biSizeImage); + ok(bmih->biWidth == bmpsize->cx && bmih->biHeight == bmpsize->cy, "Unexpected bitmap size %d x %d, " + "expected %d x %d\n", bmih->biWidth, bmih->biHeight, bmpsize->cx, bmpsize->cy); if (0) { @@ -873,15 +888,23 @@ if (0) return hdr_size + image_size; } -static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT max, INT grow, INT flags) +static BOOL is_v6_header(const ILHEAD *header) { - const ILHEAD *ilh = (const ILHEAD *)ilh_data; + return (header->usVersion & 0xff00) == 0x600; +} +static void check_ilhead_data(const ILHEAD *ilh, INT cx, INT cy, INT cur, INT max, INT grow, INT flags) +{ ok(ilh->usMagic == IMAGELIST_MAGIC, "wrong usMagic %4x (expected %02x)\n", ilh->usMagic, IMAGELIST_MAGIC); - ok(ilh->usVersion == 0x101, "wrong usVersion %x (expected 0x101)\n", ilh->usVersion); + ok(ilh->usVersion == 0x101 || + ilh->usVersion == 0x600 || /* WinXP/W2k3 */ + ilh->usVersion == 0x620, "Unknown usVersion %#x.\n", ilh->usVersion); ok(ilh->cCurImage == cur, "wrong cCurImage %d (expected %d)\n", ilh->cCurImage, cur); - ok(ilh->cMaxImage == max, "wrong cMaxImage %d (expected %d)\n", ilh->cMaxImage, max); - ok(ilh->cGrow == grow, "wrong cGrow %d (expected %d)\n", ilh->cGrow, grow); + if (!is_v6_header(ilh)) + { + ok(ilh->cMaxImage == max, "wrong cMaxImage %d (expected %d)\n", ilh->cMaxImage, max); + ok(ilh->cGrow == grow, "Unexpected cGrow %d (expected %d)\n", ilh->cGrow, grow); + } ok(ilh->cx == cx, "wrong cx %d (expected %d)\n", ilh->cx, cx); ok(ilh->cy == cy, "wrong cy %d (expected %d)\n", ilh->cy, cy); ok(ilh->bkcolor == CLR_NONE, "wrong bkcolor %x\n", ilh->bkcolor); @@ -926,17 +949,36 @@ static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment return hbmp; } +static inline void imagelist_get_bitmap_size(const ILHEAD *header, SIZE *sz) +{ + const int tile_count = 4; + + if (is_v6_header(header)) + { + sz->cx = header->cx; + sz->cy = header->cMaxImage * header->cy; + } + else + { + sz->cx = header->cx * tile_count; + sz->cy = ((header->cMaxImage + tile_count - 1) / tile_count) * header->cy; + } +} + static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, INT grow, - INT width, INT height, INT flags, const char *comment) + INT flags, const char *comment) { INT ret, cxx, cyy, size; struct memstream stream; + const ILHEAD *header; LARGE_INTEGER mv; HIMAGELIST himl2; HGLOBAL hglobal; STATSTG stat; char *data; HRESULT hr; + SIZE bmpsize; + BOOL b; ret = pImageList_GetImageCount(himl); ok(ret == cur, "%s: expected image count %d got %d\n", comment, cur, ret); @@ -947,8 +989,8 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN ok(cyy == cy, "%s: wrong cy %d (expected %d)\n", comment, cyy, cy); init_memstream(&stream); - ret = pImageList_Write(himl, &stream.IStream_iface); - ok(ret, "%s: ImageList_Write failed\n", comment); + b = pImageList_Write(himl, &stream.IStream_iface); + ok(b, "%s: ImageList_Write failed\n", comment); hr = GetHGlobalFromStream(stream.stream, &hglobal); ok(hr == S_OK, "%s: Failed to get hglobal, %#x\n", comment, hr); @@ -960,14 +1002,16 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN ok(data != 0, "%s: ImageList_Write didn't write any data\n", comment); ok(stat.cbSize.LowPart > sizeof(ILHEAD), "%s: ImageList_Write wrote not enough data\n", comment); - check_ilhead_data(data, cx, cy, cur, max, grow, flags); - size = check_bitmap_data(data + sizeof(ILHEAD), stat.cbSize.LowPart - sizeof(ILHEAD), - width, height, flags & 0xfe, comment); - if (size < stat.cbSize.LowPart - sizeof(ILHEAD)) /* mask is present */ + header = (const ILHEAD *)data; + check_ilhead_data(header, cx, cy, cur, max, grow, flags); + imagelist_get_bitmap_size(header, &bmpsize); + size = check_bitmap_data(header, data + sizeof(ILHEAD), stat.cbSize.LowPart - sizeof(ILHEAD), + &bmpsize, flags & 0xfe, comment); + if (!is_v6_header(header) && size < stat.cbSize.LowPart - sizeof(ILHEAD)) /* mask is present */ { ok( flags & ILC_MASK, "%s: extra data %u/%u but mask not expected\n", comment, stat.cbSize.LowPart, size ); - check_bitmap_data(data + sizeof(ILHEAD) + size, stat.cbSize.LowPart - sizeof(ILHEAD) - size, - width, height, 1, comment); + check_bitmap_data(header, data + sizeof(ILHEAD) + size, stat.cbSize.LowPart - sizeof(ILHEAD) - size, + &bmpsize, 1, comment); } /* rewind and reconstruct from stream */ @@ -990,37 +1034,37 @@ static void image_list_init(HIMAGELIST himl) static const struct test_data { BYTE grey; - INT cx, cy, cur, max, grow, width, height, bpp; + INT cx, cy, cur, max, grow, bpp; const char *comment; } td[] = { - { 255, BMP_CX, BMP_CX, 1, 2, 4, BMP_CX * 4, BMP_CX * 1, 24, "total 1" }, - { 170, BMP_CX, BMP_CX, 2, 7, 4, BMP_CX * 4, BMP_CX * 2, 24, "total 2" }, - { 85, BMP_CX, BMP_CX, 3, 7, 4, BMP_CX * 4, BMP_CX * 2, 24, "total 3" }, - { 0, BMP_CX, BMP_CX, 4, 7, 4, BMP_CX * 4, BMP_CX * 2, 24, "total 4" }, - { 0, BMP_CX, BMP_CX, 5, 7, 4, BMP_CX * 4, BMP_CX * 2, 24, "total 5" }, - { 85, BMP_CX, BMP_CX, 6, 7, 4, BMP_CX * 4, BMP_CX * 2, 24, "total 6" }, - { 170, BMP_CX, BMP_CX, 7, 12, 4, BMP_CX * 4, BMP_CX * 3, 24, "total 7" }, - { 255, BMP_CX, BMP_CX, 8, 12, 4, BMP_CX * 4, BMP_CX * 3, 24, "total 8" }, - { 255, BMP_CX, BMP_CX, 9, 12, 4, BMP_CX * 4, BMP_CX * 3, 24, "total 9" }, - { 170, BMP_CX, BMP_CX, 10, 12, 4, BMP_CX * 4, BMP_CX * 3, 24, "total 10" }, - { 85, BMP_CX, BMP_CX, 11, 12, 4, BMP_CX * 4, BMP_CX * 3, 24, "total 11" }, - { 0, BMP_CX, BMP_CX, 12, 17, 4, BMP_CX * 4, BMP_CX * 5, 24, "total 12" }, - { 0, BMP_CX, BMP_CX, 13, 17, 4, BMP_CX * 4, BMP_CX * 5, 24, "total 13" }, - { 85, BMP_CX, BMP_CX, 14, 17, 4, BMP_CX * 4, BMP_CX * 5, 24, "total 14" }, - { 170, BMP_CX, BMP_CX, 15, 17, 4, BMP_CX * 4, BMP_CX * 5, 24, "total 15" }, - { 255, BMP_CX, BMP_CX, 16, 17, 4, BMP_CX * 4, BMP_CX * 5, 24, "total 16" }, - { 255, BMP_CX, BMP_CX, 17, 22, 4, BMP_CX * 4, BMP_CX * 6, 24, "total 17" }, - { 170, BMP_CX, BMP_CX, 18, 22, 4, BMP_CX * 4, BMP_CX * 6, 24, "total 18" }, - { 85, BMP_CX, BMP_CX, 19, 22, 4, BMP_CX * 4, BMP_CX * 6, 24, "total 19" }, - { 0, BMP_CX, BMP_CX, 20, 22, 4, BMP_CX * 4, BMP_CX * 6, 24, "total 20" }, - { 0, BMP_CX, BMP_CX, 21, 22, 4, BMP_CX * 4, BMP_CX * 6, 24, "total 21" }, - { 85, BMP_CX, BMP_CX, 22, 27, 4, BMP_CX * 4, BMP_CX * 7, 24, "total 22" }, - { 170, BMP_CX, BMP_CX, 23, 27, 4, BMP_CX * 4, BMP_CX * 7, 24, "total 23" }, - { 255, BMP_CX, BMP_CX, 24, 27, 4, BMP_CX * 4, BMP_CX * 7, 24, "total 24" } + { 255, BMP_CX, BMP_CX, 1, 2, 4, 24, "total 1" }, + { 170, BMP_CX, BMP_CX, 2, 7, 4, 24, "total 2" }, + { 85, BMP_CX, BMP_CX, 3, 7, 4, 24, "total 3" }, + { 0, BMP_CX, BMP_CX, 4, 7, 4, 24, "total 4" }, + { 0, BMP_CX, BMP_CX, 5, 7, 4, 24, "total 5" }, + { 85, BMP_CX, BMP_CX, 6, 7, 4, 24, "total 6" }, + { 170, BMP_CX, BMP_CX, 7, 12, 4, 24, "total 7" }, + { 255, BMP_CX, BMP_CX, 8, 12, 4, 24, "total 8" }, + { 255, BMP_CX, BMP_CX, 9, 12, 4, 24, "total 9" }, + { 170, BMP_CX, BMP_CX, 10, 12, 4, 24, "total 10" }, + { 85, BMP_CX, BMP_CX, 11, 12, 4, 24, "total 11" }, + { 0, BMP_CX, BMP_CX, 12, 17, 4, 24, "total 12" }, + { 0, BMP_CX, BMP_CX, 13, 17, 4, 24, "total 13" }, + { 85, BMP_CX, BMP_CX, 14, 17, 4, 24, "total 14" }, + { 170, BMP_CX, BMP_CX, 15, 17, 4, 24, "total 15" }, + { 255, BMP_CX, BMP_CX, 16, 17, 4, 24, "total 16" }, + { 255, BMP_CX, BMP_CX, 17, 22, 4, 24, "total 17" }, + { 170, BMP_CX, BMP_CX, 18, 22, 4, 24, "total 18" }, + { 85, BMP_CX, BMP_CX, 19, 22, 4, 24, "total 19" }, + { 0, BMP_CX, BMP_CX, 20, 22, 4, 24, "total 20" }, + { 0, BMP_CX, BMP_CX, 21, 22, 4, 24, "total 21" }, + { 85, BMP_CX, BMP_CX, 22, 27, 4, 24, "total 22" }, + { 170, BMP_CX, BMP_CX, 23, 27, 4, 24, "total 23" }, + { 255, BMP_CX, BMP_CX, 24, 27, 4, 24, "total 24" } }; - check_iml_data(himl, BMP_CX, BMP_CX, 0, 2, 4, BMP_CX * 4, BMP_CX * 1, ILC_COLOR24, "total 0"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 2, 4, ILC_COLOR24, "total 0"); #define add_bitmap(grey) \ sprintf(comment, "%d", n++); \ @@ -1031,8 +1075,7 @@ static void image_list_init(HIMAGELIST himl) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { add_bitmap(td[i].grey); - check_iml_data(himl, td[i].cx, td[i].cy, td[i].cur, td[i].max, td[i].grow, - td[i].width, td[i].height, td[i].bpp, td[i].comment); + check_iml_data(himl, td[i].cx, td[i].cy, td[i].cur, td[i].max, td[i].grow, td[i].bpp, td[i].comment); } #undef add_bitmap } @@ -1047,38 +1090,38 @@ static void test_imagelist_storage(void) himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 1, 1); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 2, 4, BMP_CX * 4, BMP_CX * 1, ILC_COLOR24, "empty"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 2, 4, ILC_COLOR24, "empty"); image_list_init(himl); - check_iml_data(himl, BMP_CX, BMP_CX, 24, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "orig"); + check_iml_data(himl, BMP_CX, BMP_CX, 24, 27, 4, ILC_COLOR24, "orig"); ret = pImageList_Remove(himl, 4); ok(ret, "ImageList_Remove failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 23, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "1"); + check_iml_data(himl, BMP_CX, BMP_CX, 23, 27, 4, ILC_COLOR24, "1"); ret = pImageList_Remove(himl, 5); ok(ret, "ImageList_Remove failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 22, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "2"); + check_iml_data(himl, BMP_CX, BMP_CX, 22, 27, 4, ILC_COLOR24, "2"); ret = pImageList_Remove(himl, 6); ok(ret, "ImageList_Remove failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 21, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "3"); + check_iml_data(himl, BMP_CX, BMP_CX, 21, 27, 4, ILC_COLOR24, "3"); ret = pImageList_Remove(himl, 7); ok(ret, "ImageList_Remove failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "4"); + check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, 4, ILC_COLOR24, "4"); ret = pImageList_Remove(himl, -2); ok(!ret, "ImageList_Remove(-2) should fail\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "5"); + check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, 4, ILC_COLOR24, "5"); ret = pImageList_Remove(himl, 20); ok(!ret, "ImageList_Remove(20) should fail\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "6"); + check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, 4, ILC_COLOR24, "6"); ret = pImageList_Remove(himl, -1); ok(ret, "ImageList_Remove(-1) failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 4, 4, BMP_CX * 4, BMP_CX * 1, ILC_COLOR24, "7"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 4, 4, ILC_COLOR24, "7"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); @@ -1087,165 +1130,158 @@ static void test_imagelist_storage(void) himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 0, 32); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 1, 32, BMP_CX * 4, BMP_CX * 1, ILC_COLOR24, "init 0 grow 32"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 1, 32, ILC_COLOR24, "init 0 grow 32"); hbm = create_bitmap(BMP_CX * 9, BMP_CX, 0, "9"); ret = pImageList_Add(himl, hbm, NULL); ok(ret == 0, "ImageList_Add returned %d, expected 0\n", ret); - check_iml_data(himl, BMP_CX, BMP_CX, 1, 34, 32, BMP_CX * 4, BMP_CX * 9, ILC_COLOR24, "add 1 x 9"); + check_iml_data(himl, BMP_CX, BMP_CX, 1, 34, 32, ILC_COLOR24, "add 1 x 9"); DeleteObject(hbm); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 4); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24, "init 4 grow 4"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, ILC_COLOR24, "init 4 grow 4"); hbm = create_bitmap(BMP_CX, BMP_CX * 9, 0, "9"); ret = pImageList_Add(himl, hbm, NULL); ok(ret == 0, "ImageList_Add returned %d, expected 0\n", ret); - check_iml_data(himl, BMP_CX, BMP_CX, 9, 15, 4, BMP_CX * 4, BMP_CX * 4, ILC_COLOR24, "add 9 x 1"); + check_iml_data(himl, BMP_CX, BMP_CX, 9, 15, 4, ILC_COLOR24, "add 9 x 1"); ret = pImageList_Add(himl, hbm, NULL); ok(ret == 9, "ImageList_Add returned %d, expected 9\n", ret); - check_iml_data(himl, BMP_CX, BMP_CX, 18, 25, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "add 9 x 1"); + check_iml_data(himl, BMP_CX, BMP_CX, 18, 25, 4, ILC_COLOR24, "add 9 x 1"); DeleteObject(hbm); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 207, 209); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 208, 212, BMP_CX * 4, BMP_CX * 52, ILC_COLOR24, "init 207 grow 209"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 208, 212, ILC_COLOR24, "init 207 grow 209"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 209, 207); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 210, 208, BMP_CX * 4, BMP_CX * 53, ILC_COLOR24, "init 209 grow 207"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 210, 208, ILC_COLOR24, "init 209 grow 207"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 14, 4); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 15, 4, BMP_CX * 4, BMP_CX * 4, ILC_COLOR24, "init 14 grow 4"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 15, 4, ILC_COLOR24, "init 14 grow 4"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 5, 9); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 6, 12, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24, "init 5 grow 9"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 6, 12, ILC_COLOR24, "init 5 grow 9"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 9, 5); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 10, 8, BMP_CX * 4, BMP_CX * 3, ILC_COLOR24, "init 9 grow 5"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 10, 8, ILC_COLOR24, "init 9 grow 5"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 2, 4); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 4, BMP_CX * 4, BMP_CX * 1, ILC_COLOR24, "init 2 grow 4"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 4, ILC_COLOR24, "init 2 grow 4"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24, "init 4 grow 2"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, ILC_COLOR24, "init 4 grow 2"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR8, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR8, "bpp 8"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, ILC_COLOR8, "bpp 8"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4, "bpp 4"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, ILC_COLOR4, "bpp 4"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, 0, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4, "bpp default"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, ILC_COLOR4, "bpp default"); icon = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); ok( pImageList_ReplaceIcon(himl, -1, icon) == 0, "Failed to add icon.\n"); ok( pImageList_ReplaceIcon(himl, -1, icon) == 1, "Failed to add icon.\n"); DestroyIcon( icon ); - check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4, "bpp default"); + check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, ILC_COLOR4, "bpp default"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24|ILC_MASK, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24|ILC_MASK, - "bpp 24 + mask"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, ILC_COLOR24|ILC_MASK, "bpp 24 + mask"); icon = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); ok( pImageList_ReplaceIcon(himl, -1, icon) == 0, "Failed to add icon.\n"); ok( pImageList_ReplaceIcon(himl, -1, icon) == 1, "Failed to add icon.\n"); DestroyIcon( icon ); - check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24|ILC_MASK, "bpp 24 + mask"); + check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, ILC_COLOR24|ILC_MASK, "bpp 24 + mask"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4|ILC_MASK, "bpp 4 + mask"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, ILC_COLOR4|ILC_MASK, "bpp 4 + mask"); icon = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); ok( pImageList_ReplaceIcon(himl, -1, icon) == 0, "Failed to add icon.\n"); ok( pImageList_ReplaceIcon(himl, -1, icon) == 1, "Failed to add icon.\n"); DestroyIcon( icon ); - check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4|ILC_MASK, "bpp 4 + mask"); + check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, ILC_COLOR4|ILC_MASK, "bpp 4 + mask"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 99); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 100, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, - "init 2 grow 99"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 100, ILC_COLOR4|ILC_MASK, "init 2 grow 99"); icon = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); ok( pImageList_ReplaceIcon(himl, -1, icon) == 0, "Failed to add icon.\n"); ok( pImageList_ReplaceIcon(himl, -1, icon) == 1, "Failed to add icon.\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 2, 3, 100, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, - "init 2 grow 99 2 icons"); + check_iml_data(himl, BMP_CX, BMP_CX, 2, 3, 100, ILC_COLOR4|ILC_MASK, "init 2 grow 99 2 icons"); ok( pImageList_ReplaceIcon(himl, -1, icon) == 2, "Failed to add icon\n"); DestroyIcon( icon ); - check_iml_data(himl, BMP_CX, BMP_CX, 3, 104, 100, BMP_CX * 4, BMP_CX * 104/4, ILC_COLOR4|ILC_MASK, - "init 2 grow 99 3 icons"); + check_iml_data(himl, BMP_CX, BMP_CX, 3, 104, 100, ILC_COLOR4|ILC_MASK, "init 2 grow 99 3 icons"); ok( pImageList_Remove(himl, -1) == TRUE, "Failed to remove icon.\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 100, 100, BMP_CX * 4, BMP_CX * 100/4, ILC_COLOR4|ILC_MASK, - "init 2 grow 99 empty"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 100, 100, ILC_COLOR4|ILC_MASK, "init 2 grow 99 empty"); ok( pImageList_SetImageCount(himl, 22) == TRUE, "Failed to set image count.\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 22, 23, 100, BMP_CX * 4, BMP_CX * 24/4, ILC_COLOR4|ILC_MASK, - "init 2 grow 99 set count 22"); + check_iml_data(himl, BMP_CX, BMP_CX, 22, 23, 100, ILC_COLOR4|ILC_MASK, "init 2 grow 99 set count 22"); ok( pImageList_SetImageCount(himl, 0) == TRUE, "Failed to set image count.\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 1, 100, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, - "init 2 grow 99 set count 0"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 1, 100, ILC_COLOR4|ILC_MASK, "init 2 grow 99 set count 0"); ok( pImageList_SetImageCount(himl, 42) == TRUE, "Failed to set image count.\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 42, 43, 100, BMP_CX * 4, BMP_CX * 44/4, ILC_COLOR4|ILC_MASK, - "init 2 grow 99 set count 42"); + check_iml_data(himl, BMP_CX, BMP_CX, 42, 43, 100, ILC_COLOR4|ILC_MASK, "init 2 grow 99 set count 42"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65536+12); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, -20); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 12, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, - "init 2 grow 65536+12"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 4, ILC_COLOR4|ILC_MASK, "init 2 grow -20"); ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65535); - ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 0, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, - "init 2 grow 65535"); - ret = pImageList_Destroy(himl); - ok(ret, "ImageList_Destroy failed\n"); + /* Version 6 implementation hangs on large grow values. */ + if (!is_v6_test()) + { + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65536+12); + ok(himl != 0, "ImageList_Create failed\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 12, ILC_COLOR4|ILC_MASK, "init 2 grow 65536+12"); + ret = pImageList_Destroy(himl); + ok(ret, "ImageList_Destroy failed\n"); - himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, -20); - ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 4, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, - "init 2 grow -20"); - ret = pImageList_Destroy(himl); - ok(ret, "ImageList_Destroy failed\n"); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65535); + ok(himl != 0, "ImageList_Create failed\n"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 0, ILC_COLOR4|ILC_MASK, "init 2 grow 65535"); + ret = pImageList_Destroy(himl); + ok(ret, "ImageList_Destroy failed\n"); + } } static void test_shell_imagelist(void) @@ -2390,6 +2426,7 @@ START_TEST(imagelist) test_imagecount(); test_DrawIndirect(); test_merge(); + test_imagelist_storage(); test_iconsize(); test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); -- 2.15.1

1 0

wine-2.0.4-rc2 Available
by Michael Stefaniuc 26 Dec '17

26 Dec '17

Hello guys, I have pushed wine-2.0.4-rc1 (with tag) to https://github.com/mstefani/wine-stable http://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ Changes since rc1: - Added the commit "msvcr120: Fix exception object refcounting in __ExceptionPtrAssign." bye michael

1 0

[PATCH] oledb32: Coerce Variant to VT_DATE when converting data
by Alistair Leslie-Hughes 26 Dec '17

26 Dec '17

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 267de1b..3634ef4 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((VARIANT*)src, &tmp, 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; -- 1.9.1

2 1

[PATCH] scrrun/tests: Add a helper to construct test file path
by Nikolay Sivov 26 Dec '17

26 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/tests/filesystem.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 2e3406d3ce..d0c448c085 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -46,6 +46,7 @@ static inline ULONG get_refcount(IUnknown *iface) static const WCHAR crlfW[] = {'\r','\n',0}; static const char utf16bom[] = {0xff,0xfe,0}; +static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) @@ -239,7 +240,6 @@ static void test_createfolder(void) static void test_textstream(void) { - static const WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; ITextStream *stream; VARIANT_BOOL b; DWORD written; @@ -1451,10 +1451,18 @@ static void test_DriveCollection(void) IDriveCollection_Release(drives); } -static void test_CreateTextFile(void) +static void get_temp_filepath(const WCHAR *filename, WCHAR *path, WCHAR *dir) { static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; + + GetTempPathW(MAX_PATH, path); + lstrcatW(path, scrrunW); + lstrcpyW(dir, path); + lstrcatW(path, filename); +} + +static void test_CreateTextFile(void) +{ WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; ITextStream *stream; BSTR nameW, str; @@ -1462,10 +1470,7 @@ static void test_CreateTextFile(void) HRESULT hr; BOOL ret; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); /* dir doesn't exist */ nameW = SysAllocString(pathW); @@ -1533,8 +1538,6 @@ static void test_CreateTextFile(void) static void test_WriteLine(void) { - static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; WCHAR buffW[MAX_PATH], buff2W[MAX_PATH]; char buffA[MAX_PATH]; @@ -1545,10 +1548,7 @@ static void test_WriteLine(void) HRESULT hr; BOOL ret; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError()); @@ -1607,8 +1607,6 @@ static void test_WriteLine(void) static void test_ReadAll(void) { - static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0}; static const WCHAR aW[] = {'A',0}; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; @@ -1618,10 +1616,7 @@ static void test_ReadAll(void) BOOL ret; BSTR str; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError()); @@ -1741,8 +1736,6 @@ todo_wine static void test_Read(void) { - static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0}; static const WCHAR aW[] = {'A',0}; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; @@ -1752,10 +1745,7 @@ static void test_Read(void) BOOL ret; BSTR str; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError()); -- 2.15.1

1 0

[PATCH v2] msvcrt: Add _get_[winmajor|winminor|osver].
by Gijs Vermeulen 26 Dec '17

26 Dec '17

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Superseeds 139796 to 139798. This patchset fixes the Zoo Tycoon 2 demo. Reported here: https://bugs.winehq.org/show_bug.cgi?id=26851#c14 V2: merged patches as functions are almost identical, added annotations dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcrt/data.c | 30 ++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 6 +++--- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index dd80131464..f614eb4fbd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -548,7 +548,7 @@ @ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -@ stub _get_osver +@ cdecl _get_osver(ptr) _get_osver @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @@ -558,8 +558,8 @@ @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected -@ stub _get_winmajor -@ stub _get_winminor +@ cdecl _get_winmajor(ptr) _get_winmajor +@ cdecl _get_winminor(ptr) _get_winminor @ stub _get_winver @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 5de80f419a..5885b423f1 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -746,3 +746,33 @@ MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void) return wide_command_line = s; } + +/********************************************************************* + * _get_winmajor (MSVCRT.@) + */ +int CDECL _get_winmajor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winmajor; + return 0; +} + +/********************************************************************* + * _get_winminor (MSVCRT.@) + */ +int CDECL _get_winminor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winminor; + return 0; +} + +/********************************************************************* + * _get_osver (MSVCRT.@) + */ +int CDECL _get_osver(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__osver; + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2f20699d3b..5406900e8d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -508,13 +508,13 @@ @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -# stub _get_osver(ptr) +@ cdecl _get_osver(ptr) _get_osver @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() # stub _get_wenviron(ptr) -# stub _get_winmajor(ptr) -# stub _get_winminor(ptr) +@ cdecl _get_winmajor(ptr) _get_winmajor +@ cdecl _get_winminor(ptr) _get_winminor # stub _get_winver(ptr) @ cdecl _get_wpgmptr(ptr) @ cdecl _get_terminate() MSVCRT__get_terminate -- 2.15.1

1 0

[PATCH 1/2] testbot: Add history records for mutable task results.
by Francois Gouget 26 Dec '17

26 Dec '17

When a task fails due to a transient error it is re-run and the fact that a transient error happened cannot be recovered from the final Task object. Similarly the final Task object does not clearly identify timeouts. Furthermore all one can recover from the VM status history is that a Task was run more than once but not the reason why. So save abnormal task termination information in the history record. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 20 ++++++++++++++++---- testbot/bin/WineRunReconfig.pl | 20 ++++++++++++++++---- testbot/bin/WineRunTask.pl | 19 ++++++++++++++++--- testbot/lib/WineTestBot/VMs.pm | 29 +++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 11 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index b91d594b..e4295c8e 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -45,6 +45,7 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; +use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; @@ -192,10 +193,13 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$) +sub WrapUpAndExit($;$$) { - my ($Status, $Retry) = @_; + my ($Status, $Retry, $Timeout) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; + my $VMResult = $Status eq "boterror" ? "boterror" : + $Status eq "queued" ? "error" : + $Timeout ? "timeout" : ""; my $TestFailures; my $Tries = $Task->TestFailures || 0; @@ -219,6 +223,13 @@ sub WrapUpAndExit($;$) LogTaskError("The previous $Tries run(s) terminated abnormally\n"); } + # Record result details that may be lost or overwritten by a later run + if ($VMResult) + { + $VMResult .= " $Tries $MaxTaskTries" if ($Retry); + $VM->RecordResult(undef, $VMResult); + } + # Update the Task and Job $Task->Status($Status); $Task->TestFailures($TestFailures); @@ -373,7 +384,7 @@ if (!$Pid) # log before giving up # -my ($NewStatus, $ErrMessage, $TAError); +my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -382,6 +393,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { $ErrMessage = "The build timed out\n"; $NewStatus = "badbuild"; + $TaskTimedOut = 1; } else { @@ -480,4 +492,4 @@ $TA->Disconnect(); # Wrap up # -WrapUpAndExit($NewStatus); +WrapUpAndExit($NewStatus, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index ff99fb7c..4eefa171 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -45,6 +45,7 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; +use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; @@ -192,11 +193,14 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$) +sub WrapUpAndExit($;$$) { - my ($Status, $Retry) = @_; + my ($Status, $Retry, $Timeout) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : $Status eq 'completed' ? 'idle' : 'dirty'; + my $VMResult = $Status eq "boterror" ? "boterror" : + $Status eq "queued" ? "error" : + $Timeout ? "timeout" : ""; my $TestFailures; my $Tries = $Task->TestFailures || 0; @@ -220,6 +224,13 @@ sub WrapUpAndExit($;$) LogTaskError("The previous $Tries run(s) terminated abnormally\n"); } + # Record result details that may be lost or overwritten by a later run + if ($VMResult) + { + $VMResult .= " $Tries $MaxTaskTries" if ($Retry); + $VM->RecordResult(undef, $VMResult); + } + # Update the Task and Job $Task->Status($Status); $Task->TestFailures($TestFailures); @@ -338,7 +349,7 @@ if (!$Pid) # log before giving up # -my ($NewStatus, $ErrMessage, $TAError); +my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -347,6 +358,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { $ErrMessage = "The build timed out\n"; $NewStatus = "badbuild"; + $TaskTimedOut = 1; } else { @@ -470,4 +482,4 @@ if ($NewStatus eq 'completed') # Wrap up # -WrapUpAndExit($NewStatus); +WrapUpAndExit($NewStatus, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3807a182..65faf725 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -44,6 +44,7 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; +use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; @@ -219,10 +220,13 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$$) +sub WrapUpAndExit($;$$$) { - my ($Status, $TestFailures, $Retry) = @_; + my ($Status, $TestFailures, $Retry, $Timeout) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; + my $VMResult = $Status eq "boterror" ? "boterror" : + $Status eq "queued" ? "error" : + $Timeout ? "timeout" : ""; Debug(Elapsed($Start), " Taking a screenshot\n"); TakeScreenshot($VM, $FullScreenshotFileName); @@ -248,6 +252,13 @@ sub WrapUpAndExit($;$$) LogTaskError("The previous $Tries run(s) terminated abnormally\n"); } + # Record result details that may be lost or overwritten by a later run + if ($VMResult) + { + $VMResult .= " $Tries $MaxTaskTries" if ($Retry); + $VM->RecordResult(undef, $VMResult); + } + # Update the Task and Job $Task->Status($Status); $Task->TestFailures($TestFailures); @@ -489,6 +500,7 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } } +my $TimedOut; Debug(Elapsed($Start), " Retrieving the report file to '$FullLogFileName'\n"); if ($TA->GetFile($RptFileName, $FullLogFileName)) { @@ -712,6 +724,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # so record the failure but don't add an error message. $LogFailures++; $CurrentIsBroken = 1; + $TimedOut = ($Step->Type ne "suite"); } elsif ((!$Pid and !%CurrentPids) or ($Pid and !$CurrentPids{$Pid} and !$CurrentPids{0})) @@ -767,4 +780,4 @@ FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); # Wrap up # -WrapUpAndExit($NewStatus, $TaskFailures); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut || $TimedOut); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 961be52f..2ba6b4b5 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -566,6 +566,35 @@ sub RecordStatus($$;$) } } +=pod +=over 12 + +=item C<RecordStatus()> + +Adds a Record of the specified VM process result. + +Also resets the last known VM status so a new one will be recorded even if +it matches the current one, for instance if a new revert is started after the +first one failed. + +=back +=cut + +sub RecordResult($$$) +{ + my ($self, $Records, $Result) = @_; + + if ($Records) + { + $Records->AddRecord("vmresult", $self->GetRecordName(), $Result); + } + else + { + SaveRecord("vmresult", $self->GetRecordName(), $Result); + } + delete $_VMStatuses{$self->Name}; +} + package WineTestBot::VMs; -- 2.15.1

1 1

[PATCH 1/3] msvcrt: Add _get_winmajor.
by Gijs Vermeulen 25 Dec '17

25 Dec '17

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This patchset fixes the Zoo Tycoon 2 demo. Reported here: https://bugs.winehq.org/show_bug.cgi?id=26851#c14 dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcrt/data.c | 7 +++++++ dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index dd80131464..55738a00bf 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -558,7 +558,7 @@ @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected -@ stub _get_winmajor +@ cdecl _get_winmajor(ptr) _get_winmajor @ stub _get_winminor @ stub _get_winver @ cdecl _get_wpgmptr(ptr) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 5de80f419a..39f64539c6 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -746,3 +746,10 @@ MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void) return wide_command_line = s; } + +int CDECL _get_winmajor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winmajor; + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2f20699d3b..8a88a51fcf 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -513,7 +513,7 @@ @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() # stub _get_wenviron(ptr) -# stub _get_winmajor(ptr) +@ cdecl _get_winmajor(ptr) _get_winmajor # stub _get_winminor(ptr) # stub _get_winver(ptr) @ cdecl _get_wpgmptr(ptr) -- 2.14.3 (Apple Git-98)

1 2

[PATCH] services: Avoid buffer overruns in test_runner and START_TEST.
by Gerald Pfeifer 25 Dec '17

25 Dec '17

A few days ago my GCC-based builder started picking this up, and looking into the code there is potential for an actual buffer overrun, since service_name is included into named_pipe_name together with some constants, and both originally were the same size. This fixes it by increasing the size of the second buffer which also addresses the following warnings issued by GCC: service.c: In function ‘test_runner’: service.c:541:46: warning: ‘_pipe’ directive writing 5 bytes into a region of size between 1 and 100 [-Wformat-overflow=] sprintf(named_pipe_name, "\\\\.\\pipe\\%s_pipe", service_name); ^~~~~ service.c:541:5: note: ‘sprintf’ output between 15 and 114 bytes into a destination of size ... sprintf(named_pipe_name, "\\\\.\\pipe\\%s_pipe", service_name); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ service.c: In function ‘func_service’: service.c:593:50: warning: ‘_pipe’ directive writing 5 bytes into a region of size between 1 and 100 [-Wformat-overflow=] sprintf(named_pipe_name, "\\\\.\\pipe\\%s_pipe", service_name); ^~~~~ service.c:593:9: note: ‘sprintf’ output between 15 and 114 bytes into a destination of size ... sprintf(named_pipe_name, "\\\\.\\pipe\\%s_pipe", service_name); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- programs/services/tests/service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 98419497a5..47adb1a397 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -29,7 +29,8 @@ static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); static HANDLE pipe_handle = INVALID_HANDLE_VALUE; -static char service_name[100], named_pipe_name[100]; +static char service_name[100], + named_pipe_name[114]; /* will include service_name later on */ static SERVICE_STATUS_HANDLE service_handle; /* Service process global variables */ -- 2.15.1

1 0

[PATCH] shell32: Fix SHGetFolderPathAndSubDir() trace message
by Nikolay Sivov 23 Dec '17

23 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shellpath.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 4f1cdc01b2..551fec7951 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3935,7 +3935,8 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( HRESULT hr = S_OK; LPWSTR pszSubPathW = NULL; LPWSTR pszPathW = NULL; - TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_a(pszSubPath), pszPath); if(pszPath) { pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); @@ -3988,7 +3989,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( CSIDL_Type type; int ret; - TRACE("%p,%p,nFolder=0x%04x,%s\n", hwndOwner,pszPath,nFolder,debugstr_w(pszSubPath)); + TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_w(pszSubPath), pszPath); /* Windows always NULL-terminates the resulting path regardless of success * or failure, so do so first -- 2.15.1

1 0

[PATCH] msxml3/tests: Add missing return value test (Coverity)
by Nikolay Sivov 23 Dec '17

23 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9a607e3d3c..87a885d082 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7467,6 +7467,7 @@ static void test_XSLPattern(void) ok(hr == S_OK, "query=%s, failed with 0x%08x\n", ptr->query, hr); len = 0; hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "Failed to get list length, hr %#x.\n", hr); if (*ptr->list) { ok(len != 0, "query=%s, empty list\n", ptr->query); -- 2.15.1

1 0

[PATCH] taskschd: Fix a leak on error path (Coverity)
by Nikolay Sivov 23 Dec '17

23 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/taskschd/folder_collection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 969baec831..0b2b513f27 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -239,6 +239,7 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o if (!(folders->path = heap_strdupW(path))) { heap_free(folders); + free_list(list, count); return E_OUTOFMEMORY; } folders->count = count; -- 2.15.1

1 0

[PATCH] mlang/tests: Add some return value checks (Coverity)
by Nikolay Sivov 23 Dec '17

23 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mlang/tests/mlang.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 2e3b36b03f..9727b4fbbf 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2679,8 +2679,10 @@ static void test_MapFont(IMLangFontLink *font_link, IMLangFontLink2 *font_link2) ok(ret == S_OK, "IMLangFontLink2_ResetFontMapping: expected S_OK, got %08x\n", ret); /* Show that the font cache is global */ - IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &font1); - IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &font2); + ret = IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &font1); + ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); + ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &font2); + ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); ok(font1 != NULL && font2 != NULL, "expected !NULL/!NULL, got %p/%p", font1, font2); ok(font1 == font2, "expected equal, got not equal"); -- 2.15.1

1 0

[PATCH] hlink/tests: Check return value (Coverity)
by Nikolay Sivov 23 Dec '17

23 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/hlink/tests/hlink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 835062433c..e40807cc8a 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -877,11 +877,13 @@ static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, { IBindCtx *bctx; WCHAR *name; + HRESULT hr; CHECK_EXPECT(HBC_GetObject); CreateBindCtx(0, &bctx); - IMoniker_GetDisplayName(pimk, bctx, NULL, &name); + hr = IMoniker_GetDisplayName(pimk, bctx, NULL, &name); + ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); ok(!lstrcmpW(winehq_urlW, name) || !lstrcmpW(winehq_404W, name), "got unexpected url\n"); CoTaskMemFree(name); IBindCtx_Release(bctx); -- 2.15.1

1 0

[PATCH v2] msvcrt: Don't include MSVC 10.0+ math functions in SOs for older DLLs
by Alex Henrie 22 Dec '17

22 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Added multiple #if directives instead of rearranging functions dlls/msvcrt/math.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7fb4666bef..89400f833c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -130,7 +130,7 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#ifdef _WIN64 +#if defined(_WIN64) && _MSVCR_VER>=120 /********************************************************************* * _set_FMA3_enable (MSVCR120.@) */ @@ -813,13 +813,15 @@ MSVCRT_long CDECL MSVCRT_labs( MSVCRT_long n ) return n >= 0 ? n : -n; } +#if _MSVCR_VER>=100 /********************************************************************* - * llabs (MSVCRT.@) + * llabs (MSVCR100.@) */ MSVCRT_longlong CDECL MSVCRT_llabs( MSVCRT_longlong n ) { return n >= 0 ? n : -n; } +#endif /********************************************************************* * _abs64 (MSVCRT.@) @@ -1227,6 +1229,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask return 0; } +#if _MSVCR_VER>=120 /********************************************************************* * fegetenv (MSVCR120.@) */ @@ -1237,7 +1240,9 @@ int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env) env->status = _statusfp(); return 0; } +#endif +#if _MSVCR_VER>=140 /********************************************************************* * __fpe_flt_rounds (UCRTBASE.@) */ @@ -1259,6 +1264,9 @@ int CDECL __fpe_flt_rounds(void) #endif } } +#endif + +#if _MSVCR_VER>=120 /********************************************************************* * fegetround (MSVCR120.@) @@ -1279,6 +1287,8 @@ int CDECL MSVCRT_fesetround(int round_mode) return 0; } +#endif /* _MSVCR_VER>=120 */ + /********************************************************************* * _copysign (MSVCRT.@) */ @@ -1315,6 +1325,7 @@ void CDECL _fpreset(void) #endif } +#if _MSVCR_VER>=120 /********************************************************************* * fesetenv (MSVCR120.@) */ @@ -1382,6 +1393,7 @@ int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) #endif return 1; } +#endif /********************************************************************* * _isnan (MSVCRT.@) @@ -1469,8 +1481,10 @@ double CDECL MSVCRT__yn(int order, double num) return retval; } +#if _MSVCR_VER>=120 + /********************************************************************* - * _nearbyint (MSVCRT.@) + * _nearbyint (MSVCR120.@) */ double CDECL MSVCRT_nearbyint(double num) { @@ -1482,7 +1496,7 @@ double CDECL MSVCRT_nearbyint(double num) } /********************************************************************* - * _nearbyintf (MSVCRT.@) + * _nearbyintf (MSVCR120.@) */ float CDECL MSVCRT_nearbyintf(float num) { @@ -1493,6 +1507,8 @@ float CDECL MSVCRT_nearbyintf(float num) #endif } +#endif /* _MSVCR_VER>=120 */ + /********************************************************************* * _nextafter (MSVCRT.@) */ @@ -1888,8 +1904,9 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) } #endif /* ifdef __i386__ */ +#if _MSVCR_VER>=100 /********************************************************************* - * lldiv (MSVCRT.@) + * lldiv (MSVCR100.@) */ MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) { @@ -1900,6 +1917,7 @@ MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) return ret; } +#endif #ifdef __i386__ @@ -2624,6 +2642,8 @@ MSVCRT_longlong CDECL MSVCR120_llrintl(LDOUBLE x) return MSVCR120_llrint(x); } +#if _MSVCR_VER>=120 + /********************************************************************* * round (MSVCR120.@) */ @@ -3126,6 +3146,8 @@ LDOUBLE CDECL MSVCR120_atanhl(LDOUBLE x) return MSVCR120_atanh(x); } +#endif /* _MSVCR_VER>=120 */ + /********************************************************************* * _scalb (MSVCRT.@) * scalbn (MSVCR120.@) @@ -3146,6 +3168,8 @@ float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) return MSVCRT_ldexp(num, power); } +#if _MSVCR_VER>=120 + /********************************************************************* * scalbnl (MSVCR120.@) * scalblnl (MSVCR120.@) @@ -3337,3 +3361,5 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, return res; } + +#endif /* _MSVCR_VER>=120 */ -- 2.15.1

2 1

[PATCH] V2 [cmd] - remove trailing spaces in WCMD_addComman
by Vijay Kiran Kamuju 22 Dec '17

22 Dec '17

https://bugs.winehq.org/show_bug.cgi?id=40694 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/cmd/tests/test_cmdline.cmd | 4 ++++ programs/cmd/wcmdmain.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index 32a1ef2e48f..caac7b07144 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -86,6 +86,10 @@ cmd.exe /c ECHO %%VAR%% rem - Exit works cmd.exe /c exit +rem - Change drive +cmd.exe /c C: +cmd.exe /c "C: &" +cmd.exe /c "C: > NUL" cd .. rd foobar /s /q diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 827ddd21219..f89bd04e650 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1686,9 +1686,12 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, /* Copy in the command */ if (command) { + WCHAR *tend = command + *commandLen + 1; thisEntry->command = heap_alloc((*commandLen+1) * sizeof(WCHAR)); - memcpy(thisEntry->command, command, *commandLen * sizeof(WCHAR)); - thisEntry->command[*commandLen] = 0x00; + while (tend > command && isspaceW(*tend)) tend--; + memcpy(thisEntry->command, command, (tend - command + 2) * sizeof(WCHAR)); + thisEntry->command[tend - command + 1] = 0x00; + heap_free(tend); /* Copy in the redirects */ thisEntry->redirects = heap_alloc((*redirLen+1) * sizeof(WCHAR)); -- 2.15.1

1 0

[PATCH 1/5] user32/tests: Explicitly test minimized window size.
by Zebediah Figura 22 Dec '17

22 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fc35542..c0d83ef 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6532,6 +6532,8 @@ static void test_ShowWindow(void) LPARAM ret; SetRect(&rcMain, 120, 120, 210, 210); + SetRect(&rcMinimized, -32000, -32000, -32000 + GetSystemMetrics(SM_CXMINIMIZED), + -32000 + GetSystemMetrics(SM_CYMINIMIZED)); hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | @@ -6568,8 +6570,10 @@ static void test_ShowWindow(void) ok(style & WS_VISIBLE, "window should be visible\n"); ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); - GetWindowRect(hwnd, &rcMinimized); - ok(!EqualRect(&rcMain, &rcMinimized), "rects shouldn't match\n"); + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); /* shouldn't be able to resize minimized windows */ ret = SetWindowPos(hwnd, 0, 0, 0, (rcMinimized.right - rcMinimized.left) * 2, @@ -6577,7 +6581,9 @@ static void test_ShowWindow(void) SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); ok(ret, "not expected ret: %lu\n", ret); GetWindowRect(hwnd, &rc); - ok(EqualRect(&rc, &rcMinimized), "rects should match\n"); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); @@ -6625,7 +6631,9 @@ static void test_ShowWindow(void) ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); ok(!ret, "not expected ret: %lu\n", ret); @@ -6635,7 +6643,9 @@ static void test_ShowWindow(void) ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); ret = ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); @@ -6670,9 +6680,8 @@ static void test_ShowWindow(void) ok(style & WS_MINIMIZE, "window should be minimized\n"); GetWindowRect(hwnd, &rc); todo_wine - ok((rc.left == -32000 || rc.left == 3000) && - (rc.top == -32000 || rc.top == 3000), - "expected (-32000,-32000), got (%d,%d)\n", rc.left, rc.top); + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); hwnd = CreateWindowExA(0, "MainWindowClass", NULL, @@ -6685,9 +6694,9 @@ static void test_ShowWindow(void) style = GetWindowLongA(hwnd, GWL_STYLE); ok(style & WS_MINIMIZE, "window should be minimized\n"); GetWindowRect(hwnd, &rc); - ok((rc.left == -32000 || rc.left == 3000) && - (rc.top == -32000 || rc.top == 3000), - "expected (-32000,-32000), got (%d,%d)\n", rc.left, rc.top); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); } -- 2.7.4

3 10

[PATCH] msvcrt: Don't include MSVC 10.0+ math functions in SOs for older DLLs
by Alex Henrie 22 Dec '17

22 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This decreases the compile time and the size of the compiled binaries, though admittedly not as much as I had hoped. It will make more of a difference when we implement more of the new functions. dlls/msvcrt/math.c | 408 ++++++++++++++++++++++++++++------------------------- 1 file changed, 212 insertions(+), 196 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7fb4666bef..12600e6712 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -130,17 +130,6 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#ifdef _WIN64 -/********************************************************************* - * _set_FMA3_enable (MSVCR120.@) - */ -int CDECL MSVCRT__set_FMA3_enable(int flag) -{ - FIXME("(%x) stub\n", flag); - return 0; -} -#endif - #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || _MSVCR_VER>=120 /********************************************************************* @@ -813,14 +802,6 @@ MSVCRT_long CDECL MSVCRT_labs( MSVCRT_long n ) return n >= 0 ? n : -n; } -/********************************************************************* - * llabs (MSVCRT.@) - */ -MSVCRT_longlong CDECL MSVCRT_llabs( MSVCRT_longlong n ) -{ - return n >= 0 ? n : -n; -} - /********************************************************************* * _abs64 (MSVCRT.@) */ @@ -1227,58 +1208,6 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask return 0; } -/********************************************************************* - * fegetenv (MSVCR120.@) - */ -int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env) -{ - env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | - MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); - env->status = _statusfp(); - return 0; -} - -/********************************************************************* - * __fpe_flt_rounds (UCRTBASE.@) - */ -int CDECL __fpe_flt_rounds(void) -{ - unsigned int fpc = _controlfp(0, 0) & MSVCRT__RC_CHOP; - - TRACE("()\n"); - - switch(fpc) { - case MSVCRT__RC_CHOP: return 0; - case MSVCRT__RC_NEAR: return 1; -#ifdef _WIN64 - case MSVCRT__RC_UP: return 3; - default: return 2; -#else - case MSVCRT__RC_UP: return 2; - default: return 3; -#endif - } -} - -/********************************************************************* - * fegetround (MSVCR120.@) - */ -int CDECL MSVCRT_fegetround(void) -{ - return _controlfp(0, 0) & MSVCRT__RC_CHOP; -} - -/********************************************************************* - * fesetround (MSVCR120.@) - */ -int CDECL MSVCRT_fesetround(int round_mode) -{ - if (round_mode & (~MSVCRT__RC_CHOP)) - return 1; - _controlfp(round_mode, MSVCRT__RC_CHOP); - return 0; -} - /********************************************************************* * _copysign (MSVCRT.@) */ @@ -1315,74 +1244,6 @@ void CDECL _fpreset(void) #endif } -/********************************************************************* - * fesetenv (MSVCR120.@) - */ -int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) -{ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - struct { - WORD control_word; - WORD unused1; - WORD status_word; - WORD unused2; - WORD tag_word; - WORD unused3; - DWORD instruction_pointer; - WORD code_segment; - WORD unused4; - DWORD operand_addr; - WORD data_segment; - WORD unused5; - } fenv; - - TRACE( "(%p)\n", env ); - - if (!env->control && !env->status) { - _fpreset(); - return 0; - } - - __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); - - fenv.control_word &= ~0x3d; - if (env->control & MSVCRT__EM_INVALID) fenv.control_word |= 0x1; - if (env->control & MSVCRT__EM_ZERODIVIDE) fenv.control_word |= 0x4; - if (env->control & MSVCRT__EM_OVERFLOW) fenv.control_word |= 0x8; - if (env->control & MSVCRT__EM_UNDERFLOW) fenv.control_word |= 0x10; - if (env->control & MSVCRT__EM_INEXACT) fenv.control_word |= 0x20; - - fenv.status_word &= ~0x3d; - if (env->status & MSVCRT__SW_INVALID) fenv.status_word |= 0x1; - if (env->status & MSVCRT__SW_ZERODIVIDE) fenv.status_word |= 0x4; - if (env->status & MSVCRT__SW_OVERFLOW) fenv.status_word |= 0x8; - if (env->status & MSVCRT__SW_UNDERFLOW) fenv.status_word |= 0x10; - if (env->status & MSVCRT__SW_INEXACT) fenv.status_word |= 0x20; - - __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", - "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); - - if (sse2_supported) - { - DWORD fpword; - - __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); - fpword &= ~0x1e80; - if (env->control & MSVCRT__EM_INVALID) fpword |= 0x80; - if (env->control & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; - if (env->control & MSVCRT__EM_OVERFLOW) fpword |= 0x400; - if (env->control & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; - if (env->control & MSVCRT__EM_INEXACT) fpword |= 0x1000; - __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); - } - - return 0; -#else - FIXME( "not implemented\n" ); -#endif - return 1; -} - /********************************************************************* * _isnan (MSVCRT.@) */ @@ -1469,30 +1330,6 @@ double CDECL MSVCRT__yn(int order, double num) return retval; } -/********************************************************************* - * _nearbyint (MSVCRT.@) - */ -double CDECL MSVCRT_nearbyint(double num) -{ -#ifdef HAVE_NEARBYINT - return nearbyint(num); -#else - return num >= 0 ? floor(num + 0.5) : ceil(num - 0.5); -#endif -} - -/********************************************************************* - * _nearbyintf (MSVCRT.@) - */ -float CDECL MSVCRT_nearbyintf(float num) -{ -#ifdef HAVE_NEARBYINTF - return nearbyintf(num); -#else - return MSVCRT_nearbyint(num); -#endif -} - /********************************************************************* * _nextafter (MSVCRT.@) */ @@ -1888,19 +1725,6 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) } #endif /* ifdef __i386__ */ -/********************************************************************* - * lldiv (MSVCRT.@) - */ -MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) -{ - MSVCRT_lldiv_t ret; - - ret.quot = num / denom; - ret.rem = num % denom; - - return ret; -} - #ifdef __i386__ /********************************************************************* @@ -2376,6 +2200,179 @@ void __cdecl MSVCRT___libm_sse2_sqrt_precise(void) #endif /* __i386__ */ +/********************************************************************* + * _scalb (MSVCRT.@) + * scalbn (MSVCR120.@) + * scalbln (MSVCR120.@) + */ +double CDECL MSVCRT__scalb(double num, MSVCRT_long power) +{ + return MSVCRT_ldexp(num, power); +} + +/********************************************************************* + * _scalbf (MSVCRT.@) + * scalbnf (MSVCR120.@) + * scalblnf (MSVCR120.@) + */ +float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) +{ + return MSVCRT_ldexp(num, power); +} + +#if _MSVCR_VER>=100 + +/********************************************************************* + * llabs (MSVCR100.@) + * llabs (MSVCR110.@) + * llabs (MSVCR120.@) + */ +MSVCRT_longlong CDECL MSVCRT_llabs( MSVCRT_longlong n ) +{ + return n >= 0 ? n : -n; +} + +/********************************************************************* + * lldiv (MSVCR100.@) + * lldiv (MSVCR110.@) + * lldiv (MSVCR120.@) + */ +MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) +{ + MSVCRT_lldiv_t ret; + + ret.quot = num / denom; + ret.rem = num % denom; + + return ret; +} + +#endif /* _MSVCR_VER>=100 */ + +#if _MSVCR_VER>=120 + +/********************************************************************* + * fegetenv (MSVCR120.@) + */ +int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env) +{ + env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | + MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); + env->status = _statusfp(); + return 0; +} + +/********************************************************************* + * fegetround (MSVCR120.@) + */ +int CDECL MSVCRT_fegetround(void) +{ + return _controlfp(0, 0) & MSVCRT__RC_CHOP; +} + +/********************************************************************* + * fesetround (MSVCR120.@) + */ +int CDECL MSVCRT_fesetround(int round_mode) +{ + if (round_mode & (~MSVCRT__RC_CHOP)) + return 1; + _controlfp(round_mode, MSVCRT__RC_CHOP); + return 0; +} + +/********************************************************************* + * fesetenv (MSVCR120.@) + */ +int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) +{ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + struct { + WORD control_word; + WORD unused1; + WORD status_word; + WORD unused2; + WORD tag_word; + WORD unused3; + DWORD instruction_pointer; + WORD code_segment; + WORD unused4; + DWORD operand_addr; + WORD data_segment; + WORD unused5; + } fenv; + + TRACE( "(%p)\n", env ); + + if (!env->control && !env->status) { + _fpreset(); + return 0; + } + + __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); + + fenv.control_word &= ~0x3d; + if (env->control & MSVCRT__EM_INVALID) fenv.control_word |= 0x1; + if (env->control & MSVCRT__EM_ZERODIVIDE) fenv.control_word |= 0x4; + if (env->control & MSVCRT__EM_OVERFLOW) fenv.control_word |= 0x8; + if (env->control & MSVCRT__EM_UNDERFLOW) fenv.control_word |= 0x10; + if (env->control & MSVCRT__EM_INEXACT) fenv.control_word |= 0x20; + + fenv.status_word &= ~0x3d; + if (env->status & MSVCRT__SW_INVALID) fenv.status_word |= 0x1; + if (env->status & MSVCRT__SW_ZERODIVIDE) fenv.status_word |= 0x4; + if (env->status & MSVCRT__SW_OVERFLOW) fenv.status_word |= 0x8; + if (env->status & MSVCRT__SW_UNDERFLOW) fenv.status_word |= 0x10; + if (env->status & MSVCRT__SW_INEXACT) fenv.status_word |= 0x20; + + __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", + "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); + + if (sse2_supported) + { + DWORD fpword; + + __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); + fpword &= ~0x1e80; + if (env->control & MSVCRT__EM_INVALID) fpword |= 0x80; + if (env->control & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; + if (env->control & MSVCRT__EM_OVERFLOW) fpword |= 0x400; + if (env->control & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; + if (env->control & MSVCRT__EM_INEXACT) fpword |= 0x1000; + __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); + } + + return 0; +#else + FIXME( "not implemented\n" ); +#endif + return 1; +} + +/********************************************************************* + * _nearbyint (MSVCR120.@) + */ +double CDECL MSVCRT_nearbyint(double num) +{ +#ifdef HAVE_NEARBYINT + return nearbyint(num); +#else + return num >= 0 ? floor(num + 0.5) : ceil(num - 0.5); +#endif +} + +/********************************************************************* + * _nearbyintf (MSVCR120.@) + */ +float CDECL MSVCRT_nearbyintf(float num) +{ +#ifdef HAVE_NEARBYINTF + return nearbyintf(num); +#else + return MSVCRT_nearbyint(num); +#endif +} + /********************************************************************* * cbrt (MSVCR120.@) */ @@ -3126,26 +3123,6 @@ LDOUBLE CDECL MSVCR120_atanhl(LDOUBLE x) return MSVCR120_atanh(x); } -/********************************************************************* - * _scalb (MSVCRT.@) - * scalbn (MSVCR120.@) - * scalbln (MSVCR120.@) - */ -double CDECL MSVCRT__scalb(double num, MSVCRT_long power) -{ - return MSVCRT_ldexp(num, power); -} - -/********************************************************************* - * _scalbf (MSVCRT.@) - * scalbnf (MSVCR120.@) - * scalblnf (MSVCR120.@) - */ -float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) -{ - return MSVCRT_ldexp(num, power); -} - /********************************************************************* * scalbnl (MSVCR120.@) * scalblnl (MSVCR120.@) @@ -3337,3 +3314,42 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, return res; } + +#ifdef _WIN64 +/********************************************************************* + * _set_FMA3_enable (MSVCR120.@) + */ +int CDECL MSVCRT__set_FMA3_enable(int flag) +{ + FIXME("(%x) stub\n", flag); + return 0; +} +#endif + +#endif /* _MSVCR_VER>=120 */ + +#if _MSVCR_VER>=140 + +/********************************************************************* + * __fpe_flt_rounds (UCRTBASE.@) + */ +int CDECL __fpe_flt_rounds(void) +{ + unsigned int fpc = _controlfp(0, 0) & MSVCRT__RC_CHOP; + + TRACE("()\n"); + + switch(fpc) { + case MSVCRT__RC_CHOP: return 0; + case MSVCRT__RC_NEAR: return 1; +#ifdef _WIN64 + case MSVCRT__RC_UP: return 3; + default: return 2; +#else + case MSVCRT__RC_UP: return 2; + default: return 3; +#endif + } +} + +#endif /* _MSVCR_VER>=140 */ -- 2.15.1

2 1

[PATCH] winhttp/tests: Fix typos in ok() messages.
by Andrey Gusev 22 Dec '17

22 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 702c6a1bcc..da8f8e9bd9 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -944,7 +944,7 @@ static void _read_request_data(struct test_request *req, struct info *info, cons WaitForSingleObject( info->wait, INFINITE ); len = strlen(expected_data); - ok(!memcmp(buffer, expected_data, len), "unexpeceted data\n"); + ok(!memcmp(buffer, expected_data, len), "unexpected data\n"); } static void test_persistent_connection(int port) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 469b882bec..ec33b56d1f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -568,7 +568,7 @@ static void test_WinHttpAddHeaders(void) SetLastError(0xdeadbeef); ret = WinHttpAddRequestHeaders(request, test_headers[0], -1L, WINHTTP_ADDREQ_FLAG_ADD); err = GetLastError(); - ok(ret, "WinHttpAddRequestHeader failed to add new header, got %d with error %u.\n", ret, err); + ok(ret, "WinHttpAddRequestHeaders failed to add new header, got %d with error %u.\n", ret, err); ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); index = 0; -- 2.13.6

2 1

[PATCH] msi/tests: Fix typos in ok() messages.
by Andrey Gusev 22 Dec '17

22 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/msi/tests/db.c | 2 +- dlls/msi/tests/record.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6713bc0b2d..3cbb9b3e28 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4777,7 +4777,7 @@ static void test_update(void) MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); - ok(r == ERROR_NO_MORE_ITEMS, "Expectd ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); MsiViewClose(view); MsiCloseHandle(view); diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 5caaefc72d..777f1f78ed 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -510,7 +510,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expectd 0, got %d\n", sz); + ok(sz == 0, "Expected 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == TRUE, "Expected TRUE, got %d\n", r); @@ -529,7 +529,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expectd 0, got %d\n", sz); + ok(sz == 0, "Expected 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == TRUE, "Expected TRUE, got %d\n", r); @@ -548,7 +548,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expectd 0, got %d\n", sz); + ok(sz == 0, "Expected 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == TRUE, "Expected TRUE, got %d\n", r); @@ -558,7 +558,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "bologna"), "Expected \"bologna\", got \"%s\"\n", buf); - ok(sz == 7, "Expectd 7, got %d\n", sz); + ok(sz == 7, "Expected 7, got %d\n", sz); MsiCloseHandle(rec); @@ -599,7 +599,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "drone"), "Expected \"drone\", got \"%s\"\n", buf); - ok(sz == 5, "Expectd 5, got %d\n", sz); + ok(sz == 5, "Expected 5, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == FALSE, "Expected FALSE, got %d\n", r); -- 2.13.6

2 1

[PATCH] winhttp/tests: Fix an intermittent test failure on Windows XP/Vista.
by Hans Leidekker 22 Dec '17

22 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 469b882bec..1529227ed3 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -319,7 +319,7 @@ static void test_SendRequest (void) static CHAR post_data[] = "mode=Test"; static const char test_post[] = "mode => Test\0\n"; HINTERNET session, request, connection; - DWORD header_len, optional_len, total_len, bytes_rw, size, err; + DWORD header_len, optional_len, total_len, bytes_rw, size, err, disable; DWORD_PTR context; BOOL ret; CHAR buffer[256]; @@ -350,6 +350,12 @@ static void test_SendRequest (void) ret = WinHttpSetOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context)); ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + /* writing more data than promised by the content-length header causes an error when the connection + is resued, so disable keep-alive */ + disable = WINHTTP_DISABLE_KEEP_ALIVE; + ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &disable, sizeof(disable)); + ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + context++; ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, context); err = GetLastError(); -- 2.11.0

1 0

[PATCH] [cmd] - remove trailing spaces in WCMD_addCommand
by Vijay Kiran Kamuju 22 Dec '17

22 Dec '17

Fixes https://bugs.winehq.org/show_bug.cgi?id=44133 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 0609bb7f3fb..3b0a4b5f0c3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1470,7 +1470,7 @@ BOOL WCMD_delete (WCHAR *args) { * Pre: s non NULL * */ -static WCHAR *WCMD_strtrim(const WCHAR *s) +WCHAR *WCMD_strtrim(const WCHAR *s) { DWORD len = strlenW(s); const WCHAR *start = s; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d4d97a0067e..321b9263a06 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -112,6 +112,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdli WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdline, const WCHAR *delims); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); +WCHAR *WCMD_strtrim(const WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 827ddd21219..f4729448b27 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1680,15 +1680,17 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, CMD_LIST **lastEntry, CMD_LIST **output) { CMD_LIST *thisEntry = NULL; + WCHAR *trimcmd = WCMD_strtrim(command); + int trimlen = strlenW(trimcmd); /* Allocate storage for command */ thisEntry = heap_alloc(sizeof(CMD_LIST)); /* Copy in the command */ if (command) { - thisEntry->command = heap_alloc((*commandLen+1) * sizeof(WCHAR)); - memcpy(thisEntry->command, command, *commandLen * sizeof(WCHAR)); - thisEntry->command[*commandLen] = 0x00; + thisEntry->command = heap_alloc((trimlen+1) * sizeof(WCHAR)); + memcpy(thisEntry->command, trimcmd, trimlen * sizeof(WCHAR)); + thisEntry->command[trimlen] = 0x00; /* Copy in the redirects */ thisEntry->redirects = heap_alloc((*redirLen+1) * sizeof(WCHAR)); -- 2.15.1

2 1

[PATCH v2] regedit/tests: Skip tests if running as non-elevated admin.
by Zebediah Figura 22 Dec '17

22 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/regedit/tests/regedit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d558f2b..c8f3434 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3635,6 +3635,12 @@ START_TEST(regedit) return; } + if (!run_regedit_exe("regedit.exe /s test.reg") && GetLastError() == ERROR_ELEVATION_REQUIRED) + { + win_skip("User is a non-elevated admin; skipping regedit tests.\n"); + return; + } + test_basic_import(); test_basic_import_unicode(); test_basic_import_31(); -- 2.7.4

1 0

[PATCH] regedit/tests: Skip tests if running as non-elevated admin.
by Zebediah Figura 22 Dec '17

22 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/regedit/tests/regedit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d558f2b..c8f3434 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3635,6 +3635,12 @@ START_TEST(regedit) return; } + if (!run_regedit_exe("regedit.exe") && GetLastError() == ERROR_ELEVATION_REQUIRED) + { + win_skip("User is a non-elevated admin; skipping regedit tests.\n"); + return; + } + test_basic_import(); test_basic_import_unicode(); test_basic_import_31(); -- 2.7.4

2 2

[PATCH] kernel32/tests: Fix a typo in ok() message.
by Andrey Gusev 22 Dec '17

22 Dec '17

For bug 44161. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/tests/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 91eb162ebd..365e38c444 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -260,7 +260,7 @@ static void test_GetVolumeNameForVolumeMountPointW(void) } ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0); - ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointW succeeded\n"); ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE || GetLastError() == ERROR_INVALID_PARAMETER, /* Vista */ "wrong error, last=%d\n", GetLastError()); -- 2.13.6

1 0

[PATCH] comctl32/tests: Fix a typo in ok() message.
by Andrey Gusev 22 Dec '17

22 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/comctl32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index a6939bdb71..46bb431037 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -194,7 +194,7 @@ static void test_Alloc(void) /* reallocate a NULL ptr */ p = pReAlloc(NULL, 2); - ok(p != NULL, "Expectd non-NULL ptr\n"); + ok(p != NULL, "Expected non-NULL ptr\n"); res = pFree(p); ok(res == TRUE, "Expected TRUE, got %d\n", res); -- 2.13.6

1 0

[PATCH] include: Fix a typo in newly added edit control message.
by Akihiro Sagawa 22 Dec '17

22 Dec '17

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- include/commctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] comctl32/tests: Make sure v6 module is used when running tests, run more tests with v6 module
by Nikolay Sivov 22 Dec '17

22 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 619 +++++++++++++++++++--------------------- 1 file changed, 291 insertions(+), 328 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index a489176e01..566b3b5a83 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -61,6 +61,7 @@ typedef struct _ILHEAD #include "poppack.h" static HIMAGELIST (WINAPI *pImageList_Create)(int, int, UINT, int, int); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); static int (WINAPI *pImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); static BOOL (WINAPI *pImageList_DrawIndirect)(IMAGELISTDRAWPARAMS*); static BOOL (WINAPI *pImageList_SetImageCount)(HIMAGELIST,UINT); @@ -69,6 +70,21 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static int (WINAPI *pImageList_SetColorTable)(HIMAGELIST,int,int,RGBQUAD*); static DWORD (WINAPI *pImageList_GetFlags)(HIMAGELIST); +static BOOL (WINAPI *pImageList_BeginDrag)(HIMAGELIST, int, int, int); +static HIMAGELIST (WINAPI *pImageList_GetDragImage)(POINT *, POINT *); +static void (WINAPI *pImageList_EndDrag)(void); +static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); +static BOOL (WINAPI *pImageList_SetDragCursorImage)(HIMAGELIST, int, int, int); +static BOOL (WINAPI *pImageList_GetIconSize)(HIMAGELIST, int *, int *); +static BOOL (WINAPI *pImageList_Remove)(HIMAGELIST, int); +static INT (WINAPI *pImageList_ReplaceIcon)(HIMAGELIST, int, HICON); +static BOOL (WINAPI *pImageList_Replace)(HIMAGELIST, int, HBITMAP, HBITMAP); +static HIMAGELIST (WINAPI *pImageList_Merge)(HIMAGELIST, int, HIMAGELIST, int, int, int); +static BOOL (WINAPI *pImageList_GetImageInfo)(HIMAGELIST, int, IMAGEINFO *); +static BOOL (WINAPI *pImageList_Write)(HIMAGELIST, IStream *); +static HIMAGELIST (WINAPI *pImageList_Read)(IStream *); +static BOOL (WINAPI *pImageList_Copy)(HIMAGELIST, int, HIMAGELIST, int, UINT); +static HIMAGELIST (WINAPI *pImageList_LoadImageW)(HINSTANCE, LPCWSTR, int, int, COLORREF, UINT, UINT); static HINSTANCE hinst; @@ -125,14 +141,16 @@ static const BYTE bitmap_bits[48*48/8] = static HIMAGELIST createImageList(int cx, int cy) { /* Create an ImageList and put an image into it */ - HIMAGELIST himl = ImageList_Create(cx, cy, ILC_COLOR, 1, 1); + HIMAGELIST himl = pImageList_Create(cx, cy, ILC_COLOR, 1, 1); HBITMAP hbm = CreateBitmap(48, 48, 1, 1, bitmap_bits); - ImageList_Add(himl, hbm, NULL); + + ok(himl != NULL, "Failed to create image list, %d x %d.\n", cx, cy); + pImageList_Add(himl, hbm, NULL); DeleteObject(hbm); return himl; } -static HWND create_a_window(void) +static HWND create_window(void) { char className[] = "bmwnd"; char winName[] = "Test Bitmap"; @@ -259,41 +277,41 @@ static void test_begindrag(void) int count; POINT hotspot; - count = ImageList_GetImageCount(himl); + count = pImageList_GetImageCount(himl); ok(count > 2, "Tests need an ImageList with more than 2 images\n"); /* Two BeginDrag() without EndDrag() in between */ - ret = ImageList_BeginDrag(himl, 1, 0, 0); - drag = ImageList_GetDragImage(NULL, NULL); + ret = pImageList_BeginDrag(himl, 1, 0, 0); + drag = pImageList_GetDragImage(NULL, NULL); ok(ret && drag, "ImageList_BeginDrag() failed\n"); - ret = ImageList_BeginDrag(himl, 0, 3, 5); + ret = pImageList_BeginDrag(himl, 0, 3, 5); ok(!ret, "ImageList_BeginDrag() returned TRUE\n"); - drag = ImageList_GetDragImage(NULL, &hotspot); + drag = pImageList_GetDragImage(NULL, &hotspot); ok(!!drag, "No active ImageList drag left\n"); ok(hotspot.x == 0 && hotspot.y == 0, "New ImageList drag was created\n"); - ImageList_EndDrag(); - drag = ImageList_GetDragImage(NULL, NULL); + pImageList_EndDrag(); + drag = pImageList_GetDragImage(NULL, NULL); ok(!drag, "ImageList drag was not destroyed\n"); /* Invalid image index */ - ImageList_BeginDrag(himl, 0, 0, 0); - ret = ImageList_BeginDrag(himl, count, 3, 5); + pImageList_BeginDrag(himl, 0, 0, 0); + ret = pImageList_BeginDrag(himl, count, 3, 5); ok(!ret, "ImageList_BeginDrag() returned TRUE\n"); - drag = ImageList_GetDragImage(NULL, &hotspot); + drag = pImageList_GetDragImage(NULL, &hotspot); ok(drag && hotspot.x == 0 && hotspot.y == 0, "Active drag should not have been canceled\n"); - ImageList_EndDrag(); - drag = ImageList_GetDragImage(NULL, NULL); + pImageList_EndDrag(); + drag = pImageList_GetDragImage(NULL, NULL); ok(!drag, "ImageList drag was not destroyed\n"); /* Invalid negative image indexes succeed */ - ret = ImageList_BeginDrag(himl, -17, 0, 0); - drag = ImageList_GetDragImage(NULL, NULL); + ret = pImageList_BeginDrag(himl, -17, 0, 0); + drag = pImageList_GetDragImage(NULL, NULL); ok(ret && drag, "ImageList drag was created\n"); - ImageList_EndDrag(); - ret = ImageList_BeginDrag(himl, -1, 0, 0); - drag = ImageList_GetDragImage(NULL, NULL); + pImageList_EndDrag(); + ret = pImageList_BeginDrag(himl, -1, 0, 0); + drag = pImageList_GetDragImage(NULL, NULL); ok(ret && drag, "ImageList drag was created\n"); - ImageList_EndDrag(); - ImageList_Destroy(himl); + pImageList_EndDrag(); + pImageList_Destroy(himl); } static void test_hotspot(void) @@ -317,7 +335,7 @@ static void test_hotspot(void) int i, j, ret; HIMAGELIST himl1 = createImageList(SIZEX1, SIZEY1); HIMAGELIST himl2 = createImageList(SIZEX2, SIZEY2); - HWND hwnd = create_a_window(); + HWND hwnd = create_window(); for (i = 0; i < HOTSPOTS_MAX; i++) { @@ -331,25 +349,25 @@ static void test_hotspot(void) HIMAGELIST himlNew; POINT ppt; - ret = ImageList_BeginDrag(himl1, 0, dx1, dy1); + ret = pImageList_BeginDrag(himl1, 0, dx1, dy1); ok(ret != 0, "BeginDrag failed for { %d, %d }\n", dx1, dy1); sprintf(loc, "BeginDrag (%d,%d)\n", i, j); show_image(hwnd, himl1, 0, max(SIZEX1, SIZEY1), loc, TRUE); /* check merging the dragged image with a second image */ - ret = ImageList_SetDragCursorImage(himl2, 0, dx2, dy2); + ret = pImageList_SetDragCursorImage(himl2, 0, dx2, dy2); ok(ret != 0, "SetDragCursorImage failed for {%d, %d}{%d, %d}\n", dx1, dy1, dx2, dy2); sprintf(loc, "SetDragCursorImage (%d,%d)\n", i, j); show_image(hwnd, himl2, 0, max(SIZEX2, SIZEY2), loc, TRUE); /* check new hotspot, it should be the same like the old one */ - himlNew = ImageList_GetDragImage(NULL, &ppt); + himlNew = pImageList_GetDragImage(NULL, &ppt); ok(ppt.x == dx1 && ppt.y == dy1, "Expected drag hotspot [%d,%d] got [%d,%d]\n", dx1, dy1, ppt.x, ppt.y); /* check size of new dragged image */ - ImageList_GetIconSize(himlNew, &newx, &newy); + pImageList_GetIconSize(himlNew, &newx, &newy); correctx = max(SIZEX1, max(SIZEX2 + dx2, SIZEX1 - dx2)); correcty = max(SIZEY1, max(SIZEY2 + dy2, SIZEY1 - dy2)); ok(newx == correctx && newy == correcty, @@ -357,7 +375,7 @@ static void test_hotspot(void) correctx, correcty, newx, newy); sprintf(loc, "GetDragImage (%d,%d)\n", i, j); show_image(hwnd, himlNew, 0, max(correctx, correcty), loc, TRUE); - ImageList_EndDrag(); + pImageList_EndDrag(); } } #undef SIZEX1 @@ -365,8 +383,8 @@ static void test_hotspot(void) #undef SIZEX2 #undef SIZEY2 #undef HOTSPOTS_MAX - ImageList_Destroy(himl2); - ImageList_Destroy(himl1); + pImageList_Destroy(himl2); + pImageList_Destroy(himl1); DestroyWindow(hwnd); } @@ -379,7 +397,7 @@ static void test_add_remove(void) HICON hicon3 ; /* create an imagelist to play with */ - himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); + himl = pImageList_Create(84, 84, ILC_COLOR16, 0, 3); ok(himl!=0,"failed to create imagelist\n"); /* load the icons to add to the image list */ @@ -391,41 +409,41 @@ static void test_add_remove(void) ok(hicon3 != 0, "no hicon3\n"); /* remove when nothing exists */ - ok(!ImageList_Remove(himl,0),"removed nonexistent icon\n"); + ok(!pImageList_Remove(himl, 0), "Removed nonexistent icon.\n"); /* removing everything from an empty imagelist should succeed */ - ok(ImageList_RemoveAll(himl),"removed nonexistent icon\n"); + ok(pImageList_Remove(himl, -1), "Removed nonexistent icon\n"); /* add three */ - ok(0==ImageList_AddIcon(himl, hicon1),"failed to add icon1\n"); - ok(1==ImageList_AddIcon(himl, hicon2),"failed to add icon2\n"); - ok(2==ImageList_AddIcon(himl, hicon3),"failed to add icon3\n"); + ok(0 == pImageList_ReplaceIcon(himl, -1, hicon1), "Failed to add icon1.\n"); + ok(1 == pImageList_ReplaceIcon(himl, -1, hicon2), "Failed to add icon2.\n"); + ok(2 == pImageList_ReplaceIcon(himl, -1, hicon3), "Failed to add icon3.\n"); /* remove an index out of range */ - ok(!ImageList_Remove(himl,4711),"removed nonexistent icon\n"); + ok(!pImageList_Remove(himl, 4711), "removed nonexistent icon\n"); /* remove three */ - ok(ImageList_Remove(himl,0),"can't remove 0\n"); - ok(ImageList_Remove(himl,0),"can't remove 0\n"); - ok(ImageList_Remove(himl,0),"can't remove 0\n"); + ok(pImageList_Remove(himl, 0), "Can't remove 0\n"); + ok(pImageList_Remove(himl, 0), "Can't remove 0\n"); + ok(pImageList_Remove(himl, 0), "Can't remove 0\n"); /* remove one extra */ - ok(!ImageList_Remove(himl,0),"removed nonexistent icon\n"); + ok(!pImageList_Remove(himl, 0), "Removed nonexistent icon.\n"); /* destroy it */ - ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); + ok(pImageList_Destroy(himl), "Failed to destroy imagelist.\n"); - ok(-1==ImageList_AddIcon((HIMAGELIST)0xdeadbeef, hicon1),"don't crash on bad handle\n"); + ok(-1 == pImageList_ReplaceIcon((HIMAGELIST)0xdeadbeef, -1, hicon1), "Don't crash on bad handle\n"); - ok(DestroyIcon(hicon1),"icon 1 wasn't deleted\n"); - ok(DestroyIcon(hicon2),"icon 2 wasn't deleted\n"); - ok(DestroyIcon(hicon3),"icon 3 wasn't deleted\n"); + ok(DestroyIcon(hicon1), "Failed to destroy icon 1.\n"); + ok(DestroyIcon(hicon2), "Failed to destroy icon 2.\n"); + ok(DestroyIcon(hicon3), "Failed to destroy icon 3.\n"); } static void test_imagecount(void) { HIMAGELIST himl; - ok(0==ImageList_GetImageCount((HIMAGELIST)0xdeadbeef),"don't crash on bad handle\n"); + ok(0 == pImageList_GetImageCount((HIMAGELIST)0xdeadbeef), "don't crash on bad handle\n"); if (!pImageList_SetImageCount) { @@ -433,17 +451,17 @@ static void test_imagecount(void) return; } - himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); - ok(himl!=0,"failed to create imagelist\n"); + himl = pImageList_Create(84, 84, ILC_COLOR16, 0, 3); + ok(himl != 0, "Failed to create imagelist.\n"); ok(pImageList_SetImageCount(himl, 3), "couldn't increase image count\n"); - ok(ImageList_GetImageCount(himl) == 3, "invalid image count after increase\n"); + ok(pImageList_GetImageCount(himl) == 3, "invalid image count after increase\n"); ok(pImageList_SetImageCount(himl, 1), "couldn't decrease image count\n"); - ok(ImageList_GetImageCount(himl) == 1, "invalid image count after decrease to 1\n"); + ok(pImageList_GetImageCount(himl) == 1, "invalid image count after decrease to 1\n"); ok(pImageList_SetImageCount(himl, 0), "couldn't decrease image count\n"); - ok(ImageList_GetImageCount(himl) == 0, "invalid image count after decrease to 0\n"); + ok(pImageList_GetImageCount(himl) == 0, "invalid image count after decrease to 0\n"); - ok(ImageList_Destroy(himl), "destroy imagelist failed\n"); + ok(pImageList_Destroy(himl), "Failed to destroy imagelist.\n"); } static void test_DrawIndirect(void) @@ -464,13 +482,13 @@ static void test_DrawIndirect(void) return; } - hwndfortest = create_a_window(); + hwndfortest = create_window(); hdc = GetDC(hwndfortest); ok(hdc!=NULL, "couldn't get DC\n"); /* create an imagelist to play with */ - himl = ImageList_Create(48, 48, ILC_COLOR16, 0, 3); - ok(himl!=0,"failed to create imagelist\n"); + himl = pImageList_Create(48, 48, ILC_COLOR16, 0, 3); + ok(himl != 0, "Failed to create imagelist.\n"); /* load the icons to add to the image list */ hbm1 = CreateBitmap(48, 48, 1, 1, bitmap_bits); @@ -481,14 +499,14 @@ static void test_DrawIndirect(void) ok(hbm3 != 0, "no bitmap 3\n"); /* add three */ - ok(0==ImageList_Add(himl, hbm1, 0),"failed to add bitmap 1\n"); - ok(1==ImageList_Add(himl, hbm2, 0),"failed to add bitmap 2\n"); + ok(0 == ImageList_Add(himl, hbm1, 0),"failed to add bitmap 1\n"); + ok(1 == ImageList_Add(himl, hbm2, 0),"failed to add bitmap 2\n"); if (pImageList_SetImageCount) { ok(pImageList_SetImageCount(himl,3),"Setimage count failed\n"); /*ok(2==ImageList_Add(himl, hbm3, NULL),"failed to add bitmap 3\n"); */ - ok(ImageList_Replace(himl, 2, hbm3, 0),"failed to replace bitmap 3\n"); + ok(pImageList_Replace(himl, 2, hbm3, 0),"failed to replace bitmap 3\n"); } memset(&imldp, 0, sizeof (imldp)); @@ -517,12 +535,12 @@ static void test_DrawIndirect(void) ok(!pImageList_DrawIndirect(&imldp),"should fail\n"); /* remove three */ - ok(ImageList_Remove(himl, 0), "removing 1st bitmap\n"); - ok(ImageList_Remove(himl, 0), "removing 2nd bitmap\n"); - ok(ImageList_Remove(himl, 0), "removing 3rd bitmap\n"); + ok(pImageList_Remove(himl, 0), "removing 1st bitmap\n"); + ok(pImageList_Remove(himl, 0), "removing 2nd bitmap\n"); + ok(pImageList_Remove(himl, 0), "removing 3rd bitmap\n"); /* destroy it */ - ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); + ok(pImageList_Destroy(himl), "Failed to destroy imagelist.\n"); /* bitmaps should not be deleted by the imagelist */ ok(DeleteObject(hbm1),"bitmap 1 can't be deleted\n"); @@ -563,12 +581,12 @@ static void test_merge_colors(void) for (i = 0; i < 8; i++) { - himl[i] = ImageList_Create(32, 32, sizes[i], 0, 3); + himl[i] = pImageList_Create(32, 32, sizes[i], 0, 3); ok(himl[i] != NULL, "failed to create himl[%d]\n", i); - ok(0 == ImageList_AddIcon(himl[i], hicon1), "add icon1 to himl[%d] failed\n", i); + ok(0 == pImageList_ReplaceIcon(himl[i], -1, hicon1), "Failed to add icon1 to himl[%d].\n", i); if (i == 0 || i == 1 || i == 7) { - ImageList_GetImageInfo(himl[i], 0, &info); + pImageList_GetImageInfo(himl[i], 0, &info); sizes[i] = get_color_format(info.hbmImage); } } @@ -576,10 +594,10 @@ static void test_merge_colors(void) for (i = 0; i < 8; i++) for (j = 0; j < 8; j++) { - hmerge = ImageList_Merge(himl[i], 0, himl[j], 0, 0, 0); + hmerge = pImageList_Merge(himl[i], 0, himl[j], 0, 0, 0); ok(hmerge != NULL, "merge himl[%d], himl[%d] failed\n", i, j); - ImageList_GetImageInfo(hmerge, 0, &info); + pImageList_GetImageInfo(hmerge, 0, &info); bpp = get_color_format(info.hbmImage); /* ILC_COLOR[X] is defined as [X] */ if (i == 4 && j == 7) @@ -590,23 +608,23 @@ static void test_merge_colors(void) "wrong biBitCount %d when merging lists %d (%d) and %d (%d)\n", bpp, i, sizes[i], j, sizes[j]); ok(info.hbmMask != 0, "Imagelist merged from %d and %d had no mask\n", i, j); - if (hmerge) ImageList_Destroy(hmerge); + pImageList_Destroy(hmerge); } for (i = 0; i < 8; i++) - ImageList_Destroy(himl[i]); + pImageList_Destroy(himl[i]); } static void test_merge(void) { HIMAGELIST himl1, himl2, hmerge; HICON hicon1; - HWND hwnd = create_a_window(); + HWND hwnd = create_window(); - himl1 = ImageList_Create(32,32,0,0,3); + himl1 = pImageList_Create(32, 32, 0, 0, 3); ok(himl1 != NULL,"failed to create himl1\n"); - himl2 = ImageList_Create(32,32,0,0,3); + himl2 = pImageList_Create(32, 32, 0, 0, 3); ok(himl2 != NULL,"failed to create himl2\n"); hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); @@ -615,60 +633,60 @@ static void test_merge(void) if (!himl1 || !himl2 || !hicon1) return; - ok(0==ImageList_AddIcon(himl2, hicon1),"add icon1 to himl2 failed\n"); + ok(0 == pImageList_ReplaceIcon(himl2, -1, hicon1), "Failed to add icon1 to himl2.\n"); check_bits(hwnd, himl2, 0, 32, icon_bits, "add icon1 to himl2"); /* If himl1 has no images, merge still succeeds */ - hmerge = ImageList_Merge(himl1, -1, himl2, 0, 0, 0); + hmerge = pImageList_Merge(himl1, -1, himl2, 0, 0, 0); ok(hmerge != NULL, "merge himl1,-1 failed\n"); check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl1,-1"); - if (hmerge) ImageList_Destroy(hmerge); + pImageList_Destroy(hmerge); - hmerge = ImageList_Merge(himl1, 0, himl2, 0, 0, 0); + hmerge = pImageList_Merge(himl1, 0, himl2, 0, 0, 0); ok(hmerge != NULL,"merge himl1,0 failed\n"); check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl1,0"); - if (hmerge) ImageList_Destroy(hmerge); + pImageList_Destroy(hmerge); /* Same happens if himl2 is empty */ - ImageList_Destroy(himl2); - himl2 = ImageList_Create(32,32,0,0,3); + pImageList_Destroy(himl2); + himl2 = pImageList_Create(32, 32, 0, 0, 3); ok(himl2 != NULL,"failed to recreate himl2\n"); if (!himl2) return; - hmerge = ImageList_Merge(himl1, -1, himl2, -1, 0, 0); + hmerge = pImageList_Merge(himl1, -1, himl2, -1, 0, 0); ok(hmerge != NULL, "merge himl2,-1 failed\n"); check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl2,-1"); - if (hmerge) ImageList_Destroy(hmerge); + pImageList_Destroy(hmerge); - hmerge = ImageList_Merge(himl1, -1, himl2, 0, 0, 0); + hmerge = pImageList_Merge(himl1, -1, himl2, 0, 0, 0); ok(hmerge != NULL, "merge himl2,0 failed\n"); check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl2,0"); - if (hmerge) ImageList_Destroy(hmerge); + pImageList_Destroy(hmerge); /* Now try merging an image with itself */ - ok(0==ImageList_AddIcon(himl2, hicon1),"re-add icon1 to himl2 failed\n"); + ok(0 == pImageList_ReplaceIcon(himl2, -1, hicon1), "Failed to re-add icon1 to himl2.\n"); - hmerge = ImageList_Merge(himl2, 0, himl2, 0, 0, 0); + hmerge = pImageList_Merge(himl2, 0, himl2, 0, 0, 0); ok(hmerge != NULL, "merge himl2 with itself failed\n"); check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl2 with itself"); - if (hmerge) ImageList_Destroy(hmerge); + pImageList_Destroy(hmerge); /* Try merging 2 different image lists */ - ok(0==ImageList_AddIcon(himl1, hicon1),"add icon1 to himl1 failed\n"); + ok(0 == pImageList_ReplaceIcon(himl1, -1, hicon1), "Failed to add icon1 to himl1.\n"); - hmerge = ImageList_Merge(himl1, 0, himl2, 0, 0, 0); + hmerge = pImageList_Merge(himl1, 0, himl2, 0, 0, 0); ok(hmerge != NULL, "merge himl1 with himl2 failed\n"); check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl1 with himl2"); - if (hmerge) ImageList_Destroy(hmerge); + pImageList_Destroy(hmerge); - hmerge = ImageList_Merge(himl1, 0, himl2, 0, 8, 16); + hmerge = pImageList_Merge(himl1, 0, himl2, 0, 8, 16); ok(hmerge != NULL, "merge himl1 with himl2 8,16 failed\n"); check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl1 with himl2, 8,16"); - if (hmerge) ImageList_Destroy(hmerge); + pImageList_Destroy(hmerge); - ImageList_Destroy(himl1); - ImageList_Destroy(himl2); + pImageList_Destroy(himl1); + pImageList_Destroy(himl2); DestroyIcon(hicon1); DestroyWindow(hwnd); } @@ -920,16 +938,16 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN char *data; HRESULT hr; - ret = ImageList_GetImageCount(himl); + ret = pImageList_GetImageCount(himl); ok(ret == cur, "%s: expected image count %d got %d\n", comment, cur, ret); - ret = ImageList_GetIconSize(himl, &cxx, &cyy); + ret = pImageList_GetIconSize(himl, &cxx, &cyy); ok(ret, "ImageList_GetIconSize failed\n"); ok(cxx == cx, "%s: wrong cx %d (expected %d)\n", comment, cxx, cx); ok(cyy == cy, "%s: wrong cy %d (expected %d)\n", comment, cyy, cy); init_memstream(&stream); - ret = ImageList_Write(himl, &stream.IStream_iface); + ret = pImageList_Write(himl, &stream.IStream_iface); ok(ret, "%s: ImageList_Write failed\n", comment); hr = GetHGlobalFromStream(stream.stream, &hglobal); @@ -955,9 +973,9 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN /* rewind and reconstruct from stream */ mv.QuadPart = 0; IStream_Seek(stream.stream, mv, STREAM_SEEK_SET, NULL); - himl2 = ImageList_Read(&stream.IStream_iface); + himl2 = pImageList_Read(&stream.IStream_iface); ok(himl2 != NULL, "%s: Failed to deserialize imagelist\n", comment); - ImageList_Destroy(himl2); + pImageList_Destroy(himl2); GlobalUnlock(hglobal); cleanup_memstream(&stream); @@ -1026,7 +1044,7 @@ static void test_imagelist_storage(void) HICON icon; INT ret; - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 1, 1); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 1, 1); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 2, 4, BMP_CX * 4, BMP_CX * 1, ILC_COLOR24, "empty"); @@ -1034,202 +1052,199 @@ static void test_imagelist_storage(void) image_list_init(himl); check_iml_data(himl, BMP_CX, BMP_CX, 24, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "orig"); - ret = ImageList_Remove(himl, 4); + ret = pImageList_Remove(himl, 4); ok(ret, "ImageList_Remove failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 23, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "1"); - ret = ImageList_Remove(himl, 5); + ret = pImageList_Remove(himl, 5); ok(ret, "ImageList_Remove failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 22, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "2"); - ret = ImageList_Remove(himl, 6); + ret = pImageList_Remove(himl, 6); ok(ret, "ImageList_Remove failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 21, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "3"); - ret = ImageList_Remove(himl, 7); + ret = pImageList_Remove(himl, 7); ok(ret, "ImageList_Remove failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "4"); - ret = ImageList_Remove(himl, -2); + ret = pImageList_Remove(himl, -2); ok(!ret, "ImageList_Remove(-2) should fail\n"); check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "5"); - ret = ImageList_Remove(himl, 20); + ret = pImageList_Remove(himl, 20); ok(!ret, "ImageList_Remove(20) should fail\n"); check_iml_data(himl, BMP_CX, BMP_CX, 20, 27, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "6"); - ret = ImageList_Remove(himl, -1); + ret = pImageList_Remove(himl, -1); ok(ret, "ImageList_Remove(-1) failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 4, 4, BMP_CX * 4, BMP_CX * 1, ILC_COLOR24, "7"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); /* test ImageList_Create storage allocation */ - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 0, 32); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 0, 32); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 1, 32, BMP_CX * 4, BMP_CX * 1, ILC_COLOR24, "init 0 grow 32"); hbm = create_bitmap(BMP_CX * 9, BMP_CX, 0, "9"); - ret = ImageList_Add(himl, hbm, NULL); + ret = pImageList_Add(himl, hbm, NULL); ok(ret == 0, "ImageList_Add returned %d, expected 0\n", ret); check_iml_data(himl, BMP_CX, BMP_CX, 1, 34, 32, BMP_CX * 4, BMP_CX * 9, ILC_COLOR24, "add 1 x 9"); DeleteObject(hbm); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 4); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 4); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24, "init 4 grow 4"); hbm = create_bitmap(BMP_CX, BMP_CX * 9, 0, "9"); - ret = ImageList_Add(himl, hbm, NULL); + ret = pImageList_Add(himl, hbm, NULL); ok(ret == 0, "ImageList_Add returned %d, expected 0\n", ret); check_iml_data(himl, BMP_CX, BMP_CX, 9, 15, 4, BMP_CX * 4, BMP_CX * 4, ILC_COLOR24, "add 9 x 1"); - ret = ImageList_Add(himl, hbm, NULL); + ret = pImageList_Add(himl, hbm, NULL); ok(ret == 9, "ImageList_Add returned %d, expected 9\n", ret); check_iml_data(himl, BMP_CX, BMP_CX, 18, 25, 4, BMP_CX * 4, BMP_CX * 7, ILC_COLOR24, "add 9 x 1"); DeleteObject(hbm); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 207, 209); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 207, 209); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 208, 212, BMP_CX * 4, BMP_CX * 52, ILC_COLOR24, "init 207 grow 209"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 209, 207); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 209, 207); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 210, 208, BMP_CX * 4, BMP_CX * 53, ILC_COLOR24, "init 209 grow 207"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 14, 4); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 14, 4); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 15, 4, BMP_CX * 4, BMP_CX * 4, ILC_COLOR24, "init 14 grow 4"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 5, 9); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 5, 9); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 6, 12, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24, "init 5 grow 9"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 9, 5); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 9, 5); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 10, 8, BMP_CX * 4, BMP_CX * 3, ILC_COLOR24, "init 9 grow 5"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 2, 4); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 2, 4); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 4, BMP_CX * 4, BMP_CX * 1, ILC_COLOR24, "init 2 grow 4"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 2); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24, "init 4 grow 2"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR8, 4, 2); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR8, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR8, "bpp 8"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4, 4, 2); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4, "bpp 4"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, 0, 4, 2); + himl = pImageList_Create(BMP_CX, BMP_CX, 0, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4, "bpp default"); icon = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); - ok( ImageList_AddIcon(himl, icon) == 0,"failed to add icon\n"); - ok( ImageList_AddIcon(himl, icon) == 1,"failed to add icon\n"); + ok( pImageList_ReplaceIcon(himl, -1, icon) == 0, "Failed to add icon.\n"); + ok( pImageList_ReplaceIcon(himl, -1, icon) == 1, "Failed to add icon.\n"); DestroyIcon( icon ); check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4, "bpp default"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24|ILC_MASK, 4, 2); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24|ILC_MASK, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24|ILC_MASK, "bpp 24 + mask"); icon = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); - ok( ImageList_AddIcon(himl, icon) == 0,"failed to add icon\n"); - ok( ImageList_AddIcon(himl, icon) == 1,"failed to add icon\n"); + ok( pImageList_ReplaceIcon(himl, -1, icon) == 0, "Failed to add icon.\n"); + ok( pImageList_ReplaceIcon(himl, -1, icon) == 1, "Failed to add icon.\n"); DestroyIcon( icon ); - check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24|ILC_MASK, - "bpp 24 + mask"); - ret = ImageList_Destroy(himl); + check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24|ILC_MASK, "bpp 24 + mask"); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 4, 2); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); - check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4|ILC_MASK, - "bpp 4 + mask"); + check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4|ILC_MASK, "bpp 4 + mask"); icon = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); - ok( ImageList_AddIcon(himl, icon) == 0,"failed to add icon\n"); - ok( ImageList_AddIcon(himl, icon) == 1,"failed to add icon\n"); + ok( pImageList_ReplaceIcon(himl, -1, icon) == 0, "Failed to add icon.\n"); + ok( pImageList_ReplaceIcon(himl, -1, icon) == 1, "Failed to add icon.\n"); DestroyIcon( icon ); - check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4|ILC_MASK, - "bpp 4 + mask"); - ret = ImageList_Destroy(himl); + check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4|ILC_MASK, "bpp 4 + mask"); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 99); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 99); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 100, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, "init 2 grow 99"); icon = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); - ok( ImageList_AddIcon(himl, icon) == 0,"failed to add icon\n"); - ok( ImageList_AddIcon(himl, icon) == 1,"failed to add icon\n"); + ok( pImageList_ReplaceIcon(himl, -1, icon) == 0, "Failed to add icon.\n"); + ok( pImageList_ReplaceIcon(himl, -1, icon) == 1, "Failed to add icon.\n"); check_iml_data(himl, BMP_CX, BMP_CX, 2, 3, 100, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, "init 2 grow 99 2 icons"); - ok( ImageList_AddIcon(himl, icon) == 2,"failed to add icon\n"); + ok( pImageList_ReplaceIcon(himl, -1, icon) == 2, "Failed to add icon\n"); DestroyIcon( icon ); check_iml_data(himl, BMP_CX, BMP_CX, 3, 104, 100, BMP_CX * 4, BMP_CX * 104/4, ILC_COLOR4|ILC_MASK, "init 2 grow 99 3 icons"); - ok( ImageList_Remove(himl, -1) == TRUE,"failed to remove icon\n"); + ok( pImageList_Remove(himl, -1) == TRUE, "Failed to remove icon.\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 100, 100, BMP_CX * 4, BMP_CX * 100/4, ILC_COLOR4|ILC_MASK, "init 2 grow 99 empty"); - ok( ImageList_SetImageCount(himl, 22) == TRUE,"failed to set image count\n"); + ok( pImageList_SetImageCount(himl, 22) == TRUE, "Failed to set image count.\n"); check_iml_data(himl, BMP_CX, BMP_CX, 22, 23, 100, BMP_CX * 4, BMP_CX * 24/4, ILC_COLOR4|ILC_MASK, "init 2 grow 99 set count 22"); - ok( ImageList_SetImageCount(himl, 0) == TRUE,"failed to set image count\n"); + ok( pImageList_SetImageCount(himl, 0) == TRUE, "Failed to set image count.\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 1, 100, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, "init 2 grow 99 set count 0"); - ok( ImageList_SetImageCount(himl, 42) == TRUE,"failed to set image count\n"); + ok( pImageList_SetImageCount(himl, 42) == TRUE, "Failed to set image count.\n"); check_iml_data(himl, BMP_CX, BMP_CX, 42, 43, 100, BMP_CX * 4, BMP_CX * 44/4, ILC_COLOR4|ILC_MASK, "init 2 grow 99 set count 42"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65536+12); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65536+12); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 12, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, "init 2 grow 65536+12"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65535); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65535); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 0, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, "init 2 grow 65535"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, -20); + himl = pImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, -20); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 4, BMP_CX * 4, BMP_CX, ILC_COLOR4|ILC_MASK, "init 2 grow -20"); - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); } @@ -1566,7 +1581,7 @@ static void test_iimagelist(void) if (hr == S_OK) IImageList_Release(imgl); - ImageList_Destroy(himl); + pImageList_Destroy(himl); /* IImageList2 */ hr = pImageList_CoCreateInstance(&CLSID_ImageList, NULL, &IID_IImageList2, (void**)&imagelist); @@ -1579,81 +1594,6 @@ static void test_iimagelist(void) IImageList2_Release(imagelist); } -static void test_hotspot_v6(void) -{ - struct hotspot { - int dx; - int dy; - }; - -#define SIZEX1 47 -#define SIZEY1 31 -#define SIZEX2 11 -#define SIZEY2 17 -#define HOTSPOTS_MAX 4 /* Number of entries in hotspots */ - static const struct hotspot hotspots[HOTSPOTS_MAX] = { - { 10, 7 }, - { SIZEX1, SIZEY1 }, - { -9, -8 }, - { -7, 35 } - }; - int i, j; - HIMAGELIST himl1 = createImageList(SIZEX1, SIZEY1); - HIMAGELIST himl2 = createImageList(SIZEX2, SIZEY2); - IImageList *imgl1, *imgl2; - HRESULT hr; - - /* cast to IImageList */ - imgl1 = (IImageList *) himl1; - imgl2 = (IImageList *) himl2; - - for (i = 0; i < HOTSPOTS_MAX; i++) { - for (j = 0; j < HOTSPOTS_MAX; j++) { - int dx1 = hotspots[i].dx; - int dy1 = hotspots[i].dy; - int dx2 = hotspots[j].dx; - int dy2 = hotspots[j].dy; - int correctx, correcty, newx, newy; - char loc[256]; - IImageList *imglNew; - POINT ppt; - - hr = IImageList_BeginDrag(imgl1, 0, dx1, dy1); - ok(SUCCEEDED(hr), "BeginDrag failed for { %d, %d }\n", dx1, dy1); - sprintf(loc, "BeginDrag (%d,%d)\n", i, j); - - /* check merging the dragged image with a second image */ - hr = IImageList_SetDragCursorImage(imgl2, (IUnknown *) imgl2, 0, dx2, dy2); - ok(SUCCEEDED(hr), "SetDragCursorImage failed for {%d, %d}{%d, %d}\n", - dx1, dy1, dx2, dy2); - sprintf(loc, "SetDragCursorImage (%d,%d)\n", i, j); - - /* check new hotspot, it should be the same like the old one */ - hr = IImageList_GetDragImage(imgl2, NULL, &ppt, &IID_IImageList, (PVOID *) &imglNew); - ok(SUCCEEDED(hr), "GetDragImage failed\n"); - ok(ppt.x == dx1 && ppt.y == dy1, - "Expected drag hotspot [%d,%d] got [%d,%d]\n", - dx1, dy1, ppt.x, ppt.y); - /* check size of new dragged image */ - IImageList_GetIconSize(imglNew, &newx, &newy); - correctx = max(SIZEX1, max(SIZEX2 + dx2, SIZEX1 - dx2)); - correcty = max(SIZEY1, max(SIZEY2 + dy2, SIZEY1 - dy2)); - ok(newx == correctx && newy == correcty, - "Expected drag image size [%d,%d] got [%d,%d]\n", - correctx, correcty, newx, newy); - sprintf(loc, "GetDragImage (%d,%d)\n", i, j); - IImageList_EndDrag(imgl2); - } - } -#undef SIZEX1 -#undef SIZEY1 -#undef SIZEX2 -#undef SIZEY2 -#undef HOTSPOTS_MAX - IImageList_Release(imgl2); - IImageList_Release(imgl1); -} - static void test_IImageList_Add_Remove(void) { IImageList *imgl; @@ -1761,7 +1701,7 @@ static void test_IImageList_Draw(void) HDC hdc; int ret; - hwndfortest = create_a_window(); + hwndfortest = create_window(); hdc = GetDC(hwndfortest); ok(hdc!=NULL, "couldn't get DC\n"); @@ -1839,7 +1779,7 @@ static void test_IImageList_Merge(void) HIMAGELIST himl1, himl2; IImageList *imgl1, *imgl2, *merge; HICON hicon1; - HWND hwnd = create_a_window(); + HWND hwnd = create_window(); HRESULT hr; int ret; @@ -1926,94 +1866,89 @@ static void test_iconsize(void) INT cx, cy; BOOL ret; - himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + himl = pImageList_Create(16, 16, ILC_COLOR16, 0, 3); /* null pointers, not zero imagelist dimensions */ - ret = ImageList_GetIconSize(himl, NULL, NULL); + ret = pImageList_GetIconSize(himl, NULL, NULL); ok(!ret, "got %d\n", ret); /* doesn't touch return pointers */ cx = 0x1abe11ed; - ret = ImageList_GetIconSize(himl, &cx, NULL); + ret = pImageList_GetIconSize(himl, &cx, NULL); ok(!ret, "got %d\n", ret); ok(cx == 0x1abe11ed, "got %d\n", cx); cy = 0x1abe11ed; - ret = ImageList_GetIconSize(himl, NULL, &cy); + ret = pImageList_GetIconSize(himl, NULL, &cy); ok(!ret, "got %d\n", ret); ok(cy == 0x1abe11ed, "got %d\n", cy); - ImageList_Destroy(himl); + pImageList_Destroy(himl); - ret = ImageList_GetIconSize((HIMAGELIST)0xdeadbeef, &cx, &cy); + ret = pImageList_GetIconSize((HIMAGELIST)0xdeadbeef, &cx, &cy); ok(!ret, "got %d\n", ret); } static void test_create_destroy(void) { HIMAGELIST himl; - IImageList *imgl; INT cx, cy; BOOL rc; - HRESULT hr; INT ret; /* list with zero or negative image dimensions */ - himl = ImageList_Create(0, 0, ILC_COLOR16, 0, 3); + himl = pImageList_Create(0, 0, ILC_COLOR16, 0, 3); ok(himl == NULL, "got %p\n", himl); - himl = ImageList_Create(0, 16, ILC_COLOR16, 0, 3); + himl = pImageList_Create(0, 16, ILC_COLOR16, 0, 3); ok(himl == NULL, "got %p\n", himl); - himl = ImageList_Create(16, 0, ILC_COLOR16, 0, 3); + himl = pImageList_Create(16, 0, ILC_COLOR16, 0, 3); ok(himl == NULL, "got %p\n", himl); - himl = ImageList_Create(16, -1, ILC_COLOR16, 0, 3); + himl = pImageList_Create(16, -1, ILC_COLOR16, 0, 3); ok(himl == NULL, "got %p\n", himl); - himl = ImageList_Create(-1, 16, ILC_COLOR16, 0, 3); + himl = pImageList_Create(-1, 16, ILC_COLOR16, 0, 3); ok(himl == NULL, "got %p\n", himl); - rc = ImageList_Destroy((HIMAGELIST)0xdeadbeef); + rc = pImageList_Destroy((HIMAGELIST)0xdeadbeef); ok(rc == FALSE, "ImageList_Destroy(0xdeadbeef) should fail and not crash\n"); /* DDB image lists */ - himl = ImageList_Create(0, 14, ILC_COLORDDB, 4, 4); + himl = pImageList_Create(0, 14, ILC_COLORDDB, 4, 4); ok(himl != NULL, "got %p\n", himl); - imgl = (IImageList*)himl; - IImageList_GetIconSize(imgl, &cx, &cy); + + pImageList_GetIconSize(himl, &cx, &cy); ok (cx == 0, "Wrong cx (%i)\n", cx); ok (cy == 14, "Wrong cy (%i)\n", cy); - ImageList_Destroy(himl); + pImageList_Destroy(himl); - himl = ImageList_Create(0, 0, ILC_COLORDDB, 4, 4); + himl = pImageList_Create(0, 0, ILC_COLORDDB, 4, 4); ok(himl != NULL, "got %p\n", himl); - imgl = (IImageList*)himl; - IImageList_GetIconSize(imgl, &cx, &cy); + pImageList_GetIconSize(himl, &cx, &cy); ok (cx == 0, "Wrong cx (%i)\n", cx); ok (cy == 0, "Wrong cy (%i)\n", cy); - ImageList_Destroy(himl); + pImageList_Destroy(himl); - himl = ImageList_Create(0, 0, ILC_COLORDDB, 0, 4); + himl = pImageList_Create(0, 0, ILC_COLORDDB, 0, 4); ok(himl != NULL, "got %p\n", himl); - imgl = (IImageList*)himl; - IImageList_GetIconSize(imgl, &cx, &cy); + pImageList_GetIconSize(himl, &cx, &cy); ok (cx == 0, "Wrong cx (%i)\n", cx); ok (cy == 0, "Wrong cy (%i)\n", cy); - hr = IImageList_SetImageCount(imgl, 3); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IImageList_GetImageCount(imgl, &ret); - ok(hr == S_OK && ret == 3, "invalid image count after increase\n"); + pImageList_SetImageCount(himl, 3); + ret = pImageList_GetImageCount(himl); + ok(ret == 3, "Unexpected image count after increase\n"); /* Trying to actually add an image causes a crash on Windows */ - ImageList_Destroy(himl); + pImageList_Destroy(himl); /* Negative values fail */ - himl = ImageList_Create(-1, -1, ILC_COLORDDB, 4, 4); + himl = pImageList_Create(-1, -1, ILC_COLORDDB, 4, 4); ok(himl == NULL, "got %p\n", himl); - himl = ImageList_Create(-1, 1, ILC_COLORDDB, 4, 4); + himl = pImageList_Create(-1, 1, ILC_COLORDDB, 4, 4); ok(himl == NULL, "got %p\n", himl); - himl = ImageList_Create(1, -1, ILC_COLORDDB, 4, 4); + himl = pImageList_Create(1, -1, ILC_COLORDDB, 4, 4); ok(himl == NULL, "got %p\n", himl); } @@ -2026,7 +1961,7 @@ static void check_color_table(const char *name, HDC hdc, HIMAGELIST himl, UINT i BITMAPINFO *bmi = (BITMAPINFO *)bmi_buffer; int i, depth = ilc & 0xfe; - ret = ImageList_GetImageInfo(himl, 0, &info); + ret = pImageList_GetImageInfo(himl, 0, &info); ok(ret, "got %d\n", ret); ok(info.hbmImage != NULL, "got %p\n", info.hbmImage); @@ -2110,7 +2045,7 @@ static void test_color_table(UINT ilc) get_default_color_table(hdc, ilc & 0xfe, default_table); - himl = ImageList_Create(16, 16, ilc, 0, 3); + himl = pImageList_Create(16, 16, ilc, 0, 3); ok(himl != NULL, "got %p\n", himl); memset(bmi_buffer, 0, sizeof(bmi_buffer)); @@ -2144,17 +2079,17 @@ static void test_color_table(UINT ilc) dib32 = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); /* add 32 first then 8. This won't set the color table */ - ret = ImageList_Add(himl, dib32, NULL); + ret = pImageList_Add(himl, dib32, NULL); ok(ret == 0, "got %d\n", ret); - ret = ImageList_Add(himl, dib8, NULL); + ret = pImageList_Add(himl, dib8, NULL); ok(ret == 1, "got %d\n", ret); check_color_table("add 32, 8", hdc, himl, ilc, default_table, NULL); /* since the previous _Adds didn't set the color table, this one will */ - ret = ImageList_Remove(himl, -1); + ret = pImageList_Remove(himl, -1); ok(ret, "got %d\n", ret); - ret = ImageList_Add(himl, dib8, NULL); + ret = pImageList_Add(himl, dib8, NULL); ok(ret == 0, "got %d\n", ret); memset(rgb, 0, sizeof(rgb)); @@ -2165,18 +2100,18 @@ static void test_color_table(UINT ilc) /* remove all, add 4. Color table remains the same since it's inplicitly been set by the previous _Add */ - ret = ImageList_Remove(himl, -1); + ret = pImageList_Remove(himl, -1); ok(ret, "got %d\n", ret); - ret = ImageList_Add(himl, dib4, NULL); + ret = pImageList_Add(himl, dib4, NULL); ok(ret == 0, "got %d\n", ret); check_color_table("remove all, add 4", hdc, himl, ilc, rgb, default_table); - ImageList_Destroy(himl); - himl = ImageList_Create(16, 16, ilc, 0, 3); + pImageList_Destroy(himl); + himl = pImageList_Create(16, 16, ilc, 0, 3); ok(himl != NULL, "got %p\n", himl); /* add 4 */ - ret = ImageList_Add(himl, dib4, NULL); + ret = pImageList_Add(himl, dib4, NULL); ok(ret == 0, "got %d\n", ret); memset(rgb, 0, 16 * sizeof(rgb[0])); @@ -2190,12 +2125,12 @@ static void test_color_table(UINT ilc) check_color_table("add 4", hdc, himl, ilc, rgb, default_table); - ImageList_Destroy(himl); - himl = ImageList_Create(16, 16, ilc, 0, 3); + pImageList_Destroy(himl); + himl = pImageList_Create(16, 16, ilc, 0, 3); ok(himl != NULL, "got %p\n", himl); /* set color table, add 8 */ - ret = ImageList_Remove(himl, -1); + ret = pImageList_Remove(himl, -1); ok(ret, "got %d\n", ret); memset(rgb, 0, sizeof(rgb)); rgb[0].rgbRed = 0xcc; @@ -2203,7 +2138,7 @@ static void test_color_table(UINT ilc) ret = pImageList_SetColorTable(himl, 0, 2, rgb); ok(ret == 2, "got %d\n", ret); /* the table is set, so this doesn't change it */ - ret = ImageList_Add(himl, dib8, NULL); + ret = pImageList_Add(himl, dib8, NULL); ok(ret == 0, "got %d\n", ret); memcpy(rgb + 2, default_table + 2, 254 * sizeof(rgb[0])); @@ -2213,7 +2148,7 @@ static void test_color_table(UINT ilc) DeleteObject(dib8); DeleteObject(dib4); DeleteDC(hdc); - ImageList_Destroy(himl); + pImageList_Destroy(himl); } static void test_copy(void) @@ -2222,21 +2157,21 @@ static void test_copy(void) BOOL ret; int count; - dst = ImageList_Create(5, 11, ILC_COLOR, 1, 1); - count = ImageList_GetImageCount(dst); + dst = pImageList_Create(5, 11, ILC_COLOR, 1, 1); + count = pImageList_GetImageCount(dst); ok(!count, "ImageList not empty.\n"); src = createImageList(7, 13); - count = ImageList_GetImageCount(src); + count = pImageList_GetImageCount(src); ok(count > 2, "Tests need an ImageList with more than 2 images\n"); /* ImageList_Copy() cannot copy between two ImageLists */ - ret = ImageList_Copy(dst, 0, src, 2, ILCF_MOVE); + ret = pImageList_Copy(dst, 0, src, 2, ILCF_MOVE); ok(!ret, "ImageList_Copy() should have returned FALSE\n"); - count = ImageList_GetImageCount(dst); + count = pImageList_GetImageCount(dst); ok(count == 0, "Expected no image in dst ImageList, got %d\n", count); - ImageList_Destroy(dst); - ImageList_Destroy(src); + pImageList_Destroy(dst); + pImageList_Destroy(src); } static void test_loadimage(void) @@ -2244,19 +2179,19 @@ static void test_loadimage(void) HIMAGELIST list; DWORD flags; - list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_DEFAULT, + list = pImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_DEFAULT, IMAGE_BITMAP, LR_CREATEDIBSECTION ); ok( list != NULL, "got %p\n", list ); flags = pImageList_GetFlags( list ); ok( flags == (ILC_COLOR4 | ILC_MASK), "got %08x\n", flags ); - ImageList_Destroy( list ); + pImageList_Destroy( list ); - list = ImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_NONE, + list = pImageList_LoadImageW( hinst, MAKEINTRESOURCEW(IDB_BITMAP_128x15), 16, 1, CLR_NONE, IMAGE_BITMAP, LR_CREATEDIBSECTION ); ok( list != NULL, "got %p\n", list ); flags = pImageList_GetFlags( list ); ok( flags == ILC_COLOR4, "got %08x\n", flags ); - ImageList_Destroy( list ); + pImageList_Destroy( list ); } static void test_IImageList_Clone(void) @@ -2266,7 +2201,7 @@ static void test_IImageList_Clone(void) HRESULT hr; ULONG ref; - himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + himl = pImageList_Create(16, 16, ILC_COLOR16, 0, 3); imgl = (IImageList*)himl; if (0) @@ -2290,7 +2225,7 @@ static void test_IImageList_GetBkColor(void) COLORREF color; HRESULT hr; - himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + himl = pImageList_Create(16, 16, ILC_COLOR16, 0, 3); imgl = (IImageList*)himl; if (0) @@ -2312,7 +2247,7 @@ static void test_IImageList_SetBkColor(void) COLORREF color; HRESULT hr; - himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + himl = pImageList_Create(16, 16, ILC_COLOR16, 0, 3); imgl = (IImageList*)himl; if (0) @@ -2342,7 +2277,7 @@ static void test_IImageList_GetImageCount(void) int count; HRESULT hr; - himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + himl = pImageList_Create(16, 16, ILC_COLOR16, 0, 3); imgl = (IImageList*)himl; if (0) @@ -2366,7 +2301,7 @@ static void test_IImageList_GetIconSize(void) int cx, cy; HRESULT hr; - himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + himl = pImageList_Create(16, 16, ILC_COLOR16, 0, 3); imgl = (IImageList*)himl; hr = IImageList_GetIconSize(imgl, NULL, NULL); @@ -2381,18 +2316,47 @@ static void test_IImageList_GetIconSize(void) IImageList_Release(imgl); } +static void init_functions(void) +{ + HMODULE hComCtl32 = GetModuleHandleA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); +#define X2(f, ord) p##f = (void*)GetProcAddress(hComCtl32, (const char *)ord); + X(ImageList_Create); + X(ImageList_Destroy); + X(ImageList_Add); + X(ImageList_DrawIndirect); + X(ImageList_SetImageCount); + X(ImageList_SetImageCount); + X2(ImageList_SetColorTable, 390); + X(ImageList_GetFlags); + X(ImageList_BeginDrag); + X(ImageList_GetDragImage); + X(ImageList_EndDrag); + X(ImageList_GetImageCount); + X(ImageList_SetDragCursorImage); + X(ImageList_GetIconSize); + X(ImageList_Remove); + X(ImageList_ReplaceIcon); + X(ImageList_Replace); + X(ImageList_Merge); + X(ImageList_GetImageInfo); + X(ImageList_Write); + X(ImageList_Read); + X(ImageList_Copy); + X(ImageList_LoadImageW); + X(ImageList_CoCreateInstance); + X(HIMAGELIST_QueryInterface); +#undef X +#undef X2 +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; HANDLE hCtx; - HMODULE hComCtl32 = GetModuleHandleA("comctl32.dll"); - pImageList_Create = NULL; /* These are not needed for non-v6.0 tests*/ - pImageList_Add = NULL; - pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); - pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); - pImageList_SetColorTable = (void*)GetProcAddress(hComCtl32, (const char*)390); - pImageList_GetFlags = (void*)GetProcAddress(hComCtl32, "ImageList_GetFlags"); + init_functions(); hinst = GetModuleHandleA(NULL); @@ -2413,30 +2377,29 @@ START_TEST(imagelist) test_copy(); test_loadimage(); - FreeLibrary(hComCtl32); - /* Now perform v6 tests */ - if (!load_v6_module(&ctx_cookie, &hCtx)) return; - /* Reload comctl32 */ - hComCtl32 = LoadLibraryA("comctl32.dll"); - pImageList_Create = (void*)GetProcAddress(hComCtl32, "ImageList_Create"); - pImageList_Add = (void*)GetProcAddress(hComCtl32, "ImageList_Add"); - pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); - pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); - pImageList_CoCreateInstance = (void*)GetProcAddress(hComCtl32, "ImageList_CoCreateInstance"); - pHIMAGELIST_QueryInterface = (void*)GetProcAddress(hComCtl32, "HIMAGELIST_QueryInterface"); + init_functions(); CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); /* Do v6.0 tests */ + test_add_remove(); + test_imagecount(); + test_DrawIndirect(); + test_merge(); + test_iconsize(); + test_color_table(ILC_COLOR4); + test_color_table(ILC_COLOR8); + test_copy(); + test_loadimage(); + test_ImageList_DrawIndirect(); test_shell_imagelist(); test_iimagelist(); - test_hotspot_v6(); test_IImageList_Add_Remove(); test_IImageList_Get_SetImageCount(); test_IImageList_Draw(); -- 2.15.1

1 0

[PATCH] testbot/web: Tweak the label of 64 bit tests on the Activity page.
by Francois Gouget 22 Dec '17

22 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 677272f4..c3a1f48d 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -183,9 +183,11 @@ EOF { $Label .= " ". $VMStatus->{step}->FileName; if ($VMStatus->{task}->CmdLineArg =~ /^\w+$/ and - $Label =~ s/_(?:cross)?test\.exe$//) + $Label =~ s/_(?:cross)?test(64)?\.exe$//) { + my $Bitness = $1; $Label .= ":". $VMStatus->{task}->CmdLineArg; + $Label .= "/64" if ($Bitness); } } $Label = "<a href='/JobDetails.pl?Key=". $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No) ."'>$Label</a>"; -- 2.15.1

1 0

[PATCH] bcrypt: Fix build error on systems with old GnuTLS.
by Hans Leidekker 22 Dec '17

22 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 55cf2f6f28..b2cb43e9d8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -24,7 +24,7 @@ #ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H #include <AvailabilityMacros.h> #include <CommonCrypto/CommonCryptor.h> -#elif defined(SONAME_LIBGNUTLS) +#elif defined(HAVE_GNUTLS_CIPHER_INIT) #include <gnutls/gnutls.h> #include <gnutls/crypto.h> #endif -- 2.11.0

1 0

[PATCH] Revert "msi: Don't execute a deferred custom action when not running the install script."
by Zebediah Figura 22 Dec '17

22 Dec '17

This (effectively) reverts commit 86bc556f9fd4a964cbaa66bc1fd67e4603ecd450. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/custom.c | 19 ++++++++++++++++++- dlls/msi/tests/install.c | 1 + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 2570fe2..f67a7dd 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1132,6 +1132,23 @@ static UINT HANDLE_CustomType53_54( MSIPACKAGE *package, const WCHAR *source, co return wait_thread_handle( info ); } +static BOOL action_type_matches_script( UINT type, UINT script ) +{ + switch (script) + { + case SCRIPT_NONE: + case SCRIPT_INSTALL: + return !(type & msidbCustomActionTypeCommit) && !(type & msidbCustomActionTypeRollback); + case SCRIPT_COMMIT: + return (type & msidbCustomActionTypeCommit); + case SCRIPT_ROLLBACK: + return (type & msidbCustomActionTypeRollback); + default: + ERR("unhandled script %u\n", script); + } + return FALSE; +} + static UINT defer_custom_action( MSIPACKAGE *package, const WCHAR *action, UINT type ) { WCHAR *actiondata = msi_dup_property( package->db, action ); @@ -1209,7 +1226,7 @@ UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action ) if (type & msidbCustomActionTypeNoImpersonate) WARN("msidbCustomActionTypeNoImpersonate not handled\n"); - if (package->script == SCRIPT_NONE) + if (!action_type_matches_script( type, package->script )) { rc = defer_custom_action( package, action, type ); goto end; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 4fedc99..0cc9f9a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6056,6 +6056,7 @@ static void test_deferred_action(void) skip("Not enough rights to perform tests\n"); goto error; } +todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); error: -- 2.7.4

3 3

[PATCH v2 1/2] ddraw/tests: Add a helper for getting the device identifier
by Alex Henrie 22 Dec '17

22 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Fixed compilation error on old GCC dlls/ddraw/tests/ddraw1.c | 40 ++++++++++++---------------------------- dlls/ddraw/tests/ddraw2.c | 40 ++++++++++++---------------------------- dlls/ddraw/tests/ddraw4.c | 32 ++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 32 ++++++++++++-------------------- 4 files changed, 48 insertions(+), 96 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 109910b820..56916d6568 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -82,14 +82,16 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL ddraw_is_warp(IDirectDraw *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw *ddraw) { IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); @@ -97,42 +99,24 @@ static BOOL ddraw_is_warp(IDirectDraw *ddraw) ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); IDirectDraw4_Release(ddraw4); + return identifier; +} + +static BOOL ddraw_is_warp(IDirectDraw *ddraw) +{ + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return !!strstr(identifier.szDriver, "warp"); } static BOOL ddraw_is_nvidia(IDirectDraw *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x8086; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1db7ad9329..a92e4dc50f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -84,14 +84,16 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw2 *ddraw) { IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); @@ -99,42 +101,24 @@ static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); IDirectDraw4_Release(ddraw4); + return identifier; +} + +static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) +{ + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return !!strstr(identifier.szDriver, "warp"); } static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x8086; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 98c86d0bf0..5a356af4c5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -94,45 +94,37 @@ static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } -static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw4 *ddraw) { DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); + return identifier; +} + +static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) +{ + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return !!strstr(identifier.szDriver, "warp"); } static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw) { - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) { - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - + DDDEVICEIDENTIFIER identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x8086; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 91822281d0..a8b1a8ed92 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -104,45 +104,37 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } -static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) +static DDDEVICEIDENTIFIER2 ddraw_dev_id(IDirectDraw7 *ddraw) { DDDEVICEIDENTIFIER2 identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); + return identifier; +} + +static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) +{ + DDDEVICEIDENTIFIER2 identifier = ddraw_dev_id(ddraw); return !!strstr(identifier.szDriver, "warp"); } static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw) { - DDDEVICEIDENTIFIER2 identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - + DDDEVICEIDENTIFIER2 identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) { - DDDEVICEIDENTIFIER2 identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - + DDDEVICEIDENTIFIER2 identifier = ddraw_dev_id(ddraw); return identifier.dwVendorId == 0x8086; } -- 2.15.1

1 1

[PATCH 2/2] ddraw/tests: Recognize E_NOTIMPL returned from UpdateOverlay on VMware
by Alex Henrie 22 Dec '17

22 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 9 ++++++++- dlls/ddraw/tests/ddraw2.c | 9 ++++++++- dlls/ddraw/tests/ddraw4.c | 9 ++++++++- dlls/ddraw/tests/ddraw7.c | 9 ++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4542f3d4df..2797960321 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -117,6 +117,11 @@ static BOOL ddraw_is_intel(IDirectDraw *ddraw) return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x15ad; +} + static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -8660,7 +8665,9 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || + broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) || + broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f0fd0fa182..c6d962a235 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -119,6 +119,11 @@ static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw2 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x15ad; +} + static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -9794,7 +9799,9 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || + broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) || + broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9574331952..8a049e03a6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -125,6 +125,11 @@ static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw4 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x15ad; +} + static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -11256,7 +11261,9 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface4_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || + broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) || + broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3693821404..95c5e30900 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -135,6 +135,11 @@ static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw7 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x15ad; +} + static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -11217,7 +11222,9 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || + broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) || + broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ -- 2.15.1

2 1

[PATCH 1/2] ddraw/tests: Add a helper for getting the device identifier
by Alex Henrie 22 Dec '17

22 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 43 ++++++++++++------------------------------- dlls/ddraw/tests/ddraw2.c | 43 ++++++++++++------------------------------- dlls/ddraw/tests/ddraw4.c | 35 ++++++++++++----------------------- dlls/ddraw/tests/ddraw7.c | 35 ++++++++++++----------------------- 4 files changed, 48 insertions(+), 108 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 109910b820..4542f3d4df 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -82,14 +82,16 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL ddraw_is_warp(IDirectDraw *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw *ddraw) { IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); @@ -97,43 +99,22 @@ static BOOL ddraw_is_warp(IDirectDraw *ddraw) ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); IDirectDraw4_Release(ddraw4); - return !!strstr(identifier.szDriver, "warp"); + return identifier; } -static BOOL ddraw_is_nvidia(IDirectDraw *ddraw) +static BOOL ddraw_is_warp(IDirectDraw *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); + return !!strstr(ddraw_dev_id(ddraw).szDriver, "warp"); +} - return identifier.dwVendorId == 0x10de; +static BOOL ddraw_is_nvidia(IDirectDraw *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - - return identifier.dwVendorId == 0x8086; + return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw, diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1db7ad9329..f0fd0fa182 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -84,14 +84,16 @@ static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, floa && compare_float(vec->w, w, ulps); } -static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw2 *ddraw) { IDirectDraw4 *ddraw4; DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); @@ -99,43 +101,22 @@ static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); IDirectDraw4_Release(ddraw4); - return !!strstr(identifier.szDriver, "warp"); + return identifier; } -static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw) +static BOOL ddraw_is_warp(IDirectDraw2 *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); + return !!strstr(ddraw_dev_id(ddraw).szDriver, "warp"); +} - return identifier.dwVendorId == 0x10de; +static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) { - IDirectDraw4 *ddraw4; - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirectDraw4, (void **)&ddraw4); - ok(SUCCEEDED(hr), "Failed to get IDirectDraw4 interface, hr %#x.\n", hr); - hr = IDirectDraw4_GetDeviceIdentifier(ddraw4, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw4); - - return identifier.dwVendorId == 0x8086; + return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw, diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 98c86d0bf0..9574331952 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -94,46 +94,35 @@ static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } -static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) +static DDDEVICEIDENTIFIER ddraw_dev_id(IDirectDraw4 *ddraw) { DDDEVICEIDENTIFIER identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - return !!strstr(identifier.szDriver, "warp"); + return identifier; } -static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw) +static BOOL ddraw_is_warp(IDirectDraw4 *ddraw) { - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); + return !!strstr(ddraw_dev_id(ddraw).szDriver, "warp"); +} - return identifier.dwVendorId == 0x10de; +static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) { - DDDEVICEIDENTIFIER identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw4_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - - return identifier.dwVendorId == 0x8086; + return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 91822281d0..3693821404 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -104,46 +104,35 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } -static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) +static DDDEVICEIDENTIFIER2 ddraw_dev_id(IDirectDraw7 *ddraw) { DDDEVICEIDENTIFIER2 identifier; HRESULT hr; + memset(&identifier, 0, sizeof(identifier)); + if (!strcmp(winetest_platform, "wine")) - return FALSE; + return identifier; hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - return !!strstr(identifier.szDriver, "warp"); + return identifier; } -static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw) +static BOOL ddraw_is_warp(IDirectDraw7 *ddraw) { - DDDEVICEIDENTIFIER2 identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); + return !!strstr(ddraw_dev_id(ddraw).szDriver, "warp"); +} - return identifier.dwVendorId == 0x10de; +static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw) +{ + return ddraw_dev_id(ddraw).dwVendorId == 0x10de; } static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) { - DDDEVICEIDENTIFIER2 identifier; - HRESULT hr; - - if (!strcmp(winetest_platform, "wine")) - return FALSE; - - hr = IDirectDraw7_GetDeviceIdentifier(ddraw, &identifier, 0); - ok(SUCCEEDED(hr), "Failed to get device identifier, hr %#x.\n", hr); - - return identifier.dwVendorId == 0x8086; + return ddraw_dev_id(ddraw).dwVendorId == 0x8086; } static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw, -- 2.15.1

2 1

[PATCH] ddraw/tests: Recognize E_NOTIMPL returned from UpdateOverlay
by Alex Henrie 22 Dec '17

22 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes several test.winehq.org failures on Windows XP virtual machines. --- 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 c306c4db1a..27b1b0defc 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8679,7 +8679,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8a7801ee3e..56ca6e4cdd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9813,7 +9813,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 048331dfc3..50665af63a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11268,7 +11268,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface4_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d1ff85d5d5..9bc3c0913d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11229,7 +11229,7 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL || (hr == DDERR_OUTOFCAPS && dwm_enabled())), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ -- 2.15.1

3 4

[PATCH 1/2] po: Update Norwegian translation.
by Kim Malmo 22 Dec '17

22 Dec '17

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/po/nb_NO.po b/po/nb_NO.po index d00e67aebc..f2ef6594e5 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -10591,6 +10591,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Opprett en symbolsk lenke.\n" +"\n" +"Syntax: MKLINK [alternativer] lenke_navn mål\n" +"\n" +"Alternativer:\n" +"/d Opprett en symbolsk lenke til en katalog.\n" +"/h Opprett en hard lenke.\n" +"/j Opprett et katalog-knutepunkt.\n" +"lenke_navn er navnet på den nye symbolske lenken.\n" +"mål er stien som lenke_navn peker til.\n" #: cmd.rc:312 msgid "" -- 2.14.1

1 1

[PATCH 2/2] po: Update Simplified Chinese translation.
by Kim Malmo 22 Dec '17

22 Dec '17

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e1e92d261d..d3baf01035 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10402,7 +10402,7 @@ msgstr "" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n" -"link_nam 为符号链接的名称。\n" +"link_name 为符号链接的名称。\n" "target 为 link_name 指向的路径。\n" #: cmd.rc:312 -- 2.14.1

2 1

[PATCH 1/3] testbot: Add a history Record when the Engine starts or stops.
by Francois Gouget 22 Dec '17

22 Dec '17

A missing stop record will show that the TestBot Engine crashed (or was stopped abruptly). The gap between the stop and start records will also allow identifying the downtime. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 36a18ade..827879cf 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -749,6 +749,7 @@ sub main() LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } $MaxVMsWhenIdle = $MaxActiveVMs if (!defined $MaxVMsWhenIdle); + SaveRecord('engine', 'start'); Cleanup(1); # Check for patches that arrived while the server was off. @@ -871,6 +872,7 @@ sub main() } } } + SaveRecord('engine', 'stop'); LogMsg "Normal WineTestBot Engine shutdown\n"; return 0; -- 2.15.1

1 2

[PATCH 1/2] testbot/web: Make the title class a bit more generic.
by Francois Gouget 22 Dec '17

22 Dec '17

Instead of hardcoding the text color it now inherits it from the normal non-link text. This makes it usable on white backgrounds too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/WineTestBot.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 8c03a914..e58a4d80 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -340,7 +340,7 @@ pre .boterror { color: #e55600; } .canceled { color: black; } -a.title { color:white; text-decoration: none; } +a.title { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } -- 2.15.1

1 1

wine-2.0.4-rc1 Available
by Michael Stefaniuc 21 Dec '17

21 Dec '17

Hello guys, I have pushed wine-2.0.4-rc1 (with tag) to https://github.com/mstefani/wine-stable http://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ Commit wise, the documentation / man page patches for http ==> https dominate this release. Other than "what's new" I have pulled some small fixes to the Wine programs. The interesting parts from the ANNOUNCE file are: What's new in this release (see below for details): - Various bug fixes - Updates to the National Language Support files - Documentation updates ---------------------------------------------------------------- Bugs fixed in 2.0.4 (total 31): 7369 eISLP -help doesn't display, 'text controller' error message 14530 EM_PASTESPECIAL unimplemented in richedit 26046 comctl32/monthcal tests show some invalid reads under valgrind 28741 Odd coordinate in hit test causes uninitialized value references in MONTHCAL_CalculateDayOfWeek()? 37160 If D3D_DISABLE_9EX is defined, d3d9.h can't be compiled 37321 foobar2000 'Scheduler' plugin crashes on unimplemented function shell32.dll.ShellExec_RunDLLW 40025 Winrar installer fails to start 42256 PhotoFiltre 6 and 7 don't erase the mouse selection when dragging it 42715 Cxbx (Xbox emulator) doesn`t start (wine: Invalid address) 43044 League of Legends needs function msvcp140.dll.?__ExceptionPtrAssign@@YAXPAXPBX@Z 43046 Multiple apps need api-ms-win-crt-stdio-l1-1-0.dll.__stdio_common_vfprintf_s (Civilization VI, Mafia 3, SketchBook) 43163 Mixcraft 8 crashes when adding a video track ('IAMTimelineGroup', '{9eed4f00-b8a6-11d2-8023-00c0df10d434}' not implemented, 'qedit.dll') 43290 MyLifeOrganized crashes when mousing over tabs 43293 strange behavior- Eudora scrambles email addresses 43324 Beamng.drive requires msvcr120.dll.vsscanf 43453 Magic Online (Magic The Gathering: Online) Crashes due to race condition in secur32 43475 XM6 TypeG crashes on startup. 43503 FUJITSU Software ATLAS: unimplemented function msvcr80.dll._ismbcl0 called in 32-bit code 43527 Magic Online (Magic The Gathering: Online) Crashes due to LOCALE_SNAN returning empty string 43536 WIC can't encode to GUID_WICPixelFormat32bppPBGRA PNG 43603 clipboard PIXMAP regression after upgrading from 1.8.x to 2.x 43658 Text in Deletion Confirmation MsgBox has wrong background colour 43668 Terris Universal Remote UFB 234 - update database does not work 43707 [GdiPlus] HatchStyle is incorrectly named in Wine. Should be GpHatchStyle 43714 ImageMagick crashes with msvcr120.dll._vfprintf_l 43770 Fidibo installer crashes very early in win7 mode 43774 Chromium-based browser engine (CEFv3) used by several games randomly crashes on shutdown (World of Warships 0.6.x) 43779 In ole32/storage32.c , miss check for the result of HeapAlloc 43877 "Cannot allocate DOS memory" error with 16-bit Windows applications 43912 wine-2.0.3/programs/wineboot/wineboot.c:684]: (style) Suspicious condition 44085 winecfg: Use more secure HTTPS URL in about ---------------------------------------------------------------- Changes since 2.0.3: Akihiro Sagawa (5): msvcrt/tests: Add tests for mbstowcs and wcstombs with empty strings. msvcrt: Fix mbstowcs with empty strings. readme: Update Japanese translation. explorer: Use neutral language for the version resource. regsvr32: Use neutral language for the version resource. Alex Henrie (5): msvcrt: Note that __stdio_common functions are for ucrtbase. ucrtbase: Add __stdio_common_vfprintf_s. shell32: Implement ShellExec_RunDLL. include: Add D3D_DISABLE_9EX checks to d3d9.h. user32: Implement IDI_SHIELD. Alexandre Julliard (10): winex11: If importing an X11 clipboard format fails, try other candidate formats for the target. ntdll: Support loading binaries that start inside the DOS area. ntdll: Ignore the preload start address if it is zero. README: Remove references to removed Wiki pages. readme: Patches should now be sent to wine-devel. configure: Replace AC_HEADER_MAJOR macro to handle glibc 2.25 sys/types.h breakage. wineconsole: Avoid some fatal errors. wineconsole: Remove duplicate line feeds. wordpad: New high resolution cursor generated from SVG. explorer: Don't forward the system tray to the display driver in desktop mode. Alistair Leslie-Hughes (3): ole32: Add pointer check. qedit/tests: Add test for the IAMTimelineGroup interface. qedit: Support IAMTimelineGroup interface in IAMTimelineObj. Andrew Eikum (2): kernel32: Use different default sublangs for Spanish and Chinese. explorer: Don't leak PIDL. Andrey Semakin (4): winemine: Mine random placing fix. winemine: Added Shift+LClick hotkey to uncover multiple cells. winemine: Add WM_RBUTTONUP to cases of TestMines(). winemine: Save board without need to correctly finish the app. André Hentschel (1): ntdll: Bump Win 10 version to 15063. Anton Romanov (3): windowscodecs: PNGEncoder: Return 32bppRGBA pixel format by default. secur32: Fix race between schan_(Encrypt|Decrypt)Message. secur32: Protect SSLRead/Write with cs on OSX. Austin English (30): readme: Document that wine can be run from the build directory. readme: Clarify the wording a bit. announce: Move WineHQ URLs to https. readme: Move WineHQ URLs to https. configure: Move WineHQ URLs to https. loader: Move WineHQ URLs to https. server: Move WineHQ URLs to https. widl: Move WineHQ URLs to https. winegcc: Move WineHQ URLs to https. wrc: Move WineHQ URLs to https. winemaker: Move WineHQ URLs to https. wmc: Move WineHQ URLs to https. winebuild: Move WineHQ URLs to https. winedump: Move WineHQ URLs to https. c2man.pl: Move WineHQ URLs to https. msiexec: Move WineHQ URLs to https. notepad: Move WineHQ URLs to https. regedit: Move WineHQ URLs to https. winemine: Move WineHQ URLs to https. winepath: Move WineHQ URLs to https. wineconsole: Move WineHQ URLs to https. regsvr32: Move WineHQ URLs to https. wineboot: Move WineHQ URLs to https. winecfg: Move WineHQ URLs to https. winefile: Move WineHQ URLs to https. winedbg: Move WineHQ URLs to https. iexplore: Move WineHQ URLs to https. appwiz.cpl: Move WineHQ URLs to https. maintainers: Move WineHQ URLs to https. loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https. Bas Weelinck (1): start: Ignore multiple quoted arguments as title. Daniel Lehman (2): msvcrt: Add __ExceptionPtrAssign. server: Fix copy & paste for number of subkeys. Dmitry Timoshkov (3): user32/tests: Test DialogBoxParam using a dialog template with invalid control class. user32: DialogBoxParam should return -1 when dialog control creation fails. cmd: '$E' in the prompt should be interpreted as an escape code (0x1b). Fabian Maurer (5): shell32: Draw text on message boxes without background. gdiplus: Avoid division by zero in SOFTWARE_GdipDrawThinPath. wineboot: In ProcessRunKeys use correct parentheses in condition. ole32: Don't redefine htole32/htole16. winecfg: Remove processorArchitecture from manifest. Gijs Vermeulen (1): msvcrt: Add _vfprintf_l. Henri Verbeet (1): wordpad: Fall back to the default position if the saved position is off-screen. Hugh Bellamy (1): gdiplus: Define GpHatchStyle. Huw D. M. Davies (6): gdi32: Add a helper to fill rectangles with a given pixel. gdi32: Respect the rop mode in SetPixel. ole32: In the non-aggregated case a request for IUnknown actually returns IOleCache2. riched20: Add support for EM_PASTESPECIAL. winefile: Initialize length before calling GetWindowPlacement(). winedbg: Return after raising an exception. Jacek Caban (1): services: Call RpcMgmtWaitServerListen in RPC_Stop. Lauri Kenttä (5): readme: Fix word order. readme: Update Finnish translation. readme: Update Finnish translation. readme: Use UTF-8 consistently in all translations. readme: Move WineHQ URLs to https in translations. Li Keqing (1): wined3d: Add Intel HD Graphics 5000 to the GPU list. Nikolay Sivov (15): msvcrt: Added _ismbcl0(). kernel32/nls: Added genitive month names for Polish. kernel32/nls: Added genitive month names for Belarusian. kernel32/nls: Added genitive month names for Armenian. kernel32/nls: Added genitive month names for Croatian. kernel32/nls: Added genitive month names for Czech. kernel32/nls: Added Nepali locale data. kernel32/nls: Added Bangla (India) locale data. kernel32/nls: Added LOCALE_SNAN entries. comctl32/monthcal: Make sure set today date is valid before using it (Valgrind). comctl32/monthcal: Initialize day field before setting final hit test result (Valgrind). msxml3/httpreq: Support HEAD request. msvcr120: Added vsscanf() and vswscanf(). readme: Update Russian translation. msi: Avoid uninitialized pointer access on error path (Coverity). Piotr Caban (4): msvcrt: Fix strcpy implementation so it works on overlapping buffers. msvcr120: Add wctype implementation. wine.inf: Add Windows Messaging Subsystem MAPI registry key. vbscript: Don't leak IEnumVARIANT in interp_enumnext. Stefan Dösinger (2): ntdll: Do not queue a completion status if pipe ops fail synchronously. d3dx9/tests: Use float bit patterns in test_D3DXFloat_Array. Vincent Povirk (2): loader/wine.inf: Put 32-bit .ds fakedlls in windows/twain_32. wine.inf: Put 64-bit .ds fakedlls in windows/twain_64. Zebediah Figura (1): d3dcompiler: Fix a buffer size computation. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH] quartz: Wait for the PullPin thread to terminate.
by Zebediah Figura 21 Dec '17

21 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes an intermittent failure in the filtergraph tests where the source file was not being freed before IFilterGraph2_Release() returned. dlls/quartz/pin.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 355d87d..a17d256 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -540,13 +540,7 @@ static void PullPin_Thread_Stop(PullPin *This) { TRACE("(%p)->()\n", This); - EnterCriticalSection(This->pin.pCritSec); - { - CloseHandle(This->hThread); - This->hThread = NULL; - SetEvent(This->hEventStateChanged); - } - LeaveCriticalSection(This->pin.pCritSec); + SetEvent(This->hEventStateChanged); IBaseFilter_Release(This->pin.pinInfo.pFilter); @@ -706,6 +700,11 @@ static HRESULT PullPin_StopProcessing(PullPin * This) assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); ResetEvent(This->hEventStateChanged); SetEvent(This->thread_sleepy); + + WaitForSingleObject(This->hThread, INFINITE); + CloseHandle(This->hThread); + This->hThread = NULL; + return S_OK; } -- 2.7.4

1 0

[PATCH 3/3] server: Add support for querying FileNameInformation on named pipes.
by Jacek Caban 21 Dec '17

21 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 3 --- server/named_pipe.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 5 deletions(-)

1 0

[PATCH 2/3] server: Introduce get_file_info request for server-side NtQueryInformationFile implementation.
by Jacek Caban 21 Dec '17

21 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I made it more general than needed by the next patch. We will probably need it in such form for calls on files backed by drivers, but it will also be useful for other info classes (eg. FILE_PIPE_INFORMATION and FILE_PIPE_LOCAL_INFORMATION won't need a separated request) as well as other object types for which client-side fd-based implementation may not be right. This series keeps changes to minimum (due to code freeze). dlls/ntdll/file.c | 21 ++++++++++++++++++++- server/change.c | 1 + server/console.c | 1 + server/device.c | 1 + server/fd.c | 18 ++++++++++++++++++ server/file.c | 1 + server/file.h | 3 +++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/protocol.def | 8 ++++++++ server/serial.c | 1 + server/sock.c | 2 ++ 13 files changed, 63 insertions(+), 1 deletion(-)

1 0

[PATCH 1/3] ntdll/tests: Add NtQueryInformationFile(FileNameInformation) on named pipes tests.
by Jacek Caban 21 Dec '17

21 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)

1 0

[PATCH] ddraw: Validate the surface descriptor size in GetDisplayMode.
by Alexandre Julliard 21 Dec '17

21 Dec '17

For bug 44180. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 27 +++++++++++++-------------- dlls/ddraw/tests/ddraw1.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 17 +++++++++++++++++ 5 files changed, 81 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d3e491c3e8bb..27be401a2e57 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1627,17 +1627,14 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 struct ddraw *ddraw = impl_from_IDirectDraw7(iface); struct wined3d_display_mode mode; HRESULT hr; - DWORD Size; TRACE("iface %p, surface_desc %p.\n", iface, DDSD); - wined3d_mutex_lock(); /* This seems sane */ - if (!DDSD) - { - wined3d_mutex_unlock(); + if (!DDSD || (DDSD->dwSize != sizeof(DDSURFACEDESC) && DDSD->dwSize != sizeof(DDSURFACEDESC2))) return DDERR_INVALIDPARAMS; - } + + wined3d_mutex_lock(); if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) { @@ -1646,10 +1643,8 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 return hr; } - Size = DDSD->dwSize; - memset(DDSD, 0, Size); - - DDSD->dwSize = Size; + memset(DDSD, 0, DDSD->dwSize); + DDSD->dwSize = sizeof(*DDSD); DDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; @@ -1682,21 +1677,25 @@ static HRESULT WINAPI ddraw4_GetDisplayMode(IDirectDraw4 *iface, DDSURFACEDESC2 static HRESULT WINAPI ddraw2_GetDisplayMode(IDirectDraw2 *iface, DDSURFACEDESC *surface_desc) { struct ddraw *ddraw = impl_from_IDirectDraw2(iface); + HRESULT hr; TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); - /* FIXME: Test sizes, properly convert surface_desc */ - return ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + hr = ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + if (SUCCEEDED(hr)) surface_desc->dwSize = sizeof(*surface_desc); + return hr; } static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *surface_desc) { struct ddraw *ddraw = impl_from_IDirectDraw(iface); + HRESULT hr; TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); - /* FIXME: Test sizes, properly convert surface_desc */ - return ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + hr = ddraw7_GetDisplayMode(&ddraw->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); + if (SUCCEEDED(hr)) surface_desc->dwSize = sizeof(*surface_desc); + return hr; } /***************************************************************************** diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c306c4db1a32..b8ac74919f89 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10132,6 +10132,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw_GetDisplayMode(ddraw, &desc.desc1); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8a7801ee3e57..716103335f1b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -11643,6 +11643,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw2_GetDisplayMode(ddraw, &desc.desc1); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 048331dfc39d..46362e5c1dc0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -13247,6 +13247,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw4_GetDisplayMode(ddraw, &desc.desc2); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC2), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d1ff85d5d54f..c7a2b138e97b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12547,6 +12547,23 @@ static void test_surface_desc_size(void) IDirectDrawSurface_Release(surface); } + /* GetDisplayMode() */ + for (j = 0; j < sizeof(desc_sizes) / sizeof(*desc_sizes); ++j) + { + memset(&desc, 0xcc, sizeof(desc)); + desc.dwSize = desc_sizes[j]; + expected_hr = (desc.dwSize == sizeof(DDSURFACEDESC) || desc.dwSize == sizeof(DDSURFACEDESC2)) + ? DD_OK : DDERR_INVALIDPARAMS; + hr = IDirectDraw7_GetDisplayMode(ddraw, &desc.desc2); + ok(hr == expected_hr, "Got hr %#x, expected %#x, size %u.\n", hr, expected_hr, desc_sizes[j]); + if (SUCCEEDED(hr)) + { + ok(desc.dwSize == sizeof(DDSURFACEDESC2), "Wrong size %u for %u.\n", desc.dwSize, desc_sizes[j]); + ok(desc.blob[desc_sizes[j]] == 0xcc, "Overflow for size %u.\n", desc_sizes[j]); + ok(desc.blob[desc_sizes[j] - 1] != 0xcc, "Struct not cleared for size %u.\n", desc_sizes[j]); + } + } + refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } -- 2.15.0 -- Alexandre Julliard julliard(a)winehq.org

3 2

[PATCH] wined3d: Consider CPU blitter when clearing discarded textures.
by Józef Kucia 21 Dec '17

21 Dec '17

In order to avoid invalidating system memory for "converted" surfaces. Fixes a regression introduced by commit 56128d18d4df ("wined3d: Drop the special case for "converted" surfaces in wined3d_surface_blt()."). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw4.c | 9 ++++----- dlls/ddraw/tests/ddraw7.c | 9 ++++----- dlls/wined3d/surface.c | 4 +++- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 048331dfc39d..fb42f85b0048 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9960,11 +9960,10 @@ static void test_color_fill(void) hr = IDirectDrawSurface4_Lock(surface, NULL, &surface_desc, DDLOCK_READONLY, 0); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, surface %s.\n", hr, tests[i].name); color = surface_desc.lpSurface; - todo_wine_if(tests[i].caps & DDSCAPS_VIDEOMEMORY && U3(z_fmt).dwZBitMask != 0xffff) - ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) - || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), - "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", - *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); + ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) + || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), + "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", + *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); hr = IDirectDrawSurface4_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, surface %s.\n", hr, tests[i].name); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d1ff85d5d54f..2fb845378c42 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9911,11 +9911,10 @@ static void test_color_fill(void) hr = IDirectDrawSurface7_Lock(surface, NULL, &surface_desc, DDLOCK_READONLY, 0); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, surface %s.\n", hr, tests[i].name); color = surface_desc.lpSurface; - todo_wine_if(tests[i].caps & DDSCAPS_VIDEOMEMORY && U3(z_fmt).dwZBitMask != 0xffff) - ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) - || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), - "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", - *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); + ok((*color & U3(z_fmt).dwZBitMask) == (tests[i].result & U3(z_fmt).dwZBitMask) + || broken((*color & U3(z_fmt).dwZBitMask) == (expected_broken & U3(z_fmt).dwZBitMask)), + "Got clear result 0x%08x, expected 0x%08x, surface %s.\n", + *color & U3(z_fmt).dwZBitMask, tests[i].result & U3(z_fmt).dwZBitMask, tests[i].name); hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, surface %s.\n", hr, tests[i].name); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 02e0c70382d8..da22c7ad9aaf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2698,13 +2698,15 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) { struct wined3d_resource *resource; struct wined3d_texture *texture; + DWORD locations; resource = view->resource; if (resource->type == WINED3D_RTYPE_BUFFER) return resource->pool == WINED3D_POOL_SYSTEM_MEM; texture = texture_from_resource(resource); - if (texture->sub_resources[view->sub_resource_idx].locations & resource->map_binding) + locations = texture->sub_resources[view->sub_resource_idx].locations; + if (locations & (resource->map_binding | WINED3D_LOCATION_DISCARDED)) return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED); -- 2.13.6

2 1

[PATCH 1/2] d3d9/tests: Work around focus-follows-mouse test failures.
by Stefan Dösinger 21 Dec '17

21 Dec '17

Removing WS_VISIBLE without updating the window state with SWP_FRAMECHANGED is enough to trigger d3d9's hidden window codepath (native and in Wine), but doesn't actually hide the window. This prevents unpredictable focus changes on focus follows mouse WMs. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 6 +++++- dlls/d3d9/tests/device.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index c965af7264..702fea001d 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2952,7 +2952,11 @@ static void test_wndproc(void) hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); - ShowWindow(device_window, SW_HIDE); + /* Remove the WS_VISIBLE flag to test hidden windows. This is enough to trigger d3d's hidden + * window codepath, but does not actually hide the window without a SetWindowPos(SWP_FRAMECHANGED) + * call. This way we avoid focus changes and random failures on focus follows mouse WMs. */ + device_style = GetWindowLongA(device_window, GWL_STYLE); + SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE); flush_events(); expect_messages = focus_loss_messages_hidden; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3bf9c10f20..790e98ae4d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3907,7 +3907,11 @@ static void test_wndproc(void) hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); - ShowWindow(device_window, SW_HIDE); + /* Remove the WS_VISIBLE flag to test hidden windows. This is enough to trigger d3d's hidden + * window codepath, but does not actually hide the window without a SetWindowPos(SWP_FRAMECHANGED) + * call. This way we avoid focus changes and random failures on focus follows mouse WMs. */ + device_style = GetWindowLongA(device_window, GWL_STYLE); + SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE); flush_events(); expect_messages = focus_loss_messages_hidden; -- 2.13.6

2 3

[PATCH] testbot/web: Use a white background for Collection tables.
by Francois Gouget 21 Dec '17

21 Dec '17

This makes the table more readable when it is wide and goes off the edge of the page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/WineTestBot.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index bb80e7f2..8c03a914 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -221,6 +221,7 @@ h2 margin-right: auto; padding: 4px; border: 1px solid #601919; + background-color: white; } .CollectionBlock th @@ -347,7 +348,7 @@ td.Record { text-align: center; } .RecordJob { font-size: smaller; } .RecordDuration { } -.Record-start { background-color: white; } +.Record-start { } .Record-off { color: #c0c0c0; } .Record-unknown { background-color: #c0c0c0; } .Record-offline { background-color: red; } -- 2.15.1

1 0

[PATCH] testbot: Avoid reference cycles between Collections.
by Francois Gouget 21 Dec '17

21 Dec '17

Specifically when the Collection is used for a Detailref property (e.g. Jobs->Steps), it should not keep a reference to the parent's ScopeItems. Reference cycles cause Perl's primitive reference-count based garbage collector to leak memory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index c3bc438c..a9ec9958 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -43,6 +43,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT_OK = qw(&new &ComputeMasterKey); +use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Item; use ObjectModel::PropertyDescriptor; @@ -96,6 +97,14 @@ sub new($$$$$;$$@) Filters => {}, AllScopeItems => $AllScopeItems || {}, Items => undef}; + if ($AllScopeItems) + { + # Avoid memory cycles in case Items have Detailref properties: + # ParentCollection{AllScopeItems} --> ParentItem + # ParentItem --DetailrefProperty--> DetailCollection + # DetailCollection{AllScopeItems} == ParentCollection{AllScopeItems} + weaken($self->{AllScopeItems}); + } $self = bless $self, $class; $self->_initialize(@_); return $self; -- 2.15.1

1 0

[PATCH] testbot: Avoid reference cycles between Items and their Collection.
by Francois Gouget 21 Dec '17

21 Dec '17

Reference cycles cause Perl's primitive reference-count based garbage collector to leak memory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Item.pm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index c27e40cf..88c9d1ae 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -26,6 +26,7 @@ ObjectModel::Item - Base class for items =cut +use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Collection; use ObjectModel::PropertyDescriptor; @@ -68,6 +69,9 @@ sub new($$@) $self->{TableName} = $Collection->{TableName}; $self->{ScopeItems} = $Collection->{AllScopeItems}->{ref($Collection)}; $self->{AllScopeItems} = $Collection->{AllScopeItems}; + # Avoid memory cycles + weaken($self->{ScopeItems}); + weaken($self->{AllScopeItems}); $self->{PropertyDescriptors} = $Collection->{PropertyDescriptors}; $self->{MasterColNames} = $Collection->{MasterColNames}; $self->{MasterColValues} = $Collection->{MasterColValues}; @@ -509,14 +513,21 @@ sub MasterKeyChanged($$) { my ($self, $MasterColValues) = @_; - my $Key = $self->GetKey(); - my $FullKey = $self->GetFullKey($Key); - delete($self->{ScopeItems}->{$FullKey}) if (defined $FullKey); + my $Key; + if ($self->{ScopeItems}) + { + $Key = $self->GetKey(); + my $FullKey = $self->GetFullKey($Key); + delete($self->{ScopeItems}->{$FullKey}) if (defined $FullKey); + } $self->{MasterColValues} = $MasterColValues; $self->{MasterKey} = ObjectModel::Collection::ComputeMasterKey($MasterColValues); - $FullKey = $self->GetFullKey($Key); - $self->{ScopeItems}->{$FullKey} = $self if (defined $FullKey); + if ($self->{ScopeItems}) + { + my $FullKey = $self->GetFullKey($Key); + $self->{ScopeItems}->{$FullKey} = $self if (defined $FullKey); + } $self->KeyChanged(); } -- 2.15.1

1 0

[PATCH] testbot: Avoid reference cycles in the activity report.
by Francois Gouget 21 Dec '17

21 Dec '17

Reference cycles cause Perl's primitive reference-count based garbage collector to leak memory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 3a9081a3..dcc58956 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -25,6 +25,7 @@ WineTestBot::Activity - reconstruct the TestBot's activity from its history rec =cut +use Scalar::Util qw(weaken); use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; @@ -112,6 +113,7 @@ sub GetActivity($) $VMStatus->{host} = $RecordHost; $VMStatus->{vmstatus} = $VMStatus; + weaken($VMStatus->{vmstatus}); # avoid memory cycles $VMStatus->{start} = $Group->{start}; my ($Status, @Extra) = split / /, $Record->Value; $VMStatus->{status} = $Status; @@ -176,6 +178,7 @@ sub GetActivity($) status => "unknown", rows => 1}; $VMStatus->{vmstatus} = $VMStatus; + weaken($VMStatus->{vmstatus}); # avoid memory cycles } $LastStatusVMs{$VM->Name} = $StatusVMs; } -- 2.15.1

1 0

[PATCH 1/3] comctl32/tests: Use CreateWindowEx() to create UpDown controls
by Nikolay Sivov 21 Dec '17

21 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/updown.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 3076285e33..d6dbde01aa 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -293,11 +293,16 @@ static HWND create_updown_control(DWORD style, HWND buddy) RECT rect; GetClientRect(parent_wnd, &rect); - updown = CreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE | style, - 0, 0, rect.right, rect.bottom, parent_wnd, 1, GetModuleHandleA(NULL), buddy, - 100, 0, 50); + updown = CreateWindowExA(0, UPDOWN_CLASSA, NULL, WS_CHILD | WS_BORDER | WS_VISIBLE | style, + 0, 0, rect.right, rect.bottom, + parent_wnd, (HMENU)1, GetModuleHandleA(NULL), NULL); + ok(updown != NULL, "Failed to create UpDown control.\n"); if (!updown) return NULL; + SendMessageA(updown, UDM_SETBUDDY, (WPARAM)buddy, 0); + SendMessageA(updown, UDM_SETRANGE, 0, MAKELONG(100, 0)); + SendMessageA(updown, UDM_SETPOS, 0, MAKELONG(50, 0)); + oldproc = (WNDPROC)SetWindowLongPtrA(updown, GWLP_WNDPROC, (LONG_PTR)updown_subclass_proc); SetWindowLongPtrA(updown, GWLP_USERDATA, (LONG_PTR)oldproc); -- 2.15.1

1 2

[PATCH] comctl32/tooltips: Reset window subclass data when removing tools
by Nikolay Sivov 20 Dec '17

20 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Similar to b68dbf4ea1294a98ca653f32e88b07be632a5bae, intentionally separated because it's not essential to fix original bug. dlls/comctl32/tooltips.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 405b1e9f5c..1c8cb66422 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1142,6 +1142,13 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) return TRUE; } +static void TOOLTIPS_ResetSubclass (const TTTOOL_INFO *toolPtr) +{ + /* Reset subclassing data. */ + if (toolPtr->uInternalFlags & TTF_SUBCLASS) + SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, + TOOLTIPS_SubclassProc, 1, 0); +} static LRESULT TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) @@ -1174,15 +1181,7 @@ TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) Free (toolPtr->lpszText); } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } - } + TOOLTIPS_ResetSubclass (toolPtr); /* delete tool from tool list */ if (infoPtr->uNumTools == 1) { @@ -1888,10 +1887,7 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } } - /* Reset subclassing data. */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) - SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, - TOOLTIPS_SubclassProc, 1, 0); + TOOLTIPS_ResetSubclass (toolPtr); } Free (infoPtr->tools); -- 2.15.1

1 0

[PATCH] netapi32/tests: Print NetWkstaTransportEnum error code on test failure
by Alex Henrie 20 Dec '17

20 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This will help us figure out why this test fails intermittently on Windows 10. --- dlls/netapi32/tests/wksta.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index ee3004e17c..418a1ad626 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -168,7 +168,8 @@ static void run_wkstatransportenum_tests(void) /* 4th check: is param 6 passed? */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, NULL, NULL); - ok(apiReturn == RPC_X_NULL_REF_POINTER, "null pointer\n"); + ok(apiReturn == RPC_X_NULL_REF_POINTER, + "NetWkstaTransportEnum returned %d\n", apiReturn); /* final check: valid return, actually get data back */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, -- 2.15.1

2 2

[PATCH] jscript: Use WARN for exception traces instead of separated debug channel.
by Jacek Caban 20 Dec '17

20 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-)

1 0

[PATCH] mfplat: Implement MFGetService()
by Nikolay Sivov 20 Dec '17

20 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44201 dlls/mf/main.c | 23 ++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 153 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 2ad2e5d37b..73cd6aa3f1 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "mfidl.h" @@ -51,3 +53,24 @@ HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array) return E_NOTIMPL; } + +/*********************************************************************** + * MFGetService (mf.@) + */ +HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID riid, void **obj) +{ + IMFGetService *gs; + HRESULT hr; + + TRACE("(%p, %s, %s, %p)\n", object, debugstr_guid(service), debugstr_guid(riid), obj); + + if (!object) + return E_POINTER; + + if (FAILED(hr = IUnknown_QueryInterface(object, &IID_IMFGetService, (void **)&gs))) + return hr; + + hr = IMFGetService_GetService(gs, service, riid, obj); + IMFGetService_Release(gs); + return hr; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 54fa1f3dbe..deb9057153 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -72,7 +72,7 @@ @ stub MFCreateWMVEncoderActivate @ stub MFEnumDeviceSources @ stub MFGetMultipleServiceProviders -@ stub MFGetService +@ stdcall MFGetService(ptr ptr ptr ptr) @ stdcall MFGetSupportedMimeTypes(ptr) @ stub MFGetSupportedSchemes @ stub MFGetTopoNodeCurrentType diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f28c6e048d..76e092aa80 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "mfidl.h" #include "wine/test.h" @@ -43,7 +44,134 @@ static void test_topology(void) IMFTopology_Release(topology); } +static HRESULT WINAPI test_getservice_QI(IMFGetService *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFGetService) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_getservice_AddRef(IMFGetService *iface) +{ + return 2; +} + +static ULONG WINAPI test_getservice_Release(IMFGetService *iface) +{ + return 1; +} + +static HRESULT WINAPI test_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + *obj = (void *)0xdeadbeef; + return 0x83eddead; +} + +static const IMFGetServiceVtbl testmfgetservicevtbl = +{ + test_getservice_QI, + test_getservice_AddRef, + test_getservice_Release, + test_getservice_GetService, +}; + +static IMFGetService test_getservice = { &testmfgetservicevtbl }; + +static HRESULT WINAPI testservice_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IMFGetService)) + return 0x82eddead; + + return E_NOINTERFACE; +} + +static HRESULT WINAPI testservice2_QI(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &test_getservice; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testservice_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI testservice_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl testservicevtbl = +{ + testservice_QI, + testservice_AddRef, + testservice_Release, +}; + +static const IUnknownVtbl testservice2vtbl = +{ + testservice2_QI, + testservice_AddRef, + testservice_Release, +}; + +static IUnknown testservice = { &testservicevtbl }; +static IUnknown testservice2 = { &testservice2vtbl }; + +static void test_MFGetService(void) +{ + IUnknown *unk; + HRESULT hr; + + hr = MFGetService(NULL, NULL, NULL, NULL); + ok(hr == E_POINTER, "Unexpected return value %#x.\n", hr); + + unk = (void *)0xdeadbeef; + hr = MFGetService(NULL, NULL, NULL, (void **)&unk); + ok(hr == E_POINTER, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); + + hr = MFGetService(&testservice, NULL, NULL, NULL); + ok(hr == 0x82eddead, "Unexpected return value %#x.\n", hr); + + unk = (void *)0xdeadbeef; + hr = MFGetService(&testservice, NULL, NULL, (void **)&unk); + ok(hr == 0x82eddead, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); + + unk = NULL; + hr = MFGetService(&testservice2, NULL, NULL, (void **)&unk); + ok(hr == 0x83eddead, "Unexpected return value %#x.\n", hr); + ok(unk == (void *)0xdeadbeef, "Unexpected out object.\n"); +} + START_TEST(mf) { test_topology(); + test_MFGetService(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 2792d383db..12b351d87b 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -256,3 +256,4 @@ cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMedi cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") +cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") -- 2.15.1

1 0

Issues with the registry font keys / entries
by Mihai Todor 20 Dec '17

20 Dec '17

Hi Everyone, I have spent some time trying to improve the font packages in Winetricks and I've run into a few issues with Wine that I hope someone can clarify. I agreed with Austin here https://github.com/Winetricks/winetricks/issues/896 that it would be best to get a wider audience on Wine Devel. First of all, there is some logic somewhere in Wine which automagically populates `HKCU\Software\Wine\Fonts\Cache` when font files are copied into `.wine/drive_c/windows/Fonts/`. The magic seems to be based on inotify, but I don't understand well enough how it works. However, there seems to be a race issue between apps like regedit and notepad and the above mechanism. For example, if I have the corefonts installers cached under `.cache/winetricks/` and I run `winetricks corefonts` and I start notepad immediately after, I notice that the new fonts are not available. Worse, most times (not sure yet how to reproduce it all the time) if I run regedit just after, the new fonts never get added to `HKCU\Software\Wine\Fonts\Cache`, which seems to be the place from where Wine lists fonts through EnumFontFamiliesEx (try running this code https://github.com/kamwoods/FontAnalysis/blob/d894c082221912e72653ae76804a7… just after installing corefonts). This happens on wine-3.0-rc2 and older. Is this the expected behaviour? I'm also wondering why Wine doesn't also write the required entries under `HKLM\Software\Microsoft\Windows[\ NT]?\CurrentVersion\Fonts` when it populates `HKCU\Software\Wine\Fonts\Cache`. Is this a bug? Is there a different way of registering fonts that Winetricks should use? I'd be more than happy to remove this manual registry insertion code from Winetricks... And, I also noticed that a fresh wine install on Ubuntu 16 will auto-populate both `HKLM\Software\Microsoft\Windows[\ NT]?\CurrentVersion\Fonts` keys with the following fonts: Courier -> coure.fon MS Sans Serif -> sserife.fon MS Serif -> serife.fon Small Fonts -> smalle.fon If I look in `HKCU\Software\Wine\Fonts\Cache`, I see that they are located in `/opt/wine-devel/bin/../share/wine/fonts/`, so shouldn't the above entries also point to the same location? And maybe not all apps will like the `..` in the font path... And, since we're here, I noticed that Winetricks registers font replacements under `HKCU\Software\Wine\Fonts\Replacements`, but doesn't add any entries to `HKLM\Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes`. Does Wine completely ignore this key? Thank you, Mihai

2 2

[PATCH] mmdevapi/tests: Fix memory leaks (Coverity)
by Alex Henrie 20 Dec '17

20 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mmdevapi/tests/capture.c | 4 ++-- dlls/mmdevapi/tests/render.c | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 99da296e0a..3cdfda1a37 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -556,8 +556,7 @@ static void test_audioclient(void) if (hr != S_OK) { skip("Cannot initialize %08x, remainder of tests is useless\n", hr); - CoTaskMemFree(pwfx); - return; + goto cleanup; } hr = IAudioClient_GetStreamLatency(ac, NULL); @@ -592,6 +591,7 @@ static void test_audioclient(void) test_capture(ac, handle, pwfx); +cleanup: IAudioClient_Release(ac); CloseHandle(handle); CoTaskMemFree(pwfx); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e394d59cfe..9d3e8617b9 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -323,11 +323,7 @@ static void test_audioclient(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); if (hr != S_OK) - { - IAudioClient_Release(ac); - CoTaskMemFree(pwfx); - return; - } + goto cleanup; hr = IAudioClient_GetStreamLatency(ac, NULL); ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08x\n", hr); @@ -372,8 +368,8 @@ static void test_audioclient(void) hr = IAudioClient_Start(ac); ok(hr == AUDCLNT_E_NOT_STOPPED, "Start twice returns %08x\n", hr); +cleanup: IAudioClient_Release(ac); - CloseHandle(handle); CoTaskMemFree(pwfx); } -- 2.15.1

3 2

[PATCH] include: Add newer definitions for user controls
by Nikolay Sivov 20 Dec '17

20 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/commctrl.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index 587caae88b..e3c166b305 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1032,7 +1032,51 @@ static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; #define BCN_FIRST (0U-1250U) #define BCN_LAST (0U-1350U) -#define BCN_HOTITEMCHANGE (BCN_FIRST + 0x0001) +#define BCN_HOTITEMCHANGE (BCN_FIRST + 1) +#define BCN_DROPDOWN (BCN_FIRST + 2) + +#define BCM_FIRST 0x1600 +#define BCM_GETIDEALSIZE (BCM_FIRST + 1) +#define BCM_SETIMAGELIST (BCM_FIRST + 2) +#define BCM_GETIMAGELIST (BCM_FIRST + 3) +#define BCM_SETTEXTMARGIN (BCM_FIRST + 4) +#define BCM_GETTEXTMARGIN (BCM_FIRST + 5) +#define BCM_SETDROPDOWNSTATE (BCM_FIRST + 6) +#define BCM_SETSPLITINFO (BCM_FIRST + 7) +#define BCM_GETSPLITINFO (BCM_FIRST + 8) +#define BCM_SETNOTE (BCM_FIRST + 9) +#define BCM_GETNOTE (BCM_FIRST + 10) +#define BCM_GETNOTELENGTH (BCM_FIRST + 11) +#define BCM_SETSHIELD (BCM_FIRST + 12) + +#define BUTTON_IMAGELIST_ALIGN_LEFT 0 +#define BUTTON_IMAGELIST_ALIGN_RIGHT 1 +#define BUTTON_IMAGELIST_ALIGN_TOP 2 +#define BUTTON_IMAGELIST_ALIGN_BOTTOM 3 +#define BUTTON_IMAGELIST_ALIGN_CENTER 4 + +#define BCCL_NOGLYPH (HIMAGELIST)(-1) + +typedef struct +{ + HIMAGELIST himl; + RECT margin; + UINT uAlign; +} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST; + +typedef struct tagBUTTON_SPLITINFO +{ + UINT mask; + HIMAGELIST himlGlyph; + UINT uSplitStyle; + SIZE size; +} BUTTON_SPLITINFO, *PBUTTON_SPLITINFO; + +typedef struct tagNMBCDROPDOWN +{ + NMHDR hdr; + RECT rcButton; +} NMBCDROPDOWN; typedef struct tagNMBCHOTITEM { @@ -1041,6 +1085,7 @@ typedef struct tagNMBCHOTITEM } NMBCHOTITEM, *LPNMBCHOTITEM; #define BST_HOT 0x0200 +#define BST_DROPDOWNPUSHED 0x0400 /* Button control styles for _WIN32_WINNT >= 0x600 */ #define BS_SPLITBUTTON 0x0000000C @@ -5147,6 +5192,12 @@ static const WCHAR WC_COMBOBOXW[] = { 'C','o','m','b','o','B','o','x',0 }; #endif #define WC_COMBOBOX WINELIB_NAME_AW(WC_COMBOBOX) +#define CBM_FIRST 0x1700 +#define CB_SETMINVISIBLE (CBM_FIRST + 1) +#define CB_GETMINVISIBLE (CBM_FIRST + 2) +#define CB_SETCUEBANNER (CBM_FIRST + 3) +#define CB_GETCUEBANNER (CBM_FIRST + 4) + /************************************************************************** * Edit control */ @@ -5161,6 +5212,24 @@ static const WCHAR WC_EDITW[] = { 'E','d','i','t',0 }; #endif #define WC_EDIT WINELIB_NAME_AW(WC_EDIT) +typedef struct _tagEDITBALLOONTIP +{ + DWORD cbStruct; + LPCWSTR pszTitle; + LPCWSTR pszText; + INT ttiIcon; +} EDITBALLOONTIP, *PEDITBALLOONTIP; + +#define ECM_FIRSP 0x1500 +#define EM_SETCUEBANNER (ECM_FIRST + 1) +#define EM_GETCUEBANNER (ECM_FIRST + 2) +#define EM_SHOWBALLOONTIP (ECM_FIRST + 3) +#define EM_HIDEBALLOONTIP (ECM_FIRST + 4) +#define EM_SETHILITE (ECM_FIRST + 5) +#define EM_GETHILITE (ECM_FIRST + 6) +#define EM_NOSETFOCUS (ECM_FIRST + 7) +#define EM_TAKEFOCUS (ECM_FIRST + 8) + /************************************************************************** * Listbox control */ -- 2.15.1

1 0

[PATCH] winegstreamer: Hold a reference to the filter in push_data().
by Zebediah Figura 20 Dec '17

20 Dec '17

Fixes bug #43004. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This fixes a regression probably introduced by 38586dcf48bf38c136ea315fd9d83a1be56483b1. dlls/winegstreamer/gstdemux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 95a1630..a19c64f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -510,6 +510,8 @@ static DWORD CALLBACK push_data(LPVOID iface) DWORD_PTR user; HRESULT hr; + IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); + if (!This->stop) IAsyncReader_Length(This->pInputPin.pReader, &maxlen, &curlen); else @@ -589,6 +591,9 @@ static DWORD CALLBACK push_data(LPVOID iface) } while (buf); TRACE("Stopping.. %08x\n", hr); + + IBaseFilter_Release(&This->filter.IBaseFilter_iface); + return 0; } -- 2.7.4

1 0

[PATCH 1/4] user32/tests: Don't leave hwndMain in a topmost state.
by Zebediah Figura 20 Dec '17

20 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index db27b6b..ea9fac2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4011,6 +4011,8 @@ done: if (child) DestroyWindow(child); DestroyWindow(popup); + + SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); } static void test_validatergn(HWND hwnd) -- 2.7.4

2 5

[PATCH] po: Update Norwegian translation.
by Kim Malmo 19 Dec '17

19 Dec '17

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 68 +++++++++++++------------------------------------------------ 1 file changed, 14 insertions(+), 54 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 605b7e8c62..d00e67aebc 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -6998,7 +6998,7 @@ msgstr "Publiserer produktinformasjon" #: msi.rc:118 msgid "Registering Class servers" -msgstr "" +msgstr "Registrerer Klassetjenere" #: msi.rc:119 msgid "Registering COM+ Applications and Components" @@ -7102,7 +7102,7 @@ msgstr "Avpubliserer produktinformasjon" #: msi.rc:145 msgid "Unregister Class servers" -msgstr "" +msgstr "Avregistrerer Klassetjenere" #: msi.rc:146 msgid "Unregistering COM+ Applications and Components" @@ -7162,7 +7162,7 @@ msgstr "Tjeneste: [1]" #: msi.rc:166 msi.rc:169 msi.rc:173 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Fil: [1], Mappe: [9], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [9], Størrelse: [6]" #: msi.rc:167 msgid "Found application: [1]" @@ -7170,7 +7170,7 @@ msgstr "Funnet program: [1]" #: msi.rc:168 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Fil: [1], Mappe: [9], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [9], Størrelse: [6]" #: msi.rc:170 msgid "Service: [2]" @@ -7186,11 +7186,11 @@ msgstr "Program: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "Programkontekst:[1], Assemblynavn:[2]" +msgstr "Programkontekst:[1], Assembly-navn:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "Fil: [1], Mappe: [2], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [2], Størrelse: [6]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" @@ -7202,7 +7202,7 @@ msgstr "Egenskap: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "Klasse ID: [1]" +msgstr "Klasse Id: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" @@ -7222,15 +7222,15 @@ msgstr "MIME innholdstype: [1], Utvidelse: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: msi.rc:185 msi.rc:206 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "Fil: [1], Mappe: [2]" +msgstr "Fil: [1], Katalog: [2]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" @@ -7254,7 +7254,7 @@ msgstr "Fil: [1], Mappe: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2]}}" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" @@ -7282,7 +7282,7 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" -"Installeren har truffet på ett eventet problem under installeringen av denne " +"Installeren har truffet på ett uventet problem under installeringen av denne " "pakken. Dette kan skyldes ett problem med denne pakken. Errorkoden er [1]. " "{{Argumentene er: [2], [3], [4]}}" @@ -10601,47 +10601,6 @@ msgstr "" "eller skallet CMD ble startet fra.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10701,6 +10660,7 @@ msgstr "" "FTYPE\t\tViser eller endrer kommandoer for åpning av ulike filtyper\n" "HELP\t\tViser en kort hjelpebeskrivelse om et emne\n" "MD (MKDIR)\tLager en underkatalog\n" +"MKLINK\tOpprett en symbolsk lenke\n" "MORE\t\tViser utdata i sider\n" "MOVE\t\tFlytter én eller flere filer, eller et katalogtre\n" "PATH\t\tEndrer eller viser søkestien\n" @@ -12531,7 +12491,7 @@ msgstr "" "Brukseksempler:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -- 2.14.1

1 0

[PATCH] comctl32/tooltips: Remove window subclass right before window is destroyed
by Nikolay Sivov 19 Dec '17

19 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Fixes a crash reported as https://bugs.winehq.org/show_bug.cgi?id=14937. dlls/comctl32/tooltips.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index bbf1693f4d..405b1e9f5c 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1888,16 +1888,12 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } + /* Reset subclassing data. */ + if (toolPtr->uInternalFlags & TTF_SUBCLASS) + SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, + TOOLTIPS_SubclassProc, 1, 0); } - } + Free (infoPtr->tools); } @@ -2117,12 +2113,13 @@ TOOLTIPS_WinIniChange (TOOLTIPS_INFO *infoPtr) static LRESULT CALLBACK -TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) +TOOLTIPS_SubclassProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr ((HWND)dwRef); MSG msg; - switch(uMsg) { + switch (message) + { case WM_MOUSEMOVE: case WM_LBUTTONDOWN: case WM_LBUTTONUP: @@ -2130,17 +2127,23 @@ TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_ case WM_MBUTTONUP: case WM_RBUTTONDOWN: case WM_RBUTTONUP: - msg.hwnd = hwnd; - msg.message = uMsg; - msg.wParam = wParam; - msg.lParam = lParam; - TOOLTIPS_RelayEvent(infoPtr, &msg); - break; - + if (infoPtr) + { + msg.hwnd = hwnd; + msg.message = message; + msg.wParam = wParam; + msg.lParam = lParam; + TOOLTIPS_RelayEvent(infoPtr, &msg); + } + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, TOOLTIPS_SubclassProc, 1); + break; default: break; } - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + + return DefSubclassProc(hwnd, message, wParam, lParam); } -- 2.15.1

1 0

[PATCH v2] gdi32: Set otmMacLineGap from the line gap in the hhea table.
by Huw Davies 19 Dec '17

19 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 660900a56e..4db1c7eb56 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7930,7 +7930,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmrcFontBox.bottom = SCALE_Y(ft_face->bbox.yMin); font->potm->otmMacAscent = TM.tmAscent; font->potm->otmMacDescent = -TM.tmDescent; - font->potm->otmMacLineGap = font->potm->otmLineGap; + font->potm->otmMacLineGap = SCALE_Y(pHori->Line_Gap); font->potm->otmusMinimumPPEM = 0; /* TT Header */ font->potm->otmptSubscriptSize.x = SCALE_X(pOS2->ySubscriptXSize); font->potm->otmptSubscriptSize.y = SCALE_Y(pOS2->ySubscriptYSize); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bd04a8b6b1..117a14f153 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1790,17 +1790,17 @@ static void test_GetKerningPairs(void) kd[i].otmMacDescent, otm.otmMacDescent); ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n", kd[i].otmMacAscent, otm.otmMacAscent); -todo_wine { +todo_wine ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n", kd[i].otmsCapEmHeight, otm.otmsCapEmHeight); +todo_wine ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n", kd[i].otmsXHeight, otm.otmsXHeight); - /* FIXME: this one sometimes succeeds due to expected 0, enable it when removing todo */ - if (0) ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", + ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); +todo_wine ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n", kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); -} total_kern_pairs = GetKerningPairsW(hdc, 0, NULL); trace("total_kern_pairs %u\n", total_kern_pairs); -- 2.12.0

2 1

Upcoming TestBot patches
by Francois Gouget 19 Dec '17

19 Dec '17

For those that are interested I'm trying to regularly push my set of 'might be ready to send' patches on GitHub: https://github.com/fgouget/wine-tools/tree/future So feel free to have a look and / or test it. -- Francois Gouget <fgouget(a)codeweavers.com>

2 4

[PATCH] bcrypt: Require macOS version 10.7 or newer for encryption support.
by Hans Leidekker 19 Dec '17

19 Dec '17

Reported by Ryan Schmidt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 35c0e4a076..55cf2f6f28 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H +#include <AvailabilityMacros.h> #include <CommonCrypto/CommonCryptor.h> #elif defined(SONAME_LIBGNUTLS) #include <gnutls/gnutls.h> @@ -766,7 +767,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 static ULONG get_block_size( enum alg_id alg ) { ULONG ret = 0, size = sizeof(ret); @@ -895,7 +896,7 @@ static NTSTATUS key_destroy( struct key *key ) HeapFree( GetProcessHeap(), 0, key ); return STATUS_SUCCESS; } -#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 struct key { struct object hdr; -- 2.11.0

1 0

[PATCH] bcrypt: Fix build on macOS 10.8 and older.
by Hans Leidekker 19 Dec '17

19 Dec '17

Based on a patch by Ryan Schmidt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 3bdc463904..35c0e4a076 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -949,13 +949,13 @@ static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) key->ref_decrypt = NULL; } - if ((status = CCCryptorCreateWithMode( kCCEncrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv, + if ((status = CCCryptorCreateWithMode( kCCEncrypt, kCCModeCBC, kCCAlgorithmAES128, ccNoPadding, iv, key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_encrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); return STATUS_INTERNAL_ERROR; } - if ((status = CCCryptorCreateWithMode( kCCDecrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv, + if ((status = CCCryptorCreateWithMode( kCCDecrypt, kCCModeCBC, kCCAlgorithmAES128, ccNoPadding, iv, key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_decrypt )) != kCCSuccess) { WARN( "CCCryptorCreateWithMode failed %d\n", status ); -- 2.11.0

1 0

Patch to fix error: use of undeclared identifier 'kCCAlgorithmAES'
by Ryan Schmidt 19 Dec '17

19 Dec '17

I was instructed to send this patch to this mailing list. It fixes https://bugs.winehq.org/show_bug.cgi?id=44173

2 2

[PATCH] comctl32/tests: Remove some workarounds that no longer apply
by Nikolay Sivov 19 Dec '17

19 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/edit.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 1453271986..9feb9b42bc 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1675,40 +1675,30 @@ static void test_margins_font_change(void) SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 0 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ - "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ - "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 0, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ - "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ - "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ - "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ - "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ - "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ - "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1 || broken(LOWORD(margins) != 1 && LOWORD(margins) != LOWORD(font_margins)), /* win95 */ - "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1 || broken(HIWORD(margins) != 1 && HIWORD(margins) != HIWORD(font_margins)), /* win95 */ - "got %d\n", HIWORD(margins)); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); /* Above a certain size threshold then the margin is updated */ SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); @@ -1731,8 +1721,7 @@ static void test_margins_font_change(void) ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) != LOWORD(font_margins) || broken(LOWORD(margins) == LOWORD(font_margins)), /* win98 */ - "got %d\n", LOWORD(margins)); + ok(LOWORD(margins) != LOWORD(font_margins), "got %d\n", LOWORD(margins)); ok(HIWORD(margins) != HIWORD(font_margins), "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, WM_SETFONT, 0, 0); -- 2.15.1

1 0

[PATCH] gdi32: Set otmMacLineGap from the line gap in the hhea table.
by Huw Davies 19 Dec '17

19 Dec '17

From: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 660900a56e..4db1c7eb56 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7930,7 +7930,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmrcFontBox.bottom = SCALE_Y(ft_face->bbox.yMin); font->potm->otmMacAscent = TM.tmAscent; font->potm->otmMacDescent = -TM.tmDescent; - font->potm->otmMacLineGap = font->potm->otmLineGap; + font->potm->otmMacLineGap = SCALE_Y(pHori->Line_Gap); font->potm->otmusMinimumPPEM = 0; /* TT Header */ font->potm->otmptSubscriptSize.x = SCALE_X(pOS2->ySubscriptXSize); font->potm->otmptSubscriptSize.y = SCALE_Y(pOS2->ySubscriptYSize); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bd04a8b6b1..117a14f153 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1790,17 +1790,17 @@ static void test_GetKerningPairs(void) kd[i].otmMacDescent, otm.otmMacDescent); ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n", kd[i].otmMacAscent, otm.otmMacAscent); -todo_wine { +todo_wine ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n", kd[i].otmsCapEmHeight, otm.otmsCapEmHeight); +todo_wine ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n", kd[i].otmsXHeight, otm.otmsXHeight); - /* FIXME: this one sometimes succeeds due to expected 0, enable it when removing todo */ - if (0) ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", + ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); +todo_wine ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n", kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); -} total_kern_pairs = GetKerningPairsW(hdc, 0, NULL); trace("total_kern_pairs %u\n", total_kern_pairs); -- 2.12.0

1 1

[PATCH] comctl32/tests: Add ListBox tests
by Nikolay Sivov 19 Dec '17

19 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/listbox.c | 1862 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 1863 insertions(+) create mode 100644 dlls/comctl32/tests/listbox.c diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 4fd0f0299e..f93ff2585d 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ header.c \ imagelist.c \ ipaddress.c \ + listbox.c \ listview.c \ misc.c \ monthcal.c \ diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c new file mode 100644 index 0000000000..23aaac29e2 --- /dev/null +++ b/dlls/comctl32/tests/listbox.c @@ -0,0 +1,1862 @@ +/* Unit test suite for list boxes. + * + * Copyright 2003 Ferenc Wagner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" + +#include "wine/test.h" +#include "v6util.h" + +static const char * const strings[4] = { + "First added", + "Second added", + "Third added", + "Fourth added which is very long because at some time we only had a 256 byte character buffer and " + "that was overflowing in one of those applications that had a common dialog file open box and tried " + "to add a 300 characters long custom filter string which of course the code did not like and crashed. " + "Just make sure this string is longer than 256 characters." +}; + +static const char BAD_EXTENSION[] = "*.badtxt"; + +static HWND create_listbox(DWORD add_style, HWND parent) +{ + INT_PTR ctl_id = 0; + HWND handle; + + if (parent) + ctl_id=1; + + handle = CreateWindowA("LISTBOX", "TestList", (LBS_STANDARD & ~LBS_SORT) | add_style, 0, 0, 100, 100, + parent, (HMENU)ctl_id, NULL, 0); + ok(handle != NULL, "Failed to create listbox window.\n"); + + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[0]); + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[1]); + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[2]); + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[3]); + + return handle; +} + +struct listbox_prop +{ + DWORD add_style; +}; + +struct listbox_stat +{ + int selected, anchor, caret, selcount; +}; + +struct listbox_test +{ + struct listbox_prop prop; + struct listbox_stat init, init_todo; + struct listbox_stat click, click_todo; + struct listbox_stat step, step_todo; + struct listbox_stat sel, sel_todo; +}; + +static void listbox_query(HWND handle, struct listbox_stat *results) +{ + results->selected = SendMessageA(handle, LB_GETCURSEL, 0, 0); + results->anchor = SendMessageA(handle, LB_GETANCHORINDEX, 0, 0); + results->caret = SendMessageA(handle, LB_GETCARETINDEX, 0, 0); + results->selcount = SendMessageA(handle, LB_GETSELCOUNT, 0, 0); +} + +static void buttonpress(HWND handle, WORD x, WORD y) +{ + LPARAM lp = x + (y << 16); + + SendMessageA(handle, WM_LBUTTONDOWN, MK_LBUTTON, lp); + SendMessageA(handle, WM_LBUTTONUP, 0, lp); +} + +static void keypress(HWND handle, WPARAM keycode, BYTE scancode, BOOL extended) +{ + LPARAM lp = 1 + (scancode << 16) + (extended ? KEYEVENTF_EXTENDEDKEY : 0); + + SendMessageA(handle, WM_KEYDOWN, keycode, lp); + SendMessageA(handle, WM_KEYUP , keycode, lp | 0xc000000); +} + +#define listbox_field_ok(t, s, f, got) \ + ok (t.s.f==got.f, "style %#x, step " #s ", field " #f \ + ": expected %d, got %d\n", (unsigned int)t.prop.add_style, \ + t.s.f, got.f) + +#define listbox_todo_field_ok(t, s, f, got) \ + todo_wine_if (t.s##_todo.f) { listbox_field_ok(t, s, f, got); } + +#define listbox_ok(t, s, got) \ + listbox_todo_field_ok(t, s, selected, got); \ + listbox_todo_field_ok(t, s, anchor, got); \ + listbox_todo_field_ok(t, s, caret, got); \ + listbox_todo_field_ok(t, s, selcount, got) + +static void run_test(const struct listbox_test test) +{ + struct listbox_stat answer; + HWND hLB=create_listbox (test.prop.add_style, 0); + RECT second_item; + int i, res; + + listbox_query (hLB, &answer); + listbox_ok (test, init, answer); + + SendMessageA(hLB, LB_GETITEMRECT, 1, (LPARAM) &second_item); + buttonpress(hLB, (WORD)second_item.left, (WORD)second_item.top); + + listbox_query(hLB, &answer); + listbox_ok(test, click, answer); + + keypress(hLB, VK_DOWN, 0x50, TRUE); + + listbox_query(hLB, &answer); + listbox_ok(test, step, answer); + + DestroyWindow(hLB); + + hLB = create_listbox(test.prop.add_style, 0); + + SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 2)); + listbox_query(hLB, &answer); + listbox_ok(test, sel, answer); + + for (i = 0; i < 4; i++) + { + DWORD size = SendMessageA(hLB, LB_GETTEXTLEN, i, 0); + int resA, resW; + WCHAR *txtw; + CHAR *txt; + + txt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + 1); + resA = SendMessageA(hLB, LB_GETTEXT, i, (LPARAM)txt); + ok(!strcmp(txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); + + txtw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (size + 1) * sizeof(*txtw)); + resW = SendMessageW(hLB, LB_GETTEXT, i, (LPARAM)txtw); + if (resA != resW) + trace("SendMessageW(LB_GETTEXT) not supported on this platform (resA=%d resW=%d), skipping...\n", resA, resW); + else + { + WideCharToMultiByte(CP_ACP, 0, txtw, -1, txt, size, NULL, NULL); + ok(!strcmp (txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); + } + + HeapFree(GetProcessHeap(), 0, txtw); + HeapFree(GetProcessHeap(), 0, txt); + } + + /* Confirm the count of items, and that an invalid delete does not remove anything */ + res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); + ok(res == 4, "Expected 4 items, got %d\n", res); + res = SendMessageA(hLB, LB_DELETESTRING, -1, 0); + ok(res == LB_ERR, "Expected LB_ERR items, got %d\n", res); + res = SendMessageA(hLB, LB_DELETESTRING, 4, 0); + ok(res == LB_ERR, "Expected LB_ERR items, got %d\n", res); + res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); + ok(res == 4, "Expected 4 items, got %d\n", res); + + DestroyWindow(hLB); +} + +static void test_item_height(void) +{ + INT itemHeight; + TEXTMETRICA tm; + HFONT font; + HWND hLB; + HDC hdc; + + hLB = create_listbox (0, 0); + ok ((hdc = GetDCEx( hLB, 0, DCX_CACHE )) != 0, "Can't get hdc\n"); + ok ((font = GetCurrentObject(hdc, OBJ_FONT)) != 0, "Can't get the current font\n"); + ok (GetTextMetricsA( hdc, &tm ), "Can't read font metrics\n"); + ReleaseDC( hLB, hdc); + + ok (SendMessageA(hLB, WM_SETFONT, (WPARAM)font, 0) == 0, "Can't set font\n"); + + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok (itemHeight == tm.tmHeight, "Item height wrong, got %d, expecting %d\n", itemHeight, tm.tmHeight); + + DestroyWindow (hLB); + + hLB = CreateWindowA("LISTBOX", "TestList", LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, NULL, NULL, NULL, 0); + + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(itemHeight > 0 && itemHeight <= tm.tmHeight, "Unexpected item height %d, expected %d.\n", + itemHeight, tm.tmHeight); + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 5, 0); + ok(itemHeight > 0 && itemHeight <= tm.tmHeight, "Unexpected item height %d, expected %d.\n", + itemHeight, tm.tmHeight); + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, -5, 0); + ok(itemHeight > 0 && itemHeight <= tm.tmHeight, "Unexpected item height %d, expected %d.\n", + itemHeight, tm.tmHeight); + + DestroyWindow (hLB); +} + +static int got_selchange; + +static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_DRAWITEM: + { + RECT rc_item, rc_client, rc_clip; + DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lparam; + + ok(wparam == dis->CtlID, "got wParam=%08lx instead of %08x\n", wparam, dis->CtlID); + ok(dis->CtlType == ODT_LISTBOX, "wrong CtlType %04x\n", dis->CtlType); + + GetClientRect(dis->hwndItem, &rc_client); + GetClipBox(dis->hDC, &rc_clip); + ok(EqualRect(&rc_client, &rc_clip) || IsRectEmpty(&rc_clip), + "client rect of the listbox should be equal to the clip box," + "or the clip box should be empty\n"); + + SendMessageA(dis->hwndItem, LB_GETITEMRECT, dis->itemID, (LPARAM)&rc_item); + ok(EqualRect(&dis->rcItem, &rc_item), "item rects are not equal\n"); + + break; + } + + case WM_COMMAND: + if (HIWORD( wparam ) == LBN_SELCHANGE) got_selchange++; + break; + + default: + break; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static HWND create_parent( void ) +{ + static ATOM class; + WNDCLASSA cls; + + if (!class) + { + cls.style = 0; + cls.lpfnWndProc = main_window_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(NULL); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "main_window_class"; + class = RegisterClassA( &cls ); + } + + return CreateWindowExA(0, "main_window_class", NULL, WS_POPUP | WS_VISIBLE, 100, 100, 400, 400, GetDesktopWindow(), + 0, GetModuleHandleA(NULL), NULL); +} + +static void test_ownerdraw(void) +{ + HWND parent, hLB; + INT ret; + RECT rc; + + parent = create_parent(); + assert(parent); + + hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); + assert(hLB); + + SetForegroundWindow(hLB); + UpdateWindow(hLB); + + /* make height short enough */ + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); + + /* make 0 item invisible */ + SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); + ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); + ok(ret == 1, "wrong top index %d\n", ret); + + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok(!IsRectEmpty(&rc), "empty item rect\n"); + ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); + + DestroyWindow(hLB); + DestroyWindow(parent); +} + +#define listbox_test_query(exp, got) \ + ok(exp.selected == got.selected, "expected selected %d, got %d\n", exp.selected, got.selected); \ + ok(exp.anchor == got.anchor, "expected anchor %d, got %d\n", exp.anchor, got.anchor); \ + ok(exp.caret == got.caret, "expected caret %d, got %d\n", exp.caret, got.caret); \ + ok(exp.selcount == got.selcount, "expected selcount %d, got %d\n", exp.selcount, got.selcount); + +static void test_LB_SELITEMRANGE(void) +{ + static const struct listbox_stat test_nosel = { 0, LB_ERR, 0, 0 }; + static const struct listbox_stat test_1 = { 0, LB_ERR, 0, 2 }; + static const struct listbox_stat test_2 = { 0, LB_ERR, 0, 3 }; + static const struct listbox_stat test_3 = { 0, LB_ERR, 0, 4 }; + struct listbox_stat answer; + HWND hLB; + INT ret; + + hLB = create_listbox(LBS_EXTENDEDSEL, 0); + assert(hLB); + + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 2)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_1, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(0, 4)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_3, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(-5, 5)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(2, 10)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_1, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(4, 10)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(10, 1)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_2, answer); + + SendMessageA(hLB, LB_SETSEL, FALSE, -1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, -1)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_2, answer); + + DestroyWindow(hLB); +} + +static void test_LB_SETCURSEL(void) +{ + HWND parent, hLB; + INT ret; + + parent = create_parent(); + ok(parent != NULL, "Failed to create parent window.\n"); + + hLB = create_listbox(LBS_NOINTEGRALHEIGHT | WS_CHILD, parent); + ok(hLB != NULL, "Failed to create listbox.\n"); + + SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 32); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == 2, "LB_SETCURSEL returned %d instead of 2\n", ret); + ret = GetScrollPos(hLB, SB_VERT); + ok(ret == 0, "expected vscroll 0, got %d\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 3, 0); + ok(ret == 3, "LB_SETCURSEL returned %d instead of 3\n", ret); + ret = GetScrollPos(hLB, SB_VERT); + ok(ret == 1, "expected vscroll 1, got %d\n", ret); + + DestroyWindow(hLB); +} + +static void test_listbox_height(void) +{ + HWND hList; + int r, id; + + hList = CreateWindowA( "ListBox", "list test", 0, + 1, 1, 600, 100, NULL, NULL, NULL, NULL ); + ok( hList != NULL, "failed to create listbox\n"); + + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + ok( id == 0, "item id wrong\n"); + + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 20, 0 )); + ok( r == 0, "send message failed\n"); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "height wrong\n"); + + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0, 30 )); + ok( r == -1, "send message failed\n"); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "height wrong\n"); + + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 256, 0 )); + ok( r == -1, "Failed to set item height, %d.\n", r); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "Unexpected item height %d.\n", r); + + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0xff, 0 )); + ok( r == 0, "send message failed\n"); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 0xff, "height wrong\n"); + + DestroyWindow( hList ); +} + +static void test_itemfrompoint(void) +{ + /* WS_POPUP is required in order to have a more accurate size calculation ( + without caption). LBS_NOINTEGRALHEIGHT is required in order to test + behavior of partially-displayed item. + */ + HWND hList = CreateWindowA( "ListBox", "list test", + WS_VISIBLE|WS_POPUP|LBS_NOINTEGRALHEIGHT, + 1, 1, 600, 100, NULL, NULL, NULL, NULL ); + ULONG r, id; + RECT rc; + + /* For an empty listbox win2k returns 0x1ffff, win98 returns 0x10000, nt4 returns 0xffffffff */ + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); + ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 700, 30 )); + ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 30, 300 )); + ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + ok( id == 0, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi1"); + ok( id == 1, "item id wrong\n"); + + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); + ok( r == 0x1, "ret %x\n", r ); + + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 601 )); + ok( r == 0x10001, "ret %x\n", r ); + + /* Resize control so that below assertions about sizes are valid */ + r = SendMessageA( hList, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok( r == 1, "ret %x\n", r); + r = MoveWindow(hList, 1, 1, 600, (rc.bottom - rc.top + 1) * 9 / 2, TRUE); + ok( r != 0, "ret %x\n", r); + + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi2"); + ok( id == 2, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi3"); + ok( id == 3, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi4"); + ok( id == 4, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi5"); + ok( id == 5, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi6"); + ok( id == 6, "item id wrong\n"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi7"); + ok( id == 7, "item id wrong\n"); + + /* Set the listbox up so that id 1 is at the top, this leaves 5 + partially visible at the bottom and 6, 7 are invisible */ + + SendMessageA( hList, LB_SETTOPINDEX, 1, 0); + r = SendMessageA( hList, LB_GETTOPINDEX, 0, 0); + ok( r == 1, "top %d\n", r); + + r = SendMessageA( hList, LB_GETITEMRECT, 5, (LPARAM)&rc); + ok( r == 1, "ret %x\n", r); + r = SendMessageA( hList, LB_GETITEMRECT, 6, (LPARAM)&rc); + ok( r == 0, "ret %x\n", r); + + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(/* x */ 10, /* y */ 10) ); + ok( r == 1, "ret %x\n", r); + + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(1000, 10) ); + ok( r == 0x10001, "ret %x\n", r ); + + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, -10) ); + ok( r == 0x10001, "ret %x\n", r ); + + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 100) ); + ok( r == 0x10005, "item %x\n", r ); + + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 200) ); + ok( r == 0x10005, "item %x\n", r ); + + DestroyWindow( hList ); +} + +static void test_listbox_item_data(void) +{ + HWND hList; + int r, id; + + hList = CreateWindowA( "ListBox", "list test", 0, + 1, 1, 600, 100, NULL, NULL, NULL, NULL ); + ok( hList != NULL, "failed to create listbox\n"); + + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + ok( id == 0, "item id wrong\n"); + + r = SendMessageA( hList, LB_SETITEMDATA, 0, MAKELPARAM( 20, 0 )); + ok(r == TRUE, "LB_SETITEMDATA returned %d instead of TRUE\n", r); + + r = SendMessageA( hList, LB_GETITEMDATA, 0, 0); + ok( r == 20, "get item data failed\n"); + + DestroyWindow( hList ); +} + +static void test_listbox_LB_DIR(void) +{ + HWND hList; + int res, itemCount; + int itemCount_justFiles; + int itemCount_justDrives; + int itemCount_allFiles; + int itemCount_allDirs; + int i; + char pathBuffer[MAX_PATH]; + char * p; + char driveletter; + const char *wildcard = "*"; + HANDLE file; + + file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); + CloseHandle( file ); + + /* NOTE: for this test to succeed, there must be no subdirectories + under the current directory. In addition, there must be at least + one file that fits the wildcard w*.c . Normally, the test + directory itself satisfies both conditions. + */ + hList = CreateWindowA( "ListBox", "list test", WS_VISIBLE|WS_POPUP, + 1, 1, 600, 100, NULL, NULL, NULL, NULL ); + assert(hList); + + /* Test for standard usage */ + + /* This should list all the files in the test directory. */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); + if (res == -1) /* "*" wildcard doesn't work on win9x */ + { + wildcard = "*.*"; + strcpy(pathBuffer, wildcard); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); + } + ok (res >= 0, "SendMessage(LB_DIR, 0, *) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount > 0, "SendMessage(LB_DIR) did NOT fill the listbox!\n"); + itemCount_allFiles = itemCount; + ok(res + 1 == itemCount, + "SendMessage(LB_DIR, 0, *) returned incorrect index (expected %d got %d)!\n", + itemCount - 1, res); + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); + ok (res == -1, "SendMessage(LB_DIR, 0, %s) returned %d, expected -1\n", BAD_EXTENSION, res); + + /* There should be NO content in the listbox */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == 0, "SendMessage(LB_DIR) DID fill the listbox!\n"); + + + /* This should list all the w*.c files in the test directory + * As of this writing, this includes win.c, winstation.c, wsprintf.c + */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); + ok (res >= 0, "SendMessage(LB_DIR, 0, w*.c) failed - 0x%08x\n", GetLastError()); + + /* Path specification does NOT converted to uppercase */ + ok (!strcmp(pathBuffer, "w*.c"), + "expected no change to pathBuffer, got %s\n", pathBuffer); + + /* There should be some content in the listbox */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount > 0, "SendMessage(LB_DIR) did NOT fill the listbox!\n"); + itemCount_justFiles = itemCount; + ok(res + 1 == itemCount, + "SendMessage(LB_DIR, 0, w*.c) returned incorrect index (expected %d got %d)!\n", + itemCount - 1, res); + + /* Every single item in the control should start with a w and end in .c */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + ok(((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test DDL_DIRECTORY */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY, *) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. + * All files plus "[..]" + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + itemCount_allDirs = itemCount - itemCount_allFiles; + ok (itemCount >= itemCount_allFiles, + "SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with %d entries, expected > %d\n", + itemCount, itemCount_allFiles); + ok(res + 1 == itemCount, + "SendMessage(LB_DIR, DDL_DIRECTORY, *) returned incorrect index (expected %d got %d)!\n", + itemCount - 1, res); + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + ok (res == -1, "SendMessage(LB_DIR, DDL_DIRECTORY, %s) returned %d, expected -1\n", BAD_EXTENSION, res); + + /* There should be NO content in the listbox */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == 0, "SendMessage(LB_DIR) DID fill the listbox!\n"); + + /* Test DDL_DIRECTORY */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + ok (res >= 0, "SendMessage(LB_DIR, DDL_DIRECTORY, w*.c) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. Since the parent directory does not + * fit w*.c, there should be exactly the same number of items as without DDL_DIRECTORY + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justFiles, + "SendMessage(LB_DIR, DDL_DIRECTORY, w*.c) filled with %d entries, expected %d\n", + itemCount, itemCount_justFiles); + ok(res + 1 == itemCount, + "SendMessage(LB_DIR, DDL_DIRECTORY, w*.c) returned incorrect index (expected %d got %d)!\n", + itemCount - 1, res); + + /* Every single item in the control should start with a w and end in .c. */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + ok( + ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test DDL_DRIVES|DDL_EXCLUSIVE */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res >= 0, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be at least one element before, since the string "[-c-]" should + * have been added. Depending on the user setting, more drives might have + * been added. + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount >= 1, + "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) filled with %d entries, expected at least %d\n", + itemCount, 1); + itemCount_justDrives = itemCount; + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) returned incorrect index!\n"); + + /* Every single item in the control should fit the format [-c-] */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + ok( strlen(pathBuffer) == 5, "Length of drive string is not 5\n" ); + ok( sscanf(pathBuffer, "[-%c-]", &driveletter) == 1, "Element %d (%s) does not fit [-X-]\n", i, pathBuffer); + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + if (!(driveletter >= 'a' && driveletter <= 'z')) + { + /* Correct after invalid entry is found */ + itemCount_justDrives--; + } + } + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, %s) returned %d, expected %d\n", + BAD_EXTENSION, res, itemCount_justDrives -1); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives, "SendMessage(LB_DIR) returned %d expected %d\n", + itemCount, itemCount_justDrives); + + /* Test DDL_DRIVES. */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DRIVES, *) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be at least one element before, since the string "[-c-]" should + * have been added. Depending on the user setting, more drives might have + * been added. + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_allFiles, + "SendMessage(LB_DIR, DDL_DRIVES, *) filled with %d entries, expected %d\n", + itemCount, itemCount_justDrives + itemCount_allFiles); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DRIVES, *) returned incorrect index!\n"); + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); + ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DRIVES, %s) returned %d, expected %d\n", + BAD_EXTENSION, res, itemCount_justDrives -1); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); + + /* Test DDL_DRIVES. */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DRIVES, w*.c) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be at least one element before, since the string "[-c-]" should + * have been added. Depending on the user setting, more drives might have + * been added. + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_justFiles, + "SendMessage(LB_DIR, DDL_DRIVES, w*.c) filled with %d entries, expected %d\n", + itemCount, itemCount_justDrives + itemCount_justFiles); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DRIVES, w*.c) returned incorrect index!\n"); + + /* Every single item in the control should fit the format [-c-], or w*.c */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + { + ok( strlen(pathBuffer) == 5, "Length of drive string is not 5\n" ); + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + } + else + { + ok( + ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + } + + /* Test DDL_DIRECTORY|DDL_DRIVES. This does *not* imply DDL_EXCLUSIVE */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, *) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be exactly the number of plain files, plus the number of mapped drives. + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_allFiles + itemCount_justDrives + itemCount_allDirs, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", + itemCount, itemCount_allFiles + itemCount_justDrives + itemCount_allDirs); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, w*.c) returned incorrect index!\n"); + + /* Every single item in the control should start with a w and end in .c, + * except for the "[..]" string, which should appear exactly as it is, + * and the mapped drives in the format "[-X-]". + */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + } + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); + ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, %s) returned %d, expected %d\n", + BAD_EXTENSION, res, itemCount_justDrives -1); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); + + /* Test DDL_DIRECTORY|DDL_DRIVES. */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, w*.c) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be exactly the number of plain files, plus the number of mapped drives. + */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justFiles + itemCount_justDrives, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", + itemCount, itemCount_justFiles + itemCount_justDrives); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, w*.c) returned incorrect index!\n"); + + /* Every single item in the control should start with a w and end in .c, + * except the mapped drives in the format "[-X-]". The "[..]" directory + * should not appear. + */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + else + ok( + ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test DDL_DIRECTORY|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res != -1 || broken(res == -1), "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err %u\n", + GetLastError()); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_allDirs, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, itemCount_allDirs); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) returned incorrect index!\n"); + + if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(hList, LB_GETTEXT, 0, (LPARAM)pathBuffer); + ok( !strcmp(pathBuffer, "[..]"), "First element is not [..]\n"); + } + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res == -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, %s) returned %d, expected %d\n", + BAD_EXTENSION, res, -1); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); + + + /* Test DDL_DIRECTORY|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res == LB_ERR, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, w*.c) returned %d expected %d\n", res, LB_ERR); + + /* There should be no elements, since "[..]" does not fit w*.c */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == 0, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, 0); + + /* Test DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, wildcard); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c,) failed - 0x%08x\n", GetLastError()); + + /* There should be no plain files on the listbox */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_allDirs, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, itemCount_justDrives + itemCount_allDirs); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c) returned incorrect index!\n"); + + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + else + ok( pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']', + "Element %d (%s) does not fit expected [...]\n", i, pathBuffer); + } + + /* This tests behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, %s) returned %d, expected %d\n", + BAD_EXTENSION, res, itemCount_justDrives -1); + + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); + + /* Test DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, "w*.c"); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + ok (res >= 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c,) failed - 0x%08x\n", GetLastError()); + + /* There should be no plain files on the listbox, and no [..], since it does not fit w*.c */ + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives, + "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, itemCount_justDrives); + ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c) returned incorrect index!\n"); + + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + ok (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1, "Element %d (%s) does not fit [-X-]\n", i, pathBuffer); + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + } + DestroyWindow(hList); + + DeleteFileA( "wtest1.tmp.c" ); +} + +static HWND g_listBox; +static HWND g_label; + +#define ID_TEST_LABEL 1001 +#define ID_TEST_LISTBOX 1002 + +static BOOL on_listbox_container_create(HWND hwnd, CREATESTRUCTA *lpcs) +{ + g_label = CreateWindowA("Static", "Contents of static control before DlgDirList.", + WS_CHILD | WS_VISIBLE, 10, 10, 512, 32, hwnd, (HMENU)ID_TEST_LABEL, NULL, 0); + if (!g_label) return FALSE; + + g_listBox = CreateWindowA("ListBox", "DlgDirList test", + WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER | WS_VSCROLL, 10, 60, 256, 256, + hwnd, (HMENU)ID_TEST_LISTBOX, NULL, 0); + if (!g_listBox) return FALSE; + + return TRUE; +} + +static LRESULT CALLBACK listbox_container_window_procA(HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) +{ + LRESULT result = 0; + + switch (uiMsg) + { + case WM_DESTROY: + PostQuitMessage(0); + break; + case WM_CREATE: + result = on_listbox_container_create(hwnd, (CREATESTRUCTA *)lParam) ? 0 : (LRESULT)-1; + break; + default: + result = DefWindowProcA(hwnd, uiMsg, wParam, lParam); + break; + } + return result; +} + +static BOOL RegisterListboxWindowClass(HINSTANCE hInst) +{ + WNDCLASSA cls; + + cls.style = 0; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = hInst; + cls.hIcon = NULL; + cls.hCursor = LoadCursorA (NULL, (LPCSTR)IDC_ARROW); + cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + cls.lpszMenuName = NULL; + cls.lpfnWndProc = listbox_container_window_procA; + cls.lpszClassName = "ListboxContainerClass"; + if (!RegisterClassA (&cls)) return FALSE; + + return TRUE; +} + +static void test_listbox_dlgdir(void) +{ + HINSTANCE hInst; + HWND hWnd; + int res, itemCount; + int itemCount_allDirs; + int itemCount_justFiles; + int itemCount_justDrives; + int i; + char pathBuffer[MAX_PATH]; + char itemBuffer[MAX_PATH]; + char tempBuffer[MAX_PATH]; + char * p; + char driveletter; + HANDLE file; + + file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); + CloseHandle( file ); + + /* NOTE: for this test to succeed, there must be no subdirectories + under the current directory. In addition, there must be at least + one file that fits the wildcard w*.c . Normally, the test + directory itself satisfies both conditions. + */ + + hInst = GetModuleHandleA(0); + if (!RegisterListboxWindowClass(hInst)) assert(0); + + hWnd = CreateWindowA("ListboxContainerClass", "ListboxContainerClass", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + NULL, NULL, hInst, 0); + ok(hWnd != NULL, "Failed to create container window.\n"); + + /* Test for standard usage */ + + /* The following should be overwritten by the directory path */ + SendMessageA(g_label, WM_SETTEXT, 0, (LPARAM)"default contents"); + + /* This should list all the w*.c files in the test directory + * As of this writing, this includes win.c, winstation.c, wsprintf.c + */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, 0); + ok (res == 1, "DlgDirList(*.c, 0) returned %d - expected 1 - 0x%08x\n", res, GetLastError()); + + /* Path specification gets converted to uppercase */ + ok (!strcmp(pathBuffer, "W*.C"), + "expected conversion to uppercase, got %s\n", pathBuffer); + + /* Loaded path should have overwritten the label text */ + SendMessageA(g_label, WM_GETTEXT, MAX_PATH, (LPARAM)pathBuffer); + ok (strcmp("default contents", pathBuffer), "DlgDirList() did not modify static control!\n"); + + /* There should be some content in the listbox */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount > 0, "DlgDirList() did NOT fill the listbox!\n"); + itemCount_justFiles = itemCount; + + /* Every single item in the control should start with a w and end in .c */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + ok(((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, 0); + ok (res == 1, "DlgDirList(%s, 0) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == 0, "DlgDirList() DID fill the listbox!\n"); + + /* Test DDL_DIRECTORY */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY); + ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be exactly more elements than before, since the directories should + * have been added. + */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + itemCount_allDirs = itemCount - itemCount_justFiles; + ok (itemCount >= itemCount_justFiles, "DlgDirList(DDL_DIRECTORY) filled with %d entries, expected > %d\n", + itemCount, itemCount_justFiles); + + /* Every single item in the control should start with a w and end in .c, + * except for the "[..]" string, which should appear exactly as it is. + */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + ok( (pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']') || + ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY); + ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_allDirs, "DlgDirList() incorrectly filled the listbox! (expected %d got %d)\n", + itemCount_allDirs, itemCount); + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + ok( pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']', + "Element %d (%s) does not fit requested [...]\n", i, pathBuffer); + } + + /* Test DDL_DRIVES. At least on WinXP-SP2, this implies DDL_EXCLUSIVE */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DRIVES); + ok (res == 1, "DlgDirList(*.c, DDL_DRIVES) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be at least one element before, since the string "[-c-]" should + * have been added. Depending on the user setting, more drives might have + * been added. + */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount >= 1, + "DlgDirList(DDL_DRIVES) filled with %d entries, expected at least %d\n", + itemCount, 1); + itemCount_justDrives = itemCount; + + /* Every single item in the control should fit the format [-c-] */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + ok( strlen(pathBuffer) == 5, "Length of drive string is not 5\n" ); + ok( sscanf(pathBuffer, "[-%c-]", &driveletter) == 1, "Element %d (%s) does not fit [-X-]\n", i, pathBuffer); + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + if (!(driveletter >= 'a' && driveletter <= 'z')) { + /* Correct after invalid entry is found */ + trace("removing count of invalid entry %s\n", pathBuffer); + itemCount_justDrives--; + } + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DRIVES); + ok (res == 1, "DlgDirList(%s, DDL_DRIVES) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives, "DlgDirList() incorrectly filled the listbox!\n"); + + /* Test DDL_DIRECTORY|DDL_DRIVES. This does *not* imply DDL_EXCLUSIVE */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES); + ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY|DDL_DRIVES) failed - 0x%08x\n", GetLastError()); + + /* There should be some content in the listbox. In particular, there should + * be exactly the number of plain files, plus the number of mapped drives, + * plus one "[..]" + */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justFiles + itemCount_justDrives + itemCount_allDirs, + "DlgDirList(DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", + itemCount, itemCount_justFiles + itemCount_justDrives + itemCount_allDirs); + + /* Every single item in the control should start with a w and end in .c, + * except for the "[..]" string, which should appear exactly as it is, + * and the mapped drives in the format "[-X-]". + */ + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + p = pathBuffer + strlen(pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + else + ok( (pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']') || + ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && + (*(p-1) == 'c' || *(p-1) == 'C') && + (*(p-2) == '.')), "Element %d (%s) does not fit requested w*.c\n", i, pathBuffer); + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES); + ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY|DDL_DRIVES) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_allDirs, + "DlgDirList() incorrectly filled the listbox! (expected %d got %d)\n", + itemCount_justDrives + itemCount_allDirs, itemCount); + + /* Test DDL_DIRECTORY|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_EXCLUSIVE); + ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY|DDL_EXCLUSIVE) failed - 0x%08x\n", GetLastError()); + + /* There should be exactly one element: "[..]" */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_allDirs, + "DlgDirList(DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, itemCount_allDirs); + + if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ + { + memset(pathBuffer, 0, MAX_PATH); + SendMessageA(g_listBox, LB_GETTEXT, 0, (LPARAM)pathBuffer); + ok( !strcmp(pathBuffer, "[..]"), "First (and only) element is not [..]\n"); + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_EXCLUSIVE); + ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY|DDL_EXCLUSIVE) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); + + /* Test DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE. */ + strcpy(pathBuffer, "w*.c"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE); + ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) failed - 0x%08x\n", GetLastError()); + + /* There should be no plain files on the listbox */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_allDirs, + "DlgDirList(DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", + itemCount, itemCount_justDrives + itemCount_allDirs); + + for (i = 0; i < itemCount; i++) + { + memset(pathBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) + ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); + else + ok( pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']', + "Element %d (%s) does not fit expected [...]\n", i, pathBuffer); + } + + /* Test behavior when no files match the wildcard */ + strcpy(pathBuffer, BAD_EXTENSION); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE); + ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) returned %d expected 1\n", BAD_EXTENSION, res); + + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); + + /* Now test DlgDirSelectEx() in normal operation */ + /* Fill with everything - drives, directory and all plain files. */ + strcpy(pathBuffer, "*"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES); + ok (res != 0, "DlgDirList(*, DDL_DIRECTORY|DDL_DRIVES) failed - 0x%08x\n", GetLastError()); + + SendMessageA(g_listBox, LB_SETCURSEL, -1, 0); /* Unselect any current selection */ + memset(pathBuffer, 0, MAX_PATH); + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with no selection modified last error code from 0xdeadbeef to 0x%08x\n", + GetLastError()); + ok (res == 0, "DlgDirSelectEx() with no selection returned %d, expected 0\n", res); + /* WinXP-SP2 leaves pathBuffer untouched, but Win98 fills it with garbage. */ + /* + ok (strlen(pathBuffer) == 0, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); + */ + /* Test proper drive/dir/file recognition */ + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + for (i = 0; i < itemCount; i++) + { + memset(itemBuffer, 0, MAX_PATH); + memset(pathBuffer, 0, MAX_PATH); + memset(tempBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)itemBuffer); + res = SendMessageA(g_listBox, LB_SETCURSEL, i, 0); + ok (res == i, "SendMessageA(LB_SETCURSEL, %d) failed\n", i); + if (sscanf(itemBuffer, "[-%c-]", &driveletter) == 1) + { + /* Current item is a drive letter */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 1, "DlgDirSelectEx() thinks %s (%s) is not a drive/directory!\n", itemBuffer, pathBuffer); + + /* For drive letters, DlgDirSelectEx tacks on a colon */ + ok (pathBuffer[0] == driveletter && pathBuffer[1] == ':' && pathBuffer[2] == '\0', + "%d: got \"%s\" expected \"%c:\"\n", i, pathBuffer, driveletter); + } + else if (itemBuffer[0] == '[') + { + /* Current item is the parent directory */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 1, "DlgDirSelectEx() thinks %s (%s) is not a drive/directory!\n", itemBuffer, pathBuffer); + + /* For directories, DlgDirSelectEx tacks on a backslash */ + p = pathBuffer + strlen(pathBuffer); + ok (*(p-1) == '\\', "DlgDirSelectEx did NOT tack on a backslash to dir, got %s\n", pathBuffer); + + tempBuffer[0] = '['; + lstrcpynA(tempBuffer + 1, pathBuffer, strlen(pathBuffer)); + strcat(tempBuffer, "]"); + ok (!strcmp(tempBuffer, itemBuffer), "Formatted directory should be %s, got %s\n", tempBuffer, itemBuffer); + } + else + { + /* Current item is a plain file */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 0, "DlgDirSelectEx() thinks %s (%s) is a drive/directory!\n", itemBuffer, pathBuffer); + + /* NOTE: WinXP tacks a period on all files that lack an extension. This affects + * for example, "Makefile", which gets reported as "Makefile." + */ + strcpy(tempBuffer, itemBuffer); + if (strchr(tempBuffer, '.') == NULL) strcat(tempBuffer, "."); + ok (!strcmp(pathBuffer, tempBuffer), "Formatted file should be %s, got %s\n", tempBuffer, pathBuffer); + } + } + + DeleteFileA( "wtest1.tmp.c" ); + + /* Now test DlgDirSelectEx() in abnormal operation */ + /* Fill list with bogus entries, that look somewhat valid */ + SendMessageA(g_listBox, LB_RESETCONTENT, 0, 0); + SendMessageA(g_listBox, LB_ADDSTRING, 0, (LPARAM)"[notexist.dir]"); + SendMessageA(g_listBox, LB_ADDSTRING, 0, (LPARAM)"notexist.fil"); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); + for (i = 0; i < itemCount; i++) + { + memset(itemBuffer, 0, MAX_PATH); + memset(pathBuffer, 0, MAX_PATH); + memset(tempBuffer, 0, MAX_PATH); + driveletter = '\0'; + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)itemBuffer); + res = SendMessageA(g_listBox, LB_SETCURSEL, i, 0); + ok (res == i, "SendMessage(LB_SETCURSEL, %d) failed\n", i); + if (sscanf(itemBuffer, "[-%c-]", &driveletter) == 1) + { + /* Current item is a drive letter */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 1, "DlgDirSelectEx() thinks %s (%s) is not a drive/directory!\n", itemBuffer, pathBuffer); + + /* For drive letters, DlgDirSelectEx tacks on a colon */ + ok (pathBuffer[0] == driveletter && pathBuffer[1] == ':' && pathBuffer[2] == '\0', + "%d: got \"%s\" expected \"%c:\"\n", i, pathBuffer, driveletter); + } + else if (itemBuffer[0] == '[') + { + /* Current item is the parent directory */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 1, "DlgDirSelectEx() thinks %s (%s) is not a drive/directory!\n", itemBuffer, pathBuffer); + + /* For directories, DlgDirSelectEx tacks on a backslash */ + p = pathBuffer + strlen(pathBuffer); + ok (*(p-1) == '\\', "DlgDirSelectEx did NOT tack on a backslash to dir, got %s\n", pathBuffer); + + tempBuffer[0] = '['; + lstrcpynA(tempBuffer + 1, pathBuffer, strlen(pathBuffer)); + strcat(tempBuffer, "]"); + ok (!strcmp(tempBuffer, itemBuffer), "Formatted directory should be %s, got %s\n", tempBuffer, itemBuffer); + } + else + { + /* Current item is a plain file */ + SetLastError(0xdeadbeef); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + ok (GetLastError() == 0xdeadbeef, + "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", + i, GetLastError()); + ok(res == 0, "DlgDirSelectEx() thinks %s (%s) is a drive/directory!\n", itemBuffer, pathBuffer); + + /* NOTE: WinXP and Win98 tack a period on all files that lack an extension. + * This affects for example, "Makefile", which gets reported as "Makefile." + */ + strcpy(tempBuffer, itemBuffer); + if (strchr(tempBuffer, '.') == NULL) strcat(tempBuffer, "."); + ok (!strcmp(pathBuffer, tempBuffer), "Formatted file should be %s, got %s\n", tempBuffer, pathBuffer); + } + } + + /* Test behavior when loading folders from root with and without wildcard */ + strcpy(pathBuffer, "C:\\"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res, "DlgDirList failed to list C:\\ folders\n"); + todo_wine ok(!strcmp(pathBuffer, "*"), "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + strcpy(pathBuffer, "C:\\*"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res, "DlgDirList failed to list C:\\* folders\n"); + ok(!strcmp(pathBuffer, "*"), "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + /* Try loading files from an invalid folder */ + SetLastError(0xdeadbeef); + strcpy(pathBuffer, "C:\\INVALID$$DIR"); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + "GetLastError should return 0x589, got 0x%X\n",GetLastError()); + + DestroyWindow(hWnd); +} + +static void test_set_count( void ) +{ + HWND parent, listbox; + LONG ret; + RECT r; + + parent = create_parent(); + listbox = create_listbox( LBS_OWNERDRAWFIXED | LBS_NODATA | WS_CHILD | WS_VISIBLE, parent ); + + UpdateWindow( listbox ); + GetUpdateRect( listbox, &r, TRUE ); + ok( IsRectEmpty( &r ), "got non-empty rect\n"); + + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); + ok( ret == 0, "got %d\n", ret ); + ret = SendMessageA( listbox, LB_GETCOUNT, 0, 0 ); + ok( ret == 100, "got %d\n", ret ); + + GetUpdateRect( listbox, &r, TRUE ); + ok( !IsRectEmpty( &r ), "got empty rect\n"); + + ValidateRect( listbox, NULL ); + GetUpdateRect( listbox, &r, TRUE ); + ok( IsRectEmpty( &r ), "got non-empty rect\n"); + + ret = SendMessageA( listbox, LB_SETCOUNT, 99, 0 ); + ok( ret == 0, "got %d\n", ret ); + + GetUpdateRect( listbox, &r, TRUE ); + ok( !IsRectEmpty( &r ), "got empty rect\n"); + + DestroyWindow( listbox ); + DestroyWindow( parent ); +} + +static int lb_getlistboxinfo; + +static LRESULT WINAPI listbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == LB_GETLISTBOXINFO) + lb_getlistboxinfo++; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + +static void test_GetListBoxInfo(void) +{ + HWND listbox, parent; + WNDPROC oldproc; + DWORD ret; + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + oldproc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (LONG_PTR)listbox_subclass_proc); + SetWindowLongPtrA(listbox, GWLP_USERDATA, (LONG_PTR)oldproc); + + lb_getlistboxinfo = 0; + ret = GetListBoxInfo(listbox); + ok(ret > 0, "got %d\n", ret); + ok(lb_getlistboxinfo == 1, "got %d\n", lb_getlistboxinfo); + + DestroyWindow(listbox); + DestroyWindow(parent); +} + +static void test_missing_lbuttonup(void) +{ + HWND listbox, parent, capture; + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + /* Send button down without a corresponding button up */ + SendMessageA(listbox, WM_LBUTTONDOWN, 0, MAKELPARAM(10, 10)); + capture = GetCapture(); + ok(capture == listbox, "got %p expected %p\n", capture, listbox); + + /* Capture is released and LBN_SELCHANGE sent during WM_KILLFOCUS */ + got_selchange = 0; + SetFocus(NULL); + capture = GetCapture(); + ok(capture == NULL, "got %p\n", capture); + ok(got_selchange, "got %d\n", got_selchange); + + DestroyWindow(listbox); + DestroyWindow(parent); +} + +static void test_extents(void) +{ + HWND listbox, parent; + SCROLLINFO sinfo; + DWORD res; + BOOL br; + + parent = create_parent(); + + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent < width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 64, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + DestroyWindow(listbox); + + listbox = create_listbox(WS_CHILD | WS_VISIBLE | WS_HSCROLL, parent); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent < width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 64, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 183, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + DestroyWindow(listbox); + + + listbox = create_listbox(WS_CHILD | WS_VISIBLE | WS_HSCROLL | LBS_DISABLENOSCROLL, parent); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + /* horizontal extent < width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 64, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 183, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + DestroyWindow(listbox); + + DestroyWindow(parent); +} + +static void test_listbox(void) +{ + static const struct listbox_test SS = + /* {add_style} */ + {{0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}, + { 1, 1, 1, LB_ERR}, {0,0,0,0}, + { 2, 2, 2, LB_ERR}, {0,0,0,0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}}; + + /* {selected, anchor, caret, selcount}{TODO fields} */ + static const struct listbox_test SS_NS = + {{LBS_NOSEL}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}, + { 1, 1, 1, LB_ERR}, {0,0,0,0}, + { 2, 2, 2, LB_ERR}, {0,0,0,0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}}; + + static const struct listbox_test MS = + {{LBS_MULTIPLESEL}, + { 0, LB_ERR, 0, 0}, {0,0,0,0}, + { 1, 1, 1, 1}, {0,0,0,0}, + { 2, 1, 2, 1}, {0,0,0,0}, + { 0, LB_ERR, 0, 2}, {0,0,0,0}}; + + static const struct listbox_test MS_NS = + {{LBS_MULTIPLESEL | LBS_NOSEL}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}, + { 1, 1, 1, LB_ERR}, {0,0,0,0}, + { 2, 2, 2, LB_ERR}, {0,0,0,0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}}; + + static const struct listbox_test ES = + {{LBS_EXTENDEDSEL}, + { 0, LB_ERR, 0, 0}, {0,0,0,0}, + { 1, 1, 1, 1}, {0,0,0,0}, + { 2, 2, 2, 1}, {0,0,0,0}, + { 0, LB_ERR, 0, 2}, {0,0,0,0}}; + + static const struct listbox_test ES_NS = + {{LBS_EXTENDEDSEL | LBS_NOSEL}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}, + { 1, 1, 1, LB_ERR}, {0,0,0,0}, + { 2, 2, 2, LB_ERR}, {0,0,0,0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}}; + + static const struct listbox_test EMS = + {{LBS_EXTENDEDSEL | LBS_MULTIPLESEL}, + { 0, LB_ERR, 0, 0}, {0,0,0,0}, + { 1, 1, 1, 1}, {0,0,0,0}, + { 2, 2, 2, 1}, {0,0,0,0}, + { 0, LB_ERR, 0, 2}, {0,0,0,0}}; + + static const struct listbox_test EMS_NS = + {{LBS_EXTENDEDSEL | LBS_MULTIPLESEL | LBS_NOSEL}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}, + { 1, 1, 1, LB_ERR}, {0,0,0,0}, + { 2, 2, 2, LB_ERR}, {0,0,0,0}, + {LB_ERR, LB_ERR, 0, LB_ERR}, {0,0,0,0}}; + + run_test(SS); + run_test(SS_NS); + run_test(MS); + run_test(MS_NS); + run_test(ES); + run_test(ES_NS); + run_test(EMS); + run_test(EMS_NS); +} + +START_TEST(listbox) +{ + ULONG_PTR ctx_cookie; + HANDLE hCtx; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + test_listbox(); + test_item_height(); + test_ownerdraw(); + test_LB_SELITEMRANGE(); + test_LB_SETCURSEL(); + test_listbox_height(); + test_itemfrompoint(); + test_listbox_item_data(); + test_listbox_LB_DIR(); + test_listbox_dlgdir(); + test_set_count(); + test_GetListBoxInfo(); + test_missing_lbuttonup(); + test_extents(); + + unload_v6_module(ctx_cookie, hCtx); +} -- 2.15.1

1 0

[PATCH] gdi32/tests: Enable the otmMacLineGap tests
by Alex Henrie 19 Dec '17

19 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/gdi32/tests/font.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bd04a8b6b1..b732cde854 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1790,17 +1790,18 @@ static void test_GetKerningPairs(void) kd[i].otmMacDescent, otm.otmMacDescent); ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n", kd[i].otmMacAscent, otm.otmMacAscent); -todo_wine { +todo_wine ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n", kd[i].otmsCapEmHeight, otm.otmsCapEmHeight); +todo_wine ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n", kd[i].otmsXHeight, otm.otmsXHeight); - /* FIXME: this one sometimes succeeds due to expected 0, enable it when removing todo */ - if (0) ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", +todo_wine_if(kd[i].otmMacLineGap) + ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); +todo_wine ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n", kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); -} total_kern_pairs = GetKerningPairsW(hdc, 0, NULL); trace("total_kern_pairs %u\n", total_kern_pairs); -- 2.15.1

2 3

[PATCH] gdi32: Clamp unsigned integers to 32-bit range when scaling fonts
by Alex Henrie 19 Dec '17

19 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes test crash (floating point exception due to double value outside of integer range) with TAMu_Kadampari.ttf from Arch Linux's ttf-indic-otf package. sTypoLineGap is -194 in this font, and Windows 10 sets otmLineGap to 4294967295. Also fixes the crash with GohaTibebZemen.otf from Arch's xorg-fonts-misc package. sCapHeight and sxHeight are -32768 in this font, and Windows 10 refuses to install it. However, Windows XP installs the font without complaint and sets otmsCapEmHeight and otmsXHeight to 4294966903. I think the 0.00000009% difference from UINT_MAX is just rounding error. --- dlls/gdi32/freetype.c | 11 ++++++----- dlls/gdi32/gdi_private.h | 7 +++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7c5a7ef979..961f9e5f03 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7578,19 +7578,20 @@ static void scale_outline_font_metrics(const GdiFont *font, OUTLINETEXTMETRICW * #define SCALE_X(x) (x) = GDI_ROUND((double)(x) * (scale_x)) #define SCALE_Y(y) (y) = GDI_ROUND((double)(y) * (scale_y)) +#define SCALE_YU(y) (y) = GDI_ROUND_UINT((double)(y) * (scale_y)) SCALE_Y(potm->otmAscent); SCALE_Y(potm->otmDescent); - SCALE_Y(potm->otmLineGap); - SCALE_Y(potm->otmsCapEmHeight); - SCALE_Y(potm->otmsXHeight); + SCALE_YU(potm->otmLineGap); + SCALE_YU(potm->otmsCapEmHeight); + SCALE_YU(potm->otmsXHeight); SCALE_Y(potm->otmrcFontBox.top); SCALE_Y(potm->otmrcFontBox.bottom); SCALE_X(potm->otmrcFontBox.left); SCALE_X(potm->otmrcFontBox.right); SCALE_Y(potm->otmMacAscent); SCALE_Y(potm->otmMacDescent); - SCALE_Y(potm->otmMacLineGap); + SCALE_YU(potm->otmMacLineGap); SCALE_X(potm->otmptSubscriptSize.x); SCALE_Y(potm->otmptSubscriptSize.y); SCALE_X(potm->otmptSubscriptOffset.x); @@ -7599,7 +7600,7 @@ static void scale_outline_font_metrics(const GdiFont *font, OUTLINETEXTMETRICW * SCALE_Y(potm->otmptSuperscriptSize.y); SCALE_X(potm->otmptSuperscriptOffset.x); SCALE_Y(potm->otmptSuperscriptOffset.y); - SCALE_Y(potm->otmsStrikeoutSize); + SCALE_YU(potm->otmsStrikeoutSize); SCALE_Y(potm->otmsStrikeoutPosition); SCALE_Y(potm->otmsUnderscoreSize); SCALE_Y(potm->otmsUnderscorePosition); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4236aa3690..c591057e3a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -141,6 +141,13 @@ static inline INT GDI_ROUND(double val) return (int)floor(val + 0.5); } +static inline UINT GDI_ROUND_UINT(double val) +{ + double ret = floor(val + 0.5); + if (ret > UINT_MAX) return UINT_MAX; + return (UINT)ret; +} + #define GET_DC_PHYSDEV(dc,func) \ get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(struct gdi_dc_funcs,func)) -- 2.15.1

3 4

[PATCH 1/4] testbot: Keep a record of the status of the VMs.
by Francois Gouget 18 Dec '17

18 Dec '17

Each row of the new Records table allows storing part of the details of an event or of the state of the TestBot. These pieces of information are put together into groups and timestamped through the RecordGroups table. Together these tables allow rebuilding the activity of the TestBot. The first user of these new tables is the job scheduler which uses them to store the new VM status if it changed. This will allow rebuilding and visualizing the activity of the TestBot for monitoring or debugging. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch requires updating the database with the update29.sql script and then restarting the TestBot Engine and web server. testbot/bin/Janitor.pl | 21 ++ testbot/ddl/update29.sql | 20 ++ testbot/ddl/winetestbot.sql | 19 ++ testbot/doc/winetestbot-schema.dia | 338 ++++++++++++++++++++++++++++++++ testbot/lib/WineTestBot/Jobs.pm | 64 +++++- testbot/lib/WineTestBot/RecordGroups.pm | 117 +++++++++++ testbot/lib/WineTestBot/Records.pm | 126 ++++++++++++ testbot/lib/WineTestBot/VMs.pm | 60 ++++++ 8 files changed, 760 insertions(+), 5 deletions(-) create mode 100644 testbot/ddl/update29.sql create mode 100644 testbot/lib/WineTestBot/RecordGroups.pm create mode 100644 testbot/lib/WineTestBot/Records.pm diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index c07c21bd..4f0e4de0 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -5,6 +5,7 @@ # archives old jobs and purges older jobs and patches. # # Copyright 2009 Ge van Geldorp +# Copyright 2017 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -45,6 +46,7 @@ use WineTestBot::Log; use WineTestBot::Patches; use WineTestBot::PendingPatchSets; use WineTestBot::CGI::Sessions; +use WineTestBot::RecordGroups; use WineTestBot::Users; use WineTestBot::VMs; @@ -267,3 +269,22 @@ else { LogMsg "0Unable to open '$DataDir/staging': $!"; } + +# Delete obsolete record groups +if ($JobPurgeDays != 0) +{ + $DeleteBefore = time() - $JobPurgeDays * 86400; + my $RecordGroups = CreateRecordGroups(); + foreach my $RecordGroup (@{$RecordGroups->GetItems()}) + { + if ($RecordGroup->Timestamp < $DeleteBefore) + { + my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); + if (defined($ErrMessage)) + { + LogMsg $ErrMessage, "\n"; + } + } + } + $RecordGroups = undef; +} diff --git a/testbot/ddl/update29.sql b/testbot/ddl/update29.sql new file mode 100644 index 00000000..af49814f --- /dev/null +++ b/testbot/ddl/update29.sql @@ -0,0 +1,20 @@ +USE winetestbot; + +CREATE TABLE RecordGroups +( + Id INT(6) NOT NULL AUTO_INCREMENT, + Timestamp DATETIME NOT NULL, + PRIMARY KEY (Id) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE Records +( + RecordGroupId INT(6) NOT NULL, + Type ENUM('engine', 'tasks', 'vmresult', 'vmstatus') NOT NULL, + Name VARCHAR(96) NOT NULL, + Value VARCHAR(64) NULL, + PRIMARY KEY (RecordGroupId, Type, Name), + FOREIGN KEY (RecordGroupId) REFERENCES RecordGroups(Id) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 12c1b689..ad8d1a92 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -158,6 +158,25 @@ CREATE TABLE Tasks ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE RecordGroups +( + Id INT(6) NOT NULL AUTO_INCREMENT, + Timestamp DATETIME NOT NULL, + PRIMARY KEY (Id) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE Records +( + RecordGroupId INT(6) NOT NULL, + Type ENUM('engine', 'tasks', 'vmresult', 'vmstatus') NOT NULL, + Name VARCHAR(96) NOT NULL, + Value VARCHAR(64) NULL, + PRIMARY KEY (RecordGroupId, Type, Name), + FOREIGN KEY (RecordGroupId) REFERENCES RecordGroups(Id) +) +ENGINE=InnoDB DEFAULT CHARSET=utf8; + INSERT INTO Roles (Name, IsDefaultRole) VALUES('admin', 'N'); INSERT INTO Roles (Name, IsDefaultRole) VALUES('wine-devel', 'Y'); diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 9092c417..ef7c3ca7 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -3218,5 +3218,343 @@ <dia:real val="0.10000000000000001"/> </dia:attribute> </dia:object> + <dia:object type="Database - Table" version="0" id="O23"> + <dia:attribute name="obj_pos"> + <dia:point val="14.12,3.7"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="14.12,3.7;24.66,8.3"/> + </dia:attribute> + <dia:attribute name="meta"> + <dia:composite type="dict"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="14.12,3.7"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="10.539999999999999"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="4.6000000000000005"/> + </dia:attribute> + <dia:attribute name="name"> + <dia:string>#Records#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="visible_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="underline_primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="tagging_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="bold_primary_keys"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="attributes"> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#RecordGroupId#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(6)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Type#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#ENUM#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Name#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(96)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Value#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(64)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> + </dia:object> + <dia:object type="Database - Table" version="0" id="O24"> + <dia:attribute name="obj_pos"> + <dia:point val="2.61,3.7125"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="2.61,3.7125;10.455,6.7125"/> + </dia:attribute> + <dia:attribute name="meta"> + <dia:composite type="dict"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="2.61,3.7125"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="7.8449999999999998"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="3"/> + </dia:attribute> + <dia:attribute name="name"> + <dia:string>#RecordGroups#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="visible_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="underline_primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="tagging_comment"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="bold_primary_keys"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="attributes"> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Id#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(6)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Timestamp#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#DATETIME#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> + </dia:object> + <dia:object type="Database - Reference" version="0" id="O25"> + <dia:attribute name="obj_pos"> + <dia:point val="10.455,5.4125"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="10.405,4.75;14.17,5.4625"/> + </dia:attribute> + <dia:attribute name="meta"> + <dia:composite type="dict"/> + </dia:attribute> + <dia:attribute name="orth_points"> + <dia:point val="10.455,5.4125"/> + <dia:point val="11.95,5.4125"/> + <dia:point val="11.95,5.4"/> + <dia:point val="14.12,5.4"/> + </dia:attribute> + <dia:attribute name="orth_orient"> + <dia:enum val="0"/> + <dia:enum val="1"/> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="orth_autoroute"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> + <dia:attribute name="line_style"> + <dia:enum val="0"/> + <dia:real val="1"/> + </dia:attribute> + <dia:attribute name="corner_radius"> + <dia:real val="0"/> + </dia:attribute> + <dia:attribute name="end_arrow"> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="start_point_desc"> + <dia:string>#1#</dia:string> + </dia:attribute> + <dia:attribute name="end_point_desc"> + <dia:string>#1..n#</dia:string> + </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.59999999999999998"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O24" connection="13"/> + <dia:connection handle="1" to="O23" connection="12"/> + </dia:connections> + </dia:object> </dia:layer> </dia:diagram> diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 0144ddec..73fc34eb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -377,6 +377,7 @@ use WineTestBot::WineTestBotObjects; use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Patches; +use WineTestBot::RecordGroups; use WineTestBot::Steps; use WineTestBot::Users; use WineTestBot::VMs; @@ -488,10 +489,9 @@ kept on standby so they are ready when their turn comes. =back =cut -sub ScheduleOnHost($$$) +sub ScheduleOnHost($$$$) { - my ($ScopeObject, $SortedJobs, $Hypervisors) = @_; - + my ($ScopeObject, $SortedJobs, $Hypervisors, $Records) = @_; my $HostVMs = CreateVMs($ScopeObject); $HostVMs->FilterEnabledRole(); @@ -580,7 +580,7 @@ sub ScheduleOnHost($$$) { my $ErrMessage = $Task->Run($Step); return $ErrMessage if (defined $ErrMessage); - + $VM->RecordStatus($Records, join(" ", "running", $Job->Id, $Step->No, $Task->No)); $Job->UpdateStatus(); $IdleCount--; $RunningCount++; @@ -655,6 +655,7 @@ sub ScheduleOnHost($$$) my $ErrMessage = $VM->RunPowerOff(); return $ErrMessage if (defined $ErrMessage); + $VM->RecordStatus($Records, "dirty poweroff"); } # Power off some idle VMs we don't need immediately so we can revert more @@ -672,6 +673,7 @@ sub ScheduleOnHost($$$) my $ErrMessage = $VM->RunPowerOff(); return $ErrMessage if (defined $ErrMessage); + $VM->RecordStatus($Records, "dirty poweroff"); $PlannedActiveCount--; last if ($PlannedActiveCount <= $MaxActiveVMs); } @@ -733,6 +735,8 @@ sub ScheduleOnHost($$$) return undef; } +my $_LastTaskCounts = ""; + =pod =over 12 @@ -746,12 +750,40 @@ them using WineTestBot::Jobs::ScheduleOnHost(). sub ScheduleJobs() { + my $RecordGroups = CreateRecordGroups(); + my $RecordGroup = $RecordGroups->Add(); + my $Records = $RecordGroup->Records; + # Save the new RecordGroup now so its Id is lower than those of the groups + # created by the scripts called from the scheduler. + $RecordGroups->Save(); + my $Jobs = CreateJobs(); $Jobs->AddFilter("Status", ["queued", "running"]); my @SortedJobs = sort CompareJobPriority @{$Jobs->GetItems()}; # Note that even if there are no jobs to schedule # we should check if there are VMs to revert + # Count the runnable and queued tasks for the record + my ($RunnableTasks, $QueuedTasks) = (0, 0); + foreach my $Job (@SortedJobs) + { + my $Steps = $Job->Steps; + $Steps->AddFilter("Status", ["queued", "running"]); + my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; + next if (!@SortedSteps); + + my $Tasks = $SortedSteps[0]->Tasks; + $Tasks->AddFilter("Status", ["queued"]); + $RunnableTasks += @{$Tasks->GetItems()}; + + foreach my $Step (@SortedSteps) + { + my $Tasks = $Step->Tasks; + $Tasks->AddFilter("Status", ["queued"]); + $QueuedTasks += scalar(@{$Tasks->GetItems()}); + } + } + my %Hosts; my $VMs = CreateVMs($Jobs); $VMs->FilterEnabledRole(); @@ -765,9 +797,31 @@ sub ScheduleJobs() foreach my $Host (keys %Hosts) { my @HostHypervisors = keys %{$Hosts{$Host}}; - my $HostErrMessage = ScheduleOnHost($Jobs, \@SortedJobs, \@HostHypervisors); + my $HostErrMessage = ScheduleOnHost($Jobs, \@SortedJobs, \@HostHypervisors, $Records); push @ErrMessages, $HostErrMessage if (defined $HostErrMessage); } + + # Note that any VM Status or Role change will trigger ScheduleJobs() so this + # records all VM state changes. + $VMs = CreateVMs(); + map { $_->RecordStatus($Records) } (@{$VMs->GetItems()}); + if (@{$Records->GetItems()}) + { + # FIXME Add the number of tasks scheduled to run on a maintenance, retired + # or deleted VM... + my $TaskCounts = "$RunnableTasks $QueuedTasks 0"; + if ($TaskCounts ne $_LastTaskCounts) + { + $Records->AddRecord('tasks', 'counters', $TaskCounts); + $_LastTaskCounts = $TaskCounts; + } + $RecordGroups->Save(); + } + else + { + $RecordGroups->DeleteItem($RecordGroup); + } + return @ErrMessages ? join("\n", @ErrMessages) : undef; } diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm new file mode 100644 index 00000000..b33d16eb --- /dev/null +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -0,0 +1,117 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Copyright 2017 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package WineTestBot::RecordGroup; + +=head1 NAME + +WineTestBot::RecordGroup - a group of related history records + +=head1 DESCRIPTION + +A RecordGroup is a group of WineTestBot::Record objects describing an event +or the state of the TestBot at at a given time. + +=cut + +use WineTestBot::WineTestBotObjects; +use WineTestBot::Config; + +use vars qw (@ISA @EXPORT); + +require Exporter; +@ISA = qw(WineTestBot::WineTestBotItem Exporter); + +sub InitializeNew($$) +{ + my ($self, $Collection) = @_; + + $self->Timestamp(time()); + + $self->SUPER::InitializeNew($Collection); +} + + +package WineTestBot::RecordGroups; + +=head1 NAME + +WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects + +=cut + +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; +use ObjectModel::DetailrefPropertyDescriptor; +use ObjectModel::PropertyDescriptor; +use WineTestBot::WineTestBotObjects; +use WineTestBot::Records; + +use vars qw (@ISA @EXPORT @PropertyDescriptors); + +require Exporter; +@ISA = qw(WineTestBot::WineTestBotCollection Exporter); +@EXPORT = qw(&CreateRecordGroups &SaveRecord); + + +BEGIN +{ + @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Id", "Group id", 1, 1, "S", 6), + CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), + CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, \&CreateRecords), + ); +} + +sub CreateItem($) +{ + my ($self) = @_; + + return WineTestBot::RecordGroup->new($self); +} + +sub CreateRecordGroups(;$) +{ + my ($ScopeObject) = @_; + return WineTestBot::RecordGroups->new("RecordGroups", "RecordGroups", "RecordGroup", + \@PropertyDescriptors, $ScopeObject); +} + +=pod +=over 12 + +=item C<SaveRecord()> + +Creates and saves a standalone record. + +=back +=cut + +sub SaveRecord($$;$) +{ + my ($Type, $Name, $Value) = @_; + + my $RecordGroups = CreateRecordGroups(); + my $Records = $RecordGroups->Add()->Records; + $Records->AddRecord($Type, $Name, $Value); + + return $RecordGroups->Save(); +} + +1; diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm new file mode 100644 index 00000000..dd0fec97 --- /dev/null +++ b/testbot/lib/WineTestBot/Records.pm @@ -0,0 +1,126 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Copyright 2017 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package WineTestBot::Record; + +=head1 NAME + +WineTestBot::Record - records part of an event or the state of the TestBot. + +=head1 DESCRIPTION + +A Record is created to save information about an event or part of the state of +the TestBot at a given time. A full description of said event or state may +require a variable number of Records so they are part of a RecordGroup which +identifies which other Records relate to the same event or state. +The RecordGroup also stores the timestamp of the event or state. + +The point of the Record objects is to keep a record of the activity of the +TestBot. By putting them together it is possible to rebuild what the TestBot +did and when, for debugging or performance analysis. The amount of details is +only limited by the amount of data dumped into the Records table. + +=cut + +use WineTestBot::Config; +use WineTestBot::WineTestBotObjects; + +use vars qw (@ISA @EXPORT); + +require Exporter; +@ISA = qw(WineTestBot::WineTestBotItem Exporter); + +sub InitializeNew($$) +{ + my ($self, $Collection) = @_; + + $self->SUPER::InitializeNew($Collection); +} + + +package WineTestBot::Records; + +=head1 NAME + +WineTestBot::Records - A collection of WineTestBot::Record objects + +=cut + +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; +use ObjectModel::PropertyDescriptor; +use WineTestBot::WineTestBotObjects; + +use vars qw (@ISA @EXPORT @PropertyDescriptors); + +require Exporter; +@ISA = qw(WineTestBot::WineTestBotCollection Exporter); +@EXPORT = qw(&CreateRecords); + + +BEGIN +{ + @PropertyDescriptors = ( + CreateEnumPropertyDescriptor("Type", "Type", 1, 1, ['engine', 'tasks', 'vmresult', 'vmstatus']), + CreateBasicPropertyDescriptor("Name", "Name", 1, 1, "A", 96), + CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), + ); +} + +sub CreateItem($) +{ + my ($self) = @_; + + return WineTestBot::Record->new($self); +} + +sub CreateRecords(;$$) +{ + my ($ScopeObject, $RecordGroup) = @_; + return WineTestBot::Records->new("Records", "Records", "Record", + \@PropertyDescriptors, $ScopeObject, + $RecordGroup); +} + +=pod +=over 12 + +=item C<AddRecord()> + +This is a convenience function for adding a new record to a Records collection +and setting its properties at the same time. + +=back +=cut + +sub AddRecord($$$;$) +{ + my ($self, $Type, $Name, $Value) = @_; + + my $Record = $self->Add(); + my $TemporaryKey = $Record->GetKey(); + $Record->Type($Type); + $Record->Name($Name); + $Record->Value($Value) if (defined $Value); + $self->KeyChanged($TemporaryKey, $Record->GetKey()); + + return $Record; +} + +1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7db0aa51..a8da842b 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -148,6 +148,7 @@ use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::LibvirtDomain; +use WineTestBot::RecordGroups; use WineTestBot::TestAgent; use WineTestBot::WineTestBotObjects; @@ -175,6 +176,13 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub HasEnabledRole($) +{ + my ($self) = @_; + # Filter out the disabled VMs, that is the retired and deleted ones + return $self->Role ne "retired" && $self->Role ne "deleted"; +} + sub GetHost($) { my ($self) = @_; @@ -499,6 +507,58 @@ sub RunRevert($) return $self->_RunVMTool("reverting", ["--log-only", "revert", $self->GetKey()]); } +=pod +=over 12 + +=item C<GetRecordName()> + +Provides the name to use for history records related to this VM. + +=back +=cut + +sub GetRecordName($) +{ + my ($self) = @_; + return $self->Name ." ". $self->GetHost(); +} + +my %_VMStatuses; + +=pod +=over 12 + +=item C<RecordStatus()> + +Adds a Record if the status of the VM changed since the last recorded status. + +=back +=cut + +sub RecordStatus($$;$) +{ + my ($self, $Records, $RecordStatus) = @_; + + $RecordStatus ||= $self->HasEnabledRole() ? $self->Status : $self->Role; + my $NewStatus = $self->GetHost() ." $RecordStatus"; + + my $LastStatus = $_VMStatuses{$self->Name} || ""; + # Don't add a record if nothing changed + return if ($LastStatus eq $NewStatus); + # Or if the new status is less complete + return if ($LastStatus =~ /^\Q$NewStatus \E/); + + $_VMStatuses{$self->Name} = $NewStatus; + if ($Records) + { + $Records->AddRecord('vmstatus', $self->GetRecordName(), $RecordStatus); + } + else + { + SaveRecord('vmstatus', $self->GetRecordName(), $RecordStatus); + } +} + package WineTestBot::VMs; -- 2.15.1

1 3

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 18 Dec '17

18 Dec '17

From: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 107 ++++++++++++++++-------------------------------------------- 1 file changed, 29 insertions(+), 78 deletions(-)

3 2

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 18 Dec '17

18 Dec '17

Superseded patch 139632. From: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 99 ++++++++++++++++--------------------------------------------- 1 file changed, 25 insertions(+), 74 deletions(-)

1 0

[PATCH] msvcp90/tests: Use the correct return type for basic_istream::ipfx.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Fixes a test on Android; msvcp60 already contains the fixed version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 5dcb1d4e0f48..c075f01f8c06 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1472,7 +1472,8 @@ static void test_istream_ipfx(void) basic_string_char str; IOSB_iostate state; wchar_t wide[64]; - int i, ret, next; + int i, next; + MSVCP_bool ret; /* makes tables narrower */ const IOSB_iostate IOSTATE_faileof = IOSTATE_failbit|IOSTATE_eofbit; @@ -1481,7 +1482,7 @@ static void test_istream_ipfx(void) const char *str; int unset_skipws; int noskip; - int ret; + MSVCP_bool ret; IOSB_iostate state; int next; } tests[] = { @@ -1507,7 +1508,7 @@ static void test_istream_ipfx(void) if(tests[i].unset_skipws) call_func2(p_ios_base_unsetf, &ss.basic_ios.base, TRUE); - ret = (int)call_func2(p_basic_istream_char_ipfx, &ss.base.base1, tests[i].noskip); + ret = (MSVCP_bool)(INT_PTR)call_func2(p_basic_istream_char_ipfx, &ss.base.base1, tests[i].noskip); state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &ss.basic_ios.base); next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); @@ -1527,7 +1528,7 @@ static void test_istream_ipfx(void) if(tests[i].unset_skipws) call_func2(p_ios_base_unsetf, &wss.basic_ios.base, TRUE); - ret = (int)call_func2(p_basic_istream_wchar_ipfx, &wss.base.base1, tests[i].noskip); + ret = (MSVCP_bool)(INT_PTR)call_func2(p_basic_istream_wchar_ipfx, &wss.base.base1, tests[i].noskip); state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &wss.basic_ios.base); nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); -- 2.15.0 -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH 2/2] mshtml.idl: Added events dispinterfaces declarations.
by Jacek Caban 18 Dec '17

18 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 5 + include/mshtml.idl | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+)

1 0

[PATCH 1/2] mshtml.idl: Added IDOMMouseEvent declaration.
by Jacek Caban 18 Dec '17

18 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 26 ++++++++++++++ include/mshtml.idl | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+)

1 0

[PATCH] winecfg: Fix a crash when inputting non-ASCII dll override name.
by Zhiyi Zhang 18 Dec '17

18 Dec '17

Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> --- programs/winecfg/winecfg.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)

1 0

[PATCH] msvcrt: Correctly set rounding mode in _ftol implementation
by Piotr Caban 18 Dec '17

18 Dec '17

For bug 44168 (hopefully it will also fix bug 44170). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] user32/tests: Class API tests for interaction with activation contexts
by Nikolay Sivov 18 Dec '17

18 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/class.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 6ab4cfe0c0..88bf3769f8 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1161,6 +1161,166 @@ static void test_IME(void) ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); } +static void create_manifest_file(const char *filename, const char *manifest) +{ + WCHAR path[MAX_PATH]; + HANDLE file; + DWORD size; + + MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static HANDLE create_test_actctx(const char *file) +{ + WCHAR path[MAX_PATH]; + ACTCTXW actctx; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = path; + + handle = CreateActCtxW(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); + + ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); + ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); + ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); + ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); + ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); + ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); + ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); + ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); + ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); + + return handle; +} + +static void test_actctx_classes(void) +{ + static const char main_manifest[] = + "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" + "<assemblyIdentity version=\"4.3.2.1\" name=\"Wine.WndClass.Test\" type=\"win32\" />" + "<file name=\"file.exe\">" + "<windowClass>MyTestClass</windowClass>" + "</file>" + "</assembly>"; + WNDCLASSA wc; + ULONG_PTR cookie; + HANDLE context; + BOOL ret; + ATOM class; + HINSTANCE hinst; + + create_manifest_file("main.manifest", main_manifest); + context = create_test_actctx("main.manifest"); + DeleteFileA("main.manifest"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = ClassTest_WndProc; + wc.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wc.lpszClassName = "MyTestClass"; + + hinst = GetModuleHandleW(0); + + ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ok(!ret, "Expected failure.\n"); + + class = RegisterClassA(&wc); + ok(class != 0, "Failed to register class.\n"); + + /* Class info is available by versioned and regular names. */ + ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ok(ret, "Failed to get class info.\n"); + + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); +todo_wine + ok(ret, "Failed to get class info.\n"); + + ret = UnregisterClassA("MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + /* Register versioned class without active context. */ + wc.lpszClassName = "4.3.2.1!MyTestClass"; + class = RegisterClassA(&wc); + ok(class != 0, "Failed to register class.\n"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class == 0, "Expected failure.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + /* Only versioned name is registered. */ + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = GetClassInfoA(hinst, "MyTestClass", &wc); +todo_wine + ok(!ret, "Expected failure.\n"); + + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); +todo_wine + ok(ret, "Failed to get class info.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); +todo_wine + ok(ret, "Failed to unregister class.\n"); + + /* Register regular name first, it's not considered when versioned name is registered. */ + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class.\n"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); +todo_wine + ok(ret, "Failed to unregister class.\n"); + + ret = UnregisterClassA("MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + ReleaseActCtx(context); +} + START_TEST(class) { char **argv; @@ -1190,6 +1350,7 @@ START_TEST(class) test_builtinproc(); test_icons(); test_comctl32_classes(); + test_actctx_classes(); /* this test unregisters the Button class so it should be executed at the end */ test_instances(); -- 2.15.1

1 0

[PATCH 2/2] webservices/tests: Register an exception with the firewall to avoid a dialog.
by Hans Leidekker 18 Dec '17

18 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/Makefile.in | 2 +- dlls/webservices/tests/channel.c | 142 +++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index a7c93a7f5f..63e24e66db 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = webservices.dll -IMPORTS = webservices user32 rpcrt4 ws2_32 +IMPORTS = webservices oleaut32 ole32 user32 rpcrt4 ws2_32 advapi32 C_SRCS = \ channel.c \ diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 206f76def1..32820fed1f 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -17,8 +17,11 @@ */ #include <stdio.h> +#define COBJMACROS #include "windows.h" #include "webservices.h" +#include "initguid.h" +#include "netfw.h" #include "wine/test.h" static void test_WsCreateChannel(void) @@ -814,10 +817,147 @@ static HANDLE start_listener( struct listener_info *info ) return thread; } +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'w','e','b','s','e','r','v','i','c','e','s','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(channel) { + BOOL firewall_enabled = is_firewall_enabled(); struct listener_info info; HANDLE thread; + HRESULT hr; + + if (firewall_enabled) + { + if (!is_process_elevated()) + { + skip( "no privileges, skipping tests to avoid firewall dialog\n" ); + return; + } + if ((hr = set_firewall( APP_ADD )) != S_OK) + { + skip( "can't authorize app in firewall %08x\n", hr ); + return; + } + } test_WsCreateChannel(); test_WsOpenChannel(); @@ -859,4 +999,6 @@ START_TEST(channel) thread = start_listener( &info ); test_WsAcceptChannel( &info ); WaitForSingleObject( thread, 3000 ); + + if (firewall_enabled) set_firewall( APP_REMOVE ); } -- 2.11.0

1 0

[PATCH 1/2] webservices/tests: Merge the listener tests into channel.c.
by Hans Leidekker 18 Dec '17

18 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/Makefile.in | 1 - dlls/webservices/tests/channel.c | 336 +++++++++++++++++++++++++++++ dlls/webservices/tests/listener.c | 424 ------------------------------------- 3 files changed, 336 insertions(+), 425 deletions(-) delete mode 100644 dlls/webservices/tests/listener.c diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index 9b2e68812b..a7c93a7f5f 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -3,7 +3,6 @@ IMPORTS = webservices user32 rpcrt4 ws2_32 C_SRCS = \ channel.c \ - listener.c \ msg.c \ proxy.c \ reader.c \ diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 91cf2362c2..206f76def1 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -211,6 +211,225 @@ static void test_WsResetChannel(void) WsFreeChannel( channel ); } +static void test_WsCreateListener(void) +{ + HRESULT hr; + WS_LISTENER *listener; + WS_CHANNEL_TYPE type; + WS_CHANNEL_BINDING binding; + WS_LISTENER_STATE state; + WS_IP_VERSION version; + ULONG size, backlog; + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + listener = NULL; + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( listener != NULL, "listener not set\n" ); + + backlog = 1000; + size = sizeof(backlog); + hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_LISTEN_BACKLOG, &backlog, size, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + version = WS_IP_VERSION_4; + size = sizeof(version); + hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + type = 0xdeadbeef; + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); + + binding = 0xdeadbeef; + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_BINDING, &binding, sizeof(binding), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( binding == WS_TCP_CHANNEL_BINDING, "got %u\n", binding ); + + version = 0; + size = sizeof(version); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( version == WS_IP_VERSION_AUTO, "got %u\n", version ); + + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); + + state = WS_LISTENER_STATE_CREATED; + size = sizeof(state); + hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeListener( listener ); +} + +static void test_WsOpenListener(void) +{ + WCHAR str[] = + {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; + WCHAR str2[] = + {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','2','0','1','7'}; + WCHAR str3[] = + {'n','e','t','.','t','c','p',':','/','/','1','2','7','.','0','.','0','.','1',':','2','0','1','7'}; + WS_STRING url; + WS_LISTENER *listener; + HRESULT hr; + + hr = WsOpenListener( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeListener( listener ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenListener( listener, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + url.length = sizeof(str)/sizeof(str[0]); + url.chars = str; + hr = WsOpenListener( NULL, &url, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeListener( listener ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + url.length = sizeof(str2)/sizeof(str2[0]); + url.chars = str2; + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeListener( listener ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + url.length = sizeof(str3)/sizeof(str3[0]); + url.chars = str3; + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseListener( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeListener( listener ); +} + +static void test_WsCreateChannelForListener(void) +{ + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_CHANNEL_TYPE type; + WS_CHANNEL_STATE state; + HRESULT hr; + + hr = WsCreateChannelForListener( NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( NULL, NULL, 0, &channel, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + channel = NULL; + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( channel != NULL, "channel not set\n" ); + + type = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); + + state = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); + + WsFreeChannel( channel ); + WsFreeListener( listener ); +} + +static void test_WsResetListener(void) +{ + WCHAR str[] = + {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; + WS_STRING url = { sizeof(str)/sizeof(str[0]), str }; + WS_LISTENER *listener; + WS_LISTENER_STATE state; + WS_LISTENER_PROPERTY prop; + ULONG size, timeout = 1000; + HRESULT hr; + + hr = WsResetListener( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prop.id = WS_LISTENER_PROPERTY_CONNECT_TIMEOUT; + prop.value = &timeout; + prop.valueSize = sizeof(timeout); + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, &prop, 1, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); + + timeout = 0xdeadbeef; + size = sizeof(timeout); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CONNECT_TIMEOUT, &timeout, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( timeout == 1000, "got %u\n", timeout ); + + WsFreeListener( listener ); +} + struct listener_info { int port; @@ -441,6 +660,104 @@ static void test_duplex_session( const struct listener_info *info ) WsFreeChannel( channel ); } +static void client_accept_channel( WS_CHANNEL *channel ) +{ + WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; + WS_ELEMENT_DESCRIPTION body; + WS_MESSAGE_DESCRIPTION desc_resp; + const WS_MESSAGE_DESCRIPTION *desc[1]; + WS_MESSAGE *msg; + INT32 val = 0; + HRESULT hr; + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &localname; + body.elementNs = &ns; + body.type = WS_INT32_TYPE; + body.typeDescription = NULL; + + desc_resp.action = &action; + desc_resp.bodyElementDescription = &body; + desc[0] = &desc_resp; + + hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val == -1, "got %d\n", val ); + WsFreeMessage( msg ); +} + +static void test_WsAcceptChannel( const struct listener_info *info ) +{ + static const WCHAR fmt_tcp[] = + {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + static const WCHAR fmt_udp[] = + {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_tcp : fmt_udp; + WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; + WCHAR buf[64]; + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_MESSAGE *msg; + WS_ENDPOINT_ADDRESS addr; + WS_ELEMENT_DESCRIPTION body; + WS_MESSAGE_DESCRIPTION desc; + INT32 val = -1; + HRESULT hr; + DWORD err; + + hr = WsAcceptChannel( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateListener( info->type, info->binding, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAcceptChannel( listener, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAcceptChannel( listener, channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + WsFreeChannel( channel ); + WsFreeListener( listener ); + + hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &addr, 0, sizeof(addr) ); + addr.url.length = wsprintfW( buf, fmt, info->port ); + addr.url.chars = buf; + hr = WsOpenChannel( channel, &addr, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &localname; + body.elementNs = &ns; + body.type = WS_INT32_TYPE; + body.typeDescription = NULL; + + desc.action = &action; + desc.bodyElementDescription = &body; + + hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + err = WaitForSingleObject( info->wait, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); + WsFreeChannel( channel ); +} + static DWORD CALLBACK listener_proc( void *arg ) { static const WCHAR fmt_tcp[] = @@ -505,6 +822,10 @@ START_TEST(channel) test_WsCreateChannel(); test_WsOpenChannel(); test_WsResetChannel(); + test_WsCreateListener(); + test_WsOpenListener(); + test_WsCreateChannelForListener(); + test_WsResetListener(); info.port = 7533; info.wait = CreateEventW( NULL, 0, 0, NULL ); @@ -523,4 +844,19 @@ START_TEST(channel) thread = start_listener( &info ); test_duplex_session( &info ); WaitForSingleObject( thread, 3000 ); + + info.type = WS_CHANNEL_TYPE_DUPLEX; + info.binding = WS_UDP_CHANNEL_BINDING; + info.test_func = client_accept_channel; + + thread = start_listener( &info ); + test_WsAcceptChannel( &info ); + WaitForSingleObject( thread, 3000 ); + + info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; + info.binding = WS_TCP_CHANNEL_BINDING; + + thread = start_listener( &info ); + test_WsAcceptChannel( &info ); + WaitForSingleObject( thread, 3000 ); } diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c deleted file mode 100644 index 10539f9d9c..0000000000 --- a/dlls/webservices/tests/listener.c +++ /dev/null @@ -1,424 +0,0 @@ -/* - * Copyright 2017 Hans Leidekker for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdio.h> -#include "windows.h" -#include "webservices.h" -#include "wine/test.h" - -static void test_WsCreateListener(void) -{ - HRESULT hr; - WS_LISTENER *listener; - WS_CHANNEL_TYPE type; - WS_CHANNEL_BINDING binding; - WS_LISTENER_STATE state; - WS_IP_VERSION version; - ULONG size, backlog; - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - listener = NULL; - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( listener != NULL, "listener not set\n" ); - - backlog = 1000; - size = sizeof(backlog); - hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_LISTEN_BACKLOG, &backlog, size, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - version = WS_IP_VERSION_4; - size = sizeof(version); - hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - type = 0xdeadbeef; - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); - - binding = 0xdeadbeef; - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_BINDING, &binding, sizeof(binding), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( binding == WS_TCP_CHANNEL_BINDING, "got %u\n", binding ); - - version = 0; - size = sizeof(version); - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( version == WS_IP_VERSION_AUTO, "got %u\n", version ); - - state = 0xdeadbeef; - size = sizeof(state); - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); - - state = WS_LISTENER_STATE_CREATED; - size = sizeof(state); - hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - WsFreeListener( listener ); -} - -static void test_WsOpenListener(void) -{ - WCHAR str[] = - {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; - WCHAR str2[] = - {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','2','0','1','7'}; - WCHAR str3[] = - {'n','e','t','.','t','c','p',':','/','/','1','2','7','.','0','.','0','.','1',':','2','0','1','7'}; - WS_STRING url; - WS_LISTENER *listener; - HRESULT hr; - - hr = WsOpenListener( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - WsFreeListener( listener ); - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsOpenListener( listener, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - url.length = sizeof(str)/sizeof(str[0]); - url.chars = str; - hr = WsOpenListener( NULL, &url, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - WsFreeListener( listener ); - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - url.length = sizeof(str2)/sizeof(str2[0]); - url.chars = str2; - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - WsFreeListener( listener ); - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - url.length = sizeof(str3)/sizeof(str3[0]); - url.chars = str3; - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCloseListener( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - WsFreeListener( listener ); -} - -static void test_WsCreateChannelForListener(void) -{ - WS_LISTENER *listener; - WS_CHANNEL *channel; - WS_CHANNEL_TYPE type; - WS_CHANNEL_STATE state; - HRESULT hr; - - hr = WsCreateChannelForListener( NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsCreateChannelForListener( NULL, NULL, 0, &channel, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - channel = NULL; - hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( channel != NULL, "channel not set\n" ); - - type = 0xdeadbeef; - hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); - - state = 0xdeadbeef; - hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); - - WsFreeChannel( channel ); - WsFreeListener( listener ); -} - -static void test_WsResetListener(void) -{ - WCHAR str[] = - {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; - WS_STRING url = { sizeof(str)/sizeof(str[0]), str }; - WS_LISTENER *listener; - WS_LISTENER_STATE state; - WS_LISTENER_PROPERTY prop; - ULONG size, timeout = 1000; - HRESULT hr; - - hr = WsResetListener( NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - prop.id = WS_LISTENER_PROPERTY_CONNECT_TIMEOUT; - prop.value = &timeout; - prop.valueSize = sizeof(timeout); - hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, &prop, 1, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsResetListener( listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsResetListener( listener, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsResetListener( listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - state = 0xdeadbeef; - size = sizeof(state); - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); - - timeout = 0xdeadbeef; - size = sizeof(timeout); - hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CONNECT_TIMEOUT, &timeout, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( timeout == 1000, "got %u\n", timeout ); - - WsFreeListener( listener ); -} - -struct listener_info -{ - int port; - HANDLE wait; - WS_CHANNEL_BINDING binding; - WS_CHANNEL_TYPE type; -}; - -static DWORD CALLBACK listener_proc( void *arg ) -{ - static const WCHAR fmt_tcp[] = {'n','e','t','.','t','c','p',':','/','/','+',':','%','u',0}; - static const WCHAR fmt_udp[] = {'s','o','a','p','.','u','d','p',':','/','/','+',':','%','u',0}; - struct listener_info *info = arg; - const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_tcp : fmt_udp; - WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; - WS_ELEMENT_DESCRIPTION body; - WS_MESSAGE_DESCRIPTION desc_resp; - const WS_MESSAGE_DESCRIPTION *desc[1]; - INT32 val = 0; - WS_LISTENER *listener; - WS_CHANNEL *channel; - WS_MESSAGE *msg; - WCHAR buf[64]; - WS_STRING url; - HRESULT hr; - - hr = WsCreateListener( info->type, info->binding, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - url.length = wsprintfW( buf, fmt, info->port ); - url.chars = buf; - hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - SetEvent( info->wait ); - - hr = WsAcceptChannel( listener, channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsAcceptChannel( listener, channel, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - - hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - body.elementLocalName = &localname; - body.elementNs = &ns; - body.type = WS_INT32_TYPE; - body.typeDescription = NULL; - - desc_resp.action = &action; - desc_resp.bodyElementDescription = &body; - desc[0] = &desc_resp; - - hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, - NULL, &val, sizeof(val), NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( val == -1, "got %d\n", val ); - WsFreeMessage( msg ); - - SetEvent( info->wait ); - - hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - WsFreeChannel( channel ); - - hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - WsFreeListener( listener ); - - return 0; -} - -static void test_WsAcceptChannel( const struct listener_info *info ) -{ - static const WCHAR fmt_tcp[] = - {'n','e','t','.','t','c','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; - static const WCHAR fmt_udp[] = - {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; - const WCHAR *fmt = (info->binding == WS_TCP_CHANNEL_BINDING) ? fmt_tcp : fmt_udp; - WS_XML_STRING localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}, action = {6, (BYTE *)"action"}; - WCHAR buf[64]; - WS_LISTENER *listener; - WS_CHANNEL *channel; - WS_MESSAGE *msg; - WS_ENDPOINT_ADDRESS addr; - WS_ELEMENT_DESCRIPTION body; - WS_MESSAGE_DESCRIPTION desc; - INT32 val = -1; - HRESULT hr; - DWORD err; - - hr = WsAcceptChannel( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsCreateListener( info->type, info->binding, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsAcceptChannel( listener, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - - hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsAcceptChannel( listener, channel, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - WsFreeChannel( channel ); - WsFreeListener( listener ); - - hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - memset( &addr, 0, sizeof(addr) ); - addr.url.length = wsprintfW( buf, fmt, info->port ); - addr.url.chars = buf; - hr = WsOpenChannel( channel, &addr, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - body.elementLocalName = &localname; - body.elementNs = &ns; - body.type = WS_INT32_TYPE; - body.typeDescription = NULL; - - desc.action = &action; - desc.bodyElementDescription = &body; - - hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - err = WaitForSingleObject( info->wait, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); - - hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - WsFreeMessage( msg ); - WsFreeChannel( channel ); -} - -static HANDLE start_listener( struct listener_info *info ) -{ - DWORD err; - HANDLE thread = CreateThread( NULL, 0, listener_proc, info, 0, NULL ); - ok( thread != NULL, "failed to create listener thread %u\n", GetLastError() ); - - err = WaitForSingleObject( info->wait, 3000 ); - ok( err == WAIT_OBJECT_0, "failed to start listener %u\n", err ); - return thread; -} - -START_TEST(listener) -{ - struct listener_info info; - HANDLE thread; - - test_WsCreateListener(); - test_WsOpenListener(); - test_WsCreateChannelForListener(); - test_WsResetListener(); - - info.port = 7533; - info.wait = CreateEventW( NULL, 0, 0, NULL ); - info.type = WS_CHANNEL_TYPE_DUPLEX; - info.binding = WS_UDP_CHANNEL_BINDING; - - thread = start_listener( &info ); - test_WsAcceptChannel( &info ); - WaitForSingleObject( thread, 3000 ); - - info.type = WS_CHANNEL_TYPE_DUPLEX_SESSION; - info.binding = WS_TCP_CHANNEL_BINDING; - - thread = start_listener( &info ); - test_WsAcceptChannel( &info ); - WaitForSingleObject( thread, 3000 ); -} -- 2.11.0

1 0

[PATCH] msvcr71: Don't raise exception in _invalid_parameter
by Piotr Caban 18 Dec '17

18 Dec '17

Support for invalid parameter handler was added in msvcr80. For bug 44163. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/errno.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] comctl32/tests: Add Edit control tests
by Nikolay Sivov 18 Dec '17

18 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/edit.c | 2979 +++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/rsrc.rc | 60 + 3 files changed, 3040 insertions(+) create mode 100644 dlls/comctl32/tests/edit.c diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 36d77f0e1c..4fd0f0299e 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ combo.c \ datetime.c \ dpa.c \ + edit.c \ header.c \ imagelist.c \ ipaddress.c \ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c new file mode 100644 index 0000000000..10968957cc --- /dev/null +++ b/dlls/comctl32/tests/edit.c @@ -0,0 +1,2979 @@ +/* Unit test suite for edit control. + * + * Copyright 2004 Vitaliy Margolen + * Copyright 2005 C. Scott Ananian + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" +#include "v6util.h" + +#ifndef ES_COMBO +#define ES_COMBO 0x200 +#endif + +#define ID_EDITTESTDBUTTON 0x123 +#define ID_EDITTEST2 99 +#define MAXLEN 200 + +struct edit_notify { + int en_change, en_maxtext, en_update; +}; + +static struct edit_notify notifications; + +static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + static int num_ok_commands = 0; + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases related to bug 12319 */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 1: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for pressing enter */ + case 3: + num_ok_commands = 0; + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + num_ok_commands++; + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hfocus = GetFocus(); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hedit2 = GetDlgItem(hdlg, 1001); + HWND hedit3 = GetDlgItem(hdlg, 1002); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if (hfocus == hedit) + EndDialog(hdlg, 1111); + else if (hfocus == hedit2) + EndDialog(hdlg, 2222); + else if (hfocus == hedit3) + EndDialog(hdlg, 3333); + else + EndDialog(hdlg, 4444); + break; + case 1: + if ((hfocus == hedit) && (num_ok_commands == 0)) + EndDialog(hdlg, 11); + else + EndDialog(hdlg, 22); + break; + default: + EndDialog(hdlg, 5555); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* from bug 11841 */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* more test cases for WM_CHAR */ + case 3: + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 5: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* more test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 7: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + case 8: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* multiple tab tests */ + case 9: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 10: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + int len; + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hcancel = GetDlgItem(hdlg, IDCANCEL); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + if (len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 2: + if (hfocus == hok) + EndDialog(hdlg, 11); + else if (hfocus == hcancel) + EndDialog(hdlg, 22); + else if (hfocus == hedit) + EndDialog(hdlg, 33); + else + EndDialog(hdlg, 44); + break; + + default: + EndDialog(hdlg, 555); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 5: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + break; + case 7: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + break; + case 8: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK edit_wantreturn_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 5: + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessageA(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessageA(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 7: + PostMessageA(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 8: + PostMessageA(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessageA(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 2: + if ((hfocus == hedit) && len == 2) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + +static HINSTANCE hinst; +static HWND hwndET2; +static const char szEditTest2Class[] = "EditTest2Class"; +static const char szEditTest3Class[] = "EditTest3Class"; +static const char szEditTest4Class[] = "EditTest4Class"; +static const char szEditTextPositionClass[] = "EditTextPositionWindowClass"; + +static HWND create_editcontrol (DWORD style, DWORD exstyle) +{ + HWND handle; + + handle = CreateWindowExA(exstyle, + "EDIT", + "Test Text", + style, + 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + ok (handle != NULL, "CreateWindow EDIT Control failed\n"); + assert (handle); + if (winetest_interactive) + ShowWindow (handle, SW_SHOW); + return handle; +} + +static HWND create_child_editcontrol (DWORD style, DWORD exstyle) +{ + HWND parentWnd; + HWND editWnd; + RECT rect; + BOOL b; + SetRect(&rect, 0, 0, 300, 300); + b = AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); + ok(b, "AdjustWindowRect failed\n"); + + parentWnd = CreateWindowExA(0, + szEditTextPositionClass, + "Edit Test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + rect.right - rect.left, rect.bottom - rect.top, + NULL, NULL, hinst, NULL); + ok (parentWnd != NULL, "CreateWindow EDIT Test failed\n"); + assert(parentWnd); + + editWnd = CreateWindowExA(exstyle, + "EDIT", + "Test Text", + WS_CHILD | style, + 0, 0, 300, 300, + parentWnd, NULL, hinst, NULL); + ok (editWnd != NULL, "CreateWindow EDIT Test Text failed\n"); + assert(editWnd); + if (winetest_interactive) + ShowWindow (parentWnd, SW_SHOW); + return editWnd; +} + +static void destroy_child_editcontrol (HWND hwndEdit) +{ + if (GetParent(hwndEdit)) + DestroyWindow(GetParent(hwndEdit)); + else { + trace("Edit control has no parent!\n"); + DestroyWindow(hwndEdit); + } +} + +static LONG get_edit_style (HWND hwnd) +{ + return GetWindowLongA( hwnd, GWL_STYLE ) & ( + ES_LEFT | +/* FIXME: not implemented + ES_CENTER | + ES_RIGHT | + ES_OEMCONVERT | +*/ + ES_MULTILINE | + ES_UPPERCASE | + ES_LOWERCASE | + ES_PASSWORD | + ES_AUTOVSCROLL | + ES_AUTOHSCROLL | + ES_NOHIDESEL | + ES_COMBO | + ES_READONLY | + ES_WANTRETURN | + ES_NUMBER + ); +} + +static void set_client_height(HWND Wnd, unsigned Height) +{ + RECT ClientRect, WindowRect; + + GetWindowRect(Wnd, &WindowRect); + GetClientRect(Wnd, &ClientRect); + SetWindowPos(Wnd, NULL, 0, 0, + WindowRect.right - WindowRect.left, + Height + (WindowRect.bottom - WindowRect.top) - + (ClientRect.bottom - ClientRect.top), + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + + /* Workaround for a bug in Windows' edit control + (multi-line mode) */ + GetWindowRect(Wnd, &WindowRect); + SetWindowPos(Wnd, NULL, 0, 0, + WindowRect.right - WindowRect.left + 1, + WindowRect.bottom - WindowRect.top + 1, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + SetWindowPos(Wnd, NULL, 0, 0, + WindowRect.right - WindowRect.left, + WindowRect.bottom - WindowRect.top, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + + GetClientRect(Wnd, &ClientRect); + ok(ClientRect.bottom - ClientRect.top == Height, + "The client height should be %d, but is %d\n", + Height, ClientRect.bottom - ClientRect.top); +} + +static void test_edit_control_1(void) +{ + HWND hwEdit; + MSG msMessage; + int i; + LONG r; + + msMessage.message = WM_KEYDOWN; + + trace("EDIT: Single line\n"); + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_AUTOVSCROLL | ES_AUTOHSCROLL), "Wrong style expected 0xc0 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); + + trace("EDIT: Single line want returns\n"); + hwEdit = create_editcontrol(ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN), "Wrong style expected 0x10c0 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); + + trace("EDIT: Multiline line\n"); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE), "Wrong style expected 0xc4 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); + + trace("EDIT: Multi line want returns\n"); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = get_edit_style(hwEdit); + ok(r == (ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE), "Wrong style expected 0x10c4 got: 0x%x\n", r); + for (i = 0; i < 65535; i++) + { + msMessage.wParam = i; + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM) &msMessage); + ok(r == (DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS), + "Expected DLGC_WANTCHARS | DLGC_HASSETSEL | DLGC_WANTALLKEYS | DLGC_WANTARROWS got %x\n", r); + } + DestroyWindow(hwEdit); +} + +/* WM_SETTEXT is implemented by selecting all text, and then replacing the + * selection. This test checks that the first 'select all' doesn't generate + * an UPDATE message which can escape and (via a handler) change the + * selection, which would cause WM_SETTEXT to break. This old bug + * was fixed 18-Mar-2005; we check here to ensure it doesn't regress. + */ +static void test_edit_control_2(void) +{ + HWND hwndMain, phwnd; + char szLocalString[MAXLEN]; + LONG r, w = 150, h = 50; + POINT cpos; + + /* Create main and edit windows. */ + hwndMain = CreateWindowA(szEditTest2Class, "ET2", WS_OVERLAPPEDWINDOW, + 0, 0, 200, 200, NULL, NULL, hinst, NULL); + assert(hwndMain); + if (winetest_interactive) + ShowWindow (hwndMain, SW_SHOW); + + hwndET2 = CreateWindowA("EDIT", NULL, + WS_CHILD|WS_BORDER|ES_LEFT|ES_AUTOHSCROLL, + 0, 0, w, h, /* important this not be 0 size. */ + hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); + assert(hwndET2); + if (winetest_interactive) + ShowWindow (hwndET2, SW_SHOW); + + trace("EDIT: SETTEXT atomicity\n"); + /* Send messages to "type" in the word 'foo'. */ + r = SendMessageA(hwndET2, WM_CHAR, 'f', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + /* 'foo' should have been changed to 'bar' by the UPDATE handler. */ + GetWindowTextA(hwndET2, szLocalString, MAXLEN); + ok(strcmp(szLocalString, "bar")==0, + "Wrong contents of edit: %s\n", szLocalString); + + /* try setting the caret before it's visible */ + r = SetCaretPos(0, 0); + todo_wine ok(0 == r, "SetCaretPos succeeded unexpectedly, expected: 0, got: %d\n", r); + phwnd = SetFocus(hwndET2); + ok(phwnd != NULL, "SetFocus failed unexpectedly, expected non-zero, got NULL\n"); + r = SetCaretPos(0, 0); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == 0 && cpos.y == 0, "Wrong caret position, expected: (0,0), got: (%d,%d)\n", cpos.x, cpos.y); + r = SetCaretPos(-1, -1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == -1 && cpos.y == -1, "Wrong caret position, expected: (-1,-1), got: (%d,%d)\n", cpos.x, cpos.y); + r = SetCaretPos(w << 1, h << 1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == (w << 1) && cpos.y == (h << 1), "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w << 1, h << 1, cpos.x, cpos.y); + r = SetCaretPos(w, h); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == w && cpos.y == h, "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w, h, cpos.x, cpos.y); + r = SetCaretPos(w - 1, h - 1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == (w - 1) && cpos.y == (h - 1), "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w - 1, h - 1, cpos.x, cpos.y); + + DestroyWindow(hwndET2); + DestroyWindow(hwndMain); +} + +static void ET2_check_change(void) +{ + char szLocalString[MAXLEN]; + /* This EN_UPDATE handler changes any 'foo' to 'bar'. */ + GetWindowTextA(hwndET2, szLocalString, MAXLEN); + if (!strcmp(szLocalString, "foo")) + { + strcpy(szLocalString, "bar"); + SendMessageA(hwndET2, WM_SETTEXT, 0, (LPARAM)szLocalString); + } + /* always leave the cursor at the end. */ + SendMessageA(hwndET2, EM_SETSEL, MAXLEN - 1, MAXLEN - 1); +} + +static void ET2_OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + if (id == ID_EDITTEST2 && codeNotify == EN_UPDATE) + ET2_check_change(); +} + +static LRESULT CALLBACK ET2_WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +{ + switch (iMsg) + { + case WM_COMMAND: + ET2_OnCommand(hwnd, LOWORD(wParam), (HWND)lParam, HIWORD(wParam)); + break; + } + return DefWindowProcA(hwnd, iMsg, wParam, lParam); +} + +static void zero_notify(void) +{ + notifications.en_change = 0; + notifications.en_maxtext = 0; + notifications.en_update = 0; +} + +#define test_notify(enchange, enmaxtext, enupdate) \ +do { \ + ok(notifications.en_change == enchange, "expected %d EN_CHANGE notifications, " \ + "got %d\n", enchange, notifications.en_change); \ + ok(notifications.en_maxtext == enmaxtext, "expected %d EN_MAXTEXT notifications, " \ + "got %d\n", enmaxtext, notifications.en_maxtext); \ + ok(notifications.en_update == enupdate, "expected %d EN_UPDATE notifications, " \ + "got %d\n", enupdate, notifications.en_update); \ +} while(0) + +static LRESULT CALLBACK edit3_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_COMMAND: + switch (HIWORD(wParam)) + { + case EN_MAXTEXT: + notifications.en_maxtext++; + break; + case EN_UPDATE: + notifications.en_update++; + break; + case EN_CHANGE: + notifications.en_change++; + break; + } + break; + } + return DefWindowProcA(hWnd, msg, wParam, lParam); +} + +/* Test behaviour of WM_SETTEXT, WM_REPLACESEL and notifications sent in response + * to these messages. + */ +static void test_edit_control_3(void) +{ + static const char *str = "this is a long string."; + static const char *str2 = "this is a long string.\r\nthis is a long string.\r\nthis is a long string.\r\nthis is a long string."; + HWND hWnd, hParent; + int len, dpi; + HDC hDC; + + hDC = GetDC(NULL); + dpi = GetDeviceCaps(hDC, LOGPIXELSY); + ReleaseDC(NULL, hDC); + + trace("EDIT: Test notifications\n"); + + hParent = CreateWindowExA(0, + szEditTest3Class, + NULL, + 0, + CW_USEDEFAULT, CW_USEDEFAULT, 10, 10, + NULL, NULL, NULL, NULL); + assert(hParent); + + trace("EDIT: Single line, no ES_AUTOHSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + 0, + 10, 10, 50, 50, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + if (len == lstrlenA(str)) /* Win 8 */ + test_notify(1, 0, 1); + else + test_notify(1, 1, 1); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)"a"); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(1 == len, "wrong text length, expected 1, got %d\n", len); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + SendMessageA(hParent, WM_SETFOCUS, 0, (LPARAM)hWnd); + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + DestroyWindow(hWnd); + + trace("EDIT: Single line, ES_AUTOHSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_AUTOHSCROLL, + 10, 10, 50, 50, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + DestroyWindow(hWnd); + + trace("EDIT: Multline, no ES_AUTOHSCROLL, no ES_AUTOVSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_MULTILINE, + 10, 10, (50 * dpi) / 96, (50 * dpi) / 96, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + if (len == lstrlenA(str)) /* Win 8 */ + test_notify(1, 0, 1); + else + { + ok(0 == len, "text should have been truncated, expected 0, got %d\n", len); + test_notify(1, 1, 1); + } + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)"a"); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(1 == SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0), "wrong text length, expected 1, got %d\n", len); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + DestroyWindow(hWnd); + + trace("EDIT: Multline, ES_AUTOHSCROLL, no ES_AUTOVSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_MULTILINE | ES_AUTOHSCROLL, + 10, 10, (50 * dpi) / 96, (50 * dpi) / 96, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(0 == len, "text should have been truncated, expected 0, got %d\n", len); + test_notify(1, 1, 1); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)"a"); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(1 == SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0), "wrong text length, expected 1, got %d\n", len); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + DestroyWindow(hWnd); + + trace("EDIT: Multline, ES_AUTOHSCROLL and ES_AUTOVSCROLL\n"); + hWnd = CreateWindowExA(0, + "EDIT", + NULL, + ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + 10, 10, 50, 50, + hParent, NULL, NULL, NULL); + assert(hWnd); + + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); + + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(5 == len, "text should have been truncated to limit, expected 5, got %d\n", len); + test_notify(1, 1, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(0, 0, 0); + + DestroyWindow(hWnd); +} + +static void test_char_from_pos(void) +{ + int lo, hi, mid, ret, i; + HWND hwEdit; + + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(0 == ret, "expected 0 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_RIGHT | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(0 == ret, "expected 0 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_CENTER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(0 == ret, "expected 0 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2 + 1; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE | ES_RIGHT | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2 + 1; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE | ES_CENTER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); + lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); + hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); + mid = lo + (hi - lo) / 2 + 1; + + for (i = lo; i < mid; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + } + + for (i = mid; i <= hi; i++) + { + ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); + ok(1 == ret, "expected 1 got %d\n", ret); + } + + ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); + ok(-1 == ret, "expected -1 got %d\n", ret); + DestroyWindow(hwEdit); +} + +/* Test if creating edit control without ES_AUTOHSCROLL and ES_AUTOVSCROLL + * truncates text that doesn't fit. + */ +static void test_edit_control_5(void) +{ + static const char *str = "test\r\ntest"; + HWND parentWnd; + HWND hWnd; + int len; + RECT rc1 = { 10, 10, 11, 11}; + RECT rc; + + /* first show that a non-child won't do for this test */ + hWnd = CreateWindowExA(0, + "EDIT", + str, + 0, + 10, 10, 1, 1, + NULL, NULL, NULL, NULL); + assert(hWnd); + /* size of non-child edit control is (much) bigger than requested */ + GetWindowRect( hWnd, &rc); + ok( rc.right - rc.left > 20, "size of the window (%d) is smaller than expected\n", + rc.right - rc.left); + DestroyWindow(hWnd); + /* so create a parent, and give it edit controls children to test with */ + parentWnd = CreateWindowExA(0, + szEditTextPositionClass, + "Edit Test", WS_VISIBLE | + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 250, 250, + NULL, NULL, hinst, NULL); + assert(parentWnd); + ShowWindow( parentWnd, SW_SHOW); + /* single line */ + hWnd = CreateWindowExA(0, + "EDIT", + str, WS_VISIBLE | WS_BORDER | + WS_CHILD, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + parentWnd, NULL, NULL, NULL); + assert(hWnd); + GetClientRect( hWnd, &rc); + ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, + "Client rectangle not the expected size %s\n", wine_dbgstr_rect( &rc )); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); + /* multi line */ + hWnd = CreateWindowExA(0, + "EDIT", + str, + WS_CHILD | ES_MULTILINE, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + parentWnd, NULL, NULL, NULL); + assert(hWnd); + GetClientRect( hWnd, &rc); + ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, + "Client rectangle not the expected size %s\n", wine_dbgstr_rect( &rc )); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); + DestroyWindow(parentWnd); +} + +/* Test WM_GETTEXT processing + * after destroy messages + */ +static void test_edit_control_6(void) +{ + static const char *str = "test\r\ntest"; + char buf[MAXLEN]; + HWND hWnd; + LONG ret; + + hWnd = CreateWindowExA(0, "EDIT", "Test", 0, 10, 10, 1, 1, NULL, NULL, hinst, NULL); + ok(hWnd != NULL, "Failed to create edit control.\n"); + + ret = SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + ok(ret == TRUE, "Expected %d, got %d\n", TRUE, ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == strlen(str), "Expected %s, got len %d\n", str, ret); + ok(!strcmp(buf, str), "Expected %s, got %s\n", str, buf); + + buf[0] = 0; + ret = SendMessageA(hWnd, WM_DESTROY, 0, 0); +todo_wine + ok(ret == 1, "Unexpected return value %d\n", ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == strlen(str), "Expected %s, got len %d\n", str, ret); + ok(!strcmp(buf, str), "Expected %s, got %s\n", str, buf); + + buf[0] = 0; + ret = SendMessageA(hWnd, WM_NCDESTROY, 0, 0); + ok(ret == 0, "Expected 0, got %d\n", ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); +todo_wine { + ok(ret == strlen("Test"), "Unexpected text length %d\n", ret); + ok(!strcmp(buf, "Test"), "Unexpected text %s\n", buf); +} + DestroyWindow(hWnd); +} + +static void test_edit_control_limittext(void) +{ + HWND hwEdit; + DWORD r; + + /* Test default limit for single-line control */ + trace("EDIT: buffer limit for single-line\n"); + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); + SendMessageA(hwEdit, EM_SETLIMITTEXT, 0, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok( r == 2147483646, "got limit %u (expected 2147483646)\n", r); + DestroyWindow(hwEdit); + + /* Test default limit for multi-line control */ + trace("EDIT: buffer limit for multi-line\n"); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); + SendMessageA(hwEdit, EM_SETLIMITTEXT, 0, 0); + r = SendMessageA(hwEdit, EM_GETLIMITTEXT, 0, 0); + ok( r == 4294967295U, "got limit %u (expected 4294967295)\n", r); + DestroyWindow(hwEdit); +} + +/* Test EM_SCROLL */ +static void test_edit_control_scroll(void) +{ + static const char *single_line_str = "a"; + static const char *multiline_str = "Test\r\nText"; + HWND hwEdit; + LONG ret; + + /* Check the return value when EM_SCROLL doesn't scroll + * anything. Should not return true unless any lines were actually + * scrolled. */ + hwEdit = CreateWindowA( + "EDIT", + single_line_str, + WS_VSCROLL | ES_MULTILINE, + 1, 1, 100, 100, + NULL, NULL, hinst, NULL); + + assert(hwEdit); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEUP, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_LINEUP, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_LINEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + DestroyWindow (hwEdit); + + /* SB_PAGEDOWN while at the beginning of a buffer with few lines + should not cause EM_SCROLL to return a negative value of + scrolled lines that would put us "before" the beginning. */ + hwEdit = CreateWindowA( + "EDIT", + multiline_str, + WS_VSCROLL | ES_MULTILINE, + 0, 0, 100, 100, + NULL, NULL, hinst, NULL); + assert(hwEdit); + + ret = SendMessageA(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + DestroyWindow (hwEdit); +} + +static void test_margins_usefontinfo(UINT charset) +{ + INT margins, threshold, expect, empty_expect, small_expect; + HWND hwnd; + HDC hdc; + SIZE size; + BOOL cjk; + LOGFONTA lf; + HFONT hfont; + RECT rect; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -11; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = charset; + strcpy(lf.lfFaceName, "Tahoma"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "got %p\n", hfont); + + /* Big window rectangle */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + hdc = GetDC(hwnd); + hfont = SelectObject(hdc, hfont); + size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); + expect = MAKELONG(size.cx / 2, size.cx / 2); + small_expect = 0; + empty_expect = size.cx >= 28 ? small_expect : expect; + + charset = GetTextCharset(hdc); + switch (charset) + { + case SHIFTJIS_CHARSET: + case HANGUL_CHARSET: + case GB2312_CHARSET: + case CHINESEBIG5_CHARSET: + cjk = TRUE; + break; + default: + cjk = FALSE; + } + + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + else + { + ok(HIWORD(margins) > 0 && LOWORD(margins) > 0, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + expect = empty_expect = small_expect = margins; + } + DestroyWindow(hwnd); + + threshold = (size.cx / 2 + size.cx) * 2; + + /* Size below which non-cjk margins are zero */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold - 1, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == small_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + DestroyWindow(hwnd); + + /* Size at which non-cjk margins become non-zero */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + DestroyWindow(hwnd); + + /* Empty rect */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == empty_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + DestroyWindow(hwnd); + + DeleteObject(hfont); +} + +static void test_margins(void) +{ + DWORD old_margins, new_margins; + RECT old_rect, new_rect; + INT old_right_margin; + HWND hwEdit; + + hwEdit = create_editcontrol(WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + old_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + old_right_margin = HIWORD(old_margins); + + /* Check if setting the margins works */ + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN, MAKELONG(10, 0)); + new_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(new_margins) == 10, "Wrong left margin: %d\n", LOWORD(new_margins)); + ok(HIWORD(new_margins) == old_right_margin, "Wrong right margin: %d\n", HIWORD(new_margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_RIGHTMARGIN, MAKELONG(0, 10)); + new_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(new_margins) == 10, "Wrong left margin: %d\n", LOWORD(new_margins)); + ok(HIWORD(new_margins) == 10, "Wrong right margin: %d\n", HIWORD(new_margins)); + + /* The size of the rectangle must decrease if we increase the margin */ + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(5, 5)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(15, 20)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(new_rect.left == old_rect.left + 10, "The left border of the rectangle is wrong\n"); + ok(new_rect.right == old_rect.right - 15, "The right border of the rectangle is wrong\n"); + ok(new_rect.top == old_rect.top, "The top border of the rectangle must not change\n"); + ok(new_rect.bottom == old_rect.bottom, "The bottom border of the rectangle must not change\n"); + + /* If we set the margin to same value as the current margin, + the rectangle must not change */ + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); + SetRect(&old_rect, 1, 1, 99, 99); + SendMessageA(hwEdit, EM_SETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + + /* The lParam argument of the WM_SIZE message should be ignored. */ + + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_MINIMIZED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_MAXIMIZED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, MAKELONG(10, 10)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + + DestroyWindow (hwEdit); + + test_margins_usefontinfo(ANSI_CHARSET); + test_margins_usefontinfo(EASTEUROPE_CHARSET); + + test_margins_usefontinfo(SHIFTJIS_CHARSET); + test_margins_usefontinfo(HANGUL_CHARSET); + test_margins_usefontinfo(CHINESEBIG5_CHARSET); + /* Don't test JOHAB_CHARSET. Treated as CJK by Win 8, + but not by < Win 8 and Win 10. */ + + test_margins_usefontinfo(DEFAULT_CHARSET); +} + +static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static void test_margins_font_change(void) +{ + DWORD margins, font_margins, ret; + HFONT hfont, hfont2; + HWND hwEdit; + LOGFONTA lf; + HDC hdc; + + hdc = GetDC(0); + ret = EnumFontFamiliesA(hdc, "Arial", find_font_proc, 0); + ReleaseDC(0, hdc); + if (ret) + { + trace("Arial not found - skipping font change margin tests\n"); + return; + } + + hwEdit = create_child_editcontrol(0, 0); + + SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Arial"); + lf.lfHeight = 16; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + lf.lfHeight = 30; + hfont2 = CreateFontIndirectA(&lf); + + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + font_margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(font_margins) != 0, "got %d\n", LOWORD(font_margins)); + ok(HIWORD(font_margins) != 0, "got %d\n", HIWORD(font_margins)); + + /* With 'small' edit controls, test that the margin doesn't get set */ + SetWindowPos(hwEdit, NULL, 10, 10, 16, 100, SWP_NOZORDER | SWP_NOACTIVATE); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 0 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) == LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1 || broken(HIWORD(margins) == HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1 || broken(LOWORD(margins) != 1 && LOWORD(margins) != LOWORD(font_margins)), /* win95 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1 || broken(HIWORD(margins) != 1 && HIWORD(margins) != HIWORD(font_margins)), /* win95 */ + "got %d\n", HIWORD(margins)); + + /* Above a certain size threshold then the margin is updated */ + SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); + margins = SendMessageA(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) != LOWORD(font_margins) || broken(LOWORD(margins) == LOWORD(font_margins)), /* win98 */ + "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) != HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, WM_SETFONT, 0, 0); + + DeleteObject(hfont2); + DeleteObject(hfont); + destroy_child_editcontrol(hwEdit); + +} + +#define edit_pos_ok(exp, got, txt) \ + ok(exp == got, "wrong " #txt " expected %d got %d\n", exp, got); + +#define check_pos(hwEdit, set_height, test_top, test_height, test_left) \ +do { \ + RECT format_rect; \ + int left_margin; \ + set_client_height(hwEdit, set_height); \ + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM) &format_rect); \ + left_margin = LOWORD(SendMessageA(hwEdit, EM_GETMARGINS, 0, 0)); \ + edit_pos_ok(test_top, format_rect.top, vertical position); \ + edit_pos_ok((int)test_height, format_rect.bottom - format_rect.top, height); \ + edit_pos_ok(test_left, format_rect.left - left_margin, left); \ +} while(0) + +static void test_text_position_style(DWORD style) +{ + HWND hwEdit; + HFONT font, oldFont; + HDC dc; + TEXTMETRICA metrics; + INT b, bm, b2, b3; + BOOL xb, single_line = !(style & ES_MULTILINE); + + b = GetSystemMetrics(SM_CYBORDER) + 1; + b2 = 2 * b; + b3 = 3 * b; + bm = b2 - 1; + + /* Get a stock font for which we can determine the metrics */ + font = GetStockObject(SYSTEM_FONT); + ok (font != NULL, "GetStockObject SYSTEM_FONT failed\n"); + dc = GetDC(NULL); + ok (dc != NULL, "GetDC() failed\n"); + oldFont = SelectObject(dc, font); + xb = GetTextMetricsA(dc, &metrics); + ok (xb, "GetTextMetrics failed\n"); + SelectObject(dc, oldFont); + ReleaseDC(NULL, dc); + + /* Windows' edit control has some bugs in multi-line mode: + * - Sometimes the format rectangle doesn't get updated + * (see workaround in set_client_height()) + * - If the height of the control is smaller than the height of a text + * line, the format rectangle is still as high as a text line + * (higher than the client rectangle) and the caret is not shown + */ + + /* Edit controls that are in a parent window */ + + hwEdit = create_child_editcontrol(style | WS_VISIBLE, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 0); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 2, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 10, 0, metrics.tmHeight , 0); + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(style | WS_BORDER | WS_VISIBLE, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, b); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + bm, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b2, b, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b3, b, metrics.tmHeight , b); + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(style | WS_VISIBLE, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(style | WS_BORDER | WS_VISIBLE, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + destroy_child_editcontrol(hwEdit); + + + /* Edit controls that are popup windows */ + + hwEdit = create_editcontrol(style | WS_POPUP, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 0); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 2, 0, metrics.tmHeight , 0); + check_pos(hwEdit, metrics.tmHeight + 10, 0, metrics.tmHeight , 0); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(style | WS_POPUP | WS_BORDER, 0); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, b); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + bm, 0, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b2, b, metrics.tmHeight , b); + check_pos(hwEdit, metrics.tmHeight + b3, b, metrics.tmHeight , b); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(style | WS_POPUP, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + DestroyWindow(hwEdit); + + hwEdit = create_editcontrol(style | WS_POPUP | WS_BORDER, WS_EX_CLIENTEDGE); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM) font, FALSE); + if (single_line) + check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); + check_pos(hwEdit, metrics.tmHeight , 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 1, 0, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 2, 1, metrics.tmHeight , 1); + check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); + DestroyWindow(hwEdit); +} + +static void test_text_position(void) +{ + trace("EDIT: Text position (Single line)\n"); + test_text_position_style(ES_AUTOHSCROLL | ES_AUTOVSCROLL); + trace("EDIT: Text position (Multi line)\n"); + test_text_position_style(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL); +} + +static void test_espassword(void) +{ + HWND hwEdit; + LONG r; + char buffer[1024]; + const char* password = "secret"; + + hwEdit = create_editcontrol(ES_PASSWORD, 0); + r = get_edit_style(hwEdit); + ok(r == ES_PASSWORD, "Wrong style expected ES_PASSWORD got: 0x%x\n", r); + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) password); + ok(r == TRUE, "Expected: %d, got: %d\n", TRUE, r); + + /* select all, cut (ctrl-x) */ + SendMessageA(hwEdit, EM_SETSEL, 0, -1); + r = SendMessageA(hwEdit, WM_CHAR, 24, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(r == strlen(password), "Expected: %s, got len %d\n", password, r); + ok(strcmp(buffer, password) == 0, "expected %s, got %s\n", password, buffer); + + r = OpenClipboard(hwEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* select all, copy (ctrl-c) and paste (ctrl-v) */ + SendMessageA(hwEdit, EM_SETSEL, 0, -1); + r = SendMessageA(hwEdit, WM_CHAR, 3, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwEdit, WM_CHAR, 22, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(r == 0, "Expected: 0, got: %d\n", r); + ok(strcmp(buffer, "") == 0, "expected empty string, got %s\n", buffer); + + DestroyWindow(hwEdit); +} + +static void test_undo(void) +{ + HWND hwEdit; + LONG r; + DWORD cpMin, cpMax; + char buffer[1024]; + const char* text = "undo this"; + + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) text); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + /* select all, */ + cpMin = cpMax = 0xdeadbeef; + SendMessageA(hwEdit, EM_SETSEL, 0, -1); + r = SendMessageA(hwEdit, EM_GETSEL, (WPARAM) &cpMin, (LPARAM) &cpMax); + ok((strlen(text) << 16) == r, "Unexpected length %d\n", r); + ok(0 == cpMin, "Expected: %d, got %d\n", 0, cpMin); + ok(9 == cpMax, "Expected: %d, got %d\n", 9, cpMax); + + /* cut (ctrl-x) */ + r = SendMessageA(hwEdit, WM_CHAR, 24, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected %s, got %s\n", "", buffer); + + /* undo (ctrl-z) */ + r = SendMessageA(hwEdit, WM_CHAR, 26, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(strlen(text) == r, "Unexpected length %d\n", r); + ok(0 == strcmp(buffer, text), "expected %s, got %s\n", text, buffer); + + /* undo again (ctrl-z) */ + r = SendMessageA(hwEdit, WM_CHAR, 26, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(r == 0, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected %s, got %s\n", "", buffer); + + DestroyWindow(hwEdit); +} + +static void test_enter(void) +{ + char buffer[16]; + HWND hwEdit; + LONG r; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected ES_MULTILINE got: 0x%x\n", r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(2 == r, "Expected: %d, got len %d\n", 2, r); + ok(0 == strcmp(buffer, "\r\n"), "expected \"\\r\\n\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); + + /* single line with ES_WANTRETURN */ + hwEdit = create_editcontrol(ES_WANTRETURN, 0); + r = get_edit_style(hwEdit); + ok(ES_WANTRETURN == r, "Wrong style expected ES_WANTRETURN got: 0x%x\n", r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); +} + +static void test_tab(void) +{ + char buffer[16]; + HWND hwEdit; + LONG r; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected ES_MULTILINE got: 0x%x\n", r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_TAB, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(1 == r, "Expected: %d, got len %d\n", 1, r); + ok(0 == strcmp(buffer, "\t"), "expected \"\\t\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessageA(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_TAB, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessageA(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow(hwEdit); +} + +static void test_edit_dialog(void) +{ + int r; + + /* from bug 11841 */ + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* more tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* more tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 6); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 7); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests with an editable edit control */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 6); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 7); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* multiple tab tests */ + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 9); + ok(22 == r, "Expected %d, got %d\n", 22, r); + r = DialogBoxParamA(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 10); + ok(33 == r, "Expected %d, got %d\n", 33, r); +} + +static void test_multi_edit_dialog(void) +{ + int r; + + /* test for multiple edit dialogs (bug 12319) */ + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 0); + ok(2222 == r, "Expected %d, got %d\n", 2222, r); + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 1); + ok(1111 == r, "Expected %d, got %d\n", 1111, r); + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 2); + ok(2222 == r, "Expected %d, got %d\n", 2222, r); + r = DialogBoxParamA(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 3); + ok(11 == r, "Expected %d, got %d\n", 11, r); +} + +static void test_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 1); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 6); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 7); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + +static void test_singleline_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 0); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 6); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 7); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 0); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 6); + ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 7); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParamA(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + +static int child_edit_wmkeydown_num_messages = 0; +static INT_PTR CALLBACK child_edit_wmkeydown_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_DESTROY: + case WM_NCDESTROY: + break; + + default: + child_edit_wmkeydown_num_messages++; + break; + } + + return FALSE; +} + +static void test_child_edit_wmkeydown(void) +{ + HWND hwEdit, hwParent; + int r; + + hwEdit = create_child_editcontrol(0, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtrA(hwParent, GWLP_WNDPROC, (LONG_PTR)child_edit_wmkeydown_proc); + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + ok(0 == child_edit_wmkeydown_num_messages, "expected 0, got %d\n", child_edit_wmkeydown_num_messages); + destroy_child_editcontrol(hwEdit); +} + +static BOOL got_en_setfocus = FALSE; +static BOOL got_wm_capturechanged = FALSE; +static LRESULT (CALLBACK *p_edit_proc)(HWND, UINT, WPARAM, LPARAM); + +static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) { + case WM_COMMAND: + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + got_en_setfocus = TRUE; + break; + } + break; + case WM_CAPTURECHANGED: + if (hWnd != (HWND)lParam) + { + got_wm_capturechanged = TRUE; + EndMenu(); + } + break; + } + return DefWindowProcA(hWnd, msg, wParam, lParam); +} + +struct context_menu_messages +{ + unsigned int wm_command, em_setsel; +}; + +static struct context_menu_messages menu_messages; + +static LRESULT CALLBACK child_edit_menu_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_ENTERIDLE: + if (wParam == MSGF_MENU) + { + HWND hwndMenu = (HWND)lParam; + MENUBARINFO mbi = { sizeof(mbi) }; + if (GetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) + { + MENUITEMINFOA mii = { sizeof(MENUITEMINFOA), MIIM_STATE }; + if (GetMenuItemInfoA(mbi.hMenu, EM_SETSEL, FALSE, &mii)) + { + if (mii.fState & MFS_HILITE) + { + PostMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessageA(hwnd, WM_KEYUP, VK_RETURN, 0x1c0001); + } + else + { + PostMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0x500001); + PostMessageA(hwnd, WM_KEYUP, VK_DOWN, 0x500001); + } + } + } + } + break; + case WM_COMMAND: + menu_messages.wm_command++; + break; + case EM_SETSEL: + menu_messages.em_setsel++; + break; + } + return CallWindowProcA(p_edit_proc, hwnd, msg, wParam, lParam); +} + +static void test_contextmenu(void) +{ + HWND hwndMain, hwndEdit; + MSG msg; + + hwndMain = CreateWindowA(szEditTest4Class, "ET4", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + 0, 0, 200, 200, NULL, NULL, hinst, NULL); + assert(hwndMain); + + hwndEdit = CreateWindowA("EDIT", NULL, + WS_CHILD|WS_BORDER|WS_VISIBLE|ES_LEFT|ES_AUTOHSCROLL, + 0, 0, 150, 50, /* important this not be 0 size. */ + hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); + assert(hwndEdit); + + SetFocus(NULL); + SetCapture(hwndMain); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); + ok(got_en_setfocus, "edit box didn't get focused\n"); + ok(got_wm_capturechanged, "main window capture did not change\n"); + + DestroyWindow(hwndEdit); + + hwndEdit = CreateWindowA("EDIT", "Test Text", + WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, 100, 100, + hwndMain, NULL, hinst, NULL); + memset(&menu_messages, 0, sizeof(menu_messages)); + p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, + (ULONG_PTR)child_edit_menu_proc); + + SetFocus(hwndEdit); + SendMessageA(hwndEdit, WM_SETTEXT, 0, (LPARAM)"foo"); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(-1, -1)); + while (PeekMessageA(&msg, hwndEdit, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok(menu_messages.wm_command == 0, + "Expected no WM_COMMAND messages, got %d\n", menu_messages.wm_command); + ok(menu_messages.em_setsel == 1, + "Expected 1 EM_SETSEL message, got %d\n", menu_messages.em_setsel); + + DestroyWindow(hwndEdit); + DestroyWindow(hwndMain); +} + +static BOOL register_classes(void) +{ + WNDCLASSA test2; + WNDCLASSA test3; + WNDCLASSA test4; + WNDCLASSA text_position; + + test2.style = 0; + test2.lpfnWndProc = ET2_WndProc; + test2.cbClsExtra = 0; + test2.cbWndExtra = 0; + test2.hInstance = hinst; + test2.hIcon = NULL; + test2.hCursor = LoadCursorA (NULL, (LPCSTR)IDC_ARROW); + test2.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + test2.lpszMenuName = NULL; + test2.lpszClassName = szEditTest2Class; + if (!RegisterClassA(&test2)) return FALSE; + + test3.style = 0; + test3.lpfnWndProc = edit3_wnd_procA; + test3.cbClsExtra = 0; + test3.cbWndExtra = 0; + test3.hInstance = hinst; + test3.hIcon = 0; + test3.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + test3.hbrBackground = GetStockObject(WHITE_BRUSH); + test3.lpszMenuName = NULL; + test3.lpszClassName = szEditTest3Class; + if (!RegisterClassA(&test3)) return FALSE; + + test4.style = 0; + test4.lpfnWndProc = edit4_wnd_procA; + test4.cbClsExtra = 0; + test4.cbWndExtra = 0; + test4.hInstance = hinst; + test4.hIcon = NULL; + test4.hCursor = LoadCursorA (NULL, (LPCSTR)IDC_ARROW); + test4.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + test4.lpszMenuName = NULL; + test4.lpszClassName = szEditTest4Class; + if (!RegisterClassA(&test4)) return FALSE; + + text_position.style = CS_HREDRAW | CS_VREDRAW; + text_position.cbClsExtra = 0; + text_position.cbWndExtra = 0; + text_position.hInstance = hinst; + text_position.hIcon = NULL; + text_position.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + text_position.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + text_position.lpszMenuName = NULL; + text_position.lpszClassName = szEditTextPositionClass; + text_position.lpfnWndProc = DefWindowProcA; + if (!RegisterClassA(&text_position)) return FALSE; + + return TRUE; +} + +static void UnregisterWindowClasses (void) +{ + UnregisterClassA(szEditTest2Class, hinst); + UnregisterClassA(szEditTest3Class, hinst); + UnregisterClassA(szEditTest4Class, hinst); + UnregisterClassA(szEditTextPositionClass, hinst); +} + +static void test_fontsize(void) +{ + HWND hwEdit; + HFONT hfont; + HDC hDC; + LOGFONTA lf; + LONG r; + char szLocalString[MAXLEN]; + int dpi; + + hDC = GetDC(NULL); + dpi = GetDeviceCaps(hDC, LOGPIXELSY); + ReleaseDC(NULL, hDC); + + memset(&lf,0,sizeof(LOGFONTA)); + strcpy(lf.lfFaceName,"Arial"); + lf.lfHeight = -300; /* taller than the edit box */ + lf.lfWeight = 500; + hfont = CreateFontIndirectA(&lf); + + trace("EDIT: Oversized font (Multi line)\n"); + hwEdit= CreateWindowA("EDIT", NULL, ES_MULTILINE|ES_AUTOHSCROLL, + 0, 0, (150 * dpi) / 96, (50 * dpi) / 96, NULL, NULL, + hinst, NULL); + + SendMessageA(hwEdit,WM_SETFONT,(WPARAM)hfont,0); + + if (winetest_interactive) + ShowWindow (hwEdit, SW_SHOW); + + r = SendMessageA(hwEdit, WM_CHAR, 'A', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwEdit, WM_CHAR, 'B', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessageA(hwEdit, WM_CHAR, 'C', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + GetWindowTextA(hwEdit, szLocalString, MAXLEN); + ok(strcmp(szLocalString, "ABC")==0, + "Wrong contents of edit: %s\n", szLocalString); + + r = SendMessageA(hwEdit, EM_POSFROMCHAR,0,0); + ok(r != -1,"EM_POSFROMCHAR failed index 0\n"); + r = SendMessageA(hwEdit, EM_POSFROMCHAR,1,0); + ok(r != -1,"EM_POSFROMCHAR failed index 1\n"); + r = SendMessageA(hwEdit, EM_POSFROMCHAR,2,0); + ok(r != -1,"EM_POSFROMCHAR failed index 2\n"); + r = SendMessageA(hwEdit, EM_POSFROMCHAR,3,0); + ok(r == -1,"EM_POSFROMCHAR succeeded index 3\n"); + + DestroyWindow (hwEdit); + DeleteObject(hfont); +} + +struct dialog_mode_messages +{ + int wm_getdefid, wm_close, wm_command, wm_nextdlgctl; +}; + +static struct dialog_mode_messages dm_messages; + +static void zero_dm_messages(void) +{ + dm_messages.wm_command = 0; + dm_messages.wm_close = 0; + dm_messages.wm_getdefid = 0; + dm_messages.wm_nextdlgctl = 0; +} + +#define test_dm_messages(wmcommand, wmclose, wmgetdefid, wmnextdlgctl) \ + ok(dm_messages.wm_command == wmcommand, "expected %d WM_COMMAND messages, " \ + "got %d\n", wmcommand, dm_messages.wm_command); \ + ok(dm_messages.wm_close == wmclose, "expected %d WM_CLOSE messages, " \ + "got %d\n", wmclose, dm_messages.wm_close); \ + ok(dm_messages.wm_getdefid == wmgetdefid, "expected %d WM_GETDIFID messages, " \ + "got %d\n", wmgetdefid, dm_messages.wm_getdefid);\ + ok(dm_messages.wm_nextdlgctl == wmnextdlgctl, "expected %d WM_NEXTDLGCTL messages, " \ + "got %d\n", wmnextdlgctl, dm_messages.wm_nextdlgctl) + +static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +{ + switch (iMsg) + { + case WM_COMMAND: + dm_messages.wm_command++; + break; + case DM_GETDEFID: + dm_messages.wm_getdefid++; + return MAKELONG(ID_EDITTESTDBUTTON, DC_HASDEFID); + case WM_NEXTDLGCTL: + dm_messages.wm_nextdlgctl++; + break; + case WM_CLOSE: + dm_messages.wm_close++; + break; + } + + return DefWindowProcA(hwnd, iMsg, wParam, lParam); +} + +static void test_dialogmode(void) +{ + HWND hwEdit, hwParent, hwButton; + MSG msg= {0}; + int len, r; + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, 0); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessageA(hwEdit, WM_GETDLGCODE, 0, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE, 0); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_BACK; + msg.lParam = 0xe0001; + r = SendMessageA(hwEdit, WM_GETDLGCODE, VK_BACK, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessageA(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessageA(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + DestroyWindow(hwEdit); + + hwEdit = create_child_editcontrol(0, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtrA(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + zero_dm_messages(); + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_TAB; + msg.lParam = 0xf0001; + r = SendMessageA(hwEdit, WM_GETDLGCODE, VK_TAB, (LPARAM)&msg); + ok(0x89 == r, "expected 0x89, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtrA(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_ESCAPE; + msg.lParam = 0x10001; + r = SendMessageA(hwEdit, WM_GETDLGCODE, VK_ESCAPE, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 1); + zero_dm_messages(); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 0); + zero_dm_messages(); + + hwButton = CreateWindowA("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, + 100, 100, 50, 20, hwParent, (HMENU)ID_EDITTESTDBUTTON, hinst, NULL); + ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); + + r = SendMessageA(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 1); + zero_dm_messages(); + + DestroyWindow(hwButton); + destroy_child_editcontrol(hwEdit); +} + +static void test_EM_GETHANDLE(void) +{ + static const WCHAR str1W[] = {'1','1','1','1','+','1','1','1','1','+','1','1','1','1','#',0}; + static const WCHAR str2W[] = {'2','2','2','2','-','2','2','2','2','-','2','2','2','2','-','2','2','2','2','#',0}; + static const char str0[] = "untouched"; + static const char str1[] = "1111+1111+1111#"; + static const char str1_1[] = "2111+1111+1111#"; + static const char str2[] = "2222-2222-2222-2222#"; + static const char str3[] = "3333*3333*3333*3333*3333#"; + CHAR current[42]; + HWND hEdit; + HLOCAL hmem; + HLOCAL hmem2; + HLOCAL halloc; + WCHAR *buffer; + int len; + int r; + + trace("EDIT: EM_GETHANDLE\n"); + + /* EM_GETHANDLE is not supported for a single line edit control */ + hEdit = create_editcontrol(WS_BORDER, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + hmem = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem == NULL, "got %p (expected NULL)\n", hmem); + DestroyWindow(hEdit); + + /* EM_GETHANDLE needs a multiline edit control */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + hmem = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + /* The buffer belongs to the app now. According to MSDN, the app has to LocalFree the + buffer, LocalAlloc a new buffer and pass it to the edit control with EM_SETHANDLE. */ + + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + len = lstrlenW(buffer); +todo_wine + ok(len == lstrlenW(str1W) && !lstrcmpW(buffer, str1W), "Unexpected buffer contents %s, length %d.\n", + wine_dbgstr_w(buffer), len); + LocalUnlock(hmem); + + /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + /* Application altered buffer contents, see if WM_GETTEXTLENGTH/WM_GETTEXT pick that up. */ + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + buffer[0] = '2'; + LocalUnlock(hmem); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(len == lstrlenA(str1_1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok(r == lstrlenA(str1_1) && !lstrcmpA(current, str1_1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + + /* See if WM_SETTEXT/EM_REPLACESEL work. */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + ok(r, "Failed to set text.\n"); + + buffer = LocalLock(hmem); +todo_wine + ok(buffer != NULL && buffer[0] == '1', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + r = SendMessageA(hEdit, EM_REPLACESEL, 0, (LPARAM)str1_1); + ok(r, "Failed to replace selection.\n"); + + buffer = LocalLock(hmem); +todo_wine + ok(buffer != NULL && buffer[0] == '2', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + /* use LocalAlloc first to get a different handle */ + halloc = LocalAlloc(LMEM_MOVEABLE, 42); + ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); + /* prepare our new memory */ + buffer = LocalLock(halloc); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + lstrcpyW(buffer, str2W); + LocalUnlock(halloc); + + /* LocalFree the old memory handle before EM_SETHANDLE the new handle */ + LocalFree(hmem); + /* use LocalAlloc after the LocalFree to likely consume the handle */ + hmem2 = LocalAlloc(LMEM_MOVEABLE, 42); + ok(hmem2 != NULL, "got %p (expected != NULL)\n", hmem2); + + SendMessageA(hEdit, EM_SETHANDLE, (WPARAM)halloc, 0); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str2), "got %d (expected %d)\n", len, lstrlenA(str2)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok(r == lstrlenA(str2) && !lstrcmpA(current, str2), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str2), str2); + + /* set a different text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str3); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str3)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str3)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str3)) && !lstrcmpA(current, str3), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str3), str3); + + LocalFree(hmem2); + DestroyWindow(hEdit); + + /* Some apps have bugs ... */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + /* everything is normal up to EM_GETHANDLE */ + hmem = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + /* Some messages still work while other messages fail. + After LocalFree the memory handle, messages can crash the app */ + + /* A buggy editor used EM_GETHANDLE twice */ + hmem2 = (HGLOBAL) SendMessageA(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem2 == hmem, "got %p (expected %p)\n", hmem2, hmem); + + /* Let the edit control free the memory handle */ + SendMessageA(hEdit, EM_SETHANDLE, (WPARAM)hmem2, 0); + + DestroyWindow(hEdit); +} + +static void test_paste(void) +{ + static const char *str = "this is a simple text"; + static const char *str2 = "first line\r\nsecond line"; + HWND hEdit, hMultilineEdit; + HANDLE hmem, hmem_ret; + char *buffer; + int r, len; + + hEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hMultilineEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + + /* Prepare clipboard data with simple text */ + hmem = GlobalAlloc(GMEM_MOVEABLE, 255); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + buffer = GlobalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + strcpy(buffer, str); + GlobalUnlock(hmem); + + r = OpenClipboard(hEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + hmem_ret = SetClipboardData(CF_TEXT, hmem); + ok(hmem_ret == hmem, "expected %p, got %p\n", hmem, hmem_ret); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* Paste single line */ + SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hEdit, WM_PASTE, 0, 0); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen(str) == len, "got %d\n", len); + + /* Prepare clipboard data with multiline text */ + hmem = GlobalAlloc(GMEM_MOVEABLE, 255); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + buffer = GlobalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + strcpy(buffer, str2); + GlobalUnlock(hmem); + + r = OpenClipboard(hEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + hmem_ret = SetClipboardData(CF_TEXT, hmem); + ok(hmem_ret == hmem, "expected %p, got %p\n", hmem, hmem_ret); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* Paste multiline text in singleline edit - should be cut */ + SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hEdit, WM_PASTE, 0, 0); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen("first line") == len, "got %d\n", len); + + /* Paste multiline text in multiline edit */ + SendMessageA(hMultilineEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hMultilineEdit, WM_PASTE, 0, 0); + len = SendMessageA(hMultilineEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen(str2) == len, "got %d\n", len); + + /* Cleanup */ + DestroyWindow(hEdit); + DestroyWindow(hMultilineEdit); +} + +START_TEST(edit) +{ + ULONG_PTR ctx_cookie; + HANDLE hCtx; + BOOL b; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + hinst = GetModuleHandleA(NULL); + b = register_classes(); + ok(b, "Failed to register test classes.\n"); + if (!b) return; + + test_edit_control_1(); + test_edit_control_2(); + test_edit_control_3(); + test_char_from_pos(); + test_edit_control_5(); + test_edit_control_6(); + test_edit_control_limittext(); + test_edit_control_scroll(); + test_margins(); + test_margins_font_change(); + test_text_position(); + test_espassword(); + test_undo(); + test_enter(); + test_tab(); + test_edit_dialog(); + test_multi_edit_dialog(); + test_wantreturn_edit_dialog(); + test_singleline_wantreturn_edit_dialog(); + test_child_edit_wmkeydown(); + test_fontsize(); + test_dialogmode(); + test_contextmenu(); + test_EM_GETHANDLE(); + test_paste(); + + UnregisterWindowClasses(); + + unload_v6_module(ctx_cookie, hCtx); +} diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 93e12447bc..327aa225e1 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -101,3 +101,63 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_PS_COMBO1, 16, 68, 140, 60, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Add", IDC_PS_PUSHBUTTON1, 164, 68, 40, 13 } + +MULTI_EDIT_DIALOG DIALOG 0, 0, 160, 75 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Multiple Edit Test" +FONT 8, "MS Shell Dlg" +{ + EDITTEXT 1000, 5, 5, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | ES_WANTRETURN + EDITTEXT 1001, 5, 25, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1002, 5, 45, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +} + +EDIT_DIALOG DIALOG 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL +} + +EDIT_READONLY_DIALOG DIALOG 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Readonly Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_READONLY +} + +EDIT_WANTRETURN_DIALOG DIALOG 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN +} + +EDIT_SINGLELINE_DIALOG DIALOG 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL +} + +EDIT_SINGLELINE_WANTRETURN_DIALOG DIALOG 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "OK", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN +} -- 2.15.1

1 0

[PATCH] user32/tests: Remove runtime check for GetMenuBarInfo()
by Nikolay Sivov 18 Dec '17

18 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/edit.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 79c0010e4e..e334be1ddd 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -38,15 +38,6 @@ struct edit_notify { static struct edit_notify notifications; -static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); - -static void init_function_pointers(void) -{ - HMODULE hdll = GetModuleHandleA("user32"); - - pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); -} - static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { static int num_ok_commands = 0; @@ -2310,9 +2301,8 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR memset(&mbi, 0, sizeof(mbi)); mbi.cbSize = sizeof(mbi); SetLastError(0xdeadbeef); - ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); - ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, - "GetMenuBarInfo failed\n"); + ret = GetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); + ok(ret, "GetMenuBarInfo failed\n"); if (ret) { ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); @@ -2324,9 +2314,8 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR memset(&mbi, 0, sizeof(mbi)); mbi.cbSize = sizeof(mbi); SetLastError(0xdeadbeef); - ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); - ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, - "GetMenuBarInfo failed\n"); + ret = GetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); + ok(ret, "GetMenuBarInfo failed\n"); if (ret) { ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); @@ -2356,7 +2345,7 @@ static LRESULT CALLBACK child_edit_menu_proc(HWND hwnd, UINT msg, WPARAM wParam, if (wParam == MSGF_MENU) { HWND hwndMenu = (HWND)lParam; MENUBARINFO mbi = { sizeof(MENUBARINFO) }; - if (pGetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) { + if (GetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) { MENUITEMINFOA mii = { sizeof(MENUITEMINFOA), MIIM_STATE }; if (GetMenuItemInfoA(mbi.hMenu, EM_SETSEL, FALSE, &mii)) { if (mii.fState & MFS_HILITE) { @@ -2402,11 +2391,8 @@ static void test_contextmenu(void) ok(got_en_setfocus, "edit box didn't get focused\n"); ok(got_wm_capturechanged, "main window capture did not change\n"); - if (pGetMenuBarInfo) - { - p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); - SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); - } + p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); DestroyWindow (hwndEdit); @@ -2954,8 +2940,6 @@ START_TEST(edit) { BOOL b; - init_function_pointers(); - hinst = GetModuleHandleA(NULL); b = RegisterWindowClasses(); ok (b, "RegisterWindowClasses failed\n"); -- 2.15.1

1 0

[PATCH] po: Update Catalan translation
by Alex Henrie 18 Dec '17

18 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 1112 +++++++++++++++++++++++++------------------------------------- 1 file changed, 446 insertions(+), 666 deletions(-) diff --git a/po/ca.po b/po/ca.po index e759aee8e8..0fdec04444 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-12-18 20:53-0700\n" +"PO-Revision-Date: 2017-12-17 18:14-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.5\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -842,7 +842,7 @@ msgstr "" #: comdlg32.rc:36 msgid "Invalid character(s) in path" -msgstr "Hi ha caràcters invàlids en el camí" +msgstr "Hi ha caràcters no vàlids en el camí" #: comdlg32.rc:37 msgid "" @@ -1854,7 +1854,7 @@ msgstr "Màscara=" #: crypt32.rc:192 msgid "Registered ID=" -msgstr "ID registrada=" +msgstr "ID registrat=" #: crypt32.rc:193 msgid "Unknown Key Usage" @@ -2439,7 +2439,7 @@ msgid "" "This certificate has an invalid signature. The certificate may have been " "altered or corrupted." msgstr "" -"Aquest certificat té una signatura invàlida. Pot ser que el certificat " +"Aquest certificat té una signatura no vàlida. Pot ser que el certificat " "s'hagués modificat o corromput." #: cryptui.rc:33 @@ -2485,7 +2485,7 @@ msgstr " a " #: cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "Aquest certificat té una signatura invàlida." +msgstr "Aquest certificat té una signatura no vàlida." #: cryptui.rc:43 msgid "This certificate has expired or is not yet valid." @@ -3559,7 +3559,7 @@ msgstr "Error en convertir l'objecte a tipus primitiu" #: jscript.rc:29 msgid "Invalid procedure call or argument" -msgstr "Trucada a procediment o argument invàlid" +msgstr "Trucada a procediment o argument no vàlid" #: jscript.rc:30 msgid "Subscript out of range" @@ -3611,7 +3611,7 @@ msgstr "S'esperava '='" #: jscript.rc:42 msgid "Invalid character" -msgstr "Caràcter invàlid" +msgstr "Caràcter no vàlid" #: jscript.rc:43 msgid "Unterminated string constant" @@ -3695,7 +3695,7 @@ msgstr "Error de sintaxi en l'expressió regular" #: jscript.rc:64 msgid "URI to be encoded contains invalid characters" -msgstr "L'URI a codificar conté caràcters invàlids" +msgstr "L'URI a codificar conté caràcters no vàlids" #: jscript.rc:63 msgid "URI to be decoded is incorrect" @@ -3711,7 +3711,7 @@ msgstr "La precisió és fora d'interval" #: jscript.rc:67 msgid "Array length must be a finite positive integer" -msgstr "La longitud del vector ha de ser un enter positiu finit" +msgstr "La longitud del vector ha de ser un nombre enter positiu finit" #: jscript.rc:68 msgid "Array object expected" @@ -3719,7 +3719,7 @@ msgstr "S'esperava un objecte Array" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "DLL de nucli del Wine" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -3731,7 +3731,7 @@ msgstr "Èxit.\n" #: winerror.mc:31 msgid "Invalid function.\n" -msgstr "La funció és invàlida.\n" +msgstr "La funció no és vàlida.\n" #: winerror.mc:36 msgid "File not found.\n" @@ -3751,7 +3751,7 @@ msgstr "S'ha denegat l'accés.\n" #: winerror.mc:56 msgid "Invalid handle.\n" -msgstr "L'identificador és invàlid.\n" +msgstr "L'identificador no és vàlid.\n" #: winerror.mc:61 msgid "Memory trashed.\n" @@ -3763,7 +3763,7 @@ msgstr "Manca memòria.\n" #: winerror.mc:71 msgid "Invalid block.\n" -msgstr "El bloc és invàlid.\n" +msgstr "El bloc no és vàlid.\n" #: winerror.mc:76 msgid "Bad environment.\n" @@ -3775,11 +3775,11 @@ msgstr "El format és dolent.\n" #: winerror.mc:86 msgid "Invalid access.\n" -msgstr "L'accés és invàlid.\n" +msgstr "L'accés no és vàlid.\n" #: winerror.mc:91 msgid "Invalid data.\n" -msgstr "Les dades són invàlides.\n" +msgstr "Les dades no són vàlides.\n" #: winerror.mc:96 msgid "Out of memory.\n" @@ -3787,7 +3787,7 @@ msgstr "No queda memòria.\n" #: winerror.mc:101 msgid "Invalid drive.\n" -msgstr "La unitat és invàlida.\n" +msgstr "La unitat no és vàlida.\n" #: winerror.mc:106 msgid "Can't delete current directory.\n" @@ -3815,7 +3815,7 @@ msgstr "No està llest.\n" #: winerror.mc:136 msgid "Bad command.\n" -msgstr "L'ordre és dolent.\n" +msgstr "L'ordre és dolenta.\n" #: winerror.mc:141 msgid "CRC error.\n" @@ -3991,11 +3991,11 @@ msgstr "Ja s'ha assignat.\n" #: winerror.mc:356 winerror.mc:1711 msgid "Invalid password.\n" -msgstr "La contrasenya és invàlida.\n" +msgstr "La contrasenya no és vàlida.\n" #: winerror.mc:361 msgid "Invalid parameter.\n" -msgstr "El paràmetre és invàlid.\n" +msgstr "El paràmetre no és vàlid.\n" #: winerror.mc:366 msgid "Net write fault.\n" @@ -4059,15 +4059,15 @@ msgstr "No queden identificadors de cerca.\n" #: winerror.mc:446 msgid "Invalid target handle.\n" -msgstr "L'identificador destinatari és invàlid.\n" +msgstr "L'identificador de destinació no és vàlid.\n" #: winerror.mc:451 msgid "Invalid IOCTL.\n" -msgstr "L'IOCTL és invàlid.\n" +msgstr "L'IOCTL no és vàlid.\n" #: winerror.mc:456 msgid "Invalid verify switch.\n" -msgstr "L'indicador de verificació és invàlid.\n" +msgstr "L'indicador de verificació no és vàlid.\n" #: winerror.mc:461 msgid "Bad driver level.\n" @@ -4087,11 +4087,11 @@ msgstr "La memòria intermèdia és insuficient.\n" #: winerror.mc:481 msgid "Invalid name.\n" -msgstr "El nom és invàlid.\n" +msgstr "El nom no és vàlid.\n" #: winerror.mc:486 msgid "Invalid level.\n" -msgstr "El nivell és invàlid.\n" +msgstr "El nivell no és vàlid.\n" #: winerror.mc:491 msgid "No volume label.\n" @@ -4115,7 +4115,7 @@ msgstr "El procés fill no s'ha acabat.\n" #: winerror.mc:516 msgid "Invalid use of direct access handle.\n" -msgstr "L'ús d'identificador d'accés directe és invàlid.\n" +msgstr "L'ús d'identificador d'accés directe no és vàlid.\n" #: winerror.mc:521 msgid "Negative seek.\n" @@ -4123,7 +4123,7 @@ msgstr "La cerca és negativa.\n" #: winerror.mc:531 msgid "Drive is a JOIN target.\n" -msgstr "La unitat és un destinatari JOIN.\n" +msgstr "La unitat és una destinació JOIN.\n" #: winerror.mc:536 msgid "Drive is already JOINed.\n" @@ -4187,7 +4187,7 @@ msgstr "El camí està ocupat.\n" #: winerror.mc:611 msgid "Already a SUBST target.\n" -msgstr "Ja és un destinatari SUBST.\n" +msgstr "Ja és una destinació SUBST.\n" #: winerror.mc:616 msgid "System trace not specified or disallowed.\n" @@ -4203,7 +4203,7 @@ msgstr "Hi ha massa esperançats per a DosMuxSemWait.\n" #: winerror.mc:631 msgid "DosSemMuxWait list invalid.\n" -msgstr "La llista de DosSemMuxWait és invàlida.\n" +msgstr "La llista de DosSemMuxWait no és vàlida.\n" #: winerror.mc:636 msgid "Volume label too long.\n" @@ -4231,11 +4231,11 @@ msgstr "L'adreça d'ID de fil és dolent.\n" #: winerror.mc:666 msgid "Bad arguments to DosExecPgm.\n" -msgstr "Els paràmetres a DosExecPgm són dolents.\n" +msgstr "Els arguments a DosExecPgm són dolents.\n" #: winerror.mc:671 msgid "Path is invalid.\n" -msgstr "El camí és invàlid.\n" +msgstr "El camí no és vàlid.\n" #: winerror.mc:676 msgid "Signal pending.\n" @@ -4263,11 +4263,11 @@ msgstr "No s'accepten els bloqueigs atòmics.\n" #: winerror.mc:706 msgid "Invalid segment number.\n" -msgstr "El nombre de segment és invàlid.\n" +msgstr "El número de segment no és vàlid.\n" #: winerror.mc:711 msgid "Invalid ordinal for %1.\n" -msgstr "L'ordinal per a %1 és invàlid.\n" +msgstr "L'ordinal per a %1 no és vàlid.\n" #: winerror.mc:716 msgid "File already exists.\n" @@ -4275,7 +4275,7 @@ msgstr "El fitxer ja existeix.\n" #: winerror.mc:721 msgid "Invalid flag number.\n" -msgstr "El nombre de bandera és invàlida.\n" +msgstr "El número de bandera no és vàlid.\n" #: winerror.mc:726 msgid "Semaphore name not found.\n" @@ -4283,23 +4283,23 @@ msgstr "No s'ha trobat el nom de semàfor.\n" #: winerror.mc:731 msgid "Invalid starting code segment for %1.\n" -msgstr "El segment de codi d'inici per a %1 és invàlid.\n" +msgstr "El segment de codi d'inici per a %1 no és vàlid.\n" #: winerror.mc:736 msgid "Invalid starting stack segment for %1.\n" -msgstr "El segment de codi d'inici de pila per a %1 és invàlid.\n" +msgstr "El segment de codi d'inici de pila per a %1 no és vàlid.\n" #: winerror.mc:741 msgid "Invalid module type for %1.\n" -msgstr "El tipus de mòdul per a %1 és invàlid.\n" +msgstr "El tipus de mòdul per a %1 no és vàlid.\n" #: winerror.mc:746 msgid "Invalid EXE signature in %1.\n" -msgstr "La signatura EXE en %1 és invàlida.\n" +msgstr "La signatura EXE en %1 no és vàlida.\n" #: winerror.mc:751 msgid "EXE %1 is marked invalid.\n" -msgstr "L'EXE %1 està marcat com a invàlid.\n" +msgstr "L'EXE %1 està marcat com a no vàlid.\n" #: winerror.mc:756 msgid "Bad EXE format for %1.\n" @@ -4311,11 +4311,11 @@ msgstr "Les dades iterades superen 64k en %1.\n" #: winerror.mc:766 msgid "Invalid MinAllocSize in %1.\n" -msgstr "El MinAllocSize en %1 és invàlid.\n" +msgstr "La MinAllocSize en %1 no és vàlida.\n" #: winerror.mc:771 msgid "Dynlink from invalid ring.\n" -msgstr "L'enllaç dinàmic d'anell és invàlid.\n" +msgstr "L'enllaç dinàmic d'anell no és vàlid.\n" #: winerror.mc:776 msgid "IOPL not enabled.\n" @@ -4323,7 +4323,7 @@ msgstr "L'IOPL no està habilitat.\n" #: winerror.mc:781 msgid "Invalid SEGDPL in %1.\n" -msgstr "L'SEGDPL en %1 és invàlid.\n" +msgstr "L'SEGDPL en %1 no és vàlid.\n" #: winerror.mc:786 msgid "Auto data segment exceeds 64k.\n" @@ -4363,7 +4363,7 @@ msgstr "Hi ha un error en l'ús de comodins de nom de fitxer.\n" #: winerror.mc:831 msgid "Invalid signal number.\n" -msgstr "El nombre de senyal és invàlid.\n" +msgstr "El número de senyal no és vàlid.\n" #: winerror.mc:836 msgid "Error setting signal handler.\n" @@ -4411,7 +4411,7 @@ msgstr "S'ha cancel·lat la sessió.\n" #: winerror.mc:891 msgid "Invalid extended attribute name.\n" -msgstr "El nom d'atribut estès és invàlid.\n" +msgstr "El nom d'atribut estès no és vàlid.\n" #: winerror.mc:896 msgid "Extended attribute list inconsistent.\n" @@ -4427,7 +4427,7 @@ msgstr "No es pot utilitzar la Copy API.\n" #: winerror.mc:911 msgid "Directory name invalid.\n" -msgstr "El nom de directori és invàlid.\n" +msgstr "El nom de directori no és vàlid.\n" #: winerror.mc:916 msgid "Extended attributes didn't fit.\n" @@ -4443,7 +4443,7 @@ msgstr "La taula d'atributs estesos està ple.\n" #: winerror.mc:931 msgid "Invalid extended attribute handle.\n" -msgstr "L'identificador d'atribut estès és invàlid.\n" +msgstr "L'identificador d'atribut estès no és vàlid.\n" #: winerror.mc:936 msgid "Extended attributes not supported.\n" @@ -4467,7 +4467,7 @@ msgstr "No s'ha concedit el bloqueig d'operació.\n" #: winerror.mc:961 msgid "Invalid oplock message received.\n" -msgstr "S'ha rebut un missatge invàlid de bloqueig d'operació.\n" +msgstr "S'ha rebut un missatge no vàlid de bloqueig d'operació.\n" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" @@ -4475,7 +4475,7 @@ msgstr "No s'ha trobat el missatge 0x%1 en el fitxer %2.\n" #: winerror.mc:971 msgid "Invalid address.\n" -msgstr "L'adreça és invàlida.\n" +msgstr "L'adreça no és vàlida.\n" #: winerror.mc:976 msgid "Arithmetic overflow.\n" @@ -4519,7 +4519,7 @@ msgstr "Hi ha hagut un desbordament de pila.\n" #: winerror.mc:1026 msgid "Invalid message.\n" -msgstr "El missatge és invàlid.\n" +msgstr "El missatge no és vàlid.\n" #: winerror.mc:1031 msgid "Cannot complete.\n" @@ -4527,7 +4527,7 @@ msgstr "No es pot acabar.\n" #: winerror.mc:1036 msgid "Invalid flags.\n" -msgstr "Les banderes són invàlides.\n" +msgstr "Les banderes no són vàlides.\n" #: winerror.mc:1041 msgid "Unrecognized volume.\n" @@ -4535,7 +4535,7 @@ msgstr "No s'ha reconegut el volum.\n" #: winerror.mc:1046 msgid "File invalid.\n" -msgstr "El fitxer és invàlid.\n" +msgstr "El fitxer no és vàlid.\n" #: winerror.mc:1051 msgid "Cannot run full-screen.\n" @@ -4551,7 +4551,7 @@ msgstr "El registre és corrupte.\n" #: winerror.mc:1066 msgid "Invalid key.\n" -msgstr "La clau és invàlida.\n" +msgstr "La clau no és vàlida.\n" #: winerror.mc:1071 msgid "Can't open registry key.\n" @@ -4607,7 +4607,7 @@ msgstr "Els serveis dependents s'estan executant.\n" #: winerror.mc:1136 msgid "Invalid service control.\n" -msgstr "El control de servei és invàlid.\n" +msgstr "El control de servei no és vàlid.\n" #: winerror.mc:1141 msgid "Service request timeout.\n" @@ -4627,7 +4627,7 @@ msgstr "El servei ja està executant.\n" #: winerror.mc:1161 msgid "Invalid service account.\n" -msgstr "El compte de servei és invàlid.\n" +msgstr "El compte de servei no és vàlid.\n" #: winerror.mc:1166 msgid "Service is disabled.\n" @@ -4683,7 +4683,7 @@ msgstr "L'inici de servei s'ha congelat.\n" #: winerror.mc:1231 msgid "Invalid service lock.\n" -msgstr "El bloqueig de servei és invàlid.\n" +msgstr "El bloqueig de servei no és vàlid.\n" #: winerror.mc:1236 msgid "Service marked for delete.\n" @@ -4759,7 +4759,7 @@ msgstr "La partició ha fallat.\n" #: winerror.mc:1326 msgid "Invalid block length.\n" -msgstr "La longitud de bloc és invàlida.\n" +msgstr "La longitud de bloc no és vàlida.\n" #: winerror.mc:1331 msgid "Device not partitioned.\n" @@ -4895,7 +4895,7 @@ msgstr "Aplicació de mode real.\n" #: winerror.mc:1496 msgid "Invalid DLL.\n" -msgstr "La DLL és invàlida.\n" +msgstr "La DLL no és vàlida.\n" #: winerror.mc:1501 msgid "No associated application.\n" @@ -4923,11 +4923,11 @@ msgstr "L'element font està buit.\n" #: winerror.mc:1531 msgid "The destination element is full.\n" -msgstr "L'element destinatari està ple.\n" +msgstr "L'element de destinació està ple.\n" #: winerror.mc:1536 msgid "The element address is invalid.\n" -msgstr "L'adreça d'element és invàlida.\n" +msgstr "L'adreça d'element no és vàlida.\n" #: winerror.mc:1541 msgid "The magazine is not present.\n" @@ -5003,7 +5003,7 @@ msgstr "L'entrada de journal s'ha suprimit.\n" #: winerror.mc:1631 msgid "Invalid device name.\n" -msgstr "El nom de dispositiu és invàlid.\n" +msgstr "El nom de dispositiu no és vàlid.\n" #: winerror.mc:1636 msgid "Connection unavailable.\n" @@ -5019,7 +5019,7 @@ msgstr "No hi ha cap xarxa o el camí és dolent.\n" #: winerror.mc:1651 msgid "Invalid network provider name.\n" -msgstr "El nom de proveïdor de xarxa és invàlid.\n" +msgstr "El nom de proveïdor de xarxa no és vàlid.\n" #: winerror.mc:1656 msgid "Cannot open network connection profile.\n" @@ -5039,39 +5039,39 @@ msgstr "Hi ha hagut un error estès.\n" #: winerror.mc:1676 msgid "Invalid group name.\n" -msgstr "El nom de grup és invàlid.\n" +msgstr "El nom de grup no és vàlid.\n" #: winerror.mc:1681 msgid "Invalid computer name.\n" -msgstr "El nom d'ordinador és invàlid.\n" +msgstr "El nom d'ordinador no és vàlid.\n" #: winerror.mc:1686 msgid "Invalid event name.\n" -msgstr "El nom d'esdeveniment és invàlid.\n" +msgstr "El nom d'esdeveniment no és vàlid.\n" #: winerror.mc:1691 msgid "Invalid domain name.\n" -msgstr "El nom de domini és invàlid.\n" +msgstr "El nom de domini no és vàlid.\n" #: winerror.mc:1696 msgid "Invalid service name.\n" -msgstr "El nom de servei és invàlid.\n" +msgstr "El nom de servei no és vàlid.\n" #: winerror.mc:1701 msgid "Invalid network name.\n" -msgstr "El nom de xarxa és invàlid.\n" +msgstr "El nom de xarxa no és vàlid.\n" #: winerror.mc:1706 msgid "Invalid share name.\n" -msgstr "El nom de compartició és invàlid.\n" +msgstr "El nom de compartició no és vàlid.\n" #: winerror.mc:1716 msgid "Invalid message name.\n" -msgstr "El nom de missatge és invàlid.\n" +msgstr "El nom de missatge no és vàlid.\n" #: winerror.mc:1721 msgid "Invalid message destination.\n" -msgstr "La destinació de missatge és invàlida.\n" +msgstr "La destinació de missatge no és vàlida.\n" #: winerror.mc:1726 msgid "Session credential conflict.\n" @@ -5115,7 +5115,7 @@ msgstr "L'adreça no està associada amb el punt final de transport.\n" #: winerror.mc:1776 msgid "Connection invalid.\n" -msgstr "La connexió és invàlida.\n" +msgstr "La connexió no és vàlida.\n" #: winerror.mc:1781 msgid "Connection is active.\n" @@ -5211,7 +5211,7 @@ msgstr "Realitza l'operació encara que no hagi canviat res.\n" #: winerror.mc:1896 msgid "The user profile is invalid.\n" -msgstr "El perfil d'usuari és invàlid.\n" +msgstr "El perfil d'usuari no és vàlid.\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server.\n" @@ -5223,7 +5223,7 @@ msgstr "No tots els privilegis estan assignats.\n" #: winerror.mc:1911 msgid "Some security IDs not mapped.\n" -msgstr "Algunes ID de seguretat no estan assignades.\n" +msgstr "Alguns ID de seguretat no estan assignats.\n" #: winerror.mc:1916 msgid "No quotas for account.\n" @@ -5247,11 +5247,11 @@ msgstr "Els nivells de revisió són incompatibles.\n" #: winerror.mc:1941 msgid "Invalid owner.\n" -msgstr "El propietari és invàlid.\n" +msgstr "El propietari no és vàlid.\n" #: winerror.mc:1946 msgid "Invalid primary group.\n" -msgstr "El grup primari és invàlid.\n" +msgstr "El grup principal no és vàlid.\n" #: winerror.mc:1951 msgid "No impersonation token.\n" @@ -5279,7 +5279,7 @@ msgstr "No es té el privilegi.\n" #: winerror.mc:1981 msgid "Invalid account name.\n" -msgstr "El nom del compte és invàlid.\n" +msgstr "El nom del compte no és vàlid.\n" #: winerror.mc:1986 msgid "User already exists.\n" @@ -5331,11 +5331,11 @@ msgstr "Hi ha una restricció de compte.\n" #: winerror.mc:2046 msgid "Invalid logon hours.\n" -msgstr "Les hores de sessió són invàlides.\n" +msgstr "Les hores de sessió no són vàlides.\n" #: winerror.mc:2051 msgid "Invalid workstation.\n" -msgstr "L'estació de treball és invàlida.\n" +msgstr "L'estació de treball no és vàlida.\n" #: winerror.mc:2056 msgid "Password expired.\n" @@ -5355,23 +5355,23 @@ msgstr "S'han sol·licitat massa LUID.\n" #: winerror.mc:2076 msgid "LUIDs exhausted.\n" -msgstr "S'han acabat les LUID.\n" +msgstr "S'han acabat els LUID.\n" #: winerror.mc:2081 msgid "Invalid sub authority.\n" -msgstr "La subautoritat és invàlida.\n" +msgstr "La subautoritat no és vàlida.\n" #: winerror.mc:2086 msgid "Invalid ACL.\n" -msgstr "L'ACL és invàlida.\n" +msgstr "L'ACL no és vàlida.\n" #: winerror.mc:2091 msgid "Invalid SID.\n" -msgstr "L'SID és invàlid.\n" +msgstr "L'SID no és vàlid.\n" #: winerror.mc:2096 msgid "Invalid security descriptor.\n" -msgstr "El descriptor de seguretat és invàlid.\n" +msgstr "El descriptor de seguretat no és vàlid.\n" #: winerror.mc:2101 msgid "Bad inherited ACL.\n" @@ -5387,7 +5387,7 @@ msgstr "El servidor no està inhabilitat.\n" #: winerror.mc:2116 msgid "Invalid ID authority.\n" -msgstr "L'autoritat d'ID és invàlida.\n" +msgstr "L'autoritat d'ID no és vàlida.\n" #: winerror.mc:2121 msgid "Allotted space exceeded.\n" @@ -5395,7 +5395,7 @@ msgstr "S'ha superat l'espai assignat.\n" #: winerror.mc:2126 msgid "Invalid group attributes.\n" -msgstr "Els atributs de grup són invàlids.\n" +msgstr "Els atributs de grup no són vàlids.\n" #: winerror.mc:2131 msgid "Bad impersonation level.\n" @@ -5423,15 +5423,15 @@ msgstr "No es pot accedir a la informació de domini.\n" #: winerror.mc:2161 msgid "Invalid server state.\n" -msgstr "L'estat de servidor és invàlid.\n" +msgstr "L'estat de servidor no és vàlid.\n" #: winerror.mc:2166 msgid "Invalid domain state.\n" -msgstr "L'estat de domini és invàlid.\n" +msgstr "L'estat de domini no és vàlid.\n" #: winerror.mc:2171 msgid "Invalid domain role.\n" -msgstr "El paper de domini és invàlid.\n" +msgstr "El rol de domini no és vàlid.\n" #: winerror.mc:2176 msgid "No such domain.\n" @@ -5483,7 +5483,7 @@ msgstr "Hi ha hagut una col·lisió d'ID de sessió d'inici.\n" #: winerror.mc:2236 msgid "Invalid logon type.\n" -msgstr "El tipus d'inici de sessió és invàlid.\n" +msgstr "El tipus d'inici de sessió no és vàlid.\n" #: winerror.mc:2241 msgid "Cannot impersonate.\n" @@ -5491,7 +5491,7 @@ msgstr "No es pot suplantar.\n" #: winerror.mc:2246 msgid "Invalid transaction state.\n" -msgstr "L'estat de transacció és invàlid.\n" +msgstr "L'estat de transacció no és vàlid.\n" #: winerror.mc:2251 msgid "Security DB commit failure.\n" @@ -5511,7 +5511,7 @@ msgstr "L'usuari és integrat.\n" #: winerror.mc:2271 msgid "Group is primary for user.\n" -msgstr "El grup és el primari per a l'usuari.\n" +msgstr "El grup és el principal per a l'usuari.\n" #: winerror.mc:2276 msgid "Token already in use.\n" @@ -5563,7 +5563,7 @@ msgstr "No hi ha tal membre.\n" #: winerror.mc:2341 msgid "Invalid member.\n" -msgstr "El membre és invàlid.\n" +msgstr "El membre no és vàlid.\n" #: winerror.mc:2346 msgid "Too many SIDs.\n" @@ -5595,7 +5595,7 @@ msgstr "S'ha superat la quota de llicència.\n" #: winerror.mc:2381 msgid "Wrong target name.\n" -msgstr "El nom del destinatari és incorrecte.\n" +msgstr "El nom de la destinació és incorrecte.\n" #: winerror.mc:2386 msgid "Mutual authentication failed.\n" @@ -5607,27 +5607,27 @@ msgstr "Hi ha una asimetria de temps entre el client i el servidor.\n" #: winerror.mc:2396 msgid "Invalid window handle.\n" -msgstr "L'identificador de finestra és invàlid.\n" +msgstr "L'identificador de finestra no és vàlid.\n" #: winerror.mc:2401 msgid "Invalid menu handle.\n" -msgstr "L'identificador de menú és invàlid.\n" +msgstr "L'identificador de menú no és vàlid.\n" #: winerror.mc:2406 msgid "Invalid cursor handle.\n" -msgstr "L'identificador de cursor és invàlid.\n" +msgstr "L'identificador de cursor no és vàlid.\n" #: winerror.mc:2411 msgid "Invalid accelerator table handle.\n" -msgstr "L'identificador de taula acceleradora és invàlid.\n" +msgstr "L'identificador de taula acceleradora no és vàlid.\n" #: winerror.mc:2416 msgid "Invalid hook handle.\n" -msgstr "L'identificador de ganxo és invàlid.\n" +msgstr "L'identificador de ganxo no és vàlid.\n" #: winerror.mc:2421 msgid "Invalid DWP handle.\n" -msgstr "L'identificador DWP és invàlid.\n" +msgstr "L'identificador DWP no és vàlid.\n" #: winerror.mc:2426 msgid "Can't create top-level child window.\n" @@ -5659,11 +5659,11 @@ msgstr "La classe té finestres obertes.\n" #: winerror.mc:2461 msgid "Invalid index.\n" -msgstr "L'índex és invàlid.\n" +msgstr "L'índex no és vàlid.\n" #: winerror.mc:2466 msgid "Invalid icon handle.\n" -msgstr "L'identificador d'icona és invàlid.\n" +msgstr "L'identificador d'icona no és vàlid.\n" #: winerror.mc:2471 msgid "Private dialog index.\n" @@ -5671,7 +5671,7 @@ msgstr "L'índex de diàleg és privat.\n" #: winerror.mc:2476 msgid "List box ID not found.\n" -msgstr "No s'ha trobat l'ID de caixa de llista.\n" +msgstr "No s'ha trobat l'ID de quadre de llista.\n" #: winerror.mc:2481 msgid "No wildcard characters.\n" @@ -5695,7 +5695,7 @@ msgstr "No s'ha trobat l'ID de control.\n" #: winerror.mc:2506 msgid "Invalid combo box message.\n" -msgstr "El missatge de quadre combinat és invàlid.\n" +msgstr "El missatge de quadre combinat no és vàlid.\n" #: winerror.mc:2511 msgid "Not a combo box window.\n" @@ -5703,7 +5703,7 @@ msgstr "No és finestra de quadre combinat.\n" #: winerror.mc:2516 msgid "Invalid edit height.\n" -msgstr "L'altura d'edició és invàlida.\n" +msgstr "L'altura d'edició no és vàlida.\n" #: winerror.mc:2521 msgid "DC not found.\n" @@ -5711,11 +5711,11 @@ msgstr "No s'ha trobat el DC.\n" #: winerror.mc:2526 msgid "Invalid hook filter.\n" -msgstr "El filtre de ganxo és invàlid.\n" +msgstr "El filtre de ganxo no és vàlid.\n" #: winerror.mc:2531 msgid "Invalid filter procedure.\n" -msgstr "El procediment de filtre és invàlid.\n" +msgstr "El procediment de filtre no és vàlid.\n" #: winerror.mc:2536 msgid "Hook procedure needs module handle.\n" @@ -5735,15 +5735,15 @@ msgstr "El procediment de ganxo no està instal·lat.\n" #: winerror.mc:2556 msgid "Invalid list box message.\n" -msgstr "El missatge de caixa de llista és invàlid.\n" +msgstr "El missatge de quadre de llista no és vàlid.\n" #: winerror.mc:2561 msgid "Invalid LB_SETCOUNT sent.\n" -msgstr "S'ha enviat un LB_SETCOUNT invàlid.\n" +msgstr "S'ha enviat un LB_SETCOUNT no vàlid.\n" #: winerror.mc:2566 msgid "No tab stops on this list box.\n" -msgstr "No hi ha cap tabulador que s'aturi en aquesta caixa de llista.\n" +msgstr "No hi ha cap tabulador que s'aturi en aquest quadre de llista.\n" #: winerror.mc:2571 msgid "Can't destroy object owned by another thread.\n" @@ -5759,11 +5759,11 @@ msgstr "La finestra no té menú de sistema.\n" #: winerror.mc:2586 msgid "Invalid message box style.\n" -msgstr "L'estil de quadre de missatge és invàlid.\n" +msgstr "L'estil de quadre de missatge no és vàlid.\n" #: winerror.mc:2591 msgid "Invalid SPI parameter.\n" -msgstr "El paràmetre SPI és invàlid.\n" +msgstr "El paràmetre SPI no és vàlid.\n" #: winerror.mc:2596 msgid "Screen already locked.\n" @@ -5779,11 +5779,11 @@ msgstr "No és finestra filla.\n" #: winerror.mc:2611 msgid "Invalid GW command.\n" -msgstr "L'ordre GW és invàlid.\n" +msgstr "L'ordre GW no és vàlida.\n" #: winerror.mc:2616 msgid "Invalid thread ID.\n" -msgstr "L'ID de fil és invàlid.\n" +msgstr "L'ID de fil no és vàlid.\n" #: winerror.mc:2621 msgid "Not an MDI child window.\n" @@ -5799,11 +5799,11 @@ msgstr "No hi ha cap barra de desplaçament.\n" #: winerror.mc:2636 msgid "Invalid scrollbar range.\n" -msgstr "L'interval de desplaçament és invàlid.\n" +msgstr "L'interval de desplaçament no és vàlid.\n" #: winerror.mc:2641 msgid "Invalid ShowWin command.\n" -msgstr "L'ordre ShowWin és invàlid.\n" +msgstr "L'ordre ShowWin no és vàlida.\n" #: winerror.mc:2646 msgid "No system resources.\n" @@ -5835,7 +5835,7 @@ msgstr "No s'ha trobat l'element de menú.\n" #: winerror.mc:2681 msgid "Invalid keyboard handle.\n" -msgstr "L'identificador de teclat és invàlid.\n" +msgstr "L'identificador de teclat no és vàlid.\n" #: winerror.mc:2686 msgid "Hook type not allowed.\n" @@ -5851,7 +5851,7 @@ msgstr "S'ha superat el temps d'espera.\n" #: winerror.mc:2701 msgid "Invalid monitor handle.\n" -msgstr "L'identificador de monitor és invàlid.\n" +msgstr "L'identificador de monitor no és vàlid.\n" #: winerror.mc:2706 msgid "Event log file corrupt.\n" @@ -5903,7 +5903,7 @@ msgstr "La propietat és desconeguda.\n" #: winerror.mc:2766 msgid "Invalid handle state.\n" -msgstr "L'estat d'identificador és invàlid.\n" +msgstr "L'estat d'identificador no és vàlid.\n" #: winerror.mc:2771 msgid "Bad configuration.\n" @@ -5927,11 +5927,11 @@ msgstr "S'ha desinstal·lat el producte.\n" #: winerror.mc:2796 msgid "Invalid query syntax.\n" -msgstr "La sintaxi de consulta és invàlida.\n" +msgstr "La sintaxi de consulta no és vàlida.\n" #: winerror.mc:2801 msgid "Invalid field.\n" -msgstr "El camp és invàlid.\n" +msgstr "El camp no és vàlid.\n" #: winerror.mc:2806 msgid "Device removed.\n" @@ -5947,7 +5947,7 @@ msgstr "El paquet d'instal·lació ha fallat en obrir.\n" #: winerror.mc:2821 msgid "Installation package is invalid.\n" -msgstr "El paquet d'instal·lació és invàlid.\n" +msgstr "El paquet d'instal·lació no és vàlid.\n" #: winerror.mc:2826 msgid "Installer user interface failed.\n" @@ -5979,7 +5979,7 @@ msgstr "La funció ha fallat.\n" #: winerror.mc:2861 msgid "Invalid table.\n" -msgstr "La taula és invàlida.\n" +msgstr "La taula no és vàlida.\n" #: winerror.mc:2866 msgid "Data type mismatch.\n" @@ -6011,7 +6011,7 @@ msgstr "S'ha fallat en obrir el paquet de pedaç.\n" #: winerror.mc:2901 msgid "Invalid patch package.\n" -msgstr "El paquet de pedaç és invàlid.\n" +msgstr "El paquet de pedaç no és vàlid.\n" #: winerror.mc:2906 msgid "Unsupported patch package.\n" @@ -6023,7 +6023,7 @@ msgstr "Una altra versió està instal·lada.\n" #: winerror.mc:2916 msgid "Invalid command line.\n" -msgstr "La línia d'ordres és invàlida.\n" +msgstr "La línia d'ordres no és vàlida.\n" #: winerror.mc:2921 msgid "Remote installation not allowed.\n" @@ -6035,15 +6035,15 @@ msgstr "S'ha iniciat un reinici després d'instal·lació amb èxit.\n" #: winerror.mc:2931 msgid "Invalid string binding.\n" -msgstr "El lligament de cadena és invàlid.\n" +msgstr "La vinculació de cadena no és vàlida.\n" #: winerror.mc:2936 msgid "Wrong kind of binding.\n" -msgstr "El tipus de lligament és incorrecte.\n" +msgstr "El tipus de vinculació és incorrecte.\n" #: winerror.mc:2941 msgid "Invalid binding.\n" -msgstr "El lligament és invàlid.\n" +msgstr "La vinculació no és vàlida.\n" #: winerror.mc:2946 msgid "RPC protocol sequence not supported.\n" @@ -6051,19 +6051,19 @@ msgstr "La seqüència de protocol RPC no és compatible.\n" #: winerror.mc:2951 msgid "Invalid RPC protocol sequence.\n" -msgstr "La seqüència de protocol RPC és invàlida.\n" +msgstr "La seqüència de protocol RPC no és vàlida.\n" #: winerror.mc:2956 msgid "Invalid string UUID.\n" -msgstr "L'UUID de cadena és invàlida.\n" +msgstr "L'UUID de cadena no és vàlid.\n" #: winerror.mc:2961 msgid "Invalid endpoint format.\n" -msgstr "El format de punt final és invàlid.\n" +msgstr "El format de punt final no és vàlid.\n" #: winerror.mc:2966 msgid "Invalid network address.\n" -msgstr "L'adreça de xarxa és invàlida.\n" +msgstr "L'adreça de xarxa no és vàlida.\n" #: winerror.mc:2971 msgid "No endpoint found.\n" @@ -6071,7 +6071,7 @@ msgstr "No s'ha trobat cap punt final.\n" #: winerror.mc:2976 msgid "Invalid timeout value.\n" -msgstr "El valor de temps d'espera és invàlid.\n" +msgstr "El valor de temps d'espera no és vàlid.\n" #: winerror.mc:2981 msgid "Object UUID not found.\n" @@ -6107,7 +6107,7 @@ msgstr "La interfície és desconeguda.\n" #: winerror.mc:3021 msgid "No bindings.\n" -msgstr "No hi ha cap lligament.\n" +msgstr "No hi ha cap vinculació.\n" #: winerror.mc:3026 msgid "No protocol sequences.\n" @@ -6131,7 +6131,7 @@ msgstr "El servidor RPC està massa ocupat.\n" #: winerror.mc:3051 msgid "Invalid network options.\n" -msgstr "Les opcions de xarxa són invàlides.\n" +msgstr "Les opcions de xarxa no són vàlides.\n" #: winerror.mc:3056 msgid "No RPC call active.\n" @@ -6155,11 +6155,11 @@ msgstr "La sintaxi de transferència és incompatible.\n" #: winerror.mc:3086 msgid "Invalid tag.\n" -msgstr "L'etiqueta és invàlida.\n" +msgstr "L'etiqueta no és vàlida.\n" #: winerror.mc:3091 msgid "Invalid array bounds.\n" -msgstr "Els límits de vector són invàlids.\n" +msgstr "Els límits de vector no són vàlids.\n" #: winerror.mc:3096 msgid "No entry name.\n" @@ -6167,7 +6167,7 @@ msgstr "No hi ha cap nom d'entrada.\n" #: winerror.mc:3101 msgid "Invalid name syntax.\n" -msgstr "La sintaxi de nom és invàlid.\n" +msgstr "La sintaxi de nom no és vàlida.\n" #: winerror.mc:3106 msgid "Unsupported name syntax.\n" @@ -6199,11 +6199,11 @@ msgstr "No s'ha trobat la seqüència de protocol.\n" #: winerror.mc:3141 msgid "Procedure number out of range.\n" -msgstr "El nombre de procediment és fora d'interval.\n" +msgstr "El número de procediment és fora d'interval.\n" #: winerror.mc:3146 msgid "Binding has no authentication data.\n" -msgstr "El lligament no té dades d'autenticació.\n" +msgstr "La vinculació no té dades d'autenticació.\n" #: winerror.mc:3151 msgid "Unknown authentication service.\n" @@ -6215,7 +6215,7 @@ msgstr "El nivell d'autenticació és desconegut.\n" #: winerror.mc:3161 msgid "Invalid authentication identity.\n" -msgstr "La identitat d'autenticació és invàlid.\n" +msgstr "La identitat d'autenticació no és vàlida.\n" #: winerror.mc:3166 msgid "Unknown authorization service.\n" @@ -6223,7 +6223,7 @@ msgstr "El servei d'autorització és desconegut.\n" #: winerror.mc:3171 msgid "Invalid entry.\n" -msgstr "L'entrada és invàlida.\n" +msgstr "L'entrada no és vàlida.\n" #: winerror.mc:3176 msgid "Can't perform operation.\n" @@ -6243,7 +6243,7 @@ msgstr "El nom és incomplet.\n" #: winerror.mc:3196 msgid "Invalid version option.\n" -msgstr "L'opció de versió és invàlida.\n" +msgstr "L'opció de versió no és vàlida.\n" #: winerror.mc:3201 msgid "No more members.\n" @@ -6271,7 +6271,7 @@ msgstr "El servei de noms no està disponible.\n" #: winerror.mc:3231 msgid "Invalid network address family.\n" -msgstr "La família d'adreces de xarxa és invàlida.\n" +msgstr "La família d'adreces de xarxa no és vàlida.\n" #: winerror.mc:3236 msgid "Operation not supported.\n" @@ -6327,7 +6327,7 @@ msgstr "L'identificador de context és danyat.\n" #: winerror.mc:3301 msgid "Binding handle mismatch.\n" -msgstr "Els identificadors de lligament no es coincideixen.\n" +msgstr "Els identificadors de vinculació no es coincideixen.\n" #: winerror.mc:3306 msgid "Cannot get call handle.\n" @@ -6351,7 +6351,7 @@ msgstr "Les dades d'esbós (stub) són dolentes.\n" #: winerror.mc:3331 msgid "Invalid user buffer.\n" -msgstr "La memòria intermèdia d'usuari és invàlida.\n" +msgstr "La memòria intermèdia d'usuari no és vàlida.\n" #: winerror.mc:3336 msgid "Unrecognized media.\n" @@ -6411,15 +6411,15 @@ msgstr "El processador d'impressió és desconegut.\n" #: winerror.mc:3406 msgid "Invalid separator file.\n" -msgstr "El fitxer separador és invàlid.\n" +msgstr "El fitxer separador no és vàlid.\n" #: winerror.mc:3411 msgid "Invalid priority.\n" -msgstr "La prioritat és invàlida.\n" +msgstr "La prioritat no és vàlida.\n" #: winerror.mc:3416 msgid "Invalid printer name.\n" -msgstr "El nom d'impressora és invàlid.\n" +msgstr "El nom d'impressora no és vàlid.\n" #: winerror.mc:3421 msgid "Printer already exists.\n" @@ -6427,19 +6427,19 @@ msgstr "La impressora ja existeix.\n" #: winerror.mc:3426 msgid "Invalid printer command.\n" -msgstr "L'ordre d'impressora és invàlid.\n" +msgstr "L'ordre d'impressora no és vàlida.\n" #: winerror.mc:3431 msgid "Invalid data type.\n" -msgstr "El tipus de dades és invàlid.\n" +msgstr "El tipus de dades no és vàlid.\n" #: winerror.mc:3436 msgid "Invalid environment.\n" -msgstr "L'entorn és invàlid.\n" +msgstr "L'entorn no és vàlid.\n" #: winerror.mc:3441 msgid "No more bindings.\n" -msgstr "No hi ha més lligaments.\n" +msgstr "No hi ha més vinculacions.\n" #: winerror.mc:3446 msgid "Can't log on with inter-domain trust account.\n" @@ -6493,7 +6493,7 @@ msgstr "S'ha cancel·lat la trucada RPC.\n" #: winerror.mc:3506 msgid "Binding incomplete.\n" -msgstr "El lligament està incomplet.\n" +msgstr "La vinculació està incompleta.\n" #: winerror.mc:3511 msgid "RPC comm failure.\n" @@ -6525,7 +6525,7 @@ msgstr "No s'ha cancel·lat el fil.\n" #: winerror.mc:3546 msgid "Invalid handle operation.\n" -msgstr "L'operació d'identificador és invàlida.\n" +msgstr "L'operació d'identificador no és vàlida.\n" #: winerror.mc:3551 msgid "Wrong serializing package version.\n" @@ -6537,11 +6537,11 @@ msgstr "La versió d'esbós (stub) és incorrecta.\n" #: winerror.mc:3561 msgid "Invalid pipe object.\n" -msgstr "L'objecte de canonada és invàlid.\n" +msgstr "L'objecte de canonada no és vàlid.\n" #: winerror.mc:3566 msgid "Wrong pipe order.\n" -msgstr "L'ordre de canonada és incorrecte.\n" +msgstr "L'ordre de canonada és incorrecta.\n" #: winerror.mc:3571 msgid "Wrong pipe version.\n" @@ -6557,19 +6557,19 @@ msgstr "No es pot crear la DB assignadora de punts finals.\n" #: winerror.mc:3586 msgid "Invalid object.\n" -msgstr "L'objecte és invàlid.\n" +msgstr "L'objecte no és vàlid.\n" #: winerror.mc:3591 msgid "Invalid time.\n" -msgstr "L'hora és invàlida.\n" +msgstr "L'hora no és vàlida.\n" #: winerror.mc:3596 msgid "Invalid form name.\n" -msgstr "El nom de forma és invàlid.\n" +msgstr "El nom de forma no és vàlid.\n" #: winerror.mc:3601 msgid "Invalid form size.\n" -msgstr "La mida de forma és invàlida.\n" +msgstr "La mida de forma no és vàlida.\n" #: winerror.mc:3606 msgid "Already awaiting printer handle.\n" @@ -6581,7 +6581,7 @@ msgstr "S'ha suprimit la impressora.\n" #: winerror.mc:3616 msgid "Invalid printer state.\n" -msgstr "L'estat d'impressora és invàlid.\n" +msgstr "L'estat d'impressora no és vàlid.\n" #: winerror.mc:3621 msgid "User must change password.\n" @@ -6597,15 +6597,15 @@ msgstr "El compte està bloquejat.\n" #: winerror.mc:3636 msgid "Invalid pixel format.\n" -msgstr "El format de píxels és invàlid.\n" +msgstr "El format de píxels no és vàlid.\n" #: winerror.mc:3641 msgid "Invalid driver.\n" -msgstr "El controlador és invàlid.\n" +msgstr "El controlador no és vàlid.\n" #: winerror.mc:3646 msgid "Invalid object resolver set.\n" -msgstr "El conjunt de resolució d'objectes és invàlid.\n" +msgstr "El conjunt de resolució d'objectes no és vàlid.\n" #: winerror.mc:3651 msgid "Incomplete RPC send.\n" @@ -6613,11 +6613,11 @@ msgstr "L'enviament RPC està incomplet.\n" #: winerror.mc:3656 msgid "Invalid asynchronous RPC handle.\n" -msgstr "L'identificador RPC asíncron és invàlid.\n" +msgstr "L'identificador RPC asíncron no és vàlid.\n" #: winerror.mc:3661 msgid "Invalid asynchronous RPC call.\n" -msgstr "La trucada RPC asíncrona és invàlida.\n" +msgstr "La trucada RPC asíncrona no és vàlida.\n" #: winerror.mc:3666 msgid "RPC pipe closed.\n" @@ -6908,320 +6908,258 @@ msgid "choose which folder contains %s" msgstr "trieu quina carpeta conté %s" #: msi.rc:90 -#, fuzzy -#| msgid "No registry log space.\n" msgid "Allocating registry space" -msgstr "No hi ha espai per al registre del registre.\n" +msgstr "S'està assignant espai en el registre" #: msi.rc:91 -#, fuzzy -#| msgid "Single-instance application.\n" msgid "Searching for installed applications" -msgstr "Aplicació d'instància única.\n" +msgstr "S'estan cercant aplicacions instalades" #: msi.rc:92 msgid "Binding executables" -msgstr "" +msgstr "S'estan vinculant els executables" #: msi.rc:93 msi.rc:136 -#, fuzzy -#| msgid "Searching for %s" msgid "Searching for qualifying products" -msgstr "S'està cercant %s" +msgstr "S'estan cercant productes qualificants" #: msi.rc:94 msi.rc:95 msi.rc:100 msgid "Computing space requirements" -msgstr "" +msgstr "S'estan computant els requeriments d'espai" #: msi.rc:96 -#, fuzzy -#| msgid "Target folder" msgid "Creating folders" -msgstr "Carpeta de destinació" +msgstr "S'estan creant carpetes" #: msi.rc:97 -#, fuzzy -#| msgid "Create Shor&tcut" msgid "Creating shortcuts" -msgstr "Crea &una drecera" +msgstr "S'estan creant dreceres" #: msi.rc:98 -#, fuzzy -#| msgid "Exception in service.\n" msgid "Deleting services" -msgstr "Hi ha hagut una excepció en el servei.\n" +msgstr "S'estan eliminant serveis" #: msi.rc:99 -#, fuzzy -#| msgid "Creation date" msgid "Creating duplicate files" -msgstr "Data de creació" +msgstr "S'estan creant fitxers duplicats" #: msi.rc:101 -#, fuzzy -#| msgid "No associated application.\n" msgid "Searching for related applications" -msgstr "Cap aplicació està associada.\n" +msgstr "S'estan cercant aplicacions relacionades" #: msi.rc:102 msgid "Copying network install files" -msgstr "" +msgstr "S'estan copiant els fitxers d'instal·lació de xarxa" #: msi.rc:103 -#, fuzzy -#| msgid "Copying Files..." msgid "Copying new files" -msgstr "S'estan copiant els fitxers..." +msgstr "S'estan copiant els fitxers nous" #: msi.rc:104 -#, fuzzy -#| msgid "Installation of component failed: %08x" msgid "Installing ODBC components" -msgstr "La instal·lació del component ha fallat: %08x" +msgstr "S'estan instal·lant components ODBC" #: msi.rc:105 -#, fuzzy -#| msgid "Installer service failed.\n" msgid "Installing new services" -msgstr "El servei d'instal·lació ha fallat.\n" +msgstr "S'estan instal·lant els serveis nous" #: msi.rc:106 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Installing system catalog" -msgstr "Instal·la/desinstal·la" +msgstr "S'està instal·lant el catàleg de sistema" #: msi.rc:107 -#, fuzzy -#| msgid "Wine Application Uninstaller" msgid "Validating install" -msgstr "Desinstal·lador d'Aplicacions del Wine" +msgstr "S'està validant l'instalació" #: msi.rc:108 msgid "Evaluating launch conditions" -msgstr "" +msgstr "S'estan avaluant les condicions d'execució" #: msi.rc:109 msgid "Migrating feature states from related applications" msgstr "" +"S'estan migrant els estats de les característiques des de les aplicacions " +"relacionades" #: msi.rc:110 -#, fuzzy -#| msgid "Icon files" msgid "Moving files" -msgstr "Fitxers d'icona" +msgstr "S'estan movent fixters" #: msi.rc:111 -#, fuzzy -#| msgid "Version information" msgid "Publishing assembly information" -msgstr "Informació de versió" +msgstr "S'està publicant informació de assemblatge" #: msi.rc:112 msgid "Unpublishing assembly information" -msgstr "" +msgstr "S'està despublicant la informació d'assemblatge" #: msi.rc:113 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Fitxers d'icona" +msgstr "S'estan apedaçant fitxers" #: msi.rc:114 msgid "Updating component registration" -msgstr "" +msgstr "S'està actualitzant la registració de component" #: msi.rc:115 msgid "Publishing Qualified Components" -msgstr "" +msgstr "S'estan publicant els components qualificats" #: msi.rc:116 msgid "Publishing Product Features" -msgstr "" +msgstr "S'estan publicant les característiques de producte" #: msi.rc:117 -#, fuzzy -#| msgid "Client Information" msgid "Publishing product information" -msgstr "Informació de client" +msgstr "S'està publicant la informació de producte" #: msi.rc:118 msgid "Registering Class servers" -msgstr "" +msgstr "S'estan registrant els servidors de classe" #: msi.rc:119 msgid "Registering COM+ Applications and Components" -msgstr "" +msgstr "S'estan registrant les aplicacions i els components COM+" #: msi.rc:120 msgid "Registering extension servers" -msgstr "" +msgstr "S'estan registrant els servidors d'extensió" #: msi.rc:121 msgid "Registering fonts" -msgstr "" +msgstr "S'estan registrant els tipus de lletra" #: msi.rc:122 -#, fuzzy -#| msgid "Registry Editor" msgid "Registering MIME info" -msgstr "Editor de Registre" +msgstr "S'està registrant la informació MIME" #: msi.rc:123 -#, fuzzy -#| msgid "Registry is corrupt.\n" msgid "Registering product" -msgstr "El registre està corrupte.\n" +msgstr "S'està registrant el producte" #: msi.rc:124 msgid "Registering program identifiers" -msgstr "" +msgstr "S'estan registrant els identificadors de programa" #: msi.rc:125 -#, fuzzy -#| msgid "Type Libraries" msgid "Registering type libraries" -msgstr "Biblioteques de tipus" +msgstr "S'estan registrant les biblioteques de tipus" #: msi.rc:126 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Registering user" -msgstr "El recurs està en ús.\n" +msgstr "S'està registrant l'usuari" #: msi.rc:127 -#, fuzzy -#| msgid "&Remove duplicates" msgid "Removing duplicated files" -msgstr "&Elimina els duplicats" +msgstr "S'estan eliminant els fitxers duplicats" #: msi.rc:128 msi.rc:152 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "S'està aplicant la configuració de lletra" +msgstr "S'estan actualitzant les cadenes d'entorn" #: msi.rc:129 -#, fuzzy -#| msgid "&Remove application" msgid "Removing applications" -msgstr "&Elimina aplicació" +msgstr "S'estan eliminant les aplicacions" #: msi.rc:130 -#, fuzzy -#| msgid "Icon files" msgid "Removing files" -msgstr "Fitxers d'icona" +msgstr "S'estan eliminant els fitxers" #: msi.rc:131 msgid "Removing folders" -msgstr "" +msgstr "S'estan eliminant les carpetes" #: msi.rc:132 msgid "Removing INI files entries" -msgstr "" +msgstr "S'estan eliminant les entrades en els fitxers INI" #: msi.rc:133 -#, fuzzy -#| msgid "Domain Component" msgid "Removing ODBC components" -msgstr "Component de domini" +msgstr "S'estan eliminant els components ODBC" #: msi.rc:134 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Removing system registry values" -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "S'estan eliminant els valors del registre de sistema" #: msi.rc:135 msgid "Removing shortcuts" -msgstr "" +msgstr "S'estan eliminant les dreceres" #: msi.rc:137 msgid "Registering modules" -msgstr "" +msgstr "S'estan registrant els mòduls" #: msi.rc:138 msgid "Unregistering modules" -msgstr "" +msgstr "S'estan desregistrant els mòduls" #: msi.rc:139 -#, fuzzy -#| msgid "Initializing; " msgid "Initializing ODBC directories" -msgstr "S'està inicialitzant; " +msgstr "S'estan inicialitzant els directoris ODBC" #: msi.rc:140 -#, fuzzy -#| msgid "Starting Wordpad failed" msgid "Starting services" -msgstr "L'inici del Wordpad ha fallat" +msgstr "S'estan iniciant serveis" #: msi.rc:141 -#, fuzzy -#| msgid "Stopping dependent service: %1\n" msgid "Stopping services" -msgstr "S'està aturant el servei dependent: %1\n" +msgstr "S'estan aturant els serveis" #: msi.rc:142 msgid "Unpublishing Qualified Components" -msgstr "" +msgstr "S'estan desregistrant els components qualificats" #: msi.rc:143 msgid "Unpublishing Product Features" -msgstr "" +msgstr "S'estan despublicant les característiques de producte" #: msi.rc:144 -#, fuzzy -#| msgid "Client Information" msgid "Unpublishing product information" -msgstr "Informació de client" +msgstr "S'està despublicant la informació de producte" #: msi.rc:145 msgid "Unregister Class servers" -msgstr "" +msgstr "S'estan desregistrant els servidors de classe" #: msi.rc:146 msgid "Unregistering COM+ Applications and Components" -msgstr "" +msgstr "S'estan desregistrant les aplicacions i els components COM+" #: msi.rc:147 msgid "Unregistering extension servers" -msgstr "" +msgstr "S'estan desregistrant els servidors d'extensió" #: msi.rc:148 msgid "Unregistering fonts" -msgstr "" +msgstr "S'estan desregistrant els tipus de lletra" #: msi.rc:149 msgid "Unregistering MIME info" -msgstr "" +msgstr "S'està desregistrant la informació MIME" #: msi.rc:150 msgid "Unregistering program identifiers" -msgstr "" +msgstr "S'estan desregistrant els identificadors de programa" #: msi.rc:151 msgid "Unregistering type libraries" -msgstr "" +msgstr "S'estan desregistrant les biblioteques de tipus" #: msi.rc:153 msgid "Writing INI files values" -msgstr "" +msgstr "S'estan escrivint valors als fitxers INI" #: msi.rc:154 -#, fuzzy -#| msgid "Warning: system library" msgid "Writing system registry values" -msgstr "Advertència: biblioteca de sistema" +msgstr "S'estan escrivint valors al registre del sistema" #: msi.rc:160 msgid "Free space: [1]" -msgstr "" +msgstr "Espai lliure: [1]" #: msi.rc:161 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Propietat: [1], Signatura: [2]" #: msi.rc:162 msgid "File: [1]" @@ -7233,73 +7171,63 @@ msgstr "Carpeta: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" -msgstr "" +msgstr "Drecera: [1]" #: msi.rc:165 msi.rc:196 msi.rc:197 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [1]" -msgstr "&Dispositiu:" +msgstr "Servei: [1]" #: msi.rc:166 msi.rc:169 msi.rc:173 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Fitxer: [1] Directori: [9], Mida: [6]" #: msi.rc:167 -#, fuzzy -#| msgid "application" msgid "Found application: [1]" -msgstr "aplicació" +msgstr "S'ha trobat una aplicació: [1]" #: msi.rc:168 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Fitxer: [1] Directori: [9], Mida: [6]" #: msi.rc:170 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [2]" -msgstr "&Dispositiu:" +msgstr "Servei: [2]" #: msi.rc:171 msgid "File: [1], Dependencies: [2]" -msgstr "" +msgstr "Fitxer: [1], Dependències: [2]" #: msi.rc:172 -#, fuzzy -#| msgid "Applications" msgid "Application: [1]" -msgstr "Aplicacions" +msgstr "Aplicació: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Context d'aplicació:[1], Nom d'assemblatge:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "" +msgstr "Fitxer: [1], Directori: [2], Mida: [3]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "ID de component: [1], Qualificador: [2]" #: msi.rc:178 msi.rc:199 msgid "Feature: [1]" -msgstr "" +msgstr "Característica: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "" +msgstr "Id de classe: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Usuaris: [3], RSN: [4]}}" #: msi.rc:181 msi.rc:202 -#, fuzzy -#| msgid "Extensions Only" msgid "Extension: [1]" -msgstr "Només extensions" +msgstr "Extensió: [1]" #: msi.rc:182 msi.rc:203 msgid "Font: [1]" @@ -7307,63 +7235,63 @@ msgstr "Tipus de lletra: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "Tipus de contingut MIME: [1], Extensió: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: msi.rc:185 msi.rc:206 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Fitxer: [1], Directori: [9]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Nom: [1], Valor: [2], Acció [3]" #: msi.rc:188 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Aplicació: [1], Línia d'ordres: [2]" #: msi.rc:191 msi.rc:208 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Fitxer: [1], Secció: [2], Clau: [3], Valor: [4]" #: msi.rc:192 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Clau: [1], Nom: [2]" #: msi.rc:194 msi.rc:195 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "Fitxer: [1], Carpeta: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2]}}" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Clau: [1], Nom: [2], Valor: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Error fatal: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Error [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Advertència [1]." #: msi.rc:74 msgid "Info [1]." -msgstr "" +msgstr "Informació [1]." #: msi.rc:75 msgid "" @@ -7371,40 +7299,45 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"L'instal·lador s'ha topat amb un error inesperat en instal·lar aquest " +"paquet. Això pot indicar un problema amb aquest paquet. El codi d'error és " +"[1]. {{Els arguments són: [2], [3], [4]}}" #: msi.rc:76 msgid "{{Disk full: }}" -msgstr "{{El disc està ple: }}" +msgstr "{{Disc ple: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "Acció [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "Tipus de missatge: [1], Argument: [2]{, [3]}" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== S'ha començat el registre: [Date] [Time] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "Inici d'acció [Time]: [1]." #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "Fi d'acció [Time]: [1]. El valor retornat és [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Si us plau, inseriu el disc: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"No s'ha trobat el fitxer font{{(cabinet)}}: [2]. Verifiqueu que el fitxer " +"existeixi i que el podeu accedir." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -7636,11 +7569,11 @@ msgstr "botó" #: oleacc.rc:75 msgid "check button" -msgstr "casella de verificació" +msgstr "casella de selecció" #: oleacc.rc:76 msgid "radio button" -msgstr "botó de ràdio" +msgstr "botó d'opció" #: oleacc.rc:77 msgid "combo box" @@ -7668,7 +7601,7 @@ msgstr "control lliscant" #: oleacc.rc:83 msgid "spin box" -msgstr "spinner" +msgstr "quadre de nombre" #: oleacc.rc:84 msgid "diagram" @@ -7940,7 +7873,7 @@ msgstr "Enganxada amb opcions" #: oledlg.rc:85 setupapi.rc:43 msgid "Source:" -msgstr "Origen:" +msgstr "Font:" #: oledlg.rc:86 shdoclc.rc:50 shdoclc.rc:82 shdoclc.rc:95 shdoclc.rc:135 #: shdoclc.rc:162 shdoclc.rc:186 user32.rc:62 wineconsole.rc:33 wordpad.rc:114 @@ -8902,8 +8835,6 @@ msgid "Wine Control Panel" msgstr "Tauler de Control del Wine" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" msgstr "No s'ha pogut mostrar el quadre de diàleg Executar (error intern)" @@ -9023,10 +8954,8 @@ msgid " sec" msgstr " seg" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Selecciona una carpeta" +msgstr "Seleccionar font" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -9208,7 +9137,7 @@ msgstr "Un publicador desconegut o no de confiança ha emès el certificat." #: wininet.rc:30 msgid "The date on the certificate is invalid." -msgstr "La data en el certificat és invàlida." +msgstr "La data en el certificat no és vàlida." #: wininet.rc:31 msgid "The name on the certificate does not match the site." @@ -9222,7 +9151,7 @@ msgstr "" #: winmm.rc:32 msgid "The specified command was carried out." -msgstr "S'ha realitzat l'ordre especificat." +msgstr "S'ha realitzat l'ordre especificada." #: winmm.rc:33 msgid "Undefined external error." @@ -9247,7 +9176,7 @@ msgstr "" #: winmm.rc:37 msgid "The specified device handle is invalid." -msgstr "L'identificador del dispositiu especificat és invàlid." +msgstr "L'identificador del dispositiu especificat no és vàlid." #: winmm.rc:38 msgid "There is no driver installed on your system!" @@ -9276,11 +9205,11 @@ msgstr "Un número d'error s'ha especificat que no està definit en el sistema." #: winmm.rc:42 msgid "An invalid flag was passed to a system function." -msgstr "S'ha passat una bandera invàlida a una funció de sistema." +msgstr "S'ha passat una bandera no vàlida a una funció de sistema." #: winmm.rc:43 msgid "An invalid parameter was passed to a system function." -msgstr "S'ha passat un paràmetre invàlid a una funció de sistema." +msgstr "S'ha passat un paràmetre no vàlid a una funció de sistema." #: winmm.rc:46 msgid "" @@ -9358,7 +9287,7 @@ msgstr "" #: winmm.rc:60 msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." msgstr "" -"L'ID del dispositiu MCI és invàlida. Utilitzeu l'ID retornada en obrir el " +"L'ID del dispositiu MCI no és vàlid. Utilitzeu l'ID retornat en obrir el " "dispositiu MCI." #: winmm.rc:61 @@ -9367,7 +9296,7 @@ msgstr "El controlador no pot reconèixer el paràmetre d'ordre especificat." #: winmm.rc:62 msgid "The driver cannot recognize the specified command." -msgstr "El controlador no pot reconèixer l'ordre especificat." +msgstr "El controlador no pot reconèixer l'ordre especificada." #: winmm.rc:63 msgid "" @@ -9414,19 +9343,19 @@ msgid "" "The specified command requires a character-string parameter. Please provide " "one." msgstr "" -"L'ordre especificat requereix un paràmetre de cadena de caràcters. Si us " +"L'ordre especificada requereix un paràmetre de cadena de caràcters. Si us " "plau, proveïu un." #: winmm.rc:71 msgid "The specified integer is invalid for this command." -msgstr "El nombre enter especificat és invàlid per a aquest ordre." +msgstr "El nombre enter especificat no és vàlid per a aquesta ordre." #: winmm.rc:72 msgid "" "The device driver returned an invalid return type. Check with the device " "manufacturer about obtaining a new driver." msgstr "" -"El controlador de dispositiu ha donat un tipus de retorn invàlid. Consulteu " +"El controlador de dispositiu ha donat un tipus de retorn no vàlid. Consulteu " "amb el fabricant del dispositiu sobre com obtenir un controlador nou." #: winmm.rc:73 @@ -9439,11 +9368,11 @@ msgstr "" #: winmm.rc:74 msgid "The specified command requires a parameter. Please supply one." -msgstr "L'ordre especificat requereix un paràmetre. Si us plau, proveïu un." +msgstr "L'ordre especificada requereix un paràmetre. Si us plau, proveïu un." #: winmm.rc:75 msgid "The MCI device you are using does not support the specified command." -msgstr "El dispositiu MCI que utilitzeu no admet l'ordre especificat." +msgstr "El dispositiu MCI que utilitzeu no admet l'ordre especificada." #: winmm.rc:76 msgid "" @@ -9472,7 +9401,7 @@ msgstr "" #: winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." msgstr "" -"No es pot utilitzar 'all' com al nom de dispositiu amb l'ordre especificat." +"No es pot utilitzar 'all' com al nom de dispositiu amb l'ordre especificada." #: winmm.rc:81 msgid "" @@ -9491,7 +9420,8 @@ msgstr "" #: winmm.rc:83 msgid "The specified parameter is out of range for the specified command." -msgstr "El paràmetre especificat és fora de l'interval de l'ordre especificat." +msgstr "" +"El paràmetre especificat és fora de l'interval de l'ordre especificada." #: winmm.rc:84 msgid "The specified parameters cannot be used together." @@ -9531,7 +9461,7 @@ msgstr "" #: winmm.rc:89 msgid "The specified parameter is invalid for this command." -msgstr "El paràmetre especificat no és vàlid per a aquest ordre." +msgstr "El paràmetre especificat no és vàlid per a aquesta ordre." #: winmm.rc:90 msgid "" @@ -9546,7 +9476,7 @@ msgid "" "The specified command requires an alias, file, driver, or device name. " "Please supply one." msgstr "" -"L'ordre especificat requereix un àlies, fitxer, controlador o nom de " +"L'ordre especificada requereix un àlies, fitxer, controlador o nom de " "dispositiu. Si us plau, proveïu un." #: winmm.rc:92 @@ -9554,7 +9484,7 @@ msgid "" "The specified value for the time format is invalid. Refer to the MCI " "documentation for valid formats." msgstr "" -"El valor especificat per al format d'hora és invàlid. Consulteu la " +"El valor especificat per al format d'hora no és vàlid. Consulteu la " "documentació MCI pels formats vàlids." #: winmm.rc:93 @@ -9606,7 +9536,7 @@ msgid "" "Cannot carry out the commands in the order specified. Correct the command " "sequence, and then try again." msgstr "" -"No es pot dur a terme els ordres en l'ordre especificat. Corregiu la " +"No es pot dur a terme les ordres en l'ordre especificat. Corregiu la " "seqüència d'ordres i després torneu a intentar." #: winmm.rc:102 @@ -9614,7 +9544,7 @@ msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." msgstr "" -"No es pot dur a terme l'ordre especificat en un dispositiu obert " +"No es pot dur a terme l'ordre especificada en un dispositiu obert " "automàticament. Espereu fins que es tanqui el dispositiu i després torneu a " "intentar." @@ -9623,7 +9553,7 @@ msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." msgstr "" -"El nom de fitxer és invàlid. Assegureu-vos que el nom del fitxer no estigui " +"El nom de fitxer no és vàlid. Assegureu-vos que el nom del fitxer no estigui " "més llarg de 8 caràcters, seguit d'un període i una extensió." #: winmm.rc:104 @@ -9681,7 +9611,7 @@ msgstr "" msgid "" "The specified command requires an integer parameter. Please provide one." msgstr "" -"L'ordre especificat requereix un paràmetre de nombre sencer. Si us plau, " +"L'ordre especificada requereix un paràmetre de nombre enter. Si us plau, " "proveïu un." #: winmm.rc:112 @@ -9869,7 +9799,7 @@ msgstr "" #: winspool.rc:32 msgid "Unable to create the output file." -msgstr "No s'ha pogut crear el fitxer destinatari." +msgstr "No s'ha pogut crear el fitxer de sortida." #: wldap32.rc:32 msgid "Success" @@ -9928,10 +9858,8 @@ msgid "Confidentiality Required" msgstr "Cal confidencialitat" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "L'aturada està en curs.\n" +msgstr "Vinculació SASL en curs" #: wldap32.rc:48 msgid "No Such Attribute" @@ -9955,7 +9883,7 @@ msgstr "L'atribut o valor existeix" #: wldap32.rc:53 msgid "Invalid Syntax" -msgstr "Sintaxi invàlida" +msgstr "Sintaxi no vàlida" #: wldap32.rc:64 msgid "No Such Object" @@ -9967,7 +9895,7 @@ msgstr "Problema d'àlies" #: wldap32.rc:66 msgid "Invalid DN Syntax" -msgstr "Sintaxi DN invàlida" +msgstr "Sintaxi DN no vàlida" #: wldap32.rc:67 msgid "Is Leaf" @@ -9983,7 +9911,7 @@ msgstr "Autenticació no apropiada" #: wldap32.rc:81 msgid "Invalid Credentials" -msgstr "Credencials invàlides" +msgstr "Credencials no vàlides" #: wldap32.rc:82 msgid "Insufficient Rights" @@ -10212,8 +10140,8 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <nom de fitxer batch> s'utilitza dins un fitxer batch per a executar\n" -"ordres d'un altre fitxer batch. Quan se surt del fitxer batch, el control\n" +"CALL <nom de fitxer BAT> s'utilitza dins un fitxer BAT per a executar\n" +"ordres d'un altre fitxer BAT. Quan se surt del fitxer BAT, el control\n" "retorna al fitxer que l'ha trucat. L'ordre CALL pot proveir paràmetres al\n" "procediment trucat.\n" "\n" @@ -10271,7 +10199,7 @@ msgstr "" "actual.\n" "ECHO <cadena> mostra <cadena> en el dispositiu de terminal actual.\n" "\n" -"ECHO ON causa que tots els ordres següents en un fitxer batch es mostrin en\n" +"ECHO ON causa que totes les ordres següents en un fitxer BAT es mostrin en\n" "el dispositiu de terminal abans d'executar-se.\n" "\n" "ECHO OFF desfà l'efecte d'un ECHO ON anterior (ECHO està OFF per defecte).\n" @@ -10289,12 +10217,12 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"S'utilitza l'ordre FOR per a executar un ordre per cada un d'un conjunt de\n" +"S'utilitza l'ordre FOR per a executar una ordre per cada un d'un conjunt de\n" "fitxers.\n" "\n" "Ús: FOR %variable IN (conjunt) DO ordre\n" "\n" -"S'ha de doblar el signe % quan s'utilitza FOR en un fitxer batch.\n" +"S'ha de doblar el signe % quan s'utilitza FOR en un fitxer BAT.\n" #: cmd.rc:97 msgid "" @@ -10310,13 +10238,13 @@ msgid "" "GOTO has no effect when used interactively.\n" msgstr "" "L'ordre GOTO transfereix l'execució a una altra declaració en un fitxer\n" -"batch.\n" +"BAT.\n" "\n" "L'etiqueta que és la destinació d'un GOTO pot ser de fins a 255 caràcters\n" "de longitud però no pot incloure espais (això és diferent d'altres sistemes\n" -"operatius). Si dos o més etiquetes idèntiques existeixen en un fitxer\n" -"batch, el primer sempre s'executarà. Intentar fer GOTO a una etiqueta no\n" -"existent termina l'execució del fitxer batch.\n" +"operatius). Si dos o més etiquetes idèntiques existeixen en un fitxer BAT,\n" +"el primer sempre s'executarà. Intentar fer GOTO a una etiqueta no existent\n" +"termina l'execució del fitxer BAT.\n" "\n" "GOTO no té cap efecte quan s'utilitza de forma interactiva.\n" @@ -10339,11 +10267,11 @@ msgid "" "In the second form of the command, string1 and string2 must be in double\n" "quotes. The comparison is not case-sensitive.\n" msgstr "" -"S'utilitza IF per a executar condicionalment un ordre.\n" +"S'utilitza IF per a executar condicionalment una ordre.\n" "\n" "Sintaxi: IF [NOT] EXIST nom_de_fitxer ordre\n" " IF [NOT] cadena1==cadena2 ordre\n" -" IF [NOT] ERRORLEVEL nombre ordre\n" +" IF [NOT] ERRORLEVEL número ordre\n" "\n" "En la segona forma de la comanda, cadena1 i cadena2 han de ser entre\n" "cometes dobles. La comparació no distingeix entre majúscules i minúscules.\n" @@ -10417,11 +10345,11 @@ msgid "" "It is mainly useful in batch files to allow the user to read the output of\n" "a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE mostra un missatge en la pantalla demanant que l'usuari premi una " +"PAUSE mostra un missatge en la pantalla demanant que l'usuari premi una\n" "tecla.\n" "\n" -"És principalment útil en els fitxers batch per a permetre que l'usuari\n" -"llegeixi la sortida d'un ordre anterior abans que es desplaci fora de la\n" +"És principalment útil en els fitxers BAT per a permetre que l'usuari\n" +"llegeixi la sortida d'una ordre anterior abans que es desplaci fora de la\n" "pantalla.\n" #: cmd.rc:169 @@ -10446,7 +10374,7 @@ msgid "" "The prompt can also be changed by altering the PROMPT environment variable,\n" "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgstr "" -"PROMPT defineix l'indicador de la línia d'ordre.\n" +"PROMPT defineix l'indicador de la línia d'ordres.\n" "\n" "La cadena que segueix l'ordre PROMPT (i l'espai immediatament després)\n" "apareix al principi de la línia quan cmd està esperant l'entrada.\n" @@ -10474,7 +10402,7 @@ msgid "" "and can therefore be used as a comment in a batch file.\n" msgstr "" "Una línia d'ordres que comença amb REM (seguit per un espai) no realitza\n" -"cap acció, i per tant es pot utilitzar com a comentari en un fitxer batch.\n" +"cap acció, i per tant es pot utilitzar com a comentari en un fitxer BAT.\n" #: cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" @@ -10535,9 +10463,9 @@ msgid "" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" "called from the command line.\n" msgstr "" -"S'utilitza SHIFT en un fitxer batch per a eliminar un paràmetre del cap de\n" -"la llista, de manera que el paràmetre 2 es converteix en el paràmetre 1,\n" -"etc. No té cap efecte si es truca des de la línia d'ordres.\n" +"S'utilitza SHIFT en un fitxer BAT per a eliminar un paràmetre del cap de la\n" +"llista, de manera que el paràmetre 2 es converteix en el paràmetre 1, etc.\n" +"No té cap efecte si es truca des de la línia d'ordres.\n" #: cmd.rc:212 start.rc:56 msgid "" @@ -10596,7 +10524,7 @@ msgstr "" " el seu codi de sortida.\n" "/unix Utilitza un nom de fitxer d'Unix i inicia el fitxer com\n" " el Windows Explorer.\n" -"/ProgIDOpen Obre un document utilitzant la progID especificada.\n" +"/ProgIDOpen Obre un document utilitzant el progID especificat.\n" "/? Mostra aquesta ajuda i surt.\n" #: cmd.rc:237 @@ -10648,7 +10576,7 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" msgstr "" -"ENDLOCAL acaba la localització de canvis d'entorn en un fitxer batch, els\n" +"ENDLOCAL acaba la localització de canvis d'entorn en un fitxer BAT, els\n" "quals un SETLOCAL anterior ha introduït.\n" #: cmd.rc:271 @@ -10660,12 +10588,12 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" -"SETLOCAL comença la localització de canvis en l'entorn en un fitxer batch.\n" +"SETLOCAL comença la localització de canvis d'entorn en un fitxer BAT.\n" "\n" -"Els canvis d'entorn fets després d'un SETLOCAL són locals al fitxer batch,\n" -"i es conserven fins que es trobi la següent ENDLOCAL (o al final del\n" -"fitxer, el que passi primer), al qual punt la configuració de l'entorn\n" -"anterior es restaura.\n" +"Els canvis d'entorn fets després d'un SETLOCAL són locals al fitxer BAT, i\n" +"es conserven fins que es trobi la següent ENDLOCAL (o al final del fitxer,\n" +"el que passi primer), al qual punt la configuració d'entorn anterior es\n" +"restaura.\n" #: cmd.rc:275 msgid "" @@ -10712,7 +10640,7 @@ msgid "" "Specifying no open command after the equal sign removes the command string\n" "associated to the specified file type.\n" msgstr "" -"FTYPE mostra o modifica els ordres d'obertura associats amb els tipus de\n" +"FTYPE mostra o modifica les ordres d'obertura associats amb els tipus de\n" "fitxers.\n" "\n" "Sintaxi: FTYPE [tipusDeFitxer[=[ordreDeObertura]]]\n" @@ -10738,7 +10666,7 @@ msgstr "" "CHOICE mostra un text i espera fins que l'usuari premi una tecla permesa\n" "d'una llista seleccionable.\n" "CHOICE s'utilitza principalment per a construir un menú de selecció en un\n" -"fitxer batch.\n" +"fitxer BAT.\n" #: cmd.rc:324 msgid "" @@ -10753,6 +10681,14 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Sintaxi: MKLINK [opcions] nom_d'enllaç destinació\n" +"\n" +"Opcions:\n" +"/d Crea un enllaç simbòlic de directori\n" +"/h Crea un enllaç dur.\n" +"/j Crea una intersecció de directori.\n" +"nom_d'enllaç és el nom de l'enllaç simbòlic nou.\n" +"destinació és el camí al qual nom_d'enllaç assenyala.\n" #: cmd.rc:312 msgid "" @@ -10763,47 +10699,6 @@ msgstr "" "des del qual heu invocat cmd.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10845,10 +10740,10 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"Els ordres integrats de CMD són:\n" +"Les ordres integrades de CMD són:\n" "ASSOC\t\tMostra o modifica les associacions d'extensió de fitxer\n" "ATTRIB\t\tMostra o canvia els atributs de fitxer de DOS\n" -"CALL\t\tInvoca un fitxer batch des de dins altre\n" +"CALL\t\tInvoca un fitxer BAT des de dins altre\n" "CD (CHDIR)\tCanvia el directori per defecte actual\n" "CHOICE\t\tEspera una pulsació de tecla d'una llista seleccionable\n" "CLS\t\tEsborra la pantalla de consola\n" @@ -10858,29 +10753,30 @@ msgstr "" "DEL (ERASE)\tSuprimeix un fitxer o conjunt de fitxers\n" "DIR\t\tMostra el contingut d'un directori\n" "ECHO\t\tCopia text directament a la sortida de la consola\n" -"ENDLOCAL\tAcaba la localització de canvis en l'entorn en un fitxer batch\n" +"ENDLOCAL\tAcaba la localització de canvis d'entorn en un fitxer BAT\n" "FTYPE\t\tMostra o modifica els ordres d'obertura associats amb els tipus\n" "\t\tde fitxer\n" "HELP\t\tMostra detalls breus sobre un tema\n" "MD (MKDIR)\tCrea un subdirectori\n" +"MKLINK\tCrea un enllaç simbòlic\n" "MORE\t\tMostra la sortida en pàgines\n" "MOVE\t\tDesplaça un fitxer, conjunt de fitxers o arbre de directori\n" "PATH\t\tEstableix o mostra el camí de cerca\n" -"PAUSE\t\tSuspèn l'execució d'un fitxer batch\n" +"PAUSE\t\tSuspèn l'execució d'un fitxer BAT\n" "POPD\t\tRestaura el directori a l'últim desat amb la PUSHD\n" "PROMPT\t\tCanvia l'indicador d'ordres\n" "PUSHD\t\tCanvia a un directori nou, desant l'actual\n" "REN (RENAME)\tCanvia el nom d'un fitxer\n" "RD (RMDIR)\tSuprimeix un subdirectori\n" "SET\t\tEstableix o mostra les variables d'entorn\n" -"SETLOCAL\tComença la localització de canvis en l'entorn en un fitxer batch\n" +"SETLOCAL\tComença la localització de canvis d'entorn en un fitxer BAT\n" "START\t\tInicia un programa o obrir un document en el programa associat\n" "TIME\t\tEstableix o mostra l'hora de sistema actual\n" "TITLE\t\tEstableix el títol de finestra de la sessió CMD\n" "TYPE\t\tBolca el contingut d'un fitxer de text\n" "VER\t\tMostra la versió actual del CMD\n" "VOL\t\tMostra l'etiqueta de volum d'un dispositiu de disc\n" -"XCOPY\t\tCopia fitxers fonts o arbres de directori a una destinació\n" +"XCOPY\t\tCopia fitxers o arbres de directori a una destinació\n" "EXIT\t\tTanca el CMD\n" "\n" "Introduïu HELP <ordre> per més informació sobre qualsevulla de les ordres\n" @@ -10888,7 +10784,7 @@ msgstr "" #: cmd.rc:365 msgid "Are you sure?" -msgstr "Esteu segur?" +msgstr "N'esteu segur?" #: cmd.rc:366 reg.rc:50 xcopy.rc:43 msgctxt "Yes key" @@ -10906,7 +10802,7 @@ msgstr "Manca una associació de fitxer per a l'extensió %1\n" #: cmd.rc:369 msgid "No open command associated with file type '%1'\n" -msgstr "No hi ha cap ordre d'obertura associat amb el tipus de fitxer '%1'\n" +msgstr "No hi ha cap ordre d'obertura associada amb el tipus de fitxer '%1'\n" #: cmd.rc:370 msgid "Overwrite %1?" @@ -10919,12 +10815,12 @@ msgstr "Més..." #: cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" msgstr "" -"Hi ha hagut una línia possiblement truncada en el processament batch.\n" +"Hi ha hagut una línia possiblement truncada en el processament BAT.\n" "S'està utilitzant:\n" #: cmd.rc:374 msgid "Argument missing\n" -msgstr "Manca un paràmetre\n" +msgstr "Manca un argument\n" #: cmd.rc:375 msgid "Syntax error\n" @@ -10964,7 +10860,7 @@ msgstr "S'ha fallat en obrir '%1'\n" #: cmd.rc:385 msgid "Cannot call batch label outside of a batch script\n" -msgstr "No es pot trucar a una etiqueta de batch fora d'un script batch\n" +msgstr "No es pot trucar a una etiqueta BAT fora d'un script BAT\n" #: cmd.rc:386 xcopy.rc:45 msgctxt "All key" @@ -11047,7 +10943,7 @@ msgstr " (Sí|No|Tots)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" -"No es pot reconèixer '%1' com a ordre intern ni extern, ni script batch.\n" +"No es pot reconèixer '%1' com a ordre interna ni externa, ni script BAT.\n" #: cmd.rc:405 msgid "Division by zero error.\n" @@ -11100,7 +10996,7 @@ msgstr "Ús: hostname\n" #: hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "Error: L'opció '%c' és invàlida.\n" +msgstr "Error: L'opció '%c' no és vàlida.\n" #: hostname.rc:32 msgid "" @@ -11117,8 +11013,8 @@ msgstr "Ús: ipconfig [ /? | /all ]\n" #: ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" -"Error: S'han especificat paràmetres de línia d'ordres desconeguts o " -"invàlids\n" +"Error: S'han especificat paràmetres de línia d'ordres desconeguts o no " +"vàlids\n" #: ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -11194,9 +11090,9 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" -"NET ordre [paràmetres]\n" +"NET ordre [arguments]\n" " -o-\n" "NET ordre /HELP\n" "\n" @@ -11211,7 +11107,7 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" "NET START [servei]\n" "\n" @@ -11226,7 +11122,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" "NET STOP servei\n" "\n" @@ -11666,7 +11562,7 @@ msgstr "" #: oleview.rc:32 msgid "&Bind to file..." -msgstr "&Lligar a fitxer..." +msgstr "&Vincula a fitxer..." #: oleview.rc:33 msgid "&View TypeLib..." @@ -11838,7 +11734,7 @@ msgstr "Fitxers TypeLib (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: oleview.rc:105 msgid "Bind to file via a File Moniker" -msgstr "Lliga a fitxer a través d'un File Moniker" +msgstr "Vincula a un fitxer a través d'un File Moniker" #: oleview.rc:106 msgid "Open a TypeLib file and view the contents" @@ -11870,7 +11766,7 @@ msgstr "Lliura la instància d'objecte actualment seleccionada" #: oleview.rc:113 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "Copia la GUID de l'element actualment seleccionat al porta-retalls" +msgstr "Copia el GUID de l'element actualment seleccionat al porta-retalls" #: oleview.rc:114 msgid "Display the viewer for the selected item" @@ -11901,7 +11797,7 @@ msgstr "Actualitza totes les llistes" #: oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" @@ -12213,17 +12109,6 @@ msgid "Icons (*.ico)" msgstr "Icones (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12239,7 +12124,7 @@ msgstr "" " REG [operació] [paràmetres]\n" "\n" "Operacions admeses:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Per ajuda sobre una operació específica, teclegeu:\n" " REG [operació] /?\n" @@ -12267,11 +12152,11 @@ msgstr "L'operació s'ha acabat amb èxit\n" #: reg.rc:40 msgid "reg: Invalid key name\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "reg: Nom de clau no vàlid\n" #: reg.rc:41 msgid "reg: Invalid command line parameters\n" -msgstr "reg: Paràmetres de línia d'ordres invàlids\n" +msgstr "reg: Paràmetres de línia d'ordres no vàlids\n" #: reg.rc:42 msgid "reg: Unable to access remote machine\n" @@ -12350,11 +12235,11 @@ msgstr "S'ha completat la cerca. Nombre de coincidències trobades: %1!d!\n" #: reg.rc:61 msgid "reg: Invalid syntax. " -msgstr "reg: La sintaxi és invàlida. " +msgstr "reg: La sintaxi no és vàlida. " #: reg.rc:62 msgid "reg: Invalid option [%1]. " -msgstr "reg: L'opció [%1] és invàlida. " +msgstr "reg: L'opció [%1] no és vàlida. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" @@ -12370,43 +12255,31 @@ msgstr "(valor no definit)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT fitxer.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: No s'ha trobat el fitxer '%1'.\n" +msgstr "reg: No s'ha trobat el fitxer '%1'.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "reg: No s'ha pogut obrir la clau de registre '%1'.\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Seqüència d'escapada no reconeguda [\\%1!c!]\n" +msgstr "reg: Seqüència d'escapada no reconeguda [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY nom_de_clau [/v nom_de_valor | /ve] [/s]\n" +msgstr "REG EXPORT nom_de_clau fitxer.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid system key [%1]\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "reg: Nom de clau de sistema no vàlid [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "El valor de registre '%1' ja existeix. El voleu sobreescriure?" +msgstr "El fitxer '%1' ja existeix. El voleu sobreescriure?" #: regedit.rc:34 msgid "&Registry" @@ -12477,17 +12350,12 @@ msgid "&About Registry Editor" msgstr "&Quant a l'Editor de Registre" #: regedit.rc:89 regedit.rc:96 regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "expandit" +msgstr "Expandeix" #: regedit.rc:134 regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Modifica dades binàries..." +msgstr "Modifica dades &binàries..." #: regedit.rc:267 msgid "Export registry" @@ -12586,14 +12454,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Conté ordres per a accedir a les claus freqüentment utilitzades" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Conté ordres per a mostrar ajuda i informació quant a l'editor de registre" +"Conté ordres per a mostrar Ajuda i informació quant a l'Editor de Registre" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -12632,101 +12496,58 @@ msgid "(unknown %d)" msgstr "(desconegut %d)" #: regedit.rc:247 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut modificar el valor de registre seleccionat." #: regedit.rc:248 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut crear una clau de registre nova." #: regedit.rc:249 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut crear un valor de registre nou." #: regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"No es pot canviar el nom de la clau '%1'.\n" +"El nom de clau especificat ja existeix." #: regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"No s'ha pogut canviar el nom del valor '%1'.\n" +"El nom de valor especificat ja existeix." #: regedit.rc:252 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut suprimir la clau de registre seleccionada." #: regedit.rc:253 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut canviar el nom de la clau de registre seleccionada." #: regedit.rc:254 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut canviar el nom del valor de registre seleccionat." #: regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." msgstr "" +"Les claus i els valors continguts en %1 s'han afegit al registre amb èxit." #: regedit.rc:256 -#, fuzzy -#| msgid "" -#| "regedit: Unable to export '%1'. The specified registry key was not " -#| "found.\n" msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"regedit: No s'ha pogut exportar '%1'. No s'ha trobat la clau de registre " -"especificada.\n" +"No s'ha pogut importar %1. El fitxer especificat no és un fitxer de registre " +"vàlid." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12782,11 +12603,11 @@ msgstr "" "Exemples d'ús:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Camí\\de\\clau\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit: Commutador invàlid o no reconegut [%1]\n" +msgstr "regedit: Commutador no vàlid o no reconegut [%1]\n" #: regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -12818,7 +12639,7 @@ msgstr "regedit: No resta memòria! (%1!S!, línia %2!u!)\n" #: regedit.rc:417 msgid "regedit: Invalid hexadecimal value.\n" -msgstr "regedit: El valor hexadecimal és invàlid.\n" +msgstr "regedit: El valor hexadecimal no és vàlid.\n" #: regedit.rc:418 msgid "" @@ -12826,17 +12647,15 @@ msgid "" "encountered at '%1'.\n" msgstr "" "regedit: No s'ha pogut convertir les dades hexadecimals. S'ha trobat un " -"valor invàlid a '%1'.\n" +"valor no vàlid a '%1'.\n" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Seqüència d'escapada no reconeguda [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Tipus de dades de registre incompatible [%1]\n" +msgstr "regedit: Tipus de dades de registre incompatible [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12855,12 +12674,10 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"regedit: S'ha trobat un tipus de dades de registre incompatible [%1] en " +"regedit: S'ha trobat un tipus de dades de registre incompatible [0x%1!x!] en " "'%2'.\n" #: regedit.rc:426 @@ -12868,10 +12685,8 @@ msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "regedit: El valor de registre '%1' s'exportarà com a dades binàries.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "regedit: Clau de sistema no vàlida [%1]\n" #: regedit.rc:428 msgid "" @@ -12881,22 +12696,16 @@ msgstr "" "especificada.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: No s'ha pogut suprimir la classe de registre '%1'.\n" +msgstr "regedit: No s'ha pogut suprimir la clau de registre '%1'.\n" #: regedit.rc:431 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: No s'ha reconegut la línia '%1'.\n" +msgstr "regedit: La línia conté sintaxi no vàlida.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Tanca l'editor de registre" +msgstr "Tanca l'Editor de Registre" #: regedit.rc:188 msgid "Adds keys to the favorites list" @@ -12911,8 +12720,6 @@ msgid "Shows or hides the status bar" msgstr "Mostra o amaga la barra d'estat" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Canvia la posició de la divisió entre dos panells" @@ -12957,10 +12764,8 @@ msgid "Adds a new binary value" msgstr "Afegeix un valor binari nou" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Afegeix un valor binari nou" +msgstr "Afegeix un valor nou de 32 bits" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12975,42 +12780,32 @@ msgid "Prints all or part of the registry" msgstr "Imprimeix tot o part del registre" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Editor de Registre" +msgstr "Obre l'Ajuda de l'Editor de Registre" #: regedit.rc:182 msgid "Displays program information, version number and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: regedit.rc:206 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut consultar el valor de registre '%1'." #: regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "No es pot editar les claus d'aquest tipus (%u)" +msgstr "No es pot editar les claus d'aquest tipus (%1!u!)." #: regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "El valor és massa gran (%u)" +msgstr "El valor és massa gran (%1!u!)." #: regedit.rc:209 msgid "Confirm Value Delete" msgstr "Confirmar eliminació de valor" #: regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Cadena de cerca '%s' no trobada" +msgstr "S'ha acabat la cerca. No s'ha trobat la cadena '%1'." #: regedit.rc:211 msgid "Are you sure you want to delete these values?" @@ -13025,56 +12820,43 @@ msgid "New Value #%d" msgstr "Valor nou #%d" #: regedit.rc:205 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut consultar la clau de registre '%1'." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Modifica les dades del valor" +msgstr "Modifica les dades del valor en forma binària" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Afegeix un valor de cadena múltiple nou" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Exporta la branca seleccionada del registre a un fitxer de text" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Afegeix un valor de cadena nou" +msgstr "Afegeix un valor nou de cadena expansible" #: regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Confirmar eliminació de valor" +msgstr "Confirmar eliminació de clau" #: regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Esteu segur que voleu suprimir la clau de registre '%1'?" +msgstr "" +"Esteu segur que voleu suprimir aquesta clau de registre i totes les seves " +"subclaus?" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Expandeix o col·lapsa el node seleccionat" #: regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "col·lapsat" +msgstr "Col·lapsa" #: regsvr32.rc:32 msgid "" @@ -13107,11 +12889,11 @@ msgstr "" "Options:\n" " [/u] Desregistra un servidor.\n" " [/s] Mode silent (no es mostrarà cap missatge).\n" -" [/i] Truca DllInstall, passant una [línia d'ordres] opcional.\n" -"\tQuan s'utilitza amb [/u], es truca DllInstall en el mode de " -"desinstal·lació.\n" -" [/n] No truquis DllRegisterServer. S'ha d'utilitzar aquesta opció amb [/" -"i].\n" +" [/i] Truca a DllInstall, passant una [línia d'ordres] opcional.\n" +"\tQuan s'utilitza amb [/u], es truca a DllInstall en el mode de\n" +"\tdesinstal·lació.\n" +" [/n] No truquis a DllRegisterServer. S'ha d'utilitzar aquesta opció amb\n" +"\t[/i].\n" "\n" #: regsvr32.rc:41 @@ -13119,7 +12901,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: Commutador invàlid o no reconegut [%1]\n" +"regsvr32: Commutador no vàlid o no reconegut [%1]\n" "\n" #: regsvr32.rc:42 @@ -13185,11 +12967,12 @@ msgstr "Ús: taskkill [/?] [/f] [/im NomDeProcés | /pid IdDeProcés]\n" #: taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" msgstr "" -"Error: S'ha especificat una opció de línia d'ordres invàlida o desconeguda.\n" +"Error: S'ha especificat una opció de línia d'ordres no vàlida o " +"desconeguda.\n" #: taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "Error: S'ha especificat un paràmetre de línia d'ordres invàlid.\n" +msgstr "Error: S'ha especificat un paràmetre de línia d'ordres no vàlid.\n" #: taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" @@ -13799,7 +13582,7 @@ msgstr "Mostra temes d'ajuda de l'Administrador de Tasques" #: taskmgr.rc:212 msgid "Displays program information, version number, and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: taskmgr.rc:213 msgid "Exits the Task Manager application" @@ -14021,7 +13804,7 @@ msgstr "El procés ha de tenir afinitat amb almenys un processador" #: taskmgr.rc:316 msgid "Invalid Option" -msgstr "Opció invàlida" +msgstr "Opció no vàlida" #: taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" @@ -14054,22 +13837,21 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "L'execució de l'ordre de desinstal·lació '%s' ha fallat, potser perquè " -"l'executable manqui.\n" +"manqui l'executable.\n" "Voleu eliminar l'entrada de desinstal·lació del registre?" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "desinstal·lador: No s'ha trobat l'aplicació amb la GUID '%1'\n" +msgstr "desinstal·lador: No s'ha trobat l'aplicació amb el GUID '%1'\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" -msgstr "" -"desinstal·lador: Una GUID d'aplicació ha de seguir l'opció '--remove'\n" +msgstr "desinstal·lador: Un GUID d'aplicació ha de seguir l'opció '--remove'\n" #: uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "desinstal·lador: Opció invàlida [%1]\n" +msgstr "desinstal·lador: Opció no vàlida [%1]\n" #: uninstaller.rc:35 msgid "" @@ -14312,7 +14094,7 @@ msgstr "A&fegeix..." #: winecfg.rc:238 msgid "Aut&odetect" -msgstr "Autodetecta" +msgstr "Aut&odetecta" #: winecfg.rc:241 msgid "&Path:" @@ -14902,7 +14684,7 @@ msgstr "wineconsole: No s'ha pogut processar l'id del esdeveniment\n" #: wineconsole.rc:45 msgid "wineconsole: Invalid backend\n" -msgstr "wineconsole: Backend invàlid\n" +msgstr "wineconsole: Rerefons no vàlid\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" @@ -14918,7 +14700,7 @@ msgid "" "The command is invalid.\n" msgstr "" "wineconsole: L'inici del programa %s ha fallat.\n" -"L'ordre és invàlid.\n" +"L'ordre no és vàlida.\n" #: wineconsole.rc:50 msgid "" @@ -15014,7 +14796,7 @@ msgstr "Caiguda de programa del Wine" #: winedbg.rc:39 msgid "Internal errors - invalid parameters received" -msgstr "Errors interns - paràmetres invàlids rebuts" +msgstr "Errors interns - paràmetres no vàlids rebuts" #: winedbg.rc:40 msgid "(unidentified)" @@ -15290,10 +15072,8 @@ msgid "Expert" msgstr "Expert" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Resultat" +msgstr "Reinicia els resultats" #: winemine.rc:80 msgid "Congratulations!" @@ -15321,7 +15101,7 @@ msgstr "Mines" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Es perdran tots els resultats. N'esteu segur?" #: winemine.rc:30 msgid "WineMine" @@ -15437,11 +15217,11 @@ msgstr "Error: Àlies no trobat\n" #: wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "Error: Cerca invàlida\n" +msgstr "Error: Consulta no vàlida\n" #: wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "Error: Sintaxi invàlida per a PATH\n" +msgstr "Error: Sintaxi no vàlida per a PATH\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -15633,7 +15413,7 @@ msgstr "&Cap ajust de línia" #: wordpad.rc:269 msgid "Wrap text by the &window border" -msgstr "Ajusta el text pela vora de la &finestra" +msgstr "Ajusta el text per la vora de la &finestra" #: wordpad.rc:270 msgid "Wrap text by the &margin" @@ -15801,7 +15581,7 @@ msgstr "" #: wordpad.rc:198 msgid "Invalid number format." -msgstr "El format de nombre és invàlid." +msgstr "El format de nombre no és vàlid." #: wordpad.rc:199 msgid "OLE storage documents are not supported." @@ -15837,11 +15617,11 @@ msgstr "L'inici del Wordpad ha fallat" #: xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "Nombre de paràmetres invàlid - Utilitzeu xcopy /? per ajuda\n" +msgstr "Nombre de paràmetres no vàlid - Utilitzeu xcopy /? per ajuda\n" #: xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Paràmetre invàlid '%1' - Utilitzeu xcopy /? per ajuda\n" +msgstr "Paràmetre no vàlid '%1' - Utilitzeu xcopy /? per ajuda\n" #: xcopy.rc:32 msgid "Press <Enter> to begin copying\n" @@ -15939,7 +15719,7 @@ msgstr "" "[/S] Copia els directoris i subdirectoris.\n" "[/E] Copia els directoris i subdirectoris, incloent-hi els buits.\n" "[/Q] No mostris els noms durant la còpia, és a dir, sigues silent.\n" -"[/F] Mostra els noms complets de la font i el destinatari durant la còpia.\n" +"[/F] Mostra els noms complets de la font i la destinació durant la còpia.\n" "[/L] Simula l'operació, mostrant els noms que es copiarien.\n" "[/W] Pregunta abans de començar l'operació de còpia.\n" "[/T] Crea una estructura de directoris buits però no copiïs els fitxers.\n" -- 2.15.1

1 0

[PATCH] Update Catalan translation
by Alex Henrie 18 Dec '17

18 Dec '17

--- po/ca.po | 1112 +++++++++++++++++++++++++------------------------------------- 1 file changed, 446 insertions(+), 666 deletions(-) diff --git a/po/ca.po b/po/ca.po index e759aee8e8..0fdec04444 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-12-18 20:53-0700\n" +"PO-Revision-Date: 2017-12-17 18:14-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.5\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -842,7 +842,7 @@ msgstr "" #: comdlg32.rc:36 msgid "Invalid character(s) in path" -msgstr "Hi ha caràcters invàlids en el camí" +msgstr "Hi ha caràcters no vàlids en el camí" #: comdlg32.rc:37 msgid "" @@ -1854,7 +1854,7 @@ msgstr "Màscara=" #: crypt32.rc:192 msgid "Registered ID=" -msgstr "ID registrada=" +msgstr "ID registrat=" #: crypt32.rc:193 msgid "Unknown Key Usage" @@ -2439,7 +2439,7 @@ msgid "" "This certificate has an invalid signature. The certificate may have been " "altered or corrupted." msgstr "" -"Aquest certificat té una signatura invàlida. Pot ser que el certificat " +"Aquest certificat té una signatura no vàlida. Pot ser que el certificat " "s'hagués modificat o corromput." #: cryptui.rc:33 @@ -2485,7 +2485,7 @@ msgstr " a " #: cryptui.rc:42 msgid "This certificate has an invalid signature." -msgstr "Aquest certificat té una signatura invàlida." +msgstr "Aquest certificat té una signatura no vàlida." #: cryptui.rc:43 msgid "This certificate has expired or is not yet valid." @@ -3559,7 +3559,7 @@ msgstr "Error en convertir l'objecte a tipus primitiu" #: jscript.rc:29 msgid "Invalid procedure call or argument" -msgstr "Trucada a procediment o argument invàlid" +msgstr "Trucada a procediment o argument no vàlid" #: jscript.rc:30 msgid "Subscript out of range" @@ -3611,7 +3611,7 @@ msgstr "S'esperava '='" #: jscript.rc:42 msgid "Invalid character" -msgstr "Caràcter invàlid" +msgstr "Caràcter no vàlid" #: jscript.rc:43 msgid "Unterminated string constant" @@ -3695,7 +3695,7 @@ msgstr "Error de sintaxi en l'expressió regular" #: jscript.rc:64 msgid "URI to be encoded contains invalid characters" -msgstr "L'URI a codificar conté caràcters invàlids" +msgstr "L'URI a codificar conté caràcters no vàlids" #: jscript.rc:63 msgid "URI to be decoded is incorrect" @@ -3711,7 +3711,7 @@ msgstr "La precisió és fora d'interval" #: jscript.rc:67 msgid "Array length must be a finite positive integer" -msgstr "La longitud del vector ha de ser un enter positiu finit" +msgstr "La longitud del vector ha de ser un nombre enter positiu finit" #: jscript.rc:68 msgid "Array object expected" @@ -3719,7 +3719,7 @@ msgstr "S'esperava un objecte Array" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "DLL de nucli del Wine" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -3731,7 +3731,7 @@ msgstr "Èxit.\n" #: winerror.mc:31 msgid "Invalid function.\n" -msgstr "La funció és invàlida.\n" +msgstr "La funció no és vàlida.\n" #: winerror.mc:36 msgid "File not found.\n" @@ -3751,7 +3751,7 @@ msgstr "S'ha denegat l'accés.\n" #: winerror.mc:56 msgid "Invalid handle.\n" -msgstr "L'identificador és invàlid.\n" +msgstr "L'identificador no és vàlid.\n" #: winerror.mc:61 msgid "Memory trashed.\n" @@ -3763,7 +3763,7 @@ msgstr "Manca memòria.\n" #: winerror.mc:71 msgid "Invalid block.\n" -msgstr "El bloc és invàlid.\n" +msgstr "El bloc no és vàlid.\n" #: winerror.mc:76 msgid "Bad environment.\n" @@ -3775,11 +3775,11 @@ msgstr "El format és dolent.\n" #: winerror.mc:86 msgid "Invalid access.\n" -msgstr "L'accés és invàlid.\n" +msgstr "L'accés no és vàlid.\n" #: winerror.mc:91 msgid "Invalid data.\n" -msgstr "Les dades són invàlides.\n" +msgstr "Les dades no són vàlides.\n" #: winerror.mc:96 msgid "Out of memory.\n" @@ -3787,7 +3787,7 @@ msgstr "No queda memòria.\n" #: winerror.mc:101 msgid "Invalid drive.\n" -msgstr "La unitat és invàlida.\n" +msgstr "La unitat no és vàlida.\n" #: winerror.mc:106 msgid "Can't delete current directory.\n" @@ -3815,7 +3815,7 @@ msgstr "No està llest.\n" #: winerror.mc:136 msgid "Bad command.\n" -msgstr "L'ordre és dolent.\n" +msgstr "L'ordre és dolenta.\n" #: winerror.mc:141 msgid "CRC error.\n" @@ -3991,11 +3991,11 @@ msgstr "Ja s'ha assignat.\n" #: winerror.mc:356 winerror.mc:1711 msgid "Invalid password.\n" -msgstr "La contrasenya és invàlida.\n" +msgstr "La contrasenya no és vàlida.\n" #: winerror.mc:361 msgid "Invalid parameter.\n" -msgstr "El paràmetre és invàlid.\n" +msgstr "El paràmetre no és vàlid.\n" #: winerror.mc:366 msgid "Net write fault.\n" @@ -4059,15 +4059,15 @@ msgstr "No queden identificadors de cerca.\n" #: winerror.mc:446 msgid "Invalid target handle.\n" -msgstr "L'identificador destinatari és invàlid.\n" +msgstr "L'identificador de destinació no és vàlid.\n" #: winerror.mc:451 msgid "Invalid IOCTL.\n" -msgstr "L'IOCTL és invàlid.\n" +msgstr "L'IOCTL no és vàlid.\n" #: winerror.mc:456 msgid "Invalid verify switch.\n" -msgstr "L'indicador de verificació és invàlid.\n" +msgstr "L'indicador de verificació no és vàlid.\n" #: winerror.mc:461 msgid "Bad driver level.\n" @@ -4087,11 +4087,11 @@ msgstr "La memòria intermèdia és insuficient.\n" #: winerror.mc:481 msgid "Invalid name.\n" -msgstr "El nom és invàlid.\n" +msgstr "El nom no és vàlid.\n" #: winerror.mc:486 msgid "Invalid level.\n" -msgstr "El nivell és invàlid.\n" +msgstr "El nivell no és vàlid.\n" #: winerror.mc:491 msgid "No volume label.\n" @@ -4115,7 +4115,7 @@ msgstr "El procés fill no s'ha acabat.\n" #: winerror.mc:516 msgid "Invalid use of direct access handle.\n" -msgstr "L'ús d'identificador d'accés directe és invàlid.\n" +msgstr "L'ús d'identificador d'accés directe no és vàlid.\n" #: winerror.mc:521 msgid "Negative seek.\n" @@ -4123,7 +4123,7 @@ msgstr "La cerca és negativa.\n" #: winerror.mc:531 msgid "Drive is a JOIN target.\n" -msgstr "La unitat és un destinatari JOIN.\n" +msgstr "La unitat és una destinació JOIN.\n" #: winerror.mc:536 msgid "Drive is already JOINed.\n" @@ -4187,7 +4187,7 @@ msgstr "El camí està ocupat.\n" #: winerror.mc:611 msgid "Already a SUBST target.\n" -msgstr "Ja és un destinatari SUBST.\n" +msgstr "Ja és una destinació SUBST.\n" #: winerror.mc:616 msgid "System trace not specified or disallowed.\n" @@ -4203,7 +4203,7 @@ msgstr "Hi ha massa esperançats per a DosMuxSemWait.\n" #: winerror.mc:631 msgid "DosSemMuxWait list invalid.\n" -msgstr "La llista de DosSemMuxWait és invàlida.\n" +msgstr "La llista de DosSemMuxWait no és vàlida.\n" #: winerror.mc:636 msgid "Volume label too long.\n" @@ -4231,11 +4231,11 @@ msgstr "L'adreça d'ID de fil és dolent.\n" #: winerror.mc:666 msgid "Bad arguments to DosExecPgm.\n" -msgstr "Els paràmetres a DosExecPgm són dolents.\n" +msgstr "Els arguments a DosExecPgm són dolents.\n" #: winerror.mc:671 msgid "Path is invalid.\n" -msgstr "El camí és invàlid.\n" +msgstr "El camí no és vàlid.\n" #: winerror.mc:676 msgid "Signal pending.\n" @@ -4263,11 +4263,11 @@ msgstr "No s'accepten els bloqueigs atòmics.\n" #: winerror.mc:706 msgid "Invalid segment number.\n" -msgstr "El nombre de segment és invàlid.\n" +msgstr "El número de segment no és vàlid.\n" #: winerror.mc:711 msgid "Invalid ordinal for %1.\n" -msgstr "L'ordinal per a %1 és invàlid.\n" +msgstr "L'ordinal per a %1 no és vàlid.\n" #: winerror.mc:716 msgid "File already exists.\n" @@ -4275,7 +4275,7 @@ msgstr "El fitxer ja existeix.\n" #: winerror.mc:721 msgid "Invalid flag number.\n" -msgstr "El nombre de bandera és invàlida.\n" +msgstr "El número de bandera no és vàlid.\n" #: winerror.mc:726 msgid "Semaphore name not found.\n" @@ -4283,23 +4283,23 @@ msgstr "No s'ha trobat el nom de semàfor.\n" #: winerror.mc:731 msgid "Invalid starting code segment for %1.\n" -msgstr "El segment de codi d'inici per a %1 és invàlid.\n" +msgstr "El segment de codi d'inici per a %1 no és vàlid.\n" #: winerror.mc:736 msgid "Invalid starting stack segment for %1.\n" -msgstr "El segment de codi d'inici de pila per a %1 és invàlid.\n" +msgstr "El segment de codi d'inici de pila per a %1 no és vàlid.\n" #: winerror.mc:741 msgid "Invalid module type for %1.\n" -msgstr "El tipus de mòdul per a %1 és invàlid.\n" +msgstr "El tipus de mòdul per a %1 no és vàlid.\n" #: winerror.mc:746 msgid "Invalid EXE signature in %1.\n" -msgstr "La signatura EXE en %1 és invàlida.\n" +msgstr "La signatura EXE en %1 no és vàlida.\n" #: winerror.mc:751 msgid "EXE %1 is marked invalid.\n" -msgstr "L'EXE %1 està marcat com a invàlid.\n" +msgstr "L'EXE %1 està marcat com a no vàlid.\n" #: winerror.mc:756 msgid "Bad EXE format for %1.\n" @@ -4311,11 +4311,11 @@ msgstr "Les dades iterades superen 64k en %1.\n" #: winerror.mc:766 msgid "Invalid MinAllocSize in %1.\n" -msgstr "El MinAllocSize en %1 és invàlid.\n" +msgstr "La MinAllocSize en %1 no és vàlida.\n" #: winerror.mc:771 msgid "Dynlink from invalid ring.\n" -msgstr "L'enllaç dinàmic d'anell és invàlid.\n" +msgstr "L'enllaç dinàmic d'anell no és vàlid.\n" #: winerror.mc:776 msgid "IOPL not enabled.\n" @@ -4323,7 +4323,7 @@ msgstr "L'IOPL no està habilitat.\n" #: winerror.mc:781 msgid "Invalid SEGDPL in %1.\n" -msgstr "L'SEGDPL en %1 és invàlid.\n" +msgstr "L'SEGDPL en %1 no és vàlid.\n" #: winerror.mc:786 msgid "Auto data segment exceeds 64k.\n" @@ -4363,7 +4363,7 @@ msgstr "Hi ha un error en l'ús de comodins de nom de fitxer.\n" #: winerror.mc:831 msgid "Invalid signal number.\n" -msgstr "El nombre de senyal és invàlid.\n" +msgstr "El número de senyal no és vàlid.\n" #: winerror.mc:836 msgid "Error setting signal handler.\n" @@ -4411,7 +4411,7 @@ msgstr "S'ha cancel·lat la sessió.\n" #: winerror.mc:891 msgid "Invalid extended attribute name.\n" -msgstr "El nom d'atribut estès és invàlid.\n" +msgstr "El nom d'atribut estès no és vàlid.\n" #: winerror.mc:896 msgid "Extended attribute list inconsistent.\n" @@ -4427,7 +4427,7 @@ msgstr "No es pot utilitzar la Copy API.\n" #: winerror.mc:911 msgid "Directory name invalid.\n" -msgstr "El nom de directori és invàlid.\n" +msgstr "El nom de directori no és vàlid.\n" #: winerror.mc:916 msgid "Extended attributes didn't fit.\n" @@ -4443,7 +4443,7 @@ msgstr "La taula d'atributs estesos està ple.\n" #: winerror.mc:931 msgid "Invalid extended attribute handle.\n" -msgstr "L'identificador d'atribut estès és invàlid.\n" +msgstr "L'identificador d'atribut estès no és vàlid.\n" #: winerror.mc:936 msgid "Extended attributes not supported.\n" @@ -4467,7 +4467,7 @@ msgstr "No s'ha concedit el bloqueig d'operació.\n" #: winerror.mc:961 msgid "Invalid oplock message received.\n" -msgstr "S'ha rebut un missatge invàlid de bloqueig d'operació.\n" +msgstr "S'ha rebut un missatge no vàlid de bloqueig d'operació.\n" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" @@ -4475,7 +4475,7 @@ msgstr "No s'ha trobat el missatge 0x%1 en el fitxer %2.\n" #: winerror.mc:971 msgid "Invalid address.\n" -msgstr "L'adreça és invàlida.\n" +msgstr "L'adreça no és vàlida.\n" #: winerror.mc:976 msgid "Arithmetic overflow.\n" @@ -4519,7 +4519,7 @@ msgstr "Hi ha hagut un desbordament de pila.\n" #: winerror.mc:1026 msgid "Invalid message.\n" -msgstr "El missatge és invàlid.\n" +msgstr "El missatge no és vàlid.\n" #: winerror.mc:1031 msgid "Cannot complete.\n" @@ -4527,7 +4527,7 @@ msgstr "No es pot acabar.\n" #: winerror.mc:1036 msgid "Invalid flags.\n" -msgstr "Les banderes són invàlides.\n" +msgstr "Les banderes no són vàlides.\n" #: winerror.mc:1041 msgid "Unrecognized volume.\n" @@ -4535,7 +4535,7 @@ msgstr "No s'ha reconegut el volum.\n" #: winerror.mc:1046 msgid "File invalid.\n" -msgstr "El fitxer és invàlid.\n" +msgstr "El fitxer no és vàlid.\n" #: winerror.mc:1051 msgid "Cannot run full-screen.\n" @@ -4551,7 +4551,7 @@ msgstr "El registre és corrupte.\n" #: winerror.mc:1066 msgid "Invalid key.\n" -msgstr "La clau és invàlida.\n" +msgstr "La clau no és vàlida.\n" #: winerror.mc:1071 msgid "Can't open registry key.\n" @@ -4607,7 +4607,7 @@ msgstr "Els serveis dependents s'estan executant.\n" #: winerror.mc:1136 msgid "Invalid service control.\n" -msgstr "El control de servei és invàlid.\n" +msgstr "El control de servei no és vàlid.\n" #: winerror.mc:1141 msgid "Service request timeout.\n" @@ -4627,7 +4627,7 @@ msgstr "El servei ja està executant.\n" #: winerror.mc:1161 msgid "Invalid service account.\n" -msgstr "El compte de servei és invàlid.\n" +msgstr "El compte de servei no és vàlid.\n" #: winerror.mc:1166 msgid "Service is disabled.\n" @@ -4683,7 +4683,7 @@ msgstr "L'inici de servei s'ha congelat.\n" #: winerror.mc:1231 msgid "Invalid service lock.\n" -msgstr "El bloqueig de servei és invàlid.\n" +msgstr "El bloqueig de servei no és vàlid.\n" #: winerror.mc:1236 msgid "Service marked for delete.\n" @@ -4759,7 +4759,7 @@ msgstr "La partició ha fallat.\n" #: winerror.mc:1326 msgid "Invalid block length.\n" -msgstr "La longitud de bloc és invàlida.\n" +msgstr "La longitud de bloc no és vàlida.\n" #: winerror.mc:1331 msgid "Device not partitioned.\n" @@ -4895,7 +4895,7 @@ msgstr "Aplicació de mode real.\n" #: winerror.mc:1496 msgid "Invalid DLL.\n" -msgstr "La DLL és invàlida.\n" +msgstr "La DLL no és vàlida.\n" #: winerror.mc:1501 msgid "No associated application.\n" @@ -4923,11 +4923,11 @@ msgstr "L'element font està buit.\n" #: winerror.mc:1531 msgid "The destination element is full.\n" -msgstr "L'element destinatari està ple.\n" +msgstr "L'element de destinació està ple.\n" #: winerror.mc:1536 msgid "The element address is invalid.\n" -msgstr "L'adreça d'element és invàlida.\n" +msgstr "L'adreça d'element no és vàlida.\n" #: winerror.mc:1541 msgid "The magazine is not present.\n" @@ -5003,7 +5003,7 @@ msgstr "L'entrada de journal s'ha suprimit.\n" #: winerror.mc:1631 msgid "Invalid device name.\n" -msgstr "El nom de dispositiu és invàlid.\n" +msgstr "El nom de dispositiu no és vàlid.\n" #: winerror.mc:1636 msgid "Connection unavailable.\n" @@ -5019,7 +5019,7 @@ msgstr "No hi ha cap xarxa o el camí és dolent.\n" #: winerror.mc:1651 msgid "Invalid network provider name.\n" -msgstr "El nom de proveïdor de xarxa és invàlid.\n" +msgstr "El nom de proveïdor de xarxa no és vàlid.\n" #: winerror.mc:1656 msgid "Cannot open network connection profile.\n" @@ -5039,39 +5039,39 @@ msgstr "Hi ha hagut un error estès.\n" #: winerror.mc:1676 msgid "Invalid group name.\n" -msgstr "El nom de grup és invàlid.\n" +msgstr "El nom de grup no és vàlid.\n" #: winerror.mc:1681 msgid "Invalid computer name.\n" -msgstr "El nom d'ordinador és invàlid.\n" +msgstr "El nom d'ordinador no és vàlid.\n" #: winerror.mc:1686 msgid "Invalid event name.\n" -msgstr "El nom d'esdeveniment és invàlid.\n" +msgstr "El nom d'esdeveniment no és vàlid.\n" #: winerror.mc:1691 msgid "Invalid domain name.\n" -msgstr "El nom de domini és invàlid.\n" +msgstr "El nom de domini no és vàlid.\n" #: winerror.mc:1696 msgid "Invalid service name.\n" -msgstr "El nom de servei és invàlid.\n" +msgstr "El nom de servei no és vàlid.\n" #: winerror.mc:1701 msgid "Invalid network name.\n" -msgstr "El nom de xarxa és invàlid.\n" +msgstr "El nom de xarxa no és vàlid.\n" #: winerror.mc:1706 msgid "Invalid share name.\n" -msgstr "El nom de compartició és invàlid.\n" +msgstr "El nom de compartició no és vàlid.\n" #: winerror.mc:1716 msgid "Invalid message name.\n" -msgstr "El nom de missatge és invàlid.\n" +msgstr "El nom de missatge no és vàlid.\n" #: winerror.mc:1721 msgid "Invalid message destination.\n" -msgstr "La destinació de missatge és invàlida.\n" +msgstr "La destinació de missatge no és vàlida.\n" #: winerror.mc:1726 msgid "Session credential conflict.\n" @@ -5115,7 +5115,7 @@ msgstr "L'adreça no està associada amb el punt final de transport.\n" #: winerror.mc:1776 msgid "Connection invalid.\n" -msgstr "La connexió és invàlida.\n" +msgstr "La connexió no és vàlida.\n" #: winerror.mc:1781 msgid "Connection is active.\n" @@ -5211,7 +5211,7 @@ msgstr "Realitza l'operació encara que no hagi canviat res.\n" #: winerror.mc:1896 msgid "The user profile is invalid.\n" -msgstr "El perfil d'usuari és invàlid.\n" +msgstr "El perfil d'usuari no és vàlid.\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server.\n" @@ -5223,7 +5223,7 @@ msgstr "No tots els privilegis estan assignats.\n" #: winerror.mc:1911 msgid "Some security IDs not mapped.\n" -msgstr "Algunes ID de seguretat no estan assignades.\n" +msgstr "Alguns ID de seguretat no estan assignats.\n" #: winerror.mc:1916 msgid "No quotas for account.\n" @@ -5247,11 +5247,11 @@ msgstr "Els nivells de revisió són incompatibles.\n" #: winerror.mc:1941 msgid "Invalid owner.\n" -msgstr "El propietari és invàlid.\n" +msgstr "El propietari no és vàlid.\n" #: winerror.mc:1946 msgid "Invalid primary group.\n" -msgstr "El grup primari és invàlid.\n" +msgstr "El grup principal no és vàlid.\n" #: winerror.mc:1951 msgid "No impersonation token.\n" @@ -5279,7 +5279,7 @@ msgstr "No es té el privilegi.\n" #: winerror.mc:1981 msgid "Invalid account name.\n" -msgstr "El nom del compte és invàlid.\n" +msgstr "El nom del compte no és vàlid.\n" #: winerror.mc:1986 msgid "User already exists.\n" @@ -5331,11 +5331,11 @@ msgstr "Hi ha una restricció de compte.\n" #: winerror.mc:2046 msgid "Invalid logon hours.\n" -msgstr "Les hores de sessió són invàlides.\n" +msgstr "Les hores de sessió no són vàlides.\n" #: winerror.mc:2051 msgid "Invalid workstation.\n" -msgstr "L'estació de treball és invàlida.\n" +msgstr "L'estació de treball no és vàlida.\n" #: winerror.mc:2056 msgid "Password expired.\n" @@ -5355,23 +5355,23 @@ msgstr "S'han sol·licitat massa LUID.\n" #: winerror.mc:2076 msgid "LUIDs exhausted.\n" -msgstr "S'han acabat les LUID.\n" +msgstr "S'han acabat els LUID.\n" #: winerror.mc:2081 msgid "Invalid sub authority.\n" -msgstr "La subautoritat és invàlida.\n" +msgstr "La subautoritat no és vàlida.\n" #: winerror.mc:2086 msgid "Invalid ACL.\n" -msgstr "L'ACL és invàlida.\n" +msgstr "L'ACL no és vàlida.\n" #: winerror.mc:2091 msgid "Invalid SID.\n" -msgstr "L'SID és invàlid.\n" +msgstr "L'SID no és vàlid.\n" #: winerror.mc:2096 msgid "Invalid security descriptor.\n" -msgstr "El descriptor de seguretat és invàlid.\n" +msgstr "El descriptor de seguretat no és vàlid.\n" #: winerror.mc:2101 msgid "Bad inherited ACL.\n" @@ -5387,7 +5387,7 @@ msgstr "El servidor no està inhabilitat.\n" #: winerror.mc:2116 msgid "Invalid ID authority.\n" -msgstr "L'autoritat d'ID és invàlida.\n" +msgstr "L'autoritat d'ID no és vàlida.\n" #: winerror.mc:2121 msgid "Allotted space exceeded.\n" @@ -5395,7 +5395,7 @@ msgstr "S'ha superat l'espai assignat.\n" #: winerror.mc:2126 msgid "Invalid group attributes.\n" -msgstr "Els atributs de grup són invàlids.\n" +msgstr "Els atributs de grup no són vàlids.\n" #: winerror.mc:2131 msgid "Bad impersonation level.\n" @@ -5423,15 +5423,15 @@ msgstr "No es pot accedir a la informació de domini.\n" #: winerror.mc:2161 msgid "Invalid server state.\n" -msgstr "L'estat de servidor és invàlid.\n" +msgstr "L'estat de servidor no és vàlid.\n" #: winerror.mc:2166 msgid "Invalid domain state.\n" -msgstr "L'estat de domini és invàlid.\n" +msgstr "L'estat de domini no és vàlid.\n" #: winerror.mc:2171 msgid "Invalid domain role.\n" -msgstr "El paper de domini és invàlid.\n" +msgstr "El rol de domini no és vàlid.\n" #: winerror.mc:2176 msgid "No such domain.\n" @@ -5483,7 +5483,7 @@ msgstr "Hi ha hagut una col·lisió d'ID de sessió d'inici.\n" #: winerror.mc:2236 msgid "Invalid logon type.\n" -msgstr "El tipus d'inici de sessió és invàlid.\n" +msgstr "El tipus d'inici de sessió no és vàlid.\n" #: winerror.mc:2241 msgid "Cannot impersonate.\n" @@ -5491,7 +5491,7 @@ msgstr "No es pot suplantar.\n" #: winerror.mc:2246 msgid "Invalid transaction state.\n" -msgstr "L'estat de transacció és invàlid.\n" +msgstr "L'estat de transacció no és vàlid.\n" #: winerror.mc:2251 msgid "Security DB commit failure.\n" @@ -5511,7 +5511,7 @@ msgstr "L'usuari és integrat.\n" #: winerror.mc:2271 msgid "Group is primary for user.\n" -msgstr "El grup és el primari per a l'usuari.\n" +msgstr "El grup és el principal per a l'usuari.\n" #: winerror.mc:2276 msgid "Token already in use.\n" @@ -5563,7 +5563,7 @@ msgstr "No hi ha tal membre.\n" #: winerror.mc:2341 msgid "Invalid member.\n" -msgstr "El membre és invàlid.\n" +msgstr "El membre no és vàlid.\n" #: winerror.mc:2346 msgid "Too many SIDs.\n" @@ -5595,7 +5595,7 @@ msgstr "S'ha superat la quota de llicència.\n" #: winerror.mc:2381 msgid "Wrong target name.\n" -msgstr "El nom del destinatari és incorrecte.\n" +msgstr "El nom de la destinació és incorrecte.\n" #: winerror.mc:2386 msgid "Mutual authentication failed.\n" @@ -5607,27 +5607,27 @@ msgstr "Hi ha una asimetria de temps entre el client i el servidor.\n" #: winerror.mc:2396 msgid "Invalid window handle.\n" -msgstr "L'identificador de finestra és invàlid.\n" +msgstr "L'identificador de finestra no és vàlid.\n" #: winerror.mc:2401 msgid "Invalid menu handle.\n" -msgstr "L'identificador de menú és invàlid.\n" +msgstr "L'identificador de menú no és vàlid.\n" #: winerror.mc:2406 msgid "Invalid cursor handle.\n" -msgstr "L'identificador de cursor és invàlid.\n" +msgstr "L'identificador de cursor no és vàlid.\n" #: winerror.mc:2411 msgid "Invalid accelerator table handle.\n" -msgstr "L'identificador de taula acceleradora és invàlid.\n" +msgstr "L'identificador de taula acceleradora no és vàlid.\n" #: winerror.mc:2416 msgid "Invalid hook handle.\n" -msgstr "L'identificador de ganxo és invàlid.\n" +msgstr "L'identificador de ganxo no és vàlid.\n" #: winerror.mc:2421 msgid "Invalid DWP handle.\n" -msgstr "L'identificador DWP és invàlid.\n" +msgstr "L'identificador DWP no és vàlid.\n" #: winerror.mc:2426 msgid "Can't create top-level child window.\n" @@ -5659,11 +5659,11 @@ msgstr "La classe té finestres obertes.\n" #: winerror.mc:2461 msgid "Invalid index.\n" -msgstr "L'índex és invàlid.\n" +msgstr "L'índex no és vàlid.\n" #: winerror.mc:2466 msgid "Invalid icon handle.\n" -msgstr "L'identificador d'icona és invàlid.\n" +msgstr "L'identificador d'icona no és vàlid.\n" #: winerror.mc:2471 msgid "Private dialog index.\n" @@ -5671,7 +5671,7 @@ msgstr "L'índex de diàleg és privat.\n" #: winerror.mc:2476 msgid "List box ID not found.\n" -msgstr "No s'ha trobat l'ID de caixa de llista.\n" +msgstr "No s'ha trobat l'ID de quadre de llista.\n" #: winerror.mc:2481 msgid "No wildcard characters.\n" @@ -5695,7 +5695,7 @@ msgstr "No s'ha trobat l'ID de control.\n" #: winerror.mc:2506 msgid "Invalid combo box message.\n" -msgstr "El missatge de quadre combinat és invàlid.\n" +msgstr "El missatge de quadre combinat no és vàlid.\n" #: winerror.mc:2511 msgid "Not a combo box window.\n" @@ -5703,7 +5703,7 @@ msgstr "No és finestra de quadre combinat.\n" #: winerror.mc:2516 msgid "Invalid edit height.\n" -msgstr "L'altura d'edició és invàlida.\n" +msgstr "L'altura d'edició no és vàlida.\n" #: winerror.mc:2521 msgid "DC not found.\n" @@ -5711,11 +5711,11 @@ msgstr "No s'ha trobat el DC.\n" #: winerror.mc:2526 msgid "Invalid hook filter.\n" -msgstr "El filtre de ganxo és invàlid.\n" +msgstr "El filtre de ganxo no és vàlid.\n" #: winerror.mc:2531 msgid "Invalid filter procedure.\n" -msgstr "El procediment de filtre és invàlid.\n" +msgstr "El procediment de filtre no és vàlid.\n" #: winerror.mc:2536 msgid "Hook procedure needs module handle.\n" @@ -5735,15 +5735,15 @@ msgstr "El procediment de ganxo no està instal·lat.\n" #: winerror.mc:2556 msgid "Invalid list box message.\n" -msgstr "El missatge de caixa de llista és invàlid.\n" +msgstr "El missatge de quadre de llista no és vàlid.\n" #: winerror.mc:2561 msgid "Invalid LB_SETCOUNT sent.\n" -msgstr "S'ha enviat un LB_SETCOUNT invàlid.\n" +msgstr "S'ha enviat un LB_SETCOUNT no vàlid.\n" #: winerror.mc:2566 msgid "No tab stops on this list box.\n" -msgstr "No hi ha cap tabulador que s'aturi en aquesta caixa de llista.\n" +msgstr "No hi ha cap tabulador que s'aturi en aquest quadre de llista.\n" #: winerror.mc:2571 msgid "Can't destroy object owned by another thread.\n" @@ -5759,11 +5759,11 @@ msgstr "La finestra no té menú de sistema.\n" #: winerror.mc:2586 msgid "Invalid message box style.\n" -msgstr "L'estil de quadre de missatge és invàlid.\n" +msgstr "L'estil de quadre de missatge no és vàlid.\n" #: winerror.mc:2591 msgid "Invalid SPI parameter.\n" -msgstr "El paràmetre SPI és invàlid.\n" +msgstr "El paràmetre SPI no és vàlid.\n" #: winerror.mc:2596 msgid "Screen already locked.\n" @@ -5779,11 +5779,11 @@ msgstr "No és finestra filla.\n" #: winerror.mc:2611 msgid "Invalid GW command.\n" -msgstr "L'ordre GW és invàlid.\n" +msgstr "L'ordre GW no és vàlida.\n" #: winerror.mc:2616 msgid "Invalid thread ID.\n" -msgstr "L'ID de fil és invàlid.\n" +msgstr "L'ID de fil no és vàlid.\n" #: winerror.mc:2621 msgid "Not an MDI child window.\n" @@ -5799,11 +5799,11 @@ msgstr "No hi ha cap barra de desplaçament.\n" #: winerror.mc:2636 msgid "Invalid scrollbar range.\n" -msgstr "L'interval de desplaçament és invàlid.\n" +msgstr "L'interval de desplaçament no és vàlid.\n" #: winerror.mc:2641 msgid "Invalid ShowWin command.\n" -msgstr "L'ordre ShowWin és invàlid.\n" +msgstr "L'ordre ShowWin no és vàlida.\n" #: winerror.mc:2646 msgid "No system resources.\n" @@ -5835,7 +5835,7 @@ msgstr "No s'ha trobat l'element de menú.\n" #: winerror.mc:2681 msgid "Invalid keyboard handle.\n" -msgstr "L'identificador de teclat és invàlid.\n" +msgstr "L'identificador de teclat no és vàlid.\n" #: winerror.mc:2686 msgid "Hook type not allowed.\n" @@ -5851,7 +5851,7 @@ msgstr "S'ha superat el temps d'espera.\n" #: winerror.mc:2701 msgid "Invalid monitor handle.\n" -msgstr "L'identificador de monitor és invàlid.\n" +msgstr "L'identificador de monitor no és vàlid.\n" #: winerror.mc:2706 msgid "Event log file corrupt.\n" @@ -5903,7 +5903,7 @@ msgstr "La propietat és desconeguda.\n" #: winerror.mc:2766 msgid "Invalid handle state.\n" -msgstr "L'estat d'identificador és invàlid.\n" +msgstr "L'estat d'identificador no és vàlid.\n" #: winerror.mc:2771 msgid "Bad configuration.\n" @@ -5927,11 +5927,11 @@ msgstr "S'ha desinstal·lat el producte.\n" #: winerror.mc:2796 msgid "Invalid query syntax.\n" -msgstr "La sintaxi de consulta és invàlida.\n" +msgstr "La sintaxi de consulta no és vàlida.\n" #: winerror.mc:2801 msgid "Invalid field.\n" -msgstr "El camp és invàlid.\n" +msgstr "El camp no és vàlid.\n" #: winerror.mc:2806 msgid "Device removed.\n" @@ -5947,7 +5947,7 @@ msgstr "El paquet d'instal·lació ha fallat en obrir.\n" #: winerror.mc:2821 msgid "Installation package is invalid.\n" -msgstr "El paquet d'instal·lació és invàlid.\n" +msgstr "El paquet d'instal·lació no és vàlid.\n" #: winerror.mc:2826 msgid "Installer user interface failed.\n" @@ -5979,7 +5979,7 @@ msgstr "La funció ha fallat.\n" #: winerror.mc:2861 msgid "Invalid table.\n" -msgstr "La taula és invàlida.\n" +msgstr "La taula no és vàlida.\n" #: winerror.mc:2866 msgid "Data type mismatch.\n" @@ -6011,7 +6011,7 @@ msgstr "S'ha fallat en obrir el paquet de pedaç.\n" #: winerror.mc:2901 msgid "Invalid patch package.\n" -msgstr "El paquet de pedaç és invàlid.\n" +msgstr "El paquet de pedaç no és vàlid.\n" #: winerror.mc:2906 msgid "Unsupported patch package.\n" @@ -6023,7 +6023,7 @@ msgstr "Una altra versió està instal·lada.\n" #: winerror.mc:2916 msgid "Invalid command line.\n" -msgstr "La línia d'ordres és invàlida.\n" +msgstr "La línia d'ordres no és vàlida.\n" #: winerror.mc:2921 msgid "Remote installation not allowed.\n" @@ -6035,15 +6035,15 @@ msgstr "S'ha iniciat un reinici després d'instal·lació amb èxit.\n" #: winerror.mc:2931 msgid "Invalid string binding.\n" -msgstr "El lligament de cadena és invàlid.\n" +msgstr "La vinculació de cadena no és vàlida.\n" #: winerror.mc:2936 msgid "Wrong kind of binding.\n" -msgstr "El tipus de lligament és incorrecte.\n" +msgstr "El tipus de vinculació és incorrecte.\n" #: winerror.mc:2941 msgid "Invalid binding.\n" -msgstr "El lligament és invàlid.\n" +msgstr "La vinculació no és vàlida.\n" #: winerror.mc:2946 msgid "RPC protocol sequence not supported.\n" @@ -6051,19 +6051,19 @@ msgstr "La seqüència de protocol RPC no és compatible.\n" #: winerror.mc:2951 msgid "Invalid RPC protocol sequence.\n" -msgstr "La seqüència de protocol RPC és invàlida.\n" +msgstr "La seqüència de protocol RPC no és vàlida.\n" #: winerror.mc:2956 msgid "Invalid string UUID.\n" -msgstr "L'UUID de cadena és invàlida.\n" +msgstr "L'UUID de cadena no és vàlid.\n" #: winerror.mc:2961 msgid "Invalid endpoint format.\n" -msgstr "El format de punt final és invàlid.\n" +msgstr "El format de punt final no és vàlid.\n" #: winerror.mc:2966 msgid "Invalid network address.\n" -msgstr "L'adreça de xarxa és invàlida.\n" +msgstr "L'adreça de xarxa no és vàlida.\n" #: winerror.mc:2971 msgid "No endpoint found.\n" @@ -6071,7 +6071,7 @@ msgstr "No s'ha trobat cap punt final.\n" #: winerror.mc:2976 msgid "Invalid timeout value.\n" -msgstr "El valor de temps d'espera és invàlid.\n" +msgstr "El valor de temps d'espera no és vàlid.\n" #: winerror.mc:2981 msgid "Object UUID not found.\n" @@ -6107,7 +6107,7 @@ msgstr "La interfície és desconeguda.\n" #: winerror.mc:3021 msgid "No bindings.\n" -msgstr "No hi ha cap lligament.\n" +msgstr "No hi ha cap vinculació.\n" #: winerror.mc:3026 msgid "No protocol sequences.\n" @@ -6131,7 +6131,7 @@ msgstr "El servidor RPC està massa ocupat.\n" #: winerror.mc:3051 msgid "Invalid network options.\n" -msgstr "Les opcions de xarxa són invàlides.\n" +msgstr "Les opcions de xarxa no són vàlides.\n" #: winerror.mc:3056 msgid "No RPC call active.\n" @@ -6155,11 +6155,11 @@ msgstr "La sintaxi de transferència és incompatible.\n" #: winerror.mc:3086 msgid "Invalid tag.\n" -msgstr "L'etiqueta és invàlida.\n" +msgstr "L'etiqueta no és vàlida.\n" #: winerror.mc:3091 msgid "Invalid array bounds.\n" -msgstr "Els límits de vector són invàlids.\n" +msgstr "Els límits de vector no són vàlids.\n" #: winerror.mc:3096 msgid "No entry name.\n" @@ -6167,7 +6167,7 @@ msgstr "No hi ha cap nom d'entrada.\n" #: winerror.mc:3101 msgid "Invalid name syntax.\n" -msgstr "La sintaxi de nom és invàlid.\n" +msgstr "La sintaxi de nom no és vàlida.\n" #: winerror.mc:3106 msgid "Unsupported name syntax.\n" @@ -6199,11 +6199,11 @@ msgstr "No s'ha trobat la seqüència de protocol.\n" #: winerror.mc:3141 msgid "Procedure number out of range.\n" -msgstr "El nombre de procediment és fora d'interval.\n" +msgstr "El número de procediment és fora d'interval.\n" #: winerror.mc:3146 msgid "Binding has no authentication data.\n" -msgstr "El lligament no té dades d'autenticació.\n" +msgstr "La vinculació no té dades d'autenticació.\n" #: winerror.mc:3151 msgid "Unknown authentication service.\n" @@ -6215,7 +6215,7 @@ msgstr "El nivell d'autenticació és desconegut.\n" #: winerror.mc:3161 msgid "Invalid authentication identity.\n" -msgstr "La identitat d'autenticació és invàlid.\n" +msgstr "La identitat d'autenticació no és vàlida.\n" #: winerror.mc:3166 msgid "Unknown authorization service.\n" @@ -6223,7 +6223,7 @@ msgstr "El servei d'autorització és desconegut.\n" #: winerror.mc:3171 msgid "Invalid entry.\n" -msgstr "L'entrada és invàlida.\n" +msgstr "L'entrada no és vàlida.\n" #: winerror.mc:3176 msgid "Can't perform operation.\n" @@ -6243,7 +6243,7 @@ msgstr "El nom és incomplet.\n" #: winerror.mc:3196 msgid "Invalid version option.\n" -msgstr "L'opció de versió és invàlida.\n" +msgstr "L'opció de versió no és vàlida.\n" #: winerror.mc:3201 msgid "No more members.\n" @@ -6271,7 +6271,7 @@ msgstr "El servei de noms no està disponible.\n" #: winerror.mc:3231 msgid "Invalid network address family.\n" -msgstr "La família d'adreces de xarxa és invàlida.\n" +msgstr "La família d'adreces de xarxa no és vàlida.\n" #: winerror.mc:3236 msgid "Operation not supported.\n" @@ -6327,7 +6327,7 @@ msgstr "L'identificador de context és danyat.\n" #: winerror.mc:3301 msgid "Binding handle mismatch.\n" -msgstr "Els identificadors de lligament no es coincideixen.\n" +msgstr "Els identificadors de vinculació no es coincideixen.\n" #: winerror.mc:3306 msgid "Cannot get call handle.\n" @@ -6351,7 +6351,7 @@ msgstr "Les dades d'esbós (stub) són dolentes.\n" #: winerror.mc:3331 msgid "Invalid user buffer.\n" -msgstr "La memòria intermèdia d'usuari és invàlida.\n" +msgstr "La memòria intermèdia d'usuari no és vàlida.\n" #: winerror.mc:3336 msgid "Unrecognized media.\n" @@ -6411,15 +6411,15 @@ msgstr "El processador d'impressió és desconegut.\n" #: winerror.mc:3406 msgid "Invalid separator file.\n" -msgstr "El fitxer separador és invàlid.\n" +msgstr "El fitxer separador no és vàlid.\n" #: winerror.mc:3411 msgid "Invalid priority.\n" -msgstr "La prioritat és invàlida.\n" +msgstr "La prioritat no és vàlida.\n" #: winerror.mc:3416 msgid "Invalid printer name.\n" -msgstr "El nom d'impressora és invàlid.\n" +msgstr "El nom d'impressora no és vàlid.\n" #: winerror.mc:3421 msgid "Printer already exists.\n" @@ -6427,19 +6427,19 @@ msgstr "La impressora ja existeix.\n" #: winerror.mc:3426 msgid "Invalid printer command.\n" -msgstr "L'ordre d'impressora és invàlid.\n" +msgstr "L'ordre d'impressora no és vàlida.\n" #: winerror.mc:3431 msgid "Invalid data type.\n" -msgstr "El tipus de dades és invàlid.\n" +msgstr "El tipus de dades no és vàlid.\n" #: winerror.mc:3436 msgid "Invalid environment.\n" -msgstr "L'entorn és invàlid.\n" +msgstr "L'entorn no és vàlid.\n" #: winerror.mc:3441 msgid "No more bindings.\n" -msgstr "No hi ha més lligaments.\n" +msgstr "No hi ha més vinculacions.\n" #: winerror.mc:3446 msgid "Can't log on with inter-domain trust account.\n" @@ -6493,7 +6493,7 @@ msgstr "S'ha cancel·lat la trucada RPC.\n" #: winerror.mc:3506 msgid "Binding incomplete.\n" -msgstr "El lligament està incomplet.\n" +msgstr "La vinculació està incompleta.\n" #: winerror.mc:3511 msgid "RPC comm failure.\n" @@ -6525,7 +6525,7 @@ msgstr "No s'ha cancel·lat el fil.\n" #: winerror.mc:3546 msgid "Invalid handle operation.\n" -msgstr "L'operació d'identificador és invàlida.\n" +msgstr "L'operació d'identificador no és vàlida.\n" #: winerror.mc:3551 msgid "Wrong serializing package version.\n" @@ -6537,11 +6537,11 @@ msgstr "La versió d'esbós (stub) és incorrecta.\n" #: winerror.mc:3561 msgid "Invalid pipe object.\n" -msgstr "L'objecte de canonada és invàlid.\n" +msgstr "L'objecte de canonada no és vàlid.\n" #: winerror.mc:3566 msgid "Wrong pipe order.\n" -msgstr "L'ordre de canonada és incorrecte.\n" +msgstr "L'ordre de canonada és incorrecta.\n" #: winerror.mc:3571 msgid "Wrong pipe version.\n" @@ -6557,19 +6557,19 @@ msgstr "No es pot crear la DB assignadora de punts finals.\n" #: winerror.mc:3586 msgid "Invalid object.\n" -msgstr "L'objecte és invàlid.\n" +msgstr "L'objecte no és vàlid.\n" #: winerror.mc:3591 msgid "Invalid time.\n" -msgstr "L'hora és invàlida.\n" +msgstr "L'hora no és vàlida.\n" #: winerror.mc:3596 msgid "Invalid form name.\n" -msgstr "El nom de forma és invàlid.\n" +msgstr "El nom de forma no és vàlid.\n" #: winerror.mc:3601 msgid "Invalid form size.\n" -msgstr "La mida de forma és invàlida.\n" +msgstr "La mida de forma no és vàlida.\n" #: winerror.mc:3606 msgid "Already awaiting printer handle.\n" @@ -6581,7 +6581,7 @@ msgstr "S'ha suprimit la impressora.\n" #: winerror.mc:3616 msgid "Invalid printer state.\n" -msgstr "L'estat d'impressora és invàlid.\n" +msgstr "L'estat d'impressora no és vàlid.\n" #: winerror.mc:3621 msgid "User must change password.\n" @@ -6597,15 +6597,15 @@ msgstr "El compte està bloquejat.\n" #: winerror.mc:3636 msgid "Invalid pixel format.\n" -msgstr "El format de píxels és invàlid.\n" +msgstr "El format de píxels no és vàlid.\n" #: winerror.mc:3641 msgid "Invalid driver.\n" -msgstr "El controlador és invàlid.\n" +msgstr "El controlador no és vàlid.\n" #: winerror.mc:3646 msgid "Invalid object resolver set.\n" -msgstr "El conjunt de resolució d'objectes és invàlid.\n" +msgstr "El conjunt de resolució d'objectes no és vàlid.\n" #: winerror.mc:3651 msgid "Incomplete RPC send.\n" @@ -6613,11 +6613,11 @@ msgstr "L'enviament RPC està incomplet.\n" #: winerror.mc:3656 msgid "Invalid asynchronous RPC handle.\n" -msgstr "L'identificador RPC asíncron és invàlid.\n" +msgstr "L'identificador RPC asíncron no és vàlid.\n" #: winerror.mc:3661 msgid "Invalid asynchronous RPC call.\n" -msgstr "La trucada RPC asíncrona és invàlida.\n" +msgstr "La trucada RPC asíncrona no és vàlida.\n" #: winerror.mc:3666 msgid "RPC pipe closed.\n" @@ -6908,320 +6908,258 @@ msgid "choose which folder contains %s" msgstr "trieu quina carpeta conté %s" #: msi.rc:90 -#, fuzzy -#| msgid "No registry log space.\n" msgid "Allocating registry space" -msgstr "No hi ha espai per al registre del registre.\n" +msgstr "S'està assignant espai en el registre" #: msi.rc:91 -#, fuzzy -#| msgid "Single-instance application.\n" msgid "Searching for installed applications" -msgstr "Aplicació d'instància única.\n" +msgstr "S'estan cercant aplicacions instalades" #: msi.rc:92 msgid "Binding executables" -msgstr "" +msgstr "S'estan vinculant els executables" #: msi.rc:93 msi.rc:136 -#, fuzzy -#| msgid "Searching for %s" msgid "Searching for qualifying products" -msgstr "S'està cercant %s" +msgstr "S'estan cercant productes qualificants" #: msi.rc:94 msi.rc:95 msi.rc:100 msgid "Computing space requirements" -msgstr "" +msgstr "S'estan computant els requeriments d'espai" #: msi.rc:96 -#, fuzzy -#| msgid "Target folder" msgid "Creating folders" -msgstr "Carpeta de destinació" +msgstr "S'estan creant carpetes" #: msi.rc:97 -#, fuzzy -#| msgid "Create Shor&tcut" msgid "Creating shortcuts" -msgstr "Crea &una drecera" +msgstr "S'estan creant dreceres" #: msi.rc:98 -#, fuzzy -#| msgid "Exception in service.\n" msgid "Deleting services" -msgstr "Hi ha hagut una excepció en el servei.\n" +msgstr "S'estan eliminant serveis" #: msi.rc:99 -#, fuzzy -#| msgid "Creation date" msgid "Creating duplicate files" -msgstr "Data de creació" +msgstr "S'estan creant fitxers duplicats" #: msi.rc:101 -#, fuzzy -#| msgid "No associated application.\n" msgid "Searching for related applications" -msgstr "Cap aplicació està associada.\n" +msgstr "S'estan cercant aplicacions relacionades" #: msi.rc:102 msgid "Copying network install files" -msgstr "" +msgstr "S'estan copiant els fitxers d'instal·lació de xarxa" #: msi.rc:103 -#, fuzzy -#| msgid "Copying Files..." msgid "Copying new files" -msgstr "S'estan copiant els fitxers..." +msgstr "S'estan copiant els fitxers nous" #: msi.rc:104 -#, fuzzy -#| msgid "Installation of component failed: %08x" msgid "Installing ODBC components" -msgstr "La instal·lació del component ha fallat: %08x" +msgstr "S'estan instal·lant components ODBC" #: msi.rc:105 -#, fuzzy -#| msgid "Installer service failed.\n" msgid "Installing new services" -msgstr "El servei d'instal·lació ha fallat.\n" +msgstr "S'estan instal·lant els serveis nous" #: msi.rc:106 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Installing system catalog" -msgstr "Instal·la/desinstal·la" +msgstr "S'està instal·lant el catàleg de sistema" #: msi.rc:107 -#, fuzzy -#| msgid "Wine Application Uninstaller" msgid "Validating install" -msgstr "Desinstal·lador d'Aplicacions del Wine" +msgstr "S'està validant l'instalació" #: msi.rc:108 msgid "Evaluating launch conditions" -msgstr "" +msgstr "S'estan avaluant les condicions d'execució" #: msi.rc:109 msgid "Migrating feature states from related applications" msgstr "" +"S'estan migrant els estats de les característiques des de les aplicacions " +"relacionades" #: msi.rc:110 -#, fuzzy -#| msgid "Icon files" msgid "Moving files" -msgstr "Fitxers d'icona" +msgstr "S'estan movent fixters" #: msi.rc:111 -#, fuzzy -#| msgid "Version information" msgid "Publishing assembly information" -msgstr "Informació de versió" +msgstr "S'està publicant informació de assemblatge" #: msi.rc:112 msgid "Unpublishing assembly information" -msgstr "" +msgstr "S'està despublicant la informació d'assemblatge" #: msi.rc:113 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Fitxers d'icona" +msgstr "S'estan apedaçant fitxers" #: msi.rc:114 msgid "Updating component registration" -msgstr "" +msgstr "S'està actualitzant la registració de component" #: msi.rc:115 msgid "Publishing Qualified Components" -msgstr "" +msgstr "S'estan publicant els components qualificats" #: msi.rc:116 msgid "Publishing Product Features" -msgstr "" +msgstr "S'estan publicant les característiques de producte" #: msi.rc:117 -#, fuzzy -#| msgid "Client Information" msgid "Publishing product information" -msgstr "Informació de client" +msgstr "S'està publicant la informació de producte" #: msi.rc:118 msgid "Registering Class servers" -msgstr "" +msgstr "S'estan registrant els servidors de classe" #: msi.rc:119 msgid "Registering COM+ Applications and Components" -msgstr "" +msgstr "S'estan registrant les aplicacions i els components COM+" #: msi.rc:120 msgid "Registering extension servers" -msgstr "" +msgstr "S'estan registrant els servidors d'extensió" #: msi.rc:121 msgid "Registering fonts" -msgstr "" +msgstr "S'estan registrant els tipus de lletra" #: msi.rc:122 -#, fuzzy -#| msgid "Registry Editor" msgid "Registering MIME info" -msgstr "Editor de Registre" +msgstr "S'està registrant la informació MIME" #: msi.rc:123 -#, fuzzy -#| msgid "Registry is corrupt.\n" msgid "Registering product" -msgstr "El registre està corrupte.\n" +msgstr "S'està registrant el producte" #: msi.rc:124 msgid "Registering program identifiers" -msgstr "" +msgstr "S'estan registrant els identificadors de programa" #: msi.rc:125 -#, fuzzy -#| msgid "Type Libraries" msgid "Registering type libraries" -msgstr "Biblioteques de tipus" +msgstr "S'estan registrant les biblioteques de tipus" #: msi.rc:126 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Registering user" -msgstr "El recurs està en ús.\n" +msgstr "S'està registrant l'usuari" #: msi.rc:127 -#, fuzzy -#| msgid "&Remove duplicates" msgid "Removing duplicated files" -msgstr "&Elimina els duplicats" +msgstr "S'estan eliminant els fitxers duplicats" #: msi.rc:128 msi.rc:152 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "S'està aplicant la configuració de lletra" +msgstr "S'estan actualitzant les cadenes d'entorn" #: msi.rc:129 -#, fuzzy -#| msgid "&Remove application" msgid "Removing applications" -msgstr "&Elimina aplicació" +msgstr "S'estan eliminant les aplicacions" #: msi.rc:130 -#, fuzzy -#| msgid "Icon files" msgid "Removing files" -msgstr "Fitxers d'icona" +msgstr "S'estan eliminant els fitxers" #: msi.rc:131 msgid "Removing folders" -msgstr "" +msgstr "S'estan eliminant les carpetes" #: msi.rc:132 msgid "Removing INI files entries" -msgstr "" +msgstr "S'estan eliminant les entrades en els fitxers INI" #: msi.rc:133 -#, fuzzy -#| msgid "Domain Component" msgid "Removing ODBC components" -msgstr "Component de domini" +msgstr "S'estan eliminant els components ODBC" #: msi.rc:134 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Removing system registry values" -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "S'estan eliminant els valors del registre de sistema" #: msi.rc:135 msgid "Removing shortcuts" -msgstr "" +msgstr "S'estan eliminant les dreceres" #: msi.rc:137 msgid "Registering modules" -msgstr "" +msgstr "S'estan registrant els mòduls" #: msi.rc:138 msgid "Unregistering modules" -msgstr "" +msgstr "S'estan desregistrant els mòduls" #: msi.rc:139 -#, fuzzy -#| msgid "Initializing; " msgid "Initializing ODBC directories" -msgstr "S'està inicialitzant; " +msgstr "S'estan inicialitzant els directoris ODBC" #: msi.rc:140 -#, fuzzy -#| msgid "Starting Wordpad failed" msgid "Starting services" -msgstr "L'inici del Wordpad ha fallat" +msgstr "S'estan iniciant serveis" #: msi.rc:141 -#, fuzzy -#| msgid "Stopping dependent service: %1\n" msgid "Stopping services" -msgstr "S'està aturant el servei dependent: %1\n" +msgstr "S'estan aturant els serveis" #: msi.rc:142 msgid "Unpublishing Qualified Components" -msgstr "" +msgstr "S'estan desregistrant els components qualificats" #: msi.rc:143 msgid "Unpublishing Product Features" -msgstr "" +msgstr "S'estan despublicant les característiques de producte" #: msi.rc:144 -#, fuzzy -#| msgid "Client Information" msgid "Unpublishing product information" -msgstr "Informació de client" +msgstr "S'està despublicant la informació de producte" #: msi.rc:145 msgid "Unregister Class servers" -msgstr "" +msgstr "S'estan desregistrant els servidors de classe" #: msi.rc:146 msgid "Unregistering COM+ Applications and Components" -msgstr "" +msgstr "S'estan desregistrant les aplicacions i els components COM+" #: msi.rc:147 msgid "Unregistering extension servers" -msgstr "" +msgstr "S'estan desregistrant els servidors d'extensió" #: msi.rc:148 msgid "Unregistering fonts" -msgstr "" +msgstr "S'estan desregistrant els tipus de lletra" #: msi.rc:149 msgid "Unregistering MIME info" -msgstr "" +msgstr "S'està desregistrant la informació MIME" #: msi.rc:150 msgid "Unregistering program identifiers" -msgstr "" +msgstr "S'estan desregistrant els identificadors de programa" #: msi.rc:151 msgid "Unregistering type libraries" -msgstr "" +msgstr "S'estan desregistrant les biblioteques de tipus" #: msi.rc:153 msgid "Writing INI files values" -msgstr "" +msgstr "S'estan escrivint valors als fitxers INI" #: msi.rc:154 -#, fuzzy -#| msgid "Warning: system library" msgid "Writing system registry values" -msgstr "Advertència: biblioteca de sistema" +msgstr "S'estan escrivint valors al registre del sistema" #: msi.rc:160 msgid "Free space: [1]" -msgstr "" +msgstr "Espai lliure: [1]" #: msi.rc:161 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Propietat: [1], Signatura: [2]" #: msi.rc:162 msgid "File: [1]" @@ -7233,73 +7171,63 @@ msgstr "Carpeta: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" -msgstr "" +msgstr "Drecera: [1]" #: msi.rc:165 msi.rc:196 msi.rc:197 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [1]" -msgstr "&Dispositiu:" +msgstr "Servei: [1]" #: msi.rc:166 msi.rc:169 msi.rc:173 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Fitxer: [1] Directori: [9], Mida: [6]" #: msi.rc:167 -#, fuzzy -#| msgid "application" msgid "Found application: [1]" -msgstr "aplicació" +msgstr "S'ha trobat una aplicació: [1]" #: msi.rc:168 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Fitxer: [1] Directori: [9], Mida: [6]" #: msi.rc:170 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [2]" -msgstr "&Dispositiu:" +msgstr "Servei: [2]" #: msi.rc:171 msgid "File: [1], Dependencies: [2]" -msgstr "" +msgstr "Fitxer: [1], Dependències: [2]" #: msi.rc:172 -#, fuzzy -#| msgid "Applications" msgid "Application: [1]" -msgstr "Aplicacions" +msgstr "Aplicació: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Context d'aplicació:[1], Nom d'assemblatge:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "" +msgstr "Fitxer: [1], Directori: [2], Mida: [3]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "ID de component: [1], Qualificador: [2]" #: msi.rc:178 msi.rc:199 msgid "Feature: [1]" -msgstr "" +msgstr "Característica: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "" +msgstr "Id de classe: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Usuaris: [3], RSN: [4]}}" #: msi.rc:181 msi.rc:202 -#, fuzzy -#| msgid "Extensions Only" msgid "Extension: [1]" -msgstr "Només extensions" +msgstr "Extensió: [1]" #: msi.rc:182 msi.rc:203 msgid "Font: [1]" @@ -7307,63 +7235,63 @@ msgstr "Tipus de lletra: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "Tipus de contingut MIME: [1], Extensió: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: msi.rc:185 msi.rc:206 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Fitxer: [1], Directori: [9]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Nom: [1], Valor: [2], Acció [3]" #: msi.rc:188 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Aplicació: [1], Línia d'ordres: [2]" #: msi.rc:191 msi.rc:208 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Fitxer: [1], Secció: [2], Clau: [3], Valor: [4]" #: msi.rc:192 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Clau: [1], Nom: [2]" #: msi.rc:194 msi.rc:195 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "Fitxer: [1], Carpeta: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2]}}" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Clau: [1], Nom: [2], Valor: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Error fatal: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Error [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Advertència [1]." #: msi.rc:74 msgid "Info [1]." -msgstr "" +msgstr "Informació [1]." #: msi.rc:75 msgid "" @@ -7371,40 +7299,45 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"L'instal·lador s'ha topat amb un error inesperat en instal·lar aquest " +"paquet. Això pot indicar un problema amb aquest paquet. El codi d'error és " +"[1]. {{Els arguments són: [2], [3], [4]}}" #: msi.rc:76 msgid "{{Disk full: }}" -msgstr "{{El disc està ple: }}" +msgstr "{{Disc ple: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "Acció [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "Tipus de missatge: [1], Argument: [2]{, [3]}" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== S'ha començat el registre: [Date] [Time] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "Inici d'acció [Time]: [1]." #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "Fi d'acció [Time]: [1]. El valor retornat és [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Si us plau, inseriu el disc: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"No s'ha trobat el fitxer font{{(cabinet)}}: [2]. Verifiqueu que el fitxer " +"existeixi i que el podeu accedir." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -7636,11 +7569,11 @@ msgstr "botó" #: oleacc.rc:75 msgid "check button" -msgstr "casella de verificació" +msgstr "casella de selecció" #: oleacc.rc:76 msgid "radio button" -msgstr "botó de ràdio" +msgstr "botó d'opció" #: oleacc.rc:77 msgid "combo box" @@ -7668,7 +7601,7 @@ msgstr "control lliscant" #: oleacc.rc:83 msgid "spin box" -msgstr "spinner" +msgstr "quadre de nombre" #: oleacc.rc:84 msgid "diagram" @@ -7940,7 +7873,7 @@ msgstr "Enganxada amb opcions" #: oledlg.rc:85 setupapi.rc:43 msgid "Source:" -msgstr "Origen:" +msgstr "Font:" #: oledlg.rc:86 shdoclc.rc:50 shdoclc.rc:82 shdoclc.rc:95 shdoclc.rc:135 #: shdoclc.rc:162 shdoclc.rc:186 user32.rc:62 wineconsole.rc:33 wordpad.rc:114 @@ -8902,8 +8835,6 @@ msgid "Wine Control Panel" msgstr "Tauler de Control del Wine" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" msgstr "No s'ha pogut mostrar el quadre de diàleg Executar (error intern)" @@ -9023,10 +8954,8 @@ msgid " sec" msgstr " seg" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Selecciona una carpeta" +msgstr "Seleccionar font" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -9208,7 +9137,7 @@ msgstr "Un publicador desconegut o no de confiança ha emès el certificat." #: wininet.rc:30 msgid "The date on the certificate is invalid." -msgstr "La data en el certificat és invàlida." +msgstr "La data en el certificat no és vàlida." #: wininet.rc:31 msgid "The name on the certificate does not match the site." @@ -9222,7 +9151,7 @@ msgstr "" #: winmm.rc:32 msgid "The specified command was carried out." -msgstr "S'ha realitzat l'ordre especificat." +msgstr "S'ha realitzat l'ordre especificada." #: winmm.rc:33 msgid "Undefined external error." @@ -9247,7 +9176,7 @@ msgstr "" #: winmm.rc:37 msgid "The specified device handle is invalid." -msgstr "L'identificador del dispositiu especificat és invàlid." +msgstr "L'identificador del dispositiu especificat no és vàlid." #: winmm.rc:38 msgid "There is no driver installed on your system!" @@ -9276,11 +9205,11 @@ msgstr "Un número d'error s'ha especificat que no està definit en el sistema." #: winmm.rc:42 msgid "An invalid flag was passed to a system function." -msgstr "S'ha passat una bandera invàlida a una funció de sistema." +msgstr "S'ha passat una bandera no vàlida a una funció de sistema." #: winmm.rc:43 msgid "An invalid parameter was passed to a system function." -msgstr "S'ha passat un paràmetre invàlid a una funció de sistema." +msgstr "S'ha passat un paràmetre no vàlid a una funció de sistema." #: winmm.rc:46 msgid "" @@ -9358,7 +9287,7 @@ msgstr "" #: winmm.rc:60 msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." msgstr "" -"L'ID del dispositiu MCI és invàlida. Utilitzeu l'ID retornada en obrir el " +"L'ID del dispositiu MCI no és vàlid. Utilitzeu l'ID retornat en obrir el " "dispositiu MCI." #: winmm.rc:61 @@ -9367,7 +9296,7 @@ msgstr "El controlador no pot reconèixer el paràmetre d'ordre especificat." #: winmm.rc:62 msgid "The driver cannot recognize the specified command." -msgstr "El controlador no pot reconèixer l'ordre especificat." +msgstr "El controlador no pot reconèixer l'ordre especificada." #: winmm.rc:63 msgid "" @@ -9414,19 +9343,19 @@ msgid "" "The specified command requires a character-string parameter. Please provide " "one." msgstr "" -"L'ordre especificat requereix un paràmetre de cadena de caràcters. Si us " +"L'ordre especificada requereix un paràmetre de cadena de caràcters. Si us " "plau, proveïu un." #: winmm.rc:71 msgid "The specified integer is invalid for this command." -msgstr "El nombre enter especificat és invàlid per a aquest ordre." +msgstr "El nombre enter especificat no és vàlid per a aquesta ordre." #: winmm.rc:72 msgid "" "The device driver returned an invalid return type. Check with the device " "manufacturer about obtaining a new driver." msgstr "" -"El controlador de dispositiu ha donat un tipus de retorn invàlid. Consulteu " +"El controlador de dispositiu ha donat un tipus de retorn no vàlid. Consulteu " "amb el fabricant del dispositiu sobre com obtenir un controlador nou." #: winmm.rc:73 @@ -9439,11 +9368,11 @@ msgstr "" #: winmm.rc:74 msgid "The specified command requires a parameter. Please supply one." -msgstr "L'ordre especificat requereix un paràmetre. Si us plau, proveïu un." +msgstr "L'ordre especificada requereix un paràmetre. Si us plau, proveïu un." #: winmm.rc:75 msgid "The MCI device you are using does not support the specified command." -msgstr "El dispositiu MCI que utilitzeu no admet l'ordre especificat." +msgstr "El dispositiu MCI que utilitzeu no admet l'ordre especificada." #: winmm.rc:76 msgid "" @@ -9472,7 +9401,7 @@ msgstr "" #: winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." msgstr "" -"No es pot utilitzar 'all' com al nom de dispositiu amb l'ordre especificat." +"No es pot utilitzar 'all' com al nom de dispositiu amb l'ordre especificada." #: winmm.rc:81 msgid "" @@ -9491,7 +9420,8 @@ msgstr "" #: winmm.rc:83 msgid "The specified parameter is out of range for the specified command." -msgstr "El paràmetre especificat és fora de l'interval de l'ordre especificat." +msgstr "" +"El paràmetre especificat és fora de l'interval de l'ordre especificada." #: winmm.rc:84 msgid "The specified parameters cannot be used together." @@ -9531,7 +9461,7 @@ msgstr "" #: winmm.rc:89 msgid "The specified parameter is invalid for this command." -msgstr "El paràmetre especificat no és vàlid per a aquest ordre." +msgstr "El paràmetre especificat no és vàlid per a aquesta ordre." #: winmm.rc:90 msgid "" @@ -9546,7 +9476,7 @@ msgid "" "The specified command requires an alias, file, driver, or device name. " "Please supply one." msgstr "" -"L'ordre especificat requereix un àlies, fitxer, controlador o nom de " +"L'ordre especificada requereix un àlies, fitxer, controlador o nom de " "dispositiu. Si us plau, proveïu un." #: winmm.rc:92 @@ -9554,7 +9484,7 @@ msgid "" "The specified value for the time format is invalid. Refer to the MCI " "documentation for valid formats." msgstr "" -"El valor especificat per al format d'hora és invàlid. Consulteu la " +"El valor especificat per al format d'hora no és vàlid. Consulteu la " "documentació MCI pels formats vàlids." #: winmm.rc:93 @@ -9606,7 +9536,7 @@ msgid "" "Cannot carry out the commands in the order specified. Correct the command " "sequence, and then try again." msgstr "" -"No es pot dur a terme els ordres en l'ordre especificat. Corregiu la " +"No es pot dur a terme les ordres en l'ordre especificat. Corregiu la " "seqüència d'ordres i després torneu a intentar." #: winmm.rc:102 @@ -9614,7 +9544,7 @@ msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." msgstr "" -"No es pot dur a terme l'ordre especificat en un dispositiu obert " +"No es pot dur a terme l'ordre especificada en un dispositiu obert " "automàticament. Espereu fins que es tanqui el dispositiu i després torneu a " "intentar." @@ -9623,7 +9553,7 @@ msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." msgstr "" -"El nom de fitxer és invàlid. Assegureu-vos que el nom del fitxer no estigui " +"El nom de fitxer no és vàlid. Assegureu-vos que el nom del fitxer no estigui " "més llarg de 8 caràcters, seguit d'un període i una extensió." #: winmm.rc:104 @@ -9681,7 +9611,7 @@ msgstr "" msgid "" "The specified command requires an integer parameter. Please provide one." msgstr "" -"L'ordre especificat requereix un paràmetre de nombre sencer. Si us plau, " +"L'ordre especificada requereix un paràmetre de nombre enter. Si us plau, " "proveïu un." #: winmm.rc:112 @@ -9869,7 +9799,7 @@ msgstr "" #: winspool.rc:32 msgid "Unable to create the output file." -msgstr "No s'ha pogut crear el fitxer destinatari." +msgstr "No s'ha pogut crear el fitxer de sortida." #: wldap32.rc:32 msgid "Success" @@ -9928,10 +9858,8 @@ msgid "Confidentiality Required" msgstr "Cal confidencialitat" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "L'aturada està en curs.\n" +msgstr "Vinculació SASL en curs" #: wldap32.rc:48 msgid "No Such Attribute" @@ -9955,7 +9883,7 @@ msgstr "L'atribut o valor existeix" #: wldap32.rc:53 msgid "Invalid Syntax" -msgstr "Sintaxi invàlida" +msgstr "Sintaxi no vàlida" #: wldap32.rc:64 msgid "No Such Object" @@ -9967,7 +9895,7 @@ msgstr "Problema d'àlies" #: wldap32.rc:66 msgid "Invalid DN Syntax" -msgstr "Sintaxi DN invàlida" +msgstr "Sintaxi DN no vàlida" #: wldap32.rc:67 msgid "Is Leaf" @@ -9983,7 +9911,7 @@ msgstr "Autenticació no apropiada" #: wldap32.rc:81 msgid "Invalid Credentials" -msgstr "Credencials invàlides" +msgstr "Credencials no vàlides" #: wldap32.rc:82 msgid "Insufficient Rights" @@ -10212,8 +10140,8 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <nom de fitxer batch> s'utilitza dins un fitxer batch per a executar\n" -"ordres d'un altre fitxer batch. Quan se surt del fitxer batch, el control\n" +"CALL <nom de fitxer BAT> s'utilitza dins un fitxer BAT per a executar\n" +"ordres d'un altre fitxer BAT. Quan se surt del fitxer BAT, el control\n" "retorna al fitxer que l'ha trucat. L'ordre CALL pot proveir paràmetres al\n" "procediment trucat.\n" "\n" @@ -10271,7 +10199,7 @@ msgstr "" "actual.\n" "ECHO <cadena> mostra <cadena> en el dispositiu de terminal actual.\n" "\n" -"ECHO ON causa que tots els ordres següents en un fitxer batch es mostrin en\n" +"ECHO ON causa que totes les ordres següents en un fitxer BAT es mostrin en\n" "el dispositiu de terminal abans d'executar-se.\n" "\n" "ECHO OFF desfà l'efecte d'un ECHO ON anterior (ECHO està OFF per defecte).\n" @@ -10289,12 +10217,12 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"S'utilitza l'ordre FOR per a executar un ordre per cada un d'un conjunt de\n" +"S'utilitza l'ordre FOR per a executar una ordre per cada un d'un conjunt de\n" "fitxers.\n" "\n" "Ús: FOR %variable IN (conjunt) DO ordre\n" "\n" -"S'ha de doblar el signe % quan s'utilitza FOR en un fitxer batch.\n" +"S'ha de doblar el signe % quan s'utilitza FOR en un fitxer BAT.\n" #: cmd.rc:97 msgid "" @@ -10310,13 +10238,13 @@ msgid "" "GOTO has no effect when used interactively.\n" msgstr "" "L'ordre GOTO transfereix l'execució a una altra declaració en un fitxer\n" -"batch.\n" +"BAT.\n" "\n" "L'etiqueta que és la destinació d'un GOTO pot ser de fins a 255 caràcters\n" "de longitud però no pot incloure espais (això és diferent d'altres sistemes\n" -"operatius). Si dos o més etiquetes idèntiques existeixen en un fitxer\n" -"batch, el primer sempre s'executarà. Intentar fer GOTO a una etiqueta no\n" -"existent termina l'execució del fitxer batch.\n" +"operatius). Si dos o més etiquetes idèntiques existeixen en un fitxer BAT,\n" +"el primer sempre s'executarà. Intentar fer GOTO a una etiqueta no existent\n" +"termina l'execució del fitxer BAT.\n" "\n" "GOTO no té cap efecte quan s'utilitza de forma interactiva.\n" @@ -10339,11 +10267,11 @@ msgid "" "In the second form of the command, string1 and string2 must be in double\n" "quotes. The comparison is not case-sensitive.\n" msgstr "" -"S'utilitza IF per a executar condicionalment un ordre.\n" +"S'utilitza IF per a executar condicionalment una ordre.\n" "\n" "Sintaxi: IF [NOT] EXIST nom_de_fitxer ordre\n" " IF [NOT] cadena1==cadena2 ordre\n" -" IF [NOT] ERRORLEVEL nombre ordre\n" +" IF [NOT] ERRORLEVEL número ordre\n" "\n" "En la segona forma de la comanda, cadena1 i cadena2 han de ser entre\n" "cometes dobles. La comparació no distingeix entre majúscules i minúscules.\n" @@ -10417,11 +10345,11 @@ msgid "" "It is mainly useful in batch files to allow the user to read the output of\n" "a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE mostra un missatge en la pantalla demanant que l'usuari premi una " +"PAUSE mostra un missatge en la pantalla demanant que l'usuari premi una\n" "tecla.\n" "\n" -"És principalment útil en els fitxers batch per a permetre que l'usuari\n" -"llegeixi la sortida d'un ordre anterior abans que es desplaci fora de la\n" +"És principalment útil en els fitxers BAT per a permetre que l'usuari\n" +"llegeixi la sortida d'una ordre anterior abans que es desplaci fora de la\n" "pantalla.\n" #: cmd.rc:169 @@ -10446,7 +10374,7 @@ msgid "" "The prompt can also be changed by altering the PROMPT environment variable,\n" "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgstr "" -"PROMPT defineix l'indicador de la línia d'ordre.\n" +"PROMPT defineix l'indicador de la línia d'ordres.\n" "\n" "La cadena que segueix l'ordre PROMPT (i l'espai immediatament després)\n" "apareix al principi de la línia quan cmd està esperant l'entrada.\n" @@ -10474,7 +10402,7 @@ msgid "" "and can therefore be used as a comment in a batch file.\n" msgstr "" "Una línia d'ordres que comença amb REM (seguit per un espai) no realitza\n" -"cap acció, i per tant es pot utilitzar com a comentari en un fitxer batch.\n" +"cap acció, i per tant es pot utilitzar com a comentari en un fitxer BAT.\n" #: cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" @@ -10535,9 +10463,9 @@ msgid "" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" "called from the command line.\n" msgstr "" -"S'utilitza SHIFT en un fitxer batch per a eliminar un paràmetre del cap de\n" -"la llista, de manera que el paràmetre 2 es converteix en el paràmetre 1,\n" -"etc. No té cap efecte si es truca des de la línia d'ordres.\n" +"S'utilitza SHIFT en un fitxer BAT per a eliminar un paràmetre del cap de la\n" +"llista, de manera que el paràmetre 2 es converteix en el paràmetre 1, etc.\n" +"No té cap efecte si es truca des de la línia d'ordres.\n" #: cmd.rc:212 start.rc:56 msgid "" @@ -10596,7 +10524,7 @@ msgstr "" " el seu codi de sortida.\n" "/unix Utilitza un nom de fitxer d'Unix i inicia el fitxer com\n" " el Windows Explorer.\n" -"/ProgIDOpen Obre un document utilitzant la progID especificada.\n" +"/ProgIDOpen Obre un document utilitzant el progID especificat.\n" "/? Mostra aquesta ajuda i surt.\n" #: cmd.rc:237 @@ -10648,7 +10576,7 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" msgstr "" -"ENDLOCAL acaba la localització de canvis d'entorn en un fitxer batch, els\n" +"ENDLOCAL acaba la localització de canvis d'entorn en un fitxer BAT, els\n" "quals un SETLOCAL anterior ha introduït.\n" #: cmd.rc:271 @@ -10660,12 +10588,12 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" -"SETLOCAL comença la localització de canvis en l'entorn en un fitxer batch.\n" +"SETLOCAL comença la localització de canvis d'entorn en un fitxer BAT.\n" "\n" -"Els canvis d'entorn fets després d'un SETLOCAL són locals al fitxer batch,\n" -"i es conserven fins que es trobi la següent ENDLOCAL (o al final del\n" -"fitxer, el que passi primer), al qual punt la configuració de l'entorn\n" -"anterior es restaura.\n" +"Els canvis d'entorn fets després d'un SETLOCAL són locals al fitxer BAT, i\n" +"es conserven fins que es trobi la següent ENDLOCAL (o al final del fitxer,\n" +"el que passi primer), al qual punt la configuració d'entorn anterior es\n" +"restaura.\n" #: cmd.rc:275 msgid "" @@ -10712,7 +10640,7 @@ msgid "" "Specifying no open command after the equal sign removes the command string\n" "associated to the specified file type.\n" msgstr "" -"FTYPE mostra o modifica els ordres d'obertura associats amb els tipus de\n" +"FTYPE mostra o modifica les ordres d'obertura associats amb els tipus de\n" "fitxers.\n" "\n" "Sintaxi: FTYPE [tipusDeFitxer[=[ordreDeObertura]]]\n" @@ -10738,7 +10666,7 @@ msgstr "" "CHOICE mostra un text i espera fins que l'usuari premi una tecla permesa\n" "d'una llista seleccionable.\n" "CHOICE s'utilitza principalment per a construir un menú de selecció en un\n" -"fitxer batch.\n" +"fitxer BAT.\n" #: cmd.rc:324 msgid "" @@ -10753,6 +10681,14 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Sintaxi: MKLINK [opcions] nom_d'enllaç destinació\n" +"\n" +"Opcions:\n" +"/d Crea un enllaç simbòlic de directori\n" +"/h Crea un enllaç dur.\n" +"/j Crea una intersecció de directori.\n" +"nom_d'enllaç és el nom de l'enllaç simbòlic nou.\n" +"destinació és el camí al qual nom_d'enllaç assenyala.\n" #: cmd.rc:312 msgid "" @@ -10763,47 +10699,6 @@ msgstr "" "des del qual heu invocat cmd.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10845,10 +10740,10 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"Els ordres integrats de CMD són:\n" +"Les ordres integrades de CMD són:\n" "ASSOC\t\tMostra o modifica les associacions d'extensió de fitxer\n" "ATTRIB\t\tMostra o canvia els atributs de fitxer de DOS\n" -"CALL\t\tInvoca un fitxer batch des de dins altre\n" +"CALL\t\tInvoca un fitxer BAT des de dins altre\n" "CD (CHDIR)\tCanvia el directori per defecte actual\n" "CHOICE\t\tEspera una pulsació de tecla d'una llista seleccionable\n" "CLS\t\tEsborra la pantalla de consola\n" @@ -10858,29 +10753,30 @@ msgstr "" "DEL (ERASE)\tSuprimeix un fitxer o conjunt de fitxers\n" "DIR\t\tMostra el contingut d'un directori\n" "ECHO\t\tCopia text directament a la sortida de la consola\n" -"ENDLOCAL\tAcaba la localització de canvis en l'entorn en un fitxer batch\n" +"ENDLOCAL\tAcaba la localització de canvis d'entorn en un fitxer BAT\n" "FTYPE\t\tMostra o modifica els ordres d'obertura associats amb els tipus\n" "\t\tde fitxer\n" "HELP\t\tMostra detalls breus sobre un tema\n" "MD (MKDIR)\tCrea un subdirectori\n" +"MKLINK\tCrea un enllaç simbòlic\n" "MORE\t\tMostra la sortida en pàgines\n" "MOVE\t\tDesplaça un fitxer, conjunt de fitxers o arbre de directori\n" "PATH\t\tEstableix o mostra el camí de cerca\n" -"PAUSE\t\tSuspèn l'execució d'un fitxer batch\n" +"PAUSE\t\tSuspèn l'execució d'un fitxer BAT\n" "POPD\t\tRestaura el directori a l'últim desat amb la PUSHD\n" "PROMPT\t\tCanvia l'indicador d'ordres\n" "PUSHD\t\tCanvia a un directori nou, desant l'actual\n" "REN (RENAME)\tCanvia el nom d'un fitxer\n" "RD (RMDIR)\tSuprimeix un subdirectori\n" "SET\t\tEstableix o mostra les variables d'entorn\n" -"SETLOCAL\tComença la localització de canvis en l'entorn en un fitxer batch\n" +"SETLOCAL\tComença la localització de canvis d'entorn en un fitxer BAT\n" "START\t\tInicia un programa o obrir un document en el programa associat\n" "TIME\t\tEstableix o mostra l'hora de sistema actual\n" "TITLE\t\tEstableix el títol de finestra de la sessió CMD\n" "TYPE\t\tBolca el contingut d'un fitxer de text\n" "VER\t\tMostra la versió actual del CMD\n" "VOL\t\tMostra l'etiqueta de volum d'un dispositiu de disc\n" -"XCOPY\t\tCopia fitxers fonts o arbres de directori a una destinació\n" +"XCOPY\t\tCopia fitxers o arbres de directori a una destinació\n" "EXIT\t\tTanca el CMD\n" "\n" "Introduïu HELP <ordre> per més informació sobre qualsevulla de les ordres\n" @@ -10888,7 +10784,7 @@ msgstr "" #: cmd.rc:365 msgid "Are you sure?" -msgstr "Esteu segur?" +msgstr "N'esteu segur?" #: cmd.rc:366 reg.rc:50 xcopy.rc:43 msgctxt "Yes key" @@ -10906,7 +10802,7 @@ msgstr "Manca una associació de fitxer per a l'extensió %1\n" #: cmd.rc:369 msgid "No open command associated with file type '%1'\n" -msgstr "No hi ha cap ordre d'obertura associat amb el tipus de fitxer '%1'\n" +msgstr "No hi ha cap ordre d'obertura associada amb el tipus de fitxer '%1'\n" #: cmd.rc:370 msgid "Overwrite %1?" @@ -10919,12 +10815,12 @@ msgstr "Més..." #: cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" msgstr "" -"Hi ha hagut una línia possiblement truncada en el processament batch.\n" +"Hi ha hagut una línia possiblement truncada en el processament BAT.\n" "S'està utilitzant:\n" #: cmd.rc:374 msgid "Argument missing\n" -msgstr "Manca un paràmetre\n" +msgstr "Manca un argument\n" #: cmd.rc:375 msgid "Syntax error\n" @@ -10964,7 +10860,7 @@ msgstr "S'ha fallat en obrir '%1'\n" #: cmd.rc:385 msgid "Cannot call batch label outside of a batch script\n" -msgstr "No es pot trucar a una etiqueta de batch fora d'un script batch\n" +msgstr "No es pot trucar a una etiqueta BAT fora d'un script BAT\n" #: cmd.rc:386 xcopy.rc:45 msgctxt "All key" @@ -11047,7 +10943,7 @@ msgstr " (Sí|No|Tots)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" -"No es pot reconèixer '%1' com a ordre intern ni extern, ni script batch.\n" +"No es pot reconèixer '%1' com a ordre interna ni externa, ni script BAT.\n" #: cmd.rc:405 msgid "Division by zero error.\n" @@ -11100,7 +10996,7 @@ msgstr "Ús: hostname\n" #: hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "Error: L'opció '%c' és invàlida.\n" +msgstr "Error: L'opció '%c' no és vàlida.\n" #: hostname.rc:32 msgid "" @@ -11117,8 +11013,8 @@ msgstr "Ús: ipconfig [ /? | /all ]\n" #: ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" -"Error: S'han especificat paràmetres de línia d'ordres desconeguts o " -"invàlids\n" +"Error: S'han especificat paràmetres de línia d'ordres desconeguts o no " +"vàlids\n" #: ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -11194,9 +11090,9 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" -"NET ordre [paràmetres]\n" +"NET ordre [arguments]\n" " -o-\n" "NET ordre /HELP\n" "\n" @@ -11211,7 +11107,7 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" "NET START [servei]\n" "\n" @@ -11226,7 +11122,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"La sintaxi d'aquest ordre és:\n" +"La sintaxi d'aquesta ordre és:\n" "\n" "NET STOP servei\n" "\n" @@ -11666,7 +11562,7 @@ msgstr "" #: oleview.rc:32 msgid "&Bind to file..." -msgstr "&Lligar a fitxer..." +msgstr "&Vincula a fitxer..." #: oleview.rc:33 msgid "&View TypeLib..." @@ -11838,7 +11734,7 @@ msgstr "Fitxers TypeLib (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: oleview.rc:105 msgid "Bind to file via a File Moniker" -msgstr "Lliga a fitxer a través d'un File Moniker" +msgstr "Vincula a un fitxer a través d'un File Moniker" #: oleview.rc:106 msgid "Open a TypeLib file and view the contents" @@ -11870,7 +11766,7 @@ msgstr "Lliura la instància d'objecte actualment seleccionada" #: oleview.rc:113 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "Copia la GUID de l'element actualment seleccionat al porta-retalls" +msgstr "Copia el GUID de l'element actualment seleccionat al porta-retalls" #: oleview.rc:114 msgid "Display the viewer for the selected item" @@ -11901,7 +11797,7 @@ msgstr "Actualitza totes les llistes" #: oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" @@ -12213,17 +12109,6 @@ msgid "Icons (*.ico)" msgstr "Icones (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12239,7 +12124,7 @@ msgstr "" " REG [operació] [paràmetres]\n" "\n" "Operacions admeses:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Per ajuda sobre una operació específica, teclegeu:\n" " REG [operació] /?\n" @@ -12267,11 +12152,11 @@ msgstr "L'operació s'ha acabat amb èxit\n" #: reg.rc:40 msgid "reg: Invalid key name\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "reg: Nom de clau no vàlid\n" #: reg.rc:41 msgid "reg: Invalid command line parameters\n" -msgstr "reg: Paràmetres de línia d'ordres invàlids\n" +msgstr "reg: Paràmetres de línia d'ordres no vàlids\n" #: reg.rc:42 msgid "reg: Unable to access remote machine\n" @@ -12350,11 +12235,11 @@ msgstr "S'ha completat la cerca. Nombre de coincidències trobades: %1!d!\n" #: reg.rc:61 msgid "reg: Invalid syntax. " -msgstr "reg: La sintaxi és invàlida. " +msgstr "reg: La sintaxi no és vàlida. " #: reg.rc:62 msgid "reg: Invalid option [%1]. " -msgstr "reg: L'opció [%1] és invàlida. " +msgstr "reg: L'opció [%1] no és vàlida. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" @@ -12370,43 +12255,31 @@ msgstr "(valor no definit)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT fitxer.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: No s'ha trobat el fitxer '%1'.\n" +msgstr "reg: No s'ha trobat el fitxer '%1'.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "reg: No s'ha pogut obrir la clau de registre '%1'.\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Seqüència d'escapada no reconeguda [\\%1!c!]\n" +msgstr "reg: Seqüència d'escapada no reconeguda [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY nom_de_clau [/v nom_de_valor | /ve] [/s]\n" +msgstr "REG EXPORT nom_de_clau fitxer.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid system key [%1]\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "reg: Nom de clau de sistema no vàlid [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "El valor de registre '%1' ja existeix. El voleu sobreescriure?" +msgstr "El fitxer '%1' ja existeix. El voleu sobreescriure?" #: regedit.rc:34 msgid "&Registry" @@ -12477,17 +12350,12 @@ msgid "&About Registry Editor" msgstr "&Quant a l'Editor de Registre" #: regedit.rc:89 regedit.rc:96 regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "expandit" +msgstr "Expandeix" #: regedit.rc:134 regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Modifica dades binàries..." +msgstr "Modifica dades &binàries..." #: regedit.rc:267 msgid "Export registry" @@ -12586,14 +12454,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Conté ordres per a accedir a les claus freqüentment utilitzades" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Conté ordres per a mostrar ajuda i informació quant a l'editor de registre" +"Conté ordres per a mostrar Ajuda i informació quant a l'Editor de Registre" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -12632,101 +12496,58 @@ msgid "(unknown %d)" msgstr "(desconegut %d)" #: regedit.rc:247 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut modificar el valor de registre seleccionat." #: regedit.rc:248 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut crear una clau de registre nova." #: regedit.rc:249 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut crear un valor de registre nou." #: regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"No es pot canviar el nom de la clau '%1'.\n" +"El nom de clau especificat ja existeix." #: regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"No s'ha pogut canviar el nom del valor '%1'.\n" +"El nom de valor especificat ja existeix." #: regedit.rc:252 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut suprimir la clau de registre seleccionada." #: regedit.rc:253 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut canviar el nom de la clau de registre seleccionada." #: regedit.rc:254 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut canviar el nom del valor de registre seleccionat." #: regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." msgstr "" +"Les claus i els valors continguts en %1 s'han afegit al registre amb èxit." #: regedit.rc:256 -#, fuzzy -#| msgid "" -#| "regedit: Unable to export '%1'. The specified registry key was not " -#| "found.\n" msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"regedit: No s'ha pogut exportar '%1'. No s'ha trobat la clau de registre " -"especificada.\n" +"No s'ha pogut importar %1. El fitxer especificat no és un fitxer de registre " +"vàlid." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12782,11 +12603,11 @@ msgstr "" "Exemples d'ús:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Camí\\de\\clau\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit: Commutador invàlid o no reconegut [%1]\n" +msgstr "regedit: Commutador no vàlid o no reconegut [%1]\n" #: regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -12818,7 +12639,7 @@ msgstr "regedit: No resta memòria! (%1!S!, línia %2!u!)\n" #: regedit.rc:417 msgid "regedit: Invalid hexadecimal value.\n" -msgstr "regedit: El valor hexadecimal és invàlid.\n" +msgstr "regedit: El valor hexadecimal no és vàlid.\n" #: regedit.rc:418 msgid "" @@ -12826,17 +12647,15 @@ msgid "" "encountered at '%1'.\n" msgstr "" "regedit: No s'ha pogut convertir les dades hexadecimals. S'ha trobat un " -"valor invàlid a '%1'.\n" +"valor no vàlid a '%1'.\n" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Seqüència d'escapada no reconeguda [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Tipus de dades de registre incompatible [%1]\n" +msgstr "regedit: Tipus de dades de registre incompatible [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12855,12 +12674,10 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"regedit: S'ha trobat un tipus de dades de registre incompatible [%1] en " +"regedit: S'ha trobat un tipus de dades de registre incompatible [0x%1!x!] en " "'%2'.\n" #: regedit.rc:426 @@ -12868,10 +12685,8 @@ msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "regedit: El valor de registre '%1' s'exportarà com a dades binàries.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Nom de clau invàlid\n" +msgstr "regedit: Clau de sistema no vàlida [%1]\n" #: regedit.rc:428 msgid "" @@ -12881,22 +12696,16 @@ msgstr "" "especificada.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: No s'ha pogut suprimir la classe de registre '%1'.\n" +msgstr "regedit: No s'ha pogut suprimir la clau de registre '%1'.\n" #: regedit.rc:431 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: No s'ha reconegut la línia '%1'.\n" +msgstr "regedit: La línia conté sintaxi no vàlida.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Tanca l'editor de registre" +msgstr "Tanca l'Editor de Registre" #: regedit.rc:188 msgid "Adds keys to the favorites list" @@ -12911,8 +12720,6 @@ msgid "Shows or hides the status bar" msgstr "Mostra o amaga la barra d'estat" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Canvia la posició de la divisió entre dos panells" @@ -12957,10 +12764,8 @@ msgid "Adds a new binary value" msgstr "Afegeix un valor binari nou" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Afegeix un valor binari nou" +msgstr "Afegeix un valor nou de 32 bits" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12975,42 +12780,32 @@ msgid "Prints all or part of the registry" msgstr "Imprimeix tot o part del registre" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Editor de Registre" +msgstr "Obre l'Ajuda de l'Editor de Registre" #: regedit.rc:182 msgid "Displays program information, version number and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: regedit.rc:206 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut consultar el valor de registre '%1'." #: regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "No es pot editar les claus d'aquest tipus (%u)" +msgstr "No es pot editar les claus d'aquest tipus (%1!u!)." #: regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "El valor és massa gran (%u)" +msgstr "El valor és massa gran (%1!u!)." #: regedit.rc:209 msgid "Confirm Value Delete" msgstr "Confirmar eliminació de valor" #: regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Cadena de cerca '%s' no trobada" +msgstr "S'ha acabat la cerca. No s'ha trobat la cadena '%1'." #: regedit.rc:211 msgid "Are you sure you want to delete these values?" @@ -13025,56 +12820,43 @@ msgid "New Value #%d" msgstr "Valor nou #%d" #: regedit.rc:205 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "No s'ha pogut consultar la clau de registre '%1'." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Modifica les dades del valor" +msgstr "Modifica les dades del valor en forma binària" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Afegeix un valor de cadena múltiple nou" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Exporta la branca seleccionada del registre a un fitxer de text" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Afegeix un valor de cadena nou" +msgstr "Afegeix un valor nou de cadena expansible" #: regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Confirmar eliminació de valor" +msgstr "Confirmar eliminació de clau" #: regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Esteu segur que voleu suprimir la clau de registre '%1'?" +msgstr "" +"Esteu segur que voleu suprimir aquesta clau de registre i totes les seves " +"subclaus?" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Expandeix o col·lapsa el node seleccionat" #: regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "col·lapsat" +msgstr "Col·lapsa" #: regsvr32.rc:32 msgid "" @@ -13107,11 +12889,11 @@ msgstr "" "Options:\n" " [/u] Desregistra un servidor.\n" " [/s] Mode silent (no es mostrarà cap missatge).\n" -" [/i] Truca DllInstall, passant una [línia d'ordres] opcional.\n" -"\tQuan s'utilitza amb [/u], es truca DllInstall en el mode de " -"desinstal·lació.\n" -" [/n] No truquis DllRegisterServer. S'ha d'utilitzar aquesta opció amb [/" -"i].\n" +" [/i] Truca a DllInstall, passant una [línia d'ordres] opcional.\n" +"\tQuan s'utilitza amb [/u], es truca a DllInstall en el mode de\n" +"\tdesinstal·lació.\n" +" [/n] No truquis a DllRegisterServer. S'ha d'utilitzar aquesta opció amb\n" +"\t[/i].\n" "\n" #: regsvr32.rc:41 @@ -13119,7 +12901,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: Commutador invàlid o no reconegut [%1]\n" +"regsvr32: Commutador no vàlid o no reconegut [%1]\n" "\n" #: regsvr32.rc:42 @@ -13185,11 +12967,12 @@ msgstr "Ús: taskkill [/?] [/f] [/im NomDeProcés | /pid IdDeProcés]\n" #: taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" msgstr "" -"Error: S'ha especificat una opció de línia d'ordres invàlida o desconeguda.\n" +"Error: S'ha especificat una opció de línia d'ordres no vàlida o " +"desconeguda.\n" #: taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "Error: S'ha especificat un paràmetre de línia d'ordres invàlid.\n" +msgstr "Error: S'ha especificat un paràmetre de línia d'ordres no vàlid.\n" #: taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" @@ -13799,7 +13582,7 @@ msgstr "Mostra temes d'ajuda de l'Administrador de Tasques" #: taskmgr.rc:212 msgid "Displays program information, version number, and copyright" -msgstr "Mostra informació de programa, nombre de versió i drets d'autor" +msgstr "Mostra informació de programa, número de versió i drets d'autor" #: taskmgr.rc:213 msgid "Exits the Task Manager application" @@ -14021,7 +13804,7 @@ msgstr "El procés ha de tenir afinitat amb almenys un processador" #: taskmgr.rc:316 msgid "Invalid Option" -msgstr "Opció invàlida" +msgstr "Opció no vàlida" #: taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" @@ -14054,22 +13837,21 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "L'execució de l'ordre de desinstal·lació '%s' ha fallat, potser perquè " -"l'executable manqui.\n" +"manqui l'executable.\n" "Voleu eliminar l'entrada de desinstal·lació del registre?" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "desinstal·lador: No s'ha trobat l'aplicació amb la GUID '%1'\n" +msgstr "desinstal·lador: No s'ha trobat l'aplicació amb el GUID '%1'\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" -msgstr "" -"desinstal·lador: Una GUID d'aplicació ha de seguir l'opció '--remove'\n" +msgstr "desinstal·lador: Un GUID d'aplicació ha de seguir l'opció '--remove'\n" #: uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "desinstal·lador: Opció invàlida [%1]\n" +msgstr "desinstal·lador: Opció no vàlida [%1]\n" #: uninstaller.rc:35 msgid "" @@ -14312,7 +14094,7 @@ msgstr "A&fegeix..." #: winecfg.rc:238 msgid "Aut&odetect" -msgstr "Autodetecta" +msgstr "Aut&odetecta" #: winecfg.rc:241 msgid "&Path:" @@ -14902,7 +14684,7 @@ msgstr "wineconsole: No s'ha pogut processar l'id del esdeveniment\n" #: wineconsole.rc:45 msgid "wineconsole: Invalid backend\n" -msgstr "wineconsole: Backend invàlid\n" +msgstr "wineconsole: Rerefons no vàlid\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" @@ -14918,7 +14700,7 @@ msgid "" "The command is invalid.\n" msgstr "" "wineconsole: L'inici del programa %s ha fallat.\n" -"L'ordre és invàlid.\n" +"L'ordre no és vàlida.\n" #: wineconsole.rc:50 msgid "" @@ -15014,7 +14796,7 @@ msgstr "Caiguda de programa del Wine" #: winedbg.rc:39 msgid "Internal errors - invalid parameters received" -msgstr "Errors interns - paràmetres invàlids rebuts" +msgstr "Errors interns - paràmetres no vàlids rebuts" #: winedbg.rc:40 msgid "(unidentified)" @@ -15290,10 +15072,8 @@ msgid "Expert" msgstr "Expert" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Resultat" +msgstr "Reinicia els resultats" #: winemine.rc:80 msgid "Congratulations!" @@ -15321,7 +15101,7 @@ msgstr "Mines" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Es perdran tots els resultats. N'esteu segur?" #: winemine.rc:30 msgid "WineMine" @@ -15437,11 +15217,11 @@ msgstr "Error: Àlies no trobat\n" #: wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "Error: Cerca invàlida\n" +msgstr "Error: Consulta no vàlida\n" #: wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "Error: Sintaxi invàlida per a PATH\n" +msgstr "Error: Sintaxi no vàlida per a PATH\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -15633,7 +15413,7 @@ msgstr "&Cap ajust de línia" #: wordpad.rc:269 msgid "Wrap text by the &window border" -msgstr "Ajusta el text pela vora de la &finestra" +msgstr "Ajusta el text per la vora de la &finestra" #: wordpad.rc:270 msgid "Wrap text by the &margin" @@ -15801,7 +15581,7 @@ msgstr "" #: wordpad.rc:198 msgid "Invalid number format." -msgstr "El format de nombre és invàlid." +msgstr "El format de nombre no és vàlid." #: wordpad.rc:199 msgid "OLE storage documents are not supported." @@ -15837,11 +15617,11 @@ msgstr "L'inici del Wordpad ha fallat" #: xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "Nombre de paràmetres invàlid - Utilitzeu xcopy /? per ajuda\n" +msgstr "Nombre de paràmetres no vàlid - Utilitzeu xcopy /? per ajuda\n" #: xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Paràmetre invàlid '%1' - Utilitzeu xcopy /? per ajuda\n" +msgstr "Paràmetre no vàlid '%1' - Utilitzeu xcopy /? per ajuda\n" #: xcopy.rc:32 msgid "Press <Enter> to begin copying\n" @@ -15939,7 +15719,7 @@ msgstr "" "[/S] Copia els directoris i subdirectoris.\n" "[/E] Copia els directoris i subdirectoris, incloent-hi els buits.\n" "[/Q] No mostris els noms durant la còpia, és a dir, sigues silent.\n" -"[/F] Mostra els noms complets de la font i el destinatari durant la còpia.\n" +"[/F] Mostra els noms complets de la font i la destinació durant la còpia.\n" "[/L] Simula l'operació, mostrant els noms que es copiarien.\n" "[/W] Pregunta abans de començar l'operació de còpia.\n" "[/T] Crea una estructura de directoris buits però no copiïs els fitxers.\n" -- 2.15.1

1 2

[PATCH 1/2] testbot: Re-save the database diagram with the current dia.
by Francois Gouget 18 Dec '17

18 Dec '17

The goal is to minimize the diff in coming changes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/winetestbot-schema.dia | 1082 ++++++++++++++++++++++-------------- 1 file changed, 657 insertions(+), 425 deletions(-) diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 056412c3..de91f9aa 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2,10 +2,10 @@ <dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/"> <dia:diagramdata> <dia:attribute name="background"> - <dia:color val="#ffffff"/> + <dia:color val="#ffffffff"/> </dia:attribute> <dia:attribute name="pagebreak"> - <dia:color val="#000099"/> + <dia:color val="#000099ff"/> </dia:attribute> <dia:attribute name="paper"> <dia:composite type="paper"> @@ -37,6 +37,9 @@ </dia:attribute> <dia:attribute name="grid"> <dia:composite type="grid"> + <dia:attribute name="dynamic"> + <dia:boolean val="true"/> + </dia:attribute> <dia:attribute name="width_x"> <dia:real val="1"/> </dia:attribute> @@ -53,7 +56,7 @@ </dia:composite> </dia:attribute> <dia:attribute name="color"> - <dia:color val="#d8e5e5"/> + <dia:color val="#d8e5e5ff"/> </dia:attribute> <dia:attribute name="guides"> <dia:composite type="guides"> @@ -61,8 +64,27 @@ <dia:attribute name="vguides"/> </dia:composite> </dia:attribute> + <dia:attribute name="display"> + <dia:composite type="display"> + <dia:attribute name="antialiased"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="snap-to-grid"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="snap-to-object"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="show-grid"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="show-connection-points"> + <dia:boolean val="true"/> + </dia:attribute> + </dia:composite> + </dia:attribute> </dia:diagramdata> - <dia:layer name="Background" visible="true" active="true"> + <dia:layer name="Background" visible="true" connectable="true" active="true"> <dia:object type="Database - Table" version="0" id="O0"> <dia:attribute name="obj_pos"> <dia:point val="-4.3875,-24.05"/> @@ -82,18 +104,6 @@ <dia:attribute name="elem_height"> <dia:real val="6.2000000000000002"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Users#</dia:string> </dia:attribute> @@ -103,33 +113,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -150,6 +142,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -170,6 +165,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -190,6 +188,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -210,6 +211,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -230,6 +234,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -250,8 +257,41 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O1"> <dia:attribute name="obj_pos"> @@ -272,18 +312,6 @@ <dia:attribute name="elem_height"> <dia:real val="3.7999999999999998"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Sessions#</dia:string> </dia:attribute> @@ -293,33 +321,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -340,6 +350,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -360,6 +373,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -380,8 +396,41 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O2"> <dia:attribute name="obj_pos"> @@ -402,18 +451,6 @@ <dia:attribute name="elem_height"> <dia:real val="3"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#UserRoles#</dia:string> </dia:attribute> @@ -423,33 +460,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -470,6 +489,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -490,8 +512,41 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O3"> <dia:attribute name="obj_pos"> @@ -512,18 +567,6 @@ <dia:attribute name="elem_height"> <dia:real val="3"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Roles#</dia:string> </dia:attribute> @@ -533,33 +576,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -580,6 +605,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -600,15 +628,48 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Reference" version="0" id="O4"> <dia:attribute name="obj_pos"> <dia:point val="-7.87083,-21.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-7.87083,-23;-4.3875,-21.5"/> + <dia:rectangle val="-7.92083,-23;-4.3375,-21.45"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -628,10 +689,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -668,7 +729,7 @@ <dia:point val="4.6125,-22.35"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.6125,-23;11.0458,-22.3334"/> + <dia:rectangle val="4.5625,-23;11.0958,-22.2834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -688,10 +749,10 @@ <dia:boolean val="true"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -728,7 +789,7 @@ <dia:point val="19.6608,-21.5334"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.6608,-22.2;25.3958,-21.5334"/> + <dia:rectangle val="19.6108,-22.2;25.4458,-21.4834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -748,10 +809,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -802,18 +863,6 @@ <dia:attribute name="elem_height"> <dia:real val="3"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Branches#</dia:string> </dia:attribute> @@ -823,33 +872,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -870,6 +901,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -890,15 +924,48 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O8"> <dia:attribute name="obj_pos"> <dia:point val="-16.4708,-2.55002"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-16.4708,-2.55002;-5.9308,5.24998"/> + <dia:rectangle val="-16.4708,-2.55002;-5.9308,6.04998"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -910,19 +977,7 @@ <dia:real val="10.539999999999999"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="7.7999999999999998"/> - </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> + <dia:real val="8.5999999999999996"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#Patches#</dia:string> @@ -933,33 +988,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -980,6 +1017,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1000,6 +1040,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1020,6 +1063,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1040,6 +1086,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1060,6 +1109,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1080,6 +1132,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1100,6 +1155,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1148,6 +1206,36 @@ </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O9"> <dia:attribute name="obj_pos"> @@ -1168,18 +1256,6 @@ <dia:attribute name="elem_height"> <dia:real val="9.3999999999999986"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Jobs#</dia:string> </dia:attribute> @@ -1189,33 +1265,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1236,6 +1294,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1256,6 +1317,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1276,6 +1340,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1296,6 +1363,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1316,6 +1386,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1336,6 +1409,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1356,6 +1432,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1376,6 +1455,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1396,6 +1478,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1416,8 +1501,41 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O10"> <dia:attribute name="obj_pos"> @@ -1438,18 +1556,6 @@ <dia:attribute name="elem_height"> <dia:real val="4.6000000000000005"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#PendingPatches#</dia:string> </dia:attribute> @@ -1459,33 +1565,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1506,6 +1594,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1526,6 +1617,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1546,6 +1640,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1566,8 +1663,41 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O11"> <dia:attribute name="obj_pos"> @@ -1588,18 +1718,6 @@ <dia:attribute name="elem_height"> <dia:real val="8.5999999999999996"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Steps#</dia:string> </dia:attribute> @@ -1609,33 +1727,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1656,6 +1756,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1676,6 +1779,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1696,6 +1802,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1716,6 +1825,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1736,6 +1848,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1756,6 +1871,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1776,6 +1894,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1796,6 +1917,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1816,8 +1940,41 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O12"> <dia:attribute name="obj_pos"> @@ -1838,18 +1995,6 @@ <dia:attribute name="elem_height"> <dia:real val="10.199999999999999"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#Tasks#</dia:string> </dia:attribute> @@ -1859,33 +2004,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1906,6 +2033,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1926,6 +2056,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1946,6 +2079,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1966,6 +2102,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -1986,6 +2125,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2006,6 +2148,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2026,6 +2171,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2046,6 +2194,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2066,6 +2217,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2086,6 +2240,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2106,15 +2263,48 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Table" version="0" id="O13"> <dia:attribute name="obj_pos"> <dia:point val="25.6708,-2.02919"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.6708,-2.02919;36.2108,8.17081"/> + <dia:rectangle val="25.6708,-2.02919;36.2108,8.97081"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2126,19 +2316,7 @@ <dia:real val="10.539999999999999"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="10.199999999999999"/> - </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> + <dia:real val="11"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#VMs#</dia:string> @@ -2149,33 +2327,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2196,6 +2356,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2216,6 +2379,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2236,6 +2402,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2256,6 +2425,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2276,6 +2448,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2296,6 +2471,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2316,6 +2494,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2336,6 +2517,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2356,6 +2540,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2376,6 +2563,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2396,6 +2586,9 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2416,15 +2609,48 @@ <dia:attribute name="unique"> <dia:boolean val="false"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> <dia:object type="Database - Reference" version="0" id="O14"> <dia:attribute name="obj_pos"> <dia:point val="-7.82083,-11.5667"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-7.82083,-12.2167;-4.57083,-11.5667"/> + <dia:rectangle val="-7.87083,-12.2167;-4.52083,-11.5167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2444,10 +2670,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2484,7 +2710,7 @@ <dia:point val="4.81417,-13.1667"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.81417,-13.8334;8.24583,-13.1667"/> + <dia:rectangle val="4.76417,-13.8334;8.29583,-13.1167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2504,10 +2730,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2544,7 +2770,7 @@ <dia:point val="22.2508,-12.3834"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="22.2508,-13.0334;25.4792,-12.3834"/> + <dia:rectangle val="22.2008,-13.0334;25.5292,-12.3334"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2564,10 +2790,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2604,7 +2830,7 @@ <dia:point val="36.0192,-9.98336"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="36.0192,-10.6334;37.6193,-0.32919"/> + <dia:rectangle val="35.9692,-10.6334;37.6693,-0.27919"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2624,10 +2850,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2664,7 +2890,7 @@ <dia:point val="0.1125,-17.85"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="0.1125,-17.85;1.48167,-14.8667"/> + <dia:rectangle val="0.0625,-17.9;1.48167,-14.8167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2684,10 +2910,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2724,7 +2950,7 @@ <dia:point val="-4.57083,-5.96669"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-18.2307,-6.61669;-4.57083,-0.85002"/> + <dia:rectangle val="-18.2807,-6.61669;-4.52083,-0.80002"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2744,10 +2970,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2784,7 +3010,7 @@ <dia:point val="-5.9308,-0.85002"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-5.9308,-1.50002;-2.65417,2.33331"/> + <dia:rectangle val="-5.9808,-1.50002;-2.60417,2.38331"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2804,10 +3030,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2844,7 +3070,7 @@ <dia:point val="12.5058,-0.06669"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12.5058,-0.71669;15.2693,-0.0500233"/> + <dia:rectangle val="12.4558,-0.71669;15.3193,-2.33e-05"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2864,10 +3090,10 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="text_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_colour"> - <dia:color val="#000000"/> + <dia:color val="#000000ff"/> </dia:attribute> <dia:attribute name="line_width"> <dia:real val="0.10000000000000001"/> @@ -2918,18 +3144,6 @@ <dia:attribute name="elem_height"> <dia:real val="3"/> </dia:attribute> - <dia:attribute name="text_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="line_colour"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="fill_colour"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="line_width"> - <dia:real val="0.10000000000000001"/> - </dia:attribute> <dia:attribute name="name"> <dia:string>#PendingPatchSets#</dia:string> </dia:attribute> @@ -2939,33 +3153,15 @@ <dia:attribute name="visible_comment"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="tagging_comment"> + <dia:attribute name="underline_primary_key"> <dia:boolean val="false"/> </dia:attribute> - <dia:attribute name="underline_primary_key"> + <dia:attribute name="tagging_comment"> <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="bold_primary_keys"> <dia:boolean val="true"/> </dia:attribute> - <dia:attribute name="normal_font"> - <dia:font family="monospace" style="0" name="Courier"/> - </dia:attribute> - <dia:attribute name="name_font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> - </dia:attribute> - <dia:attribute name="comment_font"> - <dia:font family="sans" style="8" name="Helvetica-Oblique"/> - </dia:attribute> - <dia:attribute name="normal_font_height"> - <dia:real val="0.80000000000000004"/> - </dia:attribute> - <dia:attribute name="name_font_height"> - <dia:real val="0.99999999999999989"/> - </dia:attribute> - <dia:attribute name="comment_font_height"> - <dia:real val="0.69999999999999996"/> - </dia:attribute> <dia:attribute name="attributes"> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -2986,6 +3182,9 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> @@ -3006,8 +3205,41 @@ <dia:attribute name="unique"> <dia:boolean val="true"/> </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> </dia:composite> </dia:attribute> + <dia:attribute name="normal_font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="name_font"> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> + </dia:attribute> + <dia:attribute name="comment_font"> + <dia:font family="sans" style="8" name="Helvetica-Oblique"/> + </dia:attribute> + <dia:attribute name="normal_font_height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="name_font_height"> + <dia:real val="0.99999999999999989"/> + </dia:attribute> + <dia:attribute name="comment_font_height"> + <dia:real val="0.69999999999999996"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000ff"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffffff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.10000000000000001"/> + </dia:attribute> </dia:object> </dia:layer> </dia:diagram> -- 2.15.1

1 1

[PATCH v2 1/4] krnl386.exe16: NE files which have an OS type of 0x00 (unknown) or linker
by Martin Payne 17 Dec '17

17 Dec '17

major version 4 must have their imported modules checked to determine whether they are Windows or OS/2 or Multitasking DOS 4 executables. Tested on Fedora 26 x86 --- dlls/krnl386.exe16/ne_module.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 14f8075166..e9009677d0 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -697,6 +697,46 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR ne_header->ne_enttab - ne_header->ne_imptab )) goto failed; pData += ne_header->ne_enttab - ne_header->ne_imptab; + /* If the linker version is 4.x or the executable type is unknown, it is necessary to check the import table for + known Windows and OS/2 libraries to determine whether it's a Windows executable. Executables with no module table + or which don't import known Windows or OS/2 libraries are also assumed to be Windows. */ + if (((ne_header->ne_ver == 0x04) || (ne_header->ne_exetyp == 0x00)) && pModule->ne_modtab) + { + /* Array of offsets into the imported names table where module names are located */ + WORD* module_table; + + /* Series of Pascal strings containing the module names */ + LPCSTR imported_names; + + int i; + BOOL importsDosCalls = FALSE; + BOOL importsKernel = FALSE; + + /* Get address of module table and imported names table from their offsets */ + module_table = (WORD*)(((BYTE*)pModule) + pModule->ne_modtab); + imported_names = (LPCSTR)(((BYTE*)pModule) + pModule->ne_imptab); + + /* Look for imports from DOSCALLS and KERNEL */ + for (i = 0; i < pModule->ne_cmod; i++) + { + /* Module name is a Pascal string with byte length prefix */ + LPCSTR module_name = imported_names + module_table[i]; + + if (!importsDosCalls && !strncmp("DOSCALLS", &module_name[1], module_name[0])) + importsDosCalls = TRUE; + + else if (!importsKernel && !strncmp("KERNEL", &module_name[1], module_name[0])) + importsKernel = TRUE; + + if (importsDosCalls && importsKernel) + break; + } + + /* If the module has imports from DOSCALLS but not KERNEL, assume it's for OS/2 or Multitasking DOS 4. */ + if (importsDosCalls && !importsKernel) + goto failed; + } + /* Load entry table, convert it to the optimized version used by Windows */ pModule->ne_enttab = pData - (BYTE *)pModule; -- 2.15.1.windows.2

3 6

[PATCH] krnl386.exe16: Improved support for early NE format executables.
by Martin Payne 15 Dec '17

15 Dec '17

* If OS type in NE header is 0x00 (unknown) or the linker version is 4.x, check for imports from DOSCALLS and KERNEL to distinguish between Windows and OS/2 or Multitasking DOS 4 executables. * Prevents DISCARDABLE segments from link4 4.x executables being loaded as 32 bit segments. * Assumes target Windows version is 1.01 if linker version is 4 or there is no expected version set in NE header. * Don't try to load NE files with OS type of Windows/386. Even Windows/386 doesn't recognise these as Windows executables. Tested on Fedora 26 x86 Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> --- dlls/krnl386.exe16/ne_module.c | 70 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 14f8075166..72043a90ff 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -597,11 +597,10 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR /* We now have a valid NE header */ - /* check to be able to fall back to loading OS/2 programs as DOS - * FIXME: should this check be reversed in order to be less strict? - * (only fail for OS/2 ne_exetyp 0x01 here?) */ + /* check to be able to fall back to loading OS/2 programs as DOS */ if ((ne_header->ne_exetyp != 0x02 /* Windows */) - && (ne_header->ne_exetyp != 0x04) /* Windows 386 */) + && (ne_header->ne_exetyp != 0x00 /* Unknown - possible early 1.x or 2.x app */) + && (ne_header->ne_ver == 0x04 /* link4 version 4.x has no ne_exetyp field - possible early 1.x app */)) return ERROR_BAD_FORMAT; size = sizeof(NE_MODULE) + @@ -649,6 +648,11 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR pModule->ne_flags &= ~(NE_FFLAGS_BUILTIN | NE_FFLAGS_WIN32); + /* The original NE spec (which link4 version 4.x follows) doesn't have an ne_expver field and reserves it for + future use. Other early executables have the version set to 0.0. Assume Windows 1.01 in either case. */ + if ((ne_header->ne_ver == 0x04) || (ne_header->ne_expver == 0x0000)) + pModule->ne_expver = 0x0101; + /* Get the segment table */ pModule->ne_segtab = pData - (BYTE *)pModule; @@ -658,6 +662,24 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR for (i = ne_header->ne_cseg; i > 0; i--, pSeg++) { memcpy( pData, pSeg, sizeof(*pSeg) ); + + /* The original NE spec (which link4 version 4.x follows) uses the top four bits of the segment flags to set a + discard priority (0 = not discardable, 15 = highest priority). Later specs repurpose the top three bits and + use a single bit for the discardable flag. The top three bits must be masked off and discardable flag set + appropriately, otherwise a discard priority could get misinterpreted as a 32 bit segment flag which results + in an application crash. */ + if (ne_header->ne_ver == 0x04) + { + WORD* seg_flags; + BOOL isDiscardable; + + seg_flags = (WORD*)(pData + FIELD_OFFSET(SEGTABLEENTRY, flags)); + isDiscardable = ((*seg_flags & 0xF000) > 0); + + if (isDiscardable) + *seg_flags = ((*seg_flags & 0x0FFF) | NE_SEGFLAGS_DISCARDABLE); + } + pData += sizeof(SEGTABLEENTRY); } @@ -697,6 +719,46 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR ne_header->ne_enttab - ne_header->ne_imptab )) goto failed; pData += ne_header->ne_enttab - ne_header->ne_imptab; + /* If the linker version is 4.x or the executable type is unknown, it is necessary to check the import table for + known Windows and OS/2 libraries to determine whether it's a Windows executable. Executables with no module table + or which don't import known Windows or OS/2 libraries are also assumed to be Windows. */ + if (((ne_header->ne_ver == 0x04) || (ne_header->ne_exetyp == 0x00)) && pModule->ne_modtab) + { + /* Array of offsets into the imported names table where module names are located */ + WORD* module_table; + + /* Series of Pascal strings containing the module names */ + LPCSTR imported_names; + + int i; + BOOL importsDosCalls = FALSE; + BOOL importsKernel = FALSE; + + /* Get address of module table and imported names table from their offsets */ + module_table = (WORD*)(((BYTE*)pModule) + pModule->ne_modtab); + imported_names = (LPCSTR)(((BYTE*)pModule) + pModule->ne_imptab); + + /* Look for imports from DOSCALLS and KERNEL */ + for (i = 0; i < pModule->ne_cmod; i++) + { + /* Module name is a Pascal string with byte length prefix */ + LPCSTR module_name = imported_names + module_table[i]; + + if (!importsDosCalls && !strncmp("DOSCALLS", &module_name[1], module_name[0])) + importsDosCalls = TRUE; + + else if (!importsKernel && !strncmp("KERNEL", &module_name[1], module_name[0])) + importsKernel = TRUE; + + if (importsDosCalls && importsKernel) + break; + } + + /* If the module has imports from DOSCALLS but not KERNEL, assume it's for OS/2 or Multitasking DOS 4. */ + if (importsDosCalls && !importsKernel) + goto failed; + } + /* Load entry table, convert it to the optimized version used by Windows */ pModule->ne_enttab = pData - (BYTE *)pModule; -- 2.15.1.windows.2

2 2

[v2 PATCH] d2d1/tests: A test to show that DC is validated on BindDC()
by Nikolay Sivov 15 Dec '17

15 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: change tracing format for color values. dlls/d2d1/tests/d2d1.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index af023a10d8..9bd9e2b19d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4813,7 +4813,7 @@ static void test_dc_target(void) ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc, 0, 0); - ok(clr == RGB(255, 0, 0), "Got color %#x\n", clr); + ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); hdc2 = CreateCompatibleDC(NULL); ok(hdc2 != NULL, "Failed to create an HDC.\n"); @@ -4824,7 +4824,7 @@ static void test_dc_target(void) ok(hr == S_OK, "BindDC() returned %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); - ok(clr == 0, "Got color %#x\n", clr); + ok(clr == 0, "Unexpected color 0x%08x.\n", clr); set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f); hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); @@ -4843,10 +4843,42 @@ static void test_dc_target(void) ID2D1SolidColorBrush_Release(brush); clr = GetPixel(hdc2, 0, 0); - ok(clr == RGB(0, 255, 0), "Got color %#x\n", clr); + ok(clr == RGB(0, 255, 0), "Unexpected color 0x%08x.\n", clr); clr = GetPixel(hdc2, 10, 0); - ok(clr == 0, "Got color %#x\n", clr); + ok(clr == 0, "Unexpected color 0x%08x.\n", clr); + + /* Invalid DC. */ + hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); +todo_wine + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); + + hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(0, 0, 255), "Unexpected color 0x%08x.\n", clr); DeleteDC(hdc); DeleteDC(hdc2); -- 2.15.1

2 1

[website] German translation for release 3.0-rc1
by Julian Rüger 15 Dec '17

15 Dec '17

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

1 0

[website] German translation for release 2.22
by Julian Rüger 15 Dec '17

15 Dec '17

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

1 0

[PATCH] d2d1/tests: A test to show that DC is validate on BindDC()
by Nikolay Sivov 15 Dec '17

15 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index af023a10d8..7de9d4abfe 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4848,6 +4848,38 @@ static void test_dc_target(void) clr = GetPixel(hdc2, 10, 0); ok(clr == 0, "Got color %#x\n", clr); + /* Invalid DC. */ + hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); +todo_wine + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(255, 0, 0), "Got color %#x\n", clr); + + hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(0, 0, 255), "Got color %#x\n", clr); + DeleteDC(hdc); DeleteDC(hdc2); ID2D1DCRenderTarget_Release(rt); -- 2.15.1

2 1

[PATCH] po: Update German translation.
by Julian Rüger 15 Dec '17

15 Dec '17

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

1 0

[PATCH vkd3d 1/4] libs/vkd3d-shader: Fix result type for OpImageSampleDref instructions.
by Józef Kucia 15 Dec '17

15 Dec '17

From: Józef Kucia <jkucia(a)codeweavers.com> Per the SPIR-V spec: "Result Type must be a scalar of integer type or floating-point type." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e749873f663b..6fd198b4883d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2616,6 +2616,25 @@ static void vkd3d_dxbc_compiler_emit_store_dst_components(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_store_dst_scalar(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_dst_param *dst, uint32_t val_id, + enum vkd3d_component_type component_type, DWORD swizzle) +{ + unsigned int component_count = vkd3d_write_mask_component_count(dst->write_mask); + uint32_t component_ids[VKD3D_VEC4_SIZE]; + unsigned int component_idx, i; + + component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); + for (i = 0; i < component_count; ++i) + { + if (vkd3d_swizzle_get_component(swizzle, component_idx + i)) + ERR("Invalid swizzle %#x for scalar value, write mask %#x.\n", swizzle, dst->write_mask); + + component_ids[i] = val_id; + } + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, dst, component_type, component_ids); +} + static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *compiler, uint32_t target_id, SpvBuiltIn builtin) { @@ -4641,7 +4660,7 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_DEPTH); - sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); ref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); /* XXX: Nvidia is broken and expects that the D_ref is packed together with coordinates. */ @@ -4652,7 +4671,7 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil image.sampled_image_id, coordinate_id, ref_id, operands_mask, image_operands, image_operand_count); - vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, + vkd3d_dxbc_compiler_emit_store_dst_scalar(compiler, dst, val_id, image.sampled_type, src[1].swizzle); } -- 2.13.6

3 8

[PATCH] po: Update Ukrainian translation.
by Andrey Gusev 15 Dec '17

15 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- po/uk.po | 172 +++++++++++++++------------------------------------------------ 1 file changed, 39 insertions(+), 133 deletions(-) diff --git a/po/uk.po b/po/uk.po index b496a3507c..5a8a9dc0a6 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-05 17:28+0200\n" +"PO-Revision-Date: 2017-12-15 16:20+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -7299,19 +7299,19 @@ msgstr "Ключ: [1], Ім'я: [2], Значення: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Критична помилка: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Помилка [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Попередження [1]." #: msi.rc:74 msgid "Info [1]." -msgstr "Info [1]." +msgstr "Інфо [1]." #: msi.rc:75 msgid "" @@ -7319,6 +7319,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Встановлювач виявив несподівану помилку під час встановлення цього пакета. " +"Це може свідчити про проблему з цим пакетом. Код помилки [1]. {{Аргументи: " +"[2], [3], [4]}}" #: msi.rc:76 msgid "{{Disk full: }}" @@ -7346,13 +7349,15 @@ msgstr "Дія завершилася [Time]: [1]. Повернене значе #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Будь ласка, вставте диск: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Вихідний файл не знайдено{{(cabinet)}}: [2]. Переконайтеся, що файл існує " +"і ви маєте до нього доступ." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8997,10 +9002,8 @@ msgid " sec" msgstr " сек" #: twain.rc:29 -#, fuzzy -#| msgid "New Folder" msgid "Select Source" -msgstr "Нова Тека" +msgstr "Виберіть джерело" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -10664,6 +10667,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Створити символьне посилання.\n" +"\n" +"Синтаксис: MKLINK [опції] ім'я_посилання ціль\n" +"\n" +"Опції:\n" +"/d Створити символьне посилання каталогу.\n" +"/h Створити жорстке посилання.\n" +"/j Створити каталог з'єднання.\n" +"ім'я_посилання - це назва нового символьного посилання.\n" +"ім'я_посилання вказує на шлях цілі.\n" #: cmd.rc:312 msgid "" @@ -10674,47 +10687,6 @@ msgstr "" "системи чи оболонки, з якої ви запустили cmd.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10773,6 +10745,7 @@ msgstr "" "FTYPE\t\tПоказ та зміна команд відкриття, асоційованих з типами файлів\n" "HELP\t\tПоказ короткої довідкової інформації про команду\n" "MD (MKDIR)\tСтворення підтеки\n" +"MKLINK\tСтворення символьного посилання\n" "MORE\t\tВідображення виводу сторінками\n" "MOVE\t\tПереміщення файлу, набору файлів чи дерева каталогів\n" "PATH\t\tЗадання чи відображення шляху пошуку\n" @@ -12127,17 +12100,6 @@ msgid "Icons (*.ico)" msgstr "Значки (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12153,7 +12115,7 @@ msgstr "" " REG [операція] [параметри]\n" "\n" "Підтримувані операції:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Для довідки по конкретній операції, введіть:\n" " REG [операція] /?\n" @@ -12283,43 +12245,31 @@ msgstr "(значення не задане)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT file.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: Файл '%1' не знайдено.\n" +msgstr "reg: Файл '%1' не знайдено.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: Неможливо відкрити ключ '%1'.\n" +msgstr "reg: Неможливо відкрити ключ реєстру '%1'.\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Нерозпізнана послідовність [\\%1!c!]\n" +msgstr "reg: Нерозпізнана керівна послідовність [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY <ключ> [/v <параметр> | /ve] [/s]\n" +msgstr "REG EXPORT ім'я_ключа file.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid system key [%1]\n" -msgstr "reg: невірне ім'я ключа\n" +msgstr "reg: Невірний системний ключ [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Значення реєстру '%1' вже існує. Ви хочете його замінити?" +msgstr "Файл '%1' вже існує. Ви хочете його перезаписати?" #: regedit.rc:34 msgid "&Registry" @@ -12391,7 +12341,7 @@ msgstr "&Про Редактор реєстру" #: regedit.rc:89 regedit.rc:96 regedit.rc:230 msgid "Expand" -msgstr "" +msgstr "Розгорнути" #: regedit.rc:134 regedit.rc:233 msgid "Modify &Binary Data..." @@ -12585,38 +12535,6 @@ msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "Неможливо імпортувати '%1'. Вказаний файл не є файлом реєстру." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12671,7 +12589,7 @@ msgstr "" "Приклади використання:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -12742,11 +12660,9 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Неможливо відкрити ключ '%1'.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "regedit: '%2' містить непідтримуваний тип даних [%1].\n" +msgstr "regedit: '%2' містить непідтримуваний тип даних [0x%1!x!].\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" @@ -12754,10 +12670,8 @@ msgstr "" "regedit: Значення реєстру '%1' буде експортоване у двійковому вигляді.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: невірне ім'я ключа\n" +msgstr "regedit: Невірне ім'я ключа [%1]\n" #: regedit.rc:428 msgid "" @@ -12766,10 +12680,8 @@ msgstr "" "regedit: Неможливо експортувати '%1'. Вказаний ключ не був знайдений.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: Неможливо видалити клас реєстру '%1'.\n" +msgstr "regedit: Неможливо видалити ключ реєстру '%1'.\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12916,24 +12828,18 @@ msgid "Confirm Key Delete" msgstr "Підтвердження видалення ключа" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" msgstr "" -"Ви впевнені, що хочете видалити ключ реєстру '%1' та всі його підрозділи?" +"Ви впевнені, що хочете видалити цей ключ реєстру та всі його підрозділи?" #: regedit.rc:199 msgid "Expands or collapses the selected node" msgstr "Розгортає або згортає вибраний розділ" #: regedit.rc:231 -#, fuzzy -#| msgid "C&ollate" msgid "Collapse" -msgstr "&Розбити" +msgstr "Згорнути" #: regsvr32.rc:32 msgid "" @@ -15157,7 +15063,7 @@ msgstr "Мін" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Всі результати будуть втрачені. Ви впевнені?" #: winemine.rc:30 msgid "WineMine" -- 2.13.6

1 0

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