August 2017 - Wine-commits - list.winehq.org

Paul Gofman : d3dx9: Do not support preshader instructions which output multiple registers.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 14fab72269cd08b99b38db254eb5db115a039662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14fab72269cd08b99b38db254… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 31 16:08:29 2017 +0300 d3dx9: Do not support preshader instructions which output multiple registers. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 58b8d62..4142c52 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -521,7 +521,13 @@ static unsigned int *parse_pres_ins(unsigned int *ptr, unsigned int count, struc FIXME("Relative addressing in output register not supported.\n"); return NULL; } - + if (get_reg_offset(ins->output.reg.table, ins->output.reg.offset + + (pres_op_info[ins->op].func_all_comps ? 0 : ins->component_count - 1)) + != get_reg_offset(ins->output.reg.table, ins->output.reg.offset)) + { + FIXME("Instructions outputting multiple registers are not supported.\n"); + return NULL; + } return ptr; } @@ -629,8 +635,7 @@ static void append_pres_const_sets_for_shader_input(struct d3dx_const_tab *const continue; const_set.register_index = get_reg_offset(reg->table, reg->offset); - const_set.register_count = max(get_reg_offset(reg->table, - pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count), 1); + const_set.register_count = 1; const_set.table = reg->table; const_set.constant_class = D3DXPC_FORCE_DWORD; const_set.element_count = 1; @@ -963,18 +968,10 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab && out->const_set[i].register_index + out->const_set[i].register_count >= out->const_set[i + 1].register_index) { - if (out->const_set[i].register_index + out->const_set[i].register_count - > out->const_set[i + 1].register_index + out->const_set[i + 1].register_count) - { - WARN("Unexpected preshader register count %u, register index %u, " - "next register count %u, register index %u, i %u.\n", - out->const_set[i].register_count, out->const_set[i].register_index, - out->const_set[i + 1].register_count, out->const_set[i + 1].register_index, i); - hr = D3DERR_INVALIDCALL; - goto cleanup; - } - out->const_set[i].register_count = out->const_set[i + 1].register_index - + out->const_set[i + 1].register_count - out->const_set[i].register_index; + assert(out->const_set[i].register_index + out->const_set[i].register_count + <= out->const_set[i + 1].register_index + 1); + out->const_set[i].register_count = out->const_set[i + 1].register_index + 1 + - out->const_set[i].register_index; memmove(&out->const_set[i + 1], &out->const_set[i + 2], sizeof(out->const_set[i]) * (out->const_set_count - i - 2)); --out->const_set_count; @@ -1216,8 +1213,7 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u } } update_table_size(pres->regs.table_sizes, pres->ins[i].output.reg.table, - get_reg_offset(pres->ins[i].output.reg.table, - pres->ins[i].output.reg.offset + pres->ins[i].component_count - 1)); + get_reg_offset(pres->ins[i].output.reg.table, pres->ins[i].output.reg.offset)); } if (FAILED(regstore_alloc_table(&pres->regs, PRES_REGTAB_IMMED))) return E_OUTOFMEMORY;

1 0

Paul Gofman : d3dx9: Dump bytecode if parameter evaluator creation failed.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: c48658dbb82371ca3c9feb69254138875a79310b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48658dbb82371ca3c9feb692… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 31 16:08:30 2017 +0300 d3dx9: Dump bytecode if parameter evaluator creation failed. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 4142c52..e3e91c6 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1324,6 +1324,9 @@ HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte err_out: WARN("Error creating parameter evaluator.\n"); + if (TRACE_ON(d3dx)) + dump_bytecode(byte_code, byte_code_size); + d3dx_free_param_eval(peval); *peval_out = NULL; return ret;

1 0

Paul Gofman : d3dx9: Use bitmask instead of BOOL array for light_updated.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: e06b7693d6f0980b1db2fa3b9920c7a925ceb8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06b7693d6f0980b1db2fa3b9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 31 16:08:31 2017 +0300 d3dx9: Use bitmask instead of BOOL array for light_updated. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8095a0e..864f0e5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -178,7 +178,7 @@ struct ID3DXEffectImpl DWORD begin_flags; D3DLIGHT9 current_light[8]; - BOOL light_updated[8]; + unsigned int light_updated; D3DMATERIAL9 current_material; BOOL material_updated; }; @@ -3067,7 +3067,7 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas state_table[state->operation].op); d3dx9_set_light_parameter(state_table[state->operation].op, &effect->current_light[state->index], param_value); - effect->light_updated[state->index] = TRUE; + effect->light_updated |= 1u << state->index; return D3D_OK; } case SC_MATERIAL: @@ -3112,15 +3112,19 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 ret = hr; } } - for (i = 0; i < ARRAY_SIZE(effect->current_light); ++i) + + if (effect->light_updated) { - if (effect->light_updated[i] - && FAILED(hr = SET_D3D_STATE(effect, SetLight, i, &effect->current_light[i]))) + for (i = 0; i < ARRAY_SIZE(effect->current_light); ++i) { - WARN("Error setting light, hr %#x.\n", hr); - ret = hr; + if ((effect->light_updated & (1u << i)) + && FAILED(hr = SET_D3D_STATE(effect, SetLight, i, &effect->current_light[i]))) + { + WARN("Error setting light, hr %#x.\n", hr); + ret = hr; + } } - effect->light_updated[i] = FALSE; + effect->light_updated = 0; } if (effect->material_updated

1 0

Alexandre Julliard : ntdll: Store the PEB lock pointer in the PEB.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: b31583770f074ca343e00f6c2be19b831d6ad90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31583770f074ca343e00f6c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 31 10:01:04 2017 +0200 ntdll: Store the PEB lock pointer in the PEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 13 ++----------- dlls/ntdll/thread.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index b0ea413..e56eec8 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -49,15 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -static RTL_CRITICAL_SECTION peb_lock; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &peb_lock, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": peb_lock") } -}; -static RTL_CRITICAL_SECTION peb_lock = { &critsect_debug, -1, 0, 0, 0, 0 }; - #ifdef __i386__ #define DEFINE_FASTCALL4_ENTRYPOINT( name ) \ __ASM_STDCALL_FUNC( name, 16, \ @@ -380,7 +371,7 @@ NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPC */ VOID WINAPI RtlAcquirePebLock(void) { - RtlEnterCriticalSection( &peb_lock ); + RtlEnterCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); } /****************************************************************************** @@ -388,7 +379,7 @@ VOID WINAPI RtlAcquirePebLock(void) */ VOID WINAPI RtlReleasePebLock(void) { - RtlLeaveCriticalSection( &peb_lock ); + RtlLeaveCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); } /****************************************************************************** diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ba1be0f..6ded7ea 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -69,6 +69,15 @@ static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; static int nb_threads = 1; +static RTL_CRITICAL_SECTION peb_lock; +static RTL_CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &peb_lock, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": peb_lock") } +}; +static RTL_CRITICAL_SECTION peb_lock = { &critsect_debug, -1, 0, 0, 0, 0 }; + /*********************************************************************** * get_unicode_string * @@ -292,6 +301,7 @@ HANDLE thread_init(void) MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE ); peb = addr; + peb->FastPebLock = &peb_lock; peb->ProcessParameters = &params; peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap;

1 0

Alexandre Julliard : fusion/tests: Correctly test non-string properties.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 99f08cc76bdd8eb7465673432ca6162c74f799c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f08cc76bdd8eb7465673432… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 31 09:27:13 2017 +0200 fusion/tests: Correctly test non-string properties. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/tests/asmname.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 5fb14a4..01ebd0a 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -351,16 +351,14 @@ static void test_assembly_name_props_line(IAssemblyName *name, DWORD i, size; WCHAR expect[MAX_PATH]; WCHAR str[MAX_PATH]; - CHAR val[MAX_PATH]; for (i = 0; i < ASM_NAME_MAX_PARAMS; i++) { to_widechar(expect, vals[i].val); size = MAX_PATH; - ZeroMemory(str, MAX_PATH); + memset( str, 0xcc, sizeof(str) ); hr = IAssemblyName_GetProperty(name, i, str, &size); - to_multibyte(val, str); ok(hr == vals[i].hr || broken(i >= ASM_NAME_CONFIG_MASK && hr == E_INVALIDARG) || /* .NET 1.1 */ @@ -368,11 +366,15 @@ static void test_assembly_name_props_line(IAssemblyName *name, "%d: prop %d: Expected %08x, got %08x\n", line, i, vals[i].hr, hr); if (hr != E_INVALIDARG) { - if (i == ASM_NAME_PUBLIC_KEY_TOKEN) - ok(!memcmp(vals[i].val, str, size), "Expected a correct ASM_NAME_PUBLIC_KEY_TOKEN\n"); - else - ok(!lstrcmpA(vals[i].val, val), "%d: prop %d: Expected \"%s\", got \"%s\"\n", line, i, vals[i].val, val); ok(size == vals[i].size, "%d: prop %d: Expected %d, got %d\n", line, i, vals[i].size, size); + if (size && size != MAX_PATH) + { + if (i != ASM_NAME_NAME && i != ASM_NAME_CULTURE) + ok( !memcmp( vals[i].val, str, size ), "%d: prop %d: wrong value\n", line, i ); + else + ok( !lstrcmpW( expect, str ), "%d: prop %d: Expected %s, got %s\n", + line, i, wine_dbgstr_w(expect), wine_dbgstr_w(str) ); + } } } }

1 0

Alexandre Julliard : fusion/tests: Simplify directory recursion and avoid redundant buffers.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 5c37020a7e170365387973c38446a16c26030861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c37020a7e170365387973c38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 31 10:20:00 2017 +0200 fusion/tests: Simplify directory recursion and avoid redundant buffers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/tests/asmenum.c | 115 ++++++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 58 deletions(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index 1dc34a2..5091be4 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -217,79 +217,80 @@ static void test_CreateAssemblyEnum(void) typedef struct _tagASMNAME { struct list entry; - LPSTR data; + char data[1]; } ASMNAME; -static BOOL enum_gac_assemblies(struct list *assemblies, int depth, LPSTR path) +static void enum_gac_assembly_dirs(struct list *assemblies, const char *parent, char path[MAX_PATH]) { + static const char format[] = "%s, Version=%s, Culture=%s, PublicKeyToken=%s"; WIN32_FIND_DATAA ffd; - CHAR buf[MAX_PATH]; - CHAR disp[MAX_PATH]; ASMNAME *name; HANDLE hfind; - LPSTR ptr; - - static CHAR parent[MAX_PATH]; + int len; + char *ptr, *end = path + strlen( path ); - sprintf(buf, "%s\\*", path); - hfind = FindFirstFileA(buf, &ffd); - if (hfind == INVALID_HANDLE_VALUE) - return FALSE; + lstrcpynA( end, "\\*", path + MAX_PATH - end ); + hfind = FindFirstFileA(path, &ffd); + if (hfind == INVALID_HANDLE_VALUE) return; + end++; do { - if (!lstrcmpA(ffd.cFileName, ".") || !lstrcmpA(ffd.cFileName, "..")) - continue; + char culture[MAX_PATH]; + + if (!strcmp(ffd.cFileName, ".") || !strcmp(ffd.cFileName, "..")) continue; - if (depth == 0) + *end = 0; + /* Directories with no dll or exe will not be enumerated */ + snprintf(end, path + MAX_PATH - end, "%s\\%s.dll", ffd.cFileName, parent); + if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) { - lstrcpyA(parent, ffd.cFileName); + snprintf(end, path + MAX_PATH - end, "%s\\%s.exe", ffd.cFileName, parent); + if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) continue; } - else if (depth == 1) + + if (!(ptr = strchr(ffd.cFileName, '_'))) continue; + *ptr++ = 0; + + if (*ptr != '_') { - char culture[MAX_PATH]; - char dll[MAX_PATH], exe[MAX_PATH]; + lstrcpyA(culture, ptr); + *strchr(culture, '_') = 0; + } + else + lstrcpyA(culture, "neutral"); - /* Directories with no dll or exe will not be enumerated */ - sprintf(dll, "%s\\%s\\%s.dll", path, ffd.cFileName, parent); - sprintf(exe, "%s\\%s\\%s.exe", path, ffd.cFileName, parent); - if (GetFileAttributesA(dll) == INVALID_FILE_ATTRIBUTES && - GetFileAttributesA(exe) == INVALID_FILE_ATTRIBUTES) - continue; + ptr = strchr(ptr, '_'); + ptr++; + len = sizeof(format) + strlen(parent) + strlen(ffd.cFileName) + strlen(culture) + strlen(ptr); - ptr = strstr(ffd.cFileName, "_"); - *ptr = '\0'; - ptr++; + name = HeapAlloc(GetProcessHeap(), 0, offsetof( ASMNAME, data[len] )); + sprintf( name->data, format, parent, ffd.cFileName, culture, ptr); + list_add_tail(assemblies, &name->entry); + } while (FindNextFileA(hfind, &ffd) != 0); - if (*ptr != '_') - { - lstrcpyA(culture, ptr); - *strstr(culture, "_") = '\0'; - } - else - lstrcpyA(culture, "neutral"); - - ptr = strchr(ptr, '_'); - ptr++; - sprintf(buf, ", Version=%s, Culture=%s, PublicKeyToken=%s", - ffd.cFileName, culture, ptr); - lstrcpyA(disp, parent); - lstrcatA(disp, buf); - - name = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); - name->data = HeapAlloc(GetProcessHeap(), 0, lstrlenA(disp) + 1); - lstrcpyA(name->data, disp); - list_add_tail(assemblies, &name->entry); - - continue; - } + FindClose(hfind); +} - sprintf(buf, "%s\\%s", path, ffd.cFileName); - enum_gac_assemblies(assemblies, depth + 1, buf); +static void enum_gac_assemblies(struct list *assemblies, char path[MAX_PATH]) +{ + WIN32_FIND_DATAA ffd; + HANDLE hfind; + char *end = path + strlen( path ); + + lstrcpynA( end, "\\*", path + MAX_PATH - end ); + hfind = FindFirstFileA(path, &ffd); + if (hfind == INVALID_HANDLE_VALUE) return; + end++; + + do + { + if (!strcmp(ffd.cFileName, ".") || !strcmp(ffd.cFileName, "..")) continue; + lstrcpynA( end, ffd.cFileName, path + MAX_PATH - end ); + enum_gac_assembly_dirs( assemblies, ffd.cFileName, path ); } while (FindNextFileA(hfind, &ffd) != 0); FindClose(hfind); - return TRUE; } static void test_enumerate(void) @@ -311,18 +312,18 @@ static void test_enumerate(void) to_multibyte(path, buf); lstrcatA(path, "_32"); - enum_gac_assemblies(&assemblies, 0, path); + enum_gac_assemblies(&assemblies, path); to_multibyte(path, buf); lstrcatA(path, "_64"); - enum_gac_assemblies(&assemblies, 0, path); + enum_gac_assemblies(&assemblies, path); to_multibyte(path, buf); lstrcatA(path, "_MSIL"); - enum_gac_assemblies(&assemblies, 0, path); + enum_gac_assemblies(&assemblies, path); to_multibyte(path, buf); - enum_gac_assemblies(&assemblies, 0, path); + enum_gac_assemblies(&assemblies, path); asmenum = NULL; hr = pCreateAssemblyEnum(&asmenum, NULL, NULL, ASM_CACHE_GAC, NULL); @@ -345,7 +346,6 @@ static void test_enumerate(void) found = TRUE; list_remove(&asmname->entry); - HeapFree(GetProcessHeap(), 0, asmname->data); HeapFree(GetProcessHeap(), 0, asmname); break; } @@ -369,7 +369,6 @@ static void test_enumerate(void) ok(FALSE, "Assembly not enumerated: %s\n", asmname->data); list_remove(&asmname->entry); - HeapFree(GetProcessHeap(), 0, asmname->data); HeapFree(GetProcessHeap(), 0, asmname); }

1 0

Alexandre Julliard : kernel32: Silence buffer overflow gcc warnings.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 741fe13d445d73293d54066ad4a9a9d9cbecb96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=741fe13d445d73293d54066ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 31 10:48:39 2017 +0200 kernel32: Silence buffer overflow gcc warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/oldconfig.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 6c80dc6..219ecc5 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -290,7 +290,8 @@ static void create_hardware_branch(void) { if (strncmp(dent->d_name, "hd", 2) == 0) { - sprintf(cStr, procname_ide_media, dent->d_name); + if (snprintf(cStr, sizeof(cStr), procname_ide_media, dent->d_name) >= sizeof(cStr)) + continue; procfile = fopen(cStr, "r"); if (!procfile) { @@ -306,7 +307,8 @@ static void create_hardware_branch(void) if (nType == DRIVE_UNKNOWN) continue; } - sprintf(cStr, procname_ide_model, dent->d_name); + if (snprintf(cStr, sizeof(cStr), procname_ide_model, dent->d_name) >= sizeof(cStr)) + continue; procfile = fopen(cStr, "r"); if (!procfile) { @@ -322,7 +324,8 @@ static void create_hardware_branch(void) cDevModel[strlen(cDevModel) - 1] = 0; } - sprintf(cUnixDeviceName, "/dev/%s", dent->d_name); + if (snprintf(cUnixDeviceName, sizeof(cUnixDeviceName), "/dev/%s", dent->d_name) >= sizeof(cUnixDeviceName)) + continue; scsi_addr.PortNumber = (dent->d_name[2] - 'a') / 2; scsi_addr.PathId = 0; scsi_addr.TargetId = (dent->d_name[2] - 'a') % 2;

1 0

Józef Kucia : wined3d: Avoid potential NULL pointer dereference (Coverity).
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: b202586ee9a7fde70a737b7b2872301569d6bb9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b202586ee9a7fde70a737b7b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 09:04:34 2017 +0200 wined3d: Avoid potential NULL pointer dereference (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bef4795..6ea2fd2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1317,10 +1317,10 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con if (prev) InterlockedDecrement(&prev->resource->bind_count); - device_invalidate_state(cs->device, STATE_UNORDERED_ACCESS_VIEW_BINDING(op->pipeline)); - - if (op->initial_count != ~0u) + if (op->view && op->initial_count != ~0u) wined3d_unordered_access_view_set_counter(op->view, op->initial_count); + + device_invalidate_state(cs->device, STATE_UNORDERED_ACCESS_VIEW_BINDING(op->pipeline)); } void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined3d_pipeline pipeline,

1 0

Józef Kucia : d3d10core/tests: Remove needless assignment.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: a48af9e8c3fa865b5b982576f46371a5b1ed08f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48af9e8c3fa865b5b982576f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 09:04:35 2017 +0200 d3d10core/tests: Remove needless assignment. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a10f40d..819d949 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8879,7 +8879,6 @@ static void test_draw_depth_only(void) check_texture_float(texture, 0.5f, 1); ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); - depth.x = 0.1f; for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j)

1 0

Józef Kucia : d3d11/tests: Remove needless assignment.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: b4a40ac555417b417f33a03d25319b704fd2cf9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a40ac555417b417f33a03d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 09:04:36 2017 +0200 d3d11/tests: Remove needless assignment. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3cf49cc..60ae0e0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11302,7 +11302,6 @@ static void test_draw_depth_only(void) check_texture_float(texture, 0.5f, 1); ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); - depth.x = 0.1f; for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j)

1 0