March 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : wordpad: Fall back to the default position if the saved position is off-screen.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: ff0a34e9c95b6c7fee8453ee30d36bda21c01713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0a34e9c95b6c7fee8453ee3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 21 22:59:13 2017 +0100 wordpad: Fall back to the default position if the saved position is off-screen. This condition is particularly easy to trigger when switching from a multi-head setup to a virtual desktop. Inspired by some fairly similar code in notepad. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0647a19..01a9da2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2731,6 +2731,9 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar HWND hRulerWnd; POINTL EditPoint; DWORD bMaximized; + MONITORINFO info; + HMONITOR monitor; + int x, y; static const WCHAR wszAccelTable[] = {'M','A','I','N','A','C','C','E','L', 'T','A','B','L','E','\0'}; @@ -2767,8 +2770,18 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar RegisterClassExW(&wc); registry_read_winrect(&rc); + monitor = MonitorFromRect(&rc, MONITOR_DEFAULTTOPRIMARY); + info.cbSize = sizeof(info); + GetMonitorInfoW(monitor, &info); + + x = rc.left; + y = rc.top; + IntersectRect(&info.rcWork, &info.rcWork, &rc); + if (IsRectEmpty(&info.rcWork)) + x = y = CW_USEDEFAULT; + hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_CLIPCHILDREN|WS_OVERLAPPEDWINDOW, - rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, NULL, NULL, hInstance, NULL); + x, y, rc.right - rc.left, rc.bottom - rc.top, NULL, NULL, hInstance, NULL); registry_read_maximized(&bMaximized); if ((nCmdShow == SW_SHOWNORMAL || nCmdShow == SW_SHOWDEFAULT) && bMaximized)

1 0

Józef Kucia : d3d11: Avoid spurious FIXME messages about unhandled DXBC chunks.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: cac8f8dc42864eae7f28322790f1c94958b045dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac8f8dc42864eae7f2832279… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 22 09:40:54 2017 +0100 d3d11: Avoid spurious FIXME messages about unhandled DXBC chunks. 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/inputlayout.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 7604f05..620e663 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -28,15 +28,10 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * { struct wined3d_shader_signature *is = ctx; - switch(tag) - { - case TAG_ISGN: - return shader_parse_signature(data, data_size, is); + if (tag != TAG_ISGN) + return S_OK; - default: - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); - return S_OK; - } + return shader_parse_signature(data, data_size, is); } static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEMENT_DESC *element_descs,

1 0

Gijs Vermeulen : msvcp100: Add stub for Concurrency:: is_current_task_group_canceling.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 7f1044f212447c6ab520e87cc929d8f3484146be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1044f212447c6ab520e87cc… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Mar 22 10:55:17 2017 +0100 msvcp100: Add stub for Concurrency::is_current_task_group_canceling. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++++++++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 51ac8fe..9aa59be 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -477,7 +477,7 @@ @ stub ?from_numa_node(a)location@Concurrency@@SA?AV12(a)G@Z @ stub -arch=i386 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QBEJXZ @ stub -arch=win64 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QEBAJXZ -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ @ thiscall -arch=i386 ?lock(a)critical_section@Concurrency@@QAEXXZ(ptr) msvcr120.?lock(a)critical_section@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?lock(a)critical_section@Concurrency@@QEAAXXZ(ptr) msvcr120.?lock(a)critical_section@Concurrency@@QEAAXXZ @ thiscall -arch=win32 ?lock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?lock(a)reader_writer_lock@Concurrency@@QAEXXZ diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index a50c2f5..6841678 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2068,7 +2068,7 @@ @ extern ?is_bounded(a)_Num_base@std@@2_NB std_Num_base_is_bounded @ extern ?is_bounded(a)_Num_float_base@std@@2_NB std_Num_float_base_is_bounded @ extern ?is_bounded(a)_Num_int_base@std@@2_NB std_Num_int_base_is_bounded -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling @ extern ?is_exact(a)_Num_base@std@@2_NB std_Num_base_is_exact @ extern ?is_exact(a)_Num_float_base@std@@2_NB std_Num_float_base_is_exact @ extern ?is_exact(a)_Num_int_base@std@@2_NB std_Num_int_base_is_exact diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a7c3297..602cb2b 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2832,7 +2832,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling @ stub ?is_task_cancellation_requested(a)Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 61d4b32..a839575 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx @ cdecl -arch=win64 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index f649bbc..6bc6e5a 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ @ cdecl -arch=win64 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index fad324e..81a6f81 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1400,6 +1400,16 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) } #endif +/* ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ */ +MSVCP_bool __cdecl is_current_task_group_canceling(void *this) +{ + static int once; + + if (!once++) + FIXME("(%p) stub\n", this); + return FALSE; +} + #if _MSVCP_VER >= 140 typedef struct { void *unk0;

1 0

Akihiro Sagawa : winemac.drv: Use neutral language for the version resource.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 2680971ef4a175916ed6c8385d82b7e147170d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2680971ef4a175916ed6c8385… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:01 2017 +0900 winemac.drv: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/winemac.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/winemac.rc b/dlls/winemac.drv/winemac.rc index 863551e..629441b 100644 --- a/dlls/winemac.drv/winemac.rc +++ b/dlls/winemac.drv/winemac.rc @@ -43,6 +43,8 @@ STRINGTABLE STRING_MENU_ITEM_BRING_ALL_TO_FRONT "Bring All to Front" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Mac driver" #define WINE_FILENAME_STR "winemac.drv"

1 0

Akihiro Sagawa : wrc: Add support for translating version info through po files.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 52931c7523309e79b66e57cc1617ae3f2a401989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52931c7523309e79b66e57cc1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 23 00:00:57 2017 +0900 wrc: Add support for translating version info through po files. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/po.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52931c7523309e79b66e5…

1 0

Francois Gouget : testbot/WineRunTask: Clarify the timeout reporting.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: tools Branch: master Commit: 99a40fdf458c266c4524996fa99c8f8b31d93aea URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a40fdf458c266c4524996f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 22 01:16:22 2017 +0100 testbot/WineRunTask: Clarify the timeout reporting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index dc9e9e6..8799b0b 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -444,7 +444,7 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) my $ErrMessage = $TA->GetLastError(); if ($ErrMessage =~ /timed out waiting for the child process/) { - LogTaskError("The test timed out\n"); + LogTaskError("The task timed out\n"); $TestFailures = 1; $TimedOut = 1; } @@ -574,7 +574,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } elsif ($Rc == 258) { - # This is a timeout + # This is a timeout. Those are already reported based on the + # done line. $LogFailures++; } elsif ($LineFailures == 0 and $Rc != 0)

1 0

Francois Gouget : testbot/WineRunTask: Fix handling of tests with no argument.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: tools Branch: master Commit: 106bdce720415a6626cc3675d61e96b16dbfbd4f URL: http://source.winehq.org/git/tools.git/?a=commit;h=106bdce720415a6626cc3675… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 22 01:16:48 2017 +0100 testbot/WineRunTask: Fix handling of tests with no argument. TestLauncher always shows the first argument as the test unit name. If there is no argument the test unit name will be an empty string and yet the test will succeed if there is only one test unit for that dll. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 8799b0b..d364777 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -461,13 +461,14 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) chmod 0664, $FullLogFileName; if (open(my $LogFile, "<", $FullLogFileName)) { - # Note that for the TestBot we don't really care about the todos and skips + # There is more than one test unit when running the full test suite so keep + # track of the current one. Also note that for the TestBot we don't really + # care about the todos and skips my ($CurrentDll, $CurrentUnit, $LineFailures, $SummaryFailures) = ("", "", 0, 0); my ($CurrentIsPolluted, %CurrentPids, $LogFailures); foreach my $Line (<$LogFile>) { - # There may be more than one summary line due to child processes - if ($Line =~ m%([_.a-z0-9]+):([_a-z0-9]+) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) + if ($Line =~ m%([_.a-z0-9]+):([_a-z0-9]*) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) { my ($Dll, $Unit) = ($1, $2); if ($CurrentDll ne "") @@ -519,9 +520,12 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) { my ($Pid, $Unit, $Todo, $Failures) = ($1, $2, $3, $4); - # TestLauncher uses the wrong name in its test summary line - if ($Unit eq $CurrentUnit or $Unit eq $CurrentDll) + # Dlls that have only one test unit will run it even if there is + # no argument. Also TestLauncher uses the wrong name in its test + # summary line when skipping tests. + if ($Unit eq $CurrentUnit or $CurrentUnit eq "" or $Unit eq $CurrentDll) { + # There may be more than one summary line due to child processes $CurrentPids{$Pid || 0} = 1; $SummaryFailures += $Failures; } @@ -535,7 +539,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } } } - elsif ($Line =~ /^([_.a-z0-9]+):([_a-z0-9]+)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/) + elsif ($Line =~ /^([_.a-z0-9]+):([_a-z0-9]*)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4);

1 0

Alex Henrie : ntdll: Don' t report false memory statistics for other processes.
by Alexandre Julliard March 21, 2017

March 21, 2017

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

Alistair Leslie-Hughes : odbccp32: Implement SQLRemoveDriver/ SQLRemoveDriverW.
by Alexandre Julliard March 21, 2017

March 21, 2017

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

Henri Verbeet : wined3d: Merge surface_blt_to_drawable() into surface_load_drawable().
by Alexandre Julliard March 21, 2017

March 21, 2017

Module: wine Branch: master Commit: 5ab99b1643a7a26db5b17a14fcfe2a1f98bb7785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab99b1643a7a26db5b17a14f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:14 2017 +0100 wined3d: Merge surface_blt_to_drawable() into surface_load_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 008ca47..94ec035 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2098,29 +2098,6 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW rect->bottom = drawable_height - rect->bottom; } -/* Context activation is done by the caller. */ -static void surface_blt_to_drawable(struct wined3d_device *device, - struct wined3d_context *context, enum wined3d_texture_filter_type filter, - struct wined3d_surface *src_surface, const RECT *src_rect_in, - struct wined3d_surface *dst_surface, const RECT *dst_rect_in) -{ - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *dst_texture = dst_surface->container; - struct wined3d_surface *restore_rt = NULL; - - restore_rt = context_get_rt_surface(context); - if (restore_rt != dst_surface) - context = context_acquire(device, dst_texture, dst_sub_resource_idx); - else - restore_rt = NULL; - - device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, - src_surface, src_rect_in, dst_surface, dst_rect_in, NULL, filter); - - if (restore_rt) - context_restore(context, restore_rt); -} - HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) { struct wined3d_resource *resource = &s->container->resource; @@ -2337,6 +2314,8 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; + struct wined3d_surface *restore_rt = NULL; + struct wined3d_device *device; RECT r; if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) @@ -2354,10 +2333,20 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, return FALSE; } + device = texture->resource.device; + restore_rt = context_get_rt_surface(context); + if (restore_rt != surface) + context = context_acquire(device, texture, sub_resource_idx); + else + restore_rt = NULL; + surface_get_rect(surface, NULL, &r); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - surface_blt_to_drawable(texture->resource.device, context, - WINED3D_TEXF_POINT, surface, &r, surface, &r); + device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, + surface, &r, surface, &r, NULL, WINED3D_TEXF_POINT); + + if (restore_rt) + context_restore(context, restore_rt); return TRUE; }

1 0