November 2021 - Wine-devel - list.winehq.org

[PATCH vkd3d] vkd3d-shader/hlsl: Define a symbolic constant to represent the D3D_SIF_TEXTURE_COMPONENTS shift.
by Henri Verbeet 08 Nov '21

08 Nov '21

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v4: Move the constant definition up with the other shader model 4 constant definitions. This supersedes patch 218887. libs/vkd3d-shader/hlsl_sm4.c | 2 +- libs/vkd3d-shader/sm4.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9d45e163..f8eb0a1e 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -561,7 +561,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) put_u32(&buffer, sm4_resource_format(var->data_type)); put_u32(&buffer, sm4_rdef_resource_dimension(var->data_type)); put_u32(&buffer, ~0u); /* FIXME: multisample count */ - flags |= (var->data_type->e.resource_format->dimx - 1) << 2; + flags |= (var->data_type->e.resource_format->dimx - 1) << VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT; } put_u32(&buffer, var->reg.id); put_u32(&buffer, 1); /* bind count */ diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index ddcb9a86..f6b4b612 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -146,6 +146,9 @@ #define VKD3D_SM4_TYPE_COMPONENT(com, i) (((com) >> (4 * (i))) & 0xfu) +/* The shift that corresponds to the D3D_SIF_TEXTURE_COMPONENTS mask. */ +#define VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT 2 + enum vkd3d_sm4_opcode { VKD3D_SM4_OP_ADD = 0x00, -- 2.20.1

1 0

[PATCH] win32u: use 7-bit ascii for unhandled encodings
by Aurélien Inacio 08 Nov '21

08 Nov '21

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/win32u/opentype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/opentype.c b/dlls/win32u/opentype.c index 10234c6d5aa..c206d6dae57 100644 --- a/dlls/win32u/opentype.c +++ b/dlls/win32u/opentype.c @@ -344,8 +344,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_MAC_ENCODING_THAI: return 10021; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; case OPENTYPE_PLATFORM_WIN: @@ -366,8 +366,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_WIN_ENCODING_JOHAB: return 1361; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; default: -- 2.30.2

2 1

[PATCH 2/2] win32u: Use a real family name as otmpFamilyName for substituted face.
by Akihiro Sagawa 08 Nov '21

08 Nov '21

GetTextFace remains to return the original face name, e.g. MS Shell Dlg. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 +- dlls/win32u/font.c | 26 +++++++++++++------------- dlls/win32u/ntgdi_private.h | 1 + 3 files changed, 15 insertions(+), 14 deletions(-)

2 1

[PATCH 1/2] gdi32/tests: Test substituted face family name.
by Akihiro Sagawa 08 Nov '21

08 Nov '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)

2 1

[PATCH v2 2/6] include: Add transact.idl to oledb.idl
by Alistair Leslie-Hughes 08 Nov '21

08 Nov '21

Since uuid.lib includes oledb.h, we get duplicate symbols in adsiid since uuid.lib is linked. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + libs/adsiid/adsiid.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/oledb.idl b/include/oledb.idl index 49c0c304b2d..b889d72bc38 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -79,6 +79,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstchg.idl" #include "rstupd.idl" #include "mulres.idl" +#include "transact.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/libs/adsiid/adsiid.c b/libs/adsiid/adsiid.c index fc0b8b1bf4e..e4e85d89b84 100644 --- a/libs/adsiid/adsiid.c +++ b/libs/adsiid/adsiid.c @@ -25,4 +25,3 @@ #include "initguid.h" #include "iads.h" -#include "transact.h" -- 2.33.0

2 1

[PATCH 1/7] dinput: Always call the device internal poll callback.
by Rémi Bernon 08 Nov '21

08 Nov '21

We normally should not peek messages here, but because of current winex11.drv design, we have to call MsgWaitForMultipleObjectsEx from time to time to pull keyboard or mouse events. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51956 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 3 +-- dlls/dinput/dinput_main.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d375229e2c0..c79b182bc66 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1535,10 +1535,9 @@ static HRESULT WINAPI dinput_device_Poll( IDirectInputDevice8W *iface ) EnterCriticalSection( &impl->crit ); if (!impl->acquired) hr = DIERR_NOTACQUIRED; LeaveCriticalSection( &impl->crit ); - if (hr != DI_OK) return hr; if (impl->vtbl->poll) return impl->vtbl->poll( iface ); - return DI_OK; + return hr; } static HRESULT WINAPI dinput_device_SendDeviceData( IDirectInputDevice8W *iface, DWORD size, diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 3286e887662..835a8656bd1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1430,6 +1430,8 @@ void check_dinput_events(void) * (for example Culpa Innata) * - some games only poll the device, and neither keyboard nor mouse * (for example Civilization: Call to Power 2) + * - some games do not explicitly poll for keyboard events + * (for example Morrowind in its key binding page) */ MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); } -- 2.33.1

2 8

[PATCH v6 0/6] gdi32/win32u: EMF fixes to support Hancom Office 2020
by Jinoh Kang 08 Nov '21

08 Nov '21

The following commits modify the behaviours of the following GDI functions: - StretchDIBits - SetDIBitsToDevice To match more closely to that of Windows 10, build 2108, subject to the following constraints: - The source image is not a JPEG (BI_JPEG) or a PNG (BI_PNG) image. - The source image is a *bottom-up* device-independent bitmap. Changelog: - v1 -> v2: add more tests, do extra work so that EMF outputs match - v2 -> v3: emf_parse_user_bitmapinfo: zero out *dst (BITMAPINFOHEADER) (gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC.) - v3 -> v4: no changes (resend due to borked up patch orders) - v4 -> v5: change subject (no more RFC); address review comments so far - v5 -> v6: remove two EMFDRV functions entirely clarify code in EMF DC patch uppercase subjects Jinoh Kang (6): win32u: Remove EMFDRV_StretchDIBits and EMFDRV_SetDIBitsToDevice. gdi32/tests: Add tests for recording StretchDIBits in EMFs. gdi32/tests: Add tests for recording SetDIBitsToDevice in EMFs. gdi32: Fix bounding box calculation for EMR_STRETCHDIBITS. gdi32: Allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC. gdi32: Calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE. dlls/gdi32/emfdc.c | 234 ++- dlls/gdi32/tests/metafile.c | 2803 +++++++++++++++++++++++++++++++++++ dlls/win32u/emfdrv.c | 22 +- 3 files changed, 3021 insertions(+), 38 deletions(-) -- 2.33.1

2 12

[PATCH] msiexec: Append .msi extension to file name if file is not found.
by Paul Gofman 08 Nov '21

08 Nov '21

Fixes Stellaris failing to install launcher at start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msi/tests/db.c | 18 ++++++++++++++++ programs/msiexec/msiexec.c | 44 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index eedfcac486d..b42cc90a955 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -64,6 +64,8 @@ static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) static void test_msidatabase(void) { MSIHANDLE hdb = 0, hdb2 = 0; + WCHAR path[MAX_PATH]; + DWORD len; UINT res; DeleteFileW(msifileW); @@ -162,6 +164,22 @@ static void test_msidatabase(void) res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + res = GetCurrentDirectoryW(ARRAY_SIZE(path), path); + ok ( res, "Got zero res.\n" ); + lstrcatW( path, L"\\"); + lstrcatW( path, msifileW); + len = lstrlenW(path); + path[len - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + + lstrcpyW( path, msifileW ); + path[lstrlenW(path) - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + res = DeleteFileA( msifile2 ); ok( res == TRUE, "Failed to delete database\n" ); diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e25cc2659e6..e9e74f5c19e 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -588,6 +588,31 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg return ret; } +static WCHAR *get_path_with_extension(const WCHAR *package_name) +{ + static const WCHAR ext[] = L".msi"; + unsigned int p; + WCHAR *path; + + if (!(path = heap_alloc(lstrlenW(package_name) * sizeof(WCHAR) + sizeof(ext)))) + { + WINE_ERR("No memory.\n"); + return NULL; + } + + lstrcpyW(path, package_name); + p = lstrlenW(path); + while (p && path[p] != '.' && path[p] != L'\\' && path[p] != '/') + --p; + if (path[p] == '.') + { + heap_free(path); + return NULL; + } + lstrcatW(path, ext); + return path; +} + int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { int i; @@ -626,6 +651,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine DWORD ReturnCode; int argc; LPWSTR *argvW = NULL; + WCHAR *path; InitCommonControls(); @@ -1040,14 +1066,28 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine if(IsProductCode(PackageName)) ReturnCode = MsiConfigureProductExW(PackageName, 0, INSTALLSTATE_DEFAULT, Properties); else - ReturnCode = MsiInstallProductW(PackageName, Properties); + { + if ((ReturnCode = MsiInstallProductW(PackageName, Properties)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiInstallProductW(path, Properties); + heap_free(path); + } + } } else if(FunctionRepair) { if(IsProductCode(PackageName)) WINE_FIXME("Product code treatment not implemented yet\n"); else - ReturnCode = MsiReinstallProductW(PackageName, RepairMode); + { + if ((ReturnCode = MsiReinstallProductW(PackageName, RepairMode)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiReinstallProductW(path, RepairMode); + heap_free(path); + } + } } else if(FunctionAdvertise) { -- 2.33.1

2 1

[PATCH] msvcrt: printf: Later width specifiers should override earlier ones
by David Gow 08 Nov '21

08 Nov '21

From: Andrew Eikum <aeikum(a)codeweavers.com> This is a replacement for "msvcrt: The '*' character should be interpreted as the beginning of the width specification"[1], which matches the behaviour I see on my machine better. If a printf format string contains both a '*' (to specify that the field width should be read from a variable), followed by another explicit field width, only the latter field width should be used. For further details, see [2] and [3]. [1]: https://source.winehq.org/patches/data/218904 [2]: https://www.winehq.org/pipermail/wine-devel/2021-November/200039.html [3]: https://github.com/ValveSoftware/Proton/issues/5258#issuecomment-962423092 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Co-Developed-by: David Gow <david(a)davidgow.net> Signed-off-by: David Gow <david(a)davidgow.net> --- Note also that this moves the new tests after the setlocale(LC_ALL, "C"), as I don't think they need to run in a Japanese locale. --- dlls/msvcrt/printf.h | 8 +++++++- dlls/msvcrt/tests/printf.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index aeb1290f48f..6d2f02ee85b 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,7 +1050,13 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while (*p >= '0' && *p <= '9') { + + /* Ignore this length if there's another specifier. */ + if (*p >= '0' && *p <= '9') + flags.FieldLength = 0; + } + + while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 06acf4c8450..cc824f571a6 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -396,6 +396,26 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); setlocale(LC_ALL, "C"); + + r = p_sprintf(buffer, "%0*02d", 1, 0); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, "00"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*02d", 30, 17); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, "17"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%*1d", 1, 3); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "3"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*0d", 1, 2); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "2"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "% *2d", 0, 7); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "failed: \"%s\"\n", buffer); } static void test_swprintf( void ) -- 2.32.0

2 2

[PATCH] mfplay: Fix leaks on error paths (Coverity).
by Nikolay Sivov 08 Nov '21

08 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 12ea653b97d..5abee9d7de8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1024,6 +1024,15 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, IUnknown *object; HRESULT hr; + if (sync && !ret) + return E_POINTER; + + if (!sync && !player->callback) + { + WARN("Asynchronous item creation is not supported without user callback.\n"); + return MF_E_INVALIDREQUEST; + } + if (FAILED(hr = create_media_item(&player->IMFPMediaPlayer_iface, user_data, &item))) return hr; @@ -1035,9 +1044,6 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, if (sync) { - if (!ret) - return E_POINTER; - *ret = NULL; if (SUCCEEDED(hr = IMFSourceResolver_CreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, @@ -1054,17 +1060,9 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, } IMFPMediaItem_Release(&item->IMFPMediaItem_iface); - - return hr; } else { - if (!player->callback) - { - WARN("Asynchronous item creation is not supported without user callback.\n"); - return MF_E_INVALIDREQUEST; - } - if (ret) *ret = NULL; hr = IMFSourceResolver_BeginCreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, -- 2.33.0

1 0