wine-commits July 2014

wine-commits@winehq.org

2 participants
287 discussions

Ken Thomases : ntdll: In find_file_in_dir(), don't test directory entries' short names if the target name isn't a short name.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: a14ed527d858e22cc754a5513eabf7c250eec7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14ed527d858e22cc754a5513… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 28 12:58:23 2014 -0500 ntdll: In find_file_in_dir(), don't test directory entries' short names if the target name isn't a short name. hash_short_file_name() will always create a short name of at least 8 characters with the 5th being a tilde (~). If the target name isn't of that form, then it can never match any short name constructed from the directory entries. --- dlls/ntdll/directory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 04a5b75..a2796b2 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2250,6 +2250,9 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i str.Length = length * sizeof(WCHAR); str.MaximumLength = str.Length; is_name_8_dot_3 = RtlIsNameLegalDOS8Dot3( &str, NULL, &spaces ) && !spaces; +#ifndef VFAT_IOCTL_READDIR_BOTH + is_name_8_dot_3 = is_name_8_dot_3 && length >= 8 && name[4] == '~'; +#endif if (!is_name_8_dot_3 && !get_dir_case_sensitivity( unix_name )) goto not_found;

1 0

Nikolay Sivov : dwrite: Added some layout tests, simplify debug output for text ranges.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 1c23bf04c77fd3f7078c2d836e5c5c39c0ee6280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c23bf04c77fd3f7078c2d836… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 30 19:21:36 2014 +0400 dwrite: Added some layout tests, simplify debug output for text ranges. --- dlls/dwrite/analyzer.c | 2 - dlls/dwrite/dwrite_private.h | 6 +++ dlls/dwrite/font.c | 2 - dlls/dwrite/layout.c | 26 +++++------ dlls/dwrite/tests/layout.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c23bf04c77fd3f7078c2…

1 0

Andrei Slăvoiu : wined3d: Replace vendor specific callbacks with generic code that uses vendor specific renderer string tables.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 01b2b3074d60e021c5ae53ba0e94cbfde19a2085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b2b3074d60e021c5ae53ba0… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Mon Jul 28 23:06:52 2014 +0300 wined3d: Replace vendor specific callbacks with generic code that uses vendor specific renderer string tables. --- dlls/wined3d/directx.c | 971 ++++++++++++++++++++++--------------------------- 1 file changed, 445 insertions(+), 526 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01b2b3074d60e021c5ae5…

1 0

Andrei Slăvoiu : wined3d: Make the card selection for AMD binary driver use arrays only.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 1e7c5d8ca4e1eb6cb7a79258a195a0ed20aee807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7c5d8ca4e1eb6cb7a79258a… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sat Jul 26 21:24:32 2014 +0300 wined3d: Make the card selection for AMD binary driver use arrays only. --- dlls/wined3d/directx.c | 53 +++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 222cc48..e67d985 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1900,6 +1900,26 @@ static enum wined3d_pci_device select_card_amd_binary(const char *gl_renderer) {"HD 3400", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ {"HD 2400", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ {"HD 2350", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + /* Radeon R5xx */ + {"X1950", CARD_AMD_RADEON_X1600}, + {"X1900", CARD_AMD_RADEON_X1600}, + {"X1800", CARD_AMD_RADEON_X1600}, + {"X1650", CARD_AMD_RADEON_X1600}, + {"X1600", CARD_AMD_RADEON_X1600}, + /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300/X2500/HD2300 (lowend R5xx) + * Note X2300/X2500/HD2300 are R5xx GPUs with a 2xxx naming but they are still DX9-only */ + {"HD 2300", CARD_AMD_RADEON_X700}, + {"X2500", CARD_AMD_RADEON_X700}, + {"X2300", CARD_AMD_RADEON_X700}, + {"X1550", CARD_AMD_RADEON_X700}, + {"X1450", CARD_AMD_RADEON_X700}, + {"X1400", CARD_AMD_RADEON_X700}, + {"X1300", CARD_AMD_RADEON_X700}, + {"X850", CARD_AMD_RADEON_X700}, + {"X800", CARD_AMD_RADEON_X700}, + {"X700", CARD_AMD_RADEON_X700}, + /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400 MHz */ + {"Radeon Xpress", CARD_AMD_RADEON_XPRESS_200M}, }; for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) @@ -1908,39 +1928,6 @@ static enum wined3d_pci_device select_card_amd_binary(const char *gl_renderer) return cards[i].id; } - /* Radeon R5xx */ - if (strstr(gl_renderer, "X1600") - || strstr(gl_renderer, "X1650") - || strstr(gl_renderer, "X1800") - || strstr(gl_renderer, "X1900") - || strstr(gl_renderer, "X1950")) - { - return CARD_AMD_RADEON_X1600; - } - - /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300/X2500/HD2300 (lowend R5xx) - * Note X2300/X2500/HD2300 are R5xx GPUs with a 2xxx naming but they are still DX9-only */ - if (strstr(gl_renderer, "X700") - || strstr(gl_renderer, "X800") - || strstr(gl_renderer, "X850") - || strstr(gl_renderer, "X1300") - || strstr(gl_renderer, "X1400") - || strstr(gl_renderer, "X1450") - || strstr(gl_renderer, "X1550") - || strstr(gl_renderer, "X2300") - || strstr(gl_renderer, "X2500") - || strstr(gl_renderer, "HD 2300") - ) - { - return CARD_AMD_RADEON_X700; - } - - /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400 MHz */ - if (strstr(gl_renderer, "Radeon Xpress")) - { - return CARD_AMD_RADEON_XPRESS_200M; - } - return PCI_DEVICE_NONE; }

1 0

Andrei Slăvoiu : wined3d: Make the card selection for Nvidia binary driver use arrays only.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 47bec5eba0334f06226c36cbea00ca64b6dbd5f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bec5eba0334f06226c36cbe… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Mon Jul 28 23:06:47 2014 +0300 wined3d: Make the card selection for Nvidia binary driver use arrays only. --- dlls/wined3d/directx.c | 82 +++++++++++++++----------------------------------- 1 file changed, 25 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a84b85..222cc48 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1784,6 +1784,31 @@ static enum wined3d_pci_device select_card_nvidia_binary(const char *gl_renderer {"6700", CARD_NVIDIA_GEFORCE_6600GT}, /* Geforce 6 - midend */ {"6610", CARD_NVIDIA_GEFORCE_6600GT}, /* Geforce 6 - midend */ {"6600", CARD_NVIDIA_GEFORCE_6600GT}, /* Geforce 6 - midend */ + /* Direct3D 9 SM2 */ + {"Quadro FX", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ + {"5950", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ + {"5900", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ + {"5800", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ + {"5750", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ + {"5700", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ + {"5650", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ + {"5600", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ + {"5500", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ + {"5300", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ + {"5250", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ + {"5200", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ + {"5100", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ + /* Direct3D 8 */ + {"Quadro4", CARD_NVIDIA_GEFORCE4_TI4200}, + {"GeForce4 Ti", CARD_NVIDIA_GEFORCE4_TI4200}, /* Geforce4 Ti4200/Ti4400/Ti4600/Ti4800 */ + /* Direct3D 7 */ + {"GeForce4 MX", CARD_NVIDIA_GEFORCE4_MX}, /* MX420/MX440/MX460/MX4000 */ + {"Quadro2 MXR", CARD_NVIDIA_GEFORCE2_MX}, + {"GeForce2 MX", CARD_NVIDIA_GEFORCE2_MX}, /* Geforce2 standard/MX100/MX200/MX400 */ + {"Quadro2", CARD_NVIDIA_GEFORCE2}, + {"GeForce2", CARD_NVIDIA_GEFORCE2}, /* Geforce2 GTS/Pro/Ti/Ultra */ + /* Direct3D 6 */ + {"TNT2", CARD_NVIDIA_RIVA_TNT2}, /* Riva TNT2 standard/M64/Pro/Ultra */ }; for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) @@ -1792,63 +1817,6 @@ static enum wined3d_pci_device select_card_nvidia_binary(const char *gl_renderer return cards[i].id; } - /* Direct3D 9 SM2 */ - /* GeforceFX - highend */ - if (strstr(gl_renderer, "5800") - || strstr(gl_renderer, "5900") - || strstr(gl_renderer, "5950") - || strstr(gl_renderer, "Quadro FX")) - { - return CARD_NVIDIA_GEFORCEFX_5800; - } - - /* GeforceFX - midend */ - if (strstr(gl_renderer, "5600") - || strstr(gl_renderer, "5650") - || strstr(gl_renderer, "5700") - || strstr(gl_renderer, "5750")) - { - return CARD_NVIDIA_GEFORCEFX_5600; - } - - /* GeforceFX - lowend */ - if (strstr(gl_renderer, "5100") - || strstr(gl_renderer, "5200") - || strstr(gl_renderer, "5250") - || strstr(gl_renderer, "5300") - || strstr(gl_renderer, "5500")) - { - return CARD_NVIDIA_GEFORCEFX_5200; /* GeforceFX 5100/5200/5250/5300/5500 */ - } - - /* Direct3D 8 */ - if (strstr(gl_renderer, "GeForce4 Ti") || strstr(gl_renderer, "Quadro4")) - { - return CARD_NVIDIA_GEFORCE4_TI4200; /* Geforce4 Ti4200/Ti4400/Ti4600/Ti4800, Quadro4 */ - } - - /* Direct3D 7 */ - if (strstr(gl_renderer, "GeForce4 MX")) - { - return CARD_NVIDIA_GEFORCE4_MX; /* MX420/MX440/MX460/MX4000 */ - } - - if (strstr(gl_renderer, "GeForce2 MX") || strstr(gl_renderer, "Quadro2 MXR")) - { - return CARD_NVIDIA_GEFORCE2_MX; /* Geforce2 standard/MX100/MX200/MX400, Quadro2 MXR */ - } - - if (strstr(gl_renderer, "GeForce2") || strstr(gl_renderer, "Quadro2")) - { - return CARD_NVIDIA_GEFORCE2; /* Geforce2 GTS/Pro/Ti/Ultra, Quadro2 */ - } - - /* Direct3D 6 */ - if (strstr(gl_renderer, "TNT2")) - { - return CARD_NVIDIA_RIVA_TNT2; /* Riva TNT2 standard/M64/Pro/Ultra */ - } - return PCI_DEVICE_NONE; }

1 0

Thomas Faber : quartz: Destroy BaseRenderer in NullRendererInner_Release.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 0c9b8322297cafb218c7ff3a14b99491bf3594f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9b8322297cafb218c7ff3a1… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Jul 28 12:10:01 2014 +0200 quartz: Destroy BaseRenderer in NullRendererInner_Release. --- dlls/quartz/nullrenderer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 7befc46..dbbdd4f 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -128,12 +128,11 @@ static ULONG WINAPI NullRendererInner_AddRef(IUnknown *iface) static ULONG WINAPI NullRendererInner_Release(IUnknown *iface) { NullRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); + ULONG refCount = BaseRendererImpl_Release(&This->renderer.filter.IBaseFilter_iface); if (!refCount) { TRACE("Destroying Null Renderer\n"); - BaseFilter_Destroy(&This->renderer.filter); CoTaskMemFree(This); }

1 0

Thomas Faber : quartz: Fix IEnumFiltersImpl memory leak.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 1236f52d1922b5f1858a469d3305c536cc0ebf64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1236f52d1922b5f1858a469d3… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 00:20:10 2014 +0200 quartz: Fix IEnumFiltersImpl memory leak. --- dlls/quartz/enumfilters.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index 735fd79..ea2af2a 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -117,6 +117,7 @@ static ULONG WINAPI IEnumFiltersImpl_Release(IEnumFilters * iface) if (!refCount) { IGraphVersion_Release(This->pVersionSource); + CoTaskMemFree(This); return 0; } else

1 0

Gerald Pfeifer : scrrun: Add a check for empty string in start_enumeration.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 3b8e7d4dac6f079f1732518d542ca7f7c0c4da41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b8e7d4dac6f079f1732518d5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 26 00:34:47 2014 +0200 scrrun: Add a check for empty string in start_enumeration. --- dlls/scrrun/filesystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 434b402..f6f7703 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1130,7 +1130,7 @@ static HANDLE start_enumeration(const WCHAR *path, WIN32_FIND_DATAW *data, BOOL strcpyW(pathW, path); len = strlenW(pathW); - if (pathW[len-1] != '\\') + if (len && pathW[len-1] != '\\') strcatW(pathW, bsW); strcatW(pathW, allW); handle = FindFirstFileW(pathW, data);

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::navigate implementation.
by Alexandre Julliard 29 Jul '14

29 Jul '14

Module: wine Branch: master Commit: be2128fd059ec1e1786c70fda347d6ce37de2cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2128fd059ec1e1786c70fda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 28 23:56:43 2014 +0200 mshtml: Added IHTMLWindow2::navigate implementation. --- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/tests/nav_test.html | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fab227e..bc648f3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1010,8 +1010,10 @@ static HRESULT WINAPI HTMLWindow2_get_window(IHTMLWindow2 *iface, IHTMLWindow2 * static HRESULT WINAPI HTMLWindow2_navigate(IHTMLWindow2 *iface, BSTR url) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(url)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + + return navigate_url(This->outer_window, url, This->outer_window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLWindow2_put_onfocus(IHTMLWindow2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html index d106dfc..bc629a4 100644 --- a/dlls/mshtml/tests/nav_test.html +++ b/dlls/mshtml/tests/nav_test.html @@ -18,6 +18,7 @@ function nav_back_test() { } iframe.onload = function() { + iframe.onload = null; var href = iframe.contentWindow.location.href; ok(/.*blank2.html/.test(href), "Unexpected href " + href); next_test(); @@ -27,8 +28,24 @@ function nav_back_test() { subframe.src = "blank.html"; } +function window_navigate_test() { + external.trace("Runnint window.navigate() tests..."); + + var iframe = document.getElementById("testframe"); + + iframe.onload = function() { + iframe.onlod = null; + var href = iframe.contentWindow.location.href; + ok(href === "about:blank", "Unexpected href " + href); + next_test(); + } + + iframe.contentWindow.navigate("about:blank"); +} + var tests = [ nav_back_test, + window_navigate_test, function() { external.reportSuccess(); } ];

1 0

Thomas Faber : quartz: Destroy BaseOutputPin in FileAsyncReaderPin_Release.
by Alexandre Julliard 29 Jul '14

29 Jul '14

Module: wine Branch: master Commit: 7c5d0789d0616556e57253f4fcd0e54c326569a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5d0789d0616556e57253f4f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 11:39:55 2014 +0200 quartz: Destroy BaseOutputPin in FileAsyncReaderPin_Release. --- dlls/quartz/filesource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 96d83a1..84e4214 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -849,7 +849,7 @@ static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) CloseHandle(This->hFile); This->csList.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csList); - CoTaskMemFree(This); + BaseOutputPin_Destroy(&This->pin); return 0; } return refCount;

1 0

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 July 2014