November 2014 - Wine-commits

Stefan Leichter : difxapi: Add stubs for SetDifxLogCallbackA/W.
by Alexandre Julliard 26 Nov '14

26 Nov '14

Module: wine Branch: master Commit: 791d4f9f8c3a748295774c6c7c4ddb8f20892be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791d4f9f8c3a748295774c6c7… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Nov 25 22:07:03 2014 +0100 difxapi: Add stubs for SetDifxLogCallbackA/W. --- dlls/difxapi/difxapi.spec | 2 ++ dlls/difxapi/main.c | 10 ++++++++++ include/difxapi.h | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec index 33a805b..3e2f859 100644 --- a/dlls/difxapi/difxapi.spec +++ b/dlls/difxapi/difxapi.spec @@ -8,3 +8,5 @@ @ stdcall DriverPackagePreinstallW(wstr long) @ stdcall DriverPackageUninstallA(str long ptr ptr) @ stdcall DriverPackageUninstallW(wstr long ptr ptr) +@ stdcall SetDifxLogCallbackA(ptr ptr) +@ stdcall SetDifxLogCallbackW(ptr ptr) diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c index 8a2679c..7b7b1d6 100644 --- a/dlls/difxapi/main.c +++ b/dlls/difxapi/main.c @@ -86,3 +86,13 @@ VOID WINAPI DIFXAPISetLogCallbackW(DIFXAPILOGCALLBACK_W cb, VOID *ctx) { FIXME("(%p, %p) stub\n", cb, ctx); } + +VOID WINAPI SetDifxLogCallbackA(DIFXLOGCALLBACK_A cb, VOID *ctx) +{ + FIXME("(%p, %p) stub\n", cb, ctx); +} + +VOID WINAPI SetDifxLogCallbackW(DIFXLOGCALLBACK_W cb, VOID *ctx) +{ + FIXME("(%p, %p) stub\n", cb, ctx); +} diff --git a/include/difxapi.h b/include/difxapi.h index f5149b8..21d43c9 100644 --- a/include/difxapi.h +++ b/include/difxapi.h @@ -51,6 +51,8 @@ typedef enum _DIFXAPI_LOG typedef VOID (CALLBACK *DIFXAPILOGCALLBACK_A)(DIFXAPI_LOG,DWORD,PCSTR,PVOID); typedef VOID (CALLBACK *DIFXAPILOGCALLBACK_W)(DIFXAPI_LOG,DWORD,PCWSTR,PVOID); +typedef VOID (CALLBACK *DIFXLOGCALLBACK_A)(DIFXAPI_LOG,DWORD,PCSTR,PVOID); +typedef VOID (CALLBACK *DIFXLOGCALLBACK_W)(DIFXAPI_LOG,DWORD,PCWSTR,PVOID); VOID WINAPI DIFXAPISetLogCallbackA(DIFXAPILOGCALLBACK_A,VOID*); VOID WINAPI DIFXAPISetLogCallbackW(DIFXAPILOGCALLBACK_W,VOID*); @@ -62,6 +64,8 @@ DWORD WINAPI DriverPackagePreinstallA(PCSTR,DWORD); DWORD WINAPI DriverPackagePreinstallW(PCWSTR,DWORD); DWORD WINAPI DriverPackageUninstallA(PCSTR,DWORD,PCINSTALLERINFO_A,BOOL*); DWORD WINAPI DriverPackageUninstallW(PCWSTR,DWORD,PCINSTALLERINFO_W,BOOL*); +VOID WINAPI SetDifxLogCallbackA(DIFXLOGCALLBACK_A,VOID*); +VOID WINAPI SetDifxLogCallbackW(DIFXLOGCALLBACK_W,VOID*); #ifdef __cplusplus }

1 0

Nikolay Sivov : dwrite: Use usWin* values from OS/2 table as font ascent/ descent.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 87a9b51ccc8b82c72c55177777b4bffc8cd31f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a9b51ccc8b82c72c5517777… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 24 12:06:38 2014 +0300 dwrite: Use usWin* values from OS/2 table as font ascent/descent. --- dlls/dwrite/opentype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 1f5e178..a0f1c31 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -867,8 +867,8 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po memset(metrics, 0, sizeof(*metrics)); if (tt_os2) { - metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); - metrics->descent = GET_BE_WORD(tt_os2->sTypoDescender); + metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); + metrics->descent = GET_BE_WORD(tt_os2->usWinDescent); metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight); metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight);

1 0

Jacek Caban : mshtml: Improved IDM_RESPECTVISIBILITY_INDESIGN stub.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: d90016ffed93d1e2e8937329f807300c843e4f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90016ffed93d1e2e8937329f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 24 13:03:24 2014 +0100 mshtml: Improved IDM_RESPECTVISIBILITY_INDESIGN stub. --- dlls/mshtml/olecmd.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 082777c..eea3aa2 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -615,8 +615,13 @@ static HRESULT exec_baselinefont3(HTMLDocument *This, DWORD cmdexecopt, VARIANT static HRESULT exec_respectvisibility_indesign(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); - return E_NOTIMPL; + TRACE("(%p)->(%x %s %p)\n", This, cmdexecopt, debugstr_variant(in), out); + + /* This is turned on by default in Gecko. */ + if(!in || V_VT(in) != VT_BOOL || !V_BOOL(in)) + FIXME("Unsupported argument %s\n", debugstr_variant(in)); + + return S_OK; } static HRESULT query_enabled_stub(HTMLDocument *This, OLECMD *cmd)

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::execCommand implementation.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: a0d1d8cd27a4f5d2212f9524cc56be935c5d0483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d1d8cd27a4f5d2212f9524c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 24 13:03:30 2014 +0100 mshtml: Added IHTMLDocument2::execCommand implementation. --- dlls/mshtml/htmldoc.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 18 +++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 60ee739..c760c36 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -31,6 +31,7 @@ #include "ole2.h" #include "perhist.h" #include "mshtmdid.h" +#include "mshtmcid.h" #include "wine/debug.h" @@ -1095,6 +1096,40 @@ static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface) return S_OK; } +static const WCHAR insertorderedlistW[] = + {'i','n','s','e','r','t','o','r','d','e','r','e','d','l','i','s','t',0}; +static const WCHAR insertunorderedlistW[] = + {'i','n','s','e','r','t','u','n','o','r','d','e','r','e','d','l','i','s','t',0}; +static const WCHAR outdentW[] = + {'o','u','t','d','e','n','t',0}; +static const WCHAR respectvisibilityindesignW[] = + {'r','e','s','p','e','c','t','v','i','s','i','b','i','l','i','t','y','i','n','d','e','s','i','g','n',0}; + +static const struct { + const WCHAR *name; + OLECMDID id; +}command_names[] = { + {insertorderedlistW, IDM_ORDERLIST}, + {insertunorderedlistW, IDM_UNORDERLIST}, + {outdentW, IDM_OUTDENT}, + {respectvisibilityindesignW, IDM_RESPECTVISIBILITY_INDESIGN} +}; + +static BOOL cmdid_from_string(const WCHAR *str, OLECMDID *cmdid) +{ + int i; + + for(i = 0; i < sizeof(command_names)/sizeof(*command_names); i++) { + if(!strcmpiW(command_names[i].name, str)) { + *cmdid = command_names[i].id; + return TRUE; + } + } + + FIXME("Unknown command %s\n", debugstr_w(str)); + return FALSE; +} + static HRESULT WINAPI HTMLDocument_queryCommandSupported(IHTMLDocument2 *iface, BSTR cmdID, VARIANT_BOOL *pfRet) { @@ -1147,8 +1182,28 @@ static HRESULT WINAPI HTMLDocument_execCommand(IHTMLDocument2 *iface, BSTR cmdID VARIANT_BOOL showUI, VARIANT value, VARIANT_BOOL *pfRet) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s %x %s %p)\n", This, debugstr_w(cmdID), showUI, debugstr_variant(&value), pfRet); - return E_NOTIMPL; + OLECMDID cmdid; + VARIANT ret; + HRESULT hres; + + TRACE("(%p)->(%s %x %s %p)\n", This, debugstr_w(cmdID), showUI, debugstr_variant(&value), pfRet); + + if(!cmdid_from_string(cmdID, &cmdid)) + return OLECMDERR_E_NOTSUPPORTED; + + V_VT(&ret) = VT_EMPTY; + hres = IOleCommandTarget_Exec(&This->IOleCommandTarget_iface, &CGID_MSHTML, cmdid, + showUI ? 0 : OLECMDEXECOPT_DONTPROMPTUSER, &value, &ret); + if(FAILED(hres)) + return hres; + + if(V_VT(&ret) != VT_EMPTY) { + FIXME("Handle ret %s\n", debugstr_variant(&ret)); + VariantClear(&ret); + } + + *pfRet = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI HTMLDocument_execCommandShowHelp(IHTMLDocument2 *iface, BSTR cmdID, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a919b3d..2d526fc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6005,8 +6005,10 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElement2 *elem2; IHTMLElement *elem; IHTMLStyle *style; + VARIANT v; BSTR str; LONG l; + VARIANT_BOOL b; HRESULT hres; IHTMLElementCollection *collection; @@ -6129,6 +6131,22 @@ static void test_defaults(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFiltersCollection, (void**)&body); ok(hres == E_NOINTERFACE, "got interface IHTMLFiltersCollection\n"); + str = a2bstr("xxx"); + b = 100; + V_VT(&v) = VT_EMPTY; + hres = IHTMLDocument2_execCommand(doc, str, FALSE, v, &b); + ok(hres == OLECMDERR_E_NOTSUPPORTED || hres == E_INVALIDARG, + "execCommand failed: %08x, expected OLECMDERR_E_NOTSUPPORTED or E_INVALIDARG\n", hres); + SysFreeString(str); + + str = a2bstr("respectvisibilityindesign"); + b = 100; + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = VARIANT_TRUE; + hres = IHTMLDocument2_execCommand(doc, str, FALSE, v, &b); + ok(hres == S_OK, "execCommand failed: %08x, expected DRAGDROP_E_NOTREGISTERED\n", hres); + SysFreeString(str); + test_default_selection(doc); test_doc_title(doc, ""); test_dom_implementation(doc);

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::setEndPoint implementation.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 20b3aa62440a123aad1233c8598e9161a0b7ea8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b3aa62440a123aad1233c85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 24 18:47:41 2014 +0100 mshtml: Added IHTMLTxtRange::setEndPoint implementation. --- dlls/mshtml/tests/dom.c | 75 ++++++++++++++++++++++++++++++++++++++++--------- dlls/mshtml/txtrange.c | 70 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 129 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2d526fc..8a47207 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4901,6 +4901,30 @@ static IHTMLTxtRange *test_create_body_range(IHTMLDocument2 *doc) return range; } +#define range_duplicate(a) _range_duplicate(__LINE__,a) +static IHTMLTxtRange *_range_duplicate(unsigned line, IHTMLTxtRange *range) +{ + IHTMLTxtRange *ret; + HRESULT hres; + + hres = IHTMLTxtRange_duplicate(range, &ret); + ok_(__FILE__,line)(hres == S_OK, "duplicate failed: %08x\n", hres); + + return ret; +} + +#define test_range_set_end_point(a,b,c,d) _test_range_set_end_point(__LINE__,a,b,c,d) +static void _test_range_set_end_point(unsigned line, IHTMLTxtRange *range, const char *how, + IHTMLTxtRange *ref_range, HRESULT exhres) +{ + BSTR str = a2bstr(how); + HRESULT hres; + + hres = IHTMLTxtRange_setEndPoint(range, str, ref_range); + ok_(__FILE__,line)(hres == exhres, "setEndPoint failed: %08x, expected %08x\n", hres, exhres); + SysFreeString(str); +} + static void test_txtrange(IHTMLDocument2 *doc) { IHTMLTxtRange *body_range, *range, *range2; @@ -4915,11 +4939,9 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(body_range, "test abc 123\r\nit's text"); - hres = IHTMLTxtRange_duplicate(body_range, &range); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); + range = range_duplicate(body_range); + range2 = range_duplicate(body_range); - hres = IHTMLTxtRange_duplicate(body_range, &range2); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); test_range_isequal(range, range2, VARIANT_TRUE); test_range_text(range, "test abc 123\r\nit's text"); @@ -4959,8 +4981,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); - hres = IHTMLTxtRange_duplicate(body_range, &range); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); + range = range_duplicate(body_range); test_range_text(range, "test abc 123\r\nit's text"); test_range_move(range, characterW, 3, 3); @@ -4978,8 +4999,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); - hres = IHTMLTxtRange_duplicate(body_range, &range); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); + range = range_duplicate(body_range); test_range_move(range, wordW, 1, 1); test_range_moveend(range, characterW, 2, 2); @@ -5005,8 +5025,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); - hres = IHTMLTxtRange_duplicate(body_range, &range); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); + range = range_duplicate(body_range); test_range_move(range, wordW, 2, 2); test_range_moveend(range, characterW, 2, 2); @@ -5030,8 +5049,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); - hres = IHTMLTxtRange_duplicate(body_range, &range); - ok(hres == S_OK, "duplicate failed: %08x\n", hres); + range = range_duplicate(body_range); test_range_collapse(range, TRUE); test_range_expand(range, wordW, VARIANT_TRUE, "test "); @@ -5054,7 +5072,6 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, NULL); IHTMLTxtRange_Release(range); - IHTMLTxtRange_Release(body_range); hres = IHTMLDocument2_get_selection(doc, &selection); ok(hres == S_OK, "IHTMLDocument2_get_selection failed: %08x\n", hres); @@ -5116,9 +5133,39 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, "abc \r\npaste\r\nxyz abc 123\r\nit's text"); - IHTMLElement_Release(body); + test_range_move(range, wordW, 2, 2); + test_range_collapse(range, VARIANT_TRUE); + test_range_moveend(range, characterW, 5, 5); + test_range_text(range, "paste"); + + range2 = range_duplicate(range); + + test_range_set_end_point(range, "starttostart", body_range, S_OK); + test_range_text(range, "abc \r\npaste"); + + test_range_set_end_point(range, "endtoend", body_range, S_OK); + test_range_text(range, "abc \r\npaste\r\nxyz abc 123\r\nit's text"); + + test_range_set_end_point(range, "starttoend", range2, S_OK); + test_range_text(range, "\r\nxyz abc 123\r\nit's text"); + + test_range_set_end_point(range, "starttostart", body_range, S_OK); + test_range_set_end_point(range, "endtostart", range2, S_OK); + test_range_text(range, "abc "); + + test_range_set_end_point(range, "starttoend", body_range, S_OK); + test_range_text(range, "paste\r\nxyz abc 123\r\nit's text"); + + test_range_set_end_point(range, "EndToStart", body_range, S_OK); + test_range_text(range, "abc "); + + test_range_set_end_point(range, "xxx", body_range, E_INVALIDARG); IHTMLTxtRange_Release(range); + IHTMLTxtRange_Release(range2); + IHTMLTxtRange_Release(body_range); + IHTMLElement_Release(body); + } static void test_txtrange2(IHTMLDocument2 *doc) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 43c9f1a..0dd3aae 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1627,8 +1627,74 @@ static HRESULT WINAPI HTMLTxtRange_setEndPoint(IHTMLTxtRange *iface, BSTR how, IHTMLTxtRange *SourceRange) { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(how), SourceRange); - return E_NOTIMPL; + HTMLTxtRange *src_range; + nsIDOMNode *ref_node; + INT32 ref_offset; + BOOL set_start; + int how_type; + INT16 cmp; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(how), SourceRange); + + how_type = string_to_nscmptype(how); + if(how_type == -1) + return E_INVALIDARG; + + src_range = get_range_object(This->doc, SourceRange); + if(!src_range) + return E_FAIL; + + switch(how_type) { + case NS_START_TO_START: + case NS_END_TO_START: + nsres = nsIDOMRange_GetStartContainer(src_range->nsrange, &ref_node); + assert(nsres == NS_OK); + + nsres = nsIDOMRange_GetStartOffset(src_range->nsrange, &ref_offset); + assert(nsres == NS_OK); + + set_start = how_type == NS_START_TO_START; + break; + case NS_END_TO_END: + case NS_START_TO_END: + nsres = nsIDOMRange_GetEndContainer(src_range->nsrange, &ref_node); + assert(nsres == NS_OK); + + nsres = nsIDOMRange_GetEndOffset(src_range->nsrange, &ref_offset); + assert(nsres == NS_OK); + + set_start = how_type == NS_START_TO_END; + break; + DEFAULT_UNREACHABLE; + } + + nsres = nsIDOMRange_ComparePoint(This->nsrange, ref_node, ref_offset, &cmp); + assert(nsres == NS_OK); + + if(set_start) { + if(cmp <= 0) { + nsres = nsIDOMRange_SetStart(This->nsrange, ref_node, ref_offset); + }else { + nsres = nsIDOMRange_Collapse(This->nsrange, FALSE); + assert(nsres == NS_OK); + + nsres = nsIDOMRange_SetEnd(This->nsrange, ref_node, ref_offset); + } + }else { + if(cmp >= 0) { + nsres = nsIDOMRange_SetEnd(This->nsrange, ref_node, ref_offset); + }else { + nsres = nsIDOMRange_Collapse(This->nsrange, TRUE); + assert(nsres == NS_OK); + + nsres = nsIDOMRange_SetStart(This->nsrange, ref_node, ref_offset); + } + } + assert(nsres == NS_OK); + + nsIDOMNode_Release(ref_node); + return S_OK; } static HRESULT WINAPI HTMLTxtRange_compareEndPoints(IHTMLTxtRange *iface, BSTR how,

1 0

Nikolay Sivov : gdi32: Remove undefs for names that are never defined.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 2f0a4a4425bdb8a68833ee4ea5cd562fd279dc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0a4a4425bdb8a68833ee4ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 24 16:23:11 2014 +0300 gdi32: Remove undefs for names that are never defined. --- dlls/gdi32/font.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index af3ea5b..d9bb43a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1660,8 +1660,7 @@ UINT WINAPI GetOutlineTextMetricsW( output->otmsStrikeoutPosition = height_to_LP( dc, output->otmsStrikeoutPosition); output->otmsUnderscoreSize = height_to_LP( dc, output->otmsUnderscoreSize); output->otmsUnderscorePosition = height_to_LP( dc, output->otmsUnderscorePosition); -#undef WDPTOLP -#undef HDPTOLP + if(output != lpOTM) { memcpy(lpOTM, output, cbData);

1 0

Stefan Dösinger : d3d9: Only one fullscreen swapchain is allowed.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 8b6a7a9c02d048949cf4b0e9b72494213d55ead2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6a7a9c02d048949cf4b0e9b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 25 10:16:54 2014 +0100 d3d9: Only one fullscreen swapchain is allowed. --- dlls/d3d9/device.c | 25 +++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ca902a2..67a5629 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -503,11 +503,36 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_swapchain_desc desc; struct d3d9_swapchain *object; + UINT i, count; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); + if (!present_parameters->Windowed) + { + WARN("Trying to create an additional fullscreen swapchain, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + + wined3d_mutex_lock(); + count = wined3d_device_get_swapchain_count(device->wined3d_device); + for (i = 0; i < count; ++i) + { + struct wined3d_swapchain *wined3d_swapchain; + + wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, i); + wined3d_swapchain_get_desc(wined3d_swapchain, &desc); + + if (!desc.windowed) + { + wined3d_mutex_unlock(); + WARN("Trying to create an additional swapchain in fullscreen mode, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + } + wined3d_mutex_unlock(); + wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object))) *swapchain = (IDirect3DSwapChain9 *)&object->IDirect3DSwapChain9Ex_iface; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 35dad62..061846b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1058,12 +1058,16 @@ static void test_swapchain(void) IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; - HWND window; + HWND window, window2; HRESULT hr; + struct device_desc device_desc; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); ok(!!window, "Failed to create a window.\n"); + window2 = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window2, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -1176,10 +1180,42 @@ static void test_swapchain(void) IDirect3DSwapChain9_Release(swapchain3); IDirect3DSwapChain9_Release(swapchain2); IDirect3DSwapChain9_Release(swapchain1); + + d3dpp.Windowed = FALSE; + d3dpp.hDeviceWindow = window; + d3dpp.BackBufferCount = 1; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + + device_desc.width = registry_mode.dmPelsWidth; + device_desc.height = registry_mode.dmPelsHeight; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + d3dpp.hDeviceWindow = window; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.Windowed = TRUE; + d3dpp.hDeviceWindow = window; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); cleanup: IDirect3D9_Release(d3d); + DestroyWindow(window2); DestroyWindow(window); }

1 0

Stefan Dösinger : d3d8: Only one fullscreen swapchain is allowed.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: dd8bf9c87d298a05e3b6fbbcfa5e52b2b3f8e7f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8bf9c87d298a05e3b6fbbcf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 25 10:16:55 2014 +0100 d3d8: Only one fullscreen swapchain is allowed. --- dlls/d3d8/device.c | 25 +++++++++++++++++++++++++ dlls/d3d8/tests/device.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index dd0b9ee..4c17e7c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -557,11 +557,36 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_swapchain_desc desc; struct d3d8_swapchain *object; + UINT i, count; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); + if (!present_parameters->Windowed) + { + WARN("Trying to create an additional fullscreen swapchain, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + + wined3d_mutex_lock(); + count = wined3d_device_get_swapchain_count(device->wined3d_device); + for (i = 0; i < count; ++i) + { + struct wined3d_swapchain *wined3d_swapchain; + + wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, i); + wined3d_swapchain_get_desc(wined3d_swapchain, &desc); + + if (!desc.windowed) + { + wined3d_mutex_unlock(); + WARN("Trying to create an additional swapchain in fullscreen mode, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + } + wined3d_mutex_unlock(); + wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2733664..c8f9713 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -262,12 +262,16 @@ static void test_swapchain(void) IDirect3DDevice8 *device; IDirect3D8 *d3d; ULONG refcount; - HWND window; + HWND window, window2; HRESULT hr; + struct device_desc device_desc; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); ok(!!window, "Failed to create a window.\n"); + window2 = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window2, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -356,10 +360,42 @@ static void test_swapchain(void) IDirect3DSwapChain8_Release(swapchain3); IDirect3DSwapChain8_Release(swapchain2); IDirect3DSwapChain8_Release(swapchain1); + + d3dpp.Windowed = FALSE; + d3dpp.hDeviceWindow = window; + d3dpp.BackBufferCount = 1; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + + device_desc.width = registry_mode.dmPelsWidth; + device_desc.height = registry_mode.dmPelsHeight; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + d3dpp.hDeviceWindow = window; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.Windowed = TRUE; + d3dpp.hDeviceWindow = window; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + d3dpp.hDeviceWindow = window2; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x\n", hr); + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); cleanup: IDirect3D8_Release(d3d); + DestroyWindow(window2); DestroyWindow(window); }

1 0

Bruno Jesus : user32/tests: Ensure ShowWindow returns false when window is already hidden.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 30120041c8b742354d8e5c5a99a6abd80f0fd3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30120041c8b742354d8e5c5a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 24 23:54:45 2014 -0200 user32/tests: Ensure ShowWindow returns false when window is already hidden. --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 28bb35e..778b3cf 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4626,7 +4626,7 @@ static DWORD CALLBACK show_window_thread(LPVOID arg) HWND hwnd = arg; /* function will not return if ShowWindow(SW_HIDE) calls SendMessage() */ - ShowWindow(hwnd, SW_HIDE); + ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); return 0; } @@ -4669,7 +4669,7 @@ static void test_messages(void) ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", FALSE); /* test ShowWindow(SW_HIDE) on a hidden window - single threaded */ - ShowWindow(hwnd, SW_HIDE); + ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); flush_events(); ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE);

1 0

André Hentschel : comctl32/tests: Remove unused structs (Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: ab7228f3185a6d30c8e66d5213baf1c84e927bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7228f3185a6d30c8e66d521… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:59:11 2014 +0100 comctl32/tests: Remove unused structs (Clang). --- dlls/comctl32/tests/button.c | 7 ------- dlls/comctl32/tests/tab.c | 28 ---------------------------- 2 files changed, 35 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index eb4e924..badd8a7 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -427,13 +427,6 @@ static const struct message setcheck_ignored_seq[] = { 0 } }; -static const struct message setcheck_uncheck_seq[] = -{ - { BM_SETCHECK, sent }, - { WM_APP, sent|wparam|lparam, 0, 0 }, - { 0 } -}; - static const struct message setcheck_static_seq[] = { { BM_SETCHECK, sent }, diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 2b7f6d3..f832fef 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -77,28 +77,6 @@ static HWND parent_wnd; static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; -static const struct message create_parent_wnd_seq[] = { - { WM_GETMINMAXINFO, sent }, - { WM_NCCREATE, sent }, - { WM_NCCALCSIZE, sent|wparam, 0 }, - { WM_CREATE, sent }, - { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, - { WM_ACTIVATE, sent|wparam, 1 }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|defwinproc|optional }, - { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, - /* Win9x adds SWP_NOZORDER below */ - { WM_WINDOWPOSCHANGED, sent}, - { WM_NCCALCSIZE, sent|wparam|optional, 1 }, - { WM_SIZE, sent }, - { WM_MOVE, sent }, - { 0 } -}; - static const struct message add_tab_to_parent[] = { { TCM_INSERTITEMA, sent }, { TCM_INSERTITEMA, sent|optional }, @@ -158,12 +136,6 @@ static const struct message empty_sequence[] = { { 0 } }; -static const struct message set_min_tab_width_seq[] = { - { TCM_SETMINTABWIDTH, sent|wparam, 0 }, - { TCM_SETMINTABWIDTH, sent|wparam, 0 }, - { 0 } -}; - static const struct message get_item_count_seq[] = { { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { 0 }

1 0