February 2013 - Wine-Commits

Andrew Talbot : usp10: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 28, 2013

Feb. 28, 2013

Module: wine Branch: master Commit: 4ef6a9689051f4d4d6260fcdf431db99f530878b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef6a9689051f4d4d6260fcdf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 27 21:13:06 2013 +0000 usp10: Avoid signed-unsigned integer comparisons. --- dlls/usp10/bidi.c | 3 ++- dlls/usp10/usp10.c | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 3b1823f..74ca70b 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -749,7 +749,8 @@ BOOL BIDI_DetermineLevels( ) { WORD *chartype; - unsigned baselevel = 0,j; + unsigned baselevel = 0; + INT j; TRACE("%s, %d\n", debugstr_wn(lpString, uCount), uCount); chartype = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WORD)); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5287556..bc48ecd 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1017,13 +1017,14 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) if (psc && *psc) { unsigned int i; + INT n; for (i = 0; i < GLYPH_MAX / GLYPH_BLOCK_SIZE; i++) { heap_free(((ScriptCache *)*psc)->widths[i]); } for (i = 0; i < 0x10; i++) { - int j; + unsigned int j; if (((ScriptCache *)*psc)->page[i]) for (j = 0; j < GLYPH_MAX / GLYPH_BLOCK_SIZE; j++) heap_free(((ScriptCache *)*psc)->page[i]->glyphs[j]); @@ -1033,20 +1034,20 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) heap_free(((ScriptCache *)*psc)->GDEF_Table); heap_free(((ScriptCache *)*psc)->CMAP_Table); heap_free(((ScriptCache *)*psc)->GPOS_Table); - for (i = 0; i < ((ScriptCache *)*psc)->script_count; i++) + for (n = 0; n < ((ScriptCache *)*psc)->script_count; n++) { int j; - for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].language_count; j++) + for (j = 0; j < ((ScriptCache *)*psc)->scripts[n].language_count; j++) { int k; - for (k = 0; k < ((ScriptCache *)*psc)->scripts[i].languages[j].feature_count; k++) - heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features[k].lookups); - heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features); + for (k = 0; k < ((ScriptCache *)*psc)->scripts[n].languages[j].feature_count; k++) + heap_free(((ScriptCache *)*psc)->scripts[n].languages[j].features[k].lookups); + heap_free(((ScriptCache *)*psc)->scripts[n].languages[j].features); } - for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].default_language.feature_count; j++) - heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features[j].lookups); - heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features); - heap_free(((ScriptCache *)*psc)->scripts[i].languages); + for (j = 0; j < ((ScriptCache *)*psc)->scripts[n].default_language.feature_count; j++) + heap_free(((ScriptCache *)*psc)->scripts[n].default_language.features[j].lookups); + heap_free(((ScriptCache *)*psc)->scripts[n].default_language.features); + heap_free(((ScriptCache *)*psc)->scripts[n].languages); } heap_free(((ScriptCache *)*psc)->scripts); heap_free(((ScriptCache *)*psc)->otm); @@ -2843,7 +2844,8 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_GLYPHPROP *pOutGlyphProps, int *pcGlyphs) { HRESULT hr; - unsigned int i,g; + int i; + unsigned int g; BOOL rtl; int cluster;

1 0

André Hentschel : msvcrt/tests: Mark win8 behaviour as broken.
by Alexandre Julliard Feb. 28, 2013

Feb. 28, 2013

Module: wine Branch: master Commit: 43bdfce43666392fb3fcfacba02c8a6a5a0d5395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bdfce43666392fb3fcfacba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 27 21:42:57 2013 +0100 msvcrt/tests: Mark win8 behaviour as broken. --- dlls/msvcrt/tests/time.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 30d9fa7..729e359 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -181,8 +181,8 @@ static void test_gmtime(void) errno = 0; gmt = -1; err = p_gmtime32_s(&gmt_tm_s, &gmt); - ok(gmt_tm_s.tm_year==-1 || broken(gmt_tm_s.tm_year==70 && gmt_tm->tm_sec<0), - "tm_year = %d\n", gmt_tm_s.tm_year); + ok(gmt_tm_s.tm_year == -1 || broken(gmt_tm_s.tm_year == 70 && gmt_tm_s.tm_sec < 0), + "tm_year = %d, tm_sec = %d\n", gmt_tm_s.tm_year, gmt_tm_s.tm_sec); if(gmt_tm_s.tm_year == -1) { ok(err==EINVAL, "err = %d\n", err); ok(errno==EINVAL, "errno = %d\n", errno);

1 0

Piotr Caban : ole32: Don' t pass CLSCTX_INPROC_SERVER and CLSCTX_INPROC_HANDLER flags to CoCreateInstance in DefaultHandler_Run .
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: c0a17a4f098ea148e24f4bc802a6739e61b9f515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a17a4f098ea148e24f4bc80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 27 17:59:38 2013 +0100 ole32: Don't pass CLSCTX_INPROC_SERVER and CLSCTX_INPROC_HANDLER flags to CoCreateInstance in DefaultHandler_Run. --- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/tests/defaulthandler.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index b4e8203..5e89977 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1322,7 +1322,7 @@ static HRESULT WINAPI DefaultHandler_Run( release_delegates(This); - hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_ALL, + hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER, &IID_IOleObject, (void **)&This->pOleDelegate); if (FAILED(hr)) return hr; diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index 8091bc6..5da7ced 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -36,9 +36,6 @@ #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define GET_EXPECT(func) \ - expect_ ## func - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ @@ -184,12 +181,6 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r *ppv = NULL; return E_NOINTERFACE; }else if(IsEqualGUID(riid, &IID_IClassFactory)) { - if(!GET_EXPECT(CF_QueryInterface_ClassFactory)) { - todo_wine CHECK_EXPECT(CF_QueryInterface_ClassFactory); - *ppv = NULL; - return E_NOINTERFACE; - } - CHECK_EXPECT(CF_QueryInterface_ClassFactory); *ppv = iface; return S_OK; @@ -268,7 +259,7 @@ static void test_default_handler_run(void) IUnknown_Release(unk); hres = IRunnableObject_Run(ro, NULL); - todo_wine ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); + ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); IRunnableObject_Release(ro); CoRevokeClassObject(class_reg);

1 0

Piotr Caban : ole32: Added more OleCreateDefaultHandler tests.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 0cf2b77aed098a423874324e896de8ffe38e7a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf2b77aed098a423874324e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 27 17:59:26 2013 +0100 ole32: Added more OleCreateDefaultHandler tests. --- dlls/ole32/tests/defaulthandler.c | 196 +++++++++++++++++++++++++++++++++++++ 1 files changed, 196 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index a6469b7..8091bc6 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -22,6 +22,7 @@ #define CONST_VTABLE #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -29,6 +30,47 @@ #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define GET_EXPECT(func) \ + expect_ ## func + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(CF_QueryInterface_ClassFactory); +DEFINE_EXPECT(CF_CreateInstance); + +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 HRESULT create_storage(IStorage **stg) { @@ -100,11 +142,165 @@ static void test_olestream(void) IStorage_Release(stg); } +static HRESULT WINAPI test_class_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + return S_OK; + }else if(IsEqualGUID(riid, &IID_IOleObject)) { + ok(0, "unexpected query for IOleObject interface\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_class_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI test_class_Release(IUnknown *iface) +{ + return 1; +} + +static IUnknownVtbl test_class_vtbl = { + test_class_QueryInterface, + test_class_AddRef, + test_class_Release, +}; + +static IUnknown test_class = { &test_class_vtbl }; + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + return S_OK; + }else if(IsEqualGUID(riid, &IID_IMarshal)) { + *ppv = NULL; + return E_NOINTERFACE; + }else if(IsEqualGUID(riid, &IID_IClassFactory)) { + if(!GET_EXPECT(CF_QueryInterface_ClassFactory)) { + todo_wine CHECK_EXPECT(CF_QueryInterface_ClassFactory); + *ppv = NULL; + return E_NOINTERFACE; + } + + CHECK_EXPECT(CF_QueryInterface_ClassFactory); + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, + IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + CHECK_EXPECT(CF_CreateInstance); + + ok(pUnkOuter == NULL, "pUnkOuter != NULL\n"); + todo_wine ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", debugstr_guid(riid)); + if(IsEqualGUID(riid, &IID_IOleObject)) { + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = &test_class; + return S_OK; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IClassFactoryVtbl ClassFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ClassFactory = { &ClassFactoryVtbl }; + +static void test_default_handler_run(void) +{ + const CLSID test_server_clsid = {0x0f77e570,0x80c3,0x11e2,{0x9e,0x96,0x08,0x00,0x20,0x0c,0x9a,0x66}}; + + IUnknown *unk; + IRunnableObject *ro; + DWORD class_reg; + HRESULT hres; + + if(!GetProcAddress(GetModuleHandle("ole32"), "CoRegisterSurrogateEx")) { + win_skip("skipping OleCreateDefaultHandler tests\n"); + return; + } + + hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory, + CLSCTX_INPROC_SERVER, 0, &class_reg); + ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres); + + hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro); + ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres); + IUnknown_Release(unk); + + hres = IRunnableObject_Run(ro, NULL); + todo_wine ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); + IRunnableObject_Release(ro); + + CoRevokeClassObject(class_reg); + + hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory, + CLSCTX_LOCAL_SERVER, 0, &class_reg); + ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres); + + hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro); + ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres); + IUnknown_Release(unk); + + SET_EXPECT(CF_QueryInterface_ClassFactory); + SET_EXPECT(CF_CreateInstance); + hres = IRunnableObject_Run(ro, NULL); + todo_wine ok(hres == S_OK, "Run failed: %x\n", hres); + CHECK_CALLED(CF_QueryInterface_ClassFactory); + CHECK_CALLED(CF_CreateInstance); + IRunnableObject_Release(ro); + + CoRevokeClassObject(class_reg); +} + START_TEST(defaulthandler) { OleInitialize(NULL); test_olestream(); + test_default_handler_run(); OleUninitialize(); }

1 0

André Hentschel : msvcrt: Add a new file for the ARM exception handling.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 874d077ca6d60f457dcf79f0604d519a4bee78d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=874d077ca6d60f457dcf79f06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 26 23:42:33 2013 +0100 msvcrt: Add a new file for the ARM exception handling. --- dlls/crtdll/crtdll.spec | 4 +- dlls/msvcr100/msvcr100.spec | 18 ++-- dlls/msvcr70/msvcr70.spec | 10 +- dlls/msvcr71/msvcr71.spec | 12 ++-- dlls/msvcr80/msvcr80.spec | 16 ++-- dlls/msvcr90/msvcr90.spec | 16 ++-- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/except_arm.c | 187 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 17 ++++ dlls/msvcrt/msvcrt.spec | 18 ++-- dlls/msvcrt20/msvcrt20.spec | 6 +- dlls/msvcrt40/msvcrt40.spec | 6 +- dlls/msvcrtd/msvcrtd.spec | 6 +- include/msvcrt/setjmp.h | 22 +++++ include/winnt.h | 39 +++++++++ 15 files changed, 322 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=874d077ca6d60f457dcf7…

1 0

Jacek Caban : secur32: Report SecPkgContext_ConnectionInfo in bits, not bytes.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 64c84ef5c409c03a8d2ccb993552b3eb976e854d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c84ef5c409c03a8d2ccb993… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 15:36:18 2013 +0100 secur32: Report SecPkgContext_ConnectionInfo in bits, not bytes. --- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/tests/schannel.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index fa68591..b273e96 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -309,9 +309,9 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, info->dwProtocol = schannel_get_protocol(proto); info->aiCipher = schannel_get_cipher_algid(alg); - info->dwCipherStrength = pgnutls_cipher_get_key_size(alg); + info->dwCipherStrength = pgnutls_cipher_get_key_size(alg) * 8; info->aiHash = schannel_get_mac_algid(mac); - info->dwHashStrength = pgnutls_mac_get_key_size(mac); + info->dwHashStrength = pgnutls_mac_get_key_size(mac) * 8; info->aiExch = schannel_get_kx_algid(kx); /* FIXME: info->dwExchStrength? */ info->dwExchStrength = 0; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index ddcc87d..7d4c532 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -592,6 +592,7 @@ static void test_communication(void) CredHandle cred_handle; CtxtHandle context; SecPkgContext_StreamSizes sizes; + SecPkgContext_ConnectionInfo conn_info; CERT_CONTEXT *cert; SecBufferDesc buffers[2]; @@ -754,6 +755,13 @@ static void test_communication(void) pCertFreeCertificateContext(cert); } + status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_CONNECTION_INFO) failed: %08x\n", status); + if(status == SEC_E_OK) { + ok(conn_info.dwCipherStrength == 128, "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); + ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); + } + pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); reset_buffers(&buffers[0]);

1 0

Jacek Caban : vbscript: Added color constants.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 34bf93fc51c78960a009f87b71c1223bf0edc7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34bf93fc51c78960a009f87b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:55:32 2013 +0100 vbscript: Added color constants. --- dlls/vbscript/global.c | 64 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 8 +++++ 2 files changed, 16 insertions(+), 56 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ab3965e..cba611f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,54 +1609,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbBlack(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbBlue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbCyan(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbGreen(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMagenta(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbRed(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbWhite(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbYellow(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbCr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1776,14 +1728,14 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBLONGTIME, NULL, BP_GET, VT_I2, 3}, {DISPID_GLOBAL_VBSHORTTIME, NULL, BP_GET, VT_I2, 4}, {DISPID_GLOBAL_VBOBJECTERROR, NULL, BP_GET, VT_I4, 0x80040000}, - {DISPID_GLOBAL_VBBLACK, Global_vbBlack, BP_GET}, - {DISPID_GLOBAL_VBBLUE, Global_vbBlue, BP_GET}, - {DISPID_GLOBAL_VBCYAN, Global_vbCyan, BP_GET}, - {DISPID_GLOBAL_VBGREEN, Global_vbGreen, BP_GET}, - {DISPID_GLOBAL_VBMAGENTA, Global_vbMagenta, BP_GET}, - {DISPID_GLOBAL_VBRED, Global_vbRed, BP_GET}, - {DISPID_GLOBAL_VBWHITE, Global_vbWhite, BP_GET}, - {DISPID_GLOBAL_VBYELLOW, Global_vbYellow, BP_GET}, + {DISPID_GLOBAL_VBBLACK, NULL, BP_GET, VT_I4, 0x000000}, + {DISPID_GLOBAL_VBBLUE, NULL, BP_GET, VT_I4, 0xff0000}, + {DISPID_GLOBAL_VBCYAN, NULL, BP_GET, VT_I4, 0xffff00}, + {DISPID_GLOBAL_VBGREEN, NULL, BP_GET, VT_I4, 0x00ff00}, + {DISPID_GLOBAL_VBMAGENTA, NULL, BP_GET, VT_I4, 0xff00ff}, + {DISPID_GLOBAL_VBRED, NULL, BP_GET, VT_I4, 0x0000ff}, + {DISPID_GLOBAL_VBWHITE, NULL, BP_GET, VT_I4, 0xffffff}, + {DISPID_GLOBAL_VBYELLOW, NULL, BP_GET, VT_I4, 0x00ffff}, {DISPID_GLOBAL_VBCR, Global_vbCr, BP_GET}, {DISPID_GLOBAL_VBCRLF, Global_vbCrLf, BP_GET}, {DISPID_GLOBAL_VBNEWLINE, Global_vbNewLine, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ee68e9e..fc057d8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -95,6 +95,14 @@ TestConstant "vbShortDate", vbShortDate, 2 TestConstant "vbLongTime", vbLongTime, 3 TestConstant "vbShortTime", vbShortTime, 4 TestConstantI4 "vbObjectError", vbObjectError, &h80040000& +TestConstantI4 "vbBlack", vbBlack, 0 +TestConstantI4 "vbBlue", vbBlue, &hff0000& +TestConstantI4 "vbCyan", vbCyan, &hffff00& +TestConstantI4 "vbGreen", vbGreen, &h00ff00& +TestConstantI4 "vbMagenta", vbMagenta, &hff00ff& +TestConstantI4 "vbRed", vbRed, &h0000ff& +TestConstantI4 "vbWhite", vbWhite, &hffffff& +TestConstantI4 "vbYellow", vbYellow, &h00ffff& Sub TestCStr(arg, exval) dim x

1 0

Hans Leidekker : msi: Don't attempt to patch files from disabled components .
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: b36a26d65a36625af0081024ea3ec041011bb07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36a26d65a36625af0081024e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 27 12:31:13 2013 +0100 msi: Don't attempt to patch files from disabled components. --- dlls/msi/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 96584df..d53da91 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -466,7 +466,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (temp_folder[0] == '\0') GetTempPathW(MAX_PATH, temp_folder); - if (!(p = get_next_filepatch(package, file))) return FALSE; + if (!(p = get_next_filepatch(package, file)) || !p->File->Component->Enabled) + return FALSE; GetTempFileNameW(temp_folder, NULL, 0, patch_path);

1 0

Alessandro Pignotti : quartz: Make GetClassMediaFile visible in the module.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 916854c5a877ccac95558a0180d9bc006c12674c URL: http://source.winehq.org/git/wine.git/?a=commit;h=916854c5a877ccac95558a018… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 21 16:29:55 2013 +0100 quartz: Make GetClassMediaFile visible in the module. --- dlls/quartz/filesource.c | 2 +- dlls/quartz/quartz_private.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index e81110f..5bde1e5 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -254,7 +254,7 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p return hr; } -static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) +HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) { HKEY hkeyMediaType = NULL; LONG lRet; diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index d8bcdbf..af0300e 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -67,4 +67,6 @@ extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN; BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN; +HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter); + #endif /* __QUARTZ_PRIVATE_INCLUDED__ */

1 0

Nikolay Sivov : msxml3: Update refcount in replaceNode().
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 01dd81a78c16130629e97ea8bc598e284363a530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01dd81a78c16130629e97ea8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 15:36:56 2013 +0400 msxml3: Update refcount in replaceNode(). --- dlls/msxml3/node.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8571955..20f9ba9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -511,6 +511,7 @@ HRESULT node_replace_child(xmlnode *This, IXMLDOMNode *newChild, IXMLDOMNode *ol xmlnode *old_child, *new_child; xmlDocPtr leaving_doc; xmlNode *my_ancestor; + int refcount = 0; /* Do not believe any documentation telling that newChild == NULL means removal. It does certainly *not* apply to msxml3! */ @@ -548,9 +549,13 @@ HRESULT node_replace_child(xmlnode *This, IXMLDOMNode *newChild, IXMLDOMNode *ol WARN("%p is not an orphan of %p\n", new_child->node, new_child->node->doc); leaving_doc = new_child->node->doc; - xmldoc_add_ref(old_child->node->doc); + + if (leaving_doc != old_child->node->doc) + refcount = xmlnode_get_inst_cnt(new_child); + + if (refcount) xmldoc_add_refs(old_child->node->doc, refcount); xmlReplaceNode(old_child->node, new_child->node); - xmldoc_release(leaving_doc); + if (refcount) xmldoc_release_refs(leaving_doc, refcount); new_child->parent = old_child->parent; old_child->parent = NULL;

1 0