January 2022 - Wine-commits

Francois Gouget : testbot/SetWinLocale: Reorder the locales handling.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: tools Branch: master Commit: 1b54b035c68b7e0daf918c5470a6dc66cb8e7e0d URL: https://source.winehq.org/git/tools.git/?a=commit;h=1b54b035c68b7e0daf918c5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 25 16:48:45 2022 +0100 testbot/SetWinLocale: Reorder the locales handling. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 8d8f866..0b034b7 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -293,7 +293,7 @@ sub CheckLocale($$) } my ($OptHostName, $OptShow, $OptReboot); -my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard, $OptUTF8); +my ($OptDefault, $OptLocale, $OptCountry, $OptSystem, $OptUTF8, $OptMUI, $OptKeyboard); while (@ARGV) { my $Arg = shift @ARGV; @@ -331,10 +331,18 @@ while (@ARGV) { $OptLocale = CheckLocale($Arg, $OptLocale); } + elsif ($Arg eq "--country") + { + $OptCountry = CheckValue($Arg, $OptCountry); + } elsif ($Arg eq "--system") { $OptSystem = CheckLocale($Arg, $OptSystem); } + elsif ($Arg eq "--utf8") + { + $OptUTF8 = 1; + } elsif ($Arg eq "--mui") { $OptMUI = CheckLocale($Arg, $OptMUI); @@ -343,14 +351,6 @@ while (@ARGV) { $OptKeyboard = CheckLocale($Arg, $OptKeyboard); } - elsif ($Arg eq "--country") - { - $OptCountry = CheckValue($Arg, $OptCountry); - } - elsif ($Arg eq "--utf8") - { - $OptUTF8 = 1; - } elsif ($Arg eq "--debug") { $Debug = 1; @@ -429,7 +429,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-reboot] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; @@ -446,6 +446,11 @@ if (defined $Usage) print " format.\n"; print " . APIs: GetUserDefaultLCID().\n"; print " . Powershell: Set-Culture LOC\n"; + print " --country CTY Specifies the location using only the country part of the\n"; + print " Windows locale (see --defaults).\n"; + print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; + print " . APIs: GetUserGeoID().\n"; + print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; @@ -470,11 +475,6 @@ if (defined $Usage) print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; print " Override for default input method.\n"; print " . Powershell: Set-WinDefaultInputMethodOverride -InputTip KBD-ID\n"; - print " --country CTY Specifies the location using only the country part of the\n"; - print " Windows locale (see --defaults).\n"; - print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; - print " . APIs: GetUserGeoID().\n"; - print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot.\n"; print " --debug Show more detailed information about progress.\n"; @@ -870,14 +870,6 @@ if ($OptLocale) CheckSetting($Settings, "Locale", "0000$LCIDLocale", "for --locale $OptLocale", 1); CheckSetting($Settings, "LocaleName", $OptLocale, "for --locale $OptLocale"); } -if ($KeyboardIds) -{ - CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); -} -if ($OptMUI) -{ - CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); -} if ($OptCountry) { CheckSetting($Settings, "Country", $CountryId, "for --country $OptCountry"); @@ -895,8 +887,15 @@ if ($OptUTF8) CheckSetting($Settings, $VName, "65001", "for --utf8"); } } -exit(1) if (!$Success); - +if ($OptMUI) +{ + CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); +} +if ($KeyboardIds) +{ + CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); +} +exit(1) if (!$Success); Debug(Elapsed($Start), " All done!\n"); exit(0);

1 0

Francois Gouget : testbot/SetWinLocale: Add more information to the usage message.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: tools Branch: master Commit: 1f35a8d3ba4d9f2497357fae156b0db037a2f54f URL: https://source.winehq.org/git/tools.git/?a=commit;h=1f35a8d3ba4d9f2497357fa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 25 16:48:49 2022 +0100 testbot/SetWinLocale: Add more information to the usage message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 0b034b7..42a106b 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -452,12 +452,16 @@ if (defined $Usage) print " . APIs: GetUserGeoID().\n"; print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; + print " . This requires elevated privileges.\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; print " . APIs: GetSystemDefaultLCID(), GetThreadLocale().\n"; print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; print " --utf8 Set the code pages (ACP, MACCP and OEMCP) to UTF-8.\n"; + print " . This requires elevated privileges.\n"; + print " . Only supported on Windows 10+. This will render older Windows\n"; + print " versions unbootable.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale ->\n"; print " Beta: Use Unicode UTF-8 for worldwide language support.\n"; @@ -475,8 +479,9 @@ if (defined $Usage) print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; print " Override for default input method.\n"; print " . Powershell: Set-WinDefaultInputMethodOverride -InputTip KBD-ID\n"; - print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; - print " effect after the next reboot.\n"; + print " --no-reboot Do not reboot Windows. Some locale changes only take effect\n"; + print " after a reboot so this option should only be used for\n"; + print " debugging.\n"; print " --debug Show more detailed information about progress.\n"; print " --help Shows this usage message.\n"; exit 0;

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in stateblock_savedstates_set_all().
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: wine Branch: master Commit: 98d3624f2321d28b855445789de458b9f918bfc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98d3624f2321d28b85544578… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 24 13:59:07 2022 +0100 wined3d: Use wined3d_mask_from_size() in stateblock_savedstates_set_all(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6d174652b4a..c5ca5990009 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -219,7 +219,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, stateblock_set_all_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; - states->clipplane = (1u << WINED3D_MAX_CLIP_DISTANCES) - 1; + states->clipplane = wined3d_mask_from_size(WINED3D_MAX_CLIP_DISTANCES); states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff; states->vertexShaderConstantsB = 0xffff;

1 0

Zebediah Figura : d3d11: Report D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: wine Branch: master Commit: 59636714e71d15e63ec8e2eaf0e0740188c5be49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59636714e71d15e63ec8e2ea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 21 11:52:17 2022 -0600 d3d11: Report D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 +- dlls/d3d11/device.c | 1 + dlls/d3d11/tests/d3d11.c | 10 ++++++---- dlls/wined3d/directx.c | 6 +++++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index ffab5cbfca3..08566fbcd5f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13630,7 +13630,7 @@ static void check_format_support(const unsigned int *format_support, continue; } - todo_wine + todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) ok(supported, "Format %#x - %s supported, format support %#x.\n", format, feature_name, format_support[format]); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index eb8a7e65ccd..dc2edf71446 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3757,6 +3757,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * flag_mapping[] = { {WINED3D_RTYPE_BUFFER, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_BUFFER}, + {WINED3D_RTYPE_BUFFER, WINED3D_BIND_VERTEX_BUFFER, 0, D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER}, {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0ab38e366d3..3302e7c3c2b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20645,8 +20645,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE if (formats[i].fl_required <= feature_level) { - todo_wine ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", - format, feature_name, feature_level, format_support[format]); + todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) + ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", + format, feature_name, feature_level, format_support[format]); continue; } @@ -20658,8 +20659,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE continue; } - ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", - format, feature_name, feature_level, format_support[format]); + todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) + ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", + format, feature_name, feature_level, format_support[format]); } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b2925eb97e9..334a520072d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1821,7 +1821,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, allowed_usage = WINED3DUSAGE_DYNAMIC; allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE - | WINED3D_BIND_UNORDERED_ACCESS; + | WINED3D_BIND_UNORDERED_ACCESS + | WINED3D_BIND_VERTEX_BUFFER; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER; break; @@ -1853,6 +1854,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, format_flags |= WINED3DFMT_FLAG_DEPTH_STENCIL; if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) format_flags |= WINED3DFMT_FLAG_UNORDERED_ACCESS; + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + format_flags |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE; + if (usage & WINED3DUSAGE_QUERY_FILTER) format_flags |= WINED3DFMT_FLAG_FILTERING; if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING)

1 0

Zebediah Figura : d3d11: Report D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: wine Branch: master Commit: 9206277105bdc3aa25fce967d746ac177d9452eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9206277105bdc3aa25fce967… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 21 11:52:18 2022 -0600 d3d11: Report D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER. This fixes a black screen in The Unfinished Swan. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 +- dlls/d3d11/device.c | 1 + dlls/d3d11/tests/d3d11.c | 4 ++-- dlls/wined3d/directx.c | 5 ++++- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 08566fbcd5f..ea710038e17 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13630,7 +13630,7 @@ static void check_format_support(const unsigned int *format_support, continue; } - todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) + todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY) ok(supported, "Format %#x - %s supported, format support %#x.\n", format, feature_name, format_support[format]); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index dc2edf71446..cb2969d8cf6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3758,6 +3758,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * { {WINED3D_RTYPE_BUFFER, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_BUFFER}, {WINED3D_RTYPE_BUFFER, WINED3D_BIND_VERTEX_BUFFER, 0, D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER}, + {WINED3D_RTYPE_BUFFER, WINED3D_BIND_INDEX_BUFFER, 0, D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER}, {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3302e7c3c2b..1e2f04a50ac 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20645,7 +20645,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE if (formats[i].fl_required <= feature_level) { - todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) + todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY) ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]); continue; @@ -20659,7 +20659,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE continue; } - todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) + todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_DISPLAY) ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 334a520072d..1b34d2eceaa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1822,7 +1822,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, allowed_usage = WINED3DUSAGE_DYNAMIC; allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_UNORDERED_ACCESS - | WINED3D_BIND_VERTEX_BUFFER; + | WINED3D_BIND_VERTEX_BUFFER + | WINED3D_BIND_INDEX_BUFFER; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER; break; @@ -1856,6 +1857,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, format_flags |= WINED3DFMT_FLAG_UNORDERED_ACCESS; if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) format_flags |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE; + if (bind_flags & WINED3D_BIND_INDEX_BUFFER) + format_flags |= WINED3DFMT_FLAG_INDEX_BUFFER; if (usage & WINED3DUSAGE_QUERY_FILTER) format_flags |= WINED3DFMT_FLAG_FILTERING; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 69c73487240..e50d42ead92 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -345,8 +345,9 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_R32G32_SINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, {WINED3DFMT_R32_TYPELESS, WINED3DFMT_FLAG_CAST_TO_BLOCK}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32_UINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32_UINT, WINED3DFMT_FLAG_CAST_TO_BLOCK | WINED3DFMT_FLAG_INDEX_BUFFER}, {WINED3DFMT_R32_SINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R16_UINT, WINED3DFMT_FLAG_INDEX_BUFFER}, }; static void rgb888_from_rgb565(WORD rgb565, BYTE *r, BYTE *g, BYTE *b) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 95a3b08f78a..8e45b61c61e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5955,6 +5955,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_BLIT 0x02000000 #define WINED3DFMT_FLAG_MAPPABLE 0x04000000 #define WINED3DFMT_FLAG_CAST_TO_BLOCK 0x08000000 +#define WINED3DFMT_FLAG_INDEX_BUFFER 0x10000000 struct wined3d_rational {

1 0

Gabriel Ivăncescu : mshtml: Fix leak on failure in return_nsstr.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: wine Branch: master Commit: 89317f533b7c6d244301d0a83c20879a209b1409 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89317f533b7c6d244301d0a8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 7 17:43:44 2022 +0200 mshtml: Fix leak on failure in return_nsstr. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 25ad92d5ddf..32ae792625c 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -917,6 +917,7 @@ HRESULT map_nsresult(nsresult nsres) HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) { const PRUnichar *str; + HRESULT hres = S_OK; if(NS_FAILED(nsres)) { WARN("failed: %08x\n", nsres); @@ -929,13 +930,13 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) if(*str) { *p = SysAllocString(str); if(!*p) - return E_OUTOFMEMORY; + hres = E_OUTOFMEMORY; }else { *p = NULL; } nsAString_Finish(nsstr); - return S_OK; + return hres; } HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, VARIANT *p)

1 0

Alistair Leslie-Hughes : include: Add trnlcl.idl.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: wine Branch: master Commit: 2cc43651aa392f97606f27d5614165f64055d00a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc43651aa392f97606f27d5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jan 22 10:13:56 2022 +1100 include: Add trnlcl.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 27 +++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnlcl.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index dc0f2261096..e6ddf9b4885 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1769,3 +1769,30 @@ HRESULT CALLBACK ITransactionJoin_JoinTransaction_Proxy(ITransactionJoin* This, FIXME("(%p)->(%p, %d, 0x%08x, %p): stub\n", This, unk, level, flags, options); return E_NOTIMPL; } + +HRESULT __RPC_STUB ITransactionLocal_GetOptionsObject_Stub(ITransactionLocal* This, + ITransactionOptions **options, IErrorInfo **info) +{ + FIXME("(%p)->(%p, %p): stub\n", This, options, info); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionLocal_GetOptionsObject_Proxy(ITransactionLocal* This, ITransactionOptions **options) +{ + FIXME("(%p)->(%p): stub\n", This, options); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionLocal_StartTransaction_Proxy(ITransactionLocal* This, ISOLEVEL level, + ULONG flags, ITransactionOptions *options, ULONG *trans_level) +{ + FIXME("(%p)->(%d, 0x%08x, %p, %p): stub\n", This, level, flags, options, trans_level); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionLocal_StartTransaction_Stub(ITransactionLocal* This, ISOLEVEL level, + ULONG flags, ITransactionOptions *options, ULONG *trans_level, IErrorInfo **info) +{ + FIXME("(%p)->(%d, 0x%08x, %p, %p, %p): stub\n", This, level, flags, options, trans_level, info); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index e5ae8429ed0..b965bdb9917 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -717,6 +717,7 @@ SOURCES = \ traffic.h \ transact.idl \ trnjoi.idl \ + trnlcl.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index abd4d55069c..d7e56f222e6 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -81,6 +81,7 @@ typedef LONG_PTR DB_LRESERVE; #include "mulres.idl" #include "transact.idl" #include "trnjoi.idl" +#include "trnlcl.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnlcl.idl b/include/trnlcl.idl new file mode 100644 index 00000000000..5224997b38f --- /dev/null +++ b/include/trnlcl.idl @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2022 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a5f-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionLocal : ITransaction +{ + [local] + HRESULT GetOptionsObject([out] ITransactionOptions **options); + + [call_as(GetOptionsObject)] + HRESULT RemoteGetOptionsObject([out] ITransactionOptions **options, [out] IErrorInfo **info); + + [local] + HRESULT StartTransaction([in] ISOLEVEL level, [in] ULONG flags, [in] ITransactionOptions *options, [out] ULONG *trans_level); + + [call_as(StartTransaction)] + HRESULT RemoteStartTransaction([in] ISOLEVEL level, [in] ULONG flags, [in] ITransactionOptions *options, + [in, out] ULONG *trans_level, [out] IErrorInfo **info); +}

1 0

Alistair Leslie-Hughes : include: Add trnobj.idl.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: wine Branch: master Commit: d8d1acef96d660bb58cf0a3094023670b97e7927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8d1acef96d660bb58cf0a30… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jan 22 10:13:57 2022 +1100 include: Add trnobj.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnobj.idl | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index e6ddf9b4885..5ee126b5926 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1796,3 +1796,17 @@ HRESULT __RPC_STUB ITransactionLocal_StartTransaction_Stub(ITransactionLocal* Th FIXME("(%p)->(%d, 0x%08x, %p, %p, %p): stub\n", This, level, flags, options, trans_level, info); return E_NOTIMPL; } + +HRESULT CALLBACK ITransactionObject_GetTransactionObject_Proxy(ITransactionObject* This, + ULONG level, ITransaction **transaction) +{ + FIXME("(%p)->(%d, %p): stub\n", This, level, transaction); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionObject_GetTransactionObject_Stub(ITransactionObject* This, + ULONG level, ITransaction **transaction, IErrorInfo **info) +{ + FIXME("(%p)->(%d, %p, %p): stub\n", This, level, transaction, info); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index b965bdb9917..7fcf5f0ba7b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -718,6 +718,7 @@ SOURCES = \ transact.idl \ trnjoi.idl \ trnlcl.idl \ + trnobj.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index d7e56f222e6..ce8aa74138a 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -82,6 +82,7 @@ typedef LONG_PTR DB_LRESERVE; #include "transact.idl" #include "trnjoi.idl" #include "trnlcl.idl" +#include "trnobj.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnobj.idl b/include/trnobj.idl new file mode 100644 index 00000000000..f33aaaf384e --- /dev/null +++ b/include/trnobj.idl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2022 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a60-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionObject : IUnknown { + + [local] + HRESULT GetTransactionObject([in] ULONG level, [out] ITransaction **transaction); + + [call_as(GetTransactionObject)] + HRESULT RemoteGetTransactionObject([in] ULONG level, [out] ITransaction **transaction, [out] IErrorInfo **info); +}

1 0

Alistair Leslie-Hughes : msdasql/tests: Test for ITransaction* interfaces on a session.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: wine Branch: master Commit: 513feedff77bf1474d7a8ab49d4053ef8e5181c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=513feedff77bf1474d7a8ab4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jan 22 10:13:58 2022 +1100 msdasql/tests: Test for ITransaction* interfaces on a session. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/tests/provider.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index dfe3e3af886..ce3573fbfd7 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -409,6 +409,9 @@ static void test_sessions(void) IGetDataSource *datasource = NULL; ISessionProperties *session_props = NULL; IUnknown *unimplemented = NULL; + ITransaction *transaction = NULL; + ITransactionLocal *local = NULL; + ITransactionObject *object = NULL; ITransactionJoin *join = NULL; IUnknown *cmd = NULL; HRESULT hr; @@ -463,6 +466,19 @@ static void test_sessions(void) IDBProperties_Release(dsource); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ITransaction, (void**)&transaction); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + ITransaction_Release(transaction); + + hr = IUnknown_QueryInterface(session, &IID_ITransactionLocal, (void**)&local); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + ITransactionLocal_Release(local); + + hr = IUnknown_QueryInterface(session, &IID_ITransactionObject, (void**)&object); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if(hr == S_OK)

1 0

Alexandre Julliard : include: Define a few more intrinsic functions.
by Alexandre Julliard 24 Jan '22

24 Jan '22

Module: wine Branch: master Commit: 4c2b6af10f779860830cc4b9f8a92d1ff6c55a80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c2b6af10f779860830cc4b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 21:43:57 2022 +0100 include: Define a few more intrinsic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 90 ++++++++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 52 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index c80efee077d..9296a3dc555 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6262,60 +6262,12 @@ typedef enum _PROCESS_MITIGATION_POLICY MaxProcessMitigationPolicy } PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; -#ifdef _MSC_VER - -BOOLEAN _BitScanForward(unsigned long*,unsigned long); -BOOLEAN _BitScanReverse(unsigned long*,unsigned long); - -#pragma intrinsic(_BitScanForward) -#pragma intrinsic(_BitScanReverse) - -static inline BOOLEAN BitScanForward(DWORD *index, DWORD mask) -{ - return _BitScanForward((unsigned long*)index, mask); -} - -static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) -{ - return _BitScanReverse((unsigned long*)index, mask); -} - -#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) - -static inline BOOLEAN BitScanForward(DWORD *index, DWORD mask) -{ - *index = __builtin_ctz(mask); - return mask != 0; -} -static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) -{ - *index = 31 - __builtin_clz(mask); - return mask != 0; -} - -#else - -static inline BOOLEAN BitScanForward(DWORD *index, DWORD mask) -{ - unsigned int r = 0; - while (r < 31 && !(mask & (1 << r))) r++; - *index = r; - return mask != 0; -} - -static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) -{ - unsigned int r = 31; - while (r > 0 && !(mask & (1 << r))) r--; - *index = r; - return mask != 0; -} - -#endif - -/* Interlocked functions */ +/* Intrinsic functions */ +#define BitScanForward _BitScanForward +#define BitScanReverse _BitScanReverse +#define InterlockedAdd _InlineInterlockedAdd #define InterlockedAnd _InterlockedAnd #define InterlockedCompareExchange _InterlockedCompareExchange #define InterlockedCompareExchange64 _InterlockedCompareExchange64 @@ -6328,9 +6280,12 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #define InterlockedIncrement _InterlockedIncrement #define InterlockedIncrement16 _InterlockedIncrement16 #define InterlockedOr _InterlockedOr +#define InterlockedXor _InterlockedXor #ifdef _MSC_VER +#pragma intrinsic(_BitScanForward) +#pragma intrinsic(_BitScanReverse) #pragma intrinsic(_InterlockedAnd) #pragma intrinsic(_InterlockedCompareExchange) #pragma intrinsic(_InterlockedCompareExchange64) @@ -6341,7 +6296,10 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedDecrement) #pragma intrinsic(_InterlockedDecrement16) #pragma intrinsic(_InterlockedOr) +#pragma intrinsic(_InterlockedXor) +BOOLEAN _BitScanForward(unsigned long*,unsigned long); +BOOLEAN _BitScanReverse(unsigned long*,unsigned long); long _InterlockedAnd(long volatile *,long); long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); @@ -6352,6 +6310,12 @@ long _InterlockedExchangeAdd(long volatile*,long); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); +long _InterlockedXor(long volatile *,long); + +static FORCEINLINE long InterlockedAdd( long volatile *dest, long val ) +{ + return InterlockedExchangeAdd( dest, val ) + val; +} #if !defined(__i386__) || _MSC_VER >= 1600 @@ -6412,6 +6376,23 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__GNUC__) +static FORCEINLINE BOOLEAN WINAPI BitScanForward(DWORD *index, DWORD mask) +{ + *index = __builtin_ctz( mask ); + return mask != 0; +} + +static FORCEINLINE BOOLEAN WINAPI BitScanReverse(DWORD *index, DWORD mask) +{ + *index = 31 - __builtin_clz( mask ); + return mask != 0; +} + +static FORCEINLINE LONG WINAPI InterlockedAdd( LONG volatile *dest, LONG val ) +{ + return __sync_add_and_fetch( dest, val ); +} + static FORCEINLINE LONG WINAPI InterlockedAnd( LONG volatile *dest, LONG val ) { return __sync_fetch_and_and( dest, val ); @@ -6491,6 +6472,11 @@ static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val ) return __sync_fetch_and_or( dest, val ); } +static FORCEINLINE LONG WINAPI InterlockedXor( LONG volatile *dest, LONG val ) +{ + return __sync_fetch_and_xor( dest, val ); +} + static FORCEINLINE void MemoryBarrier(void) { __sync_synchronize();

1 0