December 2020 - Wine-Commits

Haidong Yu : ieframe: Fix memory leak in PersistFile_Save.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: e8741f08178070ff025e6e5280b552ad64af9249 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8741f08178070ff025e6e52… Author: Haidong Yu <yhd986(a)163.com> Date: Fri Dec 18 16:39:49 2020 +0800 ieframe: Fix memory leak in PersistFile_Save. Signed-off-by: yuhaidong <yuhaidong(a)uniontech.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/intshcut.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 13a5582dbc7..6c64eb5b3b2 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -614,6 +614,7 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam WriteFile(file, str_ICONFILE, lstrlenA(str_ICONFILE), &bytesWritten, NULL); WriteFile(file, iconfile, lstrlenA(iconfile), &bytesWritten, NULL); WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); + heap_free(iconfile); } sprintf(indexString, "ICONINDEX=%d", pvread[1].u.iVal);

1 0

Jacek Caban : widl: Don't apply call_as methods to async interface.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: 6653a381cb10d34c39bd0feba71d4221a92ca44b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6653a381cb10d34c39bd0feb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 18 16:15:28 2020 +0100 widl: Don't apply call_as methods to async interface. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1d413ca74f4..b729d772fcd 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2940,6 +2940,8 @@ static void check_async_uuid(type_t *iface) var_t *begin_func, *finish_func, *func = stmt->u.var, *arg; var_list_t *begin_args = NULL, *finish_args = NULL, *args; + if (is_attr(func->attrs, ATTR_CALLAS)) continue; + args = type_function_get_args(func->declspec.type); if (args) LIST_FOR_EACH_ENTRY(arg, args, var_t, entry) {

1 0

Tag wine-6.0-rc3 : Alexandre Julliard : Release 6.0-rc3
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: refs/tags/wine-6.0-rc3 Tag: 948bcdbfb0e81067a8470ca8f2bab713b2c112cc URL: https://source.winehq.org/git/wine.git/?a=tag;h=948bcdbfb0e81067a8470ca8f2b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 19:51:19 2020 +0100 Release 6.0-rc3

1 0

Zebediah Figura : winmm: Search the default path when opening an existing file in create_file_OF().
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: 1d043f4da705d53615caf63da05bc0ed6d2b178f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d043f4da705d53615caf63d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 17 16:40:51 2020 -0600 winmm: Search the default path when opening an existing file in create_file_OF(). Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 9 ++++++++- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index cb3175c5cd7..1255cf69da2 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -52,6 +52,7 @@ static WINE_MMIO *MMIOList; static HANDLE create_file_OF( LPCSTR path, INT mode ) { DWORD access, sharing, creation; + char full_path[MAX_PATH]; if (mode & OF_CREATE) { @@ -79,7 +80,13 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) case OF_SHARE_COMPAT: default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; } - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (mode & OF_CREATE) + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (!SearchPathA( NULL, path, NULL, MAX_PATH, full_path, NULL )) + return INVALID_HANDLE_VALUE; + return CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); } /************************************************************************** diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index c9ceda24f3f..a232070064c 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -551,7 +551,7 @@ static void test_mmioOpen_create(void) wcscpy(buffer, L"test_mmio_path"); hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); mmioClose(hmmio, 0); wcscpy(buffer, L"test_mmio_path");

1 0

Biswapriyo Nath : include: Add DEFINE_ENUM_FLAG_OPERATORS macro in directmanipulation.idl.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: 8a22d287663e2f905ac3c1f14a5fa9df1a632073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a22d287663e2f905ac3c1f1… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Dec 18 15:05:39 2020 +0530 include: Add DEFINE_ENUM_FLAG_OPERATORS macro in directmanipulation.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/directmanipulation.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/directmanipulation.idl b/include/directmanipulation.idl index f8bd55c48b1..b478b16a6b8 100644 --- a/include/directmanipulation.idl +++ b/include/directmanipulation.idl @@ -31,6 +31,7 @@ typedef enum DIRECTMANIPULATION_HITTEST_TYPE DIRECTMANIPULATION_HITTEST_TYPE_SYNCHRONOUS = 0x00000001, DIRECTMANIPULATION_HITTEST_TYPE_AUTO_SYNCHRONOUS = 0x00000002 } DIRECTMANIPULATION_HITTEST_TYPE; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DIRECTMANIPULATION_HITTEST_TYPE)") typedef enum DIRECTMANIPULATION_STATUS { @@ -52,6 +53,7 @@ typedef enum DIRECTMANIPULATION_VIEWPORT_OPTIONS DIRECTMANIPULATION_VIEWPORT_OPTIONS_EXPLICITHITTEST = 0x00000008, DIRECTMANIPULATION_VIEWPORT_OPTIONS_DISABLEPIXELSNAPPING = 0x00000010, } DIRECTMANIPULATION_VIEWPORT_OPTIONS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DIRECTMANIPULATION_VIEWPORT_OPTIONS)") typedef enum DIRECTMANIPULATION_CONFIGURATION { @@ -65,6 +67,7 @@ typedef enum DIRECTMANIPULATION_CONFIGURATION DIRECTMANIPULATION_CONFIGURATION_RAILS_X = 0x00000100, DIRECTMANIPULATION_CONFIGURATION_RAILS_Y = 0x00000200, } DIRECTMANIPULATION_CONFIGURATION; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DIRECTMANIPULATION_CONFIGURATION)") typedef enum DIRECTMANIPULATION_GESTURE_CONFIGURATION { @@ -74,6 +77,7 @@ typedef enum DIRECTMANIPULATION_GESTURE_CONFIGURATION DIRECTMANIPULATION_GESTURE_CROSS_SLIDE_HORIZONTAL = 0x00000010, DIRECTMANIPULATION_GESTURE_PINCH_ZOOM = 0x00000020, } DIRECTMANIPULATION_GESTURE_CONFIGURATION; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DIRECTMANIPULATION_GESTURE_CONFIGURATION)") typedef enum DIRECTMANIPULATION_MOTION_TYPES { @@ -87,6 +91,7 @@ typedef enum DIRECTMANIPULATION_MOTION_TYPES DIRECTMANIPULATION_MOTION_ZOOM | DIRECTMANIPULATION_MOTION_CENTERX | DIRECTMANIPULATION_MOTION_CENTERY } DIRECTMANIPULATION_MOTION_TYPES; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DIRECTMANIPULATION_MOTION_TYPES)") typedef enum DIRECTMANIPULATION_SNAPPOINT_TYPE { @@ -102,6 +107,7 @@ typedef enum DIRECTMANIPULATION_SNAPPOINT_COORDINATE DIRECTMANIPULATION_COORDINATE_ORIGIN = 0x00000001, DIRECTMANIPULATION_COORDINATE_MIRRORED = 0x00000010 } DIRECTMANIPULATION_SNAPPOINT_COORDINATE; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DIRECTMANIPULATION_SNAPPOINT_COORDINATE)") typedef enum DIRECTMANIPULATION_HORIZONTALALIGNMENT { @@ -111,6 +117,7 @@ typedef enum DIRECTMANIPULATION_HORIZONTALALIGNMENT DIRECTMANIPULATION_HORIZONTALALIGNMENT_RIGHT = 0x00000004, DIRECTMANIPULATION_HORIZONTALALIGNMENT_UNLOCKCENTER = 0x00000008 } DIRECTMANIPULATION_HORIZONTALALIGNMENT; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DIRECTMANIPULATION_HORIZONTALALIGNMENT)") typedef enum DIRECTMANIPULATION_VERTICALALIGNMENT { @@ -120,6 +127,7 @@ typedef enum DIRECTMANIPULATION_VERTICALALIGNMENT DIRECTMANIPULATION_VERTICALALIGNMENT_BOTTOM = 0x00000004, DIRECTMANIPULATION_VERTICALALIGNMENT_UNLOCKCENTER = 0x00000008 } DIRECTMANIPULATION_VERTICALALIGNMENT; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DIRECTMANIPULATION_VERTICALALIGNMENT)") typedef enum DIRECTMANIPULATION_INPUT_MODE {

1 0

Biswapriyo Nath : include: Add more GUIDs in mfreadwrite.idl.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: d958c5307c91ecbe3d74ca94dcc5a2fa8c86d3d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d958c5307c91ecbe3d74ca94… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Dec 18 15:05:39 2020 +0530 include: Add more GUIDs in mfreadwrite.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 93920a2d385..3b1318e977b 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -77,12 +77,16 @@ cpp_quote("EXTERN_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98 cpp_quote("EXTERN_GUID(CLSID_MFSourceReader, 0x1777133c, 0x0881, 0x411b, 0xa5, 0x77, 0xad, 0x54, 0x5f, 0x07, 0x14, 0xc4);") cpp_quote("EXTERN_GUID(CLSID_MFSinkWriter, 0xa3bbfb17, 0x8273, 0x4e52, 0x9e, 0x0e, 0x97, 0x39, 0xdc, 0x88, 0x79, 0x90);") +cpp_quote("EXTERN_GUID(MF_MEDIASINK_AUTOFINALIZE_SUPPORTED, 0x48c131be, 0x135a, 0x41cb, 0x82, 0x90, 0x03, 0x65, 0x25, 0x09, 0xc9, 0x99);") +cpp_quote("EXTERN_GUID(MF_MEDIASINK_ENABLE_AUTOFINALIZE, 0x34014265, 0xcb7e, 0x4cde, 0xac, 0x7c, 0xef, 0xfd, 0x3b, 0x3c, 0x25, 0x30);") + cpp_quote("EXTERN_GUID(MF_SINK_WRITER_ASYNC_CALLBACK, 0x48cb183e, 0x7b0b, 0x46f4, 0x82, 0x2e, 0x5e, 0x1d, 0x2d, 0xda, 0x43, 0x54);") cpp_quote("EXTERN_GUID(MF_SINK_WRITER_DISABLE_THROTTLING, 0x08b845d8, 0x2b74, 0x4afe, 0x9d, 0x53, 0xbe, 0x16, 0xd2, 0xd5, 0xae, 0x4f);") cpp_quote("EXTERN_GUID(MF_SINK_WRITER_D3D_MANAGER, 0xec822da2, 0xe1e9, 0x4b29, 0xa0, 0xd8, 0x56, 0x3c, 0x71, 0x9f, 0x52, 0x69);") cpp_quote("EXTERN_GUID(MF_SINK_WRITER_ENCODER_CONFIG, 0xad91cd04, 0xa7cc, 0x4ac7, 0x99, 0xb6, 0xa5, 0x7b, 0x9a, 0x4a, 0x7c, 0x70);") cpp_quote("EXTERN_GUID(MF_READWRITE_DISABLE_CONVERTERS, 0x98d5b065, 0x1374, 0x4847, 0x8d, 0x5d, 0x31, 0x52, 0x0f, 0xee, 0x71, 0x56);") +cpp_quote("EXTERN_GUID(MF_READWRITE_ENABLE_AUTOFINALIZE, 0xdd7ca129, 0x8cd1, 0x4dc5, 0x9d, 0xde, 0xce, 0x16, 0x86, 0x75, 0xde, 0x61);") cpp_quote("EXTERN_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0);") cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_CLASS, 0x39384300, 0xd0eb, 0x40b1, 0x87, 0xa0, 0x33, 0x18, 0x87, 0x1b, 0x5a, 0x53);") cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_PRIORITY, 0x43ad19ce, 0xf33f, 0x4ba9, 0xa5, 0x80, 0xe4, 0xcd, 0x12, 0xf2, 0xd1, 0x44);")

1 0

Zebediah Figura : winmm/tests: Test the mmioOpen() search path with various flags.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: 45c98bf0b07d2291db87fd3b8906b144a3ca0703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45c98bf0b07d2291db87fd3b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 17 16:40:49 2020 -0600 winmm/tests: Test the mmioOpen() search path with various flags. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mmio.c | 60 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e3984fbaf3a..0236855f246 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; /* According to docs, filename must be no more than 128 bytes, but it will * actually allow longer than that. */ - WCHAR filename[] = L"very_long_filename_" + WCHAR long_filename[] = L"very_long_filename_" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; + char exedir_filename[MAX_PATH]; + MMIOINFO info = {0}; + BOOL ret; + FILE *f; + + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); + f = fopen(exedir_filename, "w"); + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); + fclose(f); GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); SetCurrentDirectoryW(temp_dir); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_DENYNONE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); ok(hmmio != NULL, "mmioOpen failed\n"); /* MMIO_DENYNONE lets us open it here, too */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_EXCLUSIVE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); ok(hmmio != NULL, "mmioOpen failed\n"); /* should fail due to MMIO_EXCLUSIVE */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, L"test_mmio_path"); + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + wcscpy(buffer, L"test_mmio_path"); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); + + ret = DeleteFileA("test_mmio_path"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); SetCurrentDirectoryW(cwd); + + ret = DeleteFileA(exedir_filename); + ok(ret, "got error %u\n", GetLastError()); } static void test_mmioSetBuffer(char *fname)

1 0

Biswapriyo Nath : include: Add DEFINE_ENUM_FLAG_OPERATORS macro in mfreadwrite.idl.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: d82b6eac57825a5ca92ebd5993e8772dfe113dc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d82b6eac57825a5ca92ebd59… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Dec 18 15:05:39 2020 +0530 include: Add DEFINE_ENUM_FLAG_OPERATORS macro in mfreadwrite.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 3b1318e977b..46eb5dc9c0f 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -23,6 +23,7 @@ typedef [v1_enum] enum MF_SOURCE_READER_CONTROL_FLAG { MF_SOURCE_READER_CONTROLF_DRAIN = 0x00000001, } MF_SOURCE_READER_CONTROL_FLAG; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(MF_SOURCE_READER_CONTROL_FLAG)") enum { @@ -45,6 +46,7 @@ typedef [v1_enum] enum MF_SOURCE_READER_FLAG MF_SOURCE_READERF_STREAMTICK = 0x00000100, MF_SOURCE_READERF_ALLEFFECTSREMOVED = 0x00000200, } MF_SOURCE_READER_FLAG; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(MF_SOURCE_READER_FLAG)") enum {

1 0

Michael Stefaniuc : gdi32/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: f6a0c60618a2b6a4d9bf2db0bc131414e809917b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6a0c60618a2b6a4d9bf2db0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 17 23:10:19 2020 +0100 gdi32/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 2 +- dlls/gdi32/tests/font.c | 24 +++++++++++------------- dlls/gdi32/tests/icm.c | 4 +--- dlls/gdi32/tests/metafile.c | 3 +-- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 2110765835f..eb0da18b32e 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -32,7 +32,7 @@ #include "wine/test.h" -static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR display1W[] = L"\\\\.\\DISPLAY1"; static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 86ccddd05ea..ad7408f5620 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1136,7 +1136,6 @@ static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, con static void test_GetCharABCWidths(void) { - static const WCHAR str[] = {'i',0}; BOOL ret; HDC hdc; LOGFONTA lf; @@ -1201,7 +1200,7 @@ static void test_GetCharABCWidths(void) hdc = GetDC(0); hfont = SelectObject(hdc, hfont); - nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + nb = pGetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = GetCharABCWidthsI(NULL, 0, 1, glyphs, abc); @@ -1382,7 +1381,7 @@ static void test_GetCharABCWidths(void) SetMapMode(hdc, MM_ANISOTROPIC); SelectObject(hdc, hfont); - nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + nb = pGetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = GetCharABCWidthsI(hdc, 0, 1, glyphs, abc); @@ -1433,8 +1432,7 @@ static void test_GetCharABCWidths(void) static void test_text_extents(void) { - static const WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; - static const WCHAR emptyW[] = {0}; + static const WCHAR wt[] = L"One\ntwo 3"; LPINT extents; INT i, len, fit1, fit2, extents2[3]; LOGFONTA lf; @@ -1484,7 +1482,7 @@ static void test_text_extents(void) ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); memset(&sz, 0xcc, sizeof(sz)); - ret = GetTextExtentPointW(hdc, emptyW, 0, &sz); + ret = GetTextExtentPointW(hdc, L"", 0, &sz); ok(ret, "got %d\n", ret); ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); @@ -1633,7 +1631,7 @@ static void test_GetGlyphIndices(void) DWORD charcount; LOGFONTA lf; DWORD flags = 0; - WCHAR testtext[] = {'T','e','s','t',0xffff,0}; + WCHAR testtext[] = L"Test\xffff"; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; @@ -4445,7 +4443,7 @@ static void test_RealizationInfo(void) static void test_GetTextFace(void) { static const char faceA[] = "Tahoma"; - static const WCHAR faceW[] = {'T','a','h','o','m','a', 0}; + static const WCHAR faceW[] = L"Tahoma"; LOGFONTA fA = {0}; LOGFONTW fW = {0}; char bufA[LF_FACESIZE]; @@ -6822,7 +6820,7 @@ static void test_fake_bold_font(void) static void test_bitmap_font_glyph_index(void) { - const WCHAR text[] = {'#','!','/','b','i','n','/','s','h',0}; + const WCHAR text[] = L"#!/bin/sh"; const struct { LPCSTR face; BYTE charset; @@ -7117,10 +7115,10 @@ static void test_ttf_names(void) static void test_lang_names(void) { - static const WCHAR name_cond_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',0}; - static const WCHAR name_cond_ja_reg_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',' ','R','e','g',0}; - static const WCHAR name_cond_ja_reg_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',' ','R','e','g',' ','(','j','a',')',0}; - static const WCHAR name_wws_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','W','W','S',' ','(','j','a',')',0}; + static const WCHAR name_cond_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja)"; + static const WCHAR name_cond_ja_reg_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja) Reg"; + static const WCHAR name_cond_ja_reg_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja) Reg (ja)"; + static const WCHAR name_wws_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d WWS (ja)"; struct enum_fullname_data efnd; struct enum_fullname_data_w efnd_w; diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 340ebeef55a..509d5c0c579 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -27,8 +27,6 @@ #include "wine/test.h" -static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; - static void test_GetICMProfileA( HDC dc ) { BOOL ret; @@ -167,7 +165,7 @@ static void test_SetICMMode( HDC dc ) ok( ret, "SetICMMode failed (%d)\n", GetLastError() ); SetLastError( 0xdeadbeef ); - dc = CreateDCW( displayW, NULL, NULL, NULL ); + dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); if ( !dc && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) { win_skip( "CreateDCW is not implemented\n" ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 5a64fe6d60a..8dae908126d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -312,7 +312,6 @@ static int CALLBACK eto_scale_enum_proc(HDC hdc, HANDLETABLE *handle_table, static void test_ExtTextOutScale(void) { const RECT rc = { 0, 0, 100, 100 }; - const WCHAR str[] = {'a',0 }; struct eto_scale_test_record test; HDC hdcDisplay, hdcMetafile; HENHMETAFILE hMetafile; @@ -392,7 +391,7 @@ static void test_ExtTextOutScale(void) ok(ret, "SetViewportExtEx failed\n"); } - ret = ExtTextOutW(hdcMetafile, 0, 0, 0, 0, str, 1, NULL); + ret = ExtTextOutW(hdcMetafile, 0, 0, 0, 0, L"a", 1, NULL); ok(ret, "ExtTextOutW failed\n"); hMetafile = CloseEnhMetaFile(hdcMetafile);

1 0

Alexandre Julliard : ntdll: Only reset the Unix current directory on removable devices.
by Alexandre Julliard Dec. 18, 2020

Dec. 18, 2020

Module: wine Branch: master Commit: cdaa72c728df3c80499c8a4f59e731f353347db0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdaa72c728df3c80499c8a4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 15:20:45 2020 +0100 ntdll: Only reset the Unix current directory on removable devices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49545 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 1 - dlls/ntdll/unix/server.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f6775fc37a4..e9a40495c9d 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1348,7 +1348,6 @@ void CDECL get_initial_directory( UNICODE_STRING *dir ) MESSAGE("Warning: could not find DOS drive for current working directory '%s', " "starting in the Windows directory.\n", cwd ? cwd : "" ); free( cwd ); - chdir( "/" ); /* avoid locking removable devices */ } diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 7236f0acb83..87dd4b10b83 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1466,7 +1466,16 @@ void server_init_process_done(void) IMAGE_NT_HEADERS *nt = get_exe_nt_header(); void *entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; NTSTATUS status; - int suspend; + int suspend, needs_close, unixdir; + + if (peb->ProcessParameters->CurrentDirectory.Handle && + !server_get_unix_fd( peb->ProcessParameters->CurrentDirectory.Handle, + FILE_TRAVERSE, &unixdir, &needs_close, NULL, NULL )) + { + fchdir( unixdir ); + if (needs_close) close( unixdir ); + } + else chdir( "/" ); /* avoid locking removable devices */ #ifdef __APPLE__ send_server_task_port();

1 0