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

Mike Kaplinskiy : ws2/tests: Test AcceptEx with a deferred socket.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: 1dd1ea2e171fb1d81c50680903da04da19b5dab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd1ea2e171fb1d81c5068090… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Jul 13 21:35:33 2009 -0400 ws2/tests: Test AcceptEx with a deferred socket. --- dlls/ws2_32/tests/sock.c | 127 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 124 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index acb2638..672c96e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2539,17 +2539,26 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); } +static int CALLBACK AlwaysDeferConditionFunc(LPWSABUF lpCallerId, LPWSABUF lpCallerData, LPQOS pQos, + LPQOS lpGQOS, LPWSABUF lpCalleeId, LPWSABUF lpCalleeData, + GROUP FAR * g, DWORD_PTR dwCallbackData) +{ + return CF_DEFER; +} + static void test_AcceptEx(void) { SOCKET listener = INVALID_SOCKET; SOCKET acceptor = INVALID_SOCKET; SOCKET connector = INVALID_SOCKET; + SOCKET connector2 = INVALID_SOCKET; struct sockaddr_in bindAddress; int socklen; GUID acceptExGuid = WSAID_ACCEPTEX; - BOOL WINAPI (*pAcceptEx)(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, - DWORD local_addr_len, DWORD rem_addr_len, LPDWORD received, - LPOVERLAPPED overlapped); + LPFN_ACCEPTEX pAcceptEx = NULL; + fd_set fds_accept, fds_send; + struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ + int got, conn1, i; DWORD bytesReturned; char buffer[1024]; OVERLAPPED overlapped; @@ -2717,6 +2726,116 @@ static void test_AcceptEx(void) closesocket(acceptor); acceptor = INVALID_SOCKET; + /* Test CF_DEFER & AcceptEx interaction */ + + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + connector2 = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + + if (set_blocking(connector, FALSE)) { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto end; + } + + if (set_blocking(connector2, FALSE)) { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto end; + } + + /* Connect socket #1 */ + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(iret == 0 || + (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK), "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + + FD_ZERO ( &fds_accept ); + FD_ZERO ( &fds_send ); + + FD_SET ( listener, &fds_accept ); + FD_SET ( connector, &fds_send ); + + buffer[0] = '0'; + got = 0; + conn1 = 0; + + for (i = 0; i < 4000; ++i) + { + wsa_ok ( ( select ( 0, &fds_accept, &fds_send, NULL, &timeout ) ), SOCKET_ERROR !=, + "select_server (%x): select() failed: %d\n" ); + + /* check for incoming requests */ + if ( FD_ISSET ( listener, &fds_accept ) ) { + got++; + if (got == 1) { + SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); + ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection\n"); + bret = pAcceptEx(listener, acceptor, buffer, 0, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + } + else if (got == 2) { + /* this should be socket #2 */ + SOCKET tmp = accept(listener, NULL, NULL); + ok(tmp != INVALID_SOCKET, "accept failed %d\n", WSAGetLastError()); + closesocket(tmp); + } + else { + ok(FALSE, "Got more than 2 connections?\n"); + } + } + if ( conn1 && FD_ISSET ( connector2, &fds_send ) ) { + /* Send data on second socket, and stop */ + send(connector2, "2", 1, 0); + FD_CLR ( connector2, &fds_send ); + + break; + } + if ( FD_ISSET ( connector, &fds_send ) ) { + /* Once #1 is connected, allow #2 to connect */ + conn1 = 1; + + send(connector, "1", 1, 0); + FD_CLR ( connector, &fds_send ); + + iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(iret == 0 || + (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK), "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + FD_SET ( connector2, &fds_send ); + } + } + + ok (got == 2, "Did not get both connections\n"); + + dwret = WaitForSingleObject(overlapped.hEvent, 0); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); + ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + + set_blocking(acceptor, TRUE); + iret = recv( acceptor, buffer, 2, 0); + ok(iret == 1, "Failed to get data, %d\n", iret); + + ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); + + closesocket(connector); + connector = INVALID_SOCKET; + closesocket(acceptor); + acceptor = INVALID_SOCKET; + /* Disconnect during receive? */ acceptor = socket(AF_INET, SOCK_STREAM, 0); @@ -2756,6 +2875,8 @@ end: closesocket(acceptor); if (connector != INVALID_SOCKET) closesocket(connector); + if (connector2 != INVALID_SOCKET) + closesocket(connector2); } /**************** Main program ***************/

1 0

Eric Pouech : dbghelp: Fixed regressions introduced by growing arrays exponentially instead of linearly .
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: f2b7ec1c2cd22d9a2a6b7e15617f0acba5472727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b7ec1c2cd22d9a2a6b7e156… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jul 14 12:17:22 2009 +0200 dbghelp: Fixed regressions introduced by growing arrays exponentially instead of linearly. --- dlls/dbghelp/minidump.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index a786d29..4108ef4 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -266,18 +266,23 @@ static BOOL add_module(struct dump_context* dc, const WCHAR* name, dc->modules = HeapReAlloc(GetProcessHeap(), 0, dc->modules, dc->alloc_modules * sizeof(*dc->modules)); } - if (!dc->modules) return FALSE; + if (!dc->modules) + { + dc->alloc_modules = dc->num_modules = 0; + return FALSE; + } if (is_elf || !GetModuleFileNameExW(dc->hProcess, (HMODULE)base, - dc->modules[dc->num_modules - 1].name, - sizeof(dc->modules[dc->num_modules - 1].name) / sizeof(WCHAR))) - lstrcpynW(dc->modules[dc->num_modules - 1].name, name, - sizeof(dc->modules[dc->num_modules - 1].name) / sizeof(WCHAR)); - dc->modules[dc->num_modules - 1].base = base; - dc->modules[dc->num_modules - 1].size = size; - dc->modules[dc->num_modules - 1].timestamp = timestamp; - dc->modules[dc->num_modules - 1].checksum = checksum; - dc->modules[dc->num_modules - 1].is_elf = is_elf; + dc->modules[dc->num_modules].name, + sizeof(dc->modules[dc->num_modules].name) / sizeof(WCHAR))) + lstrcpynW(dc->modules[dc->num_modules].name, name, + sizeof(dc->modules[dc->num_modules].name) / sizeof(WCHAR)); + dc->modules[dc->num_modules].base = base; + dc->modules[dc->num_modules].size = size; + dc->modules[dc->num_modules].timestamp = timestamp; + dc->modules[dc->num_modules].checksum = checksum; + dc->modules[dc->num_modules].is_elf = is_elf; + dc->num_modules++; return TRUE; } @@ -402,9 +407,10 @@ static void add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, } if (dc->mem) { - dc->mem[dc->num_mem - 1].base = base; - dc->mem[dc->num_mem - 1].size = size; - dc->mem[dc->num_mem - 1].rva = rva; + dc->mem[dc->num_mem].base = base; + dc->mem[dc->num_mem].size = size; + dc->mem[dc->num_mem].rva = rva; + dc->num_mem++; } else dc->num_mem = dc->alloc_mem = 0; }

1 0

Hans Leidekker : wmiutils: Register interfaces.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: 8013e45e4c8d4c25d2f32dcd1d17f1b529fb4339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8013e45e4c8d4c25d2f32dcd1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:28:50 2009 +0200 wmiutils: Register interfaces. --- dlls/wmiutils/Makefile.in | 3 +- dlls/wmiutils/regsvr.c | 424 +++++++++++++++++++++++++++++++++++++++++++ dlls/wmiutils/wmiutils.spec | 4 +- tools/wine.inf.in | 1 + 4 files changed, 429 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8013e45e4c8d4c25d2f32…

1 0

Hans Leidekker : wmiutils: Add class factory.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: ceee3ddf472c4ab6908f82583a71f57ad1b8f554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceee3ddf472c4ab6908f82583… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:28:29 2009 +0200 wmiutils: Add class factory. --- dlls/wmiutils/main.c | 104 +++++++++++++++++++++++++++++++++++++++++++ dlls/wmiutils/wmiutils.spec | 4 +- 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c index 8e8b005..6dda4bc 100644 --- a/dlls/wmiutils/main.c +++ b/dlls/wmiutils/main.c @@ -19,14 +19,98 @@ #include "config.h" #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "objbase.h" +#include "wbemcli.h" #include "wine/debug.h" +#include "wmiutils_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); +typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); + +typedef struct +{ + const struct IClassFactoryVtbl *vtbl; + fnCreateInstance pfnCreateInstance; +} wmiutils_cf; + +static inline wmiutils_cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (wmiutils_cf *)((char *)iface - FIELD_OFFSET( wmiutils_cf, vtbl )); +} + +static HRESULT WINAPI wmiutils_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI wmiutils_cf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI wmiutils_cf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI wmiutils_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + wmiutils_cf *This = impl_from_IClassFactory( iface ); + HRESULT r; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + if (FAILED(r)) + return r; + + r = IUnknown_QueryInterface( punk, riid, ppobj ); + if (FAILED(r)) + return r; + + IUnknown_Release( punk ); + return r; +} + +static HRESULT WINAPI wmiutils_cf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME("(%p)->(%d)\n", iface, dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl wmiutils_cf_vtbl = +{ + wmiutils_cf_QueryInterface, + wmiutils_cf_AddRef, + wmiutils_cf_Release, + wmiutils_cf_CreateInstance, + wmiutils_cf_LockServer +}; + +static wmiutils_cf status_code_cf = { &wmiutils_cf_vtbl, WbemStatusCodeText_create }; + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) { switch(reason) @@ -41,3 +125,23 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) } return TRUE; } + +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) +{ + IClassFactory *cf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + if (IsEqualGUID( rclsid, &CLSID_WbemStatusCode )) + { + cf = (IClassFactory *)&status_code_cf.vtbl; + } + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, ppv ); +} + +HRESULT WINAPI DllCanUnloadNow( void ) +{ + FIXME("\n"); + return S_FALSE; +} diff --git a/dlls/wmiutils/wmiutils.spec b/dlls/wmiutils/wmiutils.spec index c5fc87a..c534b4f 100644 --- a/dlls/wmiutils/wmiutils.spec +++ b/dlls/wmiutils/wmiutils.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllRegisterServer @ stub DllUnregisterServer

1 0

Hans Leidekker : wmiutils: Add a stub implementation of IWbemStatusCodeText .
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: 0520defecc69eff4480a500f509d6a169a2d688f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0520defecc69eff4480a500f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:28:09 2009 +0200 wmiutils: Add a stub implementation of IWbemStatusCodeText. --- dlls/wmiutils/Makefile.in | 5 +- dlls/wmiutils/statuscode.c | 153 ++++++++++++++++++++++++++++++++++++++ dlls/wmiutils/wmiutils_private.h | 19 +++++ 3 files changed, 175 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in index 09d1cb4..9e44d7b 100644 --- a/dlls/wmiutils/Makefile.in +++ b/dlls/wmiutils/Makefile.in @@ -3,10 +3,11 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wmiutils.dll -IMPORTS = kernel32 +IMPORTS = oleaut32 kernel32 C_SRCS = \ - main.c + main.c \ + statuscode.c @MAKE_DLL_RULES@ diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c new file mode 100644 index 0000000..dfa3872 --- /dev/null +++ b/dlls/wmiutils/statuscode.c @@ -0,0 +1,153 @@ +/* + * Copyright 2009 Hans Leidekker 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "initguid.h" +#include "ole2.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wmiutils_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); + +typedef struct status_code +{ + const IWbemStatusCodeTextVtbl *vtbl; + LONG refs; +} status_code; + +static inline status_code *impl_from_IWbemStatusCodeText( IWbemStatusCodeText *iface ) +{ + return (status_code *)((char *)iface - FIELD_OFFSET( status_code, vtbl )); +} + +static ULONG WINAPI status_code_AddRef( + IWbemStatusCodeText *iface ) +{ + status_code *status_code = impl_from_IWbemStatusCodeText( iface ); + return InterlockedIncrement( &status_code->refs ); +} + +static ULONG WINAPI status_code_Release( + IWbemStatusCodeText *iface ) +{ + status_code *status_code = impl_from_IWbemStatusCodeText( iface ); + LONG refs = InterlockedDecrement( &status_code->refs ); + if (!refs) + { + TRACE("destroying %p\n", status_code); + HeapFree( GetProcessHeap(), 0, status_code ); + } + return refs; +} + +static HRESULT WINAPI status_code_QueryInterface( + IWbemStatusCodeText *iface, + REFIID riid, + void **ppvObject ) +{ + status_code *This = impl_from_IWbemStatusCodeText( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IWbemStatusCodeText ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWbemStatusCodeText_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI status_code_GetErrorCodeText( + IWbemStatusCodeText *iface, + HRESULT res, + LCID lcid, + LONG flags, + BSTR *text ) +{ + static const WCHAR fmt[] = + {'E','r','r','o','r',' ','c','o','d','e',':',' ','0','x','%','0','8','x',0}; + WCHAR msg[32]; + + FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); + + sprintfW(msg, fmt, res); + *text = SysAllocString(msg); + return WBEM_S_NO_ERROR; +} + +static HRESULT WINAPI status_code_GetFacilityCodeText( + IWbemStatusCodeText *iface, + HRESULT res, + LCID lcid, + LONG flags, + BSTR *text ) +{ + static const WCHAR fmt[] = + {'F','a','c','i','l','i','t','y',' ','c','o','d','e',':',' ','0','x','%','0','8','x',0}; + WCHAR msg[32]; + + FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); + + sprintfW(msg, fmt, res); + *text = SysAllocString(msg); + return WBEM_S_NO_ERROR; +} + +static const struct IWbemStatusCodeTextVtbl status_code_vtbl = +{ + status_code_QueryInterface, + status_code_AddRef, + status_code_Release, + status_code_GetErrorCodeText, + status_code_GetFacilityCodeText +}; + +HRESULT WbemStatusCodeText_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + status_code *sc; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + sc = HeapAlloc( GetProcessHeap(), 0, sizeof(*sc) ); + if (!sc) return E_OUTOFMEMORY; + + sc->vtbl = &status_code_vtbl; + sc->refs = 1; + + *ppObj = &sc->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h new file mode 100644 index 0000000..23082ce --- /dev/null +++ b/dlls/wmiutils/wmiutils_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2009 Hans Leidekker 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 + */ + +HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *);

1 0

Hans Leidekker : wmiutils: New dll.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: dd1d8cab3aa52da66de61c6f71f480bd75578021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1d8cab3aa52da66de61c6f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:27:46 2009 +0200 wmiutils: New dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/wmiutils/Makefile.in | 13 +++++++++++++ dlls/wmiutils/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/wmiutils/wmiutils.spec | 4 ++++ 5 files changed, 70 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f082f38..029742a 100755 --- a/configure +++ b/configure @@ -28041,6 +28041,14 @@ dlls/wmi/Makefile: dlls/wmi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wmi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/wmiutils/Makefile" +test "x$enable_wmiutils" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wmiutils" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/wmiutils/Makefile: dlls/wmiutils/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/wmiutils/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/wnaspi32/Makefile" test "x$enable_wnaspi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ wnaspi32" @@ -29791,6 +29799,7 @@ do "dlls/wldap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wldap32/Makefile" ;; "dlls/wldap32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wldap32/tests/Makefile" ;; "dlls/wmi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wmi/Makefile" ;; + "dlls/wmiutils/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wmiutils/Makefile" ;; "dlls/wnaspi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wnaspi32/Makefile" ;; "dlls/wow32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wow32/Makefile" ;; "dlls/ws2_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ws2_32/Makefile" ;; diff --git a/configure.ac b/configure.ac index b271773..3b805fe 100644 --- a/configure.ac +++ b/configure.ac @@ -2436,6 +2436,7 @@ WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules],[dlls] WINE_CONFIG_MAKEFILE([dlls/wldap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wldap32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/wmi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wmiutils/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wnaspi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wow32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in new file mode 100644 index 0000000..09d1cb4 --- /dev/null +++ b/dlls/wmiutils/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wmiutils.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c new file mode 100644 index 0000000..8e8b005 --- /dev/null +++ b/dlls/wmiutils/main.c @@ -0,0 +1,43 @@ +/* + * Copyright 2009 Hans Leidekker 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 + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/wmiutils/wmiutils.spec b/dlls/wmiutils/wmiutils.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/wmiutils/wmiutils.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Hans Leidekker : wbemprox: Register interfaces.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: a4717d0d4c58cac579d9a32e3cdc62f073464ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4717d0d4c58cac579d9a32e3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:27:21 2009 +0200 wbemprox: Register interfaces. --- dlls/wbemprox/Makefile.in | 3 +- dlls/wbemprox/regsvr.c | 424 +++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox.spec | 4 +- tools/wine.inf.in | 1 + 4 files changed, 429 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4717d0d4c58cac579d9a…

1 0

Hans Leidekker : wbemprox: Add class factory.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: a73b9d9b02b8b1ca1efe2e575832b8a303ce0120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73b9d9b02b8b1ca1efe2e575… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:26:59 2009 +0200 wbemprox: Add class factory. --- dlls/wbemprox/main.c | 108 +++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox.spec | 4 +- 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 89812b2..c22f57f 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -21,8 +21,96 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" +#include "objbase.h" +#include "wbemcli.h" + +#include "wbemprox_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); + +typedef struct +{ + const struct IClassFactoryVtbl *vtbl; + fnCreateInstance pfnCreateInstance; +} wbemprox_cf; + +static inline wbemprox_cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (wbemprox_cf *)((char *)iface - FIELD_OFFSET( wbemprox_cf, vtbl )); +} + +static HRESULT WINAPI wbemprox_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI wbemprox_cf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI wbemprox_cf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI wbemprox_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + wbemprox_cf *This = impl_from_IClassFactory( iface ); + HRESULT r; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + if (FAILED(r)) + return r; + + r = IUnknown_QueryInterface( punk, riid, ppobj ); + if (FAILED(r)) + return r; + + IUnknown_Release( punk ); + return r; +} + +static HRESULT WINAPI wbemprox_cf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME("(%p)->(%d)\n", iface, dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl wbemprox_cf_vtbl = +{ + wbemprox_cf_QueryInterface, + wbemprox_cf_AddRef, + wbemprox_cf_Release, + wbemprox_cf_CreateInstance, + wbemprox_cf_LockServer +}; + +static wbemprox_cf wbem_locator_cf = { &wbemprox_cf_vtbl, WbemLocator_create }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -40,3 +128,23 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) +{ + IClassFactory *cf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + if (IsEqualGUID( rclsid, &CLSID_WbemLocator )) + { + cf = (IClassFactory *)&wbem_locator_cf.vtbl; + } + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, ppv ); +} + +HRESULT WINAPI DllCanUnloadNow( void ) +{ + FIXME("\n"); + return S_FALSE; +} diff --git a/dlls/wbemprox/wbemprox.spec b/dlls/wbemprox/wbemprox.spec index c5fc87a..c534b4f 100644 --- a/dlls/wbemprox/wbemprox.spec +++ b/dlls/wbemprox/wbemprox.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllRegisterServer @ stub DllUnregisterServer

1 0

Hans Leidekker : wbemprox: Add a stub implementation of IWbemLocator.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: 2182dd1fa77b54e5912fd484cc75bee93e96f9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2182dd1fa77b54e5912fd484c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 14 12:26:38 2009 +0200 wbemprox: Add a stub implementation of IWbemLocator. --- dlls/wbemprox/Makefile.in | 3 +- dlls/wbemprox/wbemlocator.c | 130 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 19 ++++++ 3 files changed, 151 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 58aad37..b178262 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -6,7 +6,8 @@ MODULE = wbemprox.dll IMPORTS = kernel32 C_SRCS = \ - main.c + main.c \ + wbemlocator.c @MAKE_DLL_RULES@ diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c new file mode 100644 index 0000000..ad6a75d --- /dev/null +++ b/dlls/wbemprox/wbemlocator.c @@ -0,0 +1,130 @@ +/* + * Copyright 2009 Hans Leidekker 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "objbase.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +typedef struct +{ + const IWbemLocatorVtbl *vtbl; + LONG refs; +} wbem_locator; + +static inline wbem_locator *impl_from_IWbemLocator( IWbemLocator *iface ) +{ + return (wbem_locator *)((char *)iface - FIELD_OFFSET( wbem_locator, vtbl )); +} + +static ULONG WINAPI wbem_locator_AddRef( + IWbemLocator *iface ) +{ + wbem_locator *wl = impl_from_IWbemLocator( iface ); + return InterlockedIncrement( &wl->refs ); +} + +static ULONG WINAPI wbem_locator_Release( + IWbemLocator *iface ) +{ + wbem_locator *wl = impl_from_IWbemLocator( iface ); + LONG refs = InterlockedDecrement( &wl->refs ); + if (!refs) + { + TRACE("destroying %p\n", wl); + HeapFree( GetProcessHeap(), 0, wl ); + } + return refs; +} + +static HRESULT WINAPI wbem_locator_QueryInterface( + IWbemLocator *iface, + REFIID riid, + void **ppvObject ) +{ + wbem_locator *This = impl_from_IWbemLocator( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IWbemLocator ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWbemLocator_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI wbem_locator_ConnectServer( + IWbemLocator *iface, + const BSTR NetworkResource, + const BSTR User, + const BSTR Password, + const BSTR Locale, + LONG SecurityFlags, + const BSTR Authority, + IWbemContext *pCtx, + IWbemServices **ppNamespace) +{ + FIXME("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), + debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), pCtx, ppNamespace); + return WBEM_E_FAILED; +} + +static const IWbemLocatorVtbl wbem_locator_vtbl = +{ + wbem_locator_QueryInterface, + wbem_locator_AddRef, + wbem_locator_Release, + wbem_locator_ConnectServer +}; + +HRESULT WbemLocator_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + wbem_locator *wl; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + wl = HeapAlloc( GetProcessHeap(), 0, sizeof(*wl) ); + if (!wl) return E_OUTOFMEMORY; + + wl->vtbl = &wbem_locator_vtbl; + wl->refs = 1; + + *ppObj = &wl->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h new file mode 100644 index 0000000..cf4301d --- /dev/null +++ b/dlls/wbemprox/wbemprox_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2009 Hans Leidekker 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 + */ + +HRESULT WbemLocator_create(IUnknown *, LPVOID *);

1 0

Henri Verbeet : d3d10: Marge parse_fx10_pass() and parse_fx10_pass_index().
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: b4da7ebd3ea261408ea468006ce5c2f25ab44d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4da7ebd3ea261408ea468006… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 11:17:41 2009 +0200 d3d10: Marge parse_fx10_pass() and parse_fx10_pass_index(). --- dlls/d3d10/effect.c | 85 +++++++++++++++++++------------------------------- 1 files changed, 32 insertions(+), 53 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1a7c7b9..981a45e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -124,43 +124,6 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return hr; } -static HRESULT parse_fx10_pass_index(struct d3d10_effect_pass *p, const char **ptr) -{ - unsigned int i; - - read_dword(ptr, &p->start); - TRACE("Pass starts at offset %#x\n", p->start); - - read_dword(ptr, &p->variable_count); - TRACE("Pass has %u variables\n", p->variable_count); - - skip_dword_unknown(ptr, 1); - - p->variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, p->variable_count * sizeof(*p->variables)); - if (!p->variables) - { - ERR("Failed to allocate variables memory\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < p->variable_count; ++i) - { - struct d3d10_effect_variable *v = &p->variables[i]; - - v->pass = p; - - read_dword(ptr, &v->type); - TRACE("Variable %u is of type %#x\n", i, v->type); - - skip_dword_unknown(ptr, 2); - - read_dword(ptr, &v->idx_offset); - TRACE("Variable %u idx is at offset %#x\n", i, v->idx_offset); - } - - return S_OK; -} - static char *copy_name(const char *ptr) { size_t name_len; @@ -333,32 +296,51 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * return hr; } -static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char *data) +static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, const char *data) { HRESULT hr = S_OK; - const char *ptr; - size_t name_len; unsigned int i; + DWORD offset; - ptr = data + p->start; + read_dword(ptr, &offset); + TRACE("Pass name at offset %#x.\n", offset); - name_len = strlen(ptr) + 1; - p->name = HeapAlloc(GetProcessHeap(), 0, name_len); + p->name = copy_name(data + offset); if (!p->name) { - ERR("Failed to allocate name memory\n"); + ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; } + TRACE("Pass name: %s.\n", p->name); - memcpy(p->name, ptr, name_len); - ptr += name_len; + read_dword(ptr, &p->variable_count); + TRACE("Pass has %u variables.\n", p->variable_count); - TRACE("pass name: %s\n", p->name); + skip_dword_unknown(ptr, 1); + + p->variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, p->variable_count * sizeof(*p->variables)); + if (!p->variables) + { + ERR("Failed to allocate variables memory.\n"); + return E_OUTOFMEMORY; + } for (i = 0; i < p->variable_count; ++i) { - hr = parse_fx10_variable(&p->variables[i], data); - if (FAILED(hr)) break; + struct d3d10_effect_variable *v = &p->variables[i]; + + v->pass = p; + + read_dword(ptr, &v->type); + TRACE("Variable %u is of type %#x.\n", i, v->type); + + skip_dword_unknown(ptr, 2); + + read_dword(ptr, &v->idx_offset); + TRACE("Variable %u idx is at offset %#x.\n", i, v->idx_offset); + + hr = parse_fx10_variable(v, data); + if (FAILED(hr)) return hr; } return hr; @@ -400,10 +382,7 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char p->vtbl = &d3d10_effect_pass_vtbl; p->technique = t; - hr = parse_fx10_pass_index(p, ptr); - if (FAILED(hr)) return hr; - - hr = parse_fx10_pass(p, data); + hr = parse_fx10_pass(p, ptr, data); if (FAILED(hr)) return hr; }

1 0