November 2020 - Wine-Commits

Michael Stefaniuc : wintab32: Use wide-char string literals.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 783d71366a28f664370c34191634fdc7500d7d3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=783d71366a28f664370c3419… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 12 00:37:57 2020 +0100 wintab32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/wintab32.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 98ce2bc1739..d56706b4223 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintab32); HWND hwndDefault = NULL; -static const WCHAR - WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0}; static CRITICAL_SECTION_DEBUG csTablet_debug = { 0, 0, &csTablet, @@ -62,34 +60,26 @@ static VOID TABLET_Register(void) wndClass.cbWndExtra = 0; wndClass.hCursor = NULL; wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); - wndClass.lpszClassName = WC_TABLETCLASSNAME; + wndClass.lpszClassName = L"WineTabletClass"; RegisterClassW(&wndClass); } static VOID TABLET_Unregister(void) { - UnregisterClassW(WC_TABLETCLASSNAME, NULL); + UnregisterClassW(L"WineTabletClass", NULL); } static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; - static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; + static const WCHAR displayW[] = L"}\\0000"; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), L"__wine_display_device_guid" )); if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); @@ -97,7 +87,7 @@ static HMODULE load_graphics_driver(void) lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); - if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + if (!RegQueryValueExW( hkey, L"GraphicsDriver", NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); RegCloseKey( hkey ); TRACE( "%s %p\n", debugstr_w(path), ret ); return ret; @@ -105,8 +95,6 @@ static HMODULE load_graphics_driver(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { - static const WCHAR name[] = {'T','a','b','l','e','t',0}; - TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { @@ -114,7 +102,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) TRACE("Initialization\n"); DisableThreadLibraryCalls(hInstDLL); TABLET_Register(); - hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, + hwndDefault = CreateWindowW(L"WineTabletClass", L"Tablet", WS_POPUPWINDOW,0,0,0,0,0,0,hInstDLL,0); if (hwndDefault) {

1 0

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

Nov. 12, 2020

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

Vinson Lee : include: Add more D3D12_RESOURCE_STATES enum elements.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

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

Biswapriyo Nath : include: Add DEFINE_ENUM_FLAG_OPERATORS macro for enumerations.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

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

Jacek Caban : kernel32: Allow non-console handles in CloseConsoleHandle.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 5386b7e4c83f6e3a45409c21261622ace8451c62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5386b7e4c83f6e3a45409c21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:06:48 2020 +0100 kernel32: Allow non-console handles in CloseConsoleHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 +------ dlls/kernel32/kernel_private.h | 8 -------- dlls/kernel32/tests/console.c | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 8d5f8181ffe..d55c589eaf7 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -125,12 +125,7 @@ HANDLE WINAPI DuplicateConsoleHandle(HANDLE handle, DWORD access, BOOL inherit, */ BOOL WINAPI CloseConsoleHandle(HANDLE handle) { - if (!is_console_handle(handle)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return CloseHandle(wine_server_ptr_handle(console_handle_unmap(handle))); + return CloseHandle(handle); } /****************************************************************** diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index fe19e2ed5cb..fa1dd79d0c0 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -21,8 +21,6 @@ #ifndef __WINE_KERNEL_PRIVATE_H #define __WINE_KERNEL_PRIVATE_H -#include "wine/server.h" - NTSTATUS WINAPI BaseGetNamedObjectDirectory( HANDLE *dir ); BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) DECLSPEC_HIDDEN; @@ -37,12 +35,6 @@ static inline HANDLE console_handle_map(HANDLE h) return h != INVALID_HANDLE_VALUE ? (HANDLE)((UINT_PTR)h ^ 3) : INVALID_HANDLE_VALUE; } -/* map a kernel32 console handle onto a real wineserver handle */ -static inline obj_handle_t console_handle_unmap(HANDLE h) -{ - return wine_server_obj_handle( h != INVALID_HANDLE_VALUE ? (HANDLE)((UINT_PTR)h ^ 3) : INVALID_HANDLE_VALUE ); -} - static inline BOOL set_ntstatus( NTSTATUS status ) { if (status) SetLastError( RtlNtStatusToDosError( status )); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 69005bab5f1..13e17e14e4c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1523,10 +1523,8 @@ static void test_DuplicateConsoleHandle(void) ok(ret, "SetEvent failed: %u\n", GetLastError()); ret = CloseConsoleHandle(handle); - todo_wine ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); ret = CloseConsoleHandle(event); - todo_wine ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); handle = DuplicateConsoleHandle((HANDLE)0xdeadbeef, 0, FALSE, DUPLICATE_SAME_ACCESS);

1 0

Nikolay Sivov : mf/session: Notify quality manager on input/output processing.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: fa0beb858ec27798ad24870adb4968538d31337b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa0beb858ec27798ad24870a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:50 2020 +0300 mf/session: Notify quality manager on input/output processing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 8d5ff6d5c07..5bbd47b3418 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2465,7 +2465,7 @@ static struct sample *transform_create_sample(IMFSample *sample) return sample_entry; } -static HRESULT transform_node_pull_samples(struct topo_node *node) +static HRESULT transform_node_pull_samples(const struct media_session *session, struct topo_node *node) { MFT_OUTPUT_STREAM_INFO stream_info; MFT_OUTPUT_DATA_BUFFER *buffers; @@ -2518,6 +2518,9 @@ static HRESULT transform_node_pull_samples(struct topo_node *node) if (SUCCEEDED(hr) && !(buffers[i].dwStatus & MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) { + if (session->quality_manager) + IMFQualityManager_NotifyProcessOutput(session->quality_manager, node->node, i, buffers[i].pSample); + queued_sample = transform_create_sample(buffers[i].pSample); list_add_tail(&node->u.transform.outputs[i].samples, &queued_sample->entry); } @@ -2544,6 +2547,9 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop unsigned int i; HRESULT hr; + if (session->quality_manager) + IMFQualityManager_NotifyProcessInput(session->quality_manager, node, input, sample); + IMFTopologyNode_GetNodeType(node, &node_type); IMFTopologyNode_GetTopoNodeID(node, &node_id); @@ -2569,7 +2575,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop break; case MF_TOPOLOGY_TRANSFORM_NODE: - transform_node_pull_samples(topo_node); + transform_node_pull_samples(session, topo_node); sample_entry = transform_create_sample(sample); list_add_tail(&topo_node->u.transform.inputs[input].samples, &sample_entry->entry); @@ -2603,7 +2609,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop WARN("Drain command failed for transform, hr %#x.\n", hr); } - transform_node_pull_samples(topo_node); + transform_node_pull_samples(session, topo_node); /* Remaining unprocessed input has been discarded, now queue markers for every output. */ if (drain) @@ -4532,7 +4538,7 @@ static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualit static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityManager *iface, IMFTopologyNode *node, LONG input_index, IMFSample *sample) { - FIXME("%p, %p, %d, %p stub.\n", iface, node, input_index, sample); + TRACE("%p, %p, %d, %p stub.\n", iface, node, input_index, sample); return E_NOTIMPL; } @@ -4540,7 +4546,7 @@ static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityMana static HRESULT WINAPI standard_quality_manager_NotifyProcessOutput(IMFQualityManager *iface, IMFTopologyNode *node, LONG output_index, IMFSample *sample) { - FIXME("%p, %p, %d, %p stub.\n", iface, node, output_index, sample); + TRACE("%p, %p, %d, %p stub.\n", iface, node, output_index, sample); return E_NOTIMPL; }

1 0

Nikolay Sivov : mf/session: Provide quality manager with presentation clock.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 61ab5b24757b447fcd2eb92ca326d7e4a85f82b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ab5b24757b447fcd2eb92c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:48 2020 +0300 mf/session: Provide quality manager with presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 29 +++++++++++++++++++++++++++-- dlls/mf/tests/mf.c | 3 +++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a1b54b7080e..0fa6b49498d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -303,6 +303,9 @@ struct quality_manager { IMFQualityManager IMFQualityManager_iface; LONG refcount; + + IMFPresentationClock *clock; + CRITICAL_SECTION cs; }; static inline struct media_session *impl_from_IMFMediaSession(IMFMediaSession *iface) @@ -3393,6 +3396,12 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses goto failed; } + if (object->quality_manager && FAILED(hr = IMFQualityManager_NotifyPresentationClock(object->quality_manager, + object->clock))) + { + goto failed; + } + *session = &object->IMFMediaSession_iface; return S_OK; @@ -4459,6 +4468,9 @@ static ULONG WINAPI standard_quality_manager_Release(IMFQualityManager *iface) if (!refcount) { + if (manager->clock) + IMFPresentationClock_Release(manager->clock); + DeleteCriticalSection(&manager->cs); heap_free(manager); } @@ -4475,9 +4487,21 @@ static HRESULT WINAPI standard_quality_manager_NotifyTopology(IMFQualityManager static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualityManager *iface, IMFPresentationClock *clock) { - FIXME("%p, %p stub.\n", iface, clock); + struct quality_manager *manager = impl_from_IMFQualityManager(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, clock); + + if (!clock) + return E_POINTER; + + EnterCriticalSection(&manager->cs); + if (manager->clock) + IMFPresentationClock_Release(manager->clock); + manager->clock = clock; + IMFPresentationClock_AddRef(manager->clock); + LeaveCriticalSection(&manager->cs); + + return S_OK; } static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityManager *iface, IMFTopologyNode *node, @@ -4536,6 +4560,7 @@ HRESULT WINAPI MFCreateStandardQualityManager(IMFQualityManager **manager) object->IMFQualityManager_iface.lpVtbl = &standard_quality_manager_vtbl; object->refcount = 1; + InitializeCriticalSection(&object->cs); *manager = &object->IMFQualityManager_iface; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c38c817eb4b..7780bf4ea58 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2815,6 +2815,9 @@ static void test_quality_manager(void) hr = MFCreateStandardQualityManager(&manager); ok(hr == S_OK, "Failed to create quality manager, hr %#x.\n", hr); + hr = IMFQualityManager_NotifyPresentationClock(manager, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMFQualityManager_Release(manager); }

1 0

Nikolay Sivov : mf/evr: Handle sample requests from the mixer.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: d493ba166ecc2260d8b302c6592cab90c8680a61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d493ba166ecc2260d8b302c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:46 2020 +0300 mf/evr: Handle sample requests from the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 486958f5f79..a77372977c7 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -21,6 +21,7 @@ #include "mf_private.h" #include "uuids.h" #include "evr.h" +#include "evcode.h" #include "d3d9.h" #include "initguid.h" #include "dxva2api.h" @@ -1723,9 +1724,34 @@ static ULONG WINAPI video_renderer_event_sink_Release(IMediaEventSink *iface) static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, LONG event, LONG_PTR param1, LONG_PTR param2) { - FIXME("%p, %d, %ld, %ld.\n", iface, event, param1, param2); + struct video_renderer *renderer = impl_from_IMediaEventSink(iface); + HRESULT hr = S_OK; + unsigned int idx; - return E_NOTIMPL; + TRACE("%p, %d, %ld, %ld.\n", iface, event, param1, param2); + + EnterCriticalSection(&renderer->cs); + + if (event == EC_SAMPLE_NEEDED) + { + idx = param1; + if (idx >= renderer->stream_count) + hr = MF_E_INVALIDSTREAMNUMBER; + else + { + hr = IMFMediaEventQueue_QueueEventParamVar(renderer->streams[idx]->event_queue, + MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); + } + } + else + { + WARN("Unhandled event %d.\n", event); + hr = MF_E_UNEXPECTED; + } + + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMediaEventSinkVtbl media_event_sink_vtbl =

1 0

Alistair Leslie-Hughes : include: Add ICommandPrepare interface.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

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

Alistair Leslie-Hughes : include: Add IRowsetChange interface.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: a4ff1cae87339cc58ed7f019d4ba50fed382dc1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ff1cae87339cc58ed7f019… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 11 21:32:54 2020 +1100 include: Add IRowsetChange interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/rstchg.idl | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 33aa29615c7..24439dc7522 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -612,6 +612,7 @@ SOURCES = \ rpcproxy.h \ rpcsal.h \ rstbas.idl \ + rstchg.idl \ rstinf.idl \ rstloc.idl \ rstnot.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index 5060378b351..256d5fc7917 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -74,6 +74,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cmdprp.idl" #include "cvttyp.idl" #include "cmdpre.idl" +#include "rstchg.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/rstchg.idl b/include/rstchg.idl new file mode 100644 index 00000000000..973db1aab13 --- /dev/null +++ b/include/rstchg.idl @@ -0,0 +1,36 @@ +/* + * 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 + +[ + local, + object, + uuid(0c733a05-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetChange : IUnknown +{ + HRESULT DeleteRows([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [out, size_is(count)] DBROWSTATUS status[] ); + + HRESULT SetData([in] HROW row, [in] HACCESSOR accessor, [in] void *data); + + HRESULT InsertRow([in] HCHAPTER reserved, [in] HACCESSOR accessor, [in] void *data, [out] HROW *row); +}

1 0