February 2020 - Wine-commits

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetVertexDeclaration().
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: f4db2de5eb76030851c5c21e56d778ecbd2409d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4db2de5eb76030851c5c21e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 6 19:33:27 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetVertexDeclaration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 789f5a9c18..c59d83b11a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3317,9 +3317,6 @@ static HRESULT WINAPI d3d9_device_SetVertexDeclaration(IDirect3DDevice9Ex *iface wined3d_mutex_lock(); wined3d_stateblock_set_vertex_declaration(device->update_state, decl_impl ? decl_impl->wined3d_declaration : NULL); - if (!device->recording) - wined3d_device_set_vertex_declaration(device->wined3d_device, - decl_impl ? decl_impl->wined3d_declaration : NULL); device->has_vertex_declaration = !!decl_impl; wined3d_mutex_unlock();

1 0

Ilia Mirkin : crypt32: Also check CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 5011815d6236c14769c28c2391ac9fd2bfd82c7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5011815d6236c14769c28c23… Author: Ilia Mirkin <imirkin(a)alum.mit.edu> Date: Thu Jan 23 20:01:24 2020 -0500 crypt32: Also check CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG. It appears that the untrusted root check should be skipped if this flag is set even if the ExtraPolicyPara one is not set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48495 Signed-off-by: Ilia Mirkin <imirkin(a)alum.mit.edu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 396a563c04..935fd6e344 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3455,10 +3455,13 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, PCERT_CHAIN_POLICY_STATUS pPolicyStatus) { HTTPSPolicyCallbackData *sslPara = NULL; - DWORD checks = 0; + DWORD checks = 0, baseChecks = 0; if (pPolicyPara) + { + baseChecks = pPolicyPara->dwFlags; sslPara = pPolicyPara->pvExtraPolicyPara; + } if (TRACE_ON(chain)) dump_ssl_extra_chain_policy_para(sslPara); if (sslPara && sslPara->u.cbSize >= sizeof(HTTPSPolicyCallbackData)) @@ -3474,7 +3477,8 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, } else if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT && - !(checks & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) + !(checks & SECURITY_FLAG_IGNORE_UNKNOWN_CA) && + !(baseChecks & CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG)) { pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; find_element_with_error(pChainContext,

1 0

Ilia Mirkin : crypt32/tests: Additional test for skipping unknown CAs.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 8ca8fa87fae0e2ba041bd5ba97325134d004758a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ca8fa87fae0e2ba041bd5ba… Author: Ilia Mirkin <imirkin(a)alum.mit.edu> Date: Thu Jan 23 20:01:25 2020 -0500 crypt32/tests: Additional test for skipping unknown CAs. This is already tested by setting a flag in the ssl policy parameters, but apparently the flag in base policy parameters also needs to be respected. Tested on Win7. Signed-off-by: Ilia Mirkin <imirkin(a)alum.mit.edu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e2a7633526..1bf78b084d 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4743,6 +4743,11 @@ static void check_ssl_policy(void) CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); sslPolicyPara.fdwChecks = 0; + /* And again, but specifying the ignore in dwFlags */ + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, + ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); + policyPara.dwFlags = 0; /* And again, but checking the Google chain at a bad date */ sslPolicyPara.pwszServerName = google_dot_com; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL,

1 0

Dmitry Timoshkov : comctl32/tests: Add a test for notification messages order in the monthcal control.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: a4e29e9f5b0e6eb51fe8ab130c273b02362dadba URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4e29e9f5b0e6eb51fe8ab13… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 24 15:24:56 2020 +0800 comctl32/tests: Add a test for notification messages order in the monthcal control. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/monthcal.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 11a637fb82..974787ac36 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -47,6 +47,7 @@ static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND parent_wnd; +static BOOL got_MCN_SELECT, got_MCN_SELCHANGE; static const struct message create_parent_window_seq[] = { { WM_GETMINMAXINFO, sent }, @@ -544,6 +545,12 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if(GetWindowLongPtrA(nmchg->nmhdr.hwndFrom, GWLP_ID) != SEL_NOTIFY_TEST_ID) break; + + if (hdr->code == MCN_SELECT) + got_MCN_SELECT = TRUE; + else + got_MCN_SELCHANGE = TRUE; + SendMessageA(nmchg->nmhdr.hwndFrom, is_multisel ? MCM_GETSELRANGE : MCM_GETCURSEL, 0, (LPARAM)st); @@ -2032,8 +2039,21 @@ static void test_sel_notify(void) mchit.pt.y++; SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); } + got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONDOWN, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); + if (styles[i].val & MCS_MULTISELECT) +todo_wine + ok(got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should be sent\n", i); + else + ok(!got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should not be sent\n", i); + ok(!got_MCN_SELECT, "%d: MCN_SELECT should not be sent\n", i); + got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); + if (styles[i].val & MCS_MULTISELECT) + ok(!got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should not be sent\n", i); + else + ok(got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should be sent\n", i); + ok(got_MCN_SELECT, "%d: MCN_SELECT should be sent\n", i); DestroyWindow(hwnd); } }

1 0

Dmitry Timoshkov : comctl32: For multiselect monthcal control send MCN_SELCHANGE notification on WM_LBUTTONDOWN event.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 364f0c3b6c987669543eb59f9489aeb1cf747072 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364f0c3b6c987669543eb59f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 24 15:25:14 2020 +0800 comctl32: For multiselect monthcal control send MCN_SELCHANGE notification on WM_LBUTTONDOWN event. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 3 ++- dlls/comctl32/tests/monthcal.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 244bfcee69..1de13dab36 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2258,7 +2258,8 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_SetSelRange(infoPtr, st); infoPtr->status = MC_SEL_LBUTDOWN; - MONTHCAL_SetDayFocus(infoPtr, &ht.st); + if (MONTHCAL_SetDayFocus(infoPtr, &ht.st) && (infoPtr->dwStyle & MCS_MULTISELECT)) + MONTHCAL_NotifySelectionChange(infoPtr); return 0; } } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 974787ac36..ae528a0ddb 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -2042,7 +2042,6 @@ static void test_sel_notify(void) got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONDOWN, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); if (styles[i].val & MCS_MULTISELECT) -todo_wine ok(got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should be sent\n", i); else ok(!got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should not be sent\n", i);

1 0

Alexandre Julliard : wrc: Add a helper function to terminate the resource data.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 358b4ad99a8c45c3b2f49fc3c7ba10544704220a URL: https://source.winehq.org/git/wine.git/?a=commit;h=358b4ad99a8c45c3b2f49fc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 08:16:19 2020 +0100 wrc: Add a helper function to terminate the resource data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 149 +++++++++++++---------------------------------------- 1 file changed, 36 insertions(+), 113 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index b01aced470..658c8b8921 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -42,8 +42,6 @@ #include "wingdi.h" #include "winuser.h" -#define SetResSize(res, tag) set_dword((res), (tag), (res)->size - get_dword((res), (tag))) - res_t *new_res(void) { res_t *r; @@ -247,6 +245,13 @@ static DWORD get_dword(res_t *res, int ofs) } } +static res_t *end_res(res_t *res, int ofs) +{ + set_dword( res, ofs, res->size - get_dword( res, ofs )); + if (win32) put_pad( res ); + return res; +} + /* ***************************************************************************** * Function : string_to_upper @@ -606,9 +611,7 @@ static res_t *accelerator2res(name_id_t *name, accelerator_t *acc) ev = ev->next; } } - /* Set ResourceSize */ - SetResSize(res, restag); - return res; + return end_res(res, restag); } /* @@ -804,9 +807,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) /* Set number of controls */ ((char *)res->data)[tag_nctrl] = (char)nctrl; } - /* Set ResourceSize */ - SetResSize(res, restag); - return res; + return end_res(res, restag); } /* @@ -912,10 +913,9 @@ static res_t *menu2res(name_id_t *name, menu_t *men) assert(men != NULL); res = new_res(); + restag = put_res_header(res, WRC_RT_MENU, NULL, name, men->memopt, &men->lvc); if(win32) { - restag = put_res_header(res, WRC_RT_MENU, NULL, name, men->memopt, &(men->lvc)); - if (men->is_ex) { put_word(res, 1); /* Menuheader: Version */ @@ -929,20 +929,13 @@ static res_t *menu2res(name_id_t *name, menu_t *men) put_dword(res, 0); /* Menuheader: Version and HeaderSize */ menuitem2res(res, men->items, men->lvc.language); } - /* Set ResourceSize */ - SetResSize(res, restag); - put_pad(res); } else /* win16 */ { - restag = put_res_header(res, WRC_RT_MENU, NULL, name, men->memopt, NULL); - put_dword(res, 0); /* Menuheader: Version and HeaderSize */ menuitem2res(res, men->items, NULL); - /* Set ResourceSize */ - SetResSize(res, restag); } - return res; + return end_res(res, restag); } /* @@ -1009,11 +1002,7 @@ static res_t *cursorgroup2res(name_id_t *name, cursor_group_t *curg) put_word(res, cur->id); } - SetResSize(res, restag); /* Set ResourceSize */ - if(win32) - put_pad(res); - - return res; + return end_res(res, restag); } /* @@ -1043,11 +1032,7 @@ static res_t *cursor2res(cursor_t *cur) put_word(res, cur->yhot); put_raw_data(res, cur->data, 0); - SetResSize(res, restag); /* Set ResourceSize */ - if(win32) - put_pad(res); - - return res; + return end_res(res, restag); } /* @@ -1094,11 +1079,7 @@ static res_t *icongroup2res(name_id_t *name, icon_group_t *icog) put_word(res, ico->id); } - SetResSize(res, restag); /* Set ResourceSize */ - if(win32) - put_pad(res); - - return res; + return end_res(res, restag); } /* @@ -1126,11 +1107,7 @@ static res_t *icon2res(icon_t *ico) restag = put_res_header(res, WRC_RT_ICON, NULL, &name, WRC_MO_MOVEABLE | WRC_MO_DISCARDABLE, &(ico->lvc)); put_raw_data(res, ico->data, 0); - SetResSize(res, restag); /* Set ResourceSize */ - if(win32) - put_pad(res); - - return res; + return end_res(res, restag); } /* @@ -1160,11 +1137,7 @@ static res_t *anicurico2res(name_id_t *name, ani_curico_t *ani, enum res_e type) restag = put_res_header(res, type == res_anicur ? WRC_RT_ANICURSOR : WRC_RT_ANIICON, NULL, name, ani->memopt, NULL); put_raw_data(res, ani->data, 0); - /* Set ResourceSize */ - SetResSize(res, restag); - if(win32) - put_pad(res); - return res; + return end_res(res, restag); } /* @@ -1201,11 +1174,7 @@ static res_t *bitmap2res(name_id_t *name, bitmap_t *bmp) { put_raw_data(res, bmp->data, 0); } - /* Set ResourceSize */ - SetResSize(res, restag); - if(win32) - put_pad(res); - return res; + return end_res(res, restag); } /* @@ -1230,11 +1199,7 @@ static res_t *font2res(name_id_t *name, font_t *fnt) res = new_res(); restag = put_res_header(res, WRC_RT_FONT, NULL, name, fnt->memopt, &(fnt->data->lvc)); put_raw_data(res, fnt->data, 0); - /* Set ResourceSize */ - SetResSize(res, restag); - if(win32) - put_pad(res); - return res; + return end_res(res, restag); } /* @@ -1259,11 +1224,7 @@ static res_t *fontdir2res(name_id_t *name, fontdir_t *fnd) res = new_res(); restag = put_res_header(res, WRC_RT_FONTDIR, NULL, name, fnd->memopt, &(fnd->data->lvc)); put_raw_data(res, fnd->data, 0); - /* Set ResourceSize */ - SetResSize(res, restag); - if(win32) - put_pad(res); - return res; + return end_res(res, restag); } /* @@ -1288,11 +1249,7 @@ static res_t *html2res(name_id_t *name, html_t *html) res = new_res(); restag = put_res_header(res, WRC_RT_HTML, NULL, name, html->memopt, &(html->data->lvc)); put_raw_data(res, html->data, 0); - /* Set ResourceSize */ - SetResSize(res, restag); - if(win32) - put_pad(res); - return res; + return end_res(res, restag); } /* @@ -1317,11 +1274,7 @@ static res_t *rcdata2res(name_id_t *name, rcdata_t *rdt) res = new_res(); restag = put_res_header(res, WRC_RT_RCDATA, NULL, name, rdt->memopt, &(rdt->data->lvc)); put_raw_data(res, rdt->data, 0); - /* Set ResourceSize */ - SetResSize(res, restag); - if(win32) - put_pad(res); - return res; + return end_res(res, restag); } /* @@ -1347,11 +1300,7 @@ static res_t *messagetable2res(name_id_t *name, messagetable_t *msg) res = new_res(); restag = put_res_header(res, WRC_RT_MESSAGETABLE, NULL, name, msg->memopt, &(msg->data->lvc)); put_raw_data(res, msg->data, 0); - /* Set ResourceSize */ - SetResSize(res, restag); - if(win32) - put_pad(res); - return res; + return end_res(res, restag); } /* @@ -1401,10 +1350,7 @@ static res_t *stringtable2res(stringtable_t *stt) put_byte(res, 0); } } - /* Set ResourceSize */ - SetResSize(res, restag - lastsize); - if(win32) - put_pad(res); + end_res(res, restag - lastsize); lastsize = res->size; } return res; @@ -1432,11 +1378,7 @@ static res_t *user2res(name_id_t *name, user_t *usr) res = new_res(); restag = put_res_header(res, 0, usr->type, name, usr->memopt, &(usr->data->lvc)); put_raw_data(res, usr->data, 0); - /* Set ResourceSize */ - SetResSize(res, restag); - if(win32) - put_pad(res); - return res; + return end_res(res, restag); } /* @@ -1587,12 +1529,8 @@ static res_t *versioninfo2res(name_id_t *name, versioninfo_t *ver) /* Set root block's size */ set_word(res, rootblocksizetag, (WORD)(res->size - rootblocksizetag)); - SetResSize(res, restag); - if(win32) - put_pad(res); - free(vsvi.str.cstr); - return res; + return end_res(res, restag); } /* @@ -1636,29 +1574,18 @@ static res_t *toolbar2res(name_id_t *name, toolbar_t *toolbar) assert(name != NULL); assert(toolbar != NULL); + if (!win32) return NULL; + res = new_res(); - if(win32) - { - restag = put_res_header(res, WRC_RT_TOOLBAR, NULL, name, toolbar->memopt, &(toolbar->lvc)); + restag = put_res_header(res, WRC_RT_TOOLBAR, NULL, name, toolbar->memopt, &(toolbar->lvc)); - put_word(res, 1); /* Menuheader: Version */ - put_word(res, toolbar->button_width); /* (in pixels?) */ - put_word(res, toolbar->button_height); /* (in pixels?) */ - put_word(res, toolbar->nitems); - put_pad(res); - toolbaritem2res(res, toolbar->items); - /* Set ResourceSize */ - SetResSize(res, restag); - put_pad(res); - } - else /* win16 */ - { - /* Do not generate anything in 16-bit mode */ - free(res->data); - free(res); - return NULL; - } - return res; + put_word(res, 1); /* Menuheader: Version */ + put_word(res, toolbar->button_width); /* (in pixels?) */ + put_word(res, toolbar->button_height); /* (in pixels?) */ + put_word(res, toolbar->nitems); + put_pad(res); + toolbaritem2res(res, toolbar->items); + return end_res(res, restag); } /* @@ -1683,11 +1610,7 @@ static res_t *dlginit2res(name_id_t *name, dlginit_t *dit) res = new_res(); restag = put_res_header(res, WRC_RT_DLGINIT, NULL, name, dit->memopt, &(dit->data->lvc)); put_raw_data(res, dit->data, 0); - /* Set ResourceSize */ - SetResSize(res, restag); - if(win32) - put_pad(res); - return res; + return end_res(res, restag); } /*

1 0

Alexandre Julliard : wrc: Simplify the put_string() helper function.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 499d772cb65c4f839e1bea5eaff678d73f64e59b URL: https://source.winehq.org/git/wine.git/?a=commit;h=499d772cb65c4f839e1bea5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 08:26:11 2020 +0100 wrc: Simplify the put_string() helper function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 85 ++++++++++++++++++++---------------------------------- 1 file changed, 31 insertions(+), 54 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 658c8b8921..4e8552fa37 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -353,21 +353,14 @@ static int parse_accel_string( const string_t *key, int flags ) /* ***************************************************************************** * Function : put_string - * Syntax : void put_string(res_t *res, string_t *str, enum str_e type, - * int isterm, const language_t *lang) * Input : * res - Binary resource to put the data in * str - String to put - * type - Data has to be written in either str_char or str_unicode * isterm - The string is '\0' terminated (disregard the string's * size member) - * Output : nop - * Description : - * Remarks : ***************************************************************************** */ -static void put_string(res_t *res, const string_t *str, enum str_e type, int isterm, - const language_t *lang) +static void put_string(res_t *res, const string_t *str, int isterm, const language_t *lang) { int cnt, codepage; string_t *newstr; @@ -380,9 +373,9 @@ static void put_string(res_t *res, const string_t *str, enum str_e type, int ist assert( codepage != -1 ); - newstr = convert_string(str, type, codepage); - if (type == str_unicode) + if (win32) { + newstr = convert_string(str, str_unicode, codepage); if (str->type == str_char) { if (!check_unicode_conversion( str, newstr, codepage )) @@ -407,8 +400,9 @@ static void put_string(res_t *res, const string_t *str, enum str_e type, int ist } if (isterm) put_word(res, 0); } - else /* str_char */ + else { + newstr = convert_string(str, str_char, codepage); if (!isterm) put_byte(res, newstr->size); for(cnt = 0; cnt < newstr->size; cnt++) { @@ -445,7 +439,7 @@ static void put_name_id(res_t *res, name_id_t *nid, int upcase, const language_t { if(upcase) string_to_upper(nid->name.s_name); - put_string(res, nid->name.s_name, win32 ? str_unicode : str_char, TRUE, lang); + put_string(res, nid->name.s_name, TRUE, lang); } else { @@ -676,7 +670,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) else put_word(res, 0); if(dlg->title) - put_string(res, dlg->title, str_unicode, TRUE, dlg->lvc.language); + put_string(res, dlg->title, TRUE, dlg->lvc.language); else put_word(res, 0); if(dlg->font) @@ -691,7 +685,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) */ put_word(res, dlg->font->italic ? 0x0101 : 0); } - put_string(res, dlg->font->name, str_unicode, TRUE, dlg->lvc.language); + put_string(res, dlg->font->name, TRUE, dlg->lvc.language); } else if (dlg->style->or_mask & DS_SETFONT) put_word( res, 0x7fff ); @@ -763,13 +757,13 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) else put_byte(res, 0); if(dlg->title) - put_string(res, dlg->title, str_char, TRUE, NULL); + put_string(res, dlg->title, TRUE, NULL); else put_byte(res, 0); if(dlg->font) { put_word(res, dlg->font->size); - put_string(res, dlg->font->name, str_char, TRUE, NULL); + put_string(res, dlg->font->name, TRUE, NULL); } while(ctrl) @@ -823,39 +817,23 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) static void menuitem2res(res_t *res, menu_item_t *menitem, const language_t *lang) { menu_item_t *itm = menitem; - if(win32) - { - while(itm) - { - put_word(res, itm->state | (itm->popup ? MF_POPUP : 0) | (!itm->next ? MF_END : 0)); - if(!itm->popup) - put_word(res, itm->id); - if(itm->name) - put_string(res, itm->name, str_unicode, TRUE, lang); - else - put_word(res, 0); - if(itm->popup) - menuitem2res(res, itm->popup, lang); - itm = itm->next; - } - } - else /* win16 */ + + while(itm) { - while(itm) - { - put_word(res, itm->state | (itm->popup ? MF_POPUP : 0) | (!itm->next ? MF_END : 0)); - if(!itm->popup) - put_word(res, itm->id); - if(itm->name) - put_string(res, itm->name, str_char, TRUE, lang); - else - put_byte(res, 0); - if(itm->popup) - menuitem2res(res, itm->popup, lang); - itm = itm->next; + put_word(res, itm->state | (itm->popup ? MF_POPUP : 0) | (!itm->next ? MF_END : 0)); + if(!itm->popup) + put_word(res, itm->id); + if(itm->name) + put_string(res, itm->name, TRUE, lang); + else + { + if (win32) put_word(res, 0); + else put_byte(res, 0); } + if(itm->popup) + menuitem2res(res, itm->popup, lang); + itm = itm->next; } - } /* @@ -879,7 +857,7 @@ static void menuexitem2res(res_t *res, menu_item_t *menitem, const language_t *l put_dword(res, itm->gotid ? itm->id : 0); put_word(res, (itm->popup ? 0x01 : 0) | (!itm->next ? MF_END : 0)); if(itm->name) - put_string(res, itm->name, str_unicode, TRUE, lang); + put_string(res, itm->name, TRUE, lang); else put_word(res, 0); put_pad(res); @@ -1339,8 +1317,7 @@ static res_t *stringtable2res(stringtable_t *stt) { if(stt->entries[i].str && stt->entries[i].str->size) { - put_string(res, stt->entries[i].str, win32 ? str_unicode : str_char, - FALSE, win32 ? stt->lvc.language : NULL); + put_string(res, stt->entries[i].str, FALSE, stt->lvc.language); } else { @@ -1407,7 +1384,7 @@ static void versionblock2res(res_t *res, ver_block_t *blk, int level, const lang put_word(res, 0); if(win32) put_word(res, 0); /* level ? */ - put_string(res, blk->name, win32 ? str_unicode : str_char, TRUE, NULL); + put_string(res, blk->name, TRUE, NULL); put_pad(res); for(val = blk->values; val; val = val->next) { @@ -1421,10 +1398,10 @@ static void versionblock2res(res_t *res, ver_block_t *blk, int level, const lang { put_word(res, level); } - put_string(res, val->key, win32 ? str_unicode : str_char, TRUE, NULL); + put_string(res, val->key, TRUE, NULL); put_pad(res); tag = res->size; - put_string(res, val->value.str, win32 ? str_unicode : str_char, TRUE, lang); + put_string(res, val->value.str, TRUE, lang); if(win32) set_word(res, valvalsizetag, (WORD)((res->size - tag) >> 1)); else @@ -1442,7 +1419,7 @@ static void versionblock2res(res_t *res, ver_block_t *blk, int level, const lang { put_word(res, level); } - put_string(res, val->key, win32 ? str_unicode : str_char, TRUE, NULL); + put_string(res, val->key, TRUE, NULL); put_pad(res); tag = res->size; for(i = 0; i < val->value.words->nwords; i++) @@ -1504,7 +1481,7 @@ static res_t *versioninfo2res(name_id_t *name, versioninfo_t *ver) put_word(res, 0); /* ValueSize filled in later*/ if(win32) put_word(res, 0); /* Tree-level ? */ - put_string(res, &vsvi, win32 ? str_unicode : str_char, TRUE, NULL); + put_string(res, &vsvi, TRUE, NULL); if(win32) put_pad(res); tag = res->size;

1 0

Alexandre Julliard : wrc: Export the convert_string_utf8() helper function.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 20459500965c446df0b57f60555d08cb8f4007dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=20459500965c446df0b57f60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 08:34:03 2020 +0100 wrc: Export the convert_string_utf8() helper function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/parser.y | 22 ++++++++++------------ tools/wrc/po.c | 16 +++------------- tools/wrc/utils.c | 8 ++++++++ tools/wrc/utils.h | 1 + 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 4c2f22ac0d..f5666a0399 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2161,19 +2161,17 @@ static itemex_opt_t *new_itemex_opt(int id, int type, int state, int helpid) static raw_data_t *load_file(string_t *filename, language_t *lang) { FILE *fp = NULL; - char *path; + char *path, *name; raw_data_t *rd; - string_t *name; - int codepage = get_language_codepage(lang->id, lang->sub); - - /* FIXME: we may want to use utf-8 here */ - if (codepage <= 0 && filename->type != str_char) - yyerror("Cannot convert filename to ASCII string"); - name = convert_string( filename, str_char, codepage ); - if (!(path = wpp_find_include(name->str.cstr, input_name))) - yyerror("Cannot open file %s", name->str.cstr); + + if (filename->type == str_unicode) + name = convert_string_utf8( filename, 0 ); + else + name = xstrdup( filename->str.cstr ); + if (!(path = wpp_find_include(name, input_name))) + yyerror("Cannot open file %s", name); if (!(fp = fopen( path, "rb" ))) - yyerror("Cannot open file %s", name->str.cstr); + yyerror("Cannot open file %s", name); free( path ); rd = new_raw_data(); fseek(fp, 0, SEEK_END); @@ -2187,7 +2185,7 @@ static raw_data_t *load_file(string_t *filename, language_t *lang) else rd->data = NULL; fclose(fp); rd->lvc.language = lang; - free_string(name); + free(name); return rd; } diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 3f5affd49f..726bed393f 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -557,14 +557,6 @@ static void po_xerror2( int severity, po_message_t message1, static const struct po_xerror_handler po_xerror_handler = { po_xerror, po_xerror2 }; -static string_t *convert_string_utf8( const string_t *str, int codepage ) -{ - string_t *wstr = convert_string( str, str_unicode, codepage ); - string_t *ustr = convert_string( wstr, str_char, CP_UTF8 ); - free_string( wstr ); - return ustr; -} - static po_message_t find_message( po_file_t po, const char *msgid, const char *msgctxt, po_message_iterator_t *iterator ) { @@ -589,8 +581,7 @@ static void add_po_string( po_file_t po, const string_t *msgid, const string_t * po_message_t msg; po_message_iterator_t iterator; int codepage; - string_t *str_buffer = NULL; - char *id, *id_buffer, *context, *str = NULL; + char *id, *id_buffer, *context, *str = NULL, *str_buffer = NULL; if (!msgid->size) return; @@ -608,8 +599,7 @@ static void add_po_string( po_file_t po, const string_t *msgid, const string_t * if (lang) codepage = get_language_codepage( lang->id, lang->sub ); else codepage = get_language_codepage( 0, 0 ); assert( codepage != -1 ); - str_buffer = convert_string_utf8( msgstr, codepage ); - str = str_buffer->str.cstr; + str = str_buffer = convert_string_utf8( msgstr, codepage ); if (is_english( lang )) get_message_context( &str ); } if (!(msg = find_message( po, id, context, &iterator ))) @@ -623,7 +613,7 @@ static void add_po_string( po_file_t po, const string_t *msgid, const string_t * if (msgid->loc.file) po_message_add_filepos( msg, msgid->loc.file, msgid->loc.line ); po_message_iterator_free( iterator ); free( id_buffer ); - if (str_buffer) free_string( str_buffer ); + free( str_buffer ); } struct po_file_lang diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 15bbde9d74..6ec1fe7b66 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -503,6 +503,14 @@ string_t *convert_string(const string_t *str, enum str_e type, int codepage) return ret; } +char *convert_string_utf8( const string_t *str, int codepage ) +{ + int len; + string_t *wstr = convert_string( str, str_unicode, codepage ); + char *ret = unicode_to_utf8( wstr->str.wstr, wstr->size, &len ); + free_string( wstr ); + return ret; +} void free_string(string_t *str) { diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h index 15dfacdd47..f5d3385c55 100644 --- a/tools/wrc/utils.h +++ b/tools/wrc/utils.h @@ -47,6 +47,7 @@ void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); char *dup_basename(const char *name, const char *ext); int compare_name_id(const name_id_t *n1, const name_id_t *n2); string_t *convert_string(const string_t *str, enum str_e type, int codepage); +char *convert_string_utf8( const string_t *str, int codepage ); void free_string( string_t *str ); int check_valid_utf8( const string_t *str, int codepage ); int check_unicode_conversion( const string_t *str_a, const string_t *str_w, int codepage );

1 0

Alexandre Julliard : wrc: Add an option to set the input codepage to UTF-8.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: 1d8f4fe4a0a90fada6c52fc7e766ae4fd8c64252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d8f4fe4a0a90fada6c52fc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 08:48:08 2020 +0100 wrc: Add an option to set the input codepage to UTF-8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 8 ++++---- tools/wrc/parser.l | 2 +- tools/wrc/wrc.c | 8 +++++++- tools/wrc/wrc.h | 1 + tools/wrc/wrc.man.in | 3 +++ 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e5628712cc..12095436dd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2710,7 +2710,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -o $@", tools_path( make, "wrc" ) ); + output( "\t%s -u -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); output_filename( "--nostdinc" ); @@ -2735,7 +2735,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c { strarray_add( &make->clean_files, strmake( "%s.pot", obj )); output( "%s.pot: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -O pot -o $@", tools_path( make, "wrc" ) ); + output( "\t%s -u -O pot -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); output_filename( "--nostdinc" ); @@ -3019,7 +3019,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, strarray_add( &make->clean_files, dll_name ); strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), obj_dir_path( make, dll_name )); - output( "\techo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -o $@\n", obj, + output( "\techo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -u -o $@\n", obj, obj_dir_path( make, dll_name ), tools_path( make, "wrc" )); output( "%s:", obj_dir_path( make, dll_name )); @@ -3492,7 +3492,7 @@ static void output_test_module( struct makefile *make ) output( "all: %s/%s\n", top_obj_dir_path( make, "programs/winetest" ), testres ); output( "%s/%s: %s%s\n", top_obj_dir_path( make, "programs/winetest" ), testres, obj_dir_path( make, stripped ), ext ); - output( "\techo \"%s TESTRES \\\"%s%s\\\"\" | %s -o $@\n", + output( "\techo \"%s TESTRES \\\"%s%s\\\"\" | %s -u -o $@\n", testmodule, obj_dir_path( make, stripped ), ext, tools_path( make, "wrc" )); output_filenames_obj_dir( make, make->ok_files ); diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index f456c626d1..d1e768f72c 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -121,7 +121,7 @@ ws [ \f\t\r] /* Always update the current character position within a line */ #define YY_USER_ACTION char_number+=yyleng; wanted_id = want_id; want_id = 0; -#define YY_USER_INIT current_codepage = -1; +#define YY_USER_INIT current_codepage = utf8_input ? CP_UTF8 : -1; static void addcchar(char c); static void addwchar(WCHAR s); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index d171bfa2ef..b4cb013f8e 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -144,6 +144,8 @@ int preprocess_only = 0; */ int no_preprocess = 0; +int utf8_input = 0; + int check_utf8 = 1; /* whether to check for valid utf8 */ static int pointer_size = sizeof(void *); @@ -184,7 +186,7 @@ enum long_options_values }; static const char short_options[] = - "b:D:Ef:F:hi:I:J:l:m:o:O:rU:v"; + "b:D:Ef:F:hi:I:J:l:m:o:O:ruU:v"; static const struct option long_options[] = { { "debug", 1, NULL, LONG_OPT_DEBUG }, { "define", 1, NULL, 'D' }, @@ -203,6 +205,7 @@ static const struct option long_options[] = { { "preprocessor", 1, NULL, LONG_OPT_PREPROCESSOR }, { "sysroot", 1, NULL, LONG_OPT_SYSROOT }, { "target", 1, NULL, 'F' }, + { "utf8", 0, NULL, 'u' }, { "undefine", 1, NULL, 'U' }, { "use-temp-file", 0, NULL, LONG_OPT_TMPFILE }, { "verbose", 0, NULL, 'v' }, @@ -503,6 +506,9 @@ int main(int argc,char *argv[]) case 'r': /* ignored for compatibility with rc */ break; + case 'u': + utf8_input = 1; + break; case 'U': wpp_del_define(optarg); break; diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 77e3e6942e..9664dd0392 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -39,6 +39,7 @@ extern int pedantic; extern int byteorder; extern int preprocess_only; extern int no_preprocess; +extern int utf8_input; extern int check_utf8; extern char *input_name; diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 80fcd04c5b..24dca04902 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -124,6 +124,9 @@ To disable preprocessing, use \fB--preprocessor=cat\fR. .I \fB\-\-sysroot=\fIdir\fR Prefix the standard include paths with \fIdir\fR. .TP +.I \fB\-\-utf8\fR, \fB\-u\fR +Set the default codepage of the input file to UTF-8. +.TP .I \fB\-U\fR, \fB\-\-undefine\fR=\fIid\fR Undefine preprocessor identifier \fIid\fR. Please note that only macros defined up to this point are undefined by this command. However, these

1 0

Alexandre Julliard : wrc: Avoid converting Unicode strings back to Ansi.
by Alexandre Julliard 07 Feb '20

07 Feb '20

Module: wine Branch: master Commit: fe888bbbb6b8c0d1186fbe0240ce9fc6b5aa8166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe888bbbb6b8c0d1186fbe02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 08:47:00 2020 +0100 wrc: Avoid converting Unicode strings back to Ansi. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 69 ++++++++++++++++++++++-------------------------------- tools/wrc/parser.l | 16 ++++++------- tools/wrc/po.c | 38 ++++++++++++++---------------- tools/wrc/utils.c | 69 ++++++------------------------------------------------ tools/wrc/utils.h | 3 +-- 5 files changed, 62 insertions(+), 133 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe888bbbb6b8c0d1186f…

1 0