December 2010 - Wine-commits

Jacek Caban : mshtml: Added IViewObjectEx iface to plugin test.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 9f182396fb600c550e26d6b03d6d88d7d6ceb29b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f182396fb600c550e26d6b03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:38:19 2010 +0100 mshtml: Added IViewObjectEx iface to plugin test. --- dlls/mshtml/tests/activex.c | 122 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 16c91ec..a2a92c5 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -291,6 +291,11 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA IOleClientSite_AddRef(container->pClientSite); client_site = container->pClientSite; + control->dwMiscStatus = OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|OLEMISC_INSIDEOUT + |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE; + control->dwViewStatus = 0x18; + control->dwPropNotifyCookie = 1; + return S_OK; } @@ -534,6 +539,118 @@ static const IDispatchVtbl DispatchVtbl = { static IDispatch Dispatch = { &DispatchVtbl }; +static HRESULT WINAPI ViewObjectEx_QueryInterface(IViewObjectEx *iface, REFIID riid, void **ppv) +{ + return ax_qi(riid, ppv); +} + +static ULONG WINAPI ViewObjectEx_AddRef(IViewObjectEx *iface) +{ + return 2; +} + +static ULONG WINAPI ViewObjectEx_Release(IViewObjectEx *iface) +{ + return 1; +} + +static HRESULT WINAPI ViewObjectEx_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, + HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBoungs, BOOL (WINAPI*pfnContinue)(ULONG_PTR), ULONG_PTR dwContinue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_GetColorSet(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, + HDC hicTargetDev, LOGPALETTE **ppColorSet) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_Freeze(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_Unfreeze(IViewObjectEx *iface, DWORD dwFreeze) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_GetAdvise(IViewObjectEx *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_GetExtent(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE *ptd, LPSIZEL lpsizel) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_GetRect(IViewObjectEx *iface, DWORD dwAspect, LPRECTL pRect) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_GetViewStatus(IViewObjectEx *iface, DWORD *pdwStatus) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_QueryHitPoint(IViewObjectEx *iface, DWORD dwAspect, LPCRECT pRectBounds, POINT ptlLoc, + LONG lCloseHint, DWORD *pHitResult) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_QueryHitRect(IViewObjectEx *iface, DWORD dwAspect, LPCRECT pRectBounds, LPCRECT pRectLoc, + LONG lCloseHint, DWORD *pHitResult) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObjectEx_GetNaturalExtent(IViewObjectEx *iface, DWORD dwAspect, LONG lindex, DVTARGETDEVICE *ptd, + HDC hicTargetDev, DVEXTENTINFO *pExtentIngo, LPSIZEL pSizel) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IViewObjectExVtbl ViewObjectExVtbl = { + ViewObjectEx_QueryInterface, + ViewObjectEx_AddRef, + ViewObjectEx_Release, + ViewObjectEx_Draw, + ViewObjectEx_GetColorSet, + ViewObjectEx_Freeze, + ViewObjectEx_Unfreeze, + ViewObjectEx_SetAdvise, + ViewObjectEx_GetAdvise, + ViewObjectEx_GetExtent, + ViewObjectEx_GetRect, + ViewObjectEx_GetViewStatus, + ViewObjectEx_QueryHitPoint, + ViewObjectEx_QueryHitRect, + ViewObjectEx_GetNaturalExtent +}; + +static IViewObjectEx ViewObjectEx = { &ViewObjectExVtbl }; + static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { @@ -556,6 +673,11 @@ static HRESULT ax_qi(REFIID riid, void **ppv) return S_OK; } + if(IsEqualGUID(riid, &IID_IViewObject) || IsEqualGUID(riid, &IID_IViewObject2) || IsEqualGUID(riid, &IID_IViewObjectEx)) { + *ppv = &ViewObjectEx; + return S_OK; + } + *ppv = NULL; return E_NOINTERFACE; }

1 0

Hans Leidekker : msi/tests: Fix some test failures on Wow64.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 1214dca41237dcf401f3548cf0538b0748df6426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1214dca41237dcf401f3548cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 10 16:46:43 2010 +0100 msi/tests: Fix some test failures on Wow64. --- dlls/msi/tests/action.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 504291a..0032222 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2842,7 +2842,7 @@ currentuser: RegCloseKey(hkey); machprod: - res = RegOpenKeyA(HKEY_CLASSES_ROOT, machprod, &hkey); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, machprod, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); @@ -2856,7 +2856,7 @@ machprod: CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0); CHECK_DEL_REG_STR(hkey, "Clients", ":"); - res = RegOpenKeyA(hkey, "SourceList", &sourcelist); + res = RegOpenKeyExA(hkey, "SourceList", 0, access, &sourcelist); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); lstrcpyA(path, "n;1;"); @@ -2864,7 +2864,7 @@ machprod: CHECK_DEL_REG_STR(sourcelist, "LastUsedSource", path); CHECK_DEL_REG_STR(sourcelist, "PackageName", "msitest.msi"); - res = RegOpenKeyA(sourcelist, "Net", &net); + res = RegOpenKeyExA(sourcelist, "Net", 0, access, &net); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(net, "1", temp); @@ -2872,7 +2872,7 @@ machprod: RegDeleteKeyA(net, ""); RegCloseKey(net); - res = RegOpenKeyA(sourcelist, "Media", &media); + res = RegOpenKeyExA(sourcelist, "Media", 0, access, &media); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(media, "1", "DISK1;"); @@ -2884,7 +2884,7 @@ machprod: RegDeleteKeyA(hkey, ""); RegCloseKey(hkey); - res = RegOpenKeyA(HKEY_CLASSES_ROOT, machup, &hkey); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, machup, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); @@ -2989,7 +2989,7 @@ static void test_publish_features(void) res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - res = RegOpenKeyA(HKEY_LOCAL_MACHINE, classfeat, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, classfeat, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_REG_STR(hkey, "feature", "");

1 0

Eryk Wieliczko : msvcrt: Implement ecvt_s.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 1ade6c2bc8e3e895992accf4aca098b0f8d0fb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ade6c2bc8e3e895992accf4a… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Fri Dec 10 14:46:36 2010 +0100 msvcrt: Implement ecvt_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 66 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9f2a147..82606e2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -583,7 +583,7 @@ @ cdecl _dup2(long long) msvcrt._dup2 @ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt -@ stub _ecvt_s +@ cdecl _ecvt_s(str long double long ptr ptr) msvcrt._ecvt_s @ cdecl _encoded_null() msvcr90._encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1512347..e54eea6 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -423,7 +423,7 @@ @ cdecl _dup2(long long) msvcrt._dup2 @ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt -@ stub _ecvt_s +@ cdecl _ecvt_s(str long double long ptr ptr) msvcrt._ecvt_s @ cdecl _encode_pointer(ptr) msvcr90._encode_pointer @ cdecl _encoded_null() msvcr90._encoded_null @ cdecl _endthread() msvcrt._endthread diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index feaf80e..5baee98 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -415,7 +415,7 @@ @ cdecl _dup2(long long) msvcrt._dup2 @ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt -@ stub _ecvt_s +@ cdecl _ecvt_s(str long double long ptr ptr) msvcrt._ecvt_s @ cdecl _encode_pointer(ptr) MSVCR90_encode_pointer @ cdecl _encoded_null() @ cdecl _endthread() msvcrt._endthread diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6fb0549..d2110cb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1104,6 +1104,72 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) return data->efcvt_buffer; } +/********************************************************************* + * _ecvt_s (MSVCRT.@) + */ +int CDECL _ecvt_s( char *buffer, MSVCRT_size_t length, double number, int ndigits, int *decpt, int *sign ) +{ + int prec, len; + char *result; + const char infret[] = "1#INF"; + + if(!MSVCRT_CHECK_PMT(buffer != NULL) || !MSVCRT_CHECK_PMT(decpt != NULL) || !MSVCRT_CHECK_PMT(sign != NULL)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + if(!MSVCRT_CHECK_PMT(length > 2) || !MSVCRT_CHECK_PMT(ndigits < (int)length - 1)) + { + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + /* special case - inf */ + if(number == HUGE_VAL || number == -HUGE_VAL) + { + memset(buffer, '0', ndigits); + memcpy(buffer, infret, min(ndigits, sizeof(infret) - 1 ) ); + buffer[ndigits] = '\0'; + (*decpt) = 1; + if(number == -HUGE_VAL) + (*sign) = 1; + else + (*sign) = 0; + return 0; + } + result = (char*)MSVCRT_malloc(max(ndigits + 7, 7)); + + if( number < 0) { + *sign = TRUE; + number = -number; + } else + *sign = FALSE; + /* handle cases with zero ndigits or less */ + prec = ndigits; + if( prec < 1) prec = 2; + len = snprintf(result, 80, "%.*le", prec - 1, number); + /* take the decimal "point away */ + if( prec != 1) + memmove( result + 1, result + 2, len - 1 ); + /* take the exponential "e" out */ + result[ prec] = '\0'; + /* read the exponent */ + sscanf( result + prec + 1, "%d", decpt); + (*decpt)++; + /* adjust for some border cases */ + if( result[0] == '0')/* value is zero */ + *decpt = 0; + /* handle cases with zero ndigits or less */ + if( ndigits < 1){ + if( result[ 0] >= '5') + (*decpt)++; + result[ 0] = '\0'; + } + memcpy( buffer, result, max(ndigits + 1, 1) ); + MSVCRT_free( result ); + return 0; +} + /*********************************************************************** * _fcvt (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9fe5f64..ba8c9ea 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -378,7 +378,7 @@ @ cdecl _dup (long) MSVCRT__dup @ cdecl _dup2 (long long) MSVCRT__dup2 @ cdecl _ecvt(double long ptr ptr) -# stub _ecvt_s +@ cdecl _ecvt_s(str long double long ptr ptr) @ cdecl _endthread () @ cdecl _endthreadex(long) @ extern _environ MSVCRT__environ

1 0

Eryk Wieliczko : msvcrt/tests: Add _ecvt_s tests.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: a2af7ccd9909323ccf1f915663b60283da21d5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2af7ccd9909323ccf1f91566… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Fri Dec 10 15:00:59 2010 +0100 msvcrt/tests: Add _ecvt_s tests. --- dlls/msvcrt/tests/printf.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 4386bf1..3d61f3d 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -38,6 +38,8 @@ static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist); static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer, size_t count, const wchar_t *format, __ms_va_list valist); +static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number, + int ndigits, int *decpt, int *sign); static void init( void ) { @@ -46,6 +48,7 @@ static void init( void ) p__vscprintf = (void *)GetProcAddress(hmod, "_vscprintf"); p__vscwprintf = (void *)GetProcAddress(hmod, "_vscwprintf"); p__vsnwprintf_s = (void *)GetProcAddress(hmod, "_vsnwprintf_s"); + p__ecvt_s = (void *)GetProcAddress(hmod, "_ecvt_s"); } static void test_sprintf( void ) @@ -766,7 +769,7 @@ static struct { static void test_xcvt(void) { char *str; - int i, decpt, sign; + int i, decpt, sign, err; for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; str = _ecvt( test_cvt_testcases[i].value, @@ -779,6 +782,9 @@ static void test_xcvt(void) ok( decpt == test_cvt_testcases[i].expdecpt_e, "_ecvt() decimal point wrong, got %d expected %d\n", decpt, test_cvt_testcases[i].expdecpt_e); + ok( sign == test_cvt_testcases[i].expsign, + "_ecvt() sign wrong, got %d expected %d\n", sign, + test_cvt_testcases[i].expsign); } for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; @@ -796,6 +802,28 @@ static void test_xcvt(void) "_ecvt() sign wrong, got %d expected %d\n", sign, test_cvt_testcases[i].expsign); } + + if (p__ecvt_s) + { + str = malloc(1024); + for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ + decpt = sign = 100; + err = p__ecvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); + ok(err == 0, "_ecvt_s() failed with error code %d", err); + ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_e, 15), + "_ecvt_s() bad return, got \n'%s' expected \n'%s'\n", str, + test_cvt_testcases[i].expstr_e); + ok( decpt == test_cvt_testcases[i].expdecpt_e, + "_ecvt_s() decimal point wrong, got %d expected %d\n", decpt, + test_cvt_testcases[i].expdecpt_e); + ok( sign == test_cvt_testcases[i].expsign, + "_ecvt_s() sign wrong, got %d expected %d\n", sign, + test_cvt_testcases[i].expsign); + } + free(str); + } + else + win_skip("_ecvt_s not available\n"); } static int __cdecl _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...)

1 0

Marcus Meissner : ntdll: Report a failed executable mmap on nonexec filesystems.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: e7cb2d35f0bac1f4e9c7969e66e3013118802279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7cb2d35f0bac1f4e9c7969e6… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Dec 10 15:51:43 2010 +0100 ntdll: Report a failed executable mmap on nonexec filesystems. --- dlls/ntdll/virtual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d7a04c3..6f8b9a3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -877,6 +877,9 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) goto done; + if ((errno == EPERM) && (prot & PROT_EXEC)) + ERR( "failed to set %08x protection on file map, noexec filesystem?\n", prot ); + /* mmap() failed; if this is because the file offset is not */ /* page-aligned (EINVAL), or because the underlying filesystem */ /* does not support mmap() (ENOEXEC,ENODEV), we do it by hand. */

1 0

Jacek Caban : mshtml: Added beginning support for loading data by an ActiveX object.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: dbbcbd59a5df92e46ac6ba29c4802db292e962bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbcbd59a5df92e46ac6ba29c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:35:15 2010 +0100 mshtml: Added beginning support for loading data by an ActiveX object. --- dlls/mshtml/npplugin.c | 16 ++++---- dlls/mshtml/pluginhost.c | 81 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/pluginhost.h | 4 ++- 3 files changed, 91 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 93e22da..ad88da2 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -203,31 +203,30 @@ static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) return ret; } -static IUnknown *create_activex_object(HTMLWindow *window, nsIDOMElement *nselem) +static IUnknown *create_activex_object(HTMLWindow *window, nsIDOMElement *nselem, CLSID *clsid) { IClassFactoryEx *cfex; IClassFactory *cf; IUnknown *obj; DWORD policy; - CLSID guid; HRESULT hres; - if(!get_elem_clsid(nselem, &guid)) { + if(!get_elem_clsid(nselem, clsid)) { WARN("Could not determine element CLSID\n"); return NULL; } - TRACE("clsid %s\n", debugstr_guid(&guid)); + TRACE("clsid %s\n", debugstr_guid(clsid)); policy = 0; hres = IInternetHostSecurityManager_ProcessUrlAction(HOSTSECMGR(window->doc), URLACTION_ACTIVEX_RUN, - (BYTE*)&policy, sizeof(policy), (BYTE*)&guid, sizeof(GUID), 0, 0); + (BYTE*)&policy, sizeof(policy), (BYTE*)clsid, sizeof(GUID), 0, 0); if(FAILED(hres) || policy != URLPOLICY_ALLOW) { WARN("ProcessUrlAction returned %08x %x\n", hres, policy); return NULL; } - hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); + hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); if(FAILED(hres)) return NULL; @@ -250,6 +249,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I nsIDOMElement *nselem; HTMLWindow *window; IUnknown *obj; + CLSID clsid; NPError err = NPERR_NO_ERROR; TRACE("(%s %p %x %d %p %p %p)\n", debugstr_a(pluginType), instance, mode, argc, argn, argv, saved); @@ -267,12 +267,12 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I return NPERR_GENERIC_ERROR; } - obj = create_activex_object(window, nselem); + obj = create_activex_object(window, nselem, &clsid); if(obj) { PluginHost *host; HRESULT hres; - hres = create_plugin_host(window->doc, nselem, obj, &host); + hres = create_plugin_host(window->doc, nselem, obj, &clsid, &host); nsIDOMElement_Release(nselem); IUnknown_Release(obj); if(SUCCEEDED(hres)) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 785abdd..cfd40fa 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -39,6 +39,81 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); const IID IID_HTMLPluginContainer = {0xbd7a6050,0xb373,0x4f6f,{0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a}}; +static BOOL check_load_safety(PluginHost *host) +{ + DWORD policy_size, policy; + struct CONFIRMSAFETY cs; + BYTE *ppolicy; + HRESULT hres; + + cs.clsid = host->clsid; + cs.pUnk = host->plugin_unk; + cs.dwFlags = CONFIRMSAFETYACTION_LOADOBJECT; + + hres = IInternetHostSecurityManager_QueryCustomPolicy(HOSTSECMGR(host->doc), + &GUID_CUSTOM_CONFIRMOBJECTSAFETY, &ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + if(FAILED(hres)) + return FALSE; + + policy = *(DWORD*)ppolicy; + CoTaskMemFree(ppolicy); + return policy == URLPOLICY_ALLOW; +} + +static HRESULT create_prop_bag(IPropertyBag **ret) { + *ret = NULL; + return S_OK; +} + +static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_bag) +{ + IPropertyBag *prop_bag; + HRESULT hres; + + hres = create_prop_bag(&prop_bag); + if(FAILED(hres)) + return; + + if(prop_bag && !check_load_safety(host)) { + IPropertyBag_Release(prop_bag); + prop_bag = NULL; + } + + if(prop_bag) { + hres = IPersistPropertyBag_Load(persist_prop_bag, prop_bag, NULL); + IPropertyBag_Release(prop_bag); + if(FAILED(hres)) + WARN("Load failed: %08x\n", hres); + }else { + hres = IPersistPropertyBag_InitNew(persist_prop_bag); + if(FAILED(hres)) + WARN("InitNew failed: %08x\n", hres); + } +} + +static void load_plugin(PluginHost *host) +{ + IPersistPropertyBag2 *persist_prop_bag2; + IPersistPropertyBag *persist_prop_bag; + HRESULT hres; + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IPersistPropertyBag2, (void**)&persist_prop_bag2); + if(SUCCEEDED(hres)) { + FIXME("Use IPersistPropertyBag2 iface\n"); + IPersistPropertyBag2_Release(persist_prop_bag2); + return; + } + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IPersistPropertyBag, (void**)&persist_prop_bag); + if(SUCCEEDED(hres)) { + load_prop_bag(host, persist_prop_bag); + IPersistPropertyBag_Release(persist_prop_bag); + return; + } + + FIXME("No IPersistPeropertyBag iface \n"); +} + static void activate_plugin(PluginHost *host) { IClientSecurity *client_security; @@ -74,7 +149,10 @@ static void activate_plugin(PluginHost *host) FIXME("QuickActivate failed: %08x\n", hres); }else { FIXME("No IQuickActivate\n"); + return; } + + load_plugin(host); } void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) @@ -769,7 +847,7 @@ void detach_plugin_hosts(HTMLDocumentNode *doc) } } -HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknown *unk, PluginHost **ret) +HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknown *unk, const CLSID *clsid, PluginHost **ret) { PluginHost *host; HRESULT hres; @@ -797,6 +875,7 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknow IUnknown_AddRef(unk); host->plugin_unk = unk; + host->clsid = *clsid; host->doc = doc; list_add_tail(&doc->plugin_hosts, &host->entry); diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index d030a3e..7b88612 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -31,7 +31,9 @@ typedef struct { LONG ref; IUnknown *plugin_unk; + CLSID clsid; HWND hwnd; + RECT rect; HTMLDocumentNode *doc; struct list entry; @@ -47,6 +49,6 @@ struct HTMLPluginContainer { extern const IID IID_HTMLPluginContainer; -HRESULT create_plugin_host(HTMLDocumentNode*,nsIDOMElement*,IUnknown*,PluginHost**); +HRESULT create_plugin_host(HTMLDocumentNode*,nsIDOMElement*,IUnknown*,const CLSID*,PluginHost**); void update_plugin_window(PluginHost*,HWND,const RECT*); void detach_plugin_hosts(HTMLDocumentNode*);

1 0

Jacek Caban : mshtml: IPropertyBag stub implementation.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 067092c22354b6f16da95955a100c2d5eb21c81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=067092c22354b6f16da95955a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:35:40 2010 +0100 mshtml: IPropertyBag stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/pluginhost.c | 7 +-- dlls/mshtml/pluginhost.h | 2 + dlls/mshtml/propbag.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 2b4e66d..9ea7512 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -62,6 +62,7 @@ C_SRCS = \ omnavigator.c \ persist.c \ pluginhost.c \ + propbag.c \ protocol.c \ script.c \ secmgr.c \ diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index cfd40fa..f58b765 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -60,17 +60,12 @@ static BOOL check_load_safety(PluginHost *host) return policy == URLPOLICY_ALLOW; } -static HRESULT create_prop_bag(IPropertyBag **ret) { - *ret = NULL; - return S_OK; -} - static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_bag) { IPropertyBag *prop_bag; HRESULT hres; - hres = create_prop_bag(&prop_bag); + hres = create_param_prop_bag(&prop_bag); if(FAILED(hres)) return; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 7b88612..b9a9c1b 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -52,3 +52,5 @@ extern const IID IID_HTMLPluginContainer; HRESULT create_plugin_host(HTMLDocumentNode*,nsIDOMElement*,IUnknown*,const CLSID*,PluginHost**); void update_plugin_window(PluginHost*,HWND,const RECT*); void detach_plugin_hosts(HTMLDocumentNode*); + +HRESULT create_param_prop_bag(IPropertyBag**); diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c new file mode 100644 index 0000000..fd44f03 --- /dev/null +++ b/dlls/mshtml/propbag.c @@ -0,0 +1,128 @@ +/* + * Copyright 2010 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "shlobj.h" + +#include "mshtml_private.h" +#include "pluginhost.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +typedef struct { + IPropertyBag IPropertyBag_iface; + + LONG ref; +} PropertyBag; + +static inline PropertyBag *impl_from_IPropertyBag(IPropertyBag *iface) +{ + return CONTAINING_RECORD(iface, PropertyBag, IPropertyBag_iface); +} + +static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv) +{ + PropertyBag *This = impl_from_IPropertyBag(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IPropertyBag_iface; + }else if(IsEqualGUID(&IID_IPropertyBag, riid)) { + TRACE("(%p)->(IID_IPropertyBag %p)\n", This, ppv); + *ppv = &This->IPropertyBag_iface; + }else { + WARN("Unsopported interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PropertyBag_AddRef(IPropertyBag *iface) +{ + PropertyBag *This = impl_from_IPropertyBag(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI PropertyBag_Release(IPropertyBag *iface) +{ + PropertyBag *This = impl_from_IPropertyBag(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI PropertyBag_Read(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog) +{ + PropertyBag *This = impl_from_IPropertyBag(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(pszPropName), pVar, pErrorLog); + return E_NOTIMPL; +} + +static HRESULT WINAPI PropertyBag_Write(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar) +{ + PropertyBag *This = impl_from_IPropertyBag(iface); + FIXME("(%p)->(%s %s)\n", This, debugstr_w(pszPropName), debugstr_variant(pVar)); + return E_NOTIMPL; +} + +static const IPropertyBagVtbl PropertyBagVtbl = { + PropertyBag_QueryInterface, + PropertyBag_AddRef, + PropertyBag_Release, + PropertyBag_Read, + PropertyBag_Write +}; + +HRESULT create_param_prop_bag(IPropertyBag **ret) +{ + PropertyBag *prop_bag; + + prop_bag = heap_alloc(sizeof(*prop_bag)); + if(!prop_bag) + return E_OUTOFMEMORY; + + prop_bag->IPropertyBag_iface.lpVtbl = &PropertyBagVtbl; + prop_bag->ref = 1; + + *ret = &prop_bag->IPropertyBag_iface; + return S_OK; +}

1 0

Jacek Caban : mshtml: Added IPersistPropertyBag calls test.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: cc88c5a3312a5de11e7eb618a0570865397bf694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc88c5a3312a5de11e7eb618a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 16:35:59 2010 +0100 mshtml: Added IPersistPropertyBag calls test. --- dlls/mshtml/tests/activex.c | 84 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 69 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 9984ae0..8e46a25 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -60,6 +60,8 @@ DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(FreezeEvents_TRUE); DEFINE_EXPECT(FreezeEvents_FALSE); DEFINE_EXPECT(QuickActivate); +DEFINE_EXPECT(IPersistPropertyBag_InitNew); +DEFINE_EXPECT(IPersistPropertyBag_Load); static HWND container_hwnd; @@ -68,18 +70,6 @@ static HWND container_hwnd; static const GUID CLSID_TestActiveX = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xf6,0x68,0x07,0x46}}; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static const char object_ax_str[] = "<html><head></head><body>" "<object classid=\"clsid:" TESTACTIVEX_CLSID "\" width=\"300\" height=\"200\" id=\"objid\">" @@ -102,7 +92,7 @@ static const REFIID pluginhost_iids[] = { NULL }; -static const char *dbgstr_guid(REFIID riid) +static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -138,7 +128,7 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) for(piid = iids; *piid; piid++) { hres = IDispatch_QueryInterface(iface, *piid, (void**)&unk); - ok_(__FILE__,line) (hres == S_OK, "Could not get %s interface: %08x\n", dbgstr_guid(*piid), hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get %s interface: %08x\n", debugstr_guid(*piid), hres); if(SUCCEEDED(hres)) IUnknown_Release(unk); } @@ -280,6 +270,62 @@ static const IQuickActivateVtbl QuickActivateVtbl = { static IQuickActivate QuickActivate = { &QuickActivateVtbl }; +static HRESULT WINAPI PersistPropertyBag_QueryInterface(IPersistPropertyBag *iface, REFIID riid, void **ppv) +{ + return ax_qi(riid, ppv); +} + +static ULONG WINAPI PersistPropertyBag_AddRef(IPersistPropertyBag *iface) +{ + return 2; +} + +static ULONG WINAPI PersistPropertyBag_Release(IPersistPropertyBag *iface) +{ + return 1; +} + +static HRESULT WINAPI PersistPropertyBag_GetClassID(IPersistPropertyBag *face, CLSID *pClassID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistPropertyBag_InitNew(IPersistPropertyBag *face) +{ + CHECK_EXPECT(IPersistPropertyBag_InitNew); + return S_OK; +} + +static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IPropertyBag *pPropBag, IErrorLog *pErrorLog) +{ + CHECK_EXPECT(IPersistPropertyBag_Load); + + ok(pPropBag != NULL, "pPropBag == NULL\n"); + ok(!pErrorLog, "pErrorLog != NULL\n"); + + return S_OK; +} + +static HRESULT WINAPI PersistPropertyBag_Save(IPersistPropertyBag *face, IPropertyBag *pPropBag, BOOL fClearDisrty, BOOL fSaveAllProperties) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IPersistPropertyBagVtbl PersistPropertyBagVtbl = { + PersistPropertyBag_QueryInterface, + PersistPropertyBag_AddRef, + PersistPropertyBag_Release, + PersistPropertyBag_GetClassID, + PersistPropertyBag_InitNew, + PersistPropertyBag_Load, + PersistPropertyBag_Save + +}; + +static IPersistPropertyBag PersistPropertyBag = { &PersistPropertyBagVtbl }; + static HRESULT ax_qi(REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleControl)) { @@ -292,6 +338,11 @@ static HRESULT ax_qi(REFIID riid, void **ppv) return S_OK; } + if(IsEqualGUID(riid, &IID_IPersistPropertyBag)) { + *ppv = &PersistPropertyBag; + return S_OK; + } + *ppv = NULL; return E_NOINTERFACE; } @@ -351,6 +402,8 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { ClassFactory_LockServer }; +static IClassFactory activex_cf = { &ClassFactoryVtbl }; + static HRESULT cs_qi(REFIID,void **); static IOleDocumentView *view; @@ -726,7 +779,6 @@ static HRESULT cs_qi(REFIID riid, void **ppv) return *ppv ? S_OK : E_NOINTERFACE; } -static IClassFactory activex_cf = { &ClassFactoryVtbl }; static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -914,6 +966,7 @@ static void test_object_ax(void) SET_EXPECT(FreezeEvents_TRUE); SET_EXPECT(QuickActivate); SET_EXPECT(FreezeEvents_FALSE); + SET_EXPECT(IPersistPropertyBag_Load); doc = create_doc(object_ax_str, &called_CreateInstance); @@ -923,6 +976,7 @@ static void test_object_ax(void) CHECK_CALLED(QuickActivate); todo_wine CHECK_CALLED(FreezeEvents_FALSE); + CHECK_CALLED(IPersistPropertyBag_Load); release_doc(doc); }

1 0

Hans Leidekker : advapi32: Return the computer name as referenced domain name in LookupAccountName.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: eba814763a654d1c982f2142b6a70cf7d0ae1590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba814763a654d1c982f2142b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 10 12:53:25 2010 +0100 advapi32: Return the computer name as referenced domain name in LookupAccountName. --- dlls/advapi32/security.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 0458033..e24d90f 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2629,9 +2629,8 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo HANDLE token; BOOL ret; PSID pSid; - static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + WCHAR domainName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD nameLen; - LPCWSTR domainName; if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) { @@ -2655,9 +2654,12 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo } *cbSid = GetLengthSid(pSid); - domainName = dm; - nameLen = strlenW(domainName); - + nameLen = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(domainName, &nameLen)) + { + domainName[0] = 0; + nameLen = 0; + } if (*cchReferencedDomainName <= nameLen || !ret) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -2683,9 +2685,8 @@ static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR Referenc { MAX_SID local; BOOL ret; - static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + WCHAR domainName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD nameLen; - LPCWSTR domainName; if ((ret = ADVAPI_GetComputerSid(&local))) { @@ -2699,9 +2700,12 @@ static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR Referenc *cbSid = GetLengthSid(&local); } - domainName = dm; - nameLen = strlenW(domainName); - + nameLen = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(domainName, &nameLen)) + { + domainName[0] = 0; + nameLen = 0; + } if (*cchReferencedDomainName <= nameLen || !ret) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -2898,11 +2902,12 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI BOOL ret, handled; LSA_UNICODE_STRING account; - FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), + TRACE("%s %s %p %p %p %p %p\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); if (!ADVAPI_IsLocalComputer( lpSystemName )) { + FIXME("remote computer not supported\n"); SetLastError( RPC_S_SERVER_UNAVAILABLE ); return FALSE; }

1 0

Hans Leidekker : sxs: Add support for installing policy files.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 75e35447586a39b14e0ba49eb3973f01f6b0e0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e35447586a39b14e0ba49eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 10 12:53:50 2010 +0100 sxs: Add support for installing policy files. --- dlls/sxs/cache.c | 150 ++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 112 insertions(+), 38 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index cd5f26c..8f9238d 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -308,26 +308,20 @@ static HRESULT parse_assembly( IXMLDOMDocument *doc, struct assembly **assembly hr = IXMLDOMNode_get_attributes( node, &attrs ); if (hr != S_OK) goto done; - a->type = get_attribute_value( attrs, typeW ); - if (a->type && !strcmpW( a->type, policyW )) - { - FIXME("ignoring policy assembly\n"); - hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; - goto done; - } + a->type = get_attribute_value( attrs, typeW ); a->name = get_attribute_value( attrs, nameW ); a->version = get_attribute_value( attrs, versionW ); a->arch = get_attribute_value( attrs, architectureW ); a->token = get_attribute_value( attrs, tokenW ); - if (!a->type || strcmpW( a->type, win32W ) || !a->name || !a->version || !a->arch || !a->token) + if (!a->type || (strcmpW( a->type, win32W ) && strcmpW( a->type, policyW )) || + !a->name || !a->version || !a->arch || !a->token) { WARN("invalid win32 assembly\n"); hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; goto done; } - - hr = parse_files( doc, a ); + if (!strcmpW( a->type, win32W )) hr = parse_files( doc, a ); done: if (attrs) IXMLDOMNamedNodeMap_Release( attrs ); @@ -338,6 +332,99 @@ done: return hr; } +static WCHAR *build_sxs_path( void ) +{ + static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\',0}; + WCHAR sxsdir[MAX_PATH]; + + GetWindowsDirectoryW( sxsdir, MAX_PATH ); + strcatW( sxsdir, winsxsW ); + return strdupW( sxsdir ); +} + +static WCHAR *build_assembly_name( struct assembly *assembly ) +{ + static const WCHAR fmtW[] = + {'%','s','_','%','s','_','%','s','_','%','s','_','n','o','n','e','_','d','e','a','d','b','e','e','f',0}; + WCHAR *ret, *p; + int len; + + len = strlenW( fmtW ); + len += strlenW( assembly->arch ); + len += strlenW( assembly->name ); + len += strlenW( assembly->token ); + len += strlenW( assembly->version ); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, assembly->arch, assembly->name, assembly->token, assembly->version ); + for (p = ret; *p; p++) *p = tolowerW( *p ); + return ret; +} + +static WCHAR *build_policy_name( struct assembly *assembly ) +{ + static const WCHAR fmtW[] = + {'%','s','_','%','s','_','%','s','_','n','o','n','e','_','d','e','a','d','b','e','e','f',0}; + WCHAR *ret, *p; + int len; + + len = strlenW( fmtW ); + len += strlenW( assembly->arch ); + len += strlenW( assembly->name ); + len += strlenW( assembly->token ); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, assembly->arch, assembly->name, assembly->token ); + for (p = ret; *p; p++) *p = tolowerW( *p ); + return ret; +} + +static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly ) +{ + static const WCHAR policiesW[] = {'p','o','l','i','c','i','e','s','\\',0}; + static const WCHAR suffixW[] = {'.','p','o','l','i','c','y',0}; + static const WCHAR backslashW[] = {'\\',0}; + WCHAR *sxsdir, *name, *dst; + HRESULT hr = E_OUTOFMEMORY; + BOOL ret; + int len; + + /* FIXME: handle catalog file */ + + if (!(sxsdir = build_sxs_path())) return E_OUTOFMEMORY; + if (!(name = build_policy_name( assembly ))) goto done; + + len = strlenW( sxsdir ); + len += strlenW( policiesW ); + len += strlenW( name ) + 1; + len += strlenW( assembly->version ); + len += strlenW( suffixW ); + + if (!(dst = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) goto done; + strcpyW( dst, sxsdir ); + strcatW( dst, policiesW ); + CreateDirectoryW( dst, NULL ); + strcatW( dst, name ); + CreateDirectoryW( dst, NULL ); + strcatW( dst, backslashW ); + strcatW( dst, assembly->version ); + strcatW( dst, suffixW ); + + ret = CopyFileW( manifest, dst, FALSE ); + HeapFree( GetProcessHeap(), 0, dst ); + if (!ret) + { + hr = HRESULT_FROM_WIN32( GetLastError() ); + WARN("failed to copy policy manifest file 0x%08x\n", hr); + } + hr = S_OK; + +done: + HeapFree( GetProcessHeap(), 0, sxsdir ); + HeapFree( GetProcessHeap(), 0, name ); + return hr; +} + static WCHAR *build_source_filename( const WCHAR *manifest, struct file *file ) { WCHAR *src; @@ -359,42 +446,23 @@ static WCHAR *build_source_filename( const WCHAR *manifest, struct file *file ) static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembly ) { - static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\',0}; static const WCHAR manifestsW[] = {'m','a','n','i','f','e','s','t','s','\\',0}; - static const WCHAR deadbeefW[] = {'n','o','n','e','_','d','e','a','d','b','e','e','f',0}; static const WCHAR suffixW[] = {'.','m','a','n','i','f','e','s','t',0}; static const WCHAR backslashW[] = {'\\',0}; - static const WCHAR fmtW[] = {'%','s','_','%','s','_','%','s','_','%','s','_','%','s',0}; - WCHAR sxsdir[MAX_PATH], *p, *name, *dst, *src; - int len; + WCHAR *sxsdir, *p, *name, *dst, *src; struct file *file; - HRESULT hr = S_OK; + HRESULT hr = E_OUTOFMEMORY; BOOL ret; + int len; - GetWindowsDirectoryW( sxsdir, MAX_PATH ); - strcatW( sxsdir, winsxsW ); - - len = strlenW( fmtW ); - len += strlenW( assembly->arch ); - len += strlenW( assembly->name ); - len += strlenW( assembly->token ); - len += strlenW( assembly->version ); - len += strlenW( deadbeefW ); - - if (!(name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - return E_OUTOFMEMORY; - - len = sprintfW( name, fmtW, assembly->arch, assembly->name, assembly->token, assembly->version, deadbeefW ); - for (p = name; *p; p++) *p = tolowerW( *p ); + if (!(sxsdir = build_sxs_path())) return E_OUTOFMEMORY; + if (!(name = build_assembly_name( assembly ))) goto done; - len += strlenW( sxsdir ); + len = strlenW( sxsdir ); len += strlenW( manifestsW ); + len += strlenW( name ); len += strlenW( suffixW ); - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) - { - HeapFree( GetProcessHeap(), 0, name ); - return E_OUTOFMEMORY; - } + if (!(dst = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) goto done; strcpyW( dst, sxsdir ); strcatW( dst, manifestsW ); strcatW( dst, name ); @@ -442,8 +510,10 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl goto done; } } + hr = S_OK; done: + HeapFree( GetProcessHeap(), 0, sxsdir ); HeapFree( GetProcessHeap(), 0, name ); return hr; } @@ -454,6 +524,7 @@ static HRESULT WINAPI cache_InstallAssembly( LPCWSTR path, LPCFUSION_INSTALL_REFERENCE ref ) { + static const WCHAR policyW[] = {'w','i','n','3','2','-','p','o','l','i','c','y',0}; HRESULT hr, init; IXMLDOMDocument *doc = NULL; struct assembly *assembly = NULL; @@ -489,7 +560,10 @@ static HRESULT WINAPI cache_InstallAssembly( /* FIXME: verify name attributes */ - hr = install_assembly( path, assembly ); + if (!strcmpW( assembly->type, policyW )) + hr = install_policy( path, assembly ); + else + hr = install_assembly( path, assembly ); done: free_assembly( assembly );

1 0