October 2020 - Wine-Commits

Nikolay Sivov : evr/mixer: Keep dxva device handle around.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 35663e6a7fd9a1d73a3aad5129b8f59bc0923c82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35663e6a7fd9a1d73a3aad51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:29 2020 +0300 evr/mixer: Keep dxva device handle around. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 90 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 29 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index fd7596eeadf..42e0ca42f91 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -81,12 +81,14 @@ struct video_mixer unsigned int input_count; struct output_stream output; - COLORREF bkgnd_color; IDirect3DDeviceManager9 *device_manager; + HANDLE device_handle; + IMediaEventSink *event_sink; IMFAttributes *attributes; IMFAttributes *internal_attributes; unsigned int mixing_flags; + COLORREF bkgnd_color; LONGLONG lower_bound; LONGLONG upper_bound; CRITICAL_SECTION cs; @@ -266,6 +268,17 @@ static ULONG WINAPI video_mixer_inner_AddRef(IUnknown *iface) return refcount; } +static void video_mixer_release_device_manager(struct video_mixer *mixer) +{ + if (mixer->device_manager) + { + IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); + IDirect3DDeviceManager9_Release(mixer->device_manager); + } + mixer->device_handle = NULL; + mixer->device_manager = NULL; +} + static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) { struct video_mixer *mixer = impl_from_IUnknown(iface); @@ -282,8 +295,7 @@ static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) IMFAttributes_Release(mixer->inputs[i].attributes); } video_mixer_clear_types(mixer); - if (mixer->device_manager) - IDirect3DDeviceManager9_Release(mixer->device_manager); + video_mixer_release_device_manager(mixer); if (mixer->attributes) IMFAttributes_Release(mixer->attributes); if (mixer->internal_attributes) @@ -695,6 +707,33 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const return count ? S_OK : hr; } +static HRESULT video_mixer_get_processor_service(struct video_mixer *mixer, IDirectXVideoProcessorService **service) +{ + HRESULT hr; + + if (!mixer->device_handle) + { + if (FAILED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &mixer->device_handle))) + return hr; + } + + for (;;) + { + hr = IDirect3DDeviceManager9_GetVideoService(mixer->device_manager, mixer->device_handle, + &IID_IDirectXVideoProcessorService, (void **)service); + if (hr == DXVA2_E_NEW_VIDEO_DEVICE) + { + IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); + mixer->device_handle = NULL; + if (SUCCEEDED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &mixer->device_handle))) + continue; + } + break; + } + + return hr; +} + static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *media_type, DWORD flags) { struct video_mixer *mixer = impl_from_IMFTransform(iface); @@ -702,7 +741,6 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW DXVA2_VideoDesc video_desc; HRESULT hr = E_NOTIMPL; unsigned int count; - HANDLE handle; GUID *guids; TRACE("%p, %u, %p, %#x.\n", iface, id, media_type, flags); @@ -716,37 +754,33 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW hr = MF_E_NOT_INITIALIZED; else { - if (SUCCEEDED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &handle))) + if (SUCCEEDED(hr = video_mixer_get_processor_service(mixer, &service))) { - if (SUCCEEDED(hr = IDirect3DDeviceManager9_GetVideoService(mixer->device_manager, handle, - &IID_IDirectXVideoProcessorService, (void **)&service))) + if (SUCCEEDED(hr = video_mixer_init_dxva_videodesc(media_type, &video_desc))) { - if (SUCCEEDED(hr = video_mixer_init_dxva_videodesc(media_type, &video_desc))) + if (!id) { - if (!id) + if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, + &count, &guids))) { - if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, - &count, &guids))) + if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, + guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { - if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, - guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) - { - if (mixer->inputs[0].media_type) - IMFMediaType_Release(mixer->inputs[0].media_type); - mixer->inputs[0].media_type = media_type; - IMFMediaType_AddRef(mixer->inputs[0].media_type); - } - CoTaskMemFree(guids); + if (mixer->inputs[0].media_type) + IMFMediaType_Release(mixer->inputs[0].media_type); + mixer->inputs[0].media_type = media_type; + IMFMediaType_AddRef(mixer->inputs[0].media_type); } + CoTaskMemFree(guids); } - else - { - FIXME("Unimplemented for substreams.\n"); - hr = E_NOTIMPL; - } + } + else + { + FIXME("Unimplemented for substreams.\n"); + hr = E_NOTIMPL; } } - IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, handle); + IDirectXVideoProcessorService_Release(service); } } @@ -897,9 +931,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, EnterCriticalSection(&mixer->cs); - if (mixer->device_manager) - IDirect3DDeviceManager9_Release(mixer->device_manager); - mixer->device_manager = NULL; + video_mixer_release_device_manager(mixer); if (param) hr = IUnknown_QueryInterface((IUnknown *)param, &IID_IDirect3DDeviceManager9, (void **)&mixer->device_manager);

1 0

Michael Stefaniuc : ipconfig: Use wide-char string literals.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 9834492d2fcf4d6b468ea257d086aebf389fa2c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9834492d2fcf4d6b468ea257… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 21 01:02:41 2020 +0200 ipconfig: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ipconfig/ipconfig.c | 52 +++++++++++++------------------------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 1823d482e2a..a056771128c 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -91,12 +91,11 @@ static int WINAPIV ipconfig_message_printfW(int msg, ...) static int ipconfig_message(int msg) { - static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return ipconfig_printfW(formatW, msg_buffer); + return ipconfig_printfW(L"%1", msg_buffer); } static const WCHAR *iftype_to_string(DWORD type) @@ -123,27 +122,18 @@ static const WCHAR *iftype_to_string(DWORD type) static void print_field(int msg, const WCHAR *value) { - static const WCHAR formatW[] = {' ',' ',' ',' ','%','1',':',' ','%','2','\n',0}; - - WCHAR field[] = {'.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.', - ' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ',0}; + WCHAR field[] = L". . . . . . . . . . . . . . . . . "; WCHAR name_buffer[ARRAY_SIZE(field)]; LoadStringW(GetModuleHandleW(NULL), msg, name_buffer, ARRAY_SIZE(name_buffer)); memcpy(field, name_buffer, sizeof(WCHAR) * min(lstrlenW(name_buffer), ARRAY_SIZE(field) - 1)); - ipconfig_printfW(formatW, field, value); + ipconfig_printfW(L" %1: %2\n", field, value); } static void print_value(const WCHAR *value) { - static const WCHAR formatW[] = {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', - ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', - ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', - ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', - '%','1','\n',0}; - - ipconfig_printfW(formatW, value); + ipconfig_printfW(L" %1\n", value); } static BOOL socket_address_to_string(WCHAR *buf, DWORD len, SOCKET_ADDRESS *addr) @@ -172,15 +162,12 @@ static void print_basic_information(void) for (p = adapters; p; p = p->Next) { - static const WCHAR newlineW[] = {'\n',0}; - static const WCHAR emptyW[] = {0}; - IP_ADAPTER_UNICAST_ADDRESS *addr; IP_ADAPTER_GATEWAY_ADDRESS_LH *gateway; WCHAR addr_buf[54]; ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); - ipconfig_printfW(newlineW); + ipconfig_printfW(L"\n"); print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) @@ -206,9 +193,9 @@ static void print_basic_information(void) } } else - print_field(STRING_DEFAULT_GATEWAY, emptyW); + print_field(STRING_DEFAULT_GATEWAY, L""); - ipconfig_printfW(newlineW); + ipconfig_printfW(L"\n"); } } @@ -247,9 +234,6 @@ static const WCHAR *nodetype_to_string(DWORD type) static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len) { - static const WCHAR fmtW[] = {'%','0','2','X','-',0}; - static const WCHAR fmt2W[] = {'%','0','2','X',0}; - if (!len) *buf = '\0'; else @@ -259,10 +243,10 @@ static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len) for (i = 0; i < len - 1; i++) { - swprintf(p, 4, fmtW, addr[i]); + swprintf(p, 4, L"%02X-", addr[i]); p += 3; } - swprintf(p, 3, fmt2W, addr[i]); + swprintf(p, 3, L"%02X", addr[i]); } return buf; @@ -280,9 +264,6 @@ static const WCHAR *boolean_to_string(int value) static void print_full_information(void) { - static const WCHAR newlineW[] = {'\n',0}; - static const WCHAR emptyW[] = {0}; - FIXED_INFO *info; IP_ADAPTER_ADDRESSES *adapters; ULONG out = 0; @@ -307,7 +288,7 @@ static void print_full_information(void) /* FIXME: Output WINS proxy status and DNS suffix search list. */ - ipconfig_printfW(newlineW); + ipconfig_printfW(L"\n"); } HeapFree(GetProcessHeap(), 0, info); @@ -333,7 +314,7 @@ static void print_full_information(void) WCHAR addr_buf[54]; ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); - ipconfig_printfW(newlineW); + ipconfig_printfW(L"\n"); print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); print_field(STRING_DESCRIPTION, p->Description); print_field(STRING_PHYS_ADDR, physaddr_to_string(physaddr_buf, p->PhysicalAddress, p->PhysicalAddressLength)); @@ -364,9 +345,9 @@ static void print_full_information(void) } } else - print_field(STRING_DEFAULT_GATEWAY, emptyW); + print_field(STRING_DEFAULT_GATEWAY, L""); - ipconfig_printfW(newlineW); + ipconfig_printfW(L"\n"); } } @@ -376,9 +357,6 @@ static void print_full_information(void) int __cdecl wmain(int argc, WCHAR *argv[]) { - static const WCHAR slashHelp[] = {'/','?',0}; - static const WCHAR slashAll[] = {'/','a','l','l',0}; - WSADATA data; if (WSAStartup(MAKEWORD(2, 2), &data)) @@ -386,13 +364,13 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (argc > 1) { - if (!lstrcmpW(slashHelp, argv[1])) + if (!lstrcmpW(L"/?", argv[1])) { ipconfig_message(STRING_USAGE); WSACleanup(); return 1; } - else if (!wcsicmp(slashAll, argv[1])) + else if (!wcsicmp(L"/all", argv[1])) { if (argv[2]) {

1 0

Michael Stefaniuc : xcopy: Use wide-char string literals.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 73aed88c69dca069cf071bc8ff7b326eb8420d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73aed88c69dca069cf071bc8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 21 01:02:40 2020 +0200 xcopy: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 57 ++++++++++++++++++-------------------------------- 1 file changed, 20 insertions(+), 37 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index a8614f979ac..7c1bc1f472d 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -63,10 +63,6 @@ typedef struct _EXCLUDELIST static ULONG filesCopied = 0; /* Number of files copied */ static EXCLUDELIST *excludeList = NULL; /* Excluded strings list */ static FILETIME dateRange; /* Date range to copy after*/ -static const WCHAR wchr_slash[] = {'\\', 0}; -static const WCHAR wchr_star[] = {'*', 0}; -static const WCHAR wchr_dot[] = {'.', 0}; -static const WCHAR wchr_dotdot[] = {'.', '.', 0}; /* To minimize stack usage during recursion, some temporary variables @@ -81,11 +77,10 @@ static WCHAR copyTo[MAX_PATH]; * ========================================================================= */ static WCHAR *XCOPY_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; - const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); - lstrcpyW(msg, failedMsg); + lstrcpyW(msg, L"Failed!"); } return msg; } @@ -186,8 +181,7 @@ static void XCOPY_FailMessage(DWORD err) { WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", err, GetLastError()); } else { - const WCHAR infostr[] = {'%', '1', '\n', 0}; - XCOPY_wprintf(infostr, lpMsgBuf); + XCOPY_wprintf(L"%1\n", lpMsgBuf); LocalFree ((HLOCAL)lpMsgBuf); } } @@ -252,14 +246,13 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { WCHAR endChar = *endOfName; WCHAR buffer[MAXSTRING]; FILE *inFile = NULL; - const WCHAR readTextMode[] = {'r', 't', 0}; /* Null terminate the filename (temporarily updates the filename hence parms not const) */ *endOfName = 0x00; /* Open the file */ - inFile = _wfopen(filename, readTextMode); + inFile = _wfopen(filename, L"rt"); if (inFile == NULL) { XCOPY_wprintf(XCOPY_LoadMessage(STRING_OPENFAIL), filename); *endOfName = endChar; @@ -371,8 +364,8 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, skipFile = FALSE; /* Ignore . and .. */ - if (lstrcmpW(finddata->cFileName, wchr_dot)==0 || - lstrcmpW(finddata->cFileName, wchr_dotdot)==0 || + if (lstrcmpW(finddata->cFileName, L".")==0 || + lstrcmpW(finddata->cFileName, L"..")==0 || finddata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { WINE_TRACE("Skipping directory, . or .. (%s)\n", wine_dbgstr_w(finddata->cFileName)); @@ -606,7 +599,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } lstrcpyW(inputpath, srcstem); - lstrcatW(inputpath, wchr_star); + lstrcatW(inputpath, L"*"); findres = TRUE; WINE_TRACE("Processing subdirs with spec: %s\n", wine_dbgstr_w(inputpath)); @@ -615,20 +608,20 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Only looking for dirs */ if ((finddata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && - (lstrcmpW(finddata->cFileName, wchr_dot) != 0) && - (lstrcmpW(finddata->cFileName, wchr_dotdot) != 0)) { + (lstrcmpW(finddata->cFileName, L".") != 0) && + (lstrcmpW(finddata->cFileName, L"..") != 0)) { WINE_TRACE("Handling subdir: %s\n", wine_dbgstr_w(finddata->cFileName)); /* Make up recursive information */ lstrcpyW(inputpath, srcstem); lstrcatW(inputpath, finddata->cFileName); - lstrcatW(inputpath, wchr_slash); + lstrcatW(inputpath, L"\\"); lstrcpyW(outputpath, deststem); if (*destspec == 0x00) { lstrcatW(outputpath, finddata->cFileName); - lstrcatW(outputpath, wchr_slash); + lstrcatW(outputpath, L"\\"); } XCOPY_DoCopy(inputpath, srcspec, outputpath, destspec, flags); @@ -713,7 +706,6 @@ static void strip_quotes(WCHAR *word, WCHAR **end) static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, WCHAR *supplieddestination, DWORD *pflags) { - const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; DWORD flags = *pflags; WCHAR *cmdline, *word, *end, *next; int rc = RC_INITERROR; @@ -781,10 +773,8 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, OPT_REMOVEARCH; break; /* E can be /E or /EXCLUDE */ - case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - &word[1], 8, - EXCLUDE, -1) == CSTR_EQUAL) { + case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + &word[1], 8, L"EXCLUDE:", -1) == CSTR_EQUAL) { if (XCOPY_ProcessExcludeList(&word[9])) { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); goto out; @@ -889,7 +879,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, /* Default the destination if not supplied */ if (supplieddestination[0] == 0x00) - lstrcpyW(supplieddestination, wchr_dot); + lstrcpyW(supplieddestination, L"."); *pflags = flags; rc = RC_OK; @@ -959,10 +949,9 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, WINE_TRACE("Directory supplied\n"); lstrcpyW(stem, suppliedsource); lastChar = stem[lstrlenW(stem)-1]; - if (lastChar != '\\' && lastChar != ':') { - lstrcatW(stem, wchr_slash); - } - lstrcpyW(spec, wchr_star); + if (lastChar != '\\' && lastChar != ':') + lstrcatW(stem, L"\\"); + lstrcpyW(spec, L"*"); /* File or wildcard search: stem should be: @@ -1062,9 +1051,8 @@ static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR *spec = 0x00; /* Ensure ends with a '\' */ - if (stem[lstrlenW(stem)-1] != '\\') { - lstrcatW(stem, wchr_slash); - } + if (stem[lstrlenW(stem)-1] != '\\') + lstrcatW(stem, L"\\"); } else { WCHAR drive[MAX_PATH]; @@ -1097,16 +1085,11 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) WCHAR destinationspec[MAX_PATH] = {0}; /* Filespec of destination */ WCHAR copyCmd[MAXSTRING]; /* COPYCMD env var */ DWORD flags = 0; /* Option flags */ - const WCHAR PROMPTSTR1[] = {'/', 'Y', 0}; - const WCHAR PROMPTSTR2[] = {'/', 'y', 0}; - const WCHAR COPYCMD[] = {'C', 'O', 'P', 'Y', 'C', 'M', 'D', 0}; /* Preinitialize flags based on COPYCMD */ - if (GetEnvironmentVariableW(COPYCMD, copyCmd, MAXSTRING)) { - if (wcsstr(copyCmd, PROMPTSTR1) != NULL || - wcsstr(copyCmd, PROMPTSTR2) != NULL) { + if (GetEnvironmentVariableW(L"COPYCMD", copyCmd, MAXSTRING)) { + if (wcsstr(copyCmd, L"/Y") != NULL || wcsstr(copyCmd, L"/y") != NULL) flags |= OPT_NOPROMPT; - } } /* FIXME: On UNIX, files starting with a '.' are treated as hidden under

1 0

Hans Leidekker : bcrypt: Use internal helpers to generate hashes.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: a6e589bc52f4ffc80021e38c49ef2355b9479695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e589bc52f4ffc80021e38c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 21 09:56:39 2020 +0200 bcrypt: Use internal helpers to generate hashes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 171 ++++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6e589bc52f4ffc80021…

1 0

Nikolay Sivov : evr/mixer: Ignore draining command.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: c1e57ea291d179c210559c8ff3d6952e775df592 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e57ea291d179c210559c8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:31 2020 +0300 evr/mixer: Ignore draining command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 ++++ dlls/evr/tests/evr.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 1b77afac5b2..28361255fe1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -965,6 +965,10 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, LeaveCriticalSection(&mixer->cs); break; + + case MFT_MESSAGE_COMMAND_DRAIN: + break; + default: WARN("Message not handled %d.\n", message); hr = E_NOTIMPL; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 182280d0a39..d71a63ff602 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2171,6 +2171,9 @@ todo_wine hr = IMFTransform_ProcessInput(mixer, 5, sample, 0); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_COMMAND_DRAIN, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFSample_Release(sample); IDirect3DSurface9_Release(surface);

1 0

Nikolay Sivov : dxva2: Fix valid handle range test.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 2b04143e6dfb4969b28b76a4cdd00ee85ebb9be2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b04143e6dfb4969b28b76a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:28 2020 +0300 dxva2: Fix valid handle range test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 2 +- dlls/dxva2/tests/dxva2.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 6262531c7d1..83c4723a7dc 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -562,7 +562,7 @@ static HRESULT WINAPI device_manager_OpenDeviceHandle(IDirect3DDeviceManager9 *i static HRESULT device_manager_get_handle_index(struct device_manager *manager, HANDLE hdevice, size_t *idx) { - if (hdevice > ULongToHandle(manager->count)) + if (!hdevice || hdevice > ULongToHandle(manager->count)) return E_HANDLE; *idx = (ULONG_PTR)hdevice - 1; return S_OK; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index f617bf74079..a49635e7596 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -115,6 +115,9 @@ static void test_device_manager(void) hr = IDirect3DDeviceManager9_LockDevice(manager, 0, &device2, FALSE); ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, 0); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + /* Invalid token. */ hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token + 1); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -123,9 +126,13 @@ static void test_device_manager(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); refcount = get_refcount(device); + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, 0); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + handle1 = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!handle1, "Unexpected handle value.\n"); refcount2 = get_refcount(device); ok(refcount2 == refcount, "Unexpected refcount %d.\n", refcount); @@ -152,6 +159,9 @@ static void test_device_manager(void) hr = IDirect3DDeviceManager9_TestDevice(manager, handle1); ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_TestDevice(manager, 0); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + handle = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : comsvcs/tests: Close test thread handles.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: c650ec93efb423adf7d9cf3326b0f9d999b9ffcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c650ec93efb423adf7d9cf33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:50:44 2020 +0300 comsvcs/tests: Close test thread handles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/comsvcs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 4e9471e7343..f0cf0d8543f 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -197,6 +197,7 @@ static void create_dispenser(void) ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); GetExitCodeThread(thread, &ret); ok(ret == CO_E_NOTINITIALIZED, "got unexpected hr %#x\n", ret); + CloseHandle(thread); init_test_driver(&driver); @@ -210,6 +211,7 @@ static void create_dispenser(void) ok(!WaitForSingleObject(thread, 20000), "wait failed\n"); GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret); + CloseHandle(thread); hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder2); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alexandre Julliard : gdi32: Move the font name information out of freetype.c.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: ecba0d2bbbf38f964dc3db5eac27cffaa26fec31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecba0d2bbbf38f964dc3db5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 11:03:51 2020 +0200 gdi32: Move the font name information out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 24 +++++++++++++++++++++++- dlls/gdi32/freetype.c | 49 +++++++++++++++++------------------------------- dlls/gdi32/gdi_private.h | 3 ++- 3 files changed, 42 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecba0d2bbbf38f964dc3…

1 0

Alexandre Julliard : gdi32: Move the font file information out of freetype.c.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: d26462b52a1042b1bfaaf10bd8e0cb18ddd12cbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d26462b52a1042b1bfaaf10b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 11:02:48 2020 +0200 gdi32: Move the font file information out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 39 ++++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 49 +----------------------------------------------- dlls/gdi32/gdi_private.h | 12 ++---------- 3 files changed, 40 insertions(+), 60 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5c472636035..44f159c03ef 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -422,9 +422,37 @@ void free_gdi_font( struct gdi_font *font ) { if (font->private) font_funcs->destroy_font( font ); free_font_handle( font->handle ); + HeapFree( GetProcessHeap(), 0, font->fileinfo ); HeapFree( GetProcessHeap(), 0, font ); } +/* Undocumented structure filled in by GetFontFileInfo */ +struct font_fileinfo +{ + FILETIME writetime; + LARGE_INTEGER size; + WCHAR path[1]; +}; + +void set_gdi_font_file_info( struct gdi_font *font, const WCHAR *file, SIZE_T data_size ) +{ + WIN32_FILE_ATTRIBUTE_DATA info; + int len = 0; + + if (file) len = strlenW( file ); + if (!(font->fileinfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + offsetof( struct font_fileinfo, path[len + 1] )))) + return; + + if (file && GetFileAttributesExW( file, GetFileExInfoStandard, &info )) + { + font->fileinfo->writetime = info.ftLastWriteTime; + font->fileinfo->size.QuadPart = (LONGLONG)info.nFileSizeHigh << 32 | info.nFileSizeLow; + strcpyW( font->fileinfo->path, file ); + } + else font->fileinfo->size.QuadPart = data_size; +} + /* font cache */ static struct list gdi_font_list = LIST_INIT( gdi_font_list ); @@ -5179,12 +5207,19 @@ BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_filei if (!needed) needed = &required_size; - if (!font_funcs || !font) + if (!font) { *needed = 0; return FALSE; } - return font_funcs->pGetFontFileInfo( font, unknown, info, size, needed ); + *needed = sizeof(*info) + strlenW( font->fileinfo->path ) * sizeof(WCHAR); + if (*needed > size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + memcpy( info, font->fileinfo, *needed ); + return TRUE; } struct realization_info diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4fa88b960d0..1484260fa07 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -350,7 +350,6 @@ struct tagGdiFont { VOID *GSUB_Table; const VOID *vert_feature; ULONG ttc_item_offset; /* 0 if font is not a part of TrueType collection */ - struct font_fileinfo *fileinfo; }; static inline GdiFont *get_font_ptr( struct gdi_font *font ) { return font->private; } @@ -4112,7 +4111,6 @@ static void CDECL freetype_destroy_font( struct gdi_font *gdi_font ) HeapFree(GetProcessHeap(), 0, child); } - HeapFree(GetProcessHeap(), 0, font->fileinfo); if (font->ft_face) pFT_Done_Face(font->ft_face); if (font->mapping) unmap_font_file( font->mapping ); HeapFree(GetProcessHeap(), 0, font->kern_pairs); @@ -4767,30 +4765,6 @@ static const VOID * get_GSUB_vert_feature(const GdiFont *font) return feature; } -static void fill_fileinfo_from_face( GdiFont *font, Face *face ) -{ - WIN32_FILE_ATTRIBUTE_DATA info; - int len; - - if (!face->file) - { - font->fileinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font->fileinfo)); - font->fileinfo->size.QuadPart = face->font_data_size; - return; - } - - len = strlenW(face->file); - font->fileinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); - if (GetFileAttributesExW(face->file, GetFileExInfoStandard, &info)) - { - font->fileinfo->writetime = info.ftLastWriteTime; - font->fileinfo->size.QuadPart = (LONGLONG)info.nFileSizeHigh << 32 | info.nFileSizeLow; - strcpyW(font->fileinfo->path, face->file); - } - else - memset(font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); -} - /************************************************************* * freetype_SelectFont */ @@ -5183,7 +5157,7 @@ found_face: goto done; } - fill_fileinfo_from_face( ret, face ); + set_gdi_font_file_info( gdi_font, face->file, face->font_data_size ); ret->ntmFlags = face->ntmFlags; pick_charmap( ret->ft_face, ret->charset ); @@ -7968,26 +7942,6 @@ static BOOL CDECL freetype_GetFontFileData( struct gdi_font *gdi_font, DWORD unk return get_font_data( font, tag, offset, buff, buff_size ) != 0; } -/************************************************************************* - * freetype_GetFontFileInfo - */ -static BOOL CDECL freetype_GetFontFileInfo( struct gdi_font *gdi_font, DWORD unknown, - struct font_fileinfo *info, SIZE_T size, SIZE_T *needed ) -{ - const GdiFont *font = get_font_ptr( gdi_font ); - - *needed = sizeof(*info) + strlenW(font->fileinfo->path) * sizeof(WCHAR); - if (*needed > size) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - /* path is included too */ - memcpy(info, font->fileinfo, *needed); - return TRUE; -} - /************************************************************************* * Kerning support for TrueType fonts */ @@ -8261,7 +8215,6 @@ static const struct font_backend_funcs font_funcs = freetype_AddFontMemResourceEx, freetype_CreateScalableFontResource, freetype_GetFontFileData, - freetype_GetFontFileInfo, freetype_alloc_font, freetype_destroy_font }; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7d15904fd51..09526eed499 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -301,14 +301,6 @@ struct char_width_info INT unk; /* unknown */ }; -/* Undocumented structure filled in by GetFontFileInfo */ -struct font_fileinfo -{ - FILETIME writetime; - LARGE_INTEGER size; - WCHAR path[1]; -}; - typedef struct { FLOAT eM11, eM12, eM21, eM22; } FMAT2; struct gdi_font @@ -324,6 +316,7 @@ struct gdi_font LOGFONTW lf; FMAT2 matrix; BOOL can_use_bitmap; + struct font_fileinfo *fileinfo; }; struct font_backend_funcs @@ -356,8 +349,6 @@ struct font_backend_funcs LPCWSTR font_file, LPCWSTR font_path ); BOOL (CDECL *pGetFontFileData)( struct gdi_font *font, DWORD unknown, UINT64 offset, void *buff, DWORD buff_size ); - BOOL (CDECL *pGetFontFileInfo)( struct gdi_font *font, DWORD unknown, - struct font_fileinfo *info, SIZE_T size, SIZE_T *needed ); BOOL (CDECL *alloc_font)( struct gdi_font *font ); void (CDECL *destroy_font)( struct gdi_font *font ); @@ -368,6 +359,7 @@ extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void cache_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern struct gdi_font *find_cached_gdi_font( const LOGFONTW *lf, const FMAT2 *matrix, BOOL can_use_bitmap ) DECLSPEC_HIDDEN; +extern void set_gdi_font_file_info( struct gdi_font *font, const WCHAR *file, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void font_init(void) DECLSPEC_HIDDEN; /* freetype.c */

1 0

Alexandre Julliard : gdi32: Move the font cache list out of freetype.c.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 82c140f1a6bc5b8f5f517c7771ffd5d78ec9b89d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c140f1a6bc5b8f5f517c77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 11:01:50 2020 +0200 gdi32: Move the font cache list out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 107 ++++++++++++++++++++++- dlls/gdi32/freetype.c | 220 ++++++++++------------------------------------- dlls/gdi32/gdi_private.h | 22 ++++- 3 files changed, 168 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82c140f1a6bc5b8f5f51…

1 0