wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetVector().
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: e2b1f0cce946333ee954a3f8dd372f85a6403023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b1f0cce946333ee954a3f8d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 13 17:02:29 2011 +0100 d3dx9: Implement ID3DXBaseEffect::GetVector(). --- dlls/d3dx9_36/effect.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 927e067..d9cd085 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2032,10 +2032,44 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetVector(ID3DXBaseEffect* iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_GetVector(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, vector %p stub\n", This, parameter, vector); + TRACE("iface %p, parameter %p, vector %p\n", This, parameter, vector); - return E_NOTIMPL; + if (vector && param && !param->element_count) + { + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + if (param->type == D3DXPT_INT && param->bytes == 4) + { + TRACE("INT fixup\n"); + vector->x = (((*(INT *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + vector->y = (((*(INT *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + vector->z = ((*(INT *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE; + vector->w = (((*(INT *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + return D3D_OK; + } + get_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetVectorArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXVECTOR4 *vector, UINT count)

1 0

Francois Gouget : include: Add extern "C" directives where needed.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: eb5d62cbf71a250db7831406e8908594e8391e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5d62cbf71a250db7831406e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:10:50 2011 +0100 include: Add extern "C" directives where needed. --- include/d3d10shader.h | 9 +++++++++ include/dsrole.h | 8 ++++++++ include/npapi.h | 8 ++++++++ include/ws2ipdef.h | 8 ++++++++ 4 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 2566d42..af32539 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -206,6 +206,11 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown) }; #undef INTERFACE + +#ifdef __cplusplus +extern "C" { +#endif + HRESULT WINAPI D3D10CompileShader(LPCSTR data, SIZE_T data_size, LPCSTR filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, LPCSTR entrypoint, LPCSTR profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages); @@ -219,4 +224,8 @@ HRESULT WINAPI D3D10GetOutputSignatureBlob(const void *data, SIZE_T data_size, I HRESULT WINAPI D3D10GetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob); HRESULT WINAPI D3D10GetShaderDebugInfo(const void *data, SIZE_T data_size, ID3D10Blob **blob); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_D3D10SHADER_H */ diff --git a/include/dsrole.h b/include/dsrole.h index 81ec611..14b5731 100644 --- a/include/dsrole.h +++ b/include/dsrole.h @@ -21,6 +21,10 @@ #ifndef __WINE_DSROLE_H #define __WINE_DSROLE_H +#ifdef __cplusplus +extern "C" { +#endif + #define DSROLE_PRIMARY_DS_RUNNING 0x00000001 #define DSROLE_PRIMARY_DS_MIXED_MODE 0x00000002 #define DSROLE_UPGRADE_IN_PROGRESS 0x00000004 @@ -81,4 +85,8 @@ typedef struct _DSROLE_OPERATION_STATE_INFO VOID WINAPI DsRoleFreeMemory(IN PVOID Buffer); DWORD WINAPI DsRoleGetPrimaryDomainInformation(IN LPCWSTR lpServer OPTIONAL, IN DSROLE_PRIMARY_DOMAIN_INFO_LEVEL InfoLevel, OUT PBYTE *Buffer); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_DSROLE_H */ diff --git a/include/npapi.h b/include/npapi.h index 47aa2e3..b5d7c97 100644 --- a/include/npapi.h +++ b/include/npapi.h @@ -18,6 +18,10 @@ #ifndef __WINE_NPAPI_H__ #define __WINE_NPAPI_H__ +#ifdef __cplusplus +extern "C" { +#endif + /* capabilities */ #define WNNC_SPEC_VERSION 0x00000001 #define WNNC_SPEC_VERSION51 0x00050001 @@ -208,4 +212,8 @@ typedef DWORD (APIENTRY *PF_AddConnectNotify)(LPNOTIFYINFO lpNotifyInfo, typedef DWORD (APIENTRY *PF_CancelConnectNotify)(LPNOTIFYINFO lpNotifyInfo, LPNOTIFYADD lpAddInfo); +#ifdef __cplusplus +} +#endif + #endif /* ndef __WINE_NPAPI_H__ */ diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 40498c0..ea8db3d 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -261,6 +261,10 @@ typedef struct WS(in_pktinfo) { #define WS_IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } #endif /* USE_WS_PREFIX */ +#ifdef __cplusplus +extern "C" { +#endif + static inline BOOL WS(IN6_IS_ADDR_LOOPBACK) ( const IN6_ADDR *a ) { return (BOOL)((a->s6_words[0] == 0) && @@ -273,4 +277,8 @@ static inline BOOL WS(IN6_IS_ADDR_LOOPBACK) ( const IN6_ADDR *a ) (a->s6_words[7] == 0x0100)); } +#ifdef __cplusplus +} +#endif + #endif /* __WS2IPDEF__ */

1 0

Francois Gouget : include: Remove unneeded extern "C" directives.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 3e1af081c02b01b513137d33b3972fb0d34e811d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1af081c02b01b513137d33b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:12:20 2011 +0100 include: Remove unneeded extern "C" directives. --- include/vsstyle.h | 7 ------- include/vssym32.h | 7 ------- 2 files changed, 0 insertions(+), 14 deletions(-) diff --git a/include/vsstyle.h b/include/vsstyle.h index ce9f7c7..e6fb1a3 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -19,9 +19,6 @@ #ifndef __VSSTYLE_H__ #define __VSSTYLE_H__ -#ifdef __cplusplus -extern "C" { -#endif #define TMTVS_RESERVEDLOW 100000 #define TMTVS_RESERVEDHIGH 19999 @@ -1739,8 +1736,4 @@ enum CLOSEBUTTONSTATES { CBS_DISABLED = 4, }; -#ifdef __cplusplus -} -#endif - #endif /* __VSSTYLE_H__ */ diff --git a/include/vssym32.h b/include/vssym32.h index c58be0b..3536462 100644 --- a/include/vssym32.h +++ b/include/vssym32.h @@ -21,9 +21,6 @@ #include "vsstyle.h" -#ifdef __cplusplus -extern "C" { -#endif enum BGTYPE { BT_IMAGEFILE = 0, @@ -678,8 +675,4 @@ enum MENUBANDSTATES { MDS_HOTCHECKED = 6, }; -#ifdef __cplusplus -} -#endif - #endif /* __VSSYM32_H__ */

1 0

Francois Gouget : include: Add the Dll(Un)RegisterServer() prototypes to olectl.h.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: a78067fee3fca78d49515c850c81c92f544a3dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78067fee3fca78d49515c850… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:10:45 2011 +0100 include: Add the Dll(Un)RegisterServer() prototypes to olectl.h. --- include/olectl.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/olectl.h b/include/olectl.h index cda17f6..3ccf09c 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -183,6 +183,10 @@ typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; #define LP_VGACOLOR 0x2 #define LP_COLOR 0x4 +HRESULT WINAPI DllRegisterServer(void); + +HRESULT WINAPI DllUnregisterServer(void); + HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon); HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams);

1 0

Francois Gouget : include: Define the MIB_IF_OPER_STATUS_XXX constants using an enumeration in ipifcons .h.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 732f5a7239b99cf29a2ca0d471df7e93f8168949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=732f5a7239b99cf29a2ca0d47… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:10:40 2011 +0100 include: Define the MIB_IF_OPER_STATUS_XXX constants using an enumeration in ipifcons.h. --- dlls/iphlpapi/ifenum.c | 2 +- dlls/iphlpapi/ifenum.h | 2 +- dlls/iphlpapi/iphlpapi_main.c | 3 ++- include/ipifcons.h | 17 ++++++++++------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index e749cce..b4a956c 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -586,7 +586,7 @@ DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) return ret; } -DWORD getInterfaceStatusByName(const char *name, PDWORD status) +DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) { DWORD ret; int fd; diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index 228d7ee..5600b0b 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -119,6 +119,6 @@ ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs char *toIPAddressString(unsigned int addr, char string[16]) DECLSPEC_HIDDEN; DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) DECLSPEC_HIDDEN; -DWORD getInterfaceStatusByName(const char *name, PDWORD status) DECLSPEC_HIDDEN; +DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) DECLSPEC_HIDDEN; #endif /* ndef WINE_IFENUM_H_ */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 28185a8..3f72403 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -803,7 +803,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, { char name[IF_NAMESIZE], *ptr = (char *)aa + sizeof(IP_ADAPTER_ADDRESSES), *src; WCHAR *dst; - DWORD buflen, type, status; + DWORD buflen, type; + INTERNAL_IF_OPER_STATUS status; memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); diff --git a/include/ipifcons.h b/include/ipifcons.h index 7fa0a11..d50f129 100644 --- a/include/ipifcons.h +++ b/include/ipifcons.h @@ -231,11 +231,14 @@ #define MIB_IF_ADMIN_STATUS_DOWN 2 #define MIB_IF_ADMIN_STATUS_TESTING 3 -#define MIB_IF_OPER_STATUS_NON_OPERATIONAL 0 -#define MIB_IF_OPER_STATUS_UNREACHABLE 1 -#define MIB_IF_OPER_STATUS_DISCONNECTED 2 -#define MIB_IF_OPER_STATUS_CONNECTING 3 -#define MIB_IF_OPER_STATUS_CONNECTED 4 -#define MIB_IF_OPER_STATUS_OPERATIONAL 5 +typedef enum _INTERNAL_IF_OPER_STATUS +{ + MIB_IF_OPER_STATUS_NON_OPERATIONAL = 0, + MIB_IF_OPER_STATUS_UNREACHABLE = 1, + MIB_IF_OPER_STATUS_DISCONNECTED = 2, + MIB_IF_OPER_STATUS_CONNECTING = 3, + MIB_IF_OPER_STATUS_CONNECTED = 4, + MIB_IF_OPER_STATUS_OPERATIONAL = 5, +} INTERNAL_IF_OPER_STATUS; -#endif /* WINE_ROUTING_IPIFCONS_H__ */ +#endif /* WINE_IPIFCONS_H__ */

1 0

Francois Gouget : include: Split iprtrmib.h into multiple mib.h files.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: cf76be61b2e151df155b29e021b5d915f4dd0440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf76be61b2e151df155b29e02… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:04:41 2011 +0100 include: Split iprtrmib.h into multiple mib.h files. Include them where appropriate. --- include/Makefile.in | 4 + include/ifmib.h | 65 +++++++++++++ include/ipmib.h | 165 +++++++++++++++++++++++++++++++++ include/iprtrmib.h | 257 +-------------------------------------------------- include/nldef.h | 19 ++++ include/tcpmib.h | 79 ++++++++++++++++ include/udpmib.h | 48 ++++++++++ 7 files changed, 383 insertions(+), 254 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf76be61b2e151df155b2…

1 0

Francois Gouget : include: Move some definitions from iptypes.h to nldef.h.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 58fdd9ac1d51e3e3090168eee2a768690a37e557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58fdd9ac1d51e3e3090168eee… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:04:31 2011 +0100 include: Move some definitions from iptypes.h to nldef.h. Include nldef.h where appropriate. --- include/Makefile.in | 1 + include/iptypes.h | 30 ++++-------------------------- include/mstcpip.h | 2 ++ include/nldef.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 26 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index bea68f0..6bd9020 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -406,6 +406,7 @@ SRCDIR_INCLUDES = \ msxmldid.h \ nb30.h \ ndrtypes.h \ + nldef.h \ npapi.h \ nspapi.h \ ntddcdrm.h \ diff --git a/include/iptypes.h b/include/iptypes.h index 8ce7df6..997388e 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -21,6 +21,7 @@ #include <time.h> #include <ifdef.h> +#include <nldef.h> #define MAX_ADAPTER_DESCRIPTION_LENGTH 128 #define MAX_ADAPTER_NAME_LENGTH 256 @@ -87,32 +88,9 @@ typedef struct { UINT EnableDns; } FIXED_INFO, *PFIXED_INFO; -typedef enum { - IpPrefixOriginOther = 0, - IpPrefixOriginManual, - IpPrefixOriginWellKnown, - IpPrefixOriginDhcp, - IpPrefixOriginRouterAdvertisement, - IpPrefixOriginUnchanged = 16 -} IP_PREFIX_ORIGIN; - -typedef enum { - IpSuffixOriginOther = 0, - IpSuffixOriginManual, - IpSuffixOriginWellKnown, - IpSuffixOriginDhcp, - IpSuffixOriginLinkLayerAddress, - IpSuffixOriginRandom, - IpSuffixOriginUnchanged = 16 -} IP_SUFFIX_ORIGIN; - -typedef enum { - IpDadStateInvalid = 0, - IpDadStateTentative, - IpDadStateDuplicate, - IpDadStateDeprecated, - IpDadStatePreferred -} IP_DAD_STATE; +typedef NL_PREFIX_ORIGIN IP_PREFIX_ORIGIN; +typedef NL_SUFFIX_ORIGIN IP_SUFFIX_ORIGIN; +typedef NL_DAD_STATE IP_DAD_STATE; #ifdef _WINSOCK2API_ diff --git a/include/mstcpip.h b/include/mstcpip.h index 147e135..cb3ce8d 100644 --- a/include/mstcpip.h +++ b/include/mstcpip.h @@ -18,6 +18,8 @@ #ifndef __WINE_MSTCPIP_H #define __WINE_MSTCPIP_H +#include <nldef.h> + struct tcp_keepalive { ULONG onoff; diff --git a/include/nldef.h b/include/nldef.h new file mode 100644 index 0000000..abce1af --- /dev/null +++ b/include/nldef.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2003 Juan Lang + * + * 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_NLDEF_H +#define __WINE_NLDEF_H + +typedef enum +{ + IpPrefixOriginOther = 0, + IpPrefixOriginManual, + IpPrefixOriginWellKnown, + IpPrefixOriginDhcp, + IpPrefixOriginRouterAdvertisement, + IpPrefixOriginUnchanged = 16, +} NL_PREFIX_ORIGIN; + +typedef enum +{ + IpSuffixOriginOther = 0, + IpSuffixOriginManual, + IpSuffixOriginWellKnown, + IpSuffixOriginDhcp, + IpSuffixOriginLinkLayerAddress, + IpSuffixOriginRandom, + IpSuffixOriginUnchanged = 16, +} NL_SUFFIX_ORIGIN; + +typedef enum +{ + IpDadStateInvalid = 0, + IpDadStateTentative, + IpDadStateDuplicate, + IpDadStateDeprecated, + IpDadStatePreferred, +} NL_DAD_STATE; + +#endif /* __WINE_NLDEF_H */

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 4918d914e43b0d7dcd444aed3309ae0d96e3d59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4918d914e43b0d7dcd444aed3… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Dec 13 08:21:55 2011 +0100 po: Update Italian translation. --- po/it.po | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/po/it.po b/po/it.po index 1126f0d..f350233 100644 --- a/po/it.po +++ b/po/it.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: 2011-12-07 18:06+0100\n" +"PO-Revision-Date: 2011-12-13 08:20+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -3485,7 +3485,6 @@ msgid "Subscript out of range" msgstr "Sottoscript fuori portata" #: jscript.rc:28 -#, fuzzy msgid "Object required" msgstr "Richiesto un oggetto" @@ -3543,7 +3542,7 @@ msgstr "'[oggetto]' non è un oggetto data" #: jscript.rc:42 msgid "Object expected" -msgstr "Richiesto un oggetto" +msgstr "Previsto un oggetto" #: jscript.rc:43 msgid "Illegal assignment" @@ -3555,15 +3554,15 @@ msgstr "'|' non è definito" #: jscript.rc:45 msgid "Boolean object expected" -msgstr "Richiesto un oggetto Booleano" +msgstr "Previsto un oggetto Booleano" #: jscript.rc:46 msgid "VBArray object expected" -msgstr "Richiesto un oggetto VBArray" +msgstr "Previsto un oggetto VBArray" #: jscript.rc:47 msgid "JScript object expected" -msgstr "Richiesto un oggetto JScript" +msgstr "Previsto un oggetto JScript" #: jscript.rc:48 msgid "Syntax error in regular expression" @@ -3583,7 +3582,7 @@ msgstr "La lunghezza dell'array deve essere un intero finito e positivo" #: jscript.rc:52 msgid "Array object expected" -msgstr "Richiesto un oggetto array" +msgstr "Previsto un oggetto array" #: winerror.mc:26 msgid "Success\n"

1 0

Jacek Caban : htiframe.idl: Added ITargetFramePriv and ITargetFramePriv2 declarations.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 754106b5e963c581f504eaea31e9f76af9f41bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=754106b5e963c581f504eaea3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 13 15:54:54 2011 +0100 htiframe.idl: Added ITargetFramePriv and ITargetFramePriv2 declarations. --- include/htiframe.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/include/htiframe.idl b/include/htiframe.idl index 21a55a4..6bf0680 100644 --- a/include/htiframe.idl +++ b/include/htiframe.idl @@ -1,5 +1,5 @@ /* - * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2006,2011 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +18,7 @@ import "objidl.idl"; import "oleidl.idl"; +import "urlmon.idl"; /***************************************************************************** * ITargetNotify interface @@ -132,3 +133,63 @@ interface ITargetContainer : IUnknown HRESULT GetFramesContainer([out] IOleContainer **ppContainer); } + +/***************************************************************************** + * ITargetFramePriv interface + */ +[ + object, + uuid(9216e421-2bf5-11d0-82b4-00a0c90c29c5), + pointer_default(unique) +] +interface ITargetFramePriv : IUnknown +{ + typedef [unique] ITargetFramePriv *LPTARGETFRAMEPRIV; + + HRESULT FindFrameDownwards( + [in] LPCWSTR pszTargetName, + [in] DWORD dwFlags, + [out] IUnknown **ppunkTargetFrame); + + HRESULT FindFrameInContext( + [in] LPCWSTR pszTargetName, + [in] IUnknown *punkContextFrame, + [in] DWORD dwFlags, + [out] IUnknown **ppunkTargetFrame); + + HRESULT OnChildFrameActivate([in] IUnknown *pUnkChildFrame); + HRESULT OnChildFrameDeactivate([in] IUnknown *pUnkChildFrame); + + HRESULT NavigateHack( + [in] DWORD grfHLNF, + [in, unique] LPBC pbc, + [in, unique] IBindStatusCallback *pibsc, + [in, unique] LPCWSTR pszTargetName, + [in] LPCWSTR pszUrl, + [in, unique] LPCWSTR pszLocation); + + HRESULT FindBrowserByIndex( + [in] DWORD dwID, + [out] IUnknown **ppunkBrowser); +} + +/***************************************************************************** + * ITargetFramePriv2 interface + */ +[ + object, + uuid(b2c867e6-69d6-46f2-a611-ded9a4bd7fef), + pointer_default(unique) +] +interface ITargetFramePriv2 : ITargetFramePriv +{ + typedef [unique] ITargetFramePriv2 *LPTARGETFRAMEPRIV2; + + HRESULT AggregatedNavigation2( + [in] DWORD grfHLNF, + [in, unique] LPBC pbc, + [in, unique] IBindStatusCallback *pibsc, + [in, unique] LPCWSTR pszTargetName, + [in] IUri *pUri, + [in, unique] LPCWSTR pszLocation); +}

1 0

Piotr Caban : hlink: Fix leak in HlinkNavigateToStringReference.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 445db0a54d4e8ec34c5a1a2b0f3fb6975b9369e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=445db0a54d4e8ec34c5a1a2b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 13 15:14:13 2011 +0100 hlink: Fix leak in HlinkNavigateToStringReference. --- dlls/hlink/hlink_main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 54cac9d..9823a5d 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -261,14 +261,16 @@ HRESULT WINAPI HlinkNavigateToStringReference( LPCWSTR pwzTarget, HRESULT r; IHlink *hlink = NULL; - FIXME("%s %s %p %08x %p %08x %p %p %p\n", + TRACE("%s %s %p %08x %p %08x %p %p %p\n", debugstr_w(pwzTarget), debugstr_w(pwzLocation), pihlsite, dwSiteData, pihlframe, grfHLNF, pibc, pibsc, pihlbc); r = HlinkCreateFromString( pwzTarget, pwzLocation, NULL, pihlsite, dwSiteData, NULL, &IID_IHlink, (LPVOID*) &hlink ); - if (SUCCEEDED(r)) + if (SUCCEEDED(r)) { r = HlinkNavigate(hlink, pihlframe, grfHLNF, pibc, pibsc, pihlbc); + IHlink_Release(hlink); + } return r; }

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
81
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 December 2011