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

Akihiro Sagawa : mciseq: Ensure the player thread termination when stopping.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: 41c45f36866934f8da8a710aa12a2f374fca9275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c45f36866934f8da8a710aa… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 23 00:07:48 2015 +0900 mciseq: Ensure the player thread termination when stopping. --- dlls/mciseq/mcimidi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 62b3192..864ab98 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -776,7 +776,7 @@ static DWORD MIDI_mciStop(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS if (oldstat == MCI_MODE_PAUSE) dwRet = midiOutReset((HMIDIOUT)wmm->hMidi); - if ((dwFlags & MCI_WAIT) && wmm->hThread) + if (wmm->hThread) WaitForSingleObject(wmm->hThread, INFINITE); } @@ -808,7 +808,10 @@ static DWORD MIDI_mciClose(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS wmm->hFile = 0; TRACE("hFile closed !\n"); } - if (wmm->hThread) CloseHandle(wmm->hThread); + if (wmm->hThread) { + CloseHandle(wmm->hThread); + wmm->hThread = 0; + } HeapFree(GetProcessHeap(), 0, wmm->tracks); HeapFree(GetProcessHeap(), 0, wmm->lpstrElementName); HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright);

1 0

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

22 Jul '15

Module: wine Branch: master Commit: 4ea5d00e580a407953bc83a95f8d775a31095933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea5d00e580a407953bc83a95… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Jul 22 23:33:50 2015 +0800 mshtml: Add IHTMLXMLHttpRequest::responseText() method implementation. --- dlls/mshtml/tests/xmlhttprequest.c | 6 +++--- dlls/mshtml/xmlhttprequest.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index a9a6a3c..db6aca4 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -647,9 +647,9 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) text = NULL; hres = IHTMLXMLHttpRequest_get_responseText(xhr, &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", + 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)); SysFreeString(text); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 54f0187..f680b17 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -289,8 +289,17 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_responseBody(IHTMLXMLHttpRequest *i static HRESULT WINAPI HTMLXMLHttpRequest_get_responseText(IHTMLXMLHttpRequest *iface, BSTR *p) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + nsAString_Init(&nsstr, NULL); + nsres = nsIXMLHttpRequest_GetResponseText(This->nsxhr, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLXMLHttpRequest_get_responseXML(IHTMLXMLHttpRequest *iface, IDispatch **p)

1 0

Aaryaman Vasishta : d3drm: Add stubs for IDirect3DRMDevice methods.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: e1e614d1800ae2c08636d51281f8cc2f6dab6ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e614d1800ae2c08636d5128… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Jul 22 15:46:12 2015 +0530 d3drm: Add stubs for IDirect3DRMDevice methods. --- dlls/d3drm/device.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 361 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1e614d1800ae2c08636d…

1 0

Akihiro Sagawa : po: Fix a mistake in Japanese translation.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: f94670b5fb7092c56d36e537d65b22ae486c862f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94670b5fb7092c56d36e537d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 23 00:07:50 2015 +0900 po: Fix a mistake in Japanese translation. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index f3b6d4c..2e64db5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-07-16 00:16+0900\n" +"PO-Revision-Date: 2015-07-22 00:22+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -13513,7 +13513,7 @@ msgstr "簡易編集モード(&Q)" #: wineconsole.rc:80 msgid "&Insert mode" -msgstr "挿入モード(&E)" +msgstr "挿入モード(&I)" #: wineconsole.rc:88 msgid "&Font"

1 0

Hans Leidekker : iphlpapi: Implement GetIfEntry2.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: 991474da4636430706e3e61b99b4e624e6d62ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=991474da4636430706e3e61b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 22 14:28:05 2015 +0200 iphlpapi: Implement GetIfEntry2. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 52 ++++++++++++++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 73 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 113 insertions(+), 14 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index aa7c7f0..d98d5c0 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -87,7 +87,7 @@ @ stdcall GetIcmpStatistics( ptr ) @ stub GetIcmpStatsFromStack @ stdcall GetIfEntry( ptr ) -#@ stub GetIfEntry2 +@ stdcall GetIfEntry2( ptr ) @ stub GetIfEntryFromStack #@ stub GetIfStackTable @ stdcall GetIfTable( ptr ptr long ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b6e2a07..b6ab612 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -51,6 +51,7 @@ #include "ipstats.h" #include "ipifcons.h" #include "fltdefs.h" +#include "ifdef.h" #include "netioapi.h" #include "wine/debug.h" @@ -1685,6 +1686,57 @@ DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow) return ret; } +/****************************************************************** + * GetIfEntry2 (IPHLPAPI.@) + */ +DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) +{ + DWORD ret, len = sizeof(row2->Description)/sizeof(row2->Description[0]); + char buf[MAX_ADAPTER_NAME], *name; + MIB_IFROW row; + + TRACE("%p\n", row2); + + if (!row2 || (!(name = getInterfaceNameByIndex( row2->InterfaceIndex, buf )) && + !(name = getInterfaceNameByIndex( row2->InterfaceLuid.Info.NetLuidIndex, buf )))) + { + return ERROR_INVALID_PARAMETER; + } + if ((ret = getInterfaceEntryByName( name, &row ))) return ret; + if ((ret = getInterfaceStatsByName( name, &row ))) return ret; + + memset( row2, 0, sizeof(*row2) ); + row2->InterfaceLuid.Info.Reserved = 0; + row2->InterfaceLuid.Info.NetLuidIndex = row.dwIndex; + row2->InterfaceLuid.Info.IfType = row.dwType; + row2->InterfaceIndex = row.dwIndex; + row2->InterfaceGuid.Data1 = row.dwIndex; + row2->Type = row.dwType; + row2->Mtu = row.dwMtu; + MultiByteToWideChar( CP_UNIXCP, 0, (const char *)row.bDescr, -1, row2->Description, len ); + row2->PhysicalAddressLength = row.dwPhysAddrLen; + memcpy( &row2->PhysicalAddress, &row.bPhysAddr, row.dwPhysAddrLen ); + memcpy( &row2->PermanentPhysicalAddress, &row.bPhysAddr, row.dwPhysAddrLen ); + row2->OperStatus = IfOperStatusUp; + row2->AdminStatus = NET_IF_ADMIN_STATUS_UP; + row2->MediaConnectState = MediaConnectStateConnected; + row2->ConnectionType = NET_IF_CONNECTION_DEDICATED; + + /* stats */ + row2->InOctets = row.dwInOctets; + row2->InUcastPkts = row.dwInUcastPkts; + row2->InNUcastPkts = row.dwInNUcastPkts; + row2->InDiscards = row.dwInDiscards; + row2->InErrors = row.dwInErrors; + row2->InUnknownProtos = row.dwInUnknownProtos; + row2->OutOctets = row.dwOutOctets; + row2->OutUcastPkts = row.dwOutUcastPkts; + row2->OutNUcastPkts = row.dwOutNUcastPkts; + row2->OutDiscards = row.dwOutDiscards; + row2->OutErrors = row.dwOutErrors; + + return NO_ERROR; +} static int IfTableSorter(const void *a, const void *b) { diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 30e75b7..fc91142 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -41,6 +41,7 @@ #include "ws2tcpip.h" #include "iphlpapi.h" #include "iprtrmib.h" +#include "netioapi.h" #include "wine/test.h" #include <stdio.h> #include <stdlib.h> @@ -52,6 +53,7 @@ static HMODULE hLibrary = NULL; static DWORD (WINAPI *pGetNumberOfInterfaces)(PDWORD); static DWORD (WINAPI *pGetIpAddrTable)(PMIB_IPADDRTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetIfEntry)(PMIB_IFROW); +static DWORD (WINAPI *pGetIfEntry2)(PMIB_IF_ROW2); static DWORD (WINAPI *pGetFriendlyIfIndex)(DWORD); static DWORD (WINAPI *pGetIfTable)(PMIB_IFTABLE,PULONG,BOOL); static DWORD (WINAPI *pGetIpForwardTable)(PMIB_IPFORWARDTABLE,PULONG,BOOL); @@ -97,6 +99,7 @@ static void loadIPHlpApi(void) pGetNumberOfInterfaces = (void *)GetProcAddress(hLibrary, "GetNumberOfInterfaces"); pGetIpAddrTable = (void *)GetProcAddress(hLibrary, "GetIpAddrTable"); pGetIfEntry = (void *)GetProcAddress(hLibrary, "GetIfEntry"); + pGetIfEntry2 = (void *)GetProcAddress(hLibrary, "GetIfEntry2"); pGetFriendlyIfIndex = (void *)GetProcAddress(hLibrary, "GetFriendlyIfIndex"); pGetIfTable = (void *)GetProcAddress(hLibrary, "GetIfTable"); pGetIpForwardTable = (void *)GetProcAddress(hLibrary, "GetIpForwardTable"); @@ -1643,12 +1646,33 @@ static void test_CreateSortedAddressPairs(void) pFreeMibTable( pair ); } +static DWORD get_interface_index(void) +{ + DWORD size = 0, ret = 0; + IP_ADAPTER_ADDRESSES *buf, *aa; + + if (pGetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ) != ERROR_BUFFER_OVERFLOW) + return 0; + + buf = HeapAlloc( GetProcessHeap(), 0, size ); + pGetAdaptersAddresses( AF_UNSPEC, 0, NULL, buf, &size ); + for (aa = buf; aa; aa = aa->Next) + { + if (aa->IfType == IF_TYPE_ETHERNET_CSMACD) + { + ret = aa->IfIndex; + break; + } + } + HeapFree( GetProcessHeap(), 0, buf ); + return ret; +} + static void test_interface_identifier_conversion(void) { - DWORD ret, size; + DWORD ret; NET_LUID luid; GUID guid; - IP_ADAPTER_ADDRESSES *buf, *aa; SIZE_T len; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; char nameA[IF_MAX_STRING_SIZE + 1]; @@ -1659,15 +1683,7 @@ static void test_interface_identifier_conversion(void) win_skip( "ConvertInterfaceIndexToLuid not available\n" ); return; } - - size = 0; - ret = pGetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); - if (ret != ERROR_BUFFER_OVERFLOW) return; - - buf = HeapAlloc( GetProcessHeap(), 0, size ); - pGetAdaptersAddresses( AF_UNSPEC, 0, NULL, buf, &size ); - for (aa = buf; aa; aa = aa->Next) { if (aa->IfType == IF_TYPE_ETHERNET_CSMACD) break; } - if (aa->IfType != IF_TYPE_ETHERNET_CSMACD) + if (!(index = get_interface_index())) { skip( "no suitable interface found\n" ); return; @@ -1685,7 +1701,7 @@ static void test_interface_identifier_conversion(void) ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); memset( &luid, 0, sizeof(luid) ); - ret = pConvertInterfaceIndexToLuid( aa->IfIndex, &luid ); + ret = pConvertInterfaceIndexToLuid( index, &luid ); ok( !ret, "got %u\n", ret ); ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); @@ -1817,8 +1833,38 @@ static void test_interface_identifier_conversion(void) ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); +} - HeapFree( GetProcessHeap(), 0, buf ); +static void test_GetIfEntry2(void) +{ + DWORD ret; + MIB_IF_ROW2 row; + NET_IFINDEX index; + + if (!pGetIfEntry2) + { + win_skip( "GetIfEntry2 not available\n" ); + return; + } + if (!(index = get_interface_index())) + { + skip( "no suitable interface found\n" ); + return; + } + + ret = pGetIfEntry2( NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + ret = pGetIfEntry2( &row ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = index; + ret = pGetIfEntry2( &row ); + ok( ret == NO_ERROR, "got %u\n", ret ); + ok( row.InterfaceIndex == index, "got %u\n", index ); + ok( row.InterfaceLuid.Info.NetLuidIndex, "got %u\n", index ); } START_TEST(iphlpapi) @@ -1842,6 +1888,7 @@ START_TEST(iphlpapi) test_GetExtendedUdpTable(); test_CreateSortedAddressPairs(); test_interface_identifier_conversion(); + test_GetIfEntry2(); freeIPHlpApi(); } }

1 0

Aaryaman Vasishta : d3drm: Thunk relevant IDirect3DRMDevice2 stubs to version 3.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: d06bc848f5f66f0600741a21eef6350c76a3632b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06bc848f5f66f0600741a21e… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Jul 22 15:46:11 2015 +0530 d3drm: Thunk relevant IDirect3DRMDevice2 stubs to version 3. --- dlls/d3drm/device.c | 162 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 112 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d06bc848f5f66f0600741…

1 0

Hans Leidekker : iphlpapi: Implement a couple of interface identifier conversion functions.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: 6cf1de4492b05544e902af37b7076daff4ae6367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf1de4492b05544e902af37b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 22 14:26:59 2015 +0200 iphlpapi: Implement a couple of interface identifier conversion functions. --- dlls/iphlpapi/iphlpapi.spec | 14 +-- dlls/iphlpapi/iphlpapi_main.c | 171 +++++++++++++++++++++++++++++++++++- dlls/iphlpapi/tests/iphlpapi.c | 195 +++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/netioapi.h | 32 +++++++ 5 files changed, 404 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cf1de4492b05544e902a…

1 0

Nikolay Sivov : webservices: Added WsCreateError stub.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: 939fb10a6e0d438d7d01531d2f089714349f5bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=939fb10a6e0d438d7d01531d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 22 13:54:59 2015 +0300 webservices: Added WsCreateError stub. --- dlls/webservices/main.c | 17 ++++++++++----- dlls/webservices/webservices.spec | 2 +- include/Makefile.in | 1 + include/webservices.h | 46 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/main.c b/dlls/webservices/main.c index db8aaea..e221d57 100644 --- a/dlls/webservices/main.c +++ b/dlls/webservices/main.c @@ -18,16 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#define COBJMACROS - #include "windef.h" #include "winbase.h" -#include "initguid.h" -#include "wincodec.h" +#include "webservices.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(webservices); @@ -47,3 +42,13 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +/************************************************************************** + * WsCreateError [webservices.@] + */ +HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY *properties, ULONG count, WS_ERROR **error) +{ + FIXME("%p %u %p: stub\n", properties, count, error); + if (error) *error = NULL; + return E_NOTIMPL; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 7bbf5dd..386207c 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -22,7 +22,7 @@ @ stub WsCopyNode @ stub WsCreateChannel @ stub WsCreateChannelForListener -@ stub WsCreateError +@ stdcall WsCreateError(ptr long ptr) @ stub WsCreateFaultFromError @ stub WsCreateHeap @ stub WsCreateListener diff --git a/include/Makefile.in b/include/Makefile.in index 87cabec..882e78a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -597,6 +597,7 @@ SRCDIR_INCLUDES = \ vsstyle.h \ vssym32.h \ vswriter.h \ + webservices.h \ werapi.h \ wfext.h \ wia.h \ diff --git a/include/webservices.h b/include/webservices.h new file mode 100644 index 0000000..954fd49 --- /dev/null +++ b/include/webservices.h @@ -0,0 +1,46 @@ +/* + * Copyright 2015 Nikolay Sivov for CodeWeavers + * + * 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 __WINE_WEBSERVICES_H +#define __WINE_WEBSERVICES_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +typedef struct _WS_ERROR WS_ERROR; + +typedef enum { + WS_ERROR_PROPERTY_STRING_COUNT, + WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, + WS_ERROR_PROPERTY_LANGID +} WS_ERROR_PROPERTY_ID; + +typedef struct _WS_ERROR_PROPERTY { + WS_ERROR_PROPERTY_ID id; + void *value; + ULONG valueSize; +} WS_ERROR_PROPERTY; + +HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __WINE_WEBSERVICES_H */

1 0

Hans Leidekker : include: Add definition of MIB_IF_ROW2.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: 2630146bcd2889ee3cbe020261668d47b16ac183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2630146bcd2889ee3cbe02026… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 22 14:27:34 2015 +0200 include: Add definition of MIB_IF_ROW2. --- include/ipifcons.h | 2 ++ include/netioapi.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ntddndis.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+) diff --git a/include/ipifcons.h b/include/ipifcons.h index d50f129..a29ddb2 100644 --- a/include/ipifcons.h +++ b/include/ipifcons.h @@ -227,6 +227,8 @@ #define MIB_IF_TYPE_LOOPBACK 24 #define MIB_IF_TYPE_SLIP 28 +typedef ULONG IFTYPE; + #define MIB_IF_ADMIN_STATUS_UP 1 #define MIB_IF_ADMIN_STATUS_DOWN 2 #define MIB_IF_ADMIN_STATUS_TESTING 3 diff --git a/include/netioapi.h b/include/netioapi.h index 3f533f8..894dbc5 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -19,6 +19,63 @@ #ifndef __WINE_NETIOAPI_H #define __WINE_NETIOAPI_H +#include <ntddndis.h> + +typedef struct _MIB_IF_ROW2 +{ + NET_LUID InterfaceLuid; + NET_IFINDEX InterfaceIndex; + GUID InterfaceGuid; + WCHAR Alias[IF_MAX_STRING_SIZE + 1]; + WCHAR Description[IF_MAX_STRING_SIZE + 1]; + ULONG PhysicalAddressLength; + UCHAR PhysicalAddress[IF_MAX_PHYS_ADDRESS_LENGTH]; + UCHAR PermanentPhysicalAddress[IF_MAX_PHYS_ADDRESS_LENGTH]; + ULONG Mtu; + IFTYPE Type; + TUNNEL_TYPE TunnelType; + NDIS_MEDIUM MediaType; + NDIS_PHYSICAL_MEDIUM PhysicalMediumType; + NET_IF_ACCESS_TYPE AccessType; + NET_IF_DIRECTION_TYPE DirectionType; + struct + { + BOOLEAN HardwareInterface : 1; + BOOLEAN FilterInterface : 1; + BOOLEAN ConnectorPresent : 1; + BOOLEAN NotAuthenticated : 1; + BOOLEAN NotMediaConnected : 1; + BOOLEAN Paused : 1; + BOOLEAN LowPower : 1; + BOOLEAN EndPointInterface : 1; + } InterfaceAndOperStatusFlags; + IF_OPER_STATUS OperStatus; + NET_IF_ADMIN_STATUS AdminStatus; + NET_IF_MEDIA_CONNECT_STATE MediaConnectState; + NET_IF_NETWORK_GUID NetworkGuid; + NET_IF_CONNECTION_TYPE ConnectionType; + ULONG64 TransmitLinkSpeed; + ULONG64 ReceiveLinkSpeed; + ULONG64 InOctets; + ULONG64 InUcastPkts; + ULONG64 InNUcastPkts; + ULONG64 InDiscards; + ULONG64 InErrors; + ULONG64 InUnknownProtos; + ULONG64 InUcastOctets; + ULONG64 InMulticastOctets; + ULONG64 InBroadcastOctets; + ULONG64 OutOctets; + ULONG64 OutUcastPkts; + ULONG64 OutNUcastPkts; + ULONG64 OutDiscards; + ULONG64 OutErrors; + ULONG64 OutUcastOctets; + ULONG64 OutMulticastOctets; + ULONG64 OutBroadcastOctets; + ULONG64 OutQLen; +} MIB_IF_ROW2, *PMIB_IF_ROW2; + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*); @@ -28,5 +85,6 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID*,WCHAR*,SIZE_T); DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); void WINAPI FreeMibTable(void*); +DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); #endif /* __WINE_NETIOAPI_H */ diff --git a/include/ntddndis.h b/include/ntddndis.h index 1715628..3ea18ce 100644 --- a/include/ntddndis.h +++ b/include/ntddndis.h @@ -165,6 +165,56 @@ typedef struct _NDIS_802_11_BSSID_LIST { typedef int NDIS_STATUS, *PNDIS_STATUS; #endif +typedef enum _NDIS_MEDIUM +{ + NdisMedium802_3, + NdisMedium802_5, + NdisMediumFddi, + NdisMediumWan, + NdisMediumLocalTalk, + NdisMediumDix, + NdisMediumArcnetRaw, + NdisMediumArcnet878_2, + NdisMediumAtm, + NdisMediumWirelessWan, + NdisMediumIrda, + NdisMediumBpc, + NdisMediumCoWan, + NdisMedium1394, + NdisMediumInfiniBand, + NdisMediumTunnel, + NdisMediumNative802_11, + NdisMediumLoopback, + NdisMediumWiMAX, + NdisMediumIP, + NdisMediumMax +} NDIS_MEDIUM, *PNDIS_MEDIUM; + +typedef enum _NDIS_PHYSICAL_MEDIUM +{ + NdisPhysicalMediumUnspecified, + NdisPhysicalMediumWirelessLan, + NdisPhysicalMediumCableModem, + NdisPhysicalMediumPhoneLine, + NdisPhysicalMediumPowerLine, + NdisPhysicalMediumDSL, + NdisPhysicalMediumFibreChannel, + NdisPhysicalMedium1394, + NdisPhysicalMediumWirelessWan, + NdisPhysicalMediumNative802_11, + NdisPhysicalMediumBluetooth, + NdisPhysicalMediumInfiniband, + NdisPhysicalMediumWiMax, + NdisPhysicalMediumUWB, + NdisPhysicalMedium802_3, + NdisPhysicalMedium802_5, + NdisPhysicalMediumIrda, + NdisPhysicalMediumWiredWAN, + NdisPhysicalMediumWiredCoWan, + NdisPhysicalMediumOther, + NdisPhysicalMediumMax +} NDIS_PHYSICAL_MEDIUM, *PNDIS_PHYSICAL_MEDIUM; + #ifdef __cplusplus } #endif

1 0

Nikolay Sivov : shell32: Added GetCurrentProcessExplicitAppUserModelID() stub.
by Alexandre Julliard 22 Jul '15

22 Jul '15

Module: wine Branch: master Commit: e7acfee978219b88eafe921e6a4e70c4569a41f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7acfee978219b88eafe921e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 22 12:51:29 2015 +0300 shell32: Added GetCurrentProcessExplicitAppUserModelID() stub. --- .../api-ms-win-downlevel-shell32-l1-1-0.spec | 2 +- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 10 ++++++++ dlls/shell32/tests/appbar.c | 27 +++++++++++++++++++++- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec index 9e51a4a..9d03c03 100644 --- a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec @@ -1,3 +1,3 @@ @ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW -@ stub GetCurrentProcessExplicitAppUserModelID +@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index ed34919..ce3a9f7 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -310,6 +310,7 @@ @ stdcall FindExecutableW(wstr wstr ptr) @ stub FixupOptionalComponents @ stdcall FreeIconList(long) +@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) @ stdcall InitNetworkAddressControl() @ stub InternalExtractIconListA @ stub InternalExtractIconListW diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index cabf5e4..fd4b8c8 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1378,6 +1378,16 @@ HRESULT WINAPI SetCurrentProcessExplicitAppUserModelID(PCWSTR appid) } /*********************************************************************** + * GetCurrentProcessExplicitAppUserModelID (SHELL32.@) + */ +HRESULT WINAPI GetCurrentProcessExplicitAppUserModelID(PWSTR *appid) +{ + FIXME("%p: stub\n", appid); + *appid = NULL; + return E_NOTIMPL; +} + +/*********************************************************************** * SHSetUnreadMailCountW (SHELL32.@) */ HRESULT WINAPI SHSetUnreadMailCountW(LPCWSTR mailaddress, DWORD count, LPCWSTR executecommand) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 7675493..8138131 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -29,6 +29,7 @@ static const CHAR testwindow_class[] = "testwindow"; static HMONITOR (WINAPI *pMonitorFromWindow)(HWND, DWORD); +static HRESULT (WINAPI *pGetCurrentProcessExplicitAppUserModelID)(PWSTR*); typedef BOOL (*boolean_function)(void); @@ -430,15 +431,39 @@ static void test_appbarget(void) return; } +static void test_GetCurrentProcessExplicitAppUserModelID(void) +{ + WCHAR *appid; + HRESULT hr; + + if (!pGetCurrentProcessExplicitAppUserModelID) + { + win_skip("GetCurrentProcessExplicitAppUserModelID() is not supported.\n"); + return; + } + +if (0) /* crashes on native */ + hr = pGetCurrentProcessExplicitAppUserModelID(NULL); + + appid = (void*)0xdeadbeef; + hr = pGetCurrentProcessExplicitAppUserModelID(&appid); +todo_wine + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(appid == NULL, "got %p\n", appid); +} + START_TEST(appbar) { - HMODULE huser32; + HMODULE huser32, hshell32; huser32 = GetModuleHandleA("user32.dll"); + hshell32 = GetModuleHandleA("shell32.dll"); pMonitorFromWindow = (void*)GetProcAddress(huser32, "MonitorFromWindow"); + pGetCurrentProcessExplicitAppUserModelID = (void*)GetProcAddress(hshell32, "GetCurrentProcessExplicitAppUserModelID"); register_testwindow_class(); test_setpos(); test_appbarget(); + test_GetCurrentProcessExplicitAppUserModelID(); }

1 0