winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
December 2009
----- 2025 -----
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1233 discussions
Start a n
N
ew thread
Nikolay Sivov : comctl32/updown: Specify all styles explicitly in tests.
by Alexandre Julliard
03 Dec '09
03 Dec '09
Module: wine Branch: master Commit: b2d89f4823924b27b0894379268ee9bca00a2ef2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b2d89f4823924b27b08943792…
Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 3 11:01:45 2009 +0300 comctl32/updown: Specify all styles explicitly in tests. --- dlls/comctl32/tests/updown.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 85452ae..c0e381f 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -287,7 +287,7 @@ static HWND create_updown_control(DWORD style) RECT rect; GetClientRect(parent_wnd, &rect); - updown = CreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE | UDS_ALIGNRIGHT | style, + updown = CreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE | style, 0, 0, rect.right, rect.bottom, parent_wnd, 1, GetModuleHandleA(NULL), edit, 100, 0, 50); if (!updown) return NULL; @@ -304,7 +304,7 @@ static void test_updown_pos(void) HWND updown; int r; - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -365,7 +365,7 @@ static void test_updown_pos32(void) int r; int low, high; - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -437,7 +437,7 @@ static void test_updown_buddy(void) { HWND updown, buddyReturn; - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -462,7 +462,7 @@ static void test_updown_base(void) int r; CHAR text[10]; - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -499,7 +499,7 @@ static void test_updown_base(void) DestroyWindow(updown); /* switch base with buddy attached */ - updown = create_updown_control(UDS_SETBUDDYINT); + updown = create_updown_control(UDS_SETBUDDYINT | UDS_ALIGNRIGHT); r = SendMessage(updown, UDM_SETPOS, 0, 10); expect(50, r); @@ -523,7 +523,7 @@ static void test_updown_unicode(void) HWND updown; int r; - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -562,7 +562,7 @@ static void test_updown_create(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); ok(updown != NULL, "Failed to create updown control\n"); ok_sequence(sequences, PARENT_SEQ_INDEX, add_updown_to_parent_seq, "add updown control to parent", TRUE); ok_sequence(sequences, EDIT_SEQ_INDEX, add_updown_with_edit_seq, "add updown control with edit", FALSE); @@ -587,7 +587,7 @@ static void test_UDS_SETBUDDYINT(void) SetWindowTextA(edit, text); /* creating without UDS_SETBUDDYINT */ - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); /* try to set UDS_SETBUDDYINT after creation */ style = GetWindowLongA(updown, GWL_STYLE); SetWindowLongA(updown, GWL_STYLE, style | UDS_SETBUDDYINT); @@ -599,7 +599,7 @@ static void test_UDS_SETBUDDYINT(void) DestroyWindow(updown); /* creating with UDS_SETBUDDYINT */ - updown = create_updown_control(UDS_SETBUDDYINT); + updown = create_updown_control(UDS_SETBUDDYINT | UDS_ALIGNRIGHT); GetWindowTextA(edit, text, sizeof(text)/sizeof(CHAR)); /* 50 is initial value here */ ok(lstrcmpA(text, "50") == 0, "Expected '50', got '%s'\n", text);
1
0
0
0
Henri Verbeet : d3d8: Directly store a wined3d stateblock in the stateblock handle.
by Alexandre Julliard
03 Dec '09
03 Dec '09
Module: wine Branch: master Commit: 8151963f4e39e07682bb29fa76b5abe2aa654f4b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8151963f4e39e07682bb29fa7…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:23 2009 +0100 d3d8: Directly store a wined3d stateblock in the stateblock handle. IDirect3DStateBlock8Impl doesn't actually do anything useful. --- dlls/d3d8/Makefile.in | 1 - dlls/d3d8/d3d8_private.h | 61 ---------------------- dlls/d3d8/device.c | 72 ++++++++++--------------- dlls/d3d8/stateblock.c | 128 ---------------------------------------------- 4 files changed, 29 insertions(+), 233 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=8151963f4e39e07682bb2…
1
0
0
0
Henri Verbeet : dxgi/tests: Add some tests for IDXGIObject::GetParent().
by Alexandre Julliard
03 Dec '09
03 Dec '09
Module: wine Branch: master Commit: 09dd10e7f5c0b0133a1d7dede4a1809aa5690a7c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=09dd10e7f5c0b0133a1d7dede…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:22 2009 +0100 dxgi/tests: Add some tests for IDXGIObject::GetParent(). --- dlls/dxgi/tests/device.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 12893b1..491616c 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -121,6 +121,49 @@ static void test_create_surface(IDXGIDevice *device) IDXGISurface_Release(surface); } +static void test_parents(IDXGIDevice *device) +{ + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIOutput *output; + IUnknown *parent; + HRESULT hr; + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Adapter has not outputs, skipping output tests.\n"); + } + else + { + ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); + + hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&parent); + IDXGIOutput_Release(output); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(parent == (IUnknown *)adapter, "Got parent %p, expected %p.\n", parent, adapter); + IUnknown_Release(parent); + } + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + + hr = IDXGIFactory_GetParent(factory, &IID_IUnknown, (void **)&parent); + ok(hr == E_NOINTERFACE, "GetParent returned %#x, expected %#x.\n", hr, E_NOINTERFACE); + ok(parent == NULL, "Got parent %p, expected %p.\n", parent, NULL); + IDXGIFactory_Release(factory); + + hr = IDXGIDevice_GetParent(device, &IID_IDXGIAdapter, (void **)&parent); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(parent == (IUnknown *)adapter, "Got parent %p, expected %p.\n", parent, adapter); + IUnknown_Release(parent); + + IDXGIAdapter_Release(adapter); +} + START_TEST(device) { HMODULE d3d10core = LoadLibraryA("d3d10core.dll"); @@ -143,6 +186,7 @@ START_TEST(device) test_device_interfaces(device); test_create_surface(device); + test_parents(device); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left\n", refcount);
1
0
0
0
Henri Verbeet : dxgi: Implement IDXGIFactory::GetParent().
by Alexandre Julliard
03 Dec '09
03 Dec '09
Module: wine Branch: master Commit: 3543e3d8cc047b4f462680d74d025c49db6fb3bd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3543e3d8cc047b4f462680d74…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:21 2009 +0100 dxgi: Implement IDXGIFactory::GetParent(). --- dlls/dxgi/factory.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 33c1576..150e40c 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -110,9 +110,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IWineDXGIFactory *i static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IWineDXGIFactory *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + WARN("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); - return E_NOTIMPL; + *parent = NULL; + + return E_NOINTERFACE; } /* IDXGIFactory methods */
1
0
0
0
Henri Verbeet : dxgi: Implement IDXGIDevice::GetParent().
by Alexandre Julliard
03 Dec '09
03 Dec '09
Module: wine Branch: master Commit: bfdd5df7f0038796ffa37f23fa617cf4c4cafed7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bfdd5df7f0038796ffa37f23f…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:20 2009 +0100 dxgi: Implement IDXGIDevice::GetParent(). --- dlls/dxgi/device.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 9741d0e..8562d67 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -112,9 +112,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetPrivateData(IWineDXGIDevice *ifa static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + IDXGIAdapter *adapter; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); + + hr = IDXGIDevice_GetAdapter(iface, &adapter); + if (FAILED(hr)) + { + ERR("Failed to get adapter, hr %#x.\n", hr); + return hr; + } + + hr = IDXGIAdapter_QueryInterface(adapter, riid, parent); + IDXGIAdapter_Release(adapter); + + return hr; } /* IDXGIDevice methods */
1
0
0
0
Henri Verbeet : dxgi: Implement IDXGIOutput::GetParent().
by Alexandre Julliard
03 Dec '09
03 Dec '09
Module: wine Branch: master Commit: aa85b4c61d9b4021c99378c2746b2743da76a753 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aa85b4c61d9b4021c99378c27…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:19 2009 +0100 dxgi: Implement IDXGIOutput::GetParent(). --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 3 ++- dlls/dxgi/output.c | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 1efbec9..d13e3e1 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -189,7 +189,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IDXGIFactory *parent, UI { return E_OUTOFMEMORY; } - dxgi_output_init(output); + dxgi_output_init(output, adapter); adapter->output = (IDXGIOutput *)output; return S_OK; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 46b6f43..2929534 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -102,9 +102,10 @@ struct dxgi_output { const struct IDXGIOutputVtbl *vtbl; LONG refcount; + struct dxgi_adapter *adapter; }; -void dxgi_output_init(struct dxgi_output *output) DECLSPEC_HIDDEN; +void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index c3f8289..5b83427 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -98,9 +98,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface, static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + struct dxgi_output *This = (struct dxgi_output *)iface; - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); + + return IDXGIAdapter_QueryInterface((IDXGIAdapter *)This->adapter, riid, parent); } /* IDXGIOutput methods */ @@ -217,8 +219,9 @@ static const struct IDXGIOutputVtbl dxgi_output_vtbl = dxgi_output_GetFrameStatistics, }; -void dxgi_output_init(struct dxgi_output *output) +void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { output->vtbl = &dxgi_output_vtbl; output->refcount = 1; + output->adapter = adapter; }
1
0
0
0
Andrew Nguyen : shlwapi: The third parameter of UrlCombineA/ W is an output parameter.
by Alexandre Julliard
03 Dec '09
03 Dec '09
Module: wine Branch: master Commit: 77933a925b2bb652d38db0a57710f48e73901089 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=77933a925b2bb652d38db0a57…
Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Dec 3 03:20:08 2009 -0600 shlwapi: The third parameter of UrlCombineA/W is an output parameter. --- dlls/shlwapi/shlwapi.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 1a79174..a8e7428 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -810,8 +810,8 @@ @ stdcall UrlApplySchemeW(wstr ptr ptr long) @ stdcall UrlCanonicalizeA(str ptr ptr long) @ stdcall UrlCanonicalizeW(wstr ptr ptr long) -@ stdcall UrlCombineA(str str str ptr long) -@ stdcall UrlCombineW(wstr wstr wstr ptr long) +@ stdcall UrlCombineA(str str ptr ptr long) +@ stdcall UrlCombineW(wstr wstr ptr ptr long) @ stdcall UrlCompareA(str str long) @ stdcall UrlCompareW(wstr wstr long) @ stdcall UrlCreateFromPathA(str ptr ptr long)
1
0
0
0
Marcus Meissner : winspool.drv: Check ptr for being NULL (Coverity).
by Alexandre Julliard
03 Dec '09
03 Dec '09
Module: wine Branch: master Commit: faf1485e4e0744af0bc6119f0d680a8ab025b08e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=faf1485e4e0744af0bc6119f0…
Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 3 10:18:19 2009 +0100 winspool.drv: Check ptr for being NULL (Coverity). --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ad99988..8e4d714 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3337,7 +3337,7 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, if (ptr && ((DEVMODEA*)ptr)->dmSize < sizeof(DEVMODEA)) ((DEVMODEA*)ptr)->dmSize = sizeof(DEVMODEA); sz += (CCHDEVICENAME + CCHFORMNAME); - if(buflen >= sz) { + if (ptr && (buflen >= sz)) { DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr); memcpy(ptr, dmW, sz); HeapFree(GetProcessHeap(),0,dmW);
1
0
0
0
Stefan Dösinger : wined3d: Remove needless NULL checks (coverity).
by Alexandre Julliard
03 Dec '09
03 Dec '09
Module: wine Branch: master Commit: 6a1933920767c953445b97216f7a27af4ea07924 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6a1933920767c953445b97216…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 2 10:44:55 2009 +0100 wined3d: Remove needless NULL checks (coverity). --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 221f16e..d75c5e9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4053,7 +4053,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; TRACE("(%p)->(%d, %d, %p, %p, %08x\n", iface, dstx, dsty, Source, rsrc, trans); - if ( (This->Flags & SFLAG_LOCKED) || ((srcImpl != NULL) && (srcImpl->Flags & SFLAG_LOCKED))) + if ( (This->Flags & SFLAG_LOCKED) || (srcImpl->Flags & SFLAG_LOCKED)) { WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n"); return WINEDDERR_SURFACEBUSY; @@ -4061,14 +4061,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD if(myDevice->inScene && (iface == myDevice->stencilBufferTarget || - (Source && Source == myDevice->stencilBufferTarget))) { + (Source == myDevice->stencilBufferTarget))) { TRACE("Attempt to access the depth stencil surface in a BeginScene / EndScene pair, returning WINED3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; } /* Special cases for RenderTargets */ if( (This->resource.usage & WINED3DUSAGE_RENDERTARGET) || - ( srcImpl && (srcImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) )) { + (srcImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) ) { RECT SrcRect, DstRect; DWORD Flags=0;
1
0
0
0
Paul Vriens : mshtml/tests: Run tests again on boxes with older IE.
by Alexandre Julliard
03 Dec '09
03 Dec '09
Module: wine Branch: master Commit: 5bc0dd711a6e4d9e6cfe8bc367ed8fbb769a4955 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5bc0dd711a6e4d9e6cfe8bc36…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 3 08:05:16 2009 +0100 mshtml/tests: Run tests again on boxes with older IE. --- dlls/mshtml/tests/htmldoc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 0be3021..ab1a0e0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4152,8 +4152,8 @@ static void test_cookies(IUnknown *unk) ok(hres == S_OK, "get_cookie failed: %08x\n", hres); if(str) { size = sizeof(buf)/sizeof(WCHAR); - b = InternetGetCookieExW(http_urlW, NULL, buf, &size, 0, NULL); - ok(b, "InternetGetCookieEx failed: %08x\n", GetLastError()); + b = InternetGetCookieW(http_urlW, NULL, buf, &size); + ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str), "cookie = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buf)); SysFreeString(str); } @@ -4167,8 +4167,8 @@ static void test_cookies(IUnknown *unk) ok(hres == S_OK, "get_cookie failed: %08x\n", hres); ok(str2 != NULL, "cookie = NULL\n"); size = sizeof(buf)/sizeof(WCHAR); - b = InternetGetCookieExW(http_urlW, NULL, buf, &size, 0, NULL); - ok(b, "InternetGetCookieEx failed: %08x\n", GetLastError()); + b = InternetGetCookieW(http_urlW, NULL, buf, &size); + ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); SysFreeString(str); @@ -4183,8 +4183,8 @@ static void test_cookies(IUnknown *unk) ok(hres == S_OK, "get_cookie failed: %08x\n", hres); ok(str2 != NULL, "cookie = NULL\n"); size = sizeof(buf)/sizeof(WCHAR); - b = InternetGetCookieExW(http_urlW, NULL, buf, &size, 0, NULL); - ok(b, "InternetGetCookieEx failed: %08x\n", GetLastError()); + b = InternetGetCookieW(http_urlW, NULL, buf, &size); + ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); SysFreeString(str);
1
0
0
0
← Newer
1
...
106
107
108
109
110
111
112
...
124
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
Results per page:
10
25
50
100
200