May 2021 - Wine-Devel - list.winehq.org

[PATCH v2 1/4] winevulkan: Support use of extensions which mustn't be exposed.
by Derek Lesho May 20, 2021

May 20, 2021

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Fixed incorrect needs_exposed logic to expose whenever *any* extension we enable requires the command. --- dlls/winevulkan/make_vulkan | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7f76d328fc8..62d865149d8 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -120,6 +120,11 @@ UNSUPPORTED_EXTENSIONS = [ "VK_NV_external_memory_win32", ] +# Either internal extensions which aren't present on the win32 platform which +# winevulkan may nonetheless use, or extensions we want to generate headers for +# but not expose to applications (useful for test commits) +UNEXPOSED_EXTENSIONS = {} + # The Vulkan loader provides entry-points for core functionality and important # extensions. Based on vulkan-1.def this amounts to WSI extensions on 1.0.51. CORE_EXTENSIONS = [ @@ -521,8 +526,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): - self.extensions = [] + def __init__(self, _type=None, name=None, params=[], alias=None): + self.extensions = set() self.name = name self.type = _type self.params = params @@ -665,6 +670,10 @@ class VkFunction(object): def needs_private_thunk(self): return self.thunk_type == ThunkType.PRIVATE + def needs_exposed(self): + # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED + return self.is_required and (not self.extensions or not self.extensions.issubset(UNEXPOSED_EXTENSIONS)) + def pfn(self, prefix="p", call_conv=None, conv=False): """ Create function pointer. """ @@ -2656,6 +2665,9 @@ class VkGenerator(object): if not vk_func.is_required(): continue + if not vk_func.needs_exposed(): + continue + if vk_func.is_global_func(): continue @@ -2676,6 +2688,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "device": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2685,6 +2699,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "instance": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2746,6 +2762,8 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.is_required(): continue + if not vk_func.needs_exposed(): + continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -2767,6 +2785,8 @@ class VkGenerator(object): continue if vk_func.needs_thunk() and not vk_func.needs_private_thunk(): continue + if not vk_func.needs_exposed(): + continue if vk_func.is_core_func(): f.write("{0};\n".format(vk_func.prototype("WINAPI", prefix=prefix))) @@ -2874,6 +2894,8 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.is_required(): continue + if not vk_func.needs_exposed(): + continue if vk_func.loader_thunk_type != ThunkType.PUBLIC: continue @@ -2883,6 +2905,8 @@ class VkGenerator(object): for vk_func in self.registry.device_funcs: if not vk_func.is_required(): continue + if not vk_func.needs_exposed(): + continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) f.write("};\n\n") @@ -2891,6 +2915,8 @@ class VkGenerator(object): for vk_func in self.registry.phys_dev_funcs: if not vk_func.is_required(): continue + if not vk_func.needs_exposed(): + continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) f.write("};\n\n") @@ -2899,6 +2925,8 @@ class VkGenerator(object): for vk_func in self.registry.instance_funcs: if not vk_func.is_required(): continue + if not vk_func.needs_exposed(): + continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) f.write("};\n\n") @@ -2956,6 +2984,8 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.is_required(): continue + if not vk_func.needs_exposed(): + continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -3447,7 +3477,7 @@ class VkRegistry(object): # the XML file to handle this, but because of the manner in which we parse the XML # file we pre-populate from <commands> before we check if a command is enabled. if cmd_name in self.funcs: - self.funcs[cmd_name].extensions.append(ext_name) + self.funcs[cmd_name].extensions.add(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": -- 2.31.1

2 6

[PATCH] ole32: Avoid the failure of flushing the ole clipboard when the clipboard manager gets the data.
by Haoyang Chen May 20, 2021

May 20, 2021

When ole has set the clipboard data, the clipboard manager may preempt this data (by sending a WM_RENDERFORMAT message). At this point the clipboard ownership may be occupied by the clipboard manager; resulting in a failure to flush the ole clipboard. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/ole32/clipboard.c | 2 ++ dlls/ole32/tests/clipboard.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index e61b3076883..ebc498d52e7 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -2261,6 +2261,7 @@ HRESULT WINAPI OleFlushClipboard(void) HRESULT hr; ole_clipbrd *clipbrd; HWND wnd; + MSG msg; TRACE("()\n"); @@ -2273,6 +2274,7 @@ HRESULT WINAPI OleFlushClipboard(void) */ if (!clipbrd->src_data) return S_OK; + PeekMessageW(&msg, wnd, WM_RENDERFORMAT, WM_RENDERFORMAT, PM_REMOVE); if (!OpenClipboard(wnd)) return CLIPBRD_E_CANT_OPEN; SendMessageW(wnd, WM_RENDERALLFORMATS, 0, 0); diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index fd8f287680b..47700e7f3fd 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1085,6 +1085,7 @@ static void test_set_clipboard_DRAWCLIPBOARD(void) HWND viewer; int ret; HANDLE thread; + int i; hr = DataObjectImpl_CreateText("data", &data); ok(hr == S_OK, "Failed to create data object: 0x%08x\n", hr); @@ -1120,6 +1121,15 @@ static void test_set_clipboard_DRAWCLIPBOARD(void) ret = SendMessageA( viewer, WM_USER, 0, 0 ); ok( ret == 2, "%u WM_DRAWCLIPBOARD received\n", ret ); + Sleep(500); + + for (i = 0; i < 10; i++) + { + hr = OleFlushClipboard(); + if (hr == S_OK) break; + Sleep(100); + } + ok(hr == S_OK, "got %08x\n", hr); clip_data = NULL; hr = OleFlushClipboard(); ok(hr == S_OK, "failed to flush clipboard, hr = 0x%08x\n", hr); -- 2.20.1

3 3

[PATCH] po: Update Dutch Translation
by Floris Renaud May 20, 2021

May 20, 2021

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 410 ++++++++++++++++++------------------------------------- 1 file changed, 135 insertions(+), 275 deletions(-) diff --git a/po/nl.po b/po/nl.po index 16f1ebfdc50..a1fb7b2a7de 100644 --- a/po/nl.po +++ b/po/nl.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: 2021-05-04 16:50+0200\n" +"PO-Revision-Date: 2021-05-20 14:10+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -6983,569 +6983,468 @@ msgid "Resource is not currently available.\n" msgstr "Bron is tijdelijk niet beschikbaar.\n" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "Schijf" +msgstr "Letter (VS)" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "Schijf" +msgstr "Letter klein (VS)" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "&Tabel" +msgstr "Tabloid (VS)" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger (VS)" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal (VS)" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "Staat" +msgstr "Statement (VS)" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "&Uitvoeren..." +msgstr "Executive (VS)" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "Klein" +msgstr "A4 (klein)" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "Kladblok" +msgstr "Note (VS)" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Envelop nr. 9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "Envelop nr. 10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "Envelop nr. 11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "Envelop nr. 12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "Envelop nr. 14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C-papierformaat" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D-papierformaat" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E-papierformaat" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "Envelop DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "Envelop C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "Envelop C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "Envelop C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "Envelop C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "Envelop C6/C5" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "Envelop B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "Envelop B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "Envelop B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "PKCS 7 Omsloten" +msgstr "Envelop" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "Envelop Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "PKCS 7 Omsloten" +msgstr "6 3/4 envelope" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "Standaardkettingpapier (VS)" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "Duits standaardkettingpapier" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "Duits Legal-kettingpapier" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "Japans" +msgstr "Japanse briefkaart" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "Uitnodigingsenvelop" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "Schijf" +msgstr "Letter Extra (VS)" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal Extra (VS)" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloid Extra (VS)" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "&Extra's" +msgstr "A4 Extra" #: dlls/localspl/localspl.rc:88 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "Letter Transverse" -msgstr "doorkruist" +msgstr "Letter overdwars (VS)" #: dlls/localspl/localspl.rc:89 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A4 Transverse" -msgstr "doorkruist" +msgstr "A4 overdwars" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Letter Extra overdwars (VS)" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A4" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super A3" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "Schijf" +msgstr "Letter Plus (VS)" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A5 Transverse" -msgstr "doorkruist" +msgstr "A5 overdwars" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) overdwars" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "&Extra's" +msgstr "A3 Extra" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "&Extra's" +msgstr "A5 Extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) Extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A3 Transverse" -msgstr "doorkruist" +msgstr "A3 overdwars" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 Extra overdwars" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "Japanse dubbele briefkaart" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "Japanse envelop Kaku nr. 2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "Japanse envelop Kaku nr. 3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "Japanse envelop Chou nr. 3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "Japanse envelop Chou nr. 4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Letter gedraaid (VS)" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 gedraaid" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 gedraaid" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 gedraaid" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) gedraaid" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) gedraaid" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "Japanse briefkaart gedraaid" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "Japanse dubbele briefkaart gedraaid" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 Gedraaid" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "Japanse envelop Kaku nr. 2 gedraaid" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "Japanse envelop Kaku nr. 3 gedraaid" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "Japanse envelop Chou nr. 3 gedraaid" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "Japanse envelop Chou nr. 4 gedraaid" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) gedraaid" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "Japanse envelop You nr. 4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "Japanse envelop You nr. 4 gedraaid" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "Chinese 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "Chinese 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "Chinese 32K (groot)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "Chinese 16K gedraaid" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "Chinese 32K gedraaid" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "Chinese 32K (groot) gedraaid" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 1 gedraaid" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 2 gedraaid" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 3 gedraaid" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 4 gedraaid" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 5 gedraaid" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 6 gedraaid" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 7 gedraaid" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 8 gedraaid" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 9 gedraaid" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7 Omsloten" +msgstr "Chinese envelop nr. 10 gedraaid" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -14865,17 +14764,6 @@ msgid "Icons (*.ico)" msgstr "Pictogrammen (*.ico)" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | EXPORT | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -14891,7 +14779,7 @@ msgstr "" " REG [opdracht] [parameters]\n" "\n" "Ondersteunde opdrachten:\n" -" ADD | DELETE | EXPORT | IMPORT | QUERY\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Voor hulp bij een opdracht, type:\n" " REG [opdracht] /?\n" @@ -15170,10 +15058,8 @@ msgid "reg: Unsupported registry data type [%1]\n" msgstr "reg: Register data type wordt niet ondersteund [%1]\n" #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg: De optie [/d] moet gevolgd worden door een hexadecimale waarde\n" +msgstr "reg: De optie [/d] moet gevolgd worden door een numerieke waarde\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" @@ -15212,10 +15098,8 @@ msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: De optie [/d] moet gevolgd worden door tekenreeks\n" #: programs/reg/reg.rc:135 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: Kan de registersleutel '%1' niet verwijderen.\n" +msgstr "reg: Kan niet alle registerwaardes in '%1' verwijderen.\n" #: programs/reg/reg.rc:136 msgid "" @@ -15377,35 +15261,6 @@ msgid "reg: Unable to access or create the specified registry key\n" msgstr "reg: Kan de gegeven registersleutel niet openen of aanmaken\n" #: programs/reg/reg.rc:202 -#, fuzzy -#| msgid "" -#| "REG EXPORT <key> <file> [/y]\n" -#| "\n" -#| " Exports a specified registry key (including all subkeys and values)\n" -#| " to a file.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to export.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " <file>\n" -#| " The name and path of the registry file that will be created.\n" -#| " This file must have a .reg extension.\n" -#| "\n" -#| " /y\n" -#| " Overwrite <file> without prompting for confirmation.\n" -#| "\n" msgid "" "REG COPY <key1> <key2> [/s] [/f]\n" "\n" @@ -15439,13 +15294,15 @@ msgid "" "<key2>.\n" "\n" msgstr "" -"REG EXPORT <sleutel> <bestand> [/y]\n" +"REG COPY <sleutel1> <sleutel2> [/s] [/f]\n" "\n" -" Exporteer een registersleutel (inclusief alle subsleutels en waardes)\n" -" naar een bestand.\n" +" Kopieert de inhoud van een registersleutel naar een andere plek.\n" +" Standaard worden alleen de registerwaarden gekopieerd. Gebruik [/s] om\n" +" ook de onderliggende sleutels en waarden te kopiëren.\n" "\n" -" <sleutel>\n" -" De registersleutel die geëxporteerd moet worden.\n" +" <sleutel1>, <sleutel2>\n" +" De registersleutel (<sleutel1>) die gekopieerd wordt naar <sleutel2>.\n" +" <sleutel2> wordt aangemaakt als deze niet bestaat.\n" "\n" " Formaat: HOOFDSLEUTEL\\Subsleutel\n" "\n" @@ -15461,12 +15318,15 @@ msgstr "" "gegeven\n" " HOOFDSLEUTEL.\n" "\n" -" <bestand>\n" -" De naam en pad van het registerbestand dat aangemaakt wordt.\n" -" Dit bestand moet de extensie .reg hebben.\n" +" /s\n" +" Kopieer alle onderliggende sleutels en waarden van <sleutel1> naar " +"<sleutel2>.\n" "\n" -" /y\n" -" <bestand> overschrijven zonder een bevestiging te vragen.\n" +" /f\n" +" Overschrijf alle register gegevens in <sleutel2> zonder om bevestiging te " +"vragen.\n" +" Deze optie wijzigt geen onderliggende sleutels en waarden die alleen in " +"<sleutel2> bestaan.\n" "\n" #: programs/regedit/regedit.rc:34 -- 2.31.1

1 0

[PATCH] winedump: Make print_longlong() work on 64-bit.
by Henri Verbeet May 20, 2021

May 20, 2021

In particular, when long is a 64-bit type, the upper 32 bits would previously be printed twice. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tools/winedump/pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index aa679103e59..161ba3b248e 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -182,7 +182,7 @@ static inline void print_dword(const char *title, DWORD value) static inline void print_longlong(const char *title, ULONGLONG value) { printf(" %-34s 0x", title); - if(value >> 32) + if (sizeof(value) > sizeof(unsigned long) && value >> 32) printf("%lx%08lx\n", (unsigned long)(value >> 32), (unsigned long)value); else printf("%lx\n", (unsigned long)value); -- 2.20.1

1 0

[PATCH 1/2] wined3d: Use wined3d_device_context functions internally where possible.
by Zebediah Figura May 20, 2021

May 20, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 46 +++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a8383a89617..e4f0556fdbc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -933,16 +933,17 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { BOOL ds_enable = swapchain->state.desc.enable_auto_depth_stencil; + struct wined3d_device_context *context = &device->cs->c; unsigned int i; for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); + wined3d_device_context_set_rendertarget_view(context, i, NULL, FALSE); } if (device->back_buffer_view) - wined3d_device_set_rendertarget_view(device, 0, device->back_buffer_view, TRUE); + wined3d_device_context_set_rendertarget_view(context, 0, device->back_buffer_view, TRUE); - wined3d_device_set_depth_stencil_view(device, ds_enable ? device->auto_depth_stencil_view : NULL); + wined3d_device_context_set_depth_stencil_view(context, ds_enable ? device->auto_depth_stencil_view : NULL); } void wined3d_device_delete_opengl_contexts_cs(void *object) @@ -3979,9 +3980,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, TRACE("device %p, stateblock %p.\n", device, stateblock); if (changed->vertexShader) - wined3d_device_set_vertex_shader(device, state->vs); + wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_VERTEX, state->vs); if (changed->pixelShader) - wined3d_device_set_pixel_shader(device, state->ps); + wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_PIXEL, state->ps); for (start = 0; ; start = range.offset + range.size) { @@ -4136,12 +4137,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) { rasterizer_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); - wined3d_device_set_rasterizer_state(device, rasterizer_state); + wined3d_device_context_set_rasterizer_state(context, rasterizer_state); } else if (SUCCEEDED(wined3d_rasterizer_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &rasterizer_state))) { - wined3d_device_set_rasterizer_state(device, rasterizer_state); + wined3d_device_context_set_rasterizer_state(context, rasterizer_state); if (wine_rb_put(&device->rasterizer_states, &desc, &rasterizer_state->entry) == -1) { ERR("Failed to insert rasterizer state.\n"); @@ -4209,12 +4210,14 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->blend_states, &desc))) { blend_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_blend_state, entry); - wined3d_device_set_blend_state(device, blend_state, &colour, state->rs[WINED3D_RS_MULTISAMPLEMASK]); + wined3d_device_context_set_blend_state(context, blend_state, &colour, + state->rs[WINED3D_RS_MULTISAMPLEMASK]); } else if (SUCCEEDED(wined3d_blend_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &blend_state))) { - wined3d_device_set_blend_state(device, blend_state, &colour, state->rs[WINED3D_RS_MULTISAMPLEMASK]); + wined3d_device_context_set_blend_state(context, blend_state, &colour, + state->rs[WINED3D_RS_MULTISAMPLEMASK]); if (wine_rb_put(&device->blend_states, &desc, &blend_state->entry) == -1) { ERR("Failed to insert blend state.\n"); @@ -4276,12 +4279,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->depth_stencil_states, &desc))) { depth_stencil_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_depth_stencil_state, entry); - wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); + wined3d_device_context_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); } else if (SUCCEEDED(wined3d_depth_stencil_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); + wined3d_device_context_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); if (wine_rb_put(&device->depth_stencil_states, &desc, &depth_stencil_state->entry) == -1) { ERR("Failed to insert depth/stencil state.\n"); @@ -4325,22 +4328,22 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } if (changed->indices) - wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_context_set_index_buffer(context, state->index_buffer, state->index_format, 0); wined3d_device_set_base_vertex_index(device, state->base_vertex_index); if (changed->vertexDecl) - wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + wined3d_device_context_set_vertex_declaration(context, state->vertex_declaration); if (changed->material) wined3d_device_set_material(device, &state->material); if (changed->viewport) - wined3d_device_set_viewports(device, 1, &state->viewport); + wined3d_device_context_set_viewports(context, 1, &state->viewport); if (changed->scissorRect) - wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + wined3d_device_context_set_scissor_rects(context, 1, &state->scissor_rect); map = changed->streamSource; while (map) { i = wined3d_bit_scan(&map); - wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + wined3d_device_context_set_stream_source(context, i, state->streams[i].buffer, state->streams[i].offset, state->streams[i].stride); } map = changed->streamFreq; @@ -5696,9 +5699,10 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_reset_cb callback, BOOL reset_state) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; + struct wined3d_device_context *context = &device->cs->c; struct wined3d_swapchain_state *swapchain_state; + struct wined3d_state *state = context->state; struct wined3d_swapchain_desc *current_desc; - struct wined3d_state *state = device->cs->c.state; struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_swapchain *swapchain; @@ -5737,9 +5741,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); + wined3d_device_context_set_rendertarget_view(context, i, NULL, FALSE); } - wined3d_device_set_depth_stencil_view(device, NULL); + wined3d_device_context_set_depth_stencil_view(context, NULL); if (reset_state) { @@ -5961,9 +5965,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, else { if ((view = device->back_buffer_view)) - wined3d_device_set_rendertarget_view(device, 0, view, FALSE); + wined3d_device_context_set_rendertarget_view(context, 0, view, FALSE); if ((view = device->auto_depth_stencil_view)) - wined3d_device_set_depth_stencil_view(device, view); + wined3d_device_context_set_depth_stencil_view(context, view); } if (reset_state) -- 2.30.2

2 3

[PATCH vkd3d 1/5] vkd3d-shader: Write SM1 constant instructions.
by Zebediah Figura May 20, 2021

May 20, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 05aea217..f6628a2e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1663,6 +1663,29 @@ static void write_sm1_semantic_dcls(struct hlsl_ctx *ctx, struct bytecode_buffer } } +static void write_sm1_constant(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_node *instr) +{ + const struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); + struct sm1_instruction sm1_instr = + { + .opcode = D3DSIO_MOV, + + .dst.type = D3DSPR_TEMP, + .dst.reg = instr->reg.id, + .dst.writemask = instr->reg.writemask, + .has_dst = 1, + + .srcs[0].type = D3DSPR_CONST, + .srcs[0].reg = constant->reg.id, + .srcs[0].swizzle = swizzle_from_writemask(constant->reg.writemask), + .src_count = 1, + }; + + assert(instr->reg.allocated); + assert(constant->reg.allocated); + write_sm1_instruction(ctx, buffer, &sm1_instr); +} + static void write_sm1_load(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); @@ -1768,6 +1791,10 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct bytecode_buffer switch (instr->type) { + case HLSL_IR_CONSTANT: + write_sm1_constant(ctx, buffer, instr); + break; + case HLSL_IR_LOAD: write_sm1_load(ctx, buffer, instr); break; -- 2.31.1

3 14

[PATCH 1/4] kernelbase: Support PROC_THREAD_ATTRIBUTE_JOB_LIST in UpdateProcThreadAttribute().
by Paul Gofman May 20, 2021

May 20, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 54 +++++++++++++++++++++++++++++++++++ dlls/kernelbase/process.c | 8 ++++++ 2 files changed, 62 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 52c3036fe59..9acf0aaaaee 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4537,6 +4537,59 @@ static void test_nested_jobs(void) CloseHandle(job2); } +static void test_job_list_attribute(void) +{ + PPROC_THREAD_ATTRIBUTE_LIST attrs; + HANDLE jobs[2]; + SIZE_T size; + BOOL ret; + + if (!pInitializeProcThreadAttributeList) + { + win_skip("No support for ProcThreadAttributeList\n"); + return; + } + + ret = pInitializeProcThreadAttributeList(NULL, 1, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + attrs = heap_alloc(size); + + + jobs[0] = (HANDLE)0xdeadbeef; + jobs[1] = NULL; + + ret = pInitializeProcThreadAttributeList(attrs, 1, 0, &size); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = pUpdateProcThreadAttribute(attrs, 0, PROC_THREAD_ATTRIBUTE_JOB_LIST, jobs, + sizeof(*jobs), NULL, NULL); + if (!ret && GetLastError() == ERROR_NOT_SUPPORTED) + { + /* Supported since Win10. */ + win_skip("PROC_THREAD_ATTRIBUTE_JOB_LIST is not supported.\n"); + pDeleteProcThreadAttributeList(attrs); + heap_free(attrs); + return; + } + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + ret = pInitializeProcThreadAttributeList(attrs, 1, 0, &size); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = pUpdateProcThreadAttribute(attrs, 0, PROC_THREAD_ATTRIBUTE_JOB_LIST, jobs, + 3, NULL, NULL); + ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "Got unexpected ret %#x, GetLastError() %u.\n", + ret, GetLastError()); + + ret = pInitializeProcThreadAttributeList(attrs, 1, 0, &size); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = pUpdateProcThreadAttribute(attrs, 0, PROC_THREAD_ATTRIBUTE_JOB_LIST, jobs, + sizeof(*jobs) * 2, NULL, NULL); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + pDeleteProcThreadAttributeList(attrs); + heap_free(attrs); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -4688,6 +4741,7 @@ START_TEST(process) test_nested_jobs(); job = test_AddSelfToJob(); test_jobInheritance(job); + test_job_list_attribute(); test_BreakawayOk(job); CloseHandle(job); } diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index ae91168ecf4..06a90bf55ca 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1687,6 +1687,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH UpdateProcThreadAttribute( struct _PROC_THREAD_ATT } break; + case PROC_THREAD_ATTRIBUTE_JOB_LIST: + if ((size / sizeof(HANDLE)) * sizeof(HANDLE) != size) + { + SetLastError( ERROR_BAD_LENGTH ); + return FALSE; + } + break; + default: SetLastError( ERROR_NOT_SUPPORTED ); FIXME( "Unhandled attribute %lu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER ); -- 2.31.1

3 10

回复：[PATCH] ole32: Avoid the failure of flushing the ole clipboard when the clipboard manager gets the data.
by chenhaoyang＠uniontech.com May 20, 2021

May 20, 2021

1 0

[PATCH] winhttp: No need to search for proxy for localhost urls
by Jon Doron May 20, 2021

May 20, 2021

This will resolve the bug: https://bugs.winehq.org/show_bug.cgi?id=43011 Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/winhttp/session.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f052c3c569c..4a1a6803acb 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1872,6 +1872,21 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX return ret; } +static BOOL is_localhost( LPCWSTR url ) +{ + LPCWSTR scheme; + + scheme = wcsstr(url, L"://"); + if (!scheme) + { + return FALSE; + } + + return !wcsnicmp( scheme, L"://127.0.0.1", _countof(L"://127.0.0.1") - 1 ) || + !wcsnicmp( scheme, L"://localhost", _countof(L"://localhost") - 1) || + !wcsnicmp( scheme, L"://::1", _countof(L"://::1") - 1 ); +} + /*********************************************************************** * WinHttpGetProxyForUrl (winhttp.@) */ @@ -1908,6 +1923,14 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } + + if (is_localhost(url)) + { + release_object( &session->hdr ); + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT && !WinHttpDetectAutoProxyConfigUrl( options->dwAutoDetectFlags, &detected_pac_url )) goto done; -- 2.31.1

2 1

[PATCH] user32: Implement InternalGetWindowIcon().
by Zebediah Figura May 20, 2021

May 20, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47915 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 109 +++++++++++++++++++++++++++++++++++++++- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 51 +++++++++++++++++++ 3 files changed, 160 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a37afd2dc5e..3f58f7a2b11 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -64,6 +64,7 @@ static BOOL (WINAPI *pGetWindowDisplayAffinity)(HWND hwnd, DWORD *affinity); static BOOL (WINAPI *pSetWindowDisplayAffinity)(HWND hwnd, DWORD affinity); static BOOL (WINAPI *pAdjustWindowRectExForDpi)(LPRECT,DWORD,BOOL,DWORD,UINT); static BOOL (WINAPI *pSystemParametersInfoForDpi)(UINT,UINT,void*,UINT,UINT); +static HICON (WINAPI *pInternalGetWindowIcon)(HWND window, UINT type); static BOOL test_lbuttondown_flag; static DWORD num_gettext_msgs; @@ -2369,6 +2370,19 @@ todo_wine DestroyWindow(mdi_hwndMain); } +static DWORD WINAPI internal_get_icon_thread(void *arg) +{ + HICON icon; + BOOL ret; + + icon = pInternalGetWindowIcon( arg, ICON_BIG ); + ok( icon != 0, "expected nonzero icon\n" ); + ret = DestroyIcon( icon ); + ok( ret, "got error %u\n", GetLastError() ); + + return 0; +} + static void test_icons(void) { WNDCLASSEXA cls; @@ -2377,7 +2391,9 @@ static void test_icons(void) HICON icon2 = LoadIconA(0, (LPCSTR)IDI_QUESTION); HICON small_icon = LoadImageA(0, (LPCSTR)IDI_APPLICATION, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED ); - HICON res; + HICON res, res2, res3; + HANDLE thread; + BOOL ret; cls.cbSize = sizeof(cls); cls.style = 0; @@ -2400,35 +2416,125 @@ static void test_icons(void) res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_BIG, 0 ); ok( res == 0, "wrong big icon %p/0\n", res ); + SetLastError( 0xdeadbeef ); + res2 = pInternalGetWindowIcon( hwnd, ICON_BIG ); + ok( res2 != 0, "expected nonzero icon\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError() ); + res3 = pInternalGetWindowIcon( hwnd, ICON_BIG ); + ok( res3 && res3 != res2, "got %p\n", res3 ); + ret = DestroyIcon( res2 ); + ok( ret, "got error %u\n", GetLastError() ); + ret = DestroyIcon( res3 ); + ok( ret, "got error %u\n", GetLastError() ); + res = (HICON)SendMessageA( hwnd, WM_SETICON, ICON_BIG, (LPARAM)icon ); ok( res == 0, "wrong previous big icon %p/0\n", res ); res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_BIG, 0 ); ok( res == icon, "wrong big icon after set %p/%p\n", res, icon ); + res2 = pInternalGetWindowIcon( hwnd, ICON_BIG ); + ok( res2 && res2 != icon, "got %p\n", res2 ); + res3 = pInternalGetWindowIcon( hwnd, ICON_BIG ); + ok( res3 && res3 != res2, "got %p\n", res3 ); + ret = DestroyIcon( res2 ); + ok( ret, "got error %u\n", GetLastError() ); + ret = DestroyIcon( res3 ); + ok( ret, "got error %u\n", GetLastError() ); + res = (HICON)SendMessageA( hwnd, WM_SETICON, ICON_BIG, (LPARAM)icon2 ); ok( res == icon, "wrong previous big icon %p/%p\n", res, icon ); res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_BIG, 0 ); ok( res == icon2, "wrong big icon after set %p/%p\n", res, icon2 ); + res2 = pInternalGetWindowIcon( hwnd, ICON_BIG ); + ok( res2 && res2 != icon2, "got %p\n", res2 ); + ret = DestroyIcon( res2 ); + ok( ret, "got error %u\n", GetLastError() ); res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL, 0 ); ok( res == 0, "wrong small icon %p/0\n", res ); + res2 = pInternalGetWindowIcon( hwnd, ICON_SMALL ); + ok( res2 != 0, "expected nonzero icon\n" ); + res3 = pInternalGetWindowIcon( hwnd, ICON_SMALL ); + ok( res3 && res3 != res2, "got %p\n", res3 ); + ret = DestroyIcon( res2 ); + ok( ret, "got error %u\n", GetLastError() ); + ret = DestroyIcon( res3 ); + ok( ret, "got error %u\n", GetLastError() ); + res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 ); ok( (res && res != small_icon && res != icon2) || broken(!res), "wrong small2 icon %p\n", res ); + res2 = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 ); + ok( res2 == res, "expected icon to match\n" ); + res2 = pInternalGetWindowIcon( hwnd, ICON_SMALL2 ); + ok( res2 && res2 != small_icon && res2 != icon2 && res2 != res, "got %p\n", res2 ); + res3 = pInternalGetWindowIcon( hwnd, ICON_SMALL2 ); + ok( res3 && res3 != res2, "got %p\n", res3 ); + ret = DestroyIcon( res2 ); + ok( ret, "got error %u\n", GetLastError() ); + ret = DestroyIcon( res3 ); + ok( ret, "got error %u\n", GetLastError() ); + res = (HICON)SendMessageA( hwnd, WM_SETICON, ICON_SMALL, (LPARAM)icon ); ok( res == 0, "wrong previous small icon %p/0\n", res ); res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL, 0 ); ok( res == icon, "wrong small icon after set %p/%p\n", res, icon ); + res2 = pInternalGetWindowIcon( hwnd, ICON_SMALL ); + ok( res2 && res2 != icon, "got %p\n", res2 ); + res3 = pInternalGetWindowIcon( hwnd, ICON_SMALL ); + ok( res3 && res3 != res2, "got %p\n", res3 ); + ret = DestroyIcon( res2 ); + ok( ret, "got error %u\n", GetLastError() ); + ret = DestroyIcon( res3 ); + ok( ret, "got error %u\n", GetLastError() ); + res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 ); ok( res == icon || broken(!res), "wrong small2 icon after set %p/%p\n", res, icon ); + res2 = pInternalGetWindowIcon( hwnd, ICON_SMALL2 ); + ok( res2 && res2 != icon && res2 != res, "got %p\n", res2 ); + res3 = pInternalGetWindowIcon( hwnd, ICON_SMALL2 ); + ok( res3 && res3 != res2, "got %p\n", res3 ); + ret = DestroyIcon( res2 ); + ok( ret, "got error %u\n", GetLastError() ); + ret = DestroyIcon( res3 ); + ok( ret, "got error %u\n", GetLastError() ); + res = (HICON)SendMessageA( hwnd, WM_SETICON, ICON_SMALL, (LPARAM)small_icon ); ok( res == icon, "wrong previous small icon %p/%p\n", res, icon ); res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL, 0 ); ok( res == small_icon, "wrong small icon after set %p/%p\n", res, small_icon ); + res2 = pInternalGetWindowIcon( hwnd, ICON_SMALL ); + ok( res2 && res2 != small_icon, "got %p\n", res2 ); + ret = DestroyIcon( res2 ); + ok( ret, "got error %u\n", GetLastError() ); + res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 ); ok( res == small_icon || broken(!res), "wrong small2 icon after set %p/%p\n", res, small_icon ); + res2 = pInternalGetWindowIcon( hwnd, ICON_SMALL2 ); + ok( res2 && res2 != small_icon && res2 != res, "got %p\n", res2 ); + ret = DestroyIcon( res2 ); + ok( ret, "got error %u\n", GetLastError() ); /* make sure the big icon hasn't changed */ res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_BIG, 0 ); ok( res == icon2, "wrong big icon after set %p/%p\n", res, icon2 ); + res2 = pInternalGetWindowIcon( hwnd, ICON_BIG ); + ok( res2 && res2 != icon2, "got %p\n", res2 ); + ret = DestroyIcon( res2 ); + ok( ret, "got error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + res = pInternalGetWindowIcon( NULL, ICON_BIG ); + ok( !res, "got %p\n", res ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + res = pInternalGetWindowIcon( hwnd, 0xdeadbeef ); + ok( !res, "got %p\n", res ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); + + thread = CreateThread( NULL, 0, internal_get_icon_thread, hwnd, 0, NULL ); + ret = WaitForSingleObject( thread, 1000 ); + ok( !ret, "wait timed out\n" ); + CloseHandle( thread ); DestroyWindow( hwnd ); } @@ -12027,6 +12133,7 @@ START_TEST(win) pSetWindowDisplayAffinity = (void *)GetProcAddress( user32, "SetWindowDisplayAffinity" ); pAdjustWindowRectExForDpi = (void *)GetProcAddress( user32, "AdjustWindowRectExForDpi" ); pSystemParametersInfoForDpi = (void *)GetProcAddress( user32, "SystemParametersInfoForDpi" ); + pInternalGetWindowIcon = (void *)GetProcAddress( user32, "InternalGetWindowIcon" ); if (argc == 4) { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 190ee74fd6c..391e304a063 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -445,6 +445,7 @@ @ stdcall InsertMenuItemA(long long long ptr) @ stdcall InsertMenuItemW(long long long ptr) @ stdcall InsertMenuW(long long long long ptr) +@ stdcall InternalGetWindowIcon(ptr long) @ stdcall InternalGetWindowText(long ptr long) @ stdcall IntersectRect(ptr ptr ptr) @ stdcall InvalidateRect(long ptr long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 680defc2071..bd540953278 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4239,3 +4239,54 @@ BOOL WINAPI SetWindowCompositionAttribute(HWND hwnd, void *data) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * InternalGetWindowIcon (USER32.@) + */ +HICON WINAPI InternalGetWindowIcon( HWND hwnd, UINT type ) +{ + WND *win = WIN_GetPtr( hwnd ); + HICON ret; + + TRACE( "hwnd %p, type %#x\n", hwnd, type ); + + if (!win) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (win == WND_OTHER_PROCESS || win == WND_DESKTOP) + { + if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); + return 0; + } + + switch (type) + { + case ICON_BIG: + ret = win->hIcon; + if (!ret) ret = (HICON)GetClassLongPtrW( hwnd, GCLP_HICON ); + break; + + case ICON_SMALL: + ret = win->hIconSmall; + if (!ret) ret = (HICON)GetClassLongPtrW( hwnd, GCLP_HICONSM ); + break; + + case ICON_SMALL2: + ret = win->hIconSmall ? win->hIconSmall : win->hIconSmall2; + if (!ret) ret = (HICON)GetClassLongPtrW( hwnd, GCLP_HICONSM ); + break; + + default: + SetLastError( ERROR_INVALID_PARAMETER ); + WIN_ReleasePtr( win ); + return 0; + } + + if (!ret) ret = LoadIconW( 0, (const WCHAR *)IDI_WINLOGO ); + ret = CopyIcon( ret ); + + WIN_ReleasePtr( win ); + return ret; +} -- 2.30.2

3 2