October 2020 - Wine-commits

Michael Stefaniuc : avifil32: Use wide-char string literals.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 4ffc5ed5caef8867e14c8ec7b635aada6fc8e125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ffc5ed5caef8867e14c8ec7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 23:34:27 2020 +0200 avifil32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 19 ++++++------------- dlls/avifil32/avifile.c | 7 ++----- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index a7f84ba3bc..5a9985424e 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -994,11 +994,7 @@ HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving) */ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) { - static const WCHAR all_files[] = { '*','.','*',0,0 }; - static const WCHAR szClsid[] = {'C','L','S','I','D',0}; - static const WCHAR szExtensionFmt[] = {';','*','.','%','s',0}; - static const WCHAR szAVIFileExtensions[] = - {'A','V','I','F','i','l','e','\\','E','x','t','e','n','s','i','o','n','s',0}; + static const WCHAR all_files[] = L"*.*\0"; AVIFilter *lp; WCHAR szAllFiles[40]; @@ -1030,7 +1026,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) * First filter is named "All multimedia files" and its filter is a * collection of all possible extensions except "*.*". */ - if (RegOpenKeyW(HKEY_CLASSES_ROOT, szAVIFileExtensions, &hKey) != ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_CLASSES_ROOT, L"AVIFile\\Extensions", &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } @@ -1065,7 +1061,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) } /* append extension to the filter */ - wsprintfW(szValue, szExtensionFmt, szFileExt); + wsprintfW(szValue, L";*.%s", szFileExt); if (lp[i].szExtensions[0] == 0) lstrcatW(lp[i].szExtensions, szValue + 1); else @@ -1080,7 +1076,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) RegCloseKey(hKey); /* 2. get descriptions for the CLSIDs and fill out szFilter */ - if (RegOpenKeyW(HKEY_CLASSES_ROOT, szClsid, &hKey) != ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_CLASSES_ROOT, L"CLSID", &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } @@ -1254,9 +1250,6 @@ static BOOL AVISaveOptionsFmtChoose(HWND hWnd) static void AVISaveOptionsUpdate(HWND hWnd) { - static const WCHAR szVideoFmt[]={'%','l','d','x','%','l','d','x','%','d',0}; - static const WCHAR szAudioFmt[]={'%','s',' ','%','s',0}; - WCHAR szFormat[128]; AVISTREAMINFOW sInfo; LPVOID lpFormat; @@ -1283,7 +1276,7 @@ static void AVISaveOptionsUpdate(HWND hWnd) LPBITMAPINFOHEADER lpbi = lpFormat; ICINFO icinfo; - wsprintfW(szFormat, szVideoFmt, lpbi->biWidth, + wsprintfW(szFormat, L"%ldx%ldx%d", lpbi->biWidth, lpbi->biHeight, lpbi->biBitCount); if (lpbi->biCompression != BI_RGB) { @@ -1320,7 +1313,7 @@ static void AVISaveOptionsUpdate(HWND hWnd) if (acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG) == S_OK) { if (acmFormatDetailsW(NULL,&afd,ACM_FORMATDETAILSF_FORMAT) == S_OK) - wsprintfW(szFormat, szAudioFmt, afd.szFormat, aftd.szFormatTag); + wsprintfW(szFormat, L"%s %s", afd.szFormat, aftd.szFormatTag); } } } diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f3cf484d91..b1654daa69 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1714,9 +1714,6 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) break; case ckidSTREAMHEADER: { - static const WCHAR streamTypeFmt[] = {'%','4','.','4','h','s',0}; - static const WCHAR streamNameFmt[] = {'%','s',' ','%','s',' ','#','%','d',0}; - AVIStreamHeader streamHdr; WCHAR szType[25]; UINT count; @@ -1754,7 +1751,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) else if (streamHdr.fccType == streamtypeAUDIO) LoadStringW(AVIFILE_hModule, IDS_AUDIO, szType, ARRAY_SIZE(szType)); else - wsprintfW(szType, streamTypeFmt, (char*)&streamHdr.fccType); + wsprintfW(szType, L"%4.4hs", (char*)&streamHdr.fccType); /* get count of this streamtype up to this stream */ count = 0; @@ -1766,7 +1763,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) memset(pStream->sInfo.szName, 0, sizeof(pStream->sInfo.szName)); /* FIXME: avoid overflow -- better use wsnprintfW, which doesn't exists ! */ - wsprintfW(pStream->sInfo.szName, streamNameFmt, + wsprintfW(pStream->sInfo.szName, L"%s %s #%d", AVIFILE_BasenameW(This->szFileName), szType, count); } break;

1 0

Michael Stefaniuc : msiexec: Use wide-char string literals.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 64709fe7e9c629f476fb0dd7b62480e868b0174c URL: https://source.winehq.org/git/wine.git/?a=commit;h=64709fe7e9c629f476fb0dd7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 23:34:30 2020 +0200 msiexec: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 17d4bf87cd..2bc0ba9bbe 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -46,19 +46,6 @@ struct string_list WCHAR str[1]; }; -static const WCHAR ActionAdmin[] = { - 'A','C','T','I','O','N','=','A','D','M','I','N',0 }; -static const WCHAR RemoveAll[] = { - 'R','E','M','O','V','E','=','A','L','L',0 }; - -static const WCHAR InstallRunOnce[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','s','t','a','l','l','e','r','\\', - 'R','u','n','O','n','c','e','E','n','t','r','i','e','s',0}; - static void ShowUsage(int ExitCode) { WCHAR msiexec_version[40]; @@ -339,8 +326,6 @@ static DWORD DoDllUnregisterServer(LPCWSTR DllName) static DWORD DoRegServer(void) { - static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; - static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c',' ','/','V',0}; SC_HANDLE scm, service; WCHAR path[MAX_PATH+12]; DWORD len, ret = 0; @@ -351,8 +336,8 @@ static DWORD DoRegServer(void) return 1; } len = GetSystemDirectoryW(path, MAX_PATH); - lstrcpyW(path + len, msiexecW); - if ((service = CreateServiceW(scm, msiserverW, msiserverW, GENERIC_ALL, + lstrcpyW(path + len, L"\\msiexec /V"); + if ((service = CreateServiceW(scm, L"MSIServer", L"MSIServer", GENERIC_ALL, SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, path, NULL, NULL, NULL, NULL, NULL))) { @@ -369,7 +354,6 @@ static DWORD DoRegServer(void) static DWORD DoUnregServer(void) { - static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; SC_HANDLE scm, service; DWORD ret = 0; @@ -378,7 +362,7 @@ static DWORD DoUnregServer(void) fprintf(stderr, "Failed to open service control manager\n"); return 1; } - if ((service = OpenServiceW(scm, msiserverW, DELETE))) + if ((service = OpenServiceW(scm, L"MSIServer", DELETE))) { if (!DeleteService(service)) { @@ -409,7 +393,6 @@ static DWORD CALLBACK custom_action_thread(void *arg) static int custom_action_server(const WCHAR *arg) { - static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; GUID guid, *thread_guid; DWORD64 thread64; WCHAR buffer[24]; @@ -425,7 +408,7 @@ static int custom_action_server(const WCHAR *arg) return 1; } - swprintf(buffer, ARRAY_SIZE(buffer), pipe_name, client_pid, sizeof(void *) * 8); + swprintf(buffer, ARRAY_SIZE(buffer), L"\\\\.\\pipe\\msica_%x_%d", client_pid, sizeof(void *) * 8); pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (pipe == INVALID_HANDLE_VALUE) { @@ -577,7 +560,8 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg WCHAR *buf; BOOL ret = FALSE; - r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey); + r = RegOpenKeyW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\RunOnceEntries", &hkey); if(r != ERROR_SUCCESS) return FALSE; r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); @@ -700,7 +684,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine ShowUsage(1); WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; - StringListAppend(&property_list, ActionAdmin); + StringListAppend(&property_list, L"ACTION=ADMIN"); WINE_FIXME("Administrative installs are not currently supported\n"); } else if(msi_option_prefix(argvW[i], "f")) @@ -783,7 +767,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine PackageName = argvW[i]; } WINE_TRACE("PackageName = %s\n", wine_dbgstr_w(PackageName)); - StringListAppend(&property_list, RemoveAll); + StringListAppend(&property_list, L"REMOVE=ALL"); } else if(msi_option_prefix(argvW[i], "j")) { @@ -996,11 +980,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } else if(msi_option_equal(argvW[i], "passive")) { - static const WCHAR rebootpromptW[] = - {'R','E','B','O','O','T','P','R','O','M','P','T','=','"','S','"',0}; - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; - StringListAppend(&property_list, rebootpromptW); + StringListAppend(&property_list, L"REBOOTPROMPT=\"S\""); } else if(msi_option_equal(argvW[i], "y")) {

1 0

Michael Stefaniuc : bcrypt/tests: Use wide-char string literals.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: d541f5cffead2adc08f8b2200d6465dd1a8a35ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d541f5cffead2adc08f8b220… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 23:34:28 2020 +0200 bcrypt/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 7fdc0ac7fb..d499ce65a6 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -99,33 +99,20 @@ static void test_BCryptGenRandom(void) static void test_BCryptGetFipsAlgorithmMode(void) { - static const WCHAR policyKeyVistaW[] = { - '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','\\', - 'L','s','a','\\', - 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; - static const WCHAR policyValueVistaW[] = {'E','n','a','b','l','e','d',0}; - static const WCHAR policyKeyXPW[] = { - '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','\\', - 'L','s','a',0}; - static const WCHAR policyValueXPW[] = { - 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; HKEY hkey = NULL; BOOLEAN expected; BOOLEAN enabled; DWORD value, count[2] = {sizeof(value), sizeof(value)}; NTSTATUS ret; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyVistaW, &hkey) == ERROR_SUCCESS && - RegQueryValueExW(hkey, policyValueVistaW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy", &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, L"Enabled", NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } - else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyXPW, &hkey) == ERROR_SUCCESS && - RegQueryValueExW(hkey, policyValueXPW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) + else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Lsa", &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, L"FIPSAlgorithmPolicy", NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } @@ -2173,13 +2160,12 @@ static void test_ECDH(void) static void test_BCryptEnumContextFunctions(void) { - static const WCHAR sslW[] = {'S','S','L',0}; CRYPT_CONTEXT_FUNCTIONS *buffer; NTSTATUS status; ULONG buflen; buffer = NULL; - status = pBCryptEnumContextFunctions( CRYPT_LOCAL, sslW, NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); + status = pBCryptEnumContextFunctions( CRYPT_LOCAL, L"SSL", NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); todo_wine ok( status == STATUS_SUCCESS, "got %08x\n", status); if (status == STATUS_SUCCESS) pBCryptFreeBuffer( buffer ); }

1 0

Nikolay Sivov : evr/presenter: Initialize aspect ratio mode.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 6163b3331fbca57af1ff8ba530927086d360589b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6163b3331fbca57af1ff8ba5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:22 2020 +0300 evr/presenter: Initialize aspect ratio mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 28 ++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 32 ++++++++++++++++++++++++++++++++ include/evr.idl | 9 +++++++++ 3 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index ecfa923442..8fcd6d58b3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -64,6 +64,7 @@ struct video_presenter DWORD rendering_prefs; SIZE native_size; SIZE native_ratio; + unsigned int ar_mode; unsigned int state; CRITICAL_SECTION cs; }; @@ -669,16 +670,34 @@ static HRESULT WINAPI video_presenter_control_GetVideoPosition(IMFVideoDisplayCo static HRESULT WINAPI video_presenter_control_SetAspectRatioMode(IMFVideoDisplayControl *iface, DWORD mode) { - FIXME("%p, %d.\n", iface, mode); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %#x.\n", iface, mode); + + if (mode & ~MFVideoARMode_Mask) + return E_INVALIDARG; + + EnterCriticalSection(&presenter->cs); + presenter->ar_mode = mode; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_GetAspectRatioMode(IMFVideoDisplayControl *iface, DWORD *mode) { - FIXME("%p, %p.\n", iface, mode); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, mode); + + if (!mode) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); + *mode = presenter->ar_mode; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_SetVideoWindow(IMFVideoDisplayControl *iface, HWND window) @@ -969,6 +988,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; object->src_rect.right = object->src_rect.bottom = 1.0f; + object->ar_mode = MFVideoARMode_PreservePicture | MFVideoARMode_PreservePixel; InitializeCriticalSection(&object->cs); if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index e7eabc5971..3ae36d9b5d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1654,6 +1654,37 @@ static void test_presenter_native_video_size(void) IMFTransform_Release(mixer); } +static void test_presenter_ar_mode(void) +{ + IMFVideoDisplayControl *display_control; + HRESULT hr; + DWORD mode; + + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + mode = 0; + hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == (MFVideoARMode_PreservePicture | MFVideoARMode_PreservePixel), "Unexpected mode %#x.\n", mode); + + hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, 0x100); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, MFVideoARMode_Mask); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + mode = 0; + hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == MFVideoARMode_Mask, "Unexpected mode %#x.\n", mode); + + IMFVideoDisplayControl_Release(display_control); +} + static void test_mixer_output_rectangle(void) { IMFVideoMixerControl *mixer_control; @@ -1836,6 +1867,7 @@ START_TEST(evr) test_MFCreateVideoSampleAllocator(); test_presenter_video_position(); test_presenter_native_video_size(); + test_presenter_ar_mode(); test_mixer_output_rectangle(); test_mixer_zorder(); diff --git a/include/evr.idl b/include/evr.idl index c217883538..413f5af1d4 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -228,6 +228,15 @@ interface IMFDesiredSample : IUnknown void Clear(); } +typedef enum MFVideoAspectRatioMode +{ + MFVideoARMode_None = 0x00000000, + MFVideoARMode_PreservePicture = 0x00000001, + MFVideoARMode_PreservePixel = 0x00000002, + MFVideoARMode_NonLinearStretch = 0x00000004, + MFVideoARMode_Mask = 0x00000007, +} MFVideoAspectRatioMode; + [ object, uuid(a490b1e4-ab84-4d31-a1b2-181e03b1077a),

1 0

Nikolay Sivov : mfplat: Added MFBeginRegisterWorkQueueWithMMCSS().
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: eb9556bd608300064ba938d90a50edfc4c584de0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb9556bd608300064ba938d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:23 2020 +0300 mfplat: Added MFBeginRegisterWorkQueueWithMMCSS(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/queue.c | 10 ++++++++++ include/mfapi.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 8f5e7db6ae..5f4735cd6f 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -23,7 +23,7 @@ @ stub MFAverageTimePerFrameToFrameRate @ stdcall MFBeginCreateFile(long long long wstr ptr ptr ptr) @ stub MFBeginGetHostByName -@ stub MFBeginRegisterWorkQueueWithMMCSS +@ stdcall MFBeginRegisterWorkQueueWithMMCSS(long wstr long ptr ptr) @ stdcall MFBeginRegisterWorkQueueWithMMCSSEx(long wstr long long ptr ptr) rtworkq.RtwqBeginRegisterWorkQueueWithMMCSS @ stdcall MFBeginUnregisterWorkQueueWithMMCSS(long ptr ptr) rtworkq.RtwqBeginUnregisterWorkQueueWithMMCSS @ stub MFBlockThread diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 2080a79f84..8279929b46 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -140,3 +140,13 @@ HRESULT WINAPI MFGetTimerPeriodicity(DWORD *period) return S_OK; } + +/*********************************************************************** + * MFBeginRegisterWorkQueueWithMMCSS (mfplat.@) + */ +HRESULT WINAPI MFBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *usage_class, DWORD taskid, + IMFAsyncCallback *callback, IUnknown *state) +{ + return RtwqBeginRegisterWorkQueueWithMMCSS(queue, usage_class, taskid, 0, + (IRtwqAsyncCallback *)callback, state); +} diff --git a/include/mfapi.h b/include/mfapi.h index e9b26f322c..499c77ab33 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -488,6 +488,8 @@ HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMODE open_mode, MF_FILE_FLAGS flags, const WCHAR *path, IMFAsyncCallback *callback, IUnknown *state, IUnknown **cancel_cookie); +HRESULT WINAPI MFBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *usage_class, DWORD taskid, + IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFBeginRegisterWorkQueueWithMMCSSEx(DWORD queue, const WCHAR *usage_class, DWORD taskid, LONG priority, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IMFAsyncCallback *callback, IUnknown *state);

1 0

Huw Davies : riched20: Simplify FindPixelPos().
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 5dc422d4e5701cba3425ad6b4c3c8c370089e787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dc422d4e5701cba3425ad6b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 7 13:20:38 2020 +0100 riched20: Simplify FindPixelPos(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 212c9e9f99..0ed34372e3 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1011,6 +1011,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol, BOOL final_eop) { ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; + ME_DisplayItem *row = NULL; BOOL isExact = TRUE; x -= editor->rcFormat.left; @@ -1022,42 +1023,40 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, /* find paragraph */ for (; p != editor->pBuffer->pLast; p = p->member.para.next_para) { - assert(p->type == diParagraph); if (y < p->member.para.pt.y + p->member.para.nHeight) { if (p->member.para.nFlags & MEPF_ROWSTART) p = ME_FindPixelPosInTableRow(x, y, p); y -= p->member.para.pt.y; - p = ME_FindItemFwd(p, diStartRow); + row = ME_FindItemFwd(p, diStartRow); break; - } else if (p->member.para.nFlags & MEPF_ROWSTART) { + } + else if (p->member.para.nFlags & MEPF_ROWSTART) + { p = ME_GetTableRowEnd(p); } } /* find row */ - for (; p != editor->pBuffer->pLast; ) + while (row) { - ME_DisplayItem *pp; - assert(p->type == diStartRow); - if (y < p->member.row.pt.y + p->member.row.nHeight) break; - pp = ME_FindItemFwd(p, diStartRow); - if (!pp) break; - p = pp; + ME_DisplayItem *next_row; + + if (y < row->member.row.pt.y + row->member.row.nHeight) break; + next_row = ME_FindItemFwd(row, diStartRow); + if (!next_row) break; + row = next_row; } - if (p == editor->pBuffer->pLast && !final_eop) + + if (!row && !final_eop) { /* The position is below the last paragraph, so the last row will be used * rather than the end of the text, so the x position will be used to * determine the offset closest to the pixel position. */ isExact = FALSE; - p = ME_FindItemBack(p, diStartRow); - if (!p) p = editor->pBuffer->pLast; + row = ME_FindItemBack(p, diStartRow); } - assert( p->type == diStartRow || p == editor->pBuffer->pLast ); - - if( p->type == diStartRow ) - return ME_FindRunInRow( editor, p, x, result, is_eol ) && isExact; + if (row) return ME_FindRunInRow( editor, row, x, result, is_eol ) && isExact; ME_SetCursorToEnd(editor, result, TRUE); return FALSE;

1 0

Huw Davies : riched20: Simplify SplitByBacktracking().
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 14044d93fdd57b64d429af40e47904fa8bf7f265 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14044d93fdd57b64d429af40… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 7 13:20:39 2020 +0100 riched20: Simplify SplitByBacktracking(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c3b5883dbf..499ba934a0 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -498,7 +498,7 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem *p, int loc) { - ME_DisplayItem *piter = p, *pp; + ME_DisplayItem *new_run; int i, idesp, len; ME_Run *run = &p->member.run; @@ -509,9 +509,8 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem if (i) { /* don't split words */ i = reverse_find_whitespace( get_text( run, 0 ), i ); - pp = ME_MaximizeSplit(wc, p, i); - if (pp) - return pp; + new_run = ME_MaximizeSplit(wc, p, i); + if (new_run) return new_run; } TRACE("Must backtrack to split at: %s\n", debugstr_run( &p->member.run )); if (wc->pLastSplittableRun) @@ -528,20 +527,16 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem ME_UpdateRunFlags(wc->context->editor, run); assert((wc->pLastSplittableRun->member.run.nFlags & MERF_SPLITTABLE)); - piter = wc->pLastSplittableRun; - run = &piter->member.run; + p = wc->pLastSplittableRun; + run = &p->member.run; len = run->len; /* don't split words */ i = reverse_find_whitespace( get_text( run, 0 ), len ); if (i == len) i = reverse_find_non_whitespace( get_text( run, 0 ), len ); - if (i) { - ME_DisplayItem *piter2 = split_run_extents(wc, piter, i); - wc->pt = piter2->member.run.pt; - return piter2; - } - /* splittable = must have whitespaces */ - assert(0 == "Splittable, but no whitespaces"); + new_run = split_run_extents(wc, p, i); + wc->pt = new_run->member.run.pt; + return new_run; } else { @@ -553,24 +548,24 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem TRACE("Backtracking failed, trying desperate: %s\n", debugstr_run( &p->member.run )); /* OK, no better idea, so assume we MAY split words if we can split at all*/ if (idesp) - return split_run_extents(wc, piter, idesp); + return split_run_extents(wc, p, idesp); else - if (wc->pRowStart && piter != wc->pRowStart) + if (wc->pRowStart && p != wc->pRowStart) { /* don't need to break current run, because it's possible to split before this run */ wc->bOverflown = TRUE; - return piter; + return p; } else { /* split point inside first character - no choice but split after that char */ if (len != 1) { /* the run is more than 1 char, so we may split */ - return split_run_extents(wc, piter, 1); + return split_run_extents(wc, p, 1); } /* the run is one char, can't split it */ - return piter; + return p; } }

1 0

Henri Verbeet : wined3d: Copy the correct "binding_base" size in shader_spirv_select().
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 6a6bbf182821593dd28095a8b667914ceaa7faac URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a6bbf182821593dd28095a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:07 2020 +0330 wined3d: Copy the correct "binding_base" size in shader_spirv_select(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index a4368a944a..974fdab14e 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -820,7 +820,7 @@ static void shader_spirv_select(void *shader_priv, struct wined3d_context *conte priv->fragment_pipe->fp_enable(context, !use_ps(state)); bindings = &priv->bindings; - memcpy(binding_base, bindings->binding_base, sizeof(bindings)); + memcpy(binding_base, bindings->binding_base, sizeof(bindings->binding_base)); if (!shader_spirv_resource_bindings_init(bindings, &context_vk->graphics.bindings, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE))) {

1 0

Henri Verbeet : wined3d: Implement rasteriser discard for the Vulkan adapter.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: f494552c10ece8dccf46ce2749b2791c2b9f2230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f494552c10ece8dccf46ce27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:08 2020 +0330 wined3d: Implement rasteriser discard for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index aeb505ebfc..20a4522df5 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1761,6 +1761,7 @@ static void wined3d_context_vk_update_rasterisation_state(const struct wined3d_c if (!state->rasterizer_state) { desc->depthClampEnable = VK_FALSE; + desc->rasterizerDiscardEnable = is_rasterization_disabled(state->shader[WINED3D_SHADER_TYPE_GEOMETRY]); desc->cullMode = VK_CULL_MODE_BACK_BIT; desc->frontFace = VK_FRONT_FACE_CLOCKWISE; desc->depthBiasEnable = VK_FALSE; @@ -1773,6 +1774,7 @@ static void wined3d_context_vk_update_rasterisation_state(const struct wined3d_c r = &state->rasterizer_state->desc; desc->depthClampEnable = !r->depth_clip; + desc->rasterizerDiscardEnable = is_rasterization_disabled(state->shader[WINED3D_SHADER_TYPE_GEOMETRY]); desc->cullMode = vk_cull_mode_from_wined3d(r->cull_mode); desc->frontFace = r->front_ccw ? VK_FRONT_FACE_COUNTER_CLOCKWISE : VK_FRONT_FACE_CLOCKWISE; @@ -2017,7 +2019,8 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY))) { wined3d_context_vk_update_rasterisation_state(context_vk, state, key);

1 0

Henri Verbeet : wined3d: Initialise the list of Vulkan device extensions during adapter initialisation.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 10bfc47a48d0cc16673b836710d1cc1e969a7d43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10bfc47a48d0cc16673b8367… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:09 2020 +0330 wined3d: Initialise the list of Vulkan device extensions during adapter initialisation. There's no reason to wait until wined3d device creation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 174 +++++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 99 insertions(+), 77 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 799ec2601e..e589699bcd 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -274,6 +274,7 @@ static void adapter_vk_destroy(struct wined3d_adapter *adapter) VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_unload_vulkan(vk_info); wined3d_adapter_cleanup(&adapter_vk->a); + heap_free(adapter_vk->device_extensions); heap_free(adapter_vk); } @@ -397,82 +398,12 @@ static const struct wined3d_allocator_ops wined3d_allocator_vk_ops = .allocator_destroy_chunk = wined3d_allocator_vk_destroy_chunk, }; -static const struct -{ - const char *name; - unsigned int core_since_version; -} -vulkan_device_extensions[] = -{ - {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u}, - {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1}, - {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, - {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u}, -}; - -static bool enable_vulkan_device_extensions(VkPhysicalDevice physical_device, uint32_t *extension_count, - const char *enabled_extensions[], const struct wined3d_vk_info *vk_info) -{ - VkExtensionProperties *extensions = NULL; - bool success = false, found; - unsigned int i, j, count; - VkResult vr; - - *extension_count = 0; - - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) - { - ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); - goto done; - } - if (!(extensions = heap_calloc(count, sizeof(*extensions)))) - { - WARN("Out of memory.\n"); - goto done; - } - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, extensions))) < 0) - { - ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); - goto done; - } - - for (i = 0; i < ARRAY_SIZE(vulkan_device_extensions); ++i) - { - if (vulkan_device_extensions[i].core_since_version <= vk_info->api_version) - continue; - - for (j = 0, found = false; j < count; ++j) - { - if (!strcmp(extensions[j].extensionName, vulkan_device_extensions[i].name)) - { - found = true; - break; - } - } - - if (!found) - { - WARN("Required extension '%s' is not available.\n", vulkan_device_extensions[i].name); - goto done; - } - - TRACE("Enabling instance extension '%s'.\n", vulkan_device_extensions[i].name); - enabled_extensions[(*extension_count)++] = vulkan_device_extensions[i].name; - } - success = true; - -done: - heap_free(extensions); - return success; -} - static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); - const char *enabled_device_extensions[ARRAY_SIZE(vulkan_device_extensions)]; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; struct wined3d_physical_device_info physical_device_info; @@ -533,13 +464,8 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_info.pQueueCreateInfos = &queue_info; device_info.enabledLayerCount = 0; device_info.ppEnabledLayerNames = NULL; - device_info.ppEnabledExtensionNames = enabled_device_extensions; - if (!enable_vulkan_device_extensions(physical_device, - &device_info.enabledExtensionCount, enabled_device_extensions, vk_info)) - { - hr = E_FAIL; - goto fail; - } + device_info.enabledExtensionCount = adapter_vk->device_extension_count; + device_info.ppEnabledExtensionNames = adapter_vk->device_extensions; device_info.pEnabledFeatures = &features2->features; if ((vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device))) < 0) @@ -2146,6 +2072,93 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; } +static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk *adapter_vk) +{ + VkPhysicalDevice physical_device = adapter_vk->physical_device; + struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + unsigned int count, enable_count, i, j; + const char **enabled_extensions = NULL; + VkExtensionProperties *extensions; + bool found, success = false; + SIZE_T enable_size = 0; + VkResult vr; + + static const struct + { + const char *name; + unsigned int core_since_version; + } + info[] = + { + {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u}, + {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1}, + {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, + {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u}, + }; + + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) + { + ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); + return false; + } + + if (!(extensions = heap_calloc(count, sizeof(*extensions)))) + { + ERR("Failed to allocate extension properties array.\n"); + return false; + } + + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, extensions))) < 0) + { + ERR("Failed to enumerate device extensions, vr %s.\n", wined3d_debug_vkresult(vr)); + goto done; + } + + for (i = 0, enable_count = 0; i < ARRAY_SIZE(info); ++i) + { + if (info[i].core_since_version <= vk_info->api_version) + continue; + + for (j = 0, found = false; j < count; ++j) + { + if (!strcmp(extensions[j].extensionName, info[i].name)) + { + found = true; + break; + } + } + + if (!found) + { + WARN("Required extension '%s' is not available.\n", info[i].name); + goto done; + } + + TRACE("Enabling device extension '%s'.\n", info[i].name); + if (!wined3d_array_reserve((void **)&enabled_extensions, &enable_size, + enable_count + 1, sizeof(*enabled_extensions))) + { + ERR("Failed to allocate enabled extensions array.\n"); + goto done; + } + enabled_extensions[enable_count++] = info[i].name; + } + success = true; + +done: + if (success) + { + adapter_vk->device_extension_count = enable_count; + adapter_vk->device_extensions = enabled_extensions; + } + else + { + heap_free(enabled_extensions); + } + heap_free(extensions); + return success; +} + static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { @@ -2167,6 +2180,9 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!(adapter_vk->physical_device = get_vulkan_physical_device(vk_info))) goto fail_vulkan; + if (!wined3d_adapter_vk_init_device_extensions(adapter_vk)) + goto fail_vulkan; + memset(&id_properties, 0, sizeof(id_properties)); id_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; @@ -2184,7 +2200,10 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, luid = (LUID *)id_properties.deviceLUID; if (!wined3d_adapter_init(adapter, ordinal, luid, &wined3d_adapter_vk_ops)) + { + heap_free(adapter_vk->device_extensions); goto fail_vulkan; + } adapter->vertex_pipe = wined3d_spirv_vertex_pipe_init_vk(); adapter->fragment_pipe = wined3d_spirv_fragment_pipe_init_vk(); @@ -2210,6 +2229,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, fail: wined3d_adapter_cleanup(adapter); + heap_free(adapter_vk->device_extensions); fail_vulkan: VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_unload_vulkan(vk_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c783d28bc..a4ab61b186 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3347,6 +3347,8 @@ struct wined3d_adapter_vk struct wined3d_adapter a; struct wined3d_vk_info vk_info; + unsigned int device_extension_count; + const char **device_extensions; VkPhysicalDevice physical_device; VkPhysicalDeviceLimits device_limits;

1 0