wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Paul Gofman : d3dx9: Don't apply unmodified states in CommitChanges().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: a844ce7dc43c34b18a9a76649d228de1dd83c58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a844ce7dc43c34b18a9a76649… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 21 19:04:10 2017 +0100 d3dx9: Don't apply unmodified states in CommitChanges(). 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/d3dx9_private.h | 10 +++- dlls/d3dx9_36/effect.c | 126 +++++++++++++++++++++++++++--------------- dlls/d3dx9_36/preshader.c | 42 +++++++++++--- 3 files changed, 122 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a844ce7dc43c34b18a9a7…

1 0

Matteo Bruni : d3dx9: Override d3dx9_get_param_value_ptr() return value only on array overflow.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: f68de78d9ecd8babbf166866400e751f401a5bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68de78d9ecd8babbf1668664… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 21 19:04:09 2017 +0100 d3dx9: Override d3dx9_get_param_value_ptr() return value only on array overflow. Incidentally this exposes a few test failures (due to not supporting relative addressing in preshaders) previously masked by the broad override. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 22 +++++++++++++++++----- dlls/d3dx9_36/tests/effect.c | 4 ++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 202a9a3..75254c1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2572,8 +2572,9 @@ static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct TRACE("Array index %u.\n", array_idx); if (array_idx >= param->element_count) { - ERR("Computed array index %u is out of bound %u.\n", array_idx, param->element_count); - return D3DERR_INVALIDCALL; + WARN("Computed array index %u is larger than array size %u.\n", + array_idx, param->element_count); + return E_FAIL; } param = &param->members[array_idx]; @@ -2816,10 +2817,21 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas HRESULT hr; TRACE("operation %u, index %u, type %u.\n", state->operation, state->index, state->type); + if (FAILED(hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param))) - /* Native d3dx returns D3D_OK from BeginPass or Commit involving out of bounds array - * access and does not touch affected state. */ - return D3D_OK; + { + if (hr == E_FAIL) + { + /* Native d3dx9 returns D3D_OK from BeginPass or Commit involving + * out of bounds array access and does not touch the affected + * state, except for BeginPass when the out of bounds array index + * depends on dirty parameters. The latter case is supposed to + * return E_FAIL but is currently TODO. */ + WARN("Returning D3D_OK on out of bounds array access.\n"); + return D3D_OK; + } + return hr; + } switch (state_table[state->operation].class) { diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 24817dc..6aa2aaf 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4153,7 +4153,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) ok(hr == D3D_OK, "SetVector failed, hr %#x.\n", hr); hr = effect->lpVtbl->BeginPass(effect, 0); - ok(hr == D3D_OK, "Got result %#x.\n", hr); + todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->BeginPass(effect, 0); ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); @@ -4327,7 +4327,7 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe } hr = effect->lpVtbl->BeginPass(effect, 0); - ok(hr == D3D_OK, "Got result %#x.\n", hr); + todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = IDirect3DDevice9_GetLight(device, blob_position[test->args_count].result_index, &light); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

Alex Henrie : ntdll: Implement ProcessVmCounters for Linux.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: bf7a97e5d3482d1ee4130d716f02b870df804040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7a97e5d3482d1ee4130d716… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 20 22:55:37 2017 -0600 ntdll: Implement ProcessVmCounters for Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 28 ++++++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 5 +---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 8689d9b..9522256 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -131,6 +131,34 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) #endif } +#elif defined(linux) + +static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) +{ + FILE *f; + char line[256]; + unsigned long value; + + f = fopen("/proc/self/status", "r"); + if (!f) return; + + while (fgets(line, sizeof(line), f)) + { + if (sscanf(line, "VmPeak: %lu", &value)) + pvmi->PeakVirtualSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmSize: %lu", &value)) + pvmi->VirtualSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmHWM: %lu", &value)) + pvmi->PeakWorkingSetSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmRSS: %lu", &value)) + pvmi->WorkingSetSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmSwap: %lu", &value)) + pvmi->PeakPagefileUsage = pvmi->PagefileUsage = (ULONG64)value * 1024; + } + + fclose(f); +} + #else static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 448bc64..35e25af 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1078,10 +1078,7 @@ static void test_query_process_vm(void) /* Check if we have some return values */ trace("WorkingSetSize : %ld\n", pvi.WorkingSetSize); - todo_wine - { - ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); - } + ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); } static void test_query_process_io(void)

1 0

Alex Henrie : ntdll: Don' t report false memory statistics for other processes.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 08ea8280d38e0592abd817d13a058567db0ea5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=08ea8280d38e0592abd817d13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 20 22:29:55 2017 -0600 ntdll: Don't report false memory statistics for other processes. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index adff826..8689d9b 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -271,7 +271,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( else { memset(&pvmi, 0 , sizeof(VM_COUNTERS)); - fill_VM_COUNTERS(&pvmi); + if (ProcessHandle == GetCurrentProcess()) + fill_VM_COUNTERS(&pvmi); + else + FIXME("Need wineserver call to get VM counters for another process\n"); len = ProcessInformationLength; if (len != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) len = sizeof(VM_COUNTERS);

1 0

Piotr Caban : user32: Don't call IsChild with NULL window in EnableWindow.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: a878f0a02ad553b94b78b907715c691507dea501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a878f0a02ad553b94b78b9077… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 21 13:03:55 2017 +0100 user32: Don't call IsChild with NULL window in EnableWindow. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 2 ++ dlls/user32/win.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6e11ff2..915012c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3091,7 +3091,9 @@ static void test_SetFocus(HWND hwnd) ShowWindow(child, SW_SHOW); SetFocus(child); ok( GetFocus() == child, "Focus should be on child %p\n", child ); + SetLastError(0xdeadbeef); EnableWindow(hwnd, FALSE); + ok(GetLastError() == 0xdeadbeef, "got error %u in EnableWindow call\n", GetLastError()); ok( GetFocus() == child, "Focus should still be on child %p\n", child ); EnableWindow(hwnd, TRUE); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4406577..f3b4ef5 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2171,7 +2171,7 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) SetFocus( 0 ); /* A disabled window can't have the focus */ capture_wnd = GetCapture(); - if (hwnd == capture_wnd || IsChild(hwnd, capture_wnd)) + if (capture_wnd && (hwnd == capture_wnd || IsChild(hwnd, capture_wnd))) ReleaseCapture(); /* A disabled window can't capture the mouse */ SendMessageW( hwnd, WM_ENABLE, FALSE, 0 );

1 0

Piotr Caban : msvcp140: Add {_Schedule, _Reschedule, _Release}_chore implementation.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 4c54f9aeaca1d662a15ae037372d7399c37d1360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c54f9aeaca1d662a15ae0373… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 21 12:13:11 2017 +0100 msvcp140: Add {_Schedule,_Reschedule,_Release}_chore implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 12 ++++---- dlls/msvcp140/tests/msvcp140.c | 67 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 49 ++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c54f9aeaca1d662a15ae…

1 0

Piotr Caban : concrt140: Add missing i386 spec file entries.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 6288f0b435209da166408411c201dc5a6925bebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6288f0b435209da166408411c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 21 12:13:01 2017 +0100 concrt140: Add missing i386 spec file entries. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6288f0b435209da166408…

1 0

Daniel Lehman : msvcrt: Call unwind handlers on intermediate frames during virtual unwind.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 5a10705f0c57142c6317bfab660d6270116c332c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a10705f0c57142c6317bfab6… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 2 17:16:52 2016 -0700 msvcrt: Call unwind handlers on intermediate frames during virtual unwind. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 3a90a66..80780ae 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -470,14 +470,20 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block) { - ULONG64 orig_frame = rec->ExceptionInformation[1]; - const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; - int end_level = rec->ExceptionInformation[3]; EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; thread_data_t *data = msvcrt_get_thread_data(); frame_info *cur; - cxx_local_unwind(orig_frame, dispatch, descr, end_level); + if (rec->ExceptionFlags & EH_TARGET_UNWIND) + { + ULONG64 orig_frame = rec->ExceptionInformation[1]; + const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; + int end_level = rec->ExceptionInformation[3]; + + cxx_local_unwind(orig_frame, dispatch, orig_descr, end_level); + } + else + cxx_local_unwind(frame, dispatch, descr, -1); /* FIXME: we should only unregister frames registered by call_catch_block here */ for (cur = data->frame_info_head; cur; cur = cur->next)

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLRemoveDriver/ SQLRemoveDriverW.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 3136beda264d8f01f9bf772aca1289be30623e13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3136beda264d8f01f9bf772ac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 20 23:07:32 2017 +0000 odbccp32: Implement SQLRemoveDriver/SQLRemoveDriverW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 68 +++++++++++++++++++++++++++++++++++++++++----- dlls/odbccp32/tests/misc.c | 4 +-- 2 files changed, 63 insertions(+), 9 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 037a2a9..6a2c484 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1132,22 +1132,76 @@ BOOL WINAPI SQLRemoveDefaultDataSource(void) return FALSE; } -BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN, - LPDWORD lpdwUsageCount) +BOOL WINAPI SQLRemoveDriverW(LPCWSTR drivername, BOOL remove_dsn, LPDWORD usage_count) { + HKEY hkey; + DWORD usagecount = 1; + clear_errors(); - FIXME("%s %d %p\n", debugstr_w(lpszDriver), fRemoveDSN, lpdwUsageCount); - if (lpdwUsageCount) *lpdwUsageCount = 1; + TRACE("%s %d %p\n", debugstr_w(drivername), remove_dsn, usage_count); + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) + { + HKEY hkeydriver; + + if (RegOpenKeyW(hkey, drivername, &hkeydriver) == ERROR_SUCCESS) + { + DWORD size, type; + DWORD count; + + size = sizeof(usagecount); + RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); + TRACE("Usage count %d\n", usagecount); + count = usagecount - 1; + if (count) + { + if (RegSetValueExA(hkeydriver, "UsageCount", 0, REG_DWORD, (BYTE*)&count, sizeof(count)) != ERROR_SUCCESS) + ERR("Failed to write registry UsageCount key\n"); + } + + RegCloseKey(hkeydriver); + } + + if (usagecount) + usagecount--; + + if (!usagecount) + { + if (RegDeleteKeyW(hkey, drivername) != ERROR_SUCCESS) + ERR("Failed to delete registry key: %s\n", debugstr_w(drivername)); + + if (RegOpenKeyW(hkey, odbcdrivers, &hkeydriver) == ERROR_SUCCESS) + { + if(RegDeleteValueW(hkeydriver, drivername) != ERROR_SUCCESS) + ERR("Failed to delete registry value: %s\n", debugstr_w(drivername)); + RegCloseKey(hkeydriver); + } + } + + RegCloseKey(hkey); + } + + if (usage_count) + *usage_count = usagecount; + return TRUE; } BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN, LPDWORD lpdwUsageCount) { + WCHAR *driver; + BOOL ret; + clear_errors(); - FIXME("%s %d %p\n", debugstr_a(lpszDriver), fRemoveDSN, lpdwUsageCount); - if (lpdwUsageCount) *lpdwUsageCount = 1; - return TRUE; + TRACE("%s %d %p\n", debugstr_a(lpszDriver), fRemoveDSN, lpdwUsageCount); + + driver = SQLInstall_strdup(lpszDriver); + + ret = SQLRemoveDriverW(driver, fRemoveDSN, lpdwUsageCount); + + HeapFree(GetProcessHeap(), 0, driver); + return ret; } BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 5ba1eee..905468c 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -462,12 +462,12 @@ void test_SQLInstallDriverEx(void) cnt = 100; ret = SQLRemoveDriver("WINE ODBC Driver", FALSE, &cnt); ok(ret, "SQLRemoveDriver failed\n"); - todo_wine ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); + ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); cnt = 100; ret = SQLRemoveDriver("WINE ODBC Driver Path", FALSE, &cnt); ok(ret, "SQLRemoveDriver failed\n"); - todo_wine ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); + ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); } START_TEST(misc)

1 0

Hugh McMaster : regedit/tests: Add missing ok() check after RegOpenKeyExA( ).
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: e96056a026466083ebd332b9730476c178b6a859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96056a026466083ebd332b97… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 21 08:47:09 2017 +0000 regedit/tests: Add missing ok() check after RegOpenKeyExA(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index eacb583..b91df5a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -518,6 +518,7 @@ static void test_comments(void) ";comment\\\n" "\"Wine2\"=\"Line 2\"\n\n"); lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); verify_reg(hkey, "Wine1", REG_SZ, "Line 1", 7, 0); verify_reg(hkey, "Wine2", REG_SZ, "Line 2", 7, 0);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017