wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Hans Leidekker : winhttp: Register interfaces and add a typelib resource.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: e688167c73635a5c49a7ef05a92007a03a4ad442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e688167c73635a5c49a7ef05a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 16:46:48 2011 +0200 winhttp: Register interfaces and add a typelib resource. --- .gitignore | 1 + dlls/winhttp/Makefile.in | 6 ++++-- dlls/winhttp/main.c | 10 ++++++---- dlls/winhttp/version.rc | 3 +++ dlls/winhttp/winhttp_tlb.idl | 21 +++++++++++++++++++++ tools/wine.inf.in | 1 + 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 63d1433..b4003a8 100644 --- a/.gitignore +++ b/.gitignore @@ -140,6 +140,7 @@ dlls/urlmon/urlmon_urlmon_p.c dlls/vbscript/vbscript_classes.h dlls/windowscodecs/windowscodecs_wincodec.h dlls/windowscodecs/windowscodecs_wincodec_p.c +dlls/winhttp/winhttp_tlb.tlb dlls/wuapi/wuapi_tlb.tlb include/activaut.h include/activdbg.h diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index ed8968e..8cc2343 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -13,7 +13,9 @@ C_SRCS = \ session.c \ url.c -RC_SRCS = \ - version.rc +IDL_TLB_SRCS = winhttp_tlb.idl +IDL_R_SRCS = winhttp_tlb.idl + +RC_SRCS = version.rc @MAKE_DLL_RULES@ diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 917e13a..d80998f 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -23,12 +23,15 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "rpcproxy.h" #include "httprequest.h" #include "winhttp.h" #include "wine/debug.h" #include "winhttp_private.h" +static HINSTANCE instance; + WINE_DEFAULT_DEBUG_CHANNEL(winhttp); /****************************************************************** @@ -39,6 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) switch(fdwReason) { case DLL_PROCESS_ATTACH: + instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: @@ -166,8 +170,7 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("()\n"); - return S_OK; + return __wine_register_resources( instance, NULL ); } /*********************************************************************** @@ -175,6 +178,5 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("()\n"); - return S_OK; + return __wine_unregister_resources( instance, NULL ); } diff --git a/dlls/winhttp/version.rc b/dlls/winhttp/version.rc index 3dca59f..170ba38 100644 --- a/dlls/winhttp/version.rc +++ b/dlls/winhttp/version.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: winhttp_tlb.tlb */ +1 TYPELIB winhttp_tlb.tlb + #define WINE_FILEDESCRIPTION_STR "Wine HTTP Library" #define WINE_FILENAME_STR "winhttp.dll" #define WINE_FILEVERSION_MAJOR 5 diff --git a/dlls/winhttp/winhttp_tlb.idl b/dlls/winhttp/winhttp_tlb.idl new file mode 100644 index 0000000..74beb57 --- /dev/null +++ b/dlls/winhttp/winhttp_tlb.idl @@ -0,0 +1,21 @@ +/* + * Typelib for winhttp + * + * Copyright 2011 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 "httprequest.idl" diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 5493f60..d9159dd 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2564,6 +2564,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 11,,wineqtdecoder.dll,1 +11,,winhttp.dll,1 11,,wintrust.dll,1 11,,wmiutils.dll,1 11,,wuapi.dll,1

1 0

Hans Leidekker : winhttp: Add a class factory implementation.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: d25abc358a3fd43f71321b5ac8c7725c2187256b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25abc358a3fd43f71321b5ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 16:46:32 2011 +0200 winhttp: Add a class factory implementation. --- dlls/winhttp/main.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 100 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index b1ce75d..917e13a 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -16,17 +16,17 @@ * 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 "objbase.h" +#include "httprequest.h" #include "winhttp.h" #include "wine/debug.h" - #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); @@ -48,13 +48,109 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } +typedef HRESULT (*fnCreateInstance)( IUnknown *outer, void **obj ); + +struct winhttp_cf +{ + IClassFactory IClassFactory_iface; + fnCreateInstance pfnCreateInstance; +}; + +static inline struct winhttp_cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct winhttp_cf, IClassFactory_iface ); +} + +static HRESULT WINAPI requestcf_QueryInterface( + IClassFactory *iface, + REFIID riid, + void **obj ) +{ + if (IsEqualGUID( riid, &IID_IUnknown ) || + IsEqualGUID( riid, &IID_IClassFactory )) + { + IClassFactory_AddRef( iface ); + *obj = iface; + return S_OK; + } + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI requestcf_AddRef( + IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI requestcf_Release( + IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI requestcf_CreateInstance( + IClassFactory *iface, + LPUNKNOWN outer, + REFIID riid, + void **obj ) +{ + struct winhttp_cf *cf = impl_from_IClassFactory( iface ); + IUnknown *unknown; + HRESULT hr; + + TRACE("%p, %s, %p\n", outer, debugstr_guid(riid), obj); + + *obj = NULL; + if (outer) + return CLASS_E_NOAGGREGATION; + + hr = cf->pfnCreateInstance( outer, (void **)&unknown ); + if (FAILED(hr)) + return hr; + + hr = IUnknown_QueryInterface( unknown, riid, obj ); + if (FAILED(hr)) + return hr; + + IUnknown_Release( unknown ); + return hr; +} + +static HRESULT WINAPI requestcf_LockServer( + IClassFactory *iface, + BOOL dolock ) +{ + FIXME("%p, %d\n", iface, dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl winhttp_cf_vtbl = +{ + requestcf_QueryInterface, + requestcf_AddRef, + requestcf_Release, + requestcf_CreateInstance, + requestcf_LockServer +}; + +static struct winhttp_cf request_cf = { { &winhttp_cf_vtbl }, WinHttpRequest_create }; + /****************************************************************** * DllGetClassObject (winhttp.@) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return CLASS_E_CLASSNOTAVAILABLE; + IClassFactory *cf = NULL; + + TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (IsEqualGUID( rclsid, &CLSID_WinHttpRequest )) + { + cf = &request_cf.IClassFactory_iface; + } + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, riid, ppv ); } /******************************************************************

1 0

Hans Leidekker : winhttp: Add a stub implementation of IWinHttpRequest.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: fd7538d38cad6c93739a34b68ee573a9bc4d9a3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7538d38cad6c93739a34b68… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 16:46:14 2011 +0200 winhttp: Add a stub implementation of IWinHttpRequest. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/request.c | 314 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 3 + 3 files changed, 318 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index ef080a0..ed8968e 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,6 +1,6 @@ MODULE = winhttp.dll IMPORTLIB = winhttp -IMPORTS = shlwapi +IMPORTS = uuid shlwapi DELAYIMPORTS = crypt32 advapi32 EXTRALIBS = @SOCKETLIBS@ diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c8eca75..d36c657 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "config.h" #include "wine/port.h" #include "wine/debug.h" @@ -30,6 +31,9 @@ #include "windef.h" #include "winbase.h" +#include "ole2.h" +#include "initguid.h" +#include "httprequest.h" #include "winhttp.h" #include "winhttp_private.h" @@ -2132,3 +2136,313 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write release_object( &request->hdr ); return ret; } + +struct winhttp_request +{ + IWinHttpRequest IWinHttpRequest_iface; + LONG refs; +}; + +static inline struct winhttp_request *impl_from_IWinHttpRequest( IWinHttpRequest *iface ) +{ + return CONTAINING_RECORD( iface, struct winhttp_request, IWinHttpRequest_iface ); +} + +static ULONG WINAPI winhttp_request_AddRef( + IWinHttpRequest *iface ) +{ + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + return InterlockedIncrement( &request->refs ); +} + +static ULONG WINAPI winhttp_request_Release( + IWinHttpRequest *iface ) +{ + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + LONG refs = InterlockedDecrement( &request->refs ); + if (!refs) + { + TRACE("destroying %p\n", request); + heap_free( request ); + } + return refs; +} + +static HRESULT WINAPI winhttp_request_QueryInterface( + IWinHttpRequest *iface, + REFIID riid, + void **obj ) +{ + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + + TRACE("%p, %s, %p\n", request, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_IWinHttpRequest ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWinHttpRequest_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI winhttp_request_GetTypeInfoCount( + IWinHttpRequest *iface, + UINT *count ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_GetTypeInfo( + IWinHttpRequest *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_GetIDsOfNames( + IWinHttpRequest *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_Invoke( + IWinHttpRequest *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_SetProxy( + IWinHttpRequest *iface, + HTTPREQUEST_PROXY_SETTING proxy_setting, + VARIANT proxy_server, + VARIANT bypass_list ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_SetCredentials( + IWinHttpRequest *iface, + BSTR username, + BSTR password, + HTTPREQUEST_SETCREDENTIALS_FLAGS flags ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_Open( + IWinHttpRequest *iface, + BSTR method, + BSTR url, + VARIANT async ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_SetRequestHeader( + IWinHttpRequest *iface, + BSTR header, + BSTR value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_GetResponseHeader( + IWinHttpRequest *iface, + BSTR header, + BSTR *value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_GetAllResponseHeaders( + IWinHttpRequest *iface, + BSTR *headers ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_Send( + IWinHttpRequest *iface, + VARIANT body ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_get_Status( + IWinHttpRequest *iface, + LONG *status ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_get_StatusText( + IWinHttpRequest *iface, + BSTR *status ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_get_ResponseText( + IWinHttpRequest *iface, + BSTR *body ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_get_ResponseBody( + IWinHttpRequest *iface, + VARIANT *body ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_get_ResponseStream( + IWinHttpRequest *iface, + VARIANT *body ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_get_Option( + IWinHttpRequest *iface, + WinHttpRequestOption option, + VARIANT *value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_put_Option( + IWinHttpRequest *iface, + WinHttpRequestOption option, + VARIANT value ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_WaitForResponse( + IWinHttpRequest *iface, + VARIANT timeout, + VARIANT_BOOL *succeeded ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_Abort( + IWinHttpRequest *iface ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_SetTimeouts( + IWinHttpRequest *iface, + LONG resolve_timeout, + LONG connect_timeout, + LONG send_timeout, + LONG receive_timeout ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_SetClientCertificate( + IWinHttpRequest *iface, + BSTR certificate ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI winhttp_request_SetAutoLogonPolicy( + IWinHttpRequest *iface, + WinHttpRequestAutoLogonPolicy policy ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const struct IWinHttpRequestVtbl winhttp_request_vtbl = +{ + winhttp_request_QueryInterface, + winhttp_request_AddRef, + winhttp_request_Release, + winhttp_request_GetTypeInfoCount, + winhttp_request_GetTypeInfo, + winhttp_request_GetIDsOfNames, + winhttp_request_Invoke, + winhttp_request_SetProxy, + winhttp_request_SetCredentials, + winhttp_request_Open, + winhttp_request_SetRequestHeader, + winhttp_request_GetResponseHeader, + winhttp_request_GetAllResponseHeaders, + winhttp_request_Send, + winhttp_request_get_Status, + winhttp_request_get_StatusText, + winhttp_request_get_ResponseText, + winhttp_request_get_ResponseBody, + winhttp_request_get_ResponseStream, + winhttp_request_get_Option, + winhttp_request_put_Option, + winhttp_request_WaitForResponse, + winhttp_request_Abort, + winhttp_request_SetTimeouts, + winhttp_request_SetClientCertificate, + winhttp_request_SetAutoLogonPolicy +}; + +HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) +{ + struct winhttp_request *request; + + TRACE("%p, %p\n", unknown, obj); + + if (!(request = heap_alloc( sizeof(*request) ))) return E_OUTOFMEMORY; + request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; + request->refs = 1; + + *obj = &request->IWinHttpRequest_iface; + TRACE("returning iface %p\n", *obj); + return S_OK; +} diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 2444052..7607174 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -42,6 +42,7 @@ # define closesocket close # define ioctlsocket ioctl #endif +#include "ole2.h" static const WCHAR getW[] = {'G','E','T',0}; static const WCHAR postW[] = {'P','O','S','T',0}; @@ -237,6 +238,8 @@ BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN; void delete_domain( domain_t * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) DECLSPEC_HIDDEN; +extern HRESULT WinHttpRequest_create( IUnknown *, void ** ) DECLSPEC_HIDDEN; + static inline void *heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size );

1 0

Hans Leidekker : include: Add httprequestid.h and httprequest.idl.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 7c938ac2a615dab3a24a9b287d2b5ba327bdfb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c938ac2a615dab3a24a9b287… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 16:45:54 2011 +0200 include: Add httprequestid.h and httprequest.idl. --- .gitignore | 1 + include/Makefile.in | 2 + include/httprequest.idl | 186 +++++++++++++++++++++++++++++++++++++++++++++++ include/httprequestid.h | 42 +++++++++++ 4 files changed, 231 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index e08d0d8..63d1433 100644 --- a/.gitignore +++ b/.gitignore @@ -178,6 +178,7 @@ include/fusion.h include/gameux.h include/hlink.h include/htiframe.h +include/httprequest.h include/iads.h include/icftypes.h include/iextag.h diff --git a/include/Makefile.in b/include/Makefile.in index b691ffa..c405d64 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -38,6 +38,7 @@ PUBLIC_IDL_H_SRCS = \ gameux.idl \ hlink.idl \ htiframe.idl \ + httprequest.idl \ iads.idl \ icftypes.idl \ iextag.idl \ @@ -286,6 +287,7 @@ SRCDIR_INCLUDES = \ hlguids.h \ htmlhelp.h \ http.h \ + httprequestid.h \ i_cryptasn1tls.h \ icm.h \ icmpapi.h \ diff --git a/include/httprequest.idl b/include/httprequest.idl new file mode 100644 index 0000000..caa1238 --- /dev/null +++ b/include/httprequest.idl @@ -0,0 +1,186 @@ +/* + * Copyright 2011 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 "httprequestid.h" + +import "oaidl.idl"; + +[ + uuid(662901fc-6951-4854-9eb2-d9a2570f2b2e), + helpstring("Microsoft WinHTTP Services, version 5.1"), + lcid(0x0000), + version(5.1) +] +library WinHttp { + +importlib ("stdole2.tlb"); + +typedef [public] LONG HTTPREQUEST_PROXY_SETTING; +const HTTPREQUEST_PROXY_SETTING HTTPREQUEST_PROXYSETTING_DEFAULT = 0x00000000; +const HTTPREQUEST_PROXY_SETTING HTTPREQUEST_PROXYSETTING_PRECONFIG = 0x00000000; +const HTTPREQUEST_PROXY_SETTING HTTPREQUEST_PROXYSETTING_DIRECT = 0x00000001; +const HTTPREQUEST_PROXY_SETTING HTTPREQUEST_PROXYSETTING_PROXY = 0x00000002; + +typedef [public] LONG HTTPREQUEST_SETCREDENTIALS_FLAGS; +const HTTPREQUEST_SETCREDENTIALS_FLAGS HTTPREQUEST_SETCREDENTIALS_FOR_SERVER = 0x00000000; +const HTTPREQUEST_SETCREDENTIALS_FLAGS HTTPREQUEST_SETCREDENTIALS_FOR_PROXY = 0x00000001; + +typedef +[uuid(12782009-fe90-4877-9730-e5e183669b19)] +enum WinHttpRequestOption +{ + WinHttpRequestOption_UserAgentString, + WinHttpRequestOption_URL, + WinHttpRequestOption_URLCodePage, + WinHttpRequestOption_EscapePercentInURL, + WinHttpRequestOption_SslErrorIgnoreFlags, + WinHttpRequestOption_SelectCertificate, + WinHttpRequestOption_EnableRedirects, + WinHttpRequestOption_UrlEscapeDisable, + WinHttpRequestOption_UrlEscapeDisableQuery, + WinHttpRequestOption_SecureProtocols, + WinHttpRequestOption_EnableTracing, + WinHttpRequestOption_RevertImpersonationOverSsl, + WinHttpRequestOption_EnableHttpsToHttpRedirects, + WinHttpRequestOption_EnablePassportAuthentication, + WinHttpRequestOption_MaxAutomaticRedirects, + WinHttpRequestOption_MaxResponseHeaderSize, + WinHttpRequestOption_MaxResponseDrainSize, + WinHttpRequestOption_EnableHttp1_1, + WinHttpRequestOption_EnableCertificateRevocationCheck, + WinHttpRequestOption_RejectUserpwd +} WinHttpRequestOption; + +typedef +[uuid(9d8a6df8-13de-4b1f-a330-67c719d62514)] +enum WinHttpRequestAutoLogonPolicy +{ + AutoLogonPolicy_Always, + AutoLogonPolicy_OnlyIfBypassProxy, + AutoLogonPolicy_Never +} WinHttpRequestAutoLogonPolicy; + +[ + object, + uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396b), + odl, + dual, + oleautomation, + nonextensible, + pointer_default(unique) +] +interface IWinHttpRequest : IDispatch +{ + [id(DISPID_HTTPREQUEST_SETPROXY)] + HRESULT SetProxy( + [in] HTTPREQUEST_PROXY_SETTING proxy_setting, + [in, optional] VARIANT proxy_server, + [in, optional] VARIANT bypass_list); + + [id(DISPID_HTTPREQUEST_SETCREDENTIALS)] + HRESULT SetCredentials( + [in] BSTR username, + [in] BSTR password, + [in] HTTPREQUEST_SETCREDENTIALS_FLAGS flags); + + [id(DISPID_HTTPREQUEST_OPEN)] + HRESULT Open( + [in] BSTR method, + [in] BSTR url, + [in, optional] VARIANT async); + + [id(DISPID_HTTPREQUEST_SETREQUESTHEADER)] + HRESULT SetRequestHeader( + [in] BSTR header, + [in] BSTR value); + + [id(DISPID_HTTPREQUEST_GETRESPONSEHEADER)] + HRESULT GetResponseHeader( + [in] BSTR header, + [out, retval] BSTR *value); + + [id(DISPID_HTTPREQUEST_GETALLRESPONSEHEADERS)] + HRESULT GetAllResponseHeaders( + [out, retval] BSTR *headers); + + [id(DISPID_HTTPREQUEST_SEND)] + HRESULT Send( + [in, optional] VARIANT body); + + [propget, id(DISPID_HTTPREQUEST_STATUS)] + HRESULT Status( + [out, retval] LONG *status); + + [propget, id(DISPID_HTTPREQUEST_STATUSTEXT)] + HRESULT StatusText( + [out, retval] BSTR *status); + + [propget, id(DISPID_HTTPREQUEST_RESPONSETEXT)] + HRESULT ResponseText( + [out, retval] BSTR *body); + + [propget, id(DISPID_HTTPREQUEST_RESPONSEBODY)] + HRESULT ResponseBody( + [out, retval] VARIANT *body); + + [propget, id(DISPID_HTTPREQUEST_RESPONSESTREAM)] + HRESULT ResponseStream( + [out, retval] VARIANT *body); + + [propget, id(DISPID_HTTPREQUEST_OPTION)] + HRESULT Option( + [in] WinHttpRequestOption option, + [out, retval] VARIANT *value); + + [propput, id(DISPID_HTTPREQUEST_OPTION)] + HRESULT Option( + [in] WinHttpRequestOption option, + [in] VARIANT value); + + [id(DISPID_HTTPREQUEST_WAITFORRESPONSE)] + HRESULT WaitForResponse( + [in, optional] VARIANT timeout, + [out, retval] VARIANT_BOOL *succeeded); + + [id(DISPID_HTTPREQUEST_ABORT)] + HRESULT Abort(); + + [id(DISPID_HTTPREQUEST_SETTIMEOUTS)] + HRESULT SetTimeouts( + [in] LONG resolve_timeout, + [in] LONG connect_timeout, + [in] LONG send_timeout, + [in] LONG receive_timeout); + + [id(DISPID_HTTPREQUEST_SETCLIENTCERTIFICATE)] + HRESULT SetClientCertificate( + [in] BSTR certificate); + + [id(DISPID_HTTPREQUEST_SETAUTOLOGONPOLICY)] + HRESULT SetAutoLogonPolicy( + [in] WinHttpRequestAutoLogonPolicy policy); +} +[ + helpstring("WinHttpRequest Component version 5.1"), + threading(apartment), + progid("WinHttp.WinHttpRequest.5.1"), + uuid(2087c2f4-2cef-4953-a8ab-66779b670495) +] +coclass WinHttpRequest { interface IWinHttpRequest; } + +} /* WinHttp */ diff --git a/include/httprequestid.h b/include/httprequestid.h new file mode 100644 index 0000000..9860b1f --- /dev/null +++ b/include/httprequestid.h @@ -0,0 +1,42 @@ +/* + * Copyright 2011 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 + */ + +#ifndef __WINE_HTTPREQUESTID_H +#define __WINE_HTTPREQUESTID_H + +#define DISPID_HTTPREQUEST_BASE 1 +#define DISPID_HTTPREQUEST_OPEN (DISPID_HTTPREQUEST_BASE) +#define DISPID_HTTPREQUEST_SETREQUESTHEADER (DISPID_HTTPREQUEST_BASE + 1) +#define DISPID_HTTPREQUEST_GETRESPONSEHEADER (DISPID_HTTPREQUEST_BASE + 2) +#define DISPID_HTTPREQUEST_GETALLRESPONSEHEADERS (DISPID_HTTPREQUEST_BASE + 3) +#define DISPID_HTTPREQUEST_SEND (DISPID_HTTPREQUEST_BASE + 4) +#define DISPID_HTTPREQUEST_OPTION (DISPID_HTTPREQUEST_BASE + 5) +#define DISPID_HTTPREQUEST_STATUS (DISPID_HTTPREQUEST_BASE + 6) +#define DISPID_HTTPREQUEST_STATUSTEXT (DISPID_HTTPREQUEST_BASE + 7) +#define DISPID_HTTPREQUEST_RESPONSETEXT (DISPID_HTTPREQUEST_BASE + 8) +#define DISPID_HTTPREQUEST_RESPONSEBODY (DISPID_HTTPREQUEST_BASE + 9) +#define DISPID_HTTPREQUEST_RESPONSESTREAM (DISPID_HTTPREQUEST_BASE + 10) +#define DISPID_HTTPREQUEST_ABORT (DISPID_HTTPREQUEST_BASE + 11) +#define DISPID_HTTPREQUEST_SETPROXY (DISPID_HTTPREQUEST_BASE + 12) +#define DISPID_HTTPREQUEST_SETCREDENTIALS (DISPID_HTTPREQUEST_BASE + 13) +#define DISPID_HTTPREQUEST_WAITFORRESPONSE (DISPID_HTTPREQUEST_BASE + 14) +#define DISPID_HTTPREQUEST_SETTIMEOUTS (DISPID_HTTPREQUEST_BASE + 15) +#define DISPID_HTTPREQUEST_SETCLIENTCERTIFICATE (DISPID_HTTPREQUEST_BASE + 16) +#define DISPID_HTTPREQUEST_SETAUTOLOGONPOLICY (DISPID_HTTPREQUEST_BASE + 17) + +#endif /* __WINE_HTTPREQUESTID_H */

1 0

Alexandre Julliard : widl: Support LANG_NEUTRAL as a valid lcid in typelibs .
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 9df500d45d69f049d5f81da47d3f875ba494631c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df500d45d69f049d5f81da47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 17:34:41 2011 +0200 widl: Support LANG_NEUTRAL as a valid lcid in typelibs. --- tools/widl/hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/hash.c b/tools/widl/hash.c index 7900544..d8a9b70 100644 --- a/tools/widl/hash.c +++ b/tools/widl/hash.c @@ -539,7 +539,7 @@ unsigned int lhash_val_of_name_sys( syskind_t skind, LCID lcid, LPCSTR lpStr) case LANG_VIETNAMESE: case LANG_MALTESE: case LANG_IRISH: case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_TSWANA: case LANG_XHOSA: case LANG_ZULU: case LANG_WELSH: - case LANG_BRETON: + case LANG_BRETON: case LANG_NEUTRAL: /* some languages not in all windows versions or ReactOS */ #ifdef LANG_GAELIC case LANG_GAELIC:

1 0

Alexandre Julliard : winex11: Use the HDC from the gdi_physdev structure.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 00647af50b898afe5f1a18e4cb514cba06bf4991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00647af50b898afe5f1a18e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 16:03:59 2011 +0200 winex11: Use the HDC from the gdi_physdev structure. --- dlls/winex11.drv/bitblt.c | 22 ++++++++-------- dlls/winex11.drv/brush.c | 8 +++--- dlls/winex11.drv/dib.c | 14 +++++----- dlls/winex11.drv/graphics.c | 56 +++++++++++++++++++++--------------------- dlls/winex11.drv/init.c | 11 +++----- dlls/winex11.drv/opengl.c | 26 ++++++++++---------- dlls/winex11.drv/palette.c | 16 +++++------- dlls/winex11.drv/pen.c | 4 +- dlls/winex11.drv/text.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xfont.c | 4 +- dlls/winex11.drv/xrender.c | 26 ++++++++++---------- 12 files changed, 92 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00647af50b898afe5f1a1…

1 0

Alexandre Julliard : winex11: Pass a generic PHYSDEV to all graphics entry points.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 6c951b7d0d6c88f7f41dd24b131f1f77371e878e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c951b7d0d6c88f7f41dd24b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 15:55:11 2011 +0200 winex11: Pass a generic PHYSDEV to all graphics entry points. --- dlls/winex11.drv/bitblt.c | 13 +++-- dlls/winex11.drv/bitmap.c | 5 +- dlls/winex11.drv/brush.c | 7 ++- dlls/winex11.drv/dib.c | 15 ++++-- dlls/winex11.drv/graphics.c | 106 +++++++++++++++++++++---------------------- dlls/winex11.drv/init.c | 12 ++++- dlls/winex11.drv/opengl.c | 96 +++++++++++++++++++++++--------------- dlls/winex11.drv/palette.c | 14 +++--- dlls/winex11.drv/pen.c | 7 ++- dlls/winex11.drv/text.c | 14 +++--- dlls/winex11.drv/x11drv.h | 65 ++++++++++++++------------ dlls/winex11.drv/xfont.c | 14 ++++-- dlls/winex11.drv/xrender.c | 4 +- dlls/winex11.drv/xvidmode.c | 4 +- 14 files changed, 213 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c951b7d0d6c88f7f41dd…

1 0

Michael Stefaniuc : ddraw: Use unsafe_impl_from_IDirect3DExecuteBuffer for an app provided iface.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: faa269c42a6ef957acb2802153eca80a69146968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa269c42a6ef957acb280215… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 12:28:27 2011 +0200 ddraw: Use unsafe_impl_from_IDirect3DExecuteBuffer for an app provided iface. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 13 +++++-------- dlls/ddraw/executebuffer.c | 9 +++++++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 755ac2a..7bce353 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -508,6 +508,7 @@ struct IDirect3DExecuteBufferImpl HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc) DECLSPEC_HIDDEN; +IDirect3DExecuteBufferImpl *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExecuteBuffer *iface) DECLSPEC_HIDDEN; /* The execute function */ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *execute_buffer, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f8dfaa8..dbe1af6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -707,25 +707,22 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface, * D3D_OK on success * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, - IDirect3DExecuteBuffer *ExecuteBuffer, - IDirect3DViewport *Viewport, - DWORD Flags) +static HRESULT WINAPI IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, + IDirect3DExecuteBuffer *ExecuteBuffer, IDirect3DViewport *Viewport, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device1(iface); - IDirect3DExecuteBufferImpl *Direct3DExecuteBufferImpl = (IDirect3DExecuteBufferImpl *)ExecuteBuffer; + IDirect3DExecuteBufferImpl *buffer = unsafe_impl_from_IDirect3DExecuteBuffer(ExecuteBuffer); IDirect3DViewportImpl *Direct3DViewportImpl = (IDirect3DViewportImpl *)Viewport; HRESULT hr; TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, Viewport, Flags); - if(!Direct3DExecuteBufferImpl) + if(!buffer) return DDERR_INVALIDPARAMS; /* Execute... */ EnterCriticalSection(&ddraw_cs); - hr = d3d_execute_buffer_execute(Direct3DExecuteBufferImpl, This, Direct3DViewportImpl); + hr = d3d_execute_buffer_execute(buffer, This, Direct3DViewportImpl); LeaveCriticalSection(&ddraw_cs); return hr; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 5f738bb..379862a 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -870,3 +870,12 @@ HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, return D3D_OK; } + +IDirect3DExecuteBufferImpl *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExecuteBuffer *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d_execute_buffer_vtbl); + + return impl_from_IDirect3DExecuteBuffer(iface); +}

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DExecuteBuffer iface .
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 663483e16eeb5d48c1e55407c5a7dba5c6d85095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663483e16eeb5d48c1e55407c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 12:26:57 2011 +0200 ddraw: COM cleanup for the IDirect3DExecuteBuffer iface. --- dlls/ddraw/ddraw_private.h | 6 ++---- dlls/ddraw/device.c | 2 +- dlls/ddraw/executebuffer.c | 38 +++++++++++++++++++------------------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0f3864a..755ac2a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -486,10 +486,8 @@ void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) *****************************************************************************/ struct IDirect3DExecuteBufferImpl { - /* IUnknown */ - const IDirect3DExecuteBufferVtbl *lpVtbl; - LONG ref; - + IDirect3DExecuteBuffer IDirect3DExecuteBuffer_iface; + LONG ref; /* IDirect3DExecuteBuffer fields */ IDirectDrawImpl *ddraw; IDirect3DDeviceImpl *d3ddev; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b395272..f8dfaa8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -685,7 +685,7 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface, return hr; } - *ExecuteBuffer = (IDirect3DExecuteBuffer *)object; + *ExecuteBuffer = &object->IDirect3DExecuteBuffer_iface; TRACE(" Returning IDirect3DExecuteBuffer at %p, implementation is at %p\n", *ExecuteBuffer, object); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 86a3aa9..5f738bb 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -547,6 +547,11 @@ end_of_buffer: return D3D_OK; } +static inline IDirect3DExecuteBufferImpl *impl_from_IDirect3DExecuteBuffer(IDirect3DExecuteBuffer *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DExecuteBufferImpl, IDirect3DExecuteBuffer_iface); +} + /***************************************************************************** * IDirect3DExecuteBuffer::QueryInterface * @@ -598,10 +603,9 @@ IDirect3DExecuteBufferImpl_QueryInterface(IDirect3DExecuteBuffer *iface, * The new refcount * *****************************************************************************/ -static ULONG WINAPI -IDirect3DExecuteBufferImpl_AddRef(IDirect3DExecuteBuffer *iface) +static ULONG WINAPI IDirect3DExecuteBufferImpl_AddRef(IDirect3DExecuteBuffer *iface) { - IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface; + IDirect3DExecuteBufferImpl *This = impl_from_IDirect3DExecuteBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", This, ref); @@ -618,10 +622,9 @@ IDirect3DExecuteBufferImpl_AddRef(IDirect3DExecuteBuffer *iface) * The new refcount * *****************************************************************************/ -static ULONG WINAPI -IDirect3DExecuteBufferImpl_Release(IDirect3DExecuteBuffer *iface) +static ULONG WINAPI IDirect3DExecuteBufferImpl_Release(IDirect3DExecuteBuffer *iface) { - IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface; + IDirect3DExecuteBufferImpl *This = impl_from_IDirect3DExecuteBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", This, ref); @@ -669,11 +672,10 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Initialize(IDirect3DExecuteBuff * This implementation always returns D3D_OK * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DExecuteBufferImpl_Lock(IDirect3DExecuteBuffer *iface, - D3DEXECUTEBUFFERDESC *lpDesc) +static HRESULT WINAPI IDirect3DExecuteBufferImpl_Lock(IDirect3DExecuteBuffer *iface, + D3DEXECUTEBUFFERDESC *lpDesc) { - IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface; + IDirect3DExecuteBufferImpl *This = impl_from_IDirect3DExecuteBuffer(iface); DWORD dwSize; TRACE("iface %p, desc %p.\n", iface, lpDesc); @@ -719,11 +721,10 @@ static HRESULT WINAPI IDirect3DExecuteBufferImpl_Unlock(IDirect3DExecuteBuffer * * DDERR_OUTOFMEMORY if the vertex buffer allocation failed * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DExecuteBufferImpl_SetExecuteData(IDirect3DExecuteBuffer *iface, - D3DEXECUTEDATA *lpData) +static HRESULT WINAPI IDirect3DExecuteBufferImpl_SetExecuteData(IDirect3DExecuteBuffer *iface, + D3DEXECUTEDATA *lpData) { - IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface; + IDirect3DExecuteBufferImpl *This = impl_from_IDirect3DExecuteBuffer(iface); DWORD nbvert; TRACE("iface %p, data %p.\n", iface, lpData); @@ -755,11 +756,10 @@ IDirect3DExecuteBufferImpl_SetExecuteData(IDirect3DExecuteBuffer *iface, * D3D_OK on success * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DExecuteBufferImpl_GetExecuteData(IDirect3DExecuteBuffer *iface, - D3DEXECUTEDATA *lpData) +static HRESULT WINAPI IDirect3DExecuteBufferImpl_GetExecuteData(IDirect3DExecuteBuffer *iface, + D3DEXECUTEDATA *lpData) { - IDirect3DExecuteBufferImpl *This = (IDirect3DExecuteBufferImpl *)iface; + IDirect3DExecuteBufferImpl *This = impl_from_IDirect3DExecuteBuffer(iface); DWORD dwSize; TRACE("iface %p, data %p.\n", iface, lpData); @@ -839,7 +839,7 @@ static const struct IDirect3DExecuteBufferVtbl d3d_execute_buffer_vtbl = HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc) { - execute_buffer->lpVtbl = &d3d_execute_buffer_vtbl; + execute_buffer->IDirect3DExecuteBuffer_iface.lpVtbl = &d3d_execute_buffer_vtbl; execute_buffer->ref = 1; execute_buffer->d3ddev = device;

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DVertexBuffer8 iface.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 9ab233ea24c617a71a2fd8ba43279ad5dd2223cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab233ea24c617a71a2fd8ba4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 12:24:46 2011 +0200 d3d8: COM cleanup for the IDirect3DVertexBuffer8 iface. --- dlls/d3d8/buffer.c | 42 ++++++++++++++++++++++++++---------------- dlls/d3d8/d3d8_private.h | 6 ++---- dlls/d3d8/device.c | 2 +- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 19ce7e4..6d9040d 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static inline IDirect3DVertexBuffer8Impl *impl_from_IDirect3DVertexBuffer8(IDirect3DVertexBuffer8 *iface) { - return CONTAINING_RECORD(iface, IDirect3DVertexBuffer8Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DVertexBuffer8Impl, IDirect3DVertexBuffer8_iface); } static HRESULT WINAPI d3d8_vertexbuffer_QueryInterface(IDirect3DVertexBuffer8 *iface, REFIID riid, void **object) @@ -48,7 +48,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_QueryInterface(IDirect3DVertexBuffer8 *i static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface) { - IDirect3DVertexBuffer8Impl *buffer = (IDirect3DVertexBuffer8Impl *)iface; + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); ULONG refcount = InterlockedIncrement(&buffer->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -66,7 +66,7 @@ static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *iface) static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface) { - IDirect3DVertexBuffer8Impl *buffer = (IDirect3DVertexBuffer8Impl *)iface; + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); ULONG refcount = InterlockedDecrement(&buffer->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -86,11 +86,14 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface) return refcount; } -static HRESULT WINAPI d3d8_vertexbuffer_GetDevice(IDirect3DVertexBuffer8 *iface, IDirect3DDevice8 **device) +static HRESULT WINAPI d3d8_vertexbuffer_GetDevice(IDirect3DVertexBuffer8 *iface, + IDirect3DDevice8 **device) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); + TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice8 *)((IDirect3DVertexBuffer8Impl *)iface)->parentDevice; + *device = buffer->parentDevice; IDirect3DDevice8_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -152,12 +155,13 @@ static HRESULT WINAPI d3d8_vertexbuffer_FreePrivateData(IDirect3DVertexBuffer8 * static DWORD WINAPI d3d8_vertexbuffer_SetPriority(IDirect3DVertexBuffer8 *iface, DWORD priority) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); DWORD previous; TRACE("iface %p, priority %u.\n", iface, priority); wined3d_mutex_lock(); - previous = wined3d_buffer_set_priority(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer, priority); + previous = wined3d_buffer_set_priority(buffer->wineD3DVertexBuffer, priority); wined3d_mutex_unlock(); return previous; @@ -165,12 +169,13 @@ static DWORD WINAPI d3d8_vertexbuffer_SetPriority(IDirect3DVertexBuffer8 *iface, static DWORD WINAPI d3d8_vertexbuffer_GetPriority(IDirect3DVertexBuffer8 *iface) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); DWORD priority; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - priority = wined3d_buffer_get_priority(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer); + priority = wined3d_buffer_get_priority(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); return priority; @@ -178,10 +183,12 @@ static DWORD WINAPI d3d8_vertexbuffer_GetPriority(IDirect3DVertexBuffer8 *iface) static void WINAPI d3d8_vertexbuffer_PreLoad(IDirect3DVertexBuffer8 *iface) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_preload(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer); + wined3d_buffer_preload(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); } @@ -192,17 +199,17 @@ static D3DRESOURCETYPE WINAPI d3d8_vertexbuffer_GetType(IDirect3DVertexBuffer8 * return D3DRTYPE_VERTEXBUFFER; } -static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, - UINT offset, UINT size, BYTE **data, DWORD flags) +static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT offset, UINT size, + BYTE **data, DWORD flags) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); wined3d_mutex_lock(); - hr = wined3d_buffer_map(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer, - offset, size, data, flags); + hr = wined3d_buffer_map(buffer->wineD3DVertexBuffer, offset, size, data, flags); wined3d_mutex_unlock(); return hr; @@ -210,18 +217,21 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, static HRESULT WINAPI d3d8_vertexbuffer_Unlock(IDirect3DVertexBuffer8 *iface) { + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer); + wined3d_buffer_unmap(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); return D3D_OK; } -static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, D3DVERTEXBUFFER_DESC *desc) +static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, + D3DVERTEXBUFFER_DESC *desc) { - IDirect3DVertexBuffer8Impl *buffer = (IDirect3DVertexBuffer8Impl *)iface; + IDirect3DVertexBuffer8Impl *buffer = impl_from_IDirect3DVertexBuffer8(iface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; @@ -278,7 +288,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Im { HRESULT hr; - buffer->lpVtbl = &Direct3DVertexBuffer8_Vtbl; + buffer->IDirect3DVertexBuffer8_iface.lpVtbl = &Direct3DVertexBuffer8_Vtbl; buffer->ref = 1; buffer->fvf = fvf; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index cbc0186..8a4e5b2 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -266,10 +266,8 @@ IDirect3DSurface8Impl *unsafe_impl_from_IDirect3DSurface8(IDirect3DSurface8 *ifa */ struct IDirect3DVertexBuffer8Impl { - /* IUnknown fields */ - const IDirect3DVertexBuffer8Vtbl *lpVtbl; - LONG ref; - + IDirect3DVertexBuffer8 IDirect3DVertexBuffer8_iface; + LONG ref; struct wined3d_buffer *wineD3DVertexBuffer; IDirect3DDevice8 *parentDevice; DWORD fvf; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index cd3c16d..b561274 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -839,7 +839,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(IDirect3DDevice8 * } TRACE("Created vertex buffer %p.\n", object); - *buffer = (IDirect3DVertexBuffer8 *)object; + *buffer = &object->IDirect3DVertexBuffer8_iface; return D3D_OK; }

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
84
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 2011