October 2019 - Wine-Devel - list.winehq.org

[PATCH 2/2] wmvcore: IWMProfile3 GetStreamCount return 0 zero outputs.
by Alistair Leslie-Hughes Oct. 19, 2019

Oct. 19, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wmvcore/reader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index 6945f10a659..68e35cfd484 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -1756,7 +1756,12 @@ static HRESULT WINAPI profile3_GetStreamCount(IWMProfile3 *iface, DWORD *count) { WMReader *This = impl_from_IWMProfile3(iface); FIXME("%p, %p\n", This, count); - return E_NOTIMPL; + + if (!count) + return E_INVALIDARG; + + *count = 0; + return S_OK; } static HRESULT WINAPI profile3_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config) -- 2.23.0

1 0

[PATCH 1/2] wmvcore: IWMReader GetOutputCount return 0 zero outputs.
by Alistair Leslie-Hughes Oct. 19, 2019

Oct. 19, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wmvcore/reader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index 6041c567e95..6945f10a659 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -176,7 +176,12 @@ static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) { WMReader *This = impl_from_IWMReader(iface); FIXME("(%p)->(%p)\n", This, outputs); - return E_NOTIMPL; + + if(!outputs) + return E_INVALIDARG; + + *outputs = 0; + return S_OK; } static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output) -- 2.23.0

1 0

Wine staging 4.18 release
by Alistair Leslie-Hughes Oct. 18, 2019

Oct. 18, 2019

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.18 (850 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * d3dx9_36: Align texture dimensions to block size for compressed textures in D3DXCheckTextureRequirements. Added: * [47915] user32: Add InternalGetWindowIcon stub. Updated: * eventfd_synchronization * wined3d-zero-inf-shaders * dinput-joy-mappings Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] winex11.drv: Virtual desktop window properties
by Roberto Pungartnik Oct. 18, 2019

Oct. 18, 2019

2 1

[PATCH] mmdevapi/tests: remove todo in traces for capture tests
by Vijay Kiran Kamuju Oct. 18, 2019

Oct. 18, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47876 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/mmdevapi/tests/capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 0fa9f0cab83..c6142fc4360 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -392,7 +392,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) if(hr == S_OK){ /* Only PulseAudio goes here; despite snd_pcm_drop it manages * to fill GetBufferSize with a single snd_pcm_read */ - trace("Test marked todo: only PulseAudio gets here\n"); + trace("only PulseAudio gets here\n"); todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); /* Reset zeroes padding, not the position */ ok(pos >= sum, "Position %u last %u\n", (UINT)pos, sum); -- 2.21.0

4 3

[PATCH] regsvr32: Re-exec as 32-bit or 64-bit if necessary.
by Vincent Povirk Oct. 18, 2019

Oct. 18, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47075 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- programs/regsvr32/regsvr32.c | 122 +++++++++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 11 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 4aa3f7d5c1f..a7fb12e0fc1 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -83,6 +83,97 @@ static void WINAPIV output_write(UINT id, ...) LocalFree(str); } +static LPCWSTR find_arg_start(LPCWSTR cmdline) +{ + LPCWSTR s; + BOOL in_quotes; + int bcount; + + bcount=0; + in_quotes=FALSE; + s=cmdline; + while (1) { + if (*s==0 || ((*s=='\t' || *s==' ') && !in_quotes)) { + /* end of this command line argument */ + break; + } else if (*s=='\\') { + /* '\', count them */ + bcount++; + } else if ((*s=='"') && ((bcount & 1)==0)) { + /* unescaped '"' */ + in_quotes=!in_quotes; + bcount=0; + } else { + /* a regular character */ + bcount=0; + } + s++; + } + return s; +} + +static void reexec_self(void) +{ + /* restart current process as 32-bit or 64-bit with same command line */ + static const WCHAR exe_name[] = {'\\','r','e','g','s','v','r','3','2','.','e','x','e',0}; +#ifndef _WIN64 + static const WCHAR sysnative[] = {'\\','S','y','s','N','a','t','i','v','e',0}; + BOOL wow64; +#endif + WCHAR systemdir[MAX_PATH]; + LPCWSTR args; + WCHAR *cmdline; + STARTUPINFOW si = {0}; + PROCESS_INFORMATION pi; + +#ifdef _WIN64 + TRACE("restarting as 32-bit\n"); + GetSystemWow64DirectoryW(systemdir, MAX_PATH); +#else + TRACE("restarting as 64-bit\n"); + + if (!IsWow64Process(GetCurrentProcess(), &wow64) || !wow64) + { + TRACE("not running in wow64, can't restart as 64-bit\n"); + return; + } + + GetWindowsDirectoryW(systemdir, MAX_PATH); + wcscat(systemdir, sysnative); +#endif + + args = find_arg_start(GetCommandLineW()); + + cmdline = HeapAlloc(GetProcessHeap(), 0, + (wcslen(systemdir)+wcslen(exe_name)+wcslen(args)+1)*sizeof(WCHAR)); + + wcscpy(cmdline, systemdir); + wcscat(cmdline, exe_name); + wcscat(cmdline, args); + + si.cb = sizeof(si); + + if (CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + DWORD exit_code; + WaitForSingleObject(pi.hProcess, INFINITE); + GetExitCodeProcess(pi.hProcess, &exit_code); + ExitProcess(exit_code); + } + else + { + WINE_TRACE("failed to restart, err=%d\n", GetLastError()); + } + + HeapFree(GetProcessHeap(), 0, cmdline); +} + +#ifdef _WIN64 +# define ALT_BINARY_TYPE SCS_32BIT_BINARY +#else +# define ALT_BINARY_TYPE SCS_64BIT_BINARY +#endif + /** * Loads procedure. * @@ -90,14 +181,22 @@ static void WINAPIV output_write(UINT id, ...) * strDll - name of the dll. * procName - name of the procedure to load from the dll. * DllHandle - a variable that receives the handle of the loaded dll. + * firstDll - true if this is the first dll in the command line. */ -static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHandle) +static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHandle, BOOL firstDll) { VOID* (*proc)(void); *DllHandle = LoadLibraryExW(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { + DWORD binary_type; + if (firstDll && GetLastError() == ERROR_BAD_EXE_FORMAT && + GetBinaryTypeW(strDll, &binary_type) && + binary_type == ALT_BINARY_TYPE) + { + reexec_self(); + } output_write(STRING_DLL_LOAD_FAILED, strDll); ExitProcess(LOADLIBRARY_FAILED); } @@ -111,13 +210,13 @@ static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHan return proc; } -static int RegisterDll(const WCHAR* strDll) +static int RegisterDll(const WCHAR* strDll, BOOL firstDll) { HRESULT hr; DLLREGISTER pfRegister; HMODULE DllHandle = NULL; - pfRegister = LoadProc(strDll, "DllRegisterServer", &DllHandle); + pfRegister = LoadProc(strDll, "DllRegisterServer", &DllHandle, firstDll); if (!pfRegister) return GETPROCADDRESS_FAILED; @@ -134,13 +233,13 @@ static int RegisterDll(const WCHAR* strDll) return 0; } -static int UnregisterDll(const WCHAR* strDll) +static int UnregisterDll(const WCHAR* strDll, BOOL firstDll) { HRESULT hr; DLLUNREGISTER pfUnregister; HMODULE DllHandle = NULL; - pfUnregister = LoadProc(strDll, "DllUnregisterServer", &DllHandle); + pfUnregister = LoadProc(strDll, "DllUnregisterServer", &DllHandle, firstDll); if (!pfUnregister) return GETPROCADDRESS_FAILED; @@ -157,13 +256,13 @@ static int UnregisterDll(const WCHAR* strDll) return 0; } -static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_line) +static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_line, BOOL firstDll) { HRESULT hr; DLLINSTALL pfInstall; HMODULE DllHandle = NULL; - pfInstall = LoadProc(strDll, "DllInstall", &DllHandle); + pfInstall = LoadProc(strDll, "DllInstall", &DllHandle, firstDll); if (!pfInstall) return GETPROCADDRESS_FAILED; @@ -278,11 +377,12 @@ int __cdecl wmain(int argc, WCHAR* argv[]) if (argv[i]) { WCHAR *DllName = argv[i]; + BOOL firstDll = !DllFound; res = 0; DllFound = TRUE; if (CallInstall && Unregister) - res = InstallDll(!Unregister, DllName, wsCommandLine); + res = InstallDll(!Unregister, DllName, wsCommandLine, firstDll); /* The Windows version stops processing the current file on the first error. */ if (res) @@ -294,9 +394,9 @@ int __cdecl wmain(int argc, WCHAR* argv[]) if (!CallInstall || CallRegister) { if(Unregister) - res = UnregisterDll(DllName); + res = UnregisterDll(DllName, firstDll); else - res = RegisterDll(DllName); + res = RegisterDll(DllName, firstDll); } if (res) @@ -306,7 +406,7 @@ int __cdecl wmain(int argc, WCHAR* argv[]) } if (CallInstall && !Unregister) - res = InstallDll(!Unregister, DllName, wsCommandLine); + res = InstallDll(!Unregister, DllName, wsCommandLine, firstDll); if (res) { -- 2.17.1

1 0

[PATCH] mscoree: Support loading assemblies from path specified in config file.
by Gijs Vermeulen Oct. 18, 2019

Oct. 18, 2019

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/mscoree/config.c | 13 ++++++++-- dlls/mscoree/corruntimehost.c | 45 ++++++++++++++++++++++++++-------- dlls/mscoree/metahost.c | 38 +++++++++++++++++++++++++++- dlls/mscoree/mscoree_private.h | 3 +++ 4 files changed, 86 insertions(+), 13 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index f2abf107a5..035247442c 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -347,8 +347,15 @@ static HRESULT parse_probing(ConfigFileHandler *This, ISAXAttributes *pAttr) hr = ISAXAttributes_getValueFromName(pAttr, empty, 0, privatePath, lstrlenW(privatePath), &value, &value_size); if (SUCCEEDED(hr)) - FIXME("privatePath=%s not implemented\n", debugstr_wn(value, value_size)); - hr = S_OK; + { + TRACE("%s\n", debugstr_wn(value, value_size)); + + This->result->private_path = HeapAlloc(GetProcessHeap(), 0, (value_size + 1) * sizeof(WCHAR)); + if (This->result->private_path) + wcscpy(This->result->private_path, value); + else + hr = E_OUTOFMEMORY; + } return hr; } @@ -698,4 +705,6 @@ void free_parsed_config_file(parsed_config_file *file) list_remove(&cursor->entry); HeapFree(GetProcessHeap(), 0, cursor); } + + HeapFree(GetProcessHeap(), 0, file->private_path); } diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 2ccc7bc4f5..e932a7f58b 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -58,6 +58,8 @@ static HANDLE dll_fixup_heap; /* using a separate heap so we can have execute pe static struct list dll_fixups; +WCHAR **private_path = NULL; + struct dll_fixup { struct list entry; @@ -1436,6 +1438,8 @@ static void FixupVTable(HMODULE hmodule) __int32 WINAPI _CorExeMain(void) { + static const WCHAR dotconfig[] = {'.','c','o','n','f','i','g',0}; + static const WCHAR scW[] = {';',0}; int exit_code; int argc; char **argv; @@ -1443,12 +1447,14 @@ __int32 WINAPI _CorExeMain(void) MonoImage *image; MonoImageOpenStatus status; MonoAssembly *assembly=NULL; - WCHAR filename[MAX_PATH]; + WCHAR filename[MAX_PATH], config_file[MAX_PATH], *temp, **priv_path; + SIZE_T config_file_dir_size; char *filenameA; ICLRRuntimeInfo *info; RuntimeHost *host; + parsed_config_file parsed_config; HRESULT hr; - int i; + int i, number_of_private_paths = 0; get_utf8_args(&argc, &argv); @@ -1468,6 +1474,33 @@ __int32 WINAPI _CorExeMain(void) FixupVTable(GetModuleHandleW(NULL)); + wcscpy(config_file, filename); + wcscat(config_file, dotconfig); + + hr = parse_config_file(config_file, &parsed_config); + if (SUCCEEDED(hr) && parsed_config.private_path) + { + for(i = 0; parsed_config.private_path[i] != 0; i++) + if (parsed_config.private_path[i] == ';') number_of_private_paths++; + if (parsed_config.private_path[wcslen(parsed_config.private_path) - 1] != ';') number_of_private_paths++; + config_file_dir_size = (wcsrchr(config_file, '\\') - config_file) + 1; + priv_path = HeapAlloc(GetProcessHeap(), 0, (number_of_private_paths + 1) * sizeof(WCHAR *)); + /* wcstok ignores trailing semicolons */ + temp = wcstok(parsed_config.private_path, scW); + for (i = 0; i < number_of_private_paths; i++) + { + priv_path[i] = HeapAlloc(GetProcessHeap(), 0, (config_file_dir_size + wcslen(temp) + 1) * sizeof(WCHAR)); + memcpy(priv_path[i], config_file, config_file_dir_size * sizeof(WCHAR)); + wcscpy(priv_path[i] + config_file_dir_size, temp); + temp = wcstok(NULL, scW); + } + priv_path[number_of_private_paths] = NULL; + if (InterlockedCompareExchangePointer((void **)&private_path, priv_path, NULL)) + ERR("private_path was already set\n"); + } + + free_parsed_config_file(&parsed_config); + hr = get_runtime_info(filename, NULL, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) @@ -1475,15 +1508,7 @@ __int32 WINAPI _CorExeMain(void) hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); if (SUCCEEDED(hr)) - { - WCHAR config_file[MAX_PATH]; - static const WCHAR dotconfig[] = {'.','c','o','n','f','i','g',0}; - - lstrcpyW(config_file, filename); - lstrcatW(config_file, dotconfig); - hr = RuntimeHost_GetDefaultDomain(host, config_file, &domain); - } if (SUCCEEDED(hr)) { diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f87737cd83..18232a4568 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1610,20 +1610,56 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname HRESULT hr; MonoAssembly *result=NULL; char *stringname=NULL; + const char *assemblyname; LPWSTR stringnameW; int stringnameW_size; WCHAR path[MAX_PATH]; char *pathA; MonoImageOpenStatus stat; DWORD search_flags; + int i; + static const WCHAR dotdllW[] = {'.','d','l','l',0}; + static const WCHAR slashW[] = {'\\',0}; stringname = mono_stringify_assembly_name(aname); + assemblyname = mono_assembly_name_get_name(aname); TRACE("%s\n", debugstr_a(stringname)); - if (!stringname) return NULL; + if (!stringname || !assemblyname) return NULL; search_flags = get_assembly_search_flags(aname); + if (private_path) + { + stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, NULL, 0); + stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); + if (stringnameW) + { + MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, stringnameW, stringnameW_size); + for (i = 0; private_path[i] != NULL; i++) + { + wcscpy(path, private_path[i]); + wcscat(path, slashW); + wcscat(path, stringnameW); + wcscat(path, dotdllW); + pathA = WtoA(path); + if (pathA) + { + result = mono_assembly_open(pathA, &stat); + if (result) + { + TRACE("found: %s\n", debugstr_w(path)); + HeapFree(GetProcessHeap(), 0, pathA); + HeapFree(GetProcessHeap(), 0, stringnameW); + mono_free(stringname); + return result; + } + HeapFree(GetProcessHeap(), 0, pathA); + } + } + HeapFree(GetProcessHeap(), 0, stringnameW); + } + } /* FIXME: We should search the given paths before the GAC. */ diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index db18aff3eb..2b9c1dd35e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -117,6 +117,7 @@ extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDE typedef struct parsed_config_file { struct list supported_runtimes; + LPWSTR private_path; } parsed_config_file; typedef struct supported_runtime @@ -125,6 +126,8 @@ typedef struct supported_runtime LPWSTR version; } supported_runtime; +extern WCHAR **private_path; + extern HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) DECLSPEC_HIDDEN; extern HRESULT parse_config_stream(IStream *stream, parsed_config_file *result) DECLSPEC_HIDDEN; -- 2.23.0

2 1

[PATCH] ddraw/tests: Fix some test failures on 64-bit Windows.
by Sven Baars Oct. 18, 2019

Oct. 18, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index a23e76e1f7..64c03c87d0 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12998,7 +12998,7 @@ static void test_caps(void) } hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw, NULL); - ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK || (is_ddraw64 && hr == E_FAIL), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { memset(&hal_caps, 0, sizeof(hal_caps)); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2156bd5849..bf0cfef0b1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13878,7 +13878,7 @@ static void test_caps(void) } hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw1, NULL); - ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK || (is_ddraw64 && hr == E_FAIL), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw); -- 2.17.1

3 2

[PATCH v2] wined3d: Add default case in wined3d_calculate_fog_factor.
by Gijs Vermeulen Oct. 18, 2019

Oct. 18, 2019

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- v2: fix email and commit message, sorry for the noise This silences a clang warning: warning: control may reach end of non-void function [-Wreturn-type] dlls/wined3d/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b1b630014..0a668c46b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3501,6 +3501,9 @@ static float wined3d_calculate_fog_factor(float fog_coord, const struct lights_s return expf(-fog_coord * ls->fog_density); case WINED3D_FOG_EXP2: return expf(-fog_coord * fog_coord * ls->fog_density * ls->fog_density); + default: + ERR("Unhandled fog mode %#x.\n", ls->fog_mode); + return 0.0f; } } -- 2.23.0

2 1

[PATCH 1/4] wined3d: Introduce wined3d_stateblock_set_render_state().
by Zebediah Figura Oct. 18, 2019

Oct. 18, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 15 +++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 18 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dae95ae46e8..42d1d9d4d81 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1419,6 +1419,21 @@ void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock * stateblock->changed.vertexDecl = TRUE; } +void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateblock, + enum wined3d_render_state state, DWORD value) +{ + TRACE("stateblock %p, state %s (%#x), value %#x.\n", stateblock, debug_d3drenderstate(state), state, value); + + if (state > WINEHIGHEST_RENDER_STATE) + { + WARN("Unhandled render state %#x.\n", state); + return; + } + + stateblock->stateblock_state.rs[state] = value; + stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b65681f2108..488b1c4e650 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -262,6 +262,7 @@ @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) +@ cdecl wined3d_stateblock_set_render_state(ptr long long) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f79cd212a1e..8d13a245ada 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2667,6 +2667,8 @@ HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *st unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); +void __cdecl wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateblock, + enum wined3d_render_state state, DWORD value); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); -- 2.23.0

2 7