October 2020 - Wine-commits

Georg Lehmann : winevulkan: Implement VK_EXT_debug_report.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 28d75542b728fdc44e4bd4e4ab6bd74e9f9ffd23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d75542b728fdc44e4bd4e4… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 21:18:54 2020 +0100 winevulkan: Implement VK_EXT_debug_report. Messages from the driver/layers won't be reported twice. Messages during instance creation by the host loader won't be reported, since the information is partly wrong and the windows loader reports the correct information. Other messages by the loader will be reported twice if lunarg's vulkan-1.dll is used. This shouldn't be a problem because the messages are just used for logging/debugging. Needed for Quake2RTX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49813 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 14 +++--- dlls/winevulkan/vulkan.c | 105 ++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_private.h | 26 ++++++++++ dlls/winevulkan/vulkan_thunks.c | 25 ++++++++++ dlls/winevulkan/vulkan_thunks.h | 9 ++++ include/wine/vulkan.h | 86 ++++++++++++++++++++++++++++++++ 6 files changed, 258 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28d75542b728fdc44e4b…

1 0

Georg Lehmann : winevulkan: Don't use comments for object types.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 44500d3cfc288fb5afb14061cae58cc9c32de867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44500d3cfc288fb5afb14061… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 22:02:46 2020 +0100 winevulkan: Don't use comments for object types. We shouldn't do that according to the Vulkan xml maintainer. https://github.com/KhronosGroup/Vulkan-Docs/pull/1379 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7e5bd030867..771efe8f5bb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2739,21 +2739,16 @@ class VkRegistry(object): def _match_object_types(self): """ Matches each handle with the correct object type. """ - for handle in self.handles: - if not handle.is_required() or handle.is_alias(): - continue - for value in self.enums["VkObjectType"].values: - if value.comment == handle.name: - handle.object_type = value.name - break - else: - LOGGER.warning("No object type found for {}".format(handle.name)) + # Use upper case comparison for simplicity. + object_types = {} + for value in self.enums["VkObjectType"].values: + object_name = "VK" + value.name[len("VK_OBJECT_TYPE"):].replace("_", "") + object_types[object_name] = value.name for handle in self.handles: - if not handle.is_required() or not handle.is_alias(): + if not handle.is_required(): continue - # Use the object type of the alias - handle.object_type = handle.alias.object_type + handle.object_type = object_types.get(handle.name.upper()) if not handle.object_type: LOGGER.warning("No object type found for {}".format(handle.name))

1 0

Georg Lehmann : winevulkan: Remove comment from VkEnumValue.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 4a213cae61ddb16123f94dc1b8c79e45969c4c5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a213cae61ddb16123f94dc1… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 22:02:47 2020 +0100 winevulkan: Remove comment from VkEnumValue. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 771efe8f5bb..edd56526d58 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -380,21 +380,20 @@ class VkEnum(object): # Value is either a value or a bitpos, only one can exist. value = v.attrib.get("value") alias_name = v.attrib.get("alias") - comment = v.attrib.get("comment") if alias_name: alias = next(x for x in values if x.name == alias_name) - values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex)) elif value: # Some values are in hex form. We want to preserve the hex representation # at least when we convert back to a string. Internally we want to use int. if "0x" in value: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True)) else: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0))) else: # bitmask value = 1 << int(v.attrib.get("bitpos")) - values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True)) # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, # which is to prepare for extensions as they can add values and hence affect @@ -445,12 +444,11 @@ class VkEnum(object): class VkEnumValue(object): - def __init__(self, name, value=None, hex=False, alias=None, comment=None): + def __init__(self, name, value=None, hex=False, alias=None): self.name = name self.value = value self.hex = hex self.alias = alias - self.comment = comment def __repr__(self): if self.is_alias(): @@ -2845,12 +2843,10 @@ class VkRegistry(object): if only_aliased and not aliased: return - comment = enum_elem.attrib.get("comment") - if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True, comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True)) elif "offset" in enum_elem.keys(): # Extensions promoted to Core, have the extension number as part @@ -2867,12 +2863,12 @@ class VkRegistry(object): if direction is not None: value = -value - enum.add(VkEnumValue(enum_elem.attrib["name"], value=value, comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=value)) elif "value" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]), comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]))) elif "alias" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"], comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"])) elif "value" in enum_elem.keys(): # Constants are not aliased, no need to add them here, they'll get added later on.

1 0

Daniel Lehman : wine.inf: Fix SA Eastern Standard Time Zone info.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 0bc752f30d79ac40b7c2588c72257ed06499cd24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bc752f30d79ac40b7c2588c… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Oct 28 21:44:44 2020 -0700 wine.inf: Fix SA Eastern Standard Time Zone info. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fba071fe0d8..72b10d354e0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3491,7 +3491,7 @@ HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Dlt",,"SA Eastern D HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Dlt",,"@tzres.dll,-40657" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Std",,"@tzres.dll,-40656" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Std",,"SA Eastern Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Display",,"America/Bogota" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Dlt",,"SA Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-49425"

1 0

Alexandre Julliard : gdi32: Add a helper to get the FreeType face and cleanup private data.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 402281b66862108bedaeb556c6efcbaf724388ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=402281b66862108bedaeb556… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:53:18 2020 +0100 gdi32: Add a helper to get the FreeType face and cleanup private data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 345 ++++++++++++++++++++++++-------------------------- 1 file changed, 167 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=402281b66862108bedae…

1 0

Huw Davies : riched20: Use a helper to find the next run.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: f9a82574c906129bdc4269a4972c4ef3dafd67d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9a82574c906129bdc4269a4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:51 2020 +0000 riched20: Use a helper to find the next run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 9e79eda274d..98ae352ab7b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1148,7 +1148,8 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, nChars -= nLen; cursor.nOffset = 0; - cursor.pRun = ME_FindItemFwd(cursor.pRun, diRun); + cursor.pRun = run_next_all_paras( &cursor.pRun->member.run ) ? + run_get_di( run_next_all_paras( &cursor.pRun->member.run ) ) : NULL; } heap_free(buffer);

1 0

Huw Davies : riched20: Use the paragraph from the cursor.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 6b9b7b2d0bed6c2dc022238084fb35815c3722c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b9b7b2d0bed6c2dc0222380… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:52 2020 +0000 riched20: Use the paragraph from the cursor. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/undo.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 72e3b74f4c8..d9c5d28d6dc 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -335,13 +335,11 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_set_para_fmt: { ME_Cursor tmp; - ME_DisplayItem *para; cursor_from_char_ofs( editor, undo->u.set_para_fmt.pos, &tmp ); - para = ME_FindItemBack(tmp.pRun, diParagraph); - add_undo_set_para_fmt( editor, &para->member.para ); - para->member.para.fmt = undo->u.set_para_fmt.fmt; - para->member.para.border = undo->u.set_para_fmt.border; - para_mark_rewrap( editor, &para->member.para ); + add_undo_set_para_fmt( editor, &tmp.pPara->member.para ); + tmp.pPara->member.para.fmt = undo->u.set_para_fmt.fmt; + tmp.pPara->member.para.border = undo->u.set_para_fmt.border; + para_mark_rewrap( editor, &tmp.pPara->member.para ); break; } case undo_set_char_fmt:

1 0

Huw Davies : riched20: Use a helper to retrieve the first run.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 5d179e4b39a0c52a23d61430fc7a567fb381b22e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d179e4b39a0c52a23d61430… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:53 2020 +0000 riched20: Use a helper to retrieve the first run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 046a7fd5423..75bbb2c05c5 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -886,7 +886,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag linespace = ME_GetParaLineSpace( c, para ); ME_BeginRow( &wc ); - run = &ME_FindItemFwd( para_get_di( para ), diRun )->member.run; + run = para_first_run( para ); while (run) { run = ME_WrapHandleRun( &wc, run );

1 0

Michael Stefaniuc : sapi: Zero terminate some WCHAR strings.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: cc32682130b88decf506df6dceef426c51bd3c27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc32682130b88decf506df6d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:09 2020 +0100 sapi: Zero terminate some WCHAR strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/token.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b4a318b4ade..04fa3a25d6a 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -372,28 +372,28 @@ static HRESULT WINAPI token_category_EnumValues( ISpObjectTokenCategory *iface, static HRESULT parse_cat_id( const WCHAR *str, HKEY *root, const WCHAR **sub_key ) { - static const WCHAR HKLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\'}; - static const WCHAR HKCU[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\'}; struct table { const WCHAR *name; - int size; + unsigned int len; HKEY key; } table[] = { - { HKLM, sizeof(HKLM), HKEY_LOCAL_MACHINE }, - { HKCU, sizeof(HKCU), HKEY_CURRENT_USER }, +#define X(s) s, ARRAY_SIZE(s) - 1 + { X(L"HKEY_LOCAL_MACHINE\\"), HKEY_LOCAL_MACHINE }, + { X(L"HKEY_CURRENT_USER\\"), HKEY_CURRENT_USER }, { NULL } +#undef X }; struct table *ptr; int len = lstrlenW( str ); for (ptr = table; ptr->name; ptr++) { - if (len >= ptr->size / sizeof(ptr->name[0]) && !memcmp( str, ptr->name, ptr->size )) + if (len >= ptr->len && !wcsncmp( str, ptr->name, ptr->len )) { *root = ptr->key; - *sub_key = str + ptr->size / sizeof(ptr->name[0]); + *sub_key = str + ptr->len; return S_OK; } }

1 0

Michael Stefaniuc : powrprof: Use wide-char string literals.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 6594079920602a8b1f97817a6ad27364265b2a23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6594079920602a8b1f97817a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:10 2020 +0100 powrprof: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 5f00c7b6317..fc6f5706f87 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -45,20 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(powrprof); * implementing these functions is going to have to wait until somebody can * cobble together some sane test input. */ -static const WCHAR szPowerCfgSubKey[] = { 'S', 'o', 'f', 't', 'w', 'a', 'r', 'e', - '\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', - 'n', 'd', 'o', 'w', 's', '\\', 'C', 'u', 'r', 'r', 'e', 'n', 't', - 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'C', 'o', 'n', 't', 'r', - 'o', 'l', 's', ' ', 'F', 'o', 'l', 'd', 'e', 'r', '\\', 'P', 'o', - 'w', 'e', 'r', 'C', 'f', 'g', 0 }; -static const WCHAR szSemaphoreName[] = { 'P', 'o', 'w', 'e', 'r', 'P', 'r', 'o', - 'f', 'i', 'l', 'e', 'R', 'e', 'g', 'i', 's', 't', 'r', 'y', 'S', - 'e', 'm', 'a', 'p', 'h', 'o', 'r', 'e', 0 }; -static const WCHAR szDiskMax[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'a', 'x', 0 }; -static const WCHAR szDiskMin[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'i', 'n', 0 }; -static const WCHAR szLastID[] = { 'L', 'a', 's', 't', 'I', 'D', 0 }; +static const WCHAR szPowerCfgSubKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg"; static HANDLE PPRegSemaphore = NULL; NTSTATUS WINAPI CallNtPowerInformation( @@ -172,7 +159,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) return TRUE; } - r = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"DiskSpindownMax", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open DiskSpinDownMax: %d\n", r); TRACE("Using default: 3600\n"); @@ -183,7 +170,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"DiskSpindownMin", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open DiskSpinDownMin: %d\n", r); TRACE("Using default: 3\n"); @@ -360,14 +347,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } else { BYTE lpValue[40]; DWORD cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"LastID", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); } RegCloseKey(hKey); } - PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName); + PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, L"PowerProfileRegistrySemaphore"); if (PPRegSemaphore == NULL) { ERR("Couldn't create Semaphore: %d\n", GetLastError()); return FALSE;

1 0