wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Alexander Morozov : crypt32/tests: Add some tests for CryptDecodeObjectEx without CRYPT_DECODE_ALLOC_FLAG.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: fc78c2242ea1cb92c1bede700066bafd33736995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc78c2242ea1cb92c1bede700… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Nov 21 19:47:32 2011 +0400 crypt32/tests: Add some tests for CryptDecodeObjectEx without CRYPT_DECODE_ALLOC_FLAG. --- dlls/crypt32/tests/encode.c | 107 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index b79c34d..d74b1c9 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2710,6 +2710,21 @@ static void test_decodeExtensions(DWORD dwEncoding) } LocalFree(buf); } + ret = pCryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, + exts[i].encoded, exts[i].encoded[1] + 2, 0, NULL, NULL, &bufSize); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufSize); + if (buf) + { + ret = pCryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, + exts[i].encoded, exts[i].encoded[1] + 2, 0, NULL, buf, &bufSize); + if (!i) + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + else + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } } } @@ -3601,6 +3616,20 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ok(!lstrcmpW(U(*entry).pwszURL, url), "Unexpected name\n"); LocalFree(buf); } + ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, + distPointWithUrlAndIssuer, distPointWithUrlAndIssuer[1] + 2, 0, + NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (buf) + { + ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, + distPointWithUrlAndIssuer, distPointWithUrlAndIssuer[1] + 2, 0, + NULL, buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } } static const BYTE badFlagsIDP[] = { 0x30,0x06,0x81,0x01,0xff,0x82,0x01,0xff }; @@ -4741,6 +4770,18 @@ static void test_decodeEnhancedKeyUsage(DWORD dwEncoding) usage->rgpszUsageIdentifier[i]); LocalFree(buf); } + ret = pCryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, + encodedUsage, sizeof(encodedUsage), 0, NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (buf) + { + ret = pCryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, + encodedUsage, sizeof(encodedUsage), 0, NULL, buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } } static BYTE keyId[] = { 1,2,3,4 }; @@ -5215,6 +5256,20 @@ static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) LocalFree(buf); buf = NULL; } + ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + authorityInfoAccessWithUrlAndIPAddr, + sizeof(authorityInfoAccessWithUrlAndIPAddr), 0, NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (buf) + { + ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + authorityInfoAccessWithUrlAndIPAddr, + sizeof(authorityInfoAccessWithUrlAndIPAddr), 0, NULL, buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } } static const BYTE emptyCTL[] = { @@ -6168,6 +6223,18 @@ static void test_decodePKCSAttributes(DWORD dwEncoding) attributes->rgAttr[1].rgValue[0].cbData), "Unexpected value\n"); LocalFree(buf); } + ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, + doublePKCSAttributes, sizeof(doublePKCSAttributes), 0, NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (buf) + { + ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, + doublePKCSAttributes, sizeof(doublePKCSAttributes), 0, NULL, buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } } static const BYTE singleCapability[] = { @@ -6325,6 +6392,20 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) compareSMimeCapabilities("two capabilities", &capabilities, ptr); LocalFree(ptr); } + SetLastError(0xdeadbeef); + ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + twoCapabilities, sizeof(twoCapabilities), 0, NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (ptr) + { + SetLastError(0xdeadbeef); + ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + twoCapabilities, sizeof(twoCapabilities), 0, NULL, ptr, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, ptr); + } } static BYTE encodedCommonNameNoNull[] = { 0x30,0x14,0x31,0x12,0x30,0x10, @@ -7487,6 +7568,18 @@ static void test_decodeCertPolicies(DWORD dwEncoding) "unexpected qualifier value\n"); LocalFree(info); } + ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + twoPolicies, sizeof(twoPolicies), 0, NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (info) + { + ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + twoPolicies, sizeof(twoPolicies), 0, NULL, info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, info); + } } static const BYTE policyMappingWithOneMapping[] = { @@ -7630,6 +7723,20 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding) info->rgPolicyMapping[1].pszSubjectDomainPolicy); LocalFree(info); } + ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + policyMappingWithTwoMappings, sizeof(policyMappingWithTwoMappings), 0, + NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (info) + { + ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + policyMappingWithTwoMappings, sizeof(policyMappingWithTwoMappings), 0, + NULL, info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, info); + } } }

1 0

Alexandre Julliard : makefiles: Build tags from all the source files.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: c360ee0b661a759ca5c3e6903a13c8be790c4633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c360ee0b661a759ca5c3e6903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 18:20:05 2011 +0100 makefiles: Build tags from all the source files. --- Makefile.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 723bd82..72161fc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,10 +84,12 @@ $(MAKEDEP): include/config.h # Misc rules +TAGSFLAGS = --langmap='c:+.idl.l.rh,make:(Make*.in)' + TAGS etags: $(RM) TAGS - (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs etags -a + (test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs etags -a $(TAGSFLAGS) tags ctags: $(RM) tags - (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs ctags -a + (test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs ctags -a $(TAGSFLAGS)

1 0

Alexandre Julliard : msxml3: Don't return REFIID to avoid compiler warnings .
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: dbdf356f72ccfe8e7d3cf23fbfd3403f21d89e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdf356f72ccfe8e7d3cf23fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 18:19:31 2011 +0100 msxml3: Don't return REFIID to avoid compiler warnings. --- dlls/msxml3/dispex.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index d71fb04..529fd96 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -152,7 +152,7 @@ static tid_id_t tid_ids[] = { { &IID_IVBMXNamespaceManager, LibXml2 } }; -inline REFIID get_riid_from_tid(tid_t tid) +const IID *get_riid_from_tid(tid_t tid) { return tid_ids[tid].iid; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 10067a6..bb517a7 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -157,7 +157,7 @@ extern HINSTANCE MSXML_hInstance DECLSPEC_HIDDEN; void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; -REFIID get_riid_from_tid(enum tid_t tid) DECLSPEC_HIDDEN; +const IID *get_riid_from_tid(enum tid_t tid) DECLSPEC_HIDDEN; /* memory allocation functions */

1 0

Alexandre Julliard : kernel32/tests: Avoid size_t in traces.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 1998c22d1b6e5c345b2e55e1516be047a7b6abfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1998c22d1b6e5c345b2e55e15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 18:19:06 2011 +0100 kernel32/tests: Avoid size_t in traces. --- dlls/kernel32/tests/module.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 06cf557..e86b63b 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -395,8 +395,7 @@ static void testGetDllDirectory(void) { CHAR bufferA[MAX_PATH]; WCHAR bufferW[MAX_PATH]; - size_t length; - DWORD ret; + DWORD length, ret; int i; static const char *dll_directories[] = {

1 0

Andrew Eikum : winecoreaudio.drv: Make driver sample accurate.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 2da60016affdbc13356aef162e0ff6d70b03d677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da60016affdbc13356aef162… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 22 09:50:48 2011 -0600 winecoreaudio.drv: Make driver sample accurate. --- dlls/winecoreaudio.drv/mmdevdrv.c | 176 ++++++++++++++++++++++++++++++------- 1 files changed, 144 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2da60016affdbc13356ae…

1 0

Andrew Eikum : winecoreaudio.drv: Fix latency calculation.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: ca18b8ffb33f254597accf7b59d5dbc578e0a179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca18b8ffb33f254597accf7b5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 22 09:49:44 2011 -0600 winecoreaudio.drv: Fix latency calculation. --- dlls/winecoreaudio.drv/mmdevdrv.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1b0a39e..f0a3892 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1096,6 +1096,9 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, } latency += stream_latency; + /* pretend we process audio in Period chunks, so max latency includes + * the period time */ + latency += DefaultPeriod; *out = (latency / (double)This->fmt->nSamplesPerSec) * 10000000; OSSpinLockUnlock(&This->lock);

1 0

Jacek Caban : jscript: Use bytecode for '+' expression implementation.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: b1b0aadaab522d8ca97c31e3ac4483d65d167594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b0aadaab522d8ca97c31e3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:31:44 2011 +0100 jscript: Use bytecode for '+' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 16 ++++++++++++---- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 1bc887c..1e496a8 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -107,6 +107,8 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) { switch(expr->type) { + case EXPR_ADD: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_EQEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1f5863a..cbfde6d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2213,13 +2213,21 @@ static HRESULT add_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.6.1 */ -HRESULT add_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_add(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT *l, *r, ret; + HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); + + TRACE("%s + %s\n", debugstr_variant(l), debugstr_variant(r)); + + hres = add_eval(ctx->parser->script, l, r, &ctx->ei, &ret); + if(FAILED(hres)) + return hres; - return binary_expr_eval(ctx, expr, add_eval, ei, ret); + return stack_push(ctx, &ret); } /* ECMA-262 3rd Edition 11.6.2 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c004af3..829274d 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -42,6 +42,7 @@ typedef struct _func_stack { } func_stack_t; #define OP_LIST \ + X(add, 1, 0) \ X(bneg, 1, 0) \ X(eq2, 1, 0) \ X(neg, 1, 0) \ @@ -529,7 +530,6 @@ HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT in_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT add_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT sub_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 92c79fc..98813b4 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1313,7 +1313,7 @@ static const expression_eval_t expression_eval_table[] = { binary_and_expression_eval, instanceof_expression_eval, in_expression_eval, - add_expression_eval, + compiled_expression_eval, sub_expression_eval, mul_expression_eval, div_expression_eval,

1 0

Jacek Caban : jscript: Added tests of unary '+' on not existent property.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: dcca57fd87d84bef6f71a809d771d73c3719711f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcca57fd87d84bef6f71a809d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:31:29 2011 +0100 jscript: Added tests of unary '+' on not existent property. --- dlls/jscript/tests/lang.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 7cd20dd..c85907c 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -216,6 +216,10 @@ tmp = new Object(); ok((~tmp.nonexistent) === -1, "!tmp.nonexistent = " + ~tmp.nonexistent); ok(!("nonexistent" in tmp), "nonexistent is in tmp after '~' expression") +tmp = new Object(); +ok(isNaN(tmp.nonexistent), "!tmp.nonexistent = " + (+tmp.nonexistent)); +ok(!("nonexistent" in tmp), "nonexistent is in tmp after '+' expression") + tmp = 0; if(true) tmp = 1;

1 0

Alexandre Julliard : shlwapi: Convert dialogs to po files.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 3d818c3aa83b614a9ef7a6ddb974ee2e39d31feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d818c3aa83b614a9ef7a6ddb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 14:20:10 2011 +0100 shlwapi: Convert dialogs to po files. --- dlls/shlwapi/Makefile.in | 30 +--------------------- dlls/shlwapi/shlwapi.rc | 14 ++++++++++ dlls/shlwapi/shlwapi_Da.rc | 37 -------------------------- dlls/shlwapi/shlwapi_De.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_En.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Eo.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Es.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Fi.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Fr.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_He.rc | 41 ----------------------------- dlls/shlwapi/shlwapi_Hu.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_It.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_Ja.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Ko.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_Lt.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Nl.rc | 37 -------------------------- dlls/shlwapi/shlwapi_No.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Pl.rc | 38 --------------------------- dlls/shlwapi/shlwapi_Pt.rc | 41 ----------------------------- dlls/shlwapi/shlwapi_Ro.rc | 38 --------------------------- dlls/shlwapi/shlwapi_Ru.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Si.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_Sk.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Sr.rc | 56 ---------------------------------------- dlls/shlwapi/shlwapi_Sv.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Tr.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Uk.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Zh.rc | 56 ---------------------------------------- po/ar.po | 51 +++++++++++++++++++++++------------- po/bg.po | 52 +++++++++++++++++++++++------------- po/ca.po | 52 +++++++++++++++++++++++------------- po/cs.po | 52 +++++++++++++++++++++++------------- po/da.po | 51 +++++++++++++++++++++++------------- po/de.po | 51 +++++++++++++++++++++++------------- po/el.po | 52 +++++++++++++++++++++++------------- po/en.po | 51 +++++++++++++++++++++++------------- po/en_US.po | 51 +++++++++++++++++++++++------------- po/eo.po | 51 +++++++++++++++++++++++------------- po/es.po | 51 +++++++++++++++++++++++------------- po/fa.po | 51 +++++++++++++++++++++++------------- po/fi.po | 51 +++++++++++++++++++++++------------- po/fr.po | 51 +++++++++++++++++++++++------------- po/he.po | 51 +++++++++++++++++++++++------------- po/hi.po | 51 +++++++++++++++++++++++------------- po/hu.po | 51 +++++++++++++++++++++++------------- po/it.po | 51 +++++++++++++++++++++++------------- po/ja.po | 51 +++++++++++++++++++++++------------- po/ko.po | 51 +++++++++++++++++++++++------------- po/lt.po | 51 +++++++++++++++++++++++------------- po/ml.po | 51 +++++++++++++++++++++++------------- po/nb_NO.po | 51 +++++++++++++++++++++++------------- po/nl.po | 51 +++++++++++++++++++++++------------- po/or.po | 51 +++++++++++++++++++++++------------- po/pa.po | 51 +++++++++++++++++++++++------------- po/pl.po | 51 +++++++++++++++++++++++------------- po/pt_BR.po | 51 +++++++++++++++++++++++------------- po/pt_PT.po | 51 +++++++++++++++++++++++------------- po/rm.po | 51 +++++++++++++++++++++++------------- po/ro.po | 51 +++++++++++++++++++++++------------- po/ru.po | 51 +++++++++++++++++++++++------------- po/sk.po | 51 +++++++++++++++++++++++------------- po/sl.po | 51 +++++++++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 51 +++++++++++++++++++++++------------- po/sr_RS(a)latin.po | 51 +++++++++++++++++++++++------------- po/sv.po | 51 +++++++++++++++++++++++------------- po/te.po | 51 +++++++++++++++++++++++------------- po/th.po | 52 +++++++++++++++++++++++------------- po/tr.po | 51 +++++++++++++++++++++++------------- po/uk.po | 51 +++++++++++++++++++++++------------- po/wa.po | 51 +++++++++++++++++++++++------------- po/wine.pot | 51 +++++++++++++++++++++++------------- po/zh_CN.po | 51 +++++++++++++++++++++++------------- po/zh_TW.po | 61 ++++++++++++++++++++++++++----------------- 73 files changed, 1465 insertions(+), 1925 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d818c3aa83b614a9ef7a…

1 0

Alexandre Julliard : browseui: Make sure that common controls are loaded before creating the dialog.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 01593894846537244d938cbbf1c746d5db970efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=01593894846537244d938cbbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 14:15:23 2011 +0100 browseui: Make sure that common controls are loaded before creating the dialog. --- dlls/browseui/Makefile.in | 2 +- dlls/browseui/progressdlg.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 102b9e6..b463cd7 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -1,5 +1,5 @@ MODULE = browseui.dll -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = uuid ole32 comctl32 user32 advapi32 EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 2de858c..9b970e2 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -304,6 +304,7 @@ static ULONG WINAPI ProgressDialog_Release(IProgressDialog *iface) static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, HWND hwndParent, IUnknown *punkEnableModeless, DWORD dwFlags, LPCVOID reserved) { + static const INITCOMMONCONTROLSEX init = { sizeof(init), ICC_ANIMATE_CLASS }; ProgressDialog *This = impl_from_IProgressDialog(iface); struct create_params params; HANDLE hThread; @@ -316,6 +317,8 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, if (dwFlags & PROGDLG_NOTIME) FIXME("Flags PROGDLG_NOTIME not supported\n"); + InitCommonControlsEx( &init ); + EnterCriticalSection(&This->cs); if (This->hwnd)

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011