July 2015 - Wine-Commits - list.winehq.org

Alexandre Julliard : include: Add ddk/ prefix when including ddk headers.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: 354688faba7bf2156e9cd6c868cce31201bb2448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=354688faba7bf2156e9cd6c86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 14:59:45 2015 +0900 include: Add ddk/ prefix when including ddk headers. --- include/ddk/hidport.h | 2 +- include/ddk/hidsdi.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/ddk/hidport.h b/include/ddk/hidport.h index 9af8c7e..219a8de 100644 --- a/include/ddk/hidport.h +++ b/include/ddk/hidport.h @@ -19,7 +19,7 @@ #ifndef __HIDPORT_H__ #define __HIDPORT_H__ -#include <hidclass.h> +#include <ddk/hidclass.h> typedef struct _HID_MINIDRIVER_REGISTRATION { diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 9ea89b5..566d030 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -19,8 +19,8 @@ #ifndef __WINE_HIDSDI_H #define __WINE_HIDSDI_H -#include "hidusage.h" -#include "hidpi.h" +#include <hidusage.h> +#include <ddk/hidpi.h> #ifndef WINE_NTSTATUS_DECLARED #define WINE_NTSTATUS_DECLARED

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest::send() method implementation.
by Alexandre Julliard July 8, 2015

July 8, 2015

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

Aric Stewart : hidclass.sys: Add hidclass.sys.
by Alexandre Julliard July 8, 2015

July 8, 2015

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

Aric Stewart : include: Add IRP_MJ_POWER minor function codes.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: f9105eac34e9c642554b45e9e1e49ab3f39aca60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9105eac34e9c642554b45e9e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 6 13:10:29 2015 -0500 include: Add IRP_MJ_POWER minor function codes. --- include/ddk/wdm.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 10832cf..7648161 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -269,6 +269,11 @@ typedef struct _WAIT_CONTEXT_BLOCK { #define IRP_MN_SURPRISE_REMOVAL 0x17 #define IRP_MN_QUERY_LEGACY_BUS_INFORMATION 0x18 +#define IRP_MN_WAIT_WAKE 0x00 +#define IRP_MN_POWER_SEQUENCE 0x01 +#define IRP_MN_SET_POWER 0x02 +#define IRP_MN_QUERY_POWER 0x03 + #define IRP_QUOTA_CHARGED 0x01 #define IRP_ALLOCATED_MUST_SUCCEED 0x02 #define IRP_ALLOCATED_FIXED_SIZE 0x04

1 0

Bernhard Übelacker : oleview: Call RegEnumValueW with value and val_count parameters.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: 94c6e3af3a17e0d7541a0a7cfaeff00bf944fa6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c6e3af3a17e0d7541a0a7cf… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Jun 30 14:38:05 2015 +0200 oleview: Call RegEnumValueW with value and val_count parameters. --- programs/oleview/tree.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 34021e7..17844bf 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -500,10 +500,12 @@ static void AddComponentCategories(void) { TVINSERTSTRUCTW tvis; HKEY hKey, hCurKey; + WCHAR keyName[MAX_LOAD_STRING]; WCHAR valName[MAX_LOAD_STRING]; WCHAR buffer[MAX_LOAD_STRING]; LONG lenBuffer; DWORD lenBufferHlp; + DWORD lenValName; int i=-1; U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_CHILDREN; @@ -520,23 +522,24 @@ static void AddComponentCategories(void) { i++; - if(RegEnumKeyW(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, keyName, sizeof(keyName)/sizeof(keyName[0])) != ERROR_SUCCESS) break; - if(RegOpenKeyW(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue; + if(RegOpenKeyW(hKey, keyName, &hCurKey) != ERROR_SUCCESS) continue; lenBuffer = sizeof(WCHAR[MAX_LOAD_STRING]); lenBufferHlp = sizeof(WCHAR[MAX_LOAD_STRING]); + lenValName = sizeof(WCHAR[MAX_LOAD_STRING]); if(RegQueryValueW(hCurKey, NULL, buffer, &lenBuffer) == ERROR_SUCCESS && *buffer) U(tvis).item.pszText = buffer; - else if(RegEnumValueW(hCurKey, 0, NULL, NULL, NULL, NULL, + else if(RegEnumValueW(hCurKey, 0, valName, &lenValName, NULL, NULL, (LPBYTE)buffer, &lenBufferHlp) == ERROR_SUCCESS && *buffer) U(tvis).item.pszText = buffer; else continue; RegCloseKey(hCurKey); - U(tvis).item.lParam = CreateITEM_INFO(REGTOP, valName, valName, NULL); + U(tvis).item.lParam = CreateITEM_INFO(REGTOP, keyName, keyName, NULL); SendMessageW(globals.hTree, TVM_INSERTITEMW, 0, (LPARAM)&tvis); }

1 0

Huw Davies : shell32: Fix threading model for the Known Folder Manager and Shell Link objects.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: 0b9737b1eaa5c5931b5f57dfa20f5b441a61f3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9737b1eaa5c5931b5f57dfa… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 19:42:55 2015 +0100 shell32: Fix threading model for the Known Folder Manager and Shell Link objects. --- dlls/shell32/shell32_classes.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index b849cef..f0131e7 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -45,7 +45,7 @@ coclass ExplorerBrowser { interface IExplorerBrowser; } [ helpstring("Known Folder Manager"), - threading(apartment), + threading(both), uuid(4df0c730-df9d-4ae3-9153-aa6b82e9795a) ] coclass KnownFolderManager { interface IKnownFolderManager; } @@ -99,7 +99,7 @@ coclass KnownFolderManager { interface IKnownFolderManager; } [ helpstring("Shortcut"), - threading(apartment), + threading(both), uuid(00021401-0000-0000-c000-000000000046) ] coclass ShellLink { interface IShellLinkW; }

1 0

Nikolay Sivov : dwrite: Implement GetGdiCompatibleMetrics().
by Alexandre Julliard July 8, 2015

July 8, 2015

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

Piotr Caban : msvcirt: Fix leak in ~ios and ios::init implementation.
by Alexandre Julliard July 8, 2015

July 8, 2015

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(a)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

Aric Stewart : include: New ddk/hidtypes.h include file.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: b32aaab065ba348d53ee904645ac7413e2a55995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32aaab065ba348d53ee90464… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 6 13:09:56 2015 -0500 include: New ddk/hidtypes.h include file. --- include/Makefile.in | 1 + include/ddk/hidtypes.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 54f0ae1..b524326 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -256,6 +256,7 @@ SRCDIR_INCLUDES = \ ddk/hidpi.h \ ddk/hidport.h \ ddk/hidsdi.h \ + ddk/hidtypes.h \ ddk/imm.h \ ddk/mountmgr.h \ ddk/ntddcdvd.h \ diff --git a/include/ddk/hidtypes.h b/include/ddk/hidtypes.h new file mode 100644 index 0000000..dfd1061 --- /dev/null +++ b/include/ddk/hidtypes.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 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 + */ +#ifndef __HIDTYPES_H +#define __HIDTYPES_H + +typedef enum _HID_STRING_TYPE { + HID_STRING_INDEXED = 0, + HID_STRING_ID_IMANUFACTURER, + HID_STRING_ID_IPRODUCT, + HID_STRING_ID_ISERIALNUMBER, + HID_STRING_MAX +} HID_STRING_TYPE; + +#endif /* __HIDTYPES_H */

1 0

Aric Stewart : include: Add ddk/hidport.h.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 71e5fdf478dbfb1821d4c39a55c3555cc8188741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e5fdf478dbfb1821d4c39a5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 6 13:07:47 2015 -0500 include: Add ddk/hidport.h. --- include/Makefile.in | 1 + include/ddk/hidport.h | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 795642d..54f0ae1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -254,6 +254,7 @@ SRCDIR_INCLUDES = \ ddk/csq.h \ ddk/hidclass.h \ ddk/hidpi.h \ + ddk/hidport.h \ ddk/hidsdi.h \ ddk/imm.h \ ddk/mountmgr.h \ diff --git a/include/ddk/hidport.h b/include/ddk/hidport.h new file mode 100644 index 0000000..9af8c7e --- /dev/null +++ b/include/ddk/hidport.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 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 + */ + +#ifndef __HIDPORT_H__ +#define __HIDPORT_H__ + +#include <hidclass.h> + +typedef struct _HID_MINIDRIVER_REGISTRATION +{ + ULONG Revision; + PDRIVER_OBJECT DriverObject; + PUNICODE_STRING RegistryPath; + ULONG DeviceExtensionSize; + BOOLEAN DevicesArePolled; + UCHAR Reserved[3]; +} HID_MINIDRIVER_REGISTRATION, *PHID_MINIDRIVER_REGISTRATION; + +NTSTATUS WINAPI HidRegisterMinidriver(PHID_MINIDRIVER_REGISTRATION MinidriverRegistration); + +#endif /* __HIDPORT_H__ */

1 0