- Wine-Devel - list.winehq.org

[PATCH 1/4] quartz/avidec: Don't send ICM_DECOMPRESS_BEGIN or ICM_DECOMPRESS_END messages if the source is disconnected.
by Zebediah Figura Nov. 19, 2020

Nov. 19, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/avidec.c | 11 ++++++++--- dlls/quartz/tests/avidec.c | 18 +++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 72f69ef7c5a..4995276dbfc 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -565,6 +565,9 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) LRESULT res; HRESULT hr; + if (!filter->source.pin.peer) + return S_OK; + filter->late = -1; source_format = (VIDEOINFOHEADER *)filter->sink.pin.mt.pbFormat; @@ -574,7 +577,7 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) return E_FAIL; } - if (filter->source.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) ERR("Failed to commit allocator, hr %#x.\n", hr); return S_OK; @@ -585,14 +588,16 @@ static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface) struct avi_decompressor *filter = impl_from_strmbase_filter(iface); LRESULT res; + if (!filter->source.pin.peer) + return S_OK; + if (filter->hvid && (res = ICDecompressEnd(filter->hvid))) { ERR("ICDecompressEnd() failed, error %ld.\n", res); return E_FAIL; } - if (filter->source.pin.peer) - IMemAllocator_Decommit(filter->source.pAllocator); + IMemAllocator_Decommit(filter->source.pAllocator); return S_OK; } diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index ddfe22ed797..8717e107106 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -692,25 +692,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -720,11 +720,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -956,7 +956,7 @@ static void test_connect_pin(void) ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); hr = IMediaControl_Stop(control); -- 2.29.2

1 3

Re: [PATCH] msvcp120: Avoid type conversion warnings in test_tr2_sys__dir_operation.
by Gerald Pfeifer Nov. 19, 2020

Nov. 19, 2020

This patch is obsolete now since a month later the essentially identical commit d276cf7112aa15aac102b03e519cc133da8ec1c1 Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:35 2020 +0200 msvcp120/tests: Fix signed integral cast warning. First cast to int, then to enum file_type. Reported by MinGW GCC 10 with -Woverflow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Gerald On Sun, 3 May 2020, Gerald Pfeifer wrote: > GCC 10 warns > > msvcp120.c:1777:11: warning: overflow in conversion from 'enum file_type' > to 'int' changes value from 'type = 3735928559' to '-559038737' > msvcp120.c:1807:11: warning: overflow in conversion from 'enum file_type' > to 'int' changes value from 'type = 3735928559' to '-559038737' > msvcp120.c:1817:11: warning: overflow in conversion from 'enum file_type' > to 'int' changes value from 'type = 3735928559' to '-559038737' > > where 3735928559 is 0xdeadbeef. > > This happens since first this variable is assigned to an enum and > that then to an int, and GCC diagnoses the latter as an overflow > (from signed to unsigned). > > Assigning a hex constant does not trigger, so simply break out those > two assignments. > > Gerald > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/msvcp120/tests/msvcp120.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c > index 7a382ac6fa..3cfabaa7ca 100644 > --- a/dlls/msvcp120/tests/msvcp120.c > +++ b/dlls/msvcp120/tests/msvcp120.c > @@ -1774,7 +1774,8 @@ static void test_tr2_sys__dir_operation(void) > > memset(first_file_name, 0xff, MAX_PATH); > memset(dest, 0, MAX_PATH); > - err = type = 0xdeadbeef; > + err = 0xdeadbeef; > + type = 0xdeadbeef; > result_handle = NULL; > result_handle = p_tr2_sys__Open_dir(first_file_name, "tr2_test_dir", &err, &type); > ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); > @@ -1804,7 +1805,8 @@ static void test_tr2_sys__dir_operation(void) > ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); > > memset(first_file_name, 0xff, MAX_PATH); > - err = type = 0xdeadbeef; > + err = 0xdeadbeef; > + type = 0xdeadbeef; > result_handle = file; > result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); > ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); > @@ -1814,7 +1816,8 @@ static void test_tr2_sys__dir_operation(void) > > CreateDirectoryA("empty_dir", NULL); > memset(first_file_name, 0xff, MAX_PATH); > - err = type = 0xdeadbeef; > + err = 0xdeadbeef; > + type = 0xdeadbeef; > result_handle = file; > result_handle = p_tr2_sys__Open_dir(first_file_name, "empty_dir", &err, &type); > ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle);

1 0

[PATCH] imm32: Use wide-char string literals.
by Michael Stefaniuc Nov. 19, 2020

Nov. 19, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/imm.c | 45 ++++++++++++++-------------------------- dlls/imm32/tests/imm32.c | 10 +++------ 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 0f3d7d5f8c8..9d2a09f22be 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -99,14 +99,8 @@ typedef struct _tagIMMThreadData { static struct list ImmHklList = LIST_INIT(ImmHklList); static struct list ImmThreadDataList = LIST_INIT(ImmThreadDataList); -static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','M','C','P','r','o','p','e','r','t','y',0}; - -static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; -static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; -static const WCHAR szImeRegFmt[] = {'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','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; - -static const WCHAR szwIME[] = {'I','M','E',0}; -static const WCHAR szwDefaultIME[] = {'D','e','f','a','u','l','t',' ','I','M','E',0}; +static const WCHAR szwWineIMCProperty[] = L"WineImmHIMCProperty"; +static const WCHAR szImeRegFmt[] = L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\%08lx"; static CRITICAL_SECTION threaddata_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -297,23 +291,15 @@ static void IMM_FreeThreadData(void) 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) ); @@ -321,7 +307,8 @@ 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; @@ -1642,7 +1629,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, L"IME")) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE; @@ -1680,7 +1667,7 @@ BOOL WINAPI __wine_register_window(HWND hwnd) { /* Do not create the window inside of a critical section */ LeaveCriticalSection(&threaddata_cs); - new = CreateWindowExW( 0, szwIME, szwDefaultIME, + new = CreateWindowExW( 0, L"IME", L"Default IME", WS_POPUP | WS_DISABLED | WS_CLIPSIBLINGS, 0, 0, 1, 1, 0, 0, 0, 0); /* thread_data is in the current thread so we can assume it's still valid */ @@ -1785,13 +1772,11 @@ UINT WINAPI ImmGetDescriptionA( */ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) { - static const WCHAR name[] = { 'W','i','n','e',' ','X','I','M',0 }; - FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen); if (!hKL) return 0; - if (!uBufLen) return lstrlenW( name ); - lstrcpynW( lpszDescription, name, uBufLen ); + if (!uBufLen) return lstrlenW(L"Wine XIM" ); + lstrcpynW( lpszDescription, L"Wine XIM", uBufLen ); return lstrlenW( lpszDescription ); } @@ -1872,7 +1857,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) } length = 0; - rc = RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, NULL, &length); + rc = RegGetValueW(hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, NULL, &length); if (rc != ERROR_SUCCESS) { @@ -1892,7 +1877,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) return length / sizeof(WCHAR); } - RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, lpszFileName, &length); + RegGetValueW(hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, lpszFileName, &length); RegCloseKey(hkey); @@ -2111,10 +2096,10 @@ HKL WINAPI ImmInstallIMEW( if (rc == ERROR_SUCCESS) { - rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (const BYTE*)lpszIMEFileName, + rc = RegSetValueExW(hkey, L"Ime File", 0, REG_SZ, (const BYTE*)lpszIMEFileName, (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (const BYTE*)lpszLayoutText, + rc = RegSetValueExW(hkey, L"Layout Text", 0, REG_SZ, (const BYTE*)lpszLayoutText, (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); return hkl; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 827b31eec2e..cc9e0e8c01f 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1099,10 +1099,9 @@ static void test_ImmDefaultHwnd(void) static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) { - static const WCHAR imeW[] = {'I','M','E',0}; WCHAR class_nameW[16]; HWND *ime_window = (HWND *)param; - if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, imeW)) + if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, L"IME")) { *ime_window = hWnd; return FALSE; @@ -1562,9 +1561,6 @@ static LRESULT CALLBACK processkey_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, static void test_ime_processkey(void) { - WCHAR classNameW[] = {'P','r','o','c','e','s','s', 'K','e','y','T','e','s','t','C','l','a','s','s',0}; - WCHAR windowNameW[] = {'P','r','o','c','e','s','s', 'K','e','y',0}; - MSG msg; WNDCLASSW wclass; HANDLE hInstance = GetModuleHandleW(NULL); @@ -1573,7 +1569,7 @@ static void test_ime_processkey(void) INT rc; HWND hWndTest; - wclass.lpszClassName = classNameW; + wclass.lpszClassName = L"ProcessKeyTestClass"; wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = processkey_wnd_proc; wclass.hInstance = hInstance; @@ -1589,7 +1585,7 @@ static void test_ime_processkey(void) } /* create the test window that will receive the keystrokes */ - hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, + hWndTest = CreateWindowW(wclass.lpszClassName, L"ProcessKey", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, NULL, NULL, hInstance, NULL); -- 2.26.2

1 0

[PATCH] itss: Use zero terminated WCHAR strings.
by Michael Stefaniuc Nov. 19, 2020

Nov. 19, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/protocol.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 167ce906b90..6d40ddf738f 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -148,16 +148,16 @@ static ULONG WINAPI ITSInternetProtocol_Release(IInternetProtocol *iface) static LPCWSTR skip_schema(LPCWSTR url) { - static const WCHAR its_schema[] = {'i','t','s',':'}; - static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; - static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'}; - - if(!wcsnicmp(its_schema, url, ARRAY_SIZE(its_schema))) - return url + ARRAY_SIZE(its_schema); - if(!wcsnicmp(msits_schema, url, ARRAY_SIZE(msits_schema))) - return url + ARRAY_SIZE(msits_schema); - if(!wcsnicmp(mk_schema, url, ARRAY_SIZE(mk_schema))) - return url + ARRAY_SIZE(mk_schema); + static const WCHAR its_schema[] = L"its:"; + static const WCHAR msits_schema[] = L"ms-its:"; + static const WCHAR mk_schema[] = L"mk:@MSITStore:"; + + if(!wcsnicmp(its_schema, url, ARRAY_SIZE(its_schema) - 1)) + return url + ARRAY_SIZE(its_schema) - 1; + if(!wcsnicmp(msits_schema, url, ARRAY_SIZE(msits_schema) - 1)) + return url + ARRAY_SIZE(msits_schema) - 1; + if(!wcsnicmp(mk_schema, url, ARRAY_SIZE(mk_schema) - 1)) + return url + ARRAY_SIZE(mk_schema) - 1; return NULL; } -- 2.26.2

1 0

[PATCH] itss: Use wide-char string literals.
by Michael Stefaniuc Nov. 19, 2020

Nov. 19, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/chm_lib.c | 33 ++++------------------ dlls/itss/moniker.c | 7 ++--- dlls/itss/protocol.c | 8 ++---- dlls/itss/storage.c | 3 +- dlls/itss/tests/protocol.c | 58 +++++++++++++------------------------- 5 files changed, 29 insertions(+), 80 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index be04ae5673a..91e3fa3d811 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -203,31 +203,6 @@ static BOOL _unmarshal_uuid(unsigned char **pData, return _unmarshal_uchar_array(pData, pDataLen, dest, 16); } -/* names of sections essential to decompression */ -static const WCHAR _CHMU_RESET_TABLE[] = { -':',':','D','a','t','a','S','p','a','c','e','/', - 'S','t','o','r','a','g','e','/', - 'M','S','C','o','m','p','r','e','s','s','e','d','/', - 'T','r','a','n','s','f','o','r','m','/', - '{','7','F','C','2','8','9','4','0','-','9','D','3','1', - '-','1','1','D','0','-','9','B','2','7','-', - '0','0','A','0','C','9','1','E','9','C','7','C','}','/', - 'I','n','s','t','a','n','c','e','D','a','t','a','/', - 'R','e','s','e','t','T','a','b','l','e',0 -}; -static const WCHAR _CHMU_LZXC_CONTROLDATA[] = { -':',':','D','a','t','a','S','p','a','c','e','/', - 'S','t','o','r','a','g','e','/', - 'M','S','C','o','m','p','r','e','s','s','e','d','/', - 'C','o','n','t','r','o','l','D','a','t','a',0 -}; -static const WCHAR _CHMU_CONTENT[] = { -':',':','D','a','t','a','S','p','a','c','e','/', - 'S','t','o','r','a','g','e','/', - 'M','S','C','o','m','p','r','e','s','s','e','d','/', - 'C','o','n','t','e','n','t',0 -}; - /* * structures local to this module */ @@ -766,15 +741,17 @@ struct chmFile *chm_openW(const WCHAR *filename) /* prefetch most commonly needed unit infos */ if (CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, - _CHMU_RESET_TABLE, + L"::DataSpace/Storage/MSCompressed/Transform/" + "{7FC28940-9D31-11D0-9B27-00A0C91E9C7C}/" + "InstanceData/ResetTable", &newHandle->rt_unit) || newHandle->rt_unit.space == CHM_COMPRESSED || CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, - _CHMU_CONTENT, + L"::DataSpace/Storage/MSCompressed/Content", &newHandle->cn_unit) || newHandle->cn_unit.space == CHM_COMPRESSED || CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, - _CHMU_LZXC_CONTROLDATA, + L"::DataSpace/Storage/MSCompressed/ControlData", &uiLzxc) || uiLzxc.space == CHM_COMPRESSED) { diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 41faa23fb5e..3d0063f2bb7 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -283,8 +283,6 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName( LPOLESTR* ppszDisplayName) { ITS_IMonikerImpl *This = impl_from_IMoniker(iface); - static const WCHAR szFormat[] = { - 'm','s','-','i','t','s',':','%','s',':',':','%','s',0 }; DWORD len; LPWSTR str; @@ -292,7 +290,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName( len = lstrlenW( This->szFile ) + lstrlenW( This->szHtml ); str = CoTaskMemAlloc( len*sizeof(WCHAR) ); - swprintf( str, len, szFormat, This->szFile, This->szHtml ); + swprintf( str, len, L"ms-its:%s::%s", This->szFile, This->szHtml ); *ppszDisplayName = str; @@ -431,8 +429,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName( ULONG * pchEaten, IMoniker ** ppmkOut) { - static const WCHAR szPrefix[] = { - '@','M','S','I','T','S','t','o','r','e',':',0 }; + static const WCHAR szPrefix[] = L"@MSITStore:"; const DWORD prefix_len = ARRAY_SIZE(szPrefix)-1; DWORD n; diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 3f5362e5b9b..167ce906b90 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -231,8 +231,6 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, int res; HRESULT hres; - static const WCHAR separator[] = {':',':',0}; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); @@ -260,7 +258,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, return hres; } - p = wcsstr(file_name, separator); + p = wcsstr(file_name, L"::"); if(!p) { WARN("invalid url\n"); HeapFree(GetProcessHeap(), 0, file_name); @@ -480,13 +478,11 @@ static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, LPCWSTR base_end, ptr; DWORD rel_len; - static const WCHAR separator[] = {':',':',0}; - TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved); - base_end = wcsstr(pwzBaseUrl, separator); + base_end = wcsstr(pwzBaseUrl, L"::"); if(!base_end) return 0x80041001; base_end += 2; diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 86d33f29dfb..ee5432d4d61 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -639,7 +639,6 @@ HRESULT ITSS_StgOpenStorage( IStorage** ppstgOpen) { struct chmFile *chmfile; - static const WCHAR szRoot[] = { '/', 0 }; TRACE("%s\n", debugstr_w(pwcsName) ); @@ -647,7 +646,7 @@ HRESULT ITSS_StgOpenStorage( if( !chmfile ) return E_FAIL; - return ITSS_create_chm_storage( chmfile, szRoot, ppstgOpen ); + return ITSS_create_chm_storage( chmfile, L"/", ppstgOpen ); } /************************************************************************/ diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 4cafba7b615..43d867b9cfb 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -66,36 +66,24 @@ static HRESULT expect_hrResult; static IInternetProtocol *read_protocol = NULL; static DWORD bindf; -static const WCHAR blank_url1[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url2[] = {'m','S','-','i','T','s',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url3[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url4[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url5[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url6[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','%','6','2','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url7[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url8[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; -static const WCHAR blank_url9[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','d','i','r','/','.','.','/','b','l','a','n','k','.','h','t','m','l',0}; +static const WCHAR blank_url1[] = L"its:test.chm::/blank.html"; +static const WCHAR blank_url2[] = L"mS-iTs:test.chm::/blank.html"; +static const WCHAR blank_url3[] = L"mk:@MSITStore:test.chm::/blank.html"; +static const WCHAR blank_url4[] = L"its:test.chm::blank.html"; +static const WCHAR blank_url5[] = L"its:test.chm::\\blank.html"; +static const WCHAR blank_url6[] = L"its:test.chm::/%62lank.html"; +static const WCHAR blank_url7[] = L"mk:@MSITStore:test.chm::\\blank.html"; +static const WCHAR blank_url8[] = L"mk:@MSITStore:test.chm::/blank.html/"; +static const WCHAR blank_url9[] = L"its:test.chm::/dir/../blank.html"; static enum { ITS_PROTOCOL, MK_PROTOCOL } test_protocol; -static const WCHAR cache_file1[] = - {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR cache_file2[] = - {'t','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR cache_file3[] = - {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; +static const WCHAR cache_file1[] = L"test.chm::/blank.html"; +static const WCHAR cache_file2[] = L"test.chm::\\blank.html"; +static const WCHAR cache_file3[] = L"test.chm::/blank.html/"; static const WCHAR *cache_file = cache_file1; static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) @@ -126,9 +114,6 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { - static const WCHAR blank_html[] = {'b','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR text_html[] = {'t','e','x','t','/','h','t','m','l',0}; - switch(ulStatusCode) { case BINDSTATUS_BEGINDOWNLOADDATA: CHECK_EXPECT(ReportProgress_BEGINDOWNLOADDATA); @@ -137,13 +122,13 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_SENDINGREQUEST: CHECK_EXPECT(ReportProgress_SENDINGREQUEST); if(test_protocol == ITS_PROTOCOL) - ok(!lstrcmpW(szStatusText, blank_html), "unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, L"blank.html"), "unexpected szStatusText\n"); else ok(szStatusText == NULL, "szStatusText != NULL\n"); break; case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); - ok(!lstrcmpW(szStatusText, text_html), "unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, L"text/html"), "unexpected szStatusText\n"); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -523,16 +508,11 @@ static void test_its_protocol(void) ULONG ref; HRESULT hres; - static const WCHAR wrong_url1[] = - {'i','t','s',':','t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','.','h','t','m','l',0}; - static const WCHAR wrong_url2[] = - {'i','t','s',':','t','e','s','.','c','h','m',':',':','b','/','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR wrong_url3[] = - {'i','t','s',':','t','e','s','t','.','c','h','m','/','b','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR wrong_url4[] = {'m','k',':','@','M','S','I','T','S','t','o','r',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR wrong_url5[] = {'f','i','l','e',':', - 't','e','s','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; + static const WCHAR wrong_url1[] = L"its:test.chm::/blan.html"; + static const WCHAR wrong_url2[] = L"its:tes.chm::b/lank.html"; + static const WCHAR wrong_url3[] = L"its:test.chm/blank.html"; + static const WCHAR wrong_url4[] = L"mk:@MSITStor:test.chm::/blank.html"; + static const WCHAR wrong_url5[] = L"file:tes.chm::/blank.html"; test_protocol = ITS_PROTOCOL; -- 2.26.2

1 0

[PATCH] msvcrt: #include <stdarg.h> from unixlib.c
by Gerald Pfeifer Nov. 19, 2020

Nov. 19, 2020

commit c72e1b096d16a1e9a36b86fbc8c403ec3653a504 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:14:50 2020 +0100 msvcrt: Move math functions to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> broke the build on FreeBSD whose system headers do not pull in others as commonly as is the case on GNU/Linux systems. Explicitly including <stdarg.h> addresses this. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/msvcrt/unixlib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index edc3d96af4a..b64355ebf16 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -26,6 +26,7 @@ #include "wine/port.h" #include <stdio.h> +#include <stdarg.h> #define __USE_ISOC9X 1 #define __USE_ISOC99 1 #include <math.h> -- 2.28.0

1 0

[PATCH v2 1/2] winemac.drv: Use Metal to get a display's GPU info if possible.
by Brendan Shanks Nov. 19, 2020

Nov. 19, 2020

Fixes an Apple Silicon issue where CGDisplayIOServicePort() returns a fake AMD GPU "compatibility" node rather than the real GPU node. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: - Remove now-inaccurate comment (thanks Zhiyi) - macdrv_get_gpu_info_from_display_id_using_metal() needs an autorelease pool dlls/winemac.drv/cocoa_display.m | 39 +++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index e769772feaa..2e50b67c7d1 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -330,6 +330,27 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id_using_metal + * + * Get GPU information for a CG display id using Metal. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + id<MTLDevice> device; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) + ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); + + [pool release]; + return ret; +} + #else static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) @@ -337,20 +358,32 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return -1; } +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + return -1; +} + #endif /*********************************************************************** * macdrv_get_gpu_info_from_display_id * * Get GPU information from a display id. - * This is a fallback for 32bit build or older Mac OS version where Metal is unavailable. * * Returns non-zero value on failure. */ static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) { - io_registry_entry_t entry = CGDisplayIOServicePort(display_id); - return macdrv_get_gpu_info_from_entry(gpu, entry); + int ret; + io_registry_entry_t entry; + + ret = macdrv_get_gpu_info_from_display_id_using_metal(gpu, display_id); + if (ret) + { + entry = CGDisplayIOServicePort(display_id); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + } + return ret; } /*********************************************************************** -- 2.26.2

1 1

[PATCH] msvcrt: Don't overwrite threadmbcinfostruct structure in _setmbcp.
by Piotr Caban Nov. 19, 2020

Nov. 19, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 25 +++++++++++++++++---- dlls/msvcrt/locale.c | 19 ++++++++-------- dlls/msvcrt/mbcs.c | 42 +++++++++++++++++++++++++----------- dlls/msvcrt/msvcrt.h | 3 ++- 4 files changed, 63 insertions(+), 26 deletions(-)

1 0

[PATCH v2 1/5] strmbase: Forbid disconnecting the sink if the filter is not stopped.
by Zebediah Figura Nov. 19, 2020

Nov. 19, 2020

Addendum to 2a6037e263ff3fae8ca82d90b0b141bea1cd473d. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c08f04730e7..d7788cda493 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -887,6 +887,13 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) EnterCriticalSection(&pin->pin.filter->csFilter); + if (pin->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&pin->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (pin->pin.peer) { if (pin->pFuncsTable->sink_disconnect) -- 2.29.2

2 5

[PATCH] makedep: Use short debug file names.
by Jacek Caban Nov. 19, 2020

Nov. 19, 2020

Fixes gitignore entries for symbol files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

1 0