March 2014 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32/tests: Add more Unicode digit ranges.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: e64189aa55f5d2c683163b3db85cd72026521772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64189aa55f5d2c683163b3db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 7 13:37:14 2014 +0100 kernel32/tests: Add more Unicode digit ranges. --- dlls/kernel32/tests/locale.c | 46 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 62e9f01..9abe53e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2320,6 +2320,7 @@ static void test_FoldStringW(void) 0x0030, /* '0'-'9' */ 0x0660, /* Eastern Arabic */ 0x06F0, /* Arabic - Hindu */ + 0x07C0, /* Nko */ 0x0966, /* Devengari */ 0x09E6, /* Bengalii */ 0x0A66, /* Gurmukhi */ @@ -2331,16 +2332,37 @@ static void test_FoldStringW(void) 0x0D66, /* Maylayalam */ 0x0E50, /* Thai */ 0x0ED0, /* Laos */ - 0x0F29, /* Tibet - 0 is out of sequence */ + 0x0F20, /* Tibet */ + 0x0F29, /* Tibet half - 0 is out of sequence */ + 0x1040, /* Myanmar */ + 0x1090, /* Myanmar Shan */ + 0x1368, /* Ethiopic - no 0 */ + 0x17E0, /* Khmer */ + 0x1810, /* Mongolian */ + 0x1946, /* Limbu */ + 0x19D0, /* New Tai Lue */ + 0x1A80, /* Tai Tham Hora */ + 0x1A90, /* Tai Tham Tham */ + 0x1B50, /* Balinese */ + 0x1BB0, /* Sundanese */ + 0x1C40, /* Lepcha */ + 0x1C50, /* Ol Chiki */ 0x2070, /* Superscript - 1, 2, 3 are out of sequence */ 0x2080, /* Subscript */ 0x245F, /* Circled - 0 is out of sequence */ 0x2473, /* Bracketed */ 0x2487, /* Full stop */ + 0x24F4, /* Double Circled */ 0x2775, /* Inverted circled - No 0 */ 0x277F, /* Patterned circled - No 0 */ 0x2789, /* Inverted Patterned circled - No 0 */ 0x3020, /* Hangzhou */ + 0xA620, /* Vai */ + 0xA8D0, /* Saurashtra */ + 0xA900, /* Kayah Li */ + 0xA9D0, /* Javanese */ + 0xAA50, /* Cham */ + 0xABF0, /* Meetei Mayek */ 0xff10, /* Pliene chasse (?) */ 0xffff /* Terminator */ }; @@ -2350,8 +2372,17 @@ static void test_FoldStringW(void) 0xB9, /* Superscript 1 */ 0xB2, /* Superscript 2 */ 0xB3, /* Superscript 3 */ + 0x0C78, /* Telugu Fraction 0 */ + 0x0C79, /* Telugu Fraction 1 */ + 0x0C7A, /* Telugu Fraction 2 */ + 0x0C7B, /* Telugu Fraction 3 */ + 0x0C7C, /* Telugu Fraction 1 */ + 0x0C7D, /* Telugu Fraction 2 */ + 0x0C7E, /* Telugu Fraction 3 */ 0x0F33, /* Tibetan half zero */ + 0x19DA, /* New Tai Lue Tham 1 */ 0x24EA, /* Circled 0 */ + 0x24FF, /* Negative Circled 0 */ 0x3007, /* Ideographic number zero */ '\0' /* Terminator */ }; @@ -2360,8 +2391,10 @@ static void test_FoldStringW(void) { 0x0BE6, /* No Tamil 0 */ 0x0F29, /* No Tibetan half zero (out of sequence) */ + 0x1368, /* No Ethiopic 0 */ 0x2473, /* No Bracketed 0 */ 0x2487, /* No 0 Full stop */ + 0x24F4, /* No double circled 0 */ 0x2775, /* No inverted circled 0 */ 0x277F, /* No patterned circled */ 0x2789, /* No inverted Patterned circled */ @@ -2489,10 +2522,11 @@ static void test_FoldStringW(void) ok(ret == 2, "Expected ret == 2, got %d, error %d\n", ret, GetLastError()); ok(dst[0] == ch || strchrW(outOfSequenceDigits, ch) || - /* Wine (correctly) maps all Unicode 4.0+ digits */ - isdigitW(ch) || (ch >= 0x24F5 && ch <= 0x24FD) || ch == 0x24FF || ch == 0x19da || - (ch >= 0x1369 && ch <= 0x1371), - "MAP_FOLDDIGITS: ch %d 0x%04x Expected unchanged got %d\n", ch, ch, dst[0]); + (ch >= 0xa8e0 && ch <= 0xa8e9), /* combining Devanagari on Win8 */ + "MAP_FOLDDIGITS: ch 0x%04x Expected unchanged got %04x\n", ch, dst[0]); + ok(!isdigitW(ch) || strchrW(outOfSequenceDigits, ch) || + broken( ch >= 0xbf0 && ch <= 0xbf2 ), /* win2k */ + "char %04x should not be a digit\n", ch ); } if (digitRanges[j] == 0xffff) @@ -2519,7 +2553,7 @@ static void test_FoldStringW(void) (digitRanges[j] == 0x3020 && dst[0] == ch) || /* Hangzhou not present in all Windows versions */ (digitRanges[j] == 0x0F29 && dst[0] == ch) || /* Tibetan not present in all Windows versions */ strchrW(noDigitAvailable, c), - "MAP_FOLDDIGITS: ch %d Expected %d got %d\n", + "MAP_FOLDDIGITS: ch %04x Expected %04x got %04x\n", ch, '0' + digitRanges[j] - ch, dst[0]); } prev_ch = ch;

1 0

Hans Leidekker : ws2_32/tests: Mark some test results on Windows 8 as broken.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 77f5f01bbb206deaadcafa163fce659af1ee6a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f5f01bbb206deaadcafa163… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 7 14:02:32 2014 +0100 ws2_32/tests: Mark some test results on Windows 8 as broken. --- dlls/ws2_32/tests/sock.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3843252..00947c9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1857,7 +1857,8 @@ static DWORD WINAPI do_getservbyname( void *param ) int i, j; struct servent *pserv[2]; - ok ( WaitForSingleObject ( *starttest, TEST_TIMEOUT * 1000 ) != WAIT_TIMEOUT, "test_getservbyname: timeout waiting for start signal\n"); + ok ( WaitForSingleObject ( *starttest, TEST_TIMEOUT * 1000 ) != WAIT_TIMEOUT, + "test_getservbyname: timeout waiting for start signal\n" ); /* ensure that necessary buffer resizes are completed */ for ( j = 0; j < 2; j++) { @@ -1867,14 +1868,19 @@ static DWORD WINAPI do_getservbyname( void *param ) for ( i = 0; i < NUM_QUERIES / 2; i++ ) { for ( j = 0; j < 2; j++ ) { pserv[j] = getservbyname ( serv[j].name, serv[j].proto ); - ok ( pserv[j] != NULL, "getservbyname could not retrieve information for %s: %d\n", serv[j].name, WSAGetLastError() ); + ok ( pserv[j] != NULL || broken(pserv[j] == NULL) /* win8, fixed in win81 */, + "getservbyname could not retrieve information for %s: %d\n", serv[j].name, WSAGetLastError() ); if ( !pserv[j] ) continue; - ok ( pserv[j]->s_port == htons(serv[j].port), "getservbyname returned the wrong port for %s: %d\n", serv[j].name, ntohs(pserv[j]->s_port) ); - ok ( !strcmp ( pserv[j]->s_proto, serv[j].proto ), "getservbyname returned the wrong protocol for %s: %s\n", serv[j].name, pserv[j]->s_proto ); - ok ( !strcmp ( pserv[j]->s_name, serv[j].name ), "getservbyname returned the wrong name for %s: %s\n", serv[j].name, pserv[j]->s_name ); + ok ( pserv[j]->s_port == htons(serv[j].port), + "getservbyname returned the wrong port for %s: %d\n", serv[j].name, ntohs(pserv[j]->s_port) ); + ok ( !strcmp ( pserv[j]->s_proto, serv[j].proto ), + "getservbyname returned the wrong protocol for %s: %s\n", serv[j].name, pserv[j]->s_proto ); + ok ( !strcmp ( pserv[j]->s_name, serv[j].name ), + "getservbyname returned the wrong name for %s: %s\n", serv[j].name, pserv[j]->s_name ); } - ok ( pserv[0] == pserv[1], "getservbyname: winsock resized servent buffer when not necessary\n" ); + ok ( pserv[0] == pserv[1] || broken(pserv[0] != pserv[1]) /* win8, fixed in win81 */, + "getservbyname: winsock resized servent buffer when not necessary\n" ); } return 0;

1 0

Hans Leidekker : advapi32/test: Fix test failures on filesystems where compression is enabled.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 3dd7c60742535e62801f753c5005f851f8bc5753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd7c60742535e62801f753c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 7 14:03:03 2014 +0100 advapi32/test: Fix test failures on filesystems where compression is enabled. --- dlls/advapi32/tests/security.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f993c08..bd45189 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -855,7 +855,7 @@ cleanup: ok(rc, "GetTempFileName error %d\n", GetLastError()); rc = GetFileAttributesA(file); - rc &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + rc &= ~(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED|FILE_ATTRIBUTE_COMPRESSED); ok(rc == FILE_ATTRIBUTE_ARCHIVE, "expected FILE_ATTRIBUTE_ARCHIVE got %#x\n", rc); retSize = 0xdeadbeef; @@ -966,7 +966,7 @@ cleanup: CloseHandle(fh); rc = GetFileAttributesA(file); - rc &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + rc &= ~(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED|FILE_ATTRIBUTE_COMPRESSED); todo_wine ok(rc == (FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY), "expected FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY got %#x\n", rc); @@ -990,7 +990,7 @@ todo_wine CloseHandle(fh); rc = GetFileAttributesA(file); - rc &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + rc &= ~(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED|FILE_ATTRIBUTE_COMPRESSED); ok(rc == (FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY), "expected FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY got %#x\n", rc);

1 0

Jacek Caban : vbscipt: Added beginning support for arrays as class members.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 82cace0f0e47fd8a716057fe9509d340a131c84b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82cace0f0e47fd8a716057fe9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 7 14:27:12 2014 +0100 vbscipt: Added beginning support for arrays as class members. --- dlls/vbscript/compile.c | 69 ++++++++++++++++++++++++++++-------------- dlls/vbscript/parse.h | 9 ++---- dlls/vbscript/parser.y | 22 ++++++-------- dlls/vbscript/tests/lang.vbs | 23 ++++++++++++++ dlls/vbscript/vbdisp.c | 56 +++++++++++++++++++++++++++++----- dlls/vbscript/vbscript.h | 16 +++++++--- 6 files changed, 141 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82cace0f0e47fd8a71605…

1 0

Jacek Caban : vbscript: Directly access 'this' object properties in interpreter.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 70628f80c0a52e2051c6a154ecfbb9394ca239f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70628f80c0a52e2051c6a154e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 7 14:27:35 2014 +0100 vbscript: Directly access 'this' object properties in interpreter. --- dlls/vbscript/interp.c | 24 +++++++++++++++++++----- dlls/vbscript/tests/lang.vbs | 16 ++++++++-------- dlls/vbscript/vbdisp.c | 8 ++++---- dlls/vbscript/vbscript.h | 2 +- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 75e17af..8f55563 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -32,6 +32,7 @@ typedef struct { script_ctx_t *script; function_t *func; IDispatch *this_obj; + vbdisp_t *vbthis; VARIANT *args; VARIANT *vars; @@ -132,6 +133,17 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; if(ctx->func->type != FUNC_GLOBAL) { + if(ctx->vbthis) { + /* FIXME: Bind such identifier while generating bytecode. */ + for(i=0; i < ctx->vbthis->desc->prop_cnt; i++) { + if(!strcmpiW(ctx->vbthis->desc->props[i].name, name)) { + ref->type = REF_VAR; + ref->u.v = ctx->vbthis->props+i; + return S_OK; + } + } + } + hres = disp_get_id(ctx->this_obj, name, invoke_type, TRUE, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; @@ -1986,7 +1998,7 @@ static void release_exec(exec_ctx_t *ctx) heap_free(ctx->stack); } -HRESULT exec_script(script_ctx_t *ctx, function_t *func, IDispatch *this_obj, DISPPARAMS *dp, VARIANT *res) +HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPPARAMS *dp, VARIANT *res) { exec_ctx_t exec = {func->code_ctx}; vbsop_t op; @@ -2048,12 +2060,14 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, IDispatch *this_obj, DI return E_OUTOFMEMORY; } - if(this_obj) - exec.this_obj = this_obj; - else if (ctx->host_global) + if(vbthis) { + exec.this_obj = (IDispatch*)&vbthis->IDispatchEx_iface; + exec.vbthis = vbthis; + }else if (ctx->host_global) { exec.this_obj = ctx->host_global; - else + }else { exec.this_obj = (IDispatch*)&ctx->script_obj->IDispatchEx_iface; + } IDispatch_AddRef(exec.this_obj); exec.instr = exec.code->instrs + func->code_off; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 5d2b774..4c444f2 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -814,8 +814,8 @@ Class TestClass Public Sub Class_Initialize publicProp2 = 2 privateProp = true - 'todo_wine Call ok(getVT(privateProp) = "VT_BOOL*", "getVT(privateProp) = " & getVT(privateProp)) - 'todo_wine Call ok(getVT(publicProp2) = "VT_I2*", "getVT(publicProp2) = " & getVT(publicProp2)) + Call ok(getVT(privateProp) = "VT_BOOL*", "getVT(privateProp) = " & getVT(privateProp)) + Call ok(getVT(publicProp2) = "VT_I2*", "getVT(publicProp2) = " & getVT(publicProp2)) Call ok(getVT(Me.publicProp2) = "VT_I2", "getVT(Me.publicProp2) = " & getVT(Me.publicProp2)) End Sub End Class @@ -1054,12 +1054,12 @@ Class ArrClass Dim var Private Sub Class_Initialize - 'todo_wine Call ok(getVT(classarr) = "VT_ARRAY|VT_BYREF|VT_VARIANT*", "getVT(classarr) = " & getVT(classarr)) - 'todo_wine Call testArray(-1, classnoarr) - 'classarr(0) = 1 - 'classarr(1) = 2 - 'classarr(2) = 3 - 'classarr(3) = 4 + Call ok(getVT(classarr) = "VT_ARRAY|VT_BYREF|VT_VARIANT*", "getVT(classarr) = " & getVT(classarr)) + Call testArray(-1, classnoarr) + classarr(0) = 1 + classarr(1) = 2 + classarr(2) = 3 + classarr(3) = 4 End Sub End Class diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 351fcf8..e902e00 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -233,7 +233,7 @@ static BOOL run_terminator(vbdisp_t *This) This->ref++; exec_script(This->desc->ctx, This->desc->funcs[This->desc->class_terminate_id].entries[VBDISP_CALLGET], - (IDispatch*)&This->IDispatchEx_iface, &dp, NULL); + This, &dp, NULL); return !--This->ref; } @@ -397,7 +397,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return DISP_E_MEMBERNOTFOUND; } - return exec_script(This->desc->ctx, func, (IDispatch*)&This->IDispatchEx_iface, pdp, pvarRes); + return exec_script(This->desc->ctx, func, This, pdp, pvarRes); case DISPATCH_PROPERTYPUT: { VARIANT *put_val; DISPPARAMS dp = {NULL, NULL, 1, 0}; @@ -420,7 +420,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return DISP_E_MEMBERNOTFOUND; } - return exec_script(This->desc->ctx, func, (IDispatch*)&This->IDispatchEx_iface, &dp, NULL); + return exec_script(This->desc->ctx, func, This, &dp, NULL); } default: FIXME("flags %x\n", wFlags); @@ -562,7 +562,7 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) if(SUCCEEDED(hres) && desc->class_initialize_id) { DISPPARAMS dp = {0}; hres = exec_script(desc->ctx, desc->funcs[desc->class_initialize_id].entries[VBDISP_CALLGET], - (IDispatch*)&vbdisp->IDispatchEx_iface, &dp, NULL); + vbdisp, &dp, NULL); } if(FAILED(hres)) { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 051d37a..94139bb 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -347,7 +347,7 @@ struct _vbscode_t { void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; -HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; +HRESULT exec_script(script_ctx_t*,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; typedef struct {

1 0

Jacek Caban : crypt32: Simplified getting context expiration.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: e739f040c0b2c9e4e24781528757acd268081977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e739f040c0b2c9e4e24781528… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 7 16:08:10 2014 +0100 crypt32: Simplified getting context expiration. --- dlls/cryptnet/cryptnet_main.c | 77 ++++++++++------------------------------- 1 file changed, 18 insertions(+), 59 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 13ca6e2..3986f0f 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1424,61 +1424,24 @@ static BOOL CRYPT_GetCreateFunction(LPCSTR pszObjectOid, return ret; } -typedef BOOL (*get_object_expiration_func)(const void *pvContext, - FILETIME *expiration); - -static BOOL CRYPT_GetExpirationFromCert(const void *pvObject, FILETIME *expiration) -{ - PCCERT_CONTEXT cert = pvObject; - - *expiration = cert->pCertInfo->NotAfter; - return TRUE; -} - -static BOOL CRYPT_GetExpirationFromCRL(const void *pvObject, FILETIME *expiration) +static BOOL CRYPT_GetExpiration(const void *object, const char *pszObjectOid, FILETIME *expiration) { - PCCRL_CONTEXT cert = pvObject; - - *expiration = cert->pCrlInfo->NextUpdate; - return TRUE; -} - -static BOOL CRYPT_GetExpirationFromCTL(const void *pvObject, FILETIME *expiration) -{ - PCCTL_CONTEXT cert = pvObject; - - *expiration = cert->pCtlInfo->NextUpdate; - return TRUE; -} - -static BOOL CRYPT_GetExpirationFunction(LPCSTR pszObjectOid, - get_object_expiration_func *getExpiration) -{ - BOOL ret; + if (!IS_INTOID(pszObjectOid)) + return FALSE; - if (IS_INTOID(pszObjectOid)) - { - switch (LOWORD(pszObjectOid)) - { - case LOWORD(CONTEXT_OID_CERTIFICATE): - *getExpiration = CRYPT_GetExpirationFromCert; - ret = TRUE; - break; - case LOWORD(CONTEXT_OID_CRL): - *getExpiration = CRYPT_GetExpirationFromCRL; - ret = TRUE; - break; - case LOWORD(CONTEXT_OID_CTL): - *getExpiration = CRYPT_GetExpirationFromCTL; - ret = TRUE; - break; - default: - ret = FALSE; - } + switch (LOWORD(pszObjectOid)) { + case LOWORD(CONTEXT_OID_CERTIFICATE): + *expiration = ((const CERT_CONTEXT*)object)->pCertInfo->NotAfter; + return TRUE; + case LOWORD(CONTEXT_OID_CRL): + *expiration = ((const CRL_CONTEXT*)object)->pCrlInfo->NextUpdate; + return TRUE; + case LOWORD(CONTEXT_OID_CTL): + *expiration = ((const CTL_CONTEXT*)object)->pCtlInfo->NextUpdate; + return TRUE; } - else - ret = FALSE; - return ret; + + return FALSE; } /*********************************************************************** @@ -1511,22 +1474,18 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, CRYPT_BLOB_ARRAY object = { 0, NULL }; PFN_FREE_ENCODED_OBJECT_FUNC freeObject; void *freeContext; + FILETIME expires; ret = retrieve(pszURL, pszObjectOid, dwRetrievalFlags, dwTimeout, &object, &freeObject, &freeContext, hAsyncRetrieve, pCredentials, pAuxInfo); if (ret) { - get_object_expiration_func getExpiration; - ret = create(pszObjectOid, dwRetrievalFlags, &object, ppvObject); if (ret && !(dwRetrievalFlags & CRYPT_DONT_CACHE_RESULT) && - CRYPT_GetExpirationFunction(pszObjectOid, &getExpiration)) + CRYPT_GetExpiration(*ppvObject, pszObjectOid, &expires)) { - FILETIME expires; - - if (getExpiration(*ppvObject, &expires)) - CRYPT_CacheURL(pszURL, &object, dwRetrievalFlags, expires); + CRYPT_CacheURL(pszURL, &object, dwRetrievalFlags, expires); } freeObject(pszObjectOid, &object, freeContext); }

1 0

Jacek Caban : urlmon/tests: Use asynchronous binding for invalid cert tests.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 630e8d92578b347d6e94db097c05572bb416bb2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=630e8d92578b347d6e94db097… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 7 17:30:25 2014 +0100 urlmon/tests: Use asynchronous binding for invalid cert tests. --- dlls/urlmon/tests/url.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 1b32f34..8460000 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3920,11 +3920,13 @@ START_TEST(url) http_is_first = TRUE; test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); - trace("synchronous https test (invalid CN, fail)\n"); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; + + trace("asynchronous https test (invalid CN, fail)\n"); onsecurityproblem_hres = E_FAIL; test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); - trace("synchronous https test (invalid CN, accept)\n"); + trace("asynchronous https test (invalid CN, accept)\n"); onsecurityproblem_hres = S_OK; test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); @@ -3933,8 +3935,6 @@ START_TEST(url) test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); invalid_cn_accepted = FALSE; - bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; - trace("winetest test (async switch)...\n"); test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_ASYNC_SWITCH, TYMED_ISTREAM);

1 0

Piotr Caban : dinput8: Create a window that will receive events generated by input tests.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: 8d5b1dd5021ab726155319060014beee223b0ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d5b1dd5021ab726155319060… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 7 01:49:58 2014 +0100 dinput8: Create a window that will receive events generated by input tests. --- dlls/dinput8/tests/device.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index c66c43c..6495559 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -60,6 +60,21 @@ static DIACTIONA actionMapping[]= { 4, DIMOUSE_YAXIS, 0, { "Y Axis" } } }; +static void flush_events(void) +{ + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + diff = time - GetTickCount(); + min_timeout = 50; + } +} + static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, DWORD expected) { HRESULT hr; @@ -76,12 +91,14 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO if (event_type == INPUT_MOUSE) mouse_event( event, 0, 0, 0, 0); + flush_events(); IDirectInputDevice8_Poll(lpdid); hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); if (data_size != 1) { win_skip("We're not able to inject input into Windows dinput8 with events\n"); + IDirectInputDevice_Unacquire(lpdid); return; } @@ -100,6 +117,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO mouse_event(MOUSEEVENTF_LEFTUP, 1, 1, 0, 0); } + flush_events(); IDirectInputDevice8_Poll(lpdid); data_size = 1; @@ -108,6 +126,8 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO data_size = 1; hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); ok(hr == DI_OK && data_size == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); + + IDirectInputDevice_Unacquire(lpdid); } static void test_build_action_map(IDirectInputDevice8A *lpdid, DIACTIONFORMATA *lpdiaf, @@ -256,6 +276,7 @@ static void test_action_mapping(void) IDirectInput8A *pDI = NULL; DIACTIONFORMATA af; struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; + HWND hwnd; hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&pDI); if (hr == DIERR_OLDDIRECTINPUTVERSION || @@ -296,6 +317,11 @@ static void test_action_mapping(void) hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", + WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create window\n"); + SetCursorPos(50, 50); + if (data.keyboard != NULL) { /* Test keyboard BuildActionMap */ @@ -326,6 +352,8 @@ static void test_action_mapping(void) test_device_input(data.mouse, INPUT_MOUSE, MOUSEEVENTF_LEFTDOWN, 3); } + + DestroyWindow(hwnd); } static void test_save_settings(void)

1 0

Nikolay Sivov : msxml3: Make propputref methods invocable with DISPATCH_PROPERTYPUT.
by Alexandre Julliard 07 Mar '14

07 Mar '14

Module: wine Branch: master Commit: d7aee26d7fd012d9bbf810f8e85e7995a668cb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7aee26d7fd012d9bbf810f8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 7 12:07:27 2014 +0400 msxml3: Make propputref methods invocable with DISPATCH_PROPERTYPUT. --- dlls/msxml3/dispex.c | 27 ++++++++++++++ dlls/msxml3/tests/saxreader.c | 82 +++++++++++++++++++++++++++++------------ 2 files changed, 86 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 78d4c0c..a080a8b 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -32,6 +32,7 @@ #include "winnls.h" #include "ole2.h" #include "msxml6.h" +#include "msxml6did.h" #include "wininet.h" #include "urlmon.h" #include "winreg.h" @@ -519,6 +520,30 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return DISP_E_UNKNOWNNAME; } +static BOOL is_propputref_id(DISPID id) +{ + switch (id) + { + case DISPID_DOM_DOCUMENT_DOCUMENTELEMENT: + case DISPID_XMLDOM_DOCUMENT2_SCHEMAS: + case DISPID_XMLDOM_SELECTION_CONTEXT: + case DISPID_XMLDOM_TEMPLATE_STYLESHEET: + case DISPID_SAX_CONTENTHANDLER_DOCUMENTLOCATOR: + case DISPID_SAX_XMLFILTER_PARENT: + case DISPID_SAX_XMLREADER_ENTITYRESOLVER: + case DISPID_SAX_XMLREADER_CONTENTHANDLER: + case DISPID_SAX_XMLREADER_DTDHANDLER: + case DISPID_SAX_XMLREADER_ERRORHANDLER: + case DISPID_MXXML_FILTER_ENTITYRESOLVER: + case DISPID_MXXML_FILTER_CONTENTHANDLER: + case DISPID_MXXML_FILTER_DTDHANDLER: + case DISPID_MXXML_FILTER_ERRORHANDLER: + return TRUE; + default: + return FALSE; + } +} + static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -601,6 +626,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return E_FAIL; } + if (is_propputref_id(id) && wFlags == DISPATCH_PROPERTYPUT) + wFlags = DISPATCH_PROPERTYPUTREF; hres = ITypeInfo_Invoke(ti, unk, id, wFlags, pdp, pvarRes, pei, &argerr); ITypeInfo_Release(ti); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5891b55..42e4ec0 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4432,31 +4432,67 @@ static void test_obj_dispex(IUnknown *obj) IDispatchEx_Release(dispex); } -static void test_dispex(void) +static void test_saxreader_dispex(void) { - IVBSAXXMLReader *vbreader; - ISAXXMLReader *reader; - IUnknown *unk; - HRESULT hr; + IVBSAXXMLReader *vbreader; + ISAXXMLReader *reader; + DISPPARAMS dispparams; + DISPID dispid; + IUnknown *unk; + VARIANT arg; + HRESULT hr; - hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); - EXPECT_HR(hr, S_OK); - - hr = ISAXXMLReader_QueryInterface(reader, &IID_IUnknown, (void**)&unk); - EXPECT_HR(hr, S_OK); - test_obj_dispex(unk); - IUnknown_Release(unk); - - hr = ISAXXMLReader_QueryInterface(reader, &IID_IVBSAXXMLReader, (void**)&vbreader); - EXPECT_HR(hr, S_OK); - hr = IVBSAXXMLReader_QueryInterface(vbreader, &IID_IUnknown, (void**)&unk); - EXPECT_HR(hr, S_OK); - test_obj_dispex(unk); - IUnknown_Release(unk); - IVBSAXXMLReader_Release(vbreader); - - ISAXXMLReader_Release(reader); + EXPECT_HR(hr, S_OK); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + test_obj_dispex(unk); + IUnknown_Release(unk); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IVBSAXXMLReader, (void**)&vbreader); + EXPECT_HR(hr, S_OK); + hr = IVBSAXXMLReader_QueryInterface(vbreader, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + test_obj_dispex(unk); + IUnknown_Release(unk); + + dispid = DISPID_PROPERTYPUT; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 1; + dispparams.rgdispidNamedArgs = &dispid; + dispparams.rgvarg = &arg; + + V_VT(&arg) = VT_DISPATCH; + V_DISPATCH(&arg) = NULL; + + /* propputref is callable as PROPERTYPUT and PROPERTYPUTREF */ + hr = IVBSAXXMLReader_Invoke(vbreader, + DISPID_SAX_XMLREADER_CONTENTHANDLER, + &IID_NULL, + 0, + DISPATCH_PROPERTYPUT, + &dispparams, + NULL, + NULL, + NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IVBSAXXMLReader_Invoke(vbreader, + DISPID_SAX_XMLREADER_CONTENTHANDLER, + &IID_NULL, + 0, + DISPATCH_PROPERTYPUTREF, + &dispparams, + NULL, + NULL, + NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IVBSAXXMLReader_Release(vbreader); + + ISAXXMLReader_Release(reader); } static void test_mxwriter_dispex(void) @@ -5518,7 +5554,7 @@ START_TEST(saxreader) test_saxreader_properties(); test_saxreader_features(); test_saxreader_encoding(); - test_dispex(); + test_saxreader_dispex(); /* MXXMLWriter tests */ get_class_support_data(mxwriter_support_data, &IID_IMXWriter);

1 0

Jacek Caban : atl/tests: Use HKCU instead of HKCR for registrar tests.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 2871b4f6cd251de953e4dad3e6cab98279e076b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2871b4f6cd251de953e4dad3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 6 14:56:04 2014 +0100 atl/tests: Use HKCU instead of HKCR for registrar tests. --- dlls/atl/tests/registrar.c | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index c05b672..4ecb092 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -37,36 +37,8 @@ #include <initguid.h> #include <atliface.h> - -static BOOL is_process_limited(void) -{ - static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; - HANDLE token; - - if (!pOpenProcessToken) - { - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); - if (!pOpenProcessToken) - return FALSE; - } - - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; -} - - static const char textA[] = -"HKCR \n" +"HKCU \n" "{ \n" " ForceRemove eebf73c4-50fd-478f-bbcf-db212221227a \n" " { \n" @@ -96,7 +68,7 @@ static void test_registrar(void) hr = CoCreateInstance(&CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, &IID_IRegistrar, (void**)&registrar); if (FAILED(hr)) { - skip("creating IRegistrar failed, hr = 0x%08X\n", hr); + win_skip("creating IRegistrar failed, hr = 0x%08X\n", hr); return; } @@ -112,17 +84,14 @@ static void test_registrar(void) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, count); hr = IRegistrar_StringRegister(registrar, textW); + ok(hr == S_OK, "StringRegister failed: %08x\n", hr); if (FAILED(hr)) { - BOOL is_limited = is_process_limited(); - ok(hr == DISP_E_EXCEPTION && is_limited, - "IRegistrar_StringRegister failed, hr = 0x%08X, is_limited=%d\n", hr, is_limited); - skip("Skipping registrar tests\n"); IRegistrar_Release(registrar); return; } - lret = RegOpenKeyA(HKEY_CLASSES_ROOT, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); + lret = RegOpenKeyA(HKEY_CURRENT_USER, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); ok(lret == ERROR_SUCCESS, "error %d opening registry key\n", lret); size = sizeof(dword);

1 0