November 2020 - Wine-commits

Michael Stefaniuc : wineps.drv: Use wide-char string literals.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 865ee87bc330e9e5c051182b8562269ce9207586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=865ee87bc330e9e5c051182b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 12 00:37:58 2020 +0100 wineps.drv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/driver.c | 11 ++++------- dlls/wineps.drv/init.c | 4 ++-- dlls/wineps.drv/type1afm.c | 14 +++++--------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index c3d22cec1af..27e1c6e03c8 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -227,8 +227,6 @@ typedef struct static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - static const WCHAR resW[] = {'%','d',0}; - static const WCHAR resxyW[] = {'%','d','x','%','d',0}; PSDRV_DLGINFO *di; int i, Cursel; PAGESIZE *ps; @@ -280,7 +278,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WCHAR buf[256]; res = di->pi->ppd->DefaultResolution; - len = swprintf(buf, ARRAY_SIZE(buf), resW, res); + len = swprintf(buf, ARRAY_SIZE(buf), L"%d", res); buf[len++] = ' '; LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, ARRAY_SIZE(buf) - len); SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_ADDSTRING, 0, (LPARAM)buf); @@ -310,9 +308,9 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, DWORD idx; if (res->resx == res->resy) - len = swprintf(buf, ARRAY_SIZE(buf), resW, res->resx); + len = swprintf(buf, ARRAY_SIZE(buf), L"%d", res->resx); else - len = swprintf(buf, ARRAY_SIZE(buf), resxyW, res->resx, res->resy); + len = swprintf(buf, ARRAY_SIZE(buf), L"%dx%d", res->resx, res->resy); buf[len++] = ' '; LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, ARRAY_SIZE(buf) - len); idx = SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_ADDSTRING, 0, (LPARAM)buf); @@ -552,7 +550,6 @@ INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput PSDRV_DLGINFO di; PSDRV_DEVMODE dlgdm; WCHAR SetupW[64]; - static const WCHAR PAPERW[] = {'P','A','P','E','R','\0'}; LoadStringW(PSDRV_hInstance, IDS_SETUP, SetupW, ARRAY_SIZE(SetupW)); hinstComctl32 = LoadLibraryA("comctl32.dll"); @@ -565,7 +562,7 @@ INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput di.dlgdm = &dlgdm; psp.dwSize = sizeof(psp); psp.hInstance = PSDRV_hInstance; - psp.u.pszTemplate = PAPERW; + psp.u.pszTemplate = L"PAPER"; psp.u2.pszIcon = NULL; psp.pfnDlgProc = PSDRV_PaperDlgProc; psp.lParam = (LPARAM)&di; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 5c96986bb9d..ad6d6a07373 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); static const PSDRV_DEVMODE DefaultDevmode = { { /* dmPublic */ -/* dmDeviceName */ {'W','i','n','e',' ','P','o','s','t','S','c','r','i','p','t',' ','D','r','i','v','e','r',0}, +/* dmDeviceName */ L"Wine PostScript Driver", /* dmSpecVersion */ 0x30a, /* dmDriverVersion */ 0x001, /* dmSize */ sizeof(DEVMODEW), @@ -66,7 +66,7 @@ static const PSDRV_DEVMODE DefaultDevmode = /* dmYResolution */ 300, /* dmTTOption */ DMTT_SUBDEV, /* dmCollate */ DMCOLLATE_FALSE, -/* dmFormName */ {'L','e','t','t','e','r',0}, +/* dmFormName */ L"Letter", /* dmLogPixels */ 0, /* dmBitsPerPel */ 0, /* dmPelsWidth */ 0, diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index 68cf6537b1c..c78753393c0 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -1093,13 +1093,12 @@ static BOOL BuildAFM(FILE *file) */ static BOOL ReadAFMFile(LPCWSTR filename) { - static const WCHAR rW[] = {'r',0}; FILE *f; BOOL retval; TRACE("%s\n", debugstr_w(filename)); - f = _wfopen(filename, rW); + f = _wfopen(filename, L"r"); if (f == NULL) { WARN("%s: %s\n", debugstr_w(filename), strerror(errno)); @@ -1120,8 +1119,6 @@ static BOOL ReadAFMFile(LPCWSTR filename) */ static BOOL ReadAFMDir(LPCSTR dirname) { - static const WCHAR starW[] = {'*',0}; - static const WCHAR afmW[] = {'.','a','f','m',0}; WCHAR *path = wine_get_dos_file_name( dirname ); struct _wfinddata_t data; intptr_t handle; @@ -1138,7 +1135,7 @@ static BOOL ReadAFMDir(LPCSTR dirname) HeapFree( GetProcessHeap(), 0, path ); p = filename + lstrlenW(filename); *p++ = '\\'; - lstrcpyW( p, starW ); + lstrcpyW( p, L"*" ); handle = _wfindfirst( filename, &data ); if (handle != -1) @@ -1146,7 +1143,7 @@ static BOOL ReadAFMDir(LPCSTR dirname) do { WCHAR *ext = wcschr( data.name, '.' ); - if (!ext || wcsicmp(ext, afmW)) continue; + if (!ext || wcsicmp(ext, L".afm")) continue; lstrcpyW( p, data.name ); if (!(ret = ReadAFMFile( filename ))) break; } while (!_wfindnext( handle, &data )); @@ -1170,7 +1167,6 @@ static BOOL ReadAFMDir(LPCSTR dirname) */ BOOL PSDRV_GetType1Metrics(void) { - static const WCHAR pathW[] = {'A','F','M','P','a','t','h',0}; HKEY hkey; DWORD len; LPWSTR valueW; @@ -1180,11 +1176,11 @@ BOOL PSDRV_GetType1Metrics(void) if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", &hkey) != ERROR_SUCCESS) return TRUE; - if (RegQueryValueExW( hkey, pathW, NULL, NULL, NULL, &len ) == ERROR_SUCCESS) + if (RegQueryValueExW( hkey, L"AFMPath", NULL, NULL, NULL, &len ) == ERROR_SUCCESS) { len += sizeof(WCHAR); valueW = HeapAlloc( PSDRV_Heap, 0, len ); - if (RegQueryValueExW( hkey, pathW, NULL, NULL, (LPBYTE)valueW, &len ) == ERROR_SUCCESS) + if (RegQueryValueExW( hkey, L"AFMPath", NULL, NULL, (BYTE *)valueW, &len ) == ERROR_SUCCESS) { len = WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, NULL, 0, NULL, NULL ); valueA = HeapAlloc( PSDRV_Heap, 0, len );

1 0

Nikolay Sivov : oledb32: Use wide-char string literals.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 18640435497b46f7a6ab637d4689ae5f0168f424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18640435497b46f7a6ab637d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 09:52:33 2020 +0300 oledb32: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 18 ++----- dlls/oledb32/datainit.c | 127 +++++++++++++++++------------------------------ dlls/oledb32/dslocator.c | 3 +- 3 files changed, 51 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18640435497b46f7a6ab…

1 0

Biswapriyo Nath : include: Add DEFINE_ENUM_FLAG_OPERATORS macro for enumerations.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: vkd3d Branch: master Commit: f84c09cc66c834b7ed238e5f3511dedec1ec9486 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f84c09cc66c834b7ed238e5… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Nov 6 23:28:12 2020 +0530 include: Add DEFINE_ENUM_FLAG_OPERATORS macro for enumerations. This prevents g++ error: invalid conversion from 'int' to 'XYZ' [-fpermissive] Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 88ecba5..e1f1133 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -89,6 +89,7 @@ typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT D3D12_SHADER_MIN_PRECISION_SUPPORT_10_BIT = 0x1, D3D12_SHADER_MIN_PRECISION_SUPPORT_16_BIT = 0x2, } D3D12_SHADER_MIN_PRECISION_SUPPORT; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_SHADER_MIN_PRECISION_SUPPORT);") typedef enum D3D12_TILED_RESOURCES_TIER { @@ -160,6 +161,7 @@ typedef enum D3D12_FORMAT_SUPPORT1 D3D12_FORMAT_SUPPORT1_VIDEO_PROCESSOR_INPUT = 0x20000000, D3D12_FORMAT_SUPPORT1_VIDEO_ENCODER = 0x40000000, } D3D12_FORMAT_SUPPORT1; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_FORMAT_SUPPORT1);") typedef enum D3D12_FORMAT_SUPPORT2 { @@ -176,6 +178,7 @@ typedef enum D3D12_FORMAT_SUPPORT2 D3D12_FORMAT_SUPPORT2_TILED = 0x00000200, D3D12_FORMAT_SUPPORT2_MULTIPLANE_OVERLAY = 0x00004000, } D3D12_FORMAT_SUPPORT2; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_FORMAT_SUPPORT2);") typedef enum D3D12_WRITEBUFFERIMMEDIATE_MODE { @@ -199,6 +202,7 @@ typedef enum D3D12_SHADER_CACHE_SUPPORT_FLAGS D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_INPROC_CACHE = 0x4, D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_DISK_CACHE = 0x8, } D3D12_SHADER_CACHE_SUPPORT_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_SHADER_CACHE_SUPPORT_FLAGS);") typedef enum D3D12_COMMAND_LIST_SUPPORT_FLAGS { @@ -211,6 +215,7 @@ typedef enum D3D12_COMMAND_LIST_SUPPORT_FLAGS D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_PROCESS = 0x20, D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_ENCODE = 0x40, } D3D12_COMMAND_LIST_SUPPORT_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_COMMAND_LIST_SUPPORT_FLAGS);") typedef enum D3D12_VIEW_INSTANCING_TIER { @@ -413,6 +418,7 @@ typedef enum D3D12_HEAP_FLAGS D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES = 0x44, D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES = 0x84, } D3D12_HEAP_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_HEAP_FLAGS);") typedef struct D3D12_HEAP_DESC { @@ -520,6 +526,7 @@ typedef enum D3D12_RESOURCE_BARRIER_FLAGS D3D12_RESOURCE_BARRIER_FLAG_BEGIN_ONLY = 0x1, D3D12_RESOURCE_BARRIER_FLAG_END_ONLY = 0x2, } D3D12_RESOURCE_BARRIER_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RESOURCE_BARRIER_FLAGS);") typedef struct D3D12_RESOURCE_TRANSITION_BARRIER { @@ -666,6 +673,7 @@ typedef enum D3D12_DESCRIPTOR_RANGE_FLAGS D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, } D3D12_DESCRIPTOR_RANGE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DESCRIPTOR_RANGE_FLAGS);") typedef struct D3D12_DESCRIPTOR_RANGE1 { @@ -709,6 +717,7 @@ typedef enum D3D12_ROOT_DESCRIPTOR_FLAGS D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, } D3D12_ROOT_DESCRIPTOR_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_ROOT_DESCRIPTOR_FLAGS);") typedef struct D3D12_ROOT_DESCRIPTOR1 { @@ -902,6 +911,7 @@ typedef enum D3D12_ROOT_SIGNATURE_FLAGS D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS = 0x20, D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT = 0x40, } D3D12_ROOT_SIGNATURE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_ROOT_SIGNATURE_FLAGS);") typedef struct D3D12_ROOT_SIGNATURE_DESC { @@ -952,6 +962,7 @@ typedef enum D3D12_DESCRIPTOR_HEAP_FLAGS D3D12_DESCRIPTOR_HEAP_FLAG_NONE = 0x0, D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE = 0x1, } D3D12_DESCRIPTOR_HEAP_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DESCRIPTOR_HEAP_FLAGS);") typedef struct D3D12_DESCRIPTOR_HEAP_DESC { @@ -989,6 +1000,7 @@ typedef enum D3D12_BUFFER_SRV_FLAGS D3D12_BUFFER_SRV_FLAG_NONE = 0x0, D3D12_BUFFER_SRV_FLAG_RAW = 0x1, } D3D12_BUFFER_SRV_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_BUFFER_SRV_FLAGS);") typedef enum D3D12_SHADER_COMPONENT_MAPPING { @@ -1124,6 +1136,7 @@ typedef enum D3D12_BUFFER_UAV_FLAGS D3D12_BUFFER_UAV_FLAG_NONE = 0x0, D3D12_BUFFER_UAV_FLAG_RAW = 0x1, } D3D12_BUFFER_UAV_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_BUFFER_UAV_FLAGS);") typedef struct D3D12_BUFFER_UAV { @@ -1570,6 +1583,7 @@ typedef enum D3D12_PIPELINE_STATE_FLAGS D3D12_PIPELINE_STATE_FLAG_NONE = 0x0, D3D12_PIPELINE_STATE_FLAG_DEBUG = 0x1, } D3D12_PIPELINE_STATE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_PIPELINE_STATE_FLAGS);") typedef struct D3D12_GRAPHICS_PIPELINE_STATE_DESC { @@ -1625,6 +1639,7 @@ typedef enum D3D12_COMMAND_QUEUE_FLAGS D3D12_COMMAND_QUEUE_FLAG_NONE = 0x0, D3D12_COMMAND_QUEUE_FLAG_DISABLE_GPU_TIMEOUT = 0x1, } D3D12_COMMAND_QUEUE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_COMMAND_QUEUE_FLAGS);") typedef struct D3D12_COMMAND_QUEUE_DESC { @@ -1908,6 +1923,7 @@ typedef enum D3D12_TILE_COPY_FLAGS D3D12_TILE_COPY_FLAG_LINEAR_BUFFER_TO_SWIZZLED_TILED_RESOURCE = 0x2, D3D12_TILE_COPY_FLAG_SWIZZLED_TILED_RESOURCE_TO_LINEAR_BUFFER = 0x4, } D3D12_TILE_COPY_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_TILE_COPY_FLAGS);") typedef struct D3D12_INDEX_BUFFER_VIEW { @@ -2194,6 +2210,7 @@ typedef enum D3D12_TILE_MAPPING_FLAGS D3D12_TILE_MAPPING_FLAG_NONE = 0x0, D3D12_TILE_MAPPING_FLAG_NO_HAZARD = 0x1, } D3D12_TILE_MAPPING_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_TILE_MAPPING_FLAGS);") [ uuid(0ec870a6-5d7e-4c22-8cfc-5baae07616ed), @@ -2241,6 +2258,7 @@ typedef enum D3D12_FENCE_FLAGS D3D12_FENCE_FLAG_SHARED = 0x1, D3D12_FENCE_FLAG_SHARED_CROSS_ADAPTER = 0x2, } D3D12_FENCE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_FENCE_FLAGS);") typedef enum D3D12_QUERY_HEAP_TYPE {

1 0

Vinson Lee : include: Add more D3D12_RESOURCE_STATES enum elements.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: vkd3d Branch: master Commit: 4f5ec93661aaa59302f23b9bf4da4ae6b3ef3010 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4f5ec93661aaa59302f23b9… Author: Vinson Lee <vlee(a)freedesktop.org> Date: Thu Nov 12 01:42:59 2020 +0000 include: Add more D3D12_RESOURCE_STATES enum elements. Signed-off-by: Vinson Lee <vlee(a)freedesktop.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index e1f1133..11e597d 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -510,6 +510,12 @@ typedef enum D3D12_RESOURCE_STATES D3D12_RESOURCE_STATE_GENERIC_READ = 0x1 | 0x2 | 0x40 | 0x80 | 0x200 | 0x800, D3D12_RESOURCE_STATE_PRESENT = 0x0, D3D12_RESOURCE_STATE_PREDICATION = 0x200, + D3D12_RESOURCE_STATE_VIDEO_DECODE_READ = 0x10000, + D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE = 0x20000, + D3D12_RESOURCE_STATE_VIDEO_PROCESS_READ = 0x40000, + D3D12_RESOURCE_STATE_VIDEO_PROCESS_WRITE = 0x80000, + D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ = 0x200000, + D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE = 0x800000, } D3D12_RESOURCE_STATES; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RESOURCE_STATES);")

1 0

Alexandre Julliard : mscms/tests: Avoid depending on the exact Microsoft color profile.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 42cb8e802773d82d3e5b9e66ec59841582f6cb7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=42cb8e802773d82d3e5b9e66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:05:39 2020 +0100 mscms/tests: Avoid depending on the exact Microsoft color profile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/tests/profile.c | 53 ++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 2ef20129e63..15a0533145d 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -236,13 +236,8 @@ static void test_GetColorProfileElement( char *standardprofile ) BOOL ret, ref; DWORD size; TAGTYPE tag = 0x63707274; /* 'cprt' */ - static char buffer[51]; - static const char expect[] = - { 0x74, 0x65, 0x78, 0x74, 0x00, 0x00, 0x00, 0x00, 0x43, 0x6f, 0x70, - 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x29, 0x20, - 0x31, 0x39, 0x39, 0x38, 0x20, 0x48, 0x65, 0x77, 0x6c, 0x65, 0x74, - 0x74, 0x2d, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x72, 0x64, 0x20, 0x43, - 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x00 }; + char buffer[256]; + static const char expect[] = "text\0\0\0\0Copyright"; profile.dwType = PROFILE_FILENAME; profile.pProfileData = standardprofile; @@ -270,7 +265,7 @@ static void test_GetColorProfileElement( char *standardprofile ) ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() ); ok( size > 0, "wrong size\n" ); - ok( !memcmp( buffer, expect, sizeof(expect) ), "Unexpected tag data\n" ); + ok( !memcmp( buffer, expect, sizeof(expect)-1 ), "Unexpected tag data\n" ); pCloseColorProfile( handle ); } @@ -309,7 +304,7 @@ static void test_GetColorProfileElementTag( char *standardprofile ) /* Functional checks */ - ret = pGetColorProfileElementTag( handle, index, &tag ); + while ((ret = pGetColorProfileElementTag( handle, index, &tag )) && tag != expect) index++; ok( ret && tag == expect, "GetColorProfileElementTag() failed (%d)\n", GetLastError() ); @@ -321,20 +316,11 @@ static void test_GetColorProfileFromHandle( char *testprofile ) { if (testprofile) { + PROFILEHEADER *header; PROFILE profile; HPROFILE handle; DWORD size; BOOL ret; - static const unsigned char expect[] = - { 0x00, 0x00, 0x0c, 0x48, 0x4c, 0x69, 0x6e, 0x6f, 0x02, 0x10, 0x00, - 0x00, 0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, - 0x5a, 0x20, 0x07, 0xce, 0x00, 0x02, 0x00, 0x09, 0x00, 0x06, 0x00, - 0x31, 0x00, 0x00, 0x61, 0x63, 0x73, 0x70, 0x4d, 0x53, 0x46, 0x54, - 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x43, 0x20, 0x73, 0x52, 0x47, - 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0xd3, 0x2d, 0x48, 0x50, 0x20, 0x20 }; - unsigned char *buffer; profile.dwType = PROFILE_FILENAME; @@ -366,7 +352,16 @@ static void test_GetColorProfileFromHandle( char *testprofile ) ret = pGetColorProfileFromHandle( handle, buffer, &size ); ok( ret && size > 0, "GetColorProfileFromHandle() failed (%d)\n", GetLastError() ); - ok( !memcmp( buffer, expect, sizeof(expect) ), "Unexpected header data\n" ); + header = (PROFILEHEADER *)buffer; + ok( header->phClass == 0x72746e6d, "wrong phClass %x\n", header->phClass ); + ok( header->phDataColorSpace == 0x20424752, "wrong phDataColorSpace %x\n", header->phDataColorSpace ); + ok( header->phConnectionSpace == 0x205a5958, "wrong phConnectionSpace %x\n", header->phConnectionSpace ); + ok( header->phSignature == 0x70736361, "wrong phSignature %x\n", header->phSignature ); + ok( header->phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header->phProfileFlags ); + ok( header->phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header->phRenderingIntent ); + ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %x\n", header->phIlluminant.ciexyzX ); + ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %x\n", header->phIlluminant.ciexyzY ); + ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %x\n", header->phIlluminant.ciexyzZ ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -410,7 +405,15 @@ static void test_GetColorProfileHeader( char *testprofile ) ret = pGetColorProfileHeader( handle, &header ); ok( ret, "GetColorProfileHeader() failed (%d)\n", GetLastError() ); - ok( !memcmp( &header, rgbheader, sizeof(rgbheader) ), "Unexpected header data\n" ); + ok( header.phClass == 0x6d6e7472, "wrong phClass %x\n", header.phClass ); + ok( header.phDataColorSpace == 0x52474220, "wrong phDataColorSpace %x\n", header.phDataColorSpace ); + ok( header.phConnectionSpace == 0x58595a20, "wrong phConnectionSpace %x\n", header.phConnectionSpace ); + ok( header.phSignature == 0x61637370, "wrong phSignature %x\n", header.phSignature ); + ok( header.phProfileFlags == 0x00000000, "wrong phProfileFlags %x\n", header.phProfileFlags ); + ok( header.phRenderingIntent == 0x00000000, "wrong phRenderingIntent %x\n", header.phRenderingIntent ); + ok( header.phIlluminant.ciexyzX == 0x0000f6d6, "wrong phIlluminant.ciexyzX %x\n", header.phIlluminant.ciexyzX ); + ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %x\n", header.phIlluminant.ciexyzY ); + ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %x\n", header.phIlluminant.ciexyzZ ); pCloseColorProfile( handle ); } @@ -423,7 +426,7 @@ static void test_GetCountColorProfileElements( char *standardprofile ) PROFILE profile; HPROFILE handle; BOOL ret; - DWORD count, expect = 17; + DWORD count; profile.dwType = PROFILE_FILENAME; profile.pProfileData = standardprofile; @@ -445,8 +448,8 @@ static void test_GetCountColorProfileElements( char *standardprofile ) /* Functional checks */ ret = pGetCountColorProfileElements( handle, &count ); - ok( ret && count == expect, - "GetCountColorProfileElements() failed (%d)\n", GetLastError() ); + ok( ret && count > 15 && count < 20, + "GetCountColorProfileElements() failed (%d) %u\n", GetLastError(), count ); pCloseColorProfile( handle ); } @@ -1020,7 +1023,7 @@ static void test_SetColorProfileElement( char *testprofile ) TAGTYPE tag = 0x63707274; /* 'cprt' */ static char data[] = "(c) The Wine Project"; - static char buffer[51]; + char buffer[256]; profile.dwType = PROFILE_FILENAME; profile.pProfileData = testprofile;

1 0

Alexandre Julliard : mscms: Install the sRGB color profile.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: e06ae69d2cdd757843208175dfa27436191101e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e06ae69d2cdd757843208175… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:06:06 2020 +0100 mscms: Install the sRGB color profile. Based on a patch by Alex Henrie. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37396 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/srgb2014.icc | Bin 0 -> 3024 bytes dlls/mscms/version.rc | 3 +++ loader/wine.inf.in | 14 ++++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/mscms/srgb2014.icc b/dlls/mscms/srgb2014.icc new file mode 100644 index 00000000000..49afbfef10f Binary files /dev/null and b/dlls/mscms/srgb2014.icc differ diff --git a/dlls/mscms/version.rc b/dlls/mscms/version.rc index 11ebdd64b09..05ebf0c959f 100644 --- a/dlls/mscms/version.rc +++ b/dlls/mscms/version.rc @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: srgb2014.icc */ +1 WINE_DATA_FILE srgb2014.icc + #define WINE_FILEDESCRIPTION_STR "Wine Color Management System" #define WINE_FILENAME_STR "mscms.dll" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index da21245954e..5210672c295 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -2667,14 +2667,12 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [FakeDlls] ; create some directories first 10,help, -10,inf, 10,logs, 10,tasks, 10,temp, 11,catroot, 11,mui, 11,tasks, -11,spool\drivers\color, 11,spool\printers, 10,,explorer.exe 10,,hh.exe @@ -4058,6 +4056,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 +[ColorFiles] +srgb color space profile.icm,"@mscms.dll,-1" + [InfFiles] winebus.inf,"@winebus.sys,-1" winehid.inf,"@winehid.sys,-1" @@ -4145,6 +4146,7 @@ NlsFiles = nls SortFiles = nls [DestinationDirs] +ColorFiles = 23 InfFiles = 17 NlsFiles = 11 SortFiles = 10,globalization\sorting

1 0

Michael Stefaniuc : msidb: Use wide-char string literals.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 803994792a535d4bc873c9f939a0a6ba3c6fce09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=803994792a535d4bc873c9f9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 10 22:50:33 2020 +0100 msidb: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/main.c | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index ceca6df0fe7..2a18f855445 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -229,13 +229,10 @@ static const WCHAR *basenameW( const WCHAR *filename ) static int add_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const WCHAR insert_command[] = - {'I','N','S','E','R','T',' ','I','N','T','O',' ','_','S','t','r','e','a','m','s',' ', - '(','N','a','m','e',',',' ','D','a','t','a',')',' ','V','A','L','U','E','S',' ','(','?',',',' ','?',')',0}; MSIHANDLE view = 0, record = 0; UINT ret; - ret = MsiDatabaseOpenViewW( state->database_handle, insert_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"INSERT INTO _Streams (Name, Data) VALUES (?, ?)", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -290,13 +287,10 @@ static int add_streams( struct msidb_state *state ) static int kill_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const WCHAR delete_command[] = - {'D','E','L','E','T','E',' ','F','R','O','M',' ','_','S','t','r','e','a','m','s',' ', - 'W','H','E','R','E',' ','N','a','m','e',' ','=',' ','?',0}; MSIHANDLE view = 0, record = 0; UINT ret; - ret = MsiDatabaseOpenViewW( state->database_handle, delete_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"DELETE FROM _Streams WHERE Name = ?", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -345,9 +339,6 @@ static int kill_streams( struct msidb_state *state ) static int extract_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const WCHAR select_command[] = - {'S','E','L','E','C','T',' ','D','a','t','a',' ','F','R','O','M',' ','_','S','t','r','e','a','m','s',' ', - 'W','H','E','R','E',' ','N','a','m','e',' ','=',' ','?',0}; HANDLE file = INVALID_HANDLE_VALUE; MSIHANDLE view = 0, record = 0; DWORD read_size, write_size; @@ -362,7 +353,7 @@ static int extract_stream( struct msidb_state *state, const WCHAR *stream_filena ERR( "Failed to open destination file %s.\n", wine_dbgstr_w(stream_filename) ); goto cleanup; } - ret = MsiDatabaseOpenViewW( state->database_handle, select_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"SELECT Data FROM _Streams WHERE Name = ?", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -449,8 +440,6 @@ static int import_table( struct msidb_state *state, const WCHAR *table_path ) static int import_tables( struct msidb_state *state ) { - const WCHAR idt_ext[] = { '.','i','d','t',0 }; - const WCHAR wildcard[] = { '*',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) @@ -460,7 +449,7 @@ static int import_tables( struct msidb_state *state ) WCHAR *ext; /* permit specifying tables with wildcards ('Feature*') */ - if (wcsstr( table_name, wildcard ) != NULL) + if (wcsstr( table_name, L"*" ) != NULL) { WIN32_FIND_DATAW f; HANDLE handle; @@ -484,7 +473,7 @@ static int import_tables( struct msidb_state *state ) if (f.cFileName[0] == '.' && f.cFileName[1] == '.' && !f.cFileName[2]) continue; if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; if ((ext = PathFindExtensionW( f.cFileName )) == NULL) continue; - if (lstrcmpW( ext, idt_ext ) != 0) continue; + if (lstrcmpW( ext, L".idt" ) != 0) continue; if (!import_table( state, f.cFileName )) { FindClose( handle ); @@ -495,10 +484,10 @@ static int import_tables( struct msidb_state *state ) continue; } /* permit specifying tables by filename (*.idt) */ - if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, idt_ext ) != 0) + if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, L".idt" ) != 0) { - const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ - swprintf( table_path, ARRAY_SIZE(table_path), format, table_name ); + /* truncate to 8 characters */ + swprintf( table_path, ARRAY_SIZE(table_path), L"%.8s.idt", table_name ); table_name = table_path; } if (!import_table( state, table_name )) @@ -509,9 +498,7 @@ static int import_tables( struct msidb_state *state ) static int export_table( struct msidb_state *state, const WCHAR *table_name ) { - const WCHAR format_dos[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ - const WCHAR format_full[] = { '%','s','.','i','d','t',0 }; - const WCHAR *format = (state->short_filenames ? format_dos : format_full); + const WCHAR *format = (state->short_filenames ? L"%.8s.idt" : L"%s.idt"); WCHAR table_path[MAX_PATH]; UINT ret; @@ -527,14 +514,10 @@ static int export_table( struct msidb_state *state, const WCHAR *table_name ) static int export_all_tables( struct msidb_state *state ) { - static const WCHAR summary_information[] = - {'_','S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0}; - static const WCHAR query_command[] = - {'S','E','L','E','C','T',' ','N','a','m','e',' ','F','R','O','M',' ','_','T','a','b','l','e','s',0}; MSIHANDLE view = 0; UINT ret; - ret = MsiDatabaseOpenViewW( state->database_handle, query_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"SELECT Name FROM _Tables", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Tables table.\n" ); @@ -581,7 +564,7 @@ static int export_all_tables( struct msidb_state *state ) } ret = ERROR_SUCCESS; /* the _SummaryInformation table is not listed in _Tables */ - if (!export_table( state, summary_information )) + if (!export_table( state, L"_SummaryInformation" )) { ret = ERROR_FUNCTION_FAILED; goto cleanup; @@ -598,12 +581,11 @@ cleanup: static int export_tables( struct msidb_state *state ) { - const WCHAR wildcard[] = { '*',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) { - if (lstrcmpW( data->name, wildcard ) == 0) + if (lstrcmpW( data->name, L"*" ) == 0) { if (!export_all_tables( state )) return 0; /* failed, do not commit changes */

1 0

Michael Stefaniuc : icinfo: Use wide-char string literals.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 3c4860b93db6f949a5a72a961cffd5a688605a0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c4860b93db6f949a5a72a96… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 10 22:50:34 2020 +0100 icinfo: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/icinfo/icinfo.c | 58 +++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 40 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index cbf7c675b03..25b847b5a36 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -58,40 +58,18 @@ int __cdecl wmain(int argc, WCHAR* argv[]) { int i, n=0,doabout=0,doconfigure=0; - static const WCHAR header[] = {'C','u','r','r','e','n','t','l','y',' ','i','n','s','t','a','l','l','e','d',' ', - 'V','i','d','e','o',' ','C','o','m','p','r','e','s','s','o','r','s',':','\n',0}; - static const WCHAR close_flags[] = {')','\n',0}; - static const WCHAR s_fmt[] = {'%','s',0}; - static const WCHAR sspc_fmt[] = {'%','s',' ',0}; - static const WCHAR fcc_fmt[] = {'%','c','%','c','%','c','%','c','.','%','c','%','c','%','c','%','c',':',' ','%','s','\n',0}; - static const WCHAR desc_fmt[] = {'\t','s','z','D','e','s','c','r','i','p','t','i','o','n',':',' ','%','s','\n',0}; - static const WCHAR flags_fmt[] = {'\t','d','w','F','l','a','g','s',':',' ','0','x','%','0','8','x',' ','(',0}; - static const WCHAR version_fmt[] = {'\t','d','w','V','e','r','s','i','o','n',':',' ','0','x','%','0','8','x','\n',0}; - static const WCHAR versicm_fmt[] = {'\t','d','w','V','e','r','s','i','o','n','I','C','M',':',' ','0','x','%','0','8','x','\n',0}; - static const WCHAR VIDCF_QUALITY_W[] = {'V','I','D','C','F','_','Q','U','A','L','I','T','Y',0}; - static const WCHAR VIDCF_CRUNCH_W[] = {'V','I','D','C','F','_','C','R','U','N','C','H',0}; - static const WCHAR VIDCF_TEMPORAL_W[] = {'V','I','D','C','F','_','T','E','M','P','O','R','A','L',0}; - static const WCHAR VIDCF_COMPRESSFRAMES_W[] = {'V','I','D','C','F','_','C','O','M','P','R','E','S','S','F','R','A','M','E','S',0}; - static const WCHAR VIDCF_DRAW_W[] = {'V','I','D','C','F','_','D','R','A','W',0}; - static const WCHAR VIDCF_FASTTEMPORALC_W[] = {'V','I','D','C','F','_','F','A','S','T','T','E','M','P','O','R','A','L','C',0}; - static const WCHAR VIDCF_FASTTEMPORALD_W[] = {'V','I','D','C','F','_','F','A','S','T','T','E','M','P','O','R','A','L','D',0}; - static const WCHAR VIDCF_QUALITYTIME_W[] = {'V','I','D','C','F','_','Q','U','A','L','I','T','Y','T','I','M','E',0}; - static const WCHAR about[] = {'-','a','b','o','u','t','\0'}; - static const WCHAR configure[] = {'-','c','o','n','f','i','g','u','r','e','\0'}; - static const WCHAR unk_opt_fmt[] = {'U','n','k','n','o','w','n',' ','o','p','t','i','o','n',':',' ','%','s','\n',0}; - for (i = 1; i < argc; i++) { - if (!lstrcmpW(argv[i], about)) + if (!lstrcmpW(argv[i], L"-about")) doabout = 1; - else if (!lstrcmpW(argv[i], configure)) + else if (!lstrcmpW(argv[i], L"-configure")) doconfigure = 1; else { - mywprintf(unk_opt_fmt, argv[i]); + mywprintf(L"Unknown option: %s\n", argv[i]); return -1; } } - mywprintf(s_fmt, header); + mywprintf(L"%s", L"Currently installed Video Compressors:\n"); while (1) { ICINFO ii; HIC hic; @@ -106,25 +84,25 @@ int __cdecl wmain(int argc, WCHAR* argv[]) continue; } - mywprintf(fcc_fmt, + mywprintf(L"%c%c%c%c.%c%c%c%c: %s\n", LOBYTE(ii.fccType),LOBYTE(ii.fccType>>8),LOBYTE(ii.fccType>>16),LOBYTE(ii.fccType>>24), LOBYTE(ii.fccHandler),LOBYTE(ii.fccHandler>>8),LOBYTE(ii.fccHandler>>16),LOBYTE(ii.fccHandler>>24), ii.szName); - mywprintf(flags_fmt,ii.dwFlags); + mywprintf(L"\tdwFlags: 0x%08x (",ii.dwFlags); - if (ii.dwFlags & VIDCF_QUALITY) mywprintf(sspc_fmt, VIDCF_QUALITY_W); - if (ii.dwFlags & VIDCF_CRUNCH) mywprintf(sspc_fmt, VIDCF_CRUNCH_W); - if (ii.dwFlags & VIDCF_TEMPORAL) mywprintf(sspc_fmt, VIDCF_TEMPORAL_W); - if (ii.dwFlags & VIDCF_COMPRESSFRAMES) mywprintf(sspc_fmt, VIDCF_COMPRESSFRAMES_W); - if (ii.dwFlags & VIDCF_DRAW) mywprintf(sspc_fmt, VIDCF_DRAW_W); - if (ii.dwFlags & VIDCF_FASTTEMPORALC) mywprintf(sspc_fmt, VIDCF_FASTTEMPORALC_W); - if (ii.dwFlags & VIDCF_FASTTEMPORALD) mywprintf(sspc_fmt, VIDCF_FASTTEMPORALD_W); - if (ii.dwFlags & VIDCF_QUALITYTIME) mywprintf(sspc_fmt, VIDCF_QUALITYTIME_W); + if (ii.dwFlags & VIDCF_QUALITY) mywprintf(L"%s ", L"VIDCF_QUALITY"); + if (ii.dwFlags & VIDCF_CRUNCH) mywprintf(L"%s ", L"VIDCF_CRUNCH"); + if (ii.dwFlags & VIDCF_TEMPORAL) mywprintf(L"%s ", L"VIDCF_TEMPORAL"); + if (ii.dwFlags & VIDCF_COMPRESSFRAMES) mywprintf(L"%s ", L"VIDCF_COMPRESSFRAMES"); + if (ii.dwFlags & VIDCF_DRAW) mywprintf(L"%s ", L"VIDCF_DRAW"); + if (ii.dwFlags & VIDCF_FASTTEMPORALC) mywprintf(L"%s ", L"VIDCF_FASTTEMPORALC"); + if (ii.dwFlags & VIDCF_FASTTEMPORALD) mywprintf(L"%s ", L"VIDCF_FASTTEMPORALD"); + if (ii.dwFlags & VIDCF_QUALITYTIME) mywprintf(L"%s ", L"VIDCF_QUALITYTIME"); - mywprintf(s_fmt, close_flags); - mywprintf(version_fmt,ii.dwVersion); - mywprintf(versicm_fmt,ii.dwVersionICM); - mywprintf(desc_fmt,ii.szDescription); + mywprintf(L"%s", L")\n"); + mywprintf(L"\tdwVersion: 0x%08x\n", ii.dwVersion); + mywprintf(L"\tdwVersionICM: 0x%08x\n", ii.dwVersionICM); + mywprintf(L"\tszDescription: %s\n", ii.szDescription); if (doabout) ICAbout(hic,0); if (doconfigure && ICQueryConfigure(hic)) ICConfigure(hic,0);

1 0

Paul Gofman : wininet: Correctly return error status from InternetSetFilePointer() stub.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 67295a7844b94ccbfce85dbee22a76f12c9f5b36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67295a7844b94ccbfce85dbe… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 11 13:17:30 2020 +0300 wininet: Correctly return error status from InternetSetFilePointer() stub. Fixes Freestyle 2: Street Basketball update check failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 4 +++- dlls/wininet/tests/http.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fb02488934d..91bff2ece93 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2096,7 +2096,9 @@ DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove, PVOID pReserved, DWORD dwMoveContext, DWORD_PTR dwContext) { FIXME("(%p %d %p %d %lx): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext); - return FALSE; + + SetLastError(ERROR_INTERNET_INVALID_OPERATION); + return INVALID_SET_FILE_POINTER; } /*********************************************************************** diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fc984f6d33d..a5f5215f584 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -590,6 +590,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) DWORD length, length2, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; + DWORD contents_length, accepts_ranges; + BOOL not_supported; trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url); reset_events(); @@ -816,10 +818,23 @@ static void InternetReadFile_test(int flags, const test_data_t *test) res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,&index); trace("Option HTTP_QUERY_CONTENT_LENGTH -> %i %s (%u)\n",res,buffer,GetLastError()); if(test->flags & TESTF_COMPRESSED) + { ok(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %x (%u)\n", res, GetLastError()); + contents_length = 0; + } + else + { + contents_length = atoi(buffer); + } ok(!res || index == 1, "Index was not incremented although result is %x (index = %u)\n", res, index); + length = 64; + *buffer = 0; + res = HttpQueryInfoA(hor,HTTP_QUERY_ACCEPT_RANGES,&buffer,&length,0x0); + trace("Option HTTP_QUERY_ACCEPT_RANGES -> %i %s (%u)\n",res,buffer,GetLastError()); + accepts_ranges = res && !strcmp(buffer, "bytes"); + length = 100; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); buffer[length]=0; @@ -830,6 +845,26 @@ static void InternetReadFile_test(int flags, const test_data_t *test) buffer[length]=0; trace("Option HTTP_QUERY_CONTENT_ENCODING -> %i %s\n",res,buffer); + SetLastError(0xdeadbeef); + length = InternetSetFilePointer(hor, 0, NULL, FILE_END, 0); + not_supported = length == INVALID_SET_FILE_POINTER + && GetLastError() == ERROR_INTERNET_INVALID_OPERATION; + if (accepts_ranges) + todo_wine ok((length == contents_length && (GetLastError() == ERROR_SUCCESS + || broken(GetLastError() == 0xdeadbeef))) || broken(not_supported), + "Got unexpected length %#x, GetLastError() %u, contents_length %u, accepts_ranges %#x.\n", + length, GetLastError(), contents_length, accepts_ranges); + else + ok(not_supported, "Got unexpected length %#x, GetLastError() %u.\n", length, GetLastError()); + + if (length != INVALID_SET_FILE_POINTER) + { + SetLastError(0xdeadbeef); + length = InternetSetFilePointer(hor, 0, NULL, FILE_BEGIN, 0); + ok(!length && (GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef)), + "Got unexpected length %#x, GetLastError() %u.\n", length, GetLastError()); + } + SetLastError(0xdeadbeef); res = InternetReadFile(NULL, buffer, 100, &length); ok(!res, "InternetReadFile should have failed\n");

1 0

Alistair Leslie-Hughes : include: Add ICommandPrepare interface.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 82ea4cb6e069e899eb168cac9735009d47f71b55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82ea4cb6e069e899eb168cac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 11 21:32:53 2020 +1100 include: Add ICommandPrepare interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 24 ++++++++++++++++++++++++ include/Makefile.in | 1 + include/cmdpre.idl | 41 +++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 67 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index fa086290061..917395b37bd 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1629,3 +1629,27 @@ HRESULT __RPC_STUB IConvertType_CanConvert_Stub(IConvertType* This, DBTYPE from, FIXME("(%p)->(%d %d 0x%08x %p): stub\n", This, from, to, flags, error); return E_NOTIMPL; } + +HRESULT CALLBACK ICommandPrepare_Prepare_Proxy(ICommandPrepare* This, ULONG runs) +{ + FIXME("(%p)->(%d): stub\n", This, runs); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandPrepare_Prepare_Stub(ICommandPrepare* This, ULONG runs, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p): stub\n", This, runs, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandPrepare_Unprepare_Proxy(ICommandPrepare* This) +{ + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandPrepare_Unprepare_Stub(ICommandPrepare* This, IErrorInfo **error) +{ + FIXME("(%p)->(%p): stub\n", This, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 3ccacdaeecf..33aa29615c7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -63,6 +63,7 @@ SOURCES = \ cierror.h \ clusapi.h \ cmdbas.idl \ + cmdpre.idl \ cmdprp.idl \ cmdstrm.idl \ cmdtxt.idl \ diff --git a/include/cmdpre.idl b/include/cmdpre.idl new file mode 100644 index 00000000000..695149aae50 --- /dev/null +++ b/include/cmdpre.idl @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2020 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(0c733a26-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandPrepare : IUnknown +{ + [local] + HRESULT Prepare([in] ULONG runs); + + [call_as(Prepare)] + HRESULT RemotePrepare([in] ULONG runs,[out] IErrorInfo **error); + + [local] + HRESULT Unprepare(); + + [call_as(Unprepare)] + HRESULT RemoteUnprepare([out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index c56460262f5..5060378b351 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -73,6 +73,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cmdstrm.idl" #include "cmdprp.idl" #include "cvttyp.idl" +#include "cmdpre.idl" cpp_quote("#include <accctrl.h>")

1 0