wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Alexandre Julliard : server: Pass the device client pointer as part of the IRP parameters.
by Alexandre Julliard 09 Jul '15

09 Jul '15

Module: wine Branch: master Commit: d087ea6798d9dca4d974a21bb9acb70ae7dac4eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d087ea6798d9dca4d974a21bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 17:50:00 2015 +0900 server: Pass the device client pointer as part of the IRP parameters. --- dlls/ntoskrnl.exe/ntoskrnl.c | 41 ++++++++++++++++++++++++----------------- include/wine/server_protocol.h | 12 ++++++++++-- server/device.c | 23 +++++++++++++---------- server/protocol.def | 10 +++++++++- server/request.h | 5 ++--- server/trace.c | 10 +++++++--- tools/make_requests | 2 +- 7 files changed, 66 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d087ea6798d9dca4d974a…

1 0

Jacek Caban : wincodec.idl: Added missing GUID_WICPixelFormat32bpp* declarations.
by Alexandre Julliard 08 Jul '15

08 Jul '15

Module: wine Branch: master Commit: 47a11ec626dc8888442ab0f5eb943e1d33048114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a11ec626dc8888442ab0f5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:19:22 2015 +0200 wincodec.idl: Added missing GUID_WICPixelFormat32bpp* declarations. --- include/wincodec.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wincodec.idl b/include/wincodec.idl index 4e1d039..7216d07 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -193,6 +193,9 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0f);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x10);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGB, 0xd98c6b95,0x3efe,0x47d6,0xbb,0x25,0xeb,0x17,0x48,0xab,0x0c,0xf1);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGBA, 0xf5c7ad2d,0x6a8d,0x43dd,0xa7,0xa8,0xa2,0x99,0x35,0x26,0x1a,0xe9);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPRGBA, 0x3cc4a650,0xa527,0x4d37,0xa9,0x16,0x31,0x42,0xc7,0xeb,0xed,0xba);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x15);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);")

1 0

Jacek Caban : dvdmedia.h: Added AMINTERLACE_* defines.
by Alexandre Julliard 08 Jul '15

08 Jul '15

Module: wine Branch: master Commit: 530a126139497b129aa0631dac3711940a77c0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=530a126139497b129aa0631da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:19:15 2015 +0200 dvdmedia.h: Added AMINTERLACE_* defines. --- include/dvdmedia.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/dvdmedia.h b/include/dvdmedia.h index 32c22fc..daf1c9d 100644 --- a/include/dvdmedia.h +++ b/include/dvdmedia.h @@ -51,4 +51,18 @@ typedef struct tagMPEG2VIDEOINFO { DWORD dwSequenceHeader[1]; } MPEG2VIDEOINFO; +#define AMINTERLACE_IsInterlaced 0x0001 +#define AMINTERLACE_1FieldPerSample 0x0002 +#define AMINTERLACE_Field1First 0x0004 +#define AMINTERLACE_UNUSED 0x0008 +#define AMINTERLACE_FieldPatField1Only 0x0000 +#define AMINTERLACE_FieldPatField2Only 0x0010 +#define AMINTERLACE_FieldPatBothRegular 0x0020 +#define AMINTERLACE_FieldPatBothIrregular 0x0030 +#define AMINTERLACE_FieldPatternMask 0x0030 +#define AMINTERLACE_DisplayModeBobOnly 0x0000 +#define AMINTERLACE_DisplayModeWeaveOnly 0x0040 +#define AMINTERLACE_DisplayModeBobOrWeave 0x0080 +#define AMINTERLACE_DisplayModeMask 0x00c0 + #endif /* __DVDMEDIA_H__ */

1 0

Piotr Caban : msvcirt: Fix leak in ~ios and ios::init implementation.
by Alexandre Julliard 08 Jul '15

08 Jul '15

Module: wine Branch: master Commit: 4406762dc283d00c93a6433c7da7e9dca4b9d14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4406762dc283d00c93a6433c7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 8 10:28:59 2015 +0200 msvcirt: Fix leak in ~ios and ios::init implementation. --- dlls/msvcirt/msvcirt.c | 6 ++++-- dlls/msvcirt/tests/msvcirt.c | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 04c195d..c740049 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -172,6 +172,8 @@ streambuf* __thiscall streambuf_assign(streambuf *this, const streambuf *rhs) /* ??_Estreambuf@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(streambuf_vector_dtor, 8) +#define call_streambuf_vector_dtor(this, flags) CALL_VTBL_FUNC(this, 0,\ + streambuf*, (streambuf*, unsigned int), (this, flags)) streambuf* __thiscall streambuf_vector_dtor(streambuf *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); @@ -753,7 +755,7 @@ void __thiscall ios_dtor(ios *this) { TRACE("(%p)\n", this); if (this->delbuf && this->sb) - MSVCRT_operator_delete(this->sb); + call_streambuf_vector_dtor(this->sb, 1); this->sb = NULL; this->state = IOSTATE_badbit; DeleteCriticalSection(&this->lock); @@ -958,7 +960,7 @@ void __thiscall ios_init(ios *this, streambuf *sb) { TRACE("(%p %p)\n", this, sb); if (this->delbuf && this->sb) - MSVCRT_operator_delete(this->sb); + call_streambuf_vector_dtor(this->sb, 1); this->sb = sb; if (sb == NULL) this->state |= IOSTATE_badbit; diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index aded18f..bb5a5ed 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -813,8 +813,8 @@ static void test_ios(void) memset(&ios_obj, 0xab, sizeof(ios)); memset(&ios_obj2, 0xab, sizeof(ios)); psb = p_operator_new(sizeof(streambuf)); - if (psb) - call_func1(p_streambuf_ctor, psb); + ok(psb != NULL, "failed to allocate streambuf object\n"); + call_func1(p_streambuf_ctor, psb); /* constructor/destructor */ call_func2(p_ios_sb_ctor, &ios_obj, NULL); @@ -857,10 +857,12 @@ static void test_ios(void) ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == (0x8|IOSTATE_badbit), "expected %x got %x\n", (0x8|IOSTATE_badbit), ios_obj.state); ios_obj.sb = psb; - ios_obj.delbuf = 1; + ios_obj.delbuf = 0; call_func2(p_ios_init, &ios_obj, psb); ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); ok(ios_obj.state == 0x8, "expected %x got %x\n", 0x8, ios_obj.state); + ios_obj.delbuf = 1; + call_func1(p_ios_dtor, &ios_obj); /* copy constructor */ call_func2(p_ios_copy_ctor, &ios_obj, &ios_obj2);

1 0

Nikolay Sivov : dwrite: Implement GetGdiCompatibleMetrics().
by Alexandre Julliard 08 Jul '15

08 Jul '15

Module: wine Branch: master Commit: 849bb99b769c29a8eb98ca0b32b87bbda3d45865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849bb99b769c29a8eb98ca0b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 12:36:48 2015 +0300 dwrite: Implement GetGdiCompatibleMetrics(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 115 ++++++++++++++++++++++++++++++++++--------- dlls/dwrite/opentype.c | 89 +++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 54 ++++++++++++++++++-- 4 files changed, 230 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=849bb99b769c29a8eb98c…

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest::send() method implementation.
by Alexandre Julliard 08 Jul '15

08 Jul '15

Module: wine Branch: master Commit: 119af4768303eb4081e8f38dee7dfd4f39662002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=119af4768303eb4081e8f38de… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jul 7 22:49:58 2015 +0800 mshtml: Add IHTMLXMLHttpRequest::send() method implementation. --- dlls/mshtml/tests/xmlhttprequest.c | 27 ++++++++++++++------------- dlls/mshtml/xmlhttprequest.c | 24 ++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index b857b45..0a9824d 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -613,13 +613,13 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) SET_EXPECT(xmlhttprequest_onreadystatechange_done); hres = IHTMLXMLHttpRequest_send(xhr, vempty); - todo_wine ok(hres == S_OK, "send failed: %08x\n", hres); + ok(hres == S_OK, "send failed: %08x\n", hres); if(SUCCEEDED(hres)) pump_msgs(&called_xmlhttprequest_onreadystatechange_done); todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); - todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_headers_received); - todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_loading); - todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_done); + CHECK_CALLED(xmlhttprequest_onreadystatechange_headers_received); + CHECK_CALLED(xmlhttprequest_onreadystatechange_loading); + CHECK_CALLED(xmlhttprequest_onreadystatechange_done); if(FAILED(hres)) { IHTMLXMLHttpRequest_Release(xhr); @@ -629,26 +629,27 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - ok(hres == S_OK, "get_status failed: %08x\n", hres); + todo_wine ok(hres == S_OK, "get_status failed: %08x\n", hres); todo_wine ok(val == 200, "Expect 200, got %d\n", val); + text = NULL; hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - ok(hres == S_OK, "get_statusText failed: %08x\n", hres); + todo_wine ok(hres == S_OK, "get_statusText failed: %08x\n", hres); todo_wine ok(text != NULL, "text == NULL\n"); - todo_wine ok(!strcmp_wa(text, "OK"), - "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); + todo_wine ok(!strcmp_wa(text, "OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); SysFreeString(text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - todo_wine ok(val == 4, "Expect DONE, got %d\n", val); + ok(val == 4, "Expect DONE, got %d\n", val); + text = NULL; hres = IHTMLXMLHttpRequest_get_responseText(xhr, &text); - ok(hres == S_OK, "get_responseText failed: %08x\n", hres); - ok(text != NULL, "test == NULL\n"); - ok(!strcmp_wa(text, EXPECT_RESPONSE_TEXT), "expect %s, got %s\n", - EXPECT_RESPONSE_TEXT, wine_dbgstr_w(text)); + todo_wine ok(hres == S_OK, "get_responseText failed: %08x\n", hres); + todo_wine ok(text != NULL, "test == NULL\n"); + todo_wine ok(!strcmp_wa(text, EXPECT_RESPONSE_TEXT), "expect %s, got %s\n", + EXPECT_RESPONSE_TEXT, wine_dbgstr_w(text)); SysFreeString(text); IHTMLXMLHttpRequest_Release(xhr); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 1432b2c..54f0187 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -405,8 +405,28 @@ static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR b static HRESULT WINAPI HTMLXMLHttpRequest_send(IHTMLXMLHttpRequest *iface, VARIANT varBody) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&varBody)); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&varBody)); + + switch(V_VT(&varBody)) { + case VT_NULL: + case VT_EMPTY: + case VT_ERROR: + break; + default: + FIXME("varBody(%s) unsupported\n", debugstr_variant(&varBody)); + return E_FAIL; + } + + nsres = nsIXMLHttpRequest_Send(This->nsxhr, NULL); + + if(NS_FAILED(nsres)) { + ERR("nsIXMLHttpRequest_Send failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLXMLHttpRequest_getAllResponseHeaders(IHTMLXMLHttpRequest *iface, BSTR *p)

1 0

Zhenbo Li : mshtml/tests: Wait for the document to be completely loaded.
by Alexandre Julliard 08 Jul '15

08 Jul '15

Module: wine Branch: master Commit: f2669d6e9fddc266f48345e018c61f13359d7b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2669d6e9fddc266f48345e01… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jul 7 22:49:42 2015 +0800 mshtml/tests: Wait for the document to be completely loaded. --- dlls/mshtml/tests/xmlhttprequest.c | 83 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index d3f682c..b857b45 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -279,6 +279,84 @@ static IDispatchExVtbl xmlhttprequest_onreadystatechangeFuncVtbl = { }; static IDispatchEx xmlhttprequest_onreadystatechange_obj = { &xmlhttprequest_onreadystatechangeFuncVtbl }; +static BOOL doc_complete; +static IHTMLDocument2 *notif_doc; + +static HRESULT WINAPI PropertyNotifySink_QueryInterface(IPropertyNotifySink *iface, + REFIID riid, void**ppv) +{ + if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI PropertyNotifySink_AddRef(IPropertyNotifySink *iface) +{ + return 2; +} + +static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface) +{ + return 1; +} + +static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) +{ + if(dispID == DISPID_READYSTATE){ + BSTR state; + HRESULT hres; + + hres = IHTMLDocument2_get_readyState(notif_doc, &state); + ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + + if(!strcmp_wa(state, "complete")) + doc_complete = TRUE; + + SysFreeString(state); + } + + return S_OK; +} + +static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *iface, DISPID dispID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { + PropertyNotifySink_QueryInterface, + PropertyNotifySink_AddRef, + PropertyNotifySink_Release, + PropertyNotifySink_OnChanged, + PropertyNotifySink_OnRequestEdit +}; + +static IPropertyNotifySink PropertyNotifySink = { &PropertyNotifySinkVtbl }; + +static void do_advise(IUnknown *unk, REFIID riid, IUnknown *unk_advise) +{ + IConnectionPointContainer *container; + IConnectionPoint *cp; + DWORD cookie; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + + hres = IConnectionPointContainer_FindConnectionPoint(container, riid, &cp); + IConnectionPointContainer_Release(container); + ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + + hres = IConnectionPoint_Advise(cp, unk_advise, &cookie); + IConnectionPoint_Release(cp); + ok(hres == S_OK, "Advise failed: %08x\n", hres); +} + static void pump_msgs(BOOL *b) { MSG msg; @@ -611,6 +689,11 @@ static IHTMLDocument2 *create_doc_from_url(const char *start_url) IBindCtx_Release(bc); SysFreeString(url); + doc_complete = FALSE; + notif_doc = doc; + do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); + pump_msgs(&doc_complete); + return doc; }

1 0

Aric Stewart : hidclass.sys: Add hidclass.sys.
by Alexandre Julliard 08 Jul '15

08 Jul '15

Module: wine Branch: master Commit: 270790a9df1501c1e71dae20ebaae942aee73855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=270790a9df1501c1e71dae20e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 6 13:09:14 2015 -0500 hidclass.sys: Add hidclass.sys. --- configure | 2 + configure.ac | 1 + dlls/hidclass.sys/Makefile.in | 7 ++++ dlls/hidclass.sys/hid.h | 35 ++++++++++++++++++ dlls/hidclass.sys/hidclass.sys.spec | 1 + dlls/hidclass.sys/main.c | 74 +++++++++++++++++++++++++++++++++++++ 6 files changed, 120 insertions(+) diff --git a/configure b/configure index cb6afc1..ebaa38c 100755 --- a/configure +++ b/configure @@ -1078,6 +1078,7 @@ enable_gpkcsp enable_hal enable_hhctrl_ocx enable_hid +enable_hidclass_sys enable_hlink enable_hnetcfg enable_httpapi @@ -17289,6 +17290,7 @@ wine_fn_config_dll gpkcsp enable_gpkcsp wine_fn_config_dll hal enable_hal wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx clean,implib,po htmlhelp wine_fn_config_dll hid enable_hid implib +wine_fn_config_dll hidclass.sys enable_hidclass_sys implib hidclass wine_fn_config_dll hlink enable_hlink clean,implib wine_fn_config_test dlls/hlink/tests hlink_test wine_fn_config_dll hnetcfg enable_hnetcfg clean diff --git a/configure.ac b/configure.ac index cca4e0c..fa58592 100644 --- a/configure.ac +++ b/configure.ac @@ -2987,6 +2987,7 @@ WINE_CONFIG_DLL(gpkcsp) WINE_CONFIG_DLL(hal) WINE_CONFIG_DLL(hhctrl.ocx,,[clean,implib,po],[htmlhelp]) WINE_CONFIG_DLL(hid,,[implib]) +WINE_CONFIG_DLL(hidclass.sys,,[implib],[hidclass]) WINE_CONFIG_DLL(hlink,,[clean,implib]) WINE_CONFIG_TEST(dlls/hlink/tests) WINE_CONFIG_DLL(hnetcfg,,[clean]) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in new file mode 100644 index 0000000..b3fdd1c --- /dev/null +++ b/dlls/hidclass.sys/Makefile.in @@ -0,0 +1,7 @@ +MODULE = hidclass.sys +IMPORTLIB = hidclass +IMPORTS = ntoskrnl.exe +DELAYIMPORTS = setupapi hid + +C_SRCS = \ + main.c diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h new file mode 100644 index 0000000..f058e46 --- /dev/null +++ b/dlls/hidclass.sys/hid.h @@ -0,0 +1,35 @@ +/* + * Copyright 2015 Aric Stewart + * + * 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 "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "ddk/hidport.h" +#include "wine/list.h" + +typedef struct _minidriver +{ + struct list entry; + + HID_MINIDRIVER_REGISTRATION minidriver; + + PDRIVER_UNLOAD DriverUnload; +} minidriver; diff --git a/dlls/hidclass.sys/hidclass.sys.spec b/dlls/hidclass.sys/hidclass.sys.spec new file mode 100644 index 0000000..3ec2525 --- /dev/null +++ b/dlls/hidclass.sys/hidclass.sys.spec @@ -0,0 +1 @@ +@ stdcall HidRegisterMinidriver(ptr) diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c new file mode 100644 index 0000000..e4844862 --- /dev/null +++ b/dlls/hidclass.sys/main.c @@ -0,0 +1,74 @@ +/* + * WINE Hid device services + * + * Copyright 2015 Aric Stewart + * + * 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 + */ + +#define NONAMELESSUNION +#include <unistd.h> +#include <stdarg.h> +#include "hid.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hid); + +static struct list minidriver_list = LIST_INIT(minidriver_list); + +static minidriver* find_minidriver(DRIVER_OBJECT *driver) +{ + minidriver *md; + LIST_FOR_EACH_ENTRY(md, &minidriver_list, minidriver, entry) + { + if (md->minidriver.DriverObject == driver) + return md; + } + return NULL; +} + +static VOID WINAPI UnloadDriver(DRIVER_OBJECT *driver) +{ + minidriver *md; + + TRACE("Driver Unload\n"); + md = find_minidriver(driver); + if (md) + { + if (md->DriverUnload) + md->DriverUnload(md->minidriver.DriverObject); + list_remove(&md->entry); + HeapFree( GetProcessHeap(), 0, md ); + } +} + +NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) +{ + minidriver *driver; + driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*driver)); + + if (!driver) + return STATUS_NO_MEMORY; + + driver->DriverUnload = registration->DriverObject->DriverUnload; + registration->DriverObject->DriverUnload = UnloadDriver; + + driver->minidriver = *registration; + list_add_tail(&minidriver_list, &driver->entry); + + return STATUS_SUCCESS; +}

1 0

André Hentschel : ntdll: Randomize security cookie when available.
by Alexandre Julliard 08 Jul '15

08 Jul '15

Module: wine Branch: master Commit: 7e1c886fbfd362376b6aebe5381ab7d4433c3371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1c886fbfd362376b6aebe53… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 7 19:50:25 2015 +0200 ntdll: Randomize security cookie when available. --- dlls/ntdll/virtual.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index bc3f7cd..410e060 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1067,6 +1067,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz IMAGE_SECTION_HEADER sections[96]; IMAGE_SECTION_HEADER *sec; IMAGE_DATA_DIRECTORY *imports; + IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg; + ULONG loadcfg_size; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; off_t pos; @@ -1278,6 +1280,24 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } } + /* randomize security cookie */ + + loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); + if (loadcfg && loadcfg_size >= sizeof(*loadcfg)) + { + static ULONG seed; + ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie; + + if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); + if (cookie) + { + *cookie = RtlRandom( &seed ); + if (sizeof(ULONG_PTR) > sizeof(ULONG)) /* fill up, but keep the highest word clear */ + *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16; + } + } + /* set the image protections */ VIRTUAL_SetProt( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ );

1 0

Bernhard Übelacker : advapi32: Fail in RegEnumValue on missing value or val_count parameters.
by Alexandre Julliard 08 Jul '15

08 Jul '15

Module: wine Branch: master Commit: eecd136cb703777fe0acc39ecc3f19cfaf06fe6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eecd136cb703777fe0acc39ec… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Jun 30 14:38:06 2015 +0200 advapi32: Fail in RegEnumValue on missing value or val_count parameters. --- dlls/advapi32/registry.c | 8 +++---- dlls/advapi32/tests/registry.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 30130b1..cf5a1ac 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1912,8 +1912,8 @@ LSTATUS WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_ TRACE("(%p,%d,%p,%p,%p,%p,%p,%p)\n", hkey, index, value, val_count, reserved, type, data, count ); - /* NT only checks count, not val_count */ - if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + if ((data && !count) || reserved || !value || !val_count) + return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; total_size = info_size + (MAX_PATH + 1) * sizeof(WCHAR); @@ -1997,8 +1997,8 @@ LSTATUS WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_c TRACE("(%p,%d,%p,%p,%p,%p,%p,%p)\n", hkey, index, value, val_count, reserved, type, data, count ); - /* NT only checks count, not val_count */ - if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + if ((data && !count) || reserved || !value || !val_count) + return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; total_size = info_size + (MAX_PATH + 1) * sizeof(WCHAR); diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c801384..b8b7e1c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -643,6 +643,32 @@ static void test_enum_value(void) ok( !strcmp( value, "Test" ), "value is '%s' instead of Test\n", value ); ok( !strcmp( data, "foobar" ), "data is '%s' instead of foobar\n", data ); + if (pRegGetValueA) /* avoid a crash on Windows 2000 */ + { + /* no value and no val_count parameter */ + data_count = 20; + type = 1234; + strcpy( data, "xxxxxxxxxx" ); + res = RegEnumValueA( test_key, 0, NULL, NULL, NULL, &type, (BYTE*)data, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + + /* no value parameter */ + val_count = 20; + data_count = 20; + type = 1234; + strcpy( data, "xxxxxxxxxx" ); + res = RegEnumValueA( test_key, 0, NULL, &val_count, NULL, &type, (BYTE*)data, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + + /* no val_count parameter */ + data_count = 20; + type = 1234; + strcpy( value, "xxxxxxxxxx" ); + strcpy( data, "xxxxxxxxxx" ); + res = RegEnumValueA( test_key, 0, value, NULL, NULL, &type, (BYTE*)data, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + } + /* Unicode tests */ SetLastError(0xdeadbeef); @@ -710,6 +736,32 @@ static void test_enum_value(void) ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); ok( !memcmp( dataW, foobarW, sizeof(foobarW) ), "data is not 'foobar'\n" ); + if (pRegGetValueA) /* avoid a crash on Windows 2000 */ + { + /* no valueW and no val_count parameter */ + data_count = 20; + type = 1234; + memcpy( dataW, xxxW, sizeof(xxxW) ); + res = RegEnumValueW( test_key, 0, NULL, NULL, NULL, &type, (BYTE*)dataW, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + + /* no valueW parameter */ + val_count = 20; + data_count = 20; + type = 1234; + memcpy( dataW, xxxW, sizeof(xxxW) ); + res = RegEnumValueW( test_key, 0, NULL, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + + /* no val_count parameter */ + data_count = 20; + type = 1234; + memcpy( valueW, xxxW, sizeof(xxxW) ); + memcpy( dataW, xxxW, sizeof(xxxW) ); + res = RegEnumValueW( test_key, 0, valueW, NULL, NULL, &type, (BYTE*)dataW, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + } + cleanup: RegDeleteKeyA(test_key, ""); RegCloseKey(test_key);

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2015