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
July
June
May
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
August 2012
----- 2025 -----
July 2025
June 2025
May 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
2 participants
541 discussions
Start a n
N
ew thread
Henri Verbeet : winex11: Don' t set MWM decorations either for fullscreen virtual desktops.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: 13820b6f948b4447ed8d73e2e6975155441a8653 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=13820b6f948b4447ed8d73e2e…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 13 11:39:41 2012 +0200 winex11: Don't set MWM decorations either for fullscreen virtual desktops. --- dlls/winex11.drv/desktop.c | 5 +++++ dlls/winex11.drv/window.c | 5 +++-- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index c75c54c..66b1e11 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -203,6 +203,11 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam return TRUE; } +BOOL is_desktop_fullscreen(void) +{ + return screen_width == max_width && screen_height == max_height; +} + static void update_desktop_fullscreen( unsigned int width, unsigned int height) { Display *display = thread_display(); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b202586..46e2cdb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1063,8 +1063,9 @@ static void set_mwm_hints( Display *display, struct x11drv_win_data *data, DWORD if (data->hwnd == GetDesktopWindow()) { - mwm_hints.decorations = MWM_DECOR_TITLE | MWM_DECOR_BORDER | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE; - mwm_hints.functions = MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE; + if (is_desktop_fullscreen()) mwm_hints.decorations = 0; + else mwm_hints.decorations = MWM_DECOR_TITLE | MWM_DECOR_BORDER | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE; + mwm_hints.functions = MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE; } else { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 32d7772..59bc672 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -649,6 +649,7 @@ struct x11drv_mode_info extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; +BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN;
1
0
0
0
Jacek Caban : ole32: Added ISynchronizeHandle tests.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: b3b390d8acc7964bd4faa1eee3bac84200abb962 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b3b390d8acc7964bd4faa1eee…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:41:12 2012 +0200 ole32: Added ISynchronizeHandle tests. --- dlls/ole32/tests/marshal.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e0213b9..2baec4b 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2853,8 +2853,10 @@ static void test_globalinterfacetable(void) static void test_manualresetevent(void) { + ISynchronizeHandle *sync_handle; ISynchronize *psync1, *psync2; IUnknown *punk; + HANDLE handle; LONG ref; HRESULT hr; @@ -2887,6 +2889,17 @@ static void test_manualresetevent(void) ok(hr == S_OK, "Got 0x%08x\n", hr); ok(!!psync2, "Got NULL.\n"); ok(psync1 != psync2, "psync1 == psync2.\n"); + + hr = ISynchronize_QueryInterface(psync2, &IID_ISynchronizeHandle, (void**)&sync_handle); + ok(hr == S_OK, "QueryInterface(IID_ISynchronizeHandle) failed: %08x\n", hr); + + handle = NULL; + hr = ISynchronizeHandle_GetHandle(sync_handle, &handle); + ok(hr == S_OK, "GetHandle failed: %08x\n", hr); + ok(handle != NULL && handle != INVALID_HANDLE_VALUE, "handle = %p\n", handle); + + ISynchronizeHandle_Release(sync_handle); + hr = ISynchronize_Wait(psync2, 0, 5); ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr);
1
0
0
0
Jacek Caban : ole32: Added ISynchronizeHandle implementation.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: c6793a2e27d4e6ce093b23592fb59553f2da26ff URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c6793a2e27d4e6ce093b23592…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:41:02 2012 +0200 ole32: Added ISynchronizeHandle implementation. --- dlls/ole32/compobj.c | 63 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 51 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d0ae995..0055d15 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -464,7 +464,8 @@ static void COM_RevokeAllClasses(const struct apartment *apt) */ typedef struct ManualResetEvent { - ISynchronize ISynchronize_iface; + ISynchronize ISynchronize_iface; + ISynchronizeHandle ISynchronizeHandle_iface; LONG ref; HANDLE event; } MREImpl; @@ -477,22 +478,21 @@ static inline MREImpl *impl_from_ISynchronize(ISynchronize *iface) static HRESULT WINAPI ISynchronize_fnQueryInterface(ISynchronize *iface, REFIID riid, void **ppv) { MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p (%s, %p)\n", This, debugstr_guid(riid), ppv); - *ppv = NULL; - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ISynchronize)) - *ppv = This; - else + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ISynchronize)) { + *ppv = &This->ISynchronize_iface; + }else if(IsEqualGUID(riid, &IID_ISynchronizeHandle)) { + *ppv = &This->ISynchronizeHandle_iface; + }else { ERR("Unknown interface %s requested.\n", debugstr_guid(riid)); - - if(*ppv) - { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI ISynchronize_fnAddRef(ISynchronize *iface) @@ -552,6 +552,44 @@ static ISynchronizeVtbl vt_ISynchronize = { ISynchronize_fnReset }; +static inline MREImpl *impl_from_ISynchronizeHandle(ISynchronizeHandle *iface) +{ + return CONTAINING_RECORD(iface, MREImpl, ISynchronizeHandle_iface); +} + +static HRESULT WINAPI SynchronizeHandle_QueryInterface(ISynchronizeHandle *iface, REFIID riid, void **ppv) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + return ISynchronize_QueryInterface(&This->ISynchronize_iface, riid, ppv); +} + +static ULONG WINAPI SynchronizeHandle_AddRef(ISynchronizeHandle *iface) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + return ISynchronize_AddRef(&This->ISynchronize_iface); +} + +static ULONG WINAPI SynchronizeHandle_Release(ISynchronizeHandle *iface) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + return ISynchronize_Release(&This->ISynchronize_iface); +} + +static HRESULT WINAPI SynchronizeHandle_GetHandle(ISynchronizeHandle *iface, HANDLE *ph) +{ + MREImpl *This = impl_from_ISynchronizeHandle(iface); + + *ph = This->event; + return S_OK; +} + +static const ISynchronizeHandleVtbl SynchronizeHandleVtbl = { + SynchronizeHandle_QueryInterface, + SynchronizeHandle_AddRef, + SynchronizeHandle_Release, + SynchronizeHandle_GetHandle +}; + static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void **ppv) { MREImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MREImpl)); @@ -562,6 +600,7 @@ static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void This->ref = 1; This->ISynchronize_iface.lpVtbl = &vt_ISynchronize; + This->ISynchronizeHandle_iface.lpVtbl = &SynchronizeHandleVtbl; This->event = CreateEventW(NULL, TRUE, FALSE, NULL); hr = ISynchronize_QueryInterface(&This->ISynchronize_iface, iid, ppv);
1
0
0
0
Jacek Caban : ole32/tests: Use proper helpers for iface calls.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: df4f0272388f0480ce87da976ca86dd8fc3edbc8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=df4f0272388f0480ce87da976…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:40:46 2012 +0200 ole32/tests: Use proper helpers for iface calls. --- dlls/ole32/tests/dragdrop.c | 2 +- dlls/ole32/tests/hglobalstream.c | 2 +- dlls/ole32/tests/marshal.c | 18 ++++++------ dlls/ole32/tests/moniker.c | 2 +- dlls/ole32/tests/ole2.c | 54 +++++++++++++++++++------------------- dlls/ole32/tests/storage32.c | 18 ++++++------ 6 files changed, 48 insertions(+), 48 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=df4f0272388f0480ce87d…
1
0
0
0
Jacek Caban : ole32: Use proper helpers for iface calls.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: 153b94b3c5f71b4e8bfcf1d4344c14e27b070ef7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=153b94b3c5f71b4e8bfcf1d43…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:40:33 2012 +0200 ole32: Use proper helpers for iface calls. --- dlls/ole32/antimoniker.c | 5 ++--- dlls/ole32/classmoniker.c | 5 ++--- dlls/ole32/comcat.c | 2 +- dlls/ole32/compobj.c | 8 ++++---- dlls/ole32/compositemoniker.c | 5 ++--- dlls/ole32/datacache.c | 2 +- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/filemoniker.c | 2 +- dlls/ole32/ftmarshal.c | 2 +- dlls/ole32/ifs.c | 2 +- dlls/ole32/itemmoniker.c | 5 ++--- dlls/ole32/marshal.c | 4 ++-- dlls/ole32/moniker.c | 4 ++-- dlls/ole32/ole2.c | 9 +++------ dlls/ole32/oleobj.c | 2 +- dlls/ole32/pointermoniker.c | 2 +- dlls/ole32/rpc.c | 4 ++-- dlls/ole32/stubmanager.c | 2 +- 18 files changed, 30 insertions(+), 37 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=153b94b3c5f71b4e8bfcf…
1
0
0
0
Jacek Caban : oleaut32/tests: Use proper helpers for iface calls.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: 5a31c1a8814f7de78fe3430fa5a527c450c77f26 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5a31c1a8814f7de78fe3430fa…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:12:24 2012 +0200 oleaut32/tests: Use proper helpers for iface calls. --- dlls/oleaut32/tests/olefont.c | 2 +- dlls/oleaut32/tests/typelib.c | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 6fc1520..2482554 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -236,7 +236,7 @@ static HRESULT WINAPI FontEventsDisp_QueryInterface( { if (IsEqualIID(riid, &IID_IFontEventsDisp) || IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) { - IUnknown_AddRef(iface); + IFontEventsDisp_AddRef(iface); *ppvObject = iface; return S_OK; } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 631f6d8..85fd965 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1404,7 +1404,7 @@ static void test_CreateTypeLib(void) { hres = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); ok(hres == S_OK, "got %08x\n", hres); - hres = ICreateTypeLib_QueryInterface(createtl, &IID_ITypeLib, (void**)&tl); + hres = ICreateTypeLib2_QueryInterface(createtl, &IID_ITypeLib, (void**)&tl); ok(hres == S_OK, "got %08x\n", hres); hres = ITypeLib_GetTypeInfo(tl, 0, NULL); @@ -1443,10 +1443,10 @@ static void test_CreateTypeLib(void) { hres = ITypeLib_GetDocumentation(tl, 0, &name, NULL, NULL, NULL); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); - hres = ICreateTypeLib_SetName(createtl, typelibW); + hres = ICreateTypeLib2_SetName(createtl, typelibW); ok(hres == S_OK, "got %08x\n", hres); - hres = ICreateTypeLib_SetHelpFileName(createtl, helpfileW); + hres = ICreateTypeLib2_SetHelpFileName(createtl, helpfileW); ok(hres == S_OK, "got %08x\n", hres); hres = ITypeLib_GetDocumentation(tl, -1, NULL, NULL, NULL, NULL); @@ -1461,16 +1461,16 @@ static void test_CreateTypeLib(void) { SysFreeString(helpfile); /* invalid parameters */ - hres = ICreateTypeLib_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, &createti); ok(hres == E_INVALIDARG, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, NULL); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, NULL); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface1); @@ -1977,10 +1977,10 @@ static void test_CreateTypeLib(void) { ITypeInfo2_Release(ti2); ICreateTypeInfo_Release(createti); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); ok(hres == TYPE_E_NAMECONFLICT, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface2W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface2W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface2); @@ -2030,7 +2030,7 @@ static void test_CreateTypeLib(void) { VariantInit(&cust_data); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface3W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface3W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void**)&createti2); @@ -2116,7 +2116,7 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo2_Release(createti2); ICreateTypeInfo_Release(createti); - hres = ICreateTypeLib_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_AddRefTypeInfo(createti, interface1, &hreftype); @@ -2183,7 +2183,7 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo_Release(createti); - hres = ICreateTypeLib_CreateTypeInfo(createtl, dualW, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, dualW, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_SetTypeFlags(createti, TYPEFLAG_FDUAL); @@ -2967,18 +2967,18 @@ static void test_SetVarHelpContext(void) V_VT(&v) = VT_INT; V_INT(&v) = 1; U(desc).lpvarValue = &v; - hr = ICreateTypeInfo2_AddVarDesc(cti, 0, &desc); + hr = ICreateTypeInfo_AddVarDesc(cti, 0, &desc); ok(hr == S_OK, "got %08x\n", hr); - hr = ICreateTypeInfo2_SetVarHelpContext(cti, 0, 0); + hr = ICreateTypeInfo_SetVarHelpContext(cti, 0, 0); ok(hr == S_OK, "got %08x\n", hr); /* another time */ - hr = ICreateTypeInfo2_SetVarHelpContext(cti, 0, 1); + hr = ICreateTypeInfo_SetVarHelpContext(cti, 0, 1); ok(hr == S_OK, "got %08x\n", hr); /* wrong index now */ - hr = ICreateTypeInfo2_SetVarHelpContext(cti, 1, 0); + hr = ICreateTypeInfo_SetVarHelpContext(cti, 1, 0); ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); ICreateTypeInfo_Release(cti); @@ -3090,7 +3090,7 @@ static void test_SetVarDocString(void) V_VT(&v) = VT_INT; V_INT(&v) = 1; U(desc).lpvarValue = &v; - hr = ICreateTypeInfo2_AddVarDesc(cti, 0, &desc); + hr = ICreateTypeInfo_AddVarDesc(cti, 0, &desc); ok(hr == S_OK, "got %08x\n", hr); hr = ICreateTypeInfo_SetVarDocString(cti, 0, NULL); @@ -3104,7 +3104,7 @@ static void test_SetVarDocString(void) ok(hr == S_OK, "got %08x\n", hr); /* wrong index now */ - hr = ICreateTypeInfo2_SetVarDocString(cti, 1, doc1W); + hr = ICreateTypeInfo_SetVarDocString(cti, 1, doc1W); ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); ICreateTypeInfo_Release(cti);
1
0
0
0
Jacek Caban : inetcomm: Use proper iface call helpers.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: 1f60e14c78a44d9e4d889619dfc328a9e88b4df1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1f60e14c78a44d9e4d889619d…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:11:26 2012 +0200 inetcomm: Use proper iface call helpers. --- dlls/inetcomm/imaptransport.c | 14 +++++++------- dlls/inetcomm/mimeole.c | 6 +++--- dlls/inetcomm/pop3transport.c | 4 ++-- dlls/inetcomm/smtptransport.c | 4 ++-- dlls/inetcomm/tests/mimeole.c | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/inetcomm/imaptransport.c b/dlls/inetcomm/imaptransport.c index 4cef083..0da456e 100644 --- a/dlls/inetcomm/imaptransport.c +++ b/dlls/inetcomm/imaptransport.c @@ -50,7 +50,7 @@ static HRESULT WINAPI IMAPTransport_QueryInterface(IIMAPTransport *iface, REFIID IsEqualIID(riid, &IID_IIMAPTransport)) { *ppv = iface; - IUnknown_AddRef(iface); + IIMAPTransport_AddRef(iface); return S_OK; } *ppv = NULL; @@ -443,30 +443,30 @@ HRESULT WINAPI CreateIMAPTransport(IIMAPTransport **ppTransport) return S_OK; } -static HRESULT WINAPI IMAPTransportCF_QueryInterface(LPCLASSFACTORY iface, +static HRESULT WINAPI IMAPTransportCF_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppv) { *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { *ppv = iface; - IUnknown_AddRef(iface); + IClassFactory_AddRef(iface); return S_OK; } return E_NOINTERFACE; } -static ULONG WINAPI IMAPTransportCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI IMAPTransportCF_AddRef(IClassFactory *iface) { return 2; /* non-heap based object */ } -static ULONG WINAPI IMAPTransportCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI IMAPTransportCF_Release(IClassFactory *iface) { return 1; /* non-heap based object */ } -static HRESULT WINAPI IMAPTransportCF_CreateInstance(LPCLASSFACTORY iface, +static HRESULT WINAPI IMAPTransportCF_CreateInstance(IClassFactory *iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { HRESULT hr; @@ -489,7 +489,7 @@ static HRESULT WINAPI IMAPTransportCF_CreateInstance(LPCLASSFACTORY iface, return hr; } -static HRESULT WINAPI IMAPTransportCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +static HRESULT WINAPI IMAPTransportCF_LockServer(IClassFactory *iface, BOOL fLock) { FIXME("(%d), stub!\n",fLock); return S_OK; diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 8a1e3d4..ac4142a 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1448,7 +1448,7 @@ static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID rii IsEqualIID(riid, &IID_IMimeMessage)) { *ppv = iface; - IUnknown_AddRef(iface); + IMimeMessage_AddRef(iface); return S_OK; } @@ -2619,7 +2619,7 @@ static HRESULT WINAPI MimeSecurity_QueryInterface( IsEqualIID(riid, &IID_IMimeSecurity)) { *obj = iface; - IUnknown_AddRef(iface); + IMimeSecurity_AddRef(iface); return S_OK; } @@ -2807,7 +2807,7 @@ static HRESULT WINAPI MimeAlloc_QueryInterface( IsEqualIID(riid, &IID_IMimeAllocator)) { *obj = iface; - IUnknown_AddRef(iface); + IMimeAllocator_AddRef(iface); return S_OK; } diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index af7d1bf..bdae830 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -729,7 +729,7 @@ static HRESULT WINAPI POP3Transport_QueryInterface(IPOP3Transport *iface, REFIID IsEqualIID(riid, &IID_IPOP3Transport)) { *ppv = iface; - IUnknown_AddRef(iface); + IPOP3Transport_AddRef(iface); return S_OK; } *ppv = NULL; @@ -1139,7 +1139,7 @@ static HRESULT WINAPI POP3TransportCF_QueryInterface(LPCLASSFACTORY iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { *ppv = iface; - IUnknown_AddRef(iface); + IClassFactory_AddRef(iface); return S_OK; } return E_NOINTERFACE; diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index d17419f..c88ac9c 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -532,7 +532,7 @@ static HRESULT WINAPI SMTPTransport_QueryInterface(ISMTPTransport2 *iface, REFII IsEqualIID(riid, &IID_ISMTPTransport2)) { *ppv = iface; - IUnknown_AddRef(iface); + ISMTPTransport2_AddRef(iface); return S_OK; } *ppv = NULL; @@ -989,7 +989,7 @@ static HRESULT WINAPI SMTPTransportCF_QueryInterface(LPCLASSFACTORY iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { *ppv = iface; - IUnknown_AddRef(iface); + IClassFactory_AddRef(iface); return S_OK; } return E_NOINTERFACE; diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index a53ab23..389e267 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -314,7 +314,7 @@ static void test_CreateMessage(void) ok(count == 2, "got %d\n", count); CoTaskMemFree(body_list); - hr = IMimeMessage_GetCharset(body, &hcs); + hr = IMimeBody_GetCharset(body, &hcs); ok(hr == S_OK, "ret %08x\n", hr); todo_wine {
1
0
0
0
Jacek Caban : wscript: Use proper helpers for iface calls.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: e02c33164d186e219e23d8b111881c71bfc53909 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e02c33164d186e219e23d8b11…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:10:21 2012 +0200 wscript: Use proper helpers for iface calls. --- programs/wscript/main.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index d456e98..3d97bde 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -33,6 +33,20 @@ #include <wine/debug.h> #include <wine/unicode.h> +#ifdef _WIN64 + +#define IActiveScriptParse_Release IActiveScriptParse64_Release +#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText + +#else + +#define IActiveScriptParse_Release IActiveScriptParse32_Release +#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText + +#endif + WINE_DEFAULT_DEBUG_CHANNEL(wscript); static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0}; @@ -253,7 +267,7 @@ static HRESULT init_engine(IActiveScript *script, IActiveScriptParse *parser) if(FAILED(hres)) return FALSE; - hres = IActiveScriptParse64_InitNew(parser); + hres = IActiveScriptParse_InitNew(parser); if(FAILED(hres)) return FALSE; @@ -310,7 +324,7 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri return; } - hres = IActiveScriptParse64_ParseScriptText(parser, text, NULL, NULL, NULL, 1, 1, + hres = IActiveScriptParse_ParseScriptText(parser, text, NULL, NULL, NULL, 1, 1, SCRIPTTEXT_HOSTMANAGESSOURCE|SCRIPTITEM_ISVISIBLE, NULL, NULL); SysFreeString(text); if(FAILED(hres)) { @@ -406,7 +420,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm } IActiveScript_Release(script); - IUnknown_Release(parser); + IActiveScriptParse_Release(parser); CoUninitialize();
1
0
0
0
Nikolay Sivov : dwrite: Implement IDWriteBitmapRenderTarget_GetSize.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: c843e71ba57a89c5ba1a4ef8856aa4291cc9476c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c843e71ba57a89c5ba1a4ef88…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 13 07:51:38 2012 +0400 dwrite: Implement IDWriteBitmapRenderTarget_GetSize. --- dlls/dwrite/gdiinterop.c | 10 ++++++++-- dlls/dwrite/tests/font.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index c3bcc88..bac6e40 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -36,6 +36,7 @@ struct rendertarget { IDWriteBitmapRenderTarget IDWriteBitmapRenderTarget_iface; LONG ref; + SIZE size; HDC hdc; }; @@ -135,8 +136,10 @@ static HRESULT WINAPI rendertarget_SetCurrentTransform(IDWriteBitmapRenderTarget static HRESULT WINAPI rendertarget_GetSize(IDWriteBitmapRenderTarget *iface, SIZE *size) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); - FIXME("(%p)->(%p): stub\n", This, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, size); + *size = This->size; + return S_OK; } static HRESULT WINAPI rendertarget_Resize(IDWriteBitmapRenderTarget *iface, UINT32 width, UINT32 height) @@ -175,6 +178,9 @@ static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWrite This->IDWriteBitmapRenderTarget_iface.lpVtbl = &rendertargetvtbl; This->ref = 1; + This->size.cx = width; + This->size.cy = height; + This->hdc = CreateCompatibleDC(hdc); memset(bmi, 0, sizeof(bmibuf)); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 97cd477..ccaba88 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -158,6 +158,7 @@ static void test_CreateBitmapRenderTarget(void) DIBSECTION ds; HBITMAP hbm; HRESULT hr; + SIZE size; HDC hdc; int ret; @@ -168,6 +169,15 @@ static void test_CreateBitmapRenderTarget(void) hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target); EXPECT_HR(hr, S_OK); +if (0) /* crashes on native */ + hr = IDWriteBitmapRenderTarget_GetSize(target, NULL); + + size.cx = size.cy = -1; + hr = IDWriteBitmapRenderTarget_GetSize(target, &size); + EXPECT_HR(hr, S_OK); + ok(size.cx == 0, "got %d\n", size.cx); + ok(size.cy == 0, "got %d\n", size.cy); + target2 = NULL; hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target2); EXPECT_HR(hr, S_OK); @@ -213,6 +223,12 @@ static void test_CreateBitmapRenderTarget(void) ok(ds.dsBm.bmBitsPixel == 32, "got %d\n", ds.dsBm.bmBitsPixel); ok(ds.dsBm.bmBits != NULL, "got %p\n", ds.dsBm.bmBits); + size.cx = size.cy = -1; + hr = IDWriteBitmapRenderTarget_GetSize(target, &size); + EXPECT_HR(hr, S_OK); + ok(size.cx == 10, "got %d\n", size.cx); + ok(size.cy == 5, "got %d\n", size.cy); + IDWriteBitmapRenderTarget_Release(target); IDWriteGdiInterop_Release(interop);
1
0
0
0
Nikolay Sivov : dwrite: Implement IDWriteBitmapRenderTarget creation.
by Alexandre Julliard
13 Aug '12
13 Aug '12
Module: wine Branch: master Commit: 292fd912c91b1b4bd50160820a0b914eb4c972db URL:
http://source.winehq.org/git/wine.git/?a=commit;h=292fd912c91b1b4bd50160820…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 13 07:49:19 2012 +0400 dwrite: Implement IDWriteBitmapRenderTarget creation. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/gdiinterop.c | 168 ++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/Makefile.in | 2 +- dlls/dwrite/tests/font.c | 68 +++++++++++++++++ 4 files changed, 236 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index f4ee7ae..6da8c62 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,5 +1,6 @@ MODULE = dwrite.dll IMPORTLIB = dwrite +IMPORTS = gdi32 C_SRCS = \ font.c \ diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index d98eb5b..c3bcc88 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -18,10 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "dwrite.h" #include "dwrite_private.h" @@ -29,6 +32,167 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +struct rendertarget { + IDWriteBitmapRenderTarget IDWriteBitmapRenderTarget_iface; + LONG ref; + + HDC hdc; +}; + +static inline struct rendertarget *impl_from_IDWriteBitmapRenderTarget(IDWriteBitmapRenderTarget *iface) +{ + return CONTAINING_RECORD(iface, struct rendertarget, IDWriteBitmapRenderTarget_iface); +} + +static HRESULT WINAPI rendertarget_QueryInterface(IDWriteBitmapRenderTarget *iface, REFIID riid, void **obj) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteBitmapRenderTarget)) + { + *obj = iface; + IDWriteBitmapRenderTarget_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI rendertarget_AddRef(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + DeleteDC(This->hdc); + heap_free(This); + } + + return S_OK; +} + +static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget *iface, + FLOAT baselineOriginX, FLOAT baselineOriginY, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_GLYPH_RUN const* glyph_run, IDWriteRenderingParams* params, COLORREF textColor, + RECT *blackbox_rect) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%f %f %d %p %p 0x%08x %p): stub\n", This, baselineOriginX, baselineOriginY, + measuring_mode, glyph_run, params, textColor, blackbox_rect); + return E_NOTIMPL; +} + +static HDC WINAPI rendertarget_GetMemoryDC(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + TRACE("(%p)\n", This); + return This->hdc; +} + +static FLOAT WINAPI rendertarget_GetPixelsPerDip(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p): stub\n", This); + return 1.0; +} + +static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget *iface, FLOAT pixels_per_dip) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%f): stub\n", This, pixels_per_dip); + return E_NOTIMPL; +} + +static HRESULT WINAPI rendertarget_GetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX *transform) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%p): stub\n", This, transform); + return E_NOTIMPL; +} + +static HRESULT WINAPI rendertarget_SetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX const *transform) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%p): stub\n", This, transform); + return E_NOTIMPL; +} + +static HRESULT WINAPI rendertarget_GetSize(IDWriteBitmapRenderTarget *iface, SIZE *size) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%p): stub\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI rendertarget_Resize(IDWriteBitmapRenderTarget *iface, UINT32 width, UINT32 height) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%u %u): stub\n", This, width, height); + return E_NOTIMPL; +} + +static const IDWriteBitmapRenderTargetVtbl rendertargetvtbl = { + rendertarget_QueryInterface, + rendertarget_AddRef, + rendertarget_Release, + rendertarget_DrawGlyphRun, + rendertarget_GetMemoryDC, + rendertarget_GetPixelsPerDip, + rendertarget_SetPixelsPerDip, + rendertarget_GetCurrentTransform, + rendertarget_SetCurrentTransform, + rendertarget_GetSize, + rendertarget_Resize +}; + +static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) +{ + char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; + struct rendertarget *This; + HBITMAP dib; + + *target = NULL; + + This = heap_alloc(sizeof(struct rendertarget)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteBitmapRenderTarget_iface.lpVtbl = &rendertargetvtbl; + This->ref = 1; + + This->hdc = CreateCompatibleDC(hdc); + + memset(bmi, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = height; + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + + dib = CreateDIBSection(This->hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + SelectObject(This->hdc, dib); + + *target = &This->IDWriteBitmapRenderTarget_iface; + + return S_OK; +} + static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop *iface, REFIID riid, void **obj) { TRACE("(%s %p)\n", debugstr_guid(riid), obj); @@ -88,8 +252,8 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *iface, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) { - FIXME("(%p %u %u %p): stub\n", hdc, width, height, target); - return E_NOTIMPL; + TRACE("(%p %u %u %p)\n", hdc, width, height, target); + return create_rendertarget(hdc, width, height, target); } static const struct IDWriteGdiInteropVtbl gdiinteropvtbl = { diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in index f00d0e7..98843cf 100644 --- a/dlls/dwrite/tests/Makefile.in +++ b/dlls/dwrite/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dwrite.dll -IMPORTS = dwrite +IMPORTS = dwrite gdi32 C_SRCS = \ font.c diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f169393..97cd477 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -151,6 +151,73 @@ todo_wine IDWriteGdiInterop_Release(interop); } +static void test_CreateBitmapRenderTarget(void) +{ + IDWriteBitmapRenderTarget *target, *target2; + IDWriteGdiInterop *interop; + DIBSECTION ds; + HBITMAP hbm; + HRESULT hr; + HDC hdc; + int ret; + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + EXPECT_HR(hr, S_OK); + + target = NULL; + hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target); + EXPECT_HR(hr, S_OK); + + target2 = NULL; + hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target2); + EXPECT_HR(hr, S_OK); + ok(target != target2, "got %p, %p\n", target2, target); + IDWriteBitmapRenderTarget_Release(target2); + + hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target); + ok(hdc != NULL, "got %p\n", hdc); + + hbm = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm != NULL, "got %p\n", hbm); + + /* check DIB properties */ + ret = GetObjectW(hbm, sizeof(ds), &ds); + ok(ret == sizeof(BITMAP), "got %d\n", ret); + ok(ds.dsBm.bmWidth == 1, "got %d\n", ds.dsBm.bmWidth); + ok(ds.dsBm.bmHeight == 1, "got %d\n", ds.dsBm.bmHeight); + ok(ds.dsBm.bmPlanes == 1, "got %d\n", ds.dsBm.bmPlanes); + ok(ds.dsBm.bmBitsPixel == 1, "got %d\n", ds.dsBm.bmBitsPixel); + ok(!ds.dsBm.bmBits, "got %p\n", ds.dsBm.bmBits); + + IDWriteBitmapRenderTarget_Release(target); + + hbm = GetCurrentObject(hdc, OBJ_BITMAP); + ok(!hbm, "got %p\n", hbm); + + target = NULL; + hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 10, 5, &target); + EXPECT_HR(hr, S_OK); + + hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target); + ok(hdc != NULL, "got %p\n", hdc); + + hbm = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm != NULL, "got %p\n", hbm); + + /* check DIB properties */ + ret = GetObjectW(hbm, sizeof(ds), &ds); + ok(ret == sizeof(ds), "got %d\n", ret); + ok(ds.dsBm.bmWidth == 10, "got %d\n", ds.dsBm.bmWidth); + ok(ds.dsBm.bmHeight == 5, "got %d\n", ds.dsBm.bmHeight); + ok(ds.dsBm.bmPlanes == 1, "got %d\n", ds.dsBm.bmPlanes); + ok(ds.dsBm.bmBitsPixel == 32, "got %d\n", ds.dsBm.bmBitsPixel); + ok(ds.dsBm.bmBits != NULL, "got %p\n", ds.dsBm.bmBits); + + IDWriteBitmapRenderTarget_Release(target); + + IDWriteGdiInterop_Release(interop); +} + START_TEST(font) { HRESULT hr; @@ -164,6 +231,7 @@ START_TEST(font) } test_CreateFontFromLOGFONT(); + test_CreateBitmapRenderTarget(); IDWriteFactory_Release(factory); }
1
0
0
0
← Newer
1
...
47
48
49
50
51
52
53
54
55
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
Results per page:
10
25
50
100
200