March 2014 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Heap handles should be 64K-aligned.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 395df1aa2d50dc4622e64b552c85fca200798b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=395df1aa2d50dc4622e64b552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 26 11:24:14 2014 +0100 ntdll: Heap handles should be 64K-aligned. --- dlls/kernel32/tests/alloc.c | 1 + dlls/ntdll/heap.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/alloc.c b/dlls/kernel32/tests/alloc.c index 05d262e..9de9528 100644 --- a/dlls/kernel32/tests/alloc.c +++ b/dlls/kernel32/tests/alloc.c @@ -69,6 +69,7 @@ static void test_Heap(void) */ memchunk=10*sysInfo.dwPageSize; heap=HeapCreate(0,2*memchunk,5*memchunk); + ok( !((ULONG_PTR)heap & 0xffff), "heap %p not 64K aligned\n", heap ); /* Check that HeapCreate allocated the right amount of ram */ mem1=HeapAlloc(heap,0,5*memchunk+1); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ac78889..3bb7a11 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -879,7 +879,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, commitSize = min( totalSize, (commitSize + COMMIT_MASK) & ~COMMIT_MASK ); /* allocate the memory block */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 5, &totalSize, + if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, MEM_RESERVE, get_protection_type( flags ) )) { WARN("Could not allocate %08lx bytes\n", totalSize );

1 0

Thomas Faber : configure: Enable -Wvla if available.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: cb9c2d429f6f34c4057259362244a10aae27e13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9c2d429f6f34c4057259362… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Mar 25 07:50:30 2014 +0100 configure: Enable -Wvla if available. --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index 4d03970..6d8e85a 100755 --- a/configure +++ b/configure @@ -13695,6 +13695,31 @@ $as_echo "$ac_cv_cflags__Wunused_but_set_parameter" >&6; } if test "x$ac_cv_cflags__Wunused_but_set_parameter" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wunused-but-set-parameter" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wvla" >&5 +$as_echo_n "checking whether the compiler supports -Wvla... " >&6; } +if ${ac_cv_cflags__Wvla+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wvla" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wvla=yes +else + ac_cv_cflags__Wvla=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wvla" >&5 +$as_echo "$ac_cv_cflags__Wvla" >&6; } +if test "x$ac_cv_cflags__Wvla" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wvla" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wwrite-strings" >&5 $as_echo_n "checking whether the compiler supports -Wwrite-strings... " >&6; } if ${ac_cv_cflags__Wwrite_strings+:} false; then : diff --git a/configure.ac b/configure.ac index 97874c4..2b56c7d 100644 --- a/configure.ac +++ b/configure.ac @@ -1780,6 +1780,7 @@ then WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits]) WINE_TRY_CFLAGS([-Wunused-but-set-parameter]) + WINE_TRY_CFLAGS([-Wvla]) WINE_TRY_CFLAGS([-Wwrite-strings]) dnl Check for noisy string.h

1 0

Stefan Leichter : wtsapi32: Extend the parameter check of WTSEnumerateProcessesW.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 0d2ff50e223eeeec253c31c15c1102b528e8dd1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2ff50e223eeeec253c31c15… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Mar 25 22:53:26 2014 +0100 wtsapi32: Extend the parameter check of WTSEnumerateProcessesW. --- dlls/wtsapi32/tests/wtsapi.c | 8 -------- dlls/wtsapi32/wtsapi32.c | 6 +++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 0a5a1ed..e8dced7 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -45,41 +45,33 @@ static void test_WTSEnumerateProcessesW(void) info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 1, 1, &info, &count); - todo_wine ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); if (info) WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 0, &info, &count); - todo_wine ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); if (info) WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 2, &info, &count); - todo_wine ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); if (info) WTSFreeMemory(info); SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, NULL, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, NULL); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); if (info) WTSFreeMemory(info); diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 314ec6b..79d5a7f 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -87,7 +87,11 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, ppProcessInfo, pCount); - if (!ppProcessInfo || !pCount) return FALSE; + if (!ppProcessInfo || !pCount || Reserved != 0 || Version != 1) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } *pCount = 0; *ppProcessInfo = NULL;

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::bgColor property implementation.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 946378a1b2911786f489c9942bd1a41c62c79fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=946378a1b2911786f489c9942… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Mar 26 15:06:39 2014 +0800 mshtml: Added IHTMLTableRow::bgColor property implementation. --- dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmltablerow.c | 41 +++++++++++++++++++++++++++++++++++++---- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/tests/dom.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 6c2bb7a..7117087 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -124,7 +124,7 @@ static int loose_hex_to_rgb(const WCHAR *hex) | comp_value(hex+2*dpc, dpc); } -static HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) +HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) { unsigned int i; int rgb = -1; @@ -155,7 +155,7 @@ static HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) return S_OK; } -static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) +BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) { switch(V_VT(v)) { case VT_BSTR: diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index f93a606..f3a4970 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -170,15 +170,48 @@ static HRESULT WINAPI HTMLTableRow_get_vAlign(IHTMLTableRow *iface, BSTR *p) static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + nsAString_InitDepend(&val, V_BSTR(&v)); + variant_to_nscolor(&v, &val); + nsres = nsIDOMHTMLTableRowElement_SetBgColor(This->nsrow, &val); + nsAString_Finish(&val); + + if (NS_FAILED(nsres)){ + ERR("Set BgColor(%s) failed!\n", debugstr_variant(&v)); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTableRow_get_bgColor(IHTMLTableRow *iface, VARIANT *p) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString strColor; + nsresult nsres; + HRESULT hres; + const PRUnichar *color; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&strColor, NULL); + nsres = nsIDOMHTMLTableRowElement_GetBgColor(This->nsrow, &strColor); + nsAString_Finish(&strColor); + + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&strColor, &color); + V_VT(p) = VT_BSTR; + hres = nscolor_to_str(color, &V_BSTR(p)); + }else { + ERR("SetBgColor failed: %08x\n", nsres); + hres = E_FAIL; + } + + return hres; } static HRESULT WINAPI HTMLTableRow_put_borderColor(IHTMLTableRow *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 882f859..c40d773 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -862,6 +862,10 @@ HRESULT create_element(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HI HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**) DECLSPEC_HIDDEN; +BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) DECLSPEC_HIDDEN; +HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) DECLSPEC_HIDDEN; + + struct HTMLAttributeCollection { DispatchEx dispex; IHTMLAttributeCollection IHTMLAttributeCollection_iface; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2cb0087..76c283a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5578,6 +5578,7 @@ static void test_tr_elem(IHTMLElement *elem) HRESULT hres; BSTR bstr; LONG lval; + VARIANT vbg, vDefaultbg; static const elem_type_t cell_types[] = {ET_TD,ET_TD}; @@ -5628,6 +5629,40 @@ static void test_tr_elem(IHTMLElement *elem) ok(hres == S_OK, "get_sectionRowIndex failed: %08x\n", hres); ok(lval == 1, "get_sectionRowIndex returned %d\n", lval); + hres = IHTMLTableRow_get_bgColor(row, &vDefaultbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); + ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); + + V_VT(&vbg) = VT_BSTR; + V_BSTR(&vbg) = a2bstr("red"); + hres = IHTMLTableRow_put_bgColor(row, vbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLTableRow_get_bgColor(row, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + V_VT(&vbg) = VT_I4; + V_I4(&vbg) = 0xff0000; + hres = IHTMLTableRow_put_bgColor(row, vbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLTableRow_get_bgColor(row, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + /* Restore Originial */ + hres = IHTMLTableRow_put_bgColor(row, vDefaultbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vDefaultbg); + IHTMLTableRow_Release(row); }

1 0

Jactry Zeng : riched20: Return E_INVALIDARG for empty ppSel in ITextDocument::GetSelection.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: c5bd5236b924e4e21c85aa3262cbe49339b893ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bd5236b924e4e21c85aa326… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Mar 25 23:53:59 2014 +0800 riched20: Return E_INVALIDARG for empty ppSel in ITextDocument::GetSelection. --- dlls/riched20/richole.c | 3 +++ dlls/riched20/tests/richole.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 6805873..bec228e 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -515,6 +515,9 @@ ITextDocument_fnGetSelection(ITextDocument* me, ITextSelection** ppSel) { IRichEditOleImpl *This = impl_from_ITextDocument(me); TRACE("(%p)\n", me); + + if(!ppSel) + return E_INVALIDARG; *ppSel = &This->txtSel->ITextSelection_iface; ITextSelection_AddRef(*ppSel); return S_OK; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 5bfb999..5a3ffbe 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -117,6 +117,9 @@ static void test_Interfaces(void) ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); ok(txtDoc != NULL, "IRichEditOle_QueryInterface\n"); + hres = ITextDocument_GetSelection(txtDoc, NULL); + ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%x\n", hres); + ITextDocument_GetSelection(txtDoc, &txtSel); punk = NULL;

1 0

Hermès Bélusca-Maïto : winemac.drv: Fix a typo in _MSC_VER.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 7a7925c8728eb2b357f45c3f6ebc5b729656d3ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a7925c8728eb2b357f45c3f6… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Tue Mar 25 18:46:13 2014 +0100 winemac.drv: Fix a typo in _MSC_VER. --- dlls/winemac.drv/macdrv_cocoa.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 564910c..1550280 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -89,7 +89,7 @@ #ifndef DECLSPEC_HIDDEN -# if defined(__MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) # define DECLSPEC_HIDDEN # elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) # define DECLSPEC_HIDDEN __attribute__((visibility ("hidden")))

1 0

Javier Cantero : user32: Fix side effect in SubtractRect().
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 1f15169f725894edfa2f33e16b8827d3d2c11a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f15169f725894edfa2f33e16… Author: Javier Cantero <jcantero(a)escomposlinux.org> Date: Thu Mar 20 16:07:32 2014 +0100 user32: Fix side effect in SubtractRect(). --- dlls/user32/uitools.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index c11a1d3..1afb1c89 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1421,14 +1421,14 @@ BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1, const RECT *src2 ) SetRectEmpty( dest ); return FALSE; } - *dest = *src1; if (IntersectRect( &tmp, src1, src2 )) { - if (EqualRect( &tmp, dest )) + if (EqualRect( &tmp, src1 )) { SetRectEmpty( dest ); return FALSE; } + *dest = *src1; if ((tmp.top == dest->top) && (tmp.bottom == dest->bottom)) { if (tmp.left == dest->left) dest->left = tmp.right; @@ -1440,6 +1440,10 @@ BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1, const RECT *src2 ) else if (tmp.bottom == dest->bottom) dest->bottom = tmp.top; } } + else + { + *dest = *src1; + } return TRUE; }

1 0

Vijay Kiran Kamuju : mshtml: Add text/ jscript as valid mime type for javascript files.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 66c1a099aad23550445b96d7a05403b349c9fbca URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c1a099aad23550445b96d7a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Mar 22 11:46:44 2014 +0000 mshtml: Add text/jscript as valid mime type for javascript files. --- dlls/mshtml/script.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 8a74554..4d49587 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -816,11 +816,13 @@ static BOOL get_guid_from_type(LPCWSTR type, GUID *guid) { const WCHAR text_javascriptW[] = {'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0}; + const WCHAR text_jscriptW[] = + {'t','e','x','t','/','j','s','c','r','i','p','t',0}; const WCHAR text_vbscriptW[] = {'t','e','x','t','/','v','b','s','c','r','i','p','t',0}; /* FIXME: Handle more types */ - if(!strcmpiW(type, text_javascriptW)) { + if(!strcmpiW(type, text_javascriptW) || !strcmpiW(type, text_jscriptW)) { *guid = CLSID_JScript; }else if(!strcmpiW(type, text_vbscriptW)) { *guid = CLSID_VBScript;

1 0

Alistair Leslie-Hughes : netcfgx: Add INetCfg interface support.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: f9862efa48736c884670091c80d2a7ede4729e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9862efa48736c884670091c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 20 21:00:28 2014 +1100 netcfgx: Add INetCfg interface support. --- configure | 1 + configure.ac | 1 + dlls/netcfgx/Makefile.in | 4 +- dlls/netcfgx/main.c | 107 ++++++++++++++++++++++++- dlls/netcfgx/netcfg.c | 170 ++++++++++++++++++++++++++++++++++++++++ dlls/netcfgx/netcfg_private.h | 23 ++++++ dlls/netcfgx/tests/Makefile.in | 5 ++ dlls/netcfgx/tests/netcfgx.c | 66 ++++++++++++++++ 8 files changed, 374 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9862efa48736c8846700…

1 0

Michael Müller : dxva2: Added stub dll.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: b1f2e33cc2a11df889f629a7d20575b1e96e2e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f2e33cc2a11df889f629a7d… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Mar 24 00:05:38 2014 +0100 dxva2: Added stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/dxva2/Makefile.in | 4 ++++ dlls/dxva2/dxva2.spec | 37 +++++++++++++++++++++++++++++++++++++ dlls/dxva2/main.c | 40 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+) diff --git a/configure b/configure index d270071..4d03970 100755 --- a/configure +++ b/configure @@ -1024,6 +1024,7 @@ enable_dwmapi enable_dwrite enable_dxdiagn enable_dxgi +enable_dxva2 enable_explorerframe enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_faultrep @@ -16851,6 +16852,7 @@ wine_fn_config_lib dxerr9 wine_fn_config_dll dxgi enable_dxgi implib wine_fn_config_test dlls/dxgi/tests dxgi_test wine_fn_config_lib dxguid +wine_fn_config_dll dxva2 enable_dxva2 wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 diff --git a/configure.ac b/configure.ac index e493cd0..97874c4 100644 --- a/configure.ac +++ b/configure.ac @@ -2855,6 +2855,7 @@ WINE_CONFIG_LIB(dxerr9) WINE_CONFIG_DLL(dxgi,,[implib]) WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_LIB(dxguid) +WINE_CONFIG_DLL(dxva2) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in new file mode 100644 index 0000000..7b9ef6f --- /dev/null +++ b/dlls/dxva2/Makefile.in @@ -0,0 +1,4 @@ +MODULE = dxva2.dll + +C_SRCS = \ + main.c diff --git a/dlls/dxva2/dxva2.spec b/dlls/dxva2/dxva2.spec new file mode 100644 index 0000000..da94df3 --- /dev/null +++ b/dlls/dxva2/dxva2.spec @@ -0,0 +1,37 @@ +@ stub CapabilitiesRequestAndCapabilitiesReply +@ stub DXVA2CreateDirect3DDeviceManager9 +@ stub DXVA2CreateVideoService +@ stub DegaussMonitor +@ stub DestroyPhysicalMonitor +@ stub DestroyPhysicalMonitors +@ stub GetCapabilitiesStringLength +@ stub GetMonitorBrightness +@ stub GetMonitorCapabilities +@ stub GetMonitorColorTemperature +@ stub GetMonitorContrast +@ stub GetMonitorDisplayAreaPosition +@ stub GetMonitorDisplayAreaSize +@ stub GetMonitorRedGreenOrBlueDrive +@ stub GetMonitorRedGreenOrBlueGain +@ stub GetMonitorTechnologyType +@ stub GetNumberOfPhysicalMonitorsFromHMONITOR +@ stub GetNumberOfPhysicalMonitorsFromIDirect3DDevice9 +@ stub GetPhysicalMonitorsFromHMONITOR +@ stub GetPhysicalMonitorsFromIDirect3DDevice9 +@ stub GetTimingReport +@ stub GetVCPFeatureAndVCPFeatureReply +@ stub OPMGetVideoOutputsFromHMONITOR +@ stub OPMGetVideoOutputsFromIDirect3DDevice9Object +@ stub RestoreMonitorFactoryColorDefaults +@ stub RestoreMonitorFactoryDefaults +@ stub SaveCurrentMonitorSettings +@ stub SaveCurrentSettings +@ stub SetMonitorBrightness +@ stub SetMonitorColorTemperature +@ stub SetMonitorContrast +@ stub SetMonitorDisplayAreaPosition +@ stub SetMonitorDisplayAreaSize +@ stub SetMonitorRedGreenOrBlueDrive +@ stub SetMonitorRedGreenOrBlueGain +@ stub SetVCPFeature +@ stub UABGetCertificate diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c new file mode 100644 index 0000000..d16320f --- /dev/null +++ b/dlls/dxva2/main.c @@ -0,0 +1,40 @@ +/* + * Copyright 2014 Michael Müller for Pipelight + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxva2); + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + + return TRUE; +}

1 0