December 2011 - Wine-commits

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 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

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

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

14 Dec '11

Module: wine Branch: master Commit: 67591832a34828a85b394e61b401f2e4a165f57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67591832a34828a85b394e61b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 13 17:02:34 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetVector(). --- dlls/d3dx9_36/effect.c | 54 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d9cd085..1e86aa2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -919,6 +919,16 @@ static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indat } } +static void set_vector(struct d3dx_parameter *param, CONST D3DXVECTOR4 *vector) +{ + UINT i; + + for (i = 0; i < param->columns; ++i) + { + set_number((FLOAT *)param->data + i, param->type, (FLOAT *)vector + i, D3DXPT_FLOAT); + } +} + static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) { unsigned int i, k; @@ -2020,13 +2030,51 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloatArray(ID3DXBaseEffect *iface, return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXBaseEffectImpl_SetVector(ID3DXBaseEffect* iface, D3DXHANDLE parameter, CONST D3DXVECTOR4* vector) +static HRESULT WINAPI ID3DXBaseEffectImpl_SetVector(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST 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 (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) + { + DWORD tmp; + + TRACE("INT fixup\n"); + tmp = (DWORD)(max(min(vector->z, 1.0f), 0.0f) * INT_FLOAT_MULTI); + tmp += ((DWORD)(max(min(vector->y, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; + tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; + tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; + + *(INT *)param->data = tmp; + return D3D_OK; + } + set_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_GetVector(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector)

1 0

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

14 Dec '11

Module: wine Branch: master Commit: 165afd63cee6e4c52512e6a31ea2c20a2d312ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=165afd63cee6e4c52512e6a31… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 13 17:02:37 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetVectorArray(). --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1e86aa2..d9fc0b9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2123,10 +2123,40 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetVector(ID3DXBaseEffect *iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_SetVectorArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXVECTOR4 *vector, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, vector %p, count %u stub\n", This, parameter, vector, count); + TRACE("iface %p, parameter %p, vector %p, count %u stub\n", This, parameter, vector, count); - return E_NOTIMPL; + if (param && param->element_count && param->element_count >= count) + { + UINT i; + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_VECTOR: + for (i = 0; i < count; ++i) + { + set_vector(get_parameter_struct(param->member_handles[i]), &vector[i]); + } + return D3D_OK; + + case D3DXPC_SCALAR: + 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_GetVectorArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector, UINT count)

1 0

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

14 Dec '11

Module: wine Branch: master Commit: 940b50b2d8e1b1c2d69739fe4d8af8b4cb536cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=940b50b2d8e1b1c2d69739fe4… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 13 17:02:42 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetValue(). --- dlls/d3dx9_36/effect.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d9fc0b9..75680d3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1603,10 +1603,48 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPCVOID data, UINT bytes) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, data %p, bytes %u stub\n", This, parameter, data, bytes); + TRACE("iface %p, parameter %p, data %p, bytes %u\n", This, parameter, data, bytes); - return E_NOTIMPL; + if (!param) + { + WARN("Invalid parameter %p specified\n", parameter); + return D3DERR_INVALIDCALL; + } + + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER + || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D + || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + { + TRACE("Sampler: returning E_FAIL\n"); + return E_FAIL; + } + + if (data && param->bytes >= bytes) + { + switch (param->type) + { + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + TRACE("Copy %u bytes\n", bytes); + memcpy(param->data, data, bytes); + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPVOID data, UINT bytes)

1 0

Nikolay Sivov : msxml3: Implemented get_responseStream().
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 19a86feaa1c986846a346a98d1340258e1c37106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a86feaa1c986846a346a98d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 13 00:56:13 2011 +0300 msxml3: Implemented get_responseStream(). --- dlls/msxml3/httprequest.c | 26 ++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 2385d18..cf4afe4 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -926,7 +926,9 @@ static HRESULT WINAPI httprequest_get_responseBody(IXMLHTTPRequest *iface, VARIA TRACE("(%p)->(%p)\n", This, body); if (!body) return E_INVALIDARG; - if (This->state != READYSTATE_COMPLETE) return E_FAIL; + V_VT(body) = VT_EMPTY; + + if (This->state != READYSTATE_COMPLETE) return E_PENDING; hr = GetHGlobalFromStream(This->bsc->stream, &hglobal); if (hr == S_OK) @@ -968,13 +970,29 @@ static HRESULT WINAPI httprequest_get_responseBody(IXMLHTTPRequest *iface, VARIA return hr; } -static HRESULT WINAPI httprequest_get_responseStream(IXMLHTTPRequest *iface, VARIANT *pvarBody) +static HRESULT WINAPI httprequest_get_responseStream(IXMLHTTPRequest *iface, VARIANT *body) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + LARGE_INTEGER move; + IStream *stream; + HRESULT hr; - FIXME("stub %p %p\n", This, pvarBody); + TRACE("(%p)->(%p)\n", This, body); - return E_NOTIMPL; + if (!body) return E_INVALIDARG; + V_VT(body) = VT_EMPTY; + + if (This->state != READYSTATE_COMPLETE) return E_PENDING; + + hr = IStream_Clone(This->bsc->stream, &stream); + + move.QuadPart = 0; + IStream_Seek(stream, move, STREAM_SEEK_SET, NULL); + + V_VT(body) = VT_UNKNOWN; + V_UNKNOWN(body) = (IUnknown*)stream; + + return hr; } static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, LONG *state) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4a719c8..19cb758 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4639,6 +4639,7 @@ static void test_XMLHTTP(void) IDispatch *event; void *ptr; HRESULT hr; + HGLOBAL g; hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest, (void**)&xhr); @@ -4665,6 +4666,20 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_abort(xhr); EXPECT_HR(hr, S_OK); + V_VT(&varbody) = VT_I2; + V_I2(&varbody) = 1; + hr = IXMLHttpRequest_get_responseBody(xhr, &varbody); + EXPECT_HR(hr, E_PENDING); + ok(V_VT(&varbody) == VT_EMPTY, "got type %d\n", V_VT(&varbody)); + ok(V_I2(&varbody) == 1, "got %d\n", V_I2(&varbody)); + + V_VT(&varbody) = VT_I2; + V_I2(&varbody) = 1; + hr = IXMLHttpRequest_get_responseStream(xhr, &varbody); + EXPECT_HR(hr, E_PENDING); + ok(V_VT(&varbody) == VT_EMPTY, "got type %d\n", V_VT(&varbody)); + ok(V_I2(&varbody) == 1, "got %d\n", V_I2(&varbody)); + /* send before open */ hr = IXMLHttpRequest_send(xhr, dummy); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); @@ -4835,9 +4850,23 @@ static void test_XMLHTTP(void) SafeArrayUnaccessData(V_ARRAY(&varbody)); VariantClear(&varbody); - SysFreeString(url); + /* get_responseStream */ + hr = IXMLHttpRequest_get_responseStream(xhr, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_get_responseStream(xhr, &varbody); + ok(V_VT(&varbody) == VT_UNKNOWN, "got type %d\n", V_VT(&varbody)); + EXPECT_HR(hr, S_OK); + EXPECT_REF(V_UNKNOWN(&varbody), 1); + + g = NULL; + hr = GetHGlobalFromStream((IStream*)V_UNKNOWN(&varbody), &g); + EXPECT_HR(hr, S_OK); + ok(g != NULL, "got %p\n", g); + hr = IXMLHttpRequest_QueryInterface(xhr, &IID_IObjectSafety, (void**)&safety); EXPECT_HR(hr, S_OK); if(hr == S_OK)

1 0

Hans Leidekker : msi: Move some traces from implementations to entry points .
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 973e86b844aa8d3e5533b26f59cb21d835d8b2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=973e86b844aa8d3e5533b26f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:18:42 2011 +0100 msi: Move some traces from implementations to entry points. --- dlls/msi/msi.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ce08940..3727560 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2685,6 +2685,8 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR szPackage ) static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, awstring* lpPathBuf, LPDWORD pcchBuf) { + static const WCHAR wininstaller[] = + {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; WCHAR squished_pc[GUID_SIZE]; WCHAR squished_comp[GUID_SIZE]; HKEY hkey; @@ -2692,12 +2694,6 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, INSTALLSTATE state; DWORD version; - static const WCHAR wininstaller[] = { - 'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; - - TRACE("%s %s %p %p\n", debugstr_w(szProduct), - debugstr_w(szComponent), lpPathBuf->str.w, pcchBuf); - if (!szProduct || !szComponent) return INSTALLSTATE_INVALIDARG; @@ -2772,6 +2768,8 @@ INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR szProduct, LPCWSTR szComponent, { awstring path; + TRACE("%s %s %p %p\n", debugstr_w(szProduct), debugstr_w(szComponent), lpPathBuf, pcchBuf); + path.unicode = TRUE; path.str.w = lpPathBuf; @@ -2788,6 +2786,8 @@ INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR szProduct, LPCSTR szComponent, INSTALLSTATE r = INSTALLSTATE_UNKNOWN; awstring path; + TRACE("%s %s %p %p\n", debugstr_a(szProduct), debugstr_a(szComponent), lpPathBuf, pcchBuf); + szwProduct = strdupAtoW( szProduct ); if( szProduct && !szwProduct) goto end; @@ -3243,10 +3243,6 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, DWORD sz; UINT rc; - TRACE("%s %s %i %s %i %i %p %p\n", debugstr_w(szComponent), - debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct), - Unused1, Unused2, lpPathBuf, pcchPathBuf); - rc = MSIREG_OpenUserComponentsKey(szComponent, &hkey, FALSE); if (rc != ERROR_SUCCESS) return ERROR_INDEX_ABSENT; @@ -3282,6 +3278,10 @@ UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR szComponent, { awstring path; + TRACE("%s %s %u %s %u %u %p %p\n", debugstr_w(szComponent), + debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct), + Unused1, Unused2, lpPathBuf, pcchPathBuf); + path.unicode = TRUE; path.str.w = lpPathBuf;

1 0

Hans Leidekker : msi: Support all install contexts in MsiReinstallFeatureW.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 00477d601eb1604e0854a447ffd5a7c56cf8e5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00477d601eb1604e0854a447f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:19:01 2011 +0100 msi: Support all install contexts in MsiReinstallFeatureW. --- dlls/msi/msi.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 3727560..21ffb39 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3773,18 +3773,20 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget, UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dwReinstallMode ) { - MSIPACKAGE* package = NULL; + static const WCHAR szLogVerbose[] = + {' ','L','O','G','V','E','R','B','O','S','E',0}; + MSIPACKAGE *package; + MSIINSTALLCONTEXT context; UINT r; - WCHAR sourcepath[MAX_PATH]; - WCHAR filename[MAX_PATH]; - static const WCHAR szLogVerbose[] = { - ' ','L','O','G','V','E','R','B','O','S','E',0 }; - WCHAR reinstallmode[11]; + WCHAR sourcepath[MAX_PATH], filename[MAX_PATH], reinstallmode[11]; LPWSTR ptr; DWORD sz; - FIXME("%s %s 0x%08x\n", - debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode); + TRACE("%s, %s, 0x%08x\n", debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode); + + r = msi_locate_product( szProduct, &context ); + if (r != ERROR_SUCCESS) + return r; ptr = reinstallmode; @@ -3811,12 +3813,12 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, *ptr = 0; sz = sizeof(sourcepath); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); + MsiSourceListGetInfoW( szProduct, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz ); sz = sizeof(filename); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); + MsiSourceListGetInfoW( szProduct, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_PACKAGENAMEW, filename, &sz ); lstrcatW( sourcepath, filename );

1 0

Hans Leidekker : msi: Don' t set the Installed property in MsiReinstallFeatureW.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 1f56b60cc41cfa87ecf57bccb88fc0b130bfbb52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f56b60cc41cfa87ecf57bccb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:19:14 2011 +0100 msi: Don't set the Installed property in MsiReinstallFeatureW. This property will be set later. --- dlls/msi/msi.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 21ffb39..d062ad0 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3831,7 +3831,6 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, return r; msi_set_property( package->db, szReinstallMode, reinstallmode ); - msi_set_property( package->db, szInstalled, szOne ); msi_set_property( package->db, szLogVerbose, szOne ); msi_set_property( package->db, szReinstall, szFeature );

1 0