January 2011 - Wine-Commits

Jacek Caban : mshtml: Added script execution time tests.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: bfebbbb13e20addc8acd08b3ab829318ea03b679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfebbbb13e20addc8acd08b3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 31 00:32:04 2011 +0100 mshtml: Added script execution time tests. --- dlls/mshtml/tests/exectest.html | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 +++ dlls/mshtml/tests/script.c | 22 ++++++++++++++++++++++ 3 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html new file mode 100644 index 0000000..42fa38a --- /dev/null +++ b/dlls/mshtml/tests/exectest.html @@ -0,0 +1,32 @@ +<html> +<body> +Script execution test +<div id="b1"></div> +<div id="b2"></div> +<div id="b3"></div> +<script> +function ok(b, msg) { + return external.ok(b, msg); +} + +var executed = false; +var len = document.getElementsByTagName('div').length; +ok(len === 3, "init length = " + len); + +document.write("<script>" + + "var len = document.getElementsByTagName('div').length;" + + "external.todo_wine_ok(len === 3, 'unexpected length ' + len);" + + "executed = true;" + + "<" + "/script>"); + +len = document.getElementsByTagName('script').length; +external.todo_wine_ok(len === 2, "script col length = " + len); +external.todo_wine_ok(executed, "writen script not executed"); + +external.reportSuccess(); +</script> +<div id="a1"></div> +<div id="a2"></div> +<div id="b3"></div> +</body> +</html> diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 70925ca..d6c0ffd 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -16,5 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: exectest.html */ +exectest.html HTML "exectest.html" + /* @makedep: jstest.html */ jstest.html HTML "jstest.html" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index af51b78..f9aafbb 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -139,6 +139,7 @@ DEFINE_EXPECT(external_success); #define DISPID_EXTERNAL_OK 0x300000 #define DISPID_EXTERNAL_TRACE 0x300001 #define DISPID_EXTERNAL_REPORTSUCCESS 0x300002 +#define DISPID_EXTERNAL_TODO_WINE_OK 0x300003 static const GUID CLSID_TestScript = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; @@ -493,6 +494,10 @@ static HRESULT WINAPI externalDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, *pid = DISPID_EXTERNAL_REPORTSUCCESS; return S_OK; } + if(!strcmp_wa(bstrName, "todo_wine_ok")) { + *pid = DISPID_EXTERNAL_TODO_WINE_OK; + return S_OK; + } ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -546,6 +551,22 @@ static HRESULT WINAPI externalDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID return S_OK; + case DISPID_EXTERNAL_TODO_WINE_OK: + ok(wFlags == INVOKE_FUNC || wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); + todo_wine + ok(V_BOOL(pdp->rgvarg+1), "%s\n", wine_dbgstr_w(V_BSTR(pdp->rgvarg))); + + return S_OK; + default: ok(0, "unexpected call\n"); return E_NOTIMPL; @@ -2561,6 +2582,7 @@ static void run_js_script(const char *test_name) static void run_js_tests(void) { run_js_script("jstest.html"); + run_js_script("exectest.html"); } static BOOL init_registry(BOOL init)

1 0

Wolfram Sang : comdlg32: Filedlg should not add extension if it contains a glob.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 5cb4c55335c5e1192a6ac3b6f97db87f6344c7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb4c55335c5e1192a6ac3b6f… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Sat Jan 29 09:15:34 2011 +0100 comdlg32: Filedlg should not add extension if it contains a glob. --- dlls/comdlg32/filedlg.c | 4 ++-- dlls/comdlg32/tests/filedlg.c | 40 ++++++++++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index f36d3a5..2fb0969 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2491,8 +2491,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) else if ( fodInfos->defext ) /* attach the default file extension*/ filterExt = fodInfos->defext; - /* If extension is .*, ignore it */ - if (filterExt[0] != '*') + /* If extension contains a glob, ignore it */ + if ( filterExt && !strchrW(filterExt, '*') && !strchrW(filterExt, '?') ) { /* Attach the dot*/ lstrcatW(lpstrPathAndFile, szwDot); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0320e7e..73e8d36 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1052,6 +1052,15 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg, WPARAM wParam, return FALSE; } +static const char *defext_filters[] = { + "TestFilter (*.pt*)\0*.pt*\0", + "TestFilter (*.ab?)\0*.ab?\0", + "TestFilter (*.*)\0*.*\0", + NULL /* is a test, not an endmark! */ +}; + +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + static void test_extension(void) { OPENFILENAME ofn = { sizeof(OPENFILENAME)}; @@ -1059,11 +1068,12 @@ static void test_extension(void) char curdir[MAX_PATH]; char *filename_ptr; const char *test_file_name = "deadbeef"; + const char **cur_filter; DWORD ret; - BOOL cdret; + BOOL boolret; - cdret = GetCurrentDirectoryA(sizeof(curdir), curdir); - ok(cdret, "Failed to get current dir err %d\n", GetLastError()); + boolret = GetCurrentDirectoryA(sizeof(curdir), curdir); + ok(boolret, "Failed to get current dir err %d\n", GetLastError()); /* Ignore .* extension */ ofn.lStructSize = sizeof(ofn); @@ -1075,17 +1085,23 @@ static void test_extension(void) ofn.lpstrInitialDir = curdir; ofn.lpfnHook = test_extension_wndproc; ofn.nFileExtension = 0; - ofn.lpstrFilter = "All Files (*.*)\0*.*\0"; - strcpy(filename, test_file_name); - - ret = GetSaveFileNameA(&ofn); - filename_ptr = ofn.lpstrFile + strlen( ofn.lpstrFile ) - strlen( test_file_name ); - ok(1 == ret, "expected 1, got %d\n", ret); - ok(strlen(ofn.lpstrFile) >= strlen(test_file_name), "Filename %s is too short\n", ofn.lpstrFile ); - ok( strcmp(filename_ptr, test_file_name) == 0, - "Filename is %s, expected %s\n", filename_ptr, test_file_name ); + + for (cur_filter = defext_filters; cur_filter < defext_filters + ARRAY_SIZE(defext_filters); cur_filter++) { + ofn.lpstrFilter = *cur_filter; + strcpy(filename, test_file_name); + boolret = GetSaveFileNameA(&ofn); + ok(boolret, "expected true\n"); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + filename_ptr = ofn.lpstrFile + strlen( ofn.lpstrFile ) - strlen( test_file_name ); + ok( strlen(ofn.lpstrFile) >= strlen(test_file_name), "Filename %s is too short\n", ofn.lpstrFile ); + ok( strcmp(filename_ptr, test_file_name) == 0, + "Filename is %s, expected %s\n", filename_ptr, test_file_name ); + } } +#undef ARRAY_SIZE + START_TEST(filedlg) { test_DialogCancel();

1 0

Nikolay Sivov : msvcrt: Implement _fcvt_s().
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 7a57f02b8d275c1e8af1ea1c8e8c1bb2e9b02971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a57f02b8d275c1e8af1ea1c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 20:47:34 2011 +0300 msvcrt: Implement _fcvt_s(). --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 89 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/printf.c | 35 ++++++++++++++-- 6 files changed, 123 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 703a78d..9080ba1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -606,7 +606,7 @@ @ stub _fclose_nolock @ cdecl _fcloseall() msvcrt._fcloseall @ cdecl _fcvt(double long ptr ptr) msvcrt._fcvt -@ stub _fcvt_s +@ cdecl _fcvt_s(ptr long double long ptr ptr) msvcrt._fcvt_s @ cdecl _fdopen(long str) msvcrt._fdopen @ stub _fflush_nolock @ cdecl _fgetchar() msvcrt._fgetchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c622b0e..76c25e7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -447,7 +447,7 @@ @ stub _fclose_nolock @ cdecl _fcloseall() msvcrt._fcloseall @ cdecl _fcvt(double long ptr ptr) msvcrt._fcvt -@ stub _fcvt_s +@ cdecl _fcvt_s(ptr long double long ptr ptr) msvcrt._fcvt_s @ cdecl _fdopen(long str) msvcrt._fdopen @ stub _fflush_nolock @ cdecl _fgetchar() msvcrt._fgetchar diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 52f49c5..49b7139 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -439,7 +439,7 @@ @ stub _fclose_nolock @ cdecl _fcloseall() msvcrt._fcloseall @ cdecl _fcvt(double long ptr ptr) msvcrt._fcvt -@ stub _fcvt_s +@ cdecl _fcvt_s(ptr long double long ptr ptr) msvcrt._fcvt_s @ cdecl _fdopen(long str) msvcrt._fdopen @ stub _fflush_nolock @ cdecl _fgetchar() msvcrt._fgetchar diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c0fc11c..ab9cec4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1423,6 +1423,95 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign ) } /*********************************************************************** + * _fcvt_s (MSVCRT.@) + */ +int CDECL _fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int ndigits, int *decpt, int *sign) +{ + int stop, dec1, dec2; + char *ptr1, *ptr2, *first; + char buf[80]; /* ought to be enough */ + + if (!outbuffer || !decpt || !sign || size == 0) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (number < 0) + { + *sign = 1; + number = -number; + } else *sign = 0; + + snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); + ptr1 = buf; + ptr2 = outbuffer; + first = NULL; + dec1 = 0; + dec2 = 0; + + /* For numbers below the requested resolution, work out where + the decimal point will be rather than finding it in the string */ + if (number < 1.0 && number > 0.0) { + dec2 = log10(number + 1e-10); + if (-dec2 <= ndigits) dec2 = 0; + } + + /* If requested digits is zero or less, we will need to truncate + * the returned string */ + if (ndigits < 1) { + stop = strlen(buf) + ndigits; + } else { + stop = strlen(buf); + } + + while (*ptr1 == '0') ptr1++; /* Skip leading zeroes */ + while (*ptr1 != '\0' && *ptr1 != '.') { + if (!first) first = ptr2; + if ((ptr1 - buf) < stop) { + if (size > 1) { + *ptr2++ = *ptr1++; + size--; + } + } else { + ptr1++; + } + dec1++; + } + + if (ndigits > 0) { + ptr1++; + if (!first) { + while (*ptr1 == '0') { /* Process leading zeroes */ + if (number == 0.0 && size > 1) { + *ptr2++ = '0'; + size--; + } + ptr1++; + dec1--; + } + } + while (*ptr1 != '\0') { + if (!first) first = ptr2; + if (size > 1) { + *ptr2++ = *ptr1++; + size--; + } + } + } + + *ptr2 = '\0'; + + /* We never found a non-zero digit, then our number is either + * smaller than the requested precision, or 0.0 */ + if (!first && (number <= 0.0)) + dec1 = 0; + + *decpt = dec2 ? dec2 : dec1; + return 0; +} + +/*********************************************************************** * _gcvt (MSVCRT.@) */ char * CDECL _gcvt( double number, int ndigit, char *buff ) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 37d2425..64cb281 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -400,7 +400,7 @@ # stub _expand_dbg @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) -# stub _fcvt_s +@ cdecl _fcvt_s(ptr long double long ptr ptr) @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fgetchar() @ cdecl _fgetwchar() diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d32ef73..f05d124 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -26,6 +26,7 @@ #define _CRT_NON_CONFORMING_SWPRINTFS #include <stdio.h> +#include <errno.h> #include "windef.h" #include "winbase.h" @@ -760,7 +761,7 @@ static struct { { 0.4, 0, "", "", 0, 0, 0 }, { 0.49, 0, "", "", 0, 0, 0 }, { 0.51, 0, "", "1", 1, 1, 0 }, - /* ask ridiculous amunt of precision, ruin formatting this table */ + /* ask for ridiculous precision, ruin formatting this table */ { 1.0, 30, "100000000000000000000000000000", "1000000000000000000000000000000", 1, 1, 0}, { 123456789012345678901.0, 30, "123456789012345680000000000000", @@ -773,6 +774,7 @@ static void test_xcvt(void) { char *str; 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, @@ -830,17 +832,40 @@ static void test_xcvt(void) if (p__fcvt_s) { + int i; + str = malloc(1024); + + /* invalid arguments */ + err = p__fcvt_s(NULL, 0, 0.0, 0, &i, &i); + ok(err == EINVAL, "got %d, expected EINVAL\n", err); + + err = p__fcvt_s(str, 0, 0.0, 0, &i, &i); + ok(err == EINVAL, "got %d, expected EINVAL\n", err); + + str[0] = ' '; + str[1] = 0; + err = p__fcvt_s(str, -1, 0.0, 0, &i, &i); + ok(err == 0, "got %d, expected 0\n", err); + ok(str[0] == 0, "got %c, expected 0\n", str[0]); + ok(str[1] == 0, "got %c, expected 0\n", str[1]); + + err = p__fcvt_s(str, 1, 0.0, 0, NULL, &i); + ok(err == EINVAL, "got %d, expected EINVAL\n", err); + + err = p__fcvt_s(str, 1, 0.0, 0, &i, NULL); + ok(err == EINVAL, "got %d, expected EINVAL\n", err); + for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; err = p__fcvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); ok(err == 0, "_fcvt_s() failed with error code %d", err); ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_f, 15), - "_fcvt_s() bad return, got \n'%s' expected \n'%s'\n", str, - test_cvt_testcases[i].expstr_e); + "_fcvt_s() bad return, got '%s' expected '%s'. test %d\n", str, + test_cvt_testcases[i].expstr_f, i); ok( decpt == test_cvt_testcases[i].expdecpt_f, "_fcvt_s() decimal point wrong, got %d expected %d\n", decpt, - test_cvt_testcases[i].expdecpt_e); + test_cvt_testcases[i].expdecpt_f); ok( sign == test_cvt_testcases[i].expsign, "_fcvt_s() sign wrong, got %d expected %d\n", sign, test_cvt_testcases[i].expsign); @@ -848,7 +873,7 @@ static void test_xcvt(void) free(str); } else - todo_wine win_skip("_fcvt_s not available\n"); + win_skip("_fcvt_s not available\n"); } static int __cdecl _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 9d432ff761ffba4979f458abe3709f721aebdbc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d432ff761ffba4979f458abe… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Jan 29 12:57:45 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 281 +++++++++++++++++++++++--------------------------------------- 1 files changed, 102 insertions(+), 179 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d432ff761ffba4979f45…

1 0

Eric Pouech : kernel32: Added support for ctrl-home ( aka clear from beginning of line) in line edition in win32 mode.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 08f13cbd39dce3a6072d27dca46f11e3dbfca7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f13cbd39dce3a6072d27dca… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 19:59:16 2011 +0100 kernel32: Added support for ctrl-home (aka clear from beginning of line) in line edition in win32 mode. --- dlls/kernel32/editline.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index c2799af..a39fa8d 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -639,6 +639,16 @@ static void WCEL_KillToEndOfLine(WCEL_Context* ctx) WCEL_DeleteString(ctx, ctx->ofs, ctx->len); } +static void WCEL_KillFromBegOfLine(WCEL_Context* ctx) +{ + if (ctx->ofs) + { + WCEL_SaveYank(ctx, 0, ctx->ofs); + WCEL_DeleteString(ctx, 0, ctx->ofs); + ctx->ofs = 0; + } +} + static void WCEL_KillMarkedZone(WCEL_Context* ctx) { unsigned beg, end; @@ -883,6 +893,7 @@ static const KeyEntry Win32KeyMapCtrl[] = {/*VK_LEFT*/ 0x25, WCEL_MoveToLeftWord }, {/*VK_RIGHT*/0x27, WCEL_MoveToRightWord }, {/*VK_END*/ 0x23, WCEL_KillToEndOfLine }, + {/*VK_HOME*/ 0x24, WCEL_KillFromBegOfLine }, { 0, NULL } };

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: aef44d698e4ed32d77972dc722fa3b3dd29ee57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef44d698e4ed32d77972dc72… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jan 29 23:43:06 2011 +0900 po: Update Japanese translation. --- po/ja.po | 436 ++++++++++++++++++++++---------------------------------------- 1 files changed, 151 insertions(+), 285 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aef44d698e4ed32d77972…

1 0

Nikolay Sivov : oleaut32: Fix default parameter variant leak (Valgrind).
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: d902249e54836aa1f7836a74d172ce5b75585a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d902249e54836aa1f7836a74d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 02:12:56 2011 +0300 oleaut32: Fix default parameter variant leak (Valgrind). --- dlls/oleaut32/typelib2.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8260ef2..f87ed9f 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3313,6 +3313,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncDesc( } (*ppFuncDesc)->lprgelemdescParam[i].u.paramdesc.pparamdescex->cBytes = sizeof(PARAMDESCEX); + VariantInit(&(*ppFuncDesc)->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); hres = ctl2_decode_variant(This->typelib, typedata[hdr_len + i], &(*ppFuncDesc)->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); if (FAILED(hres)) { @@ -3749,7 +3750,11 @@ static void WINAPI ITypeInfo2_fnReleaseFuncDesc( if (pFuncDesc->lprgelemdescParam[i].tdesc.vt != VT_USERDEFINED) release_typedesc(pFuncDesc->lprgelemdescParam[i].tdesc.u.lptdesc); - heap_free(pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex); + if (pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex) + { + VariantClear(&pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); + heap_free(pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex); + } } heap_free(pFuncDesc->lprgelemdescParam); }

1 0

Nikolay Sivov : shell32/tests: Fix a dependency on unimplemented function call (Valgrind).
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 4ca01b3475608246a1d71b4194988f4d8099e5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca01b3475608246a1d71b419… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 13:55:47 2011 +0300 shell32/tests: Fix a dependency on unimplemented function call (Valgrind). --- dlls/shell32/tests/progman_dde.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index d7bf432..1e3239d 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -200,14 +200,22 @@ static void init_strings(void) WCHAR module[MAX_PATH]; WCHAR module_expanded[MAX_PATH]; WCHAR localized[MAX_PATH]; + HRESULT hr; int id; MultiByteToWideChar(CP_ACP, 0, startup, -1, startupW, sizeof(startupW)/sizeof(WCHAR)); - pSHGetLocalizedName(startupW, module, MAX_PATH, &id); - ExpandEnvironmentStringsW(module, module_expanded, MAX_PATH); - LoadStringW(GetModuleHandleW(module_expanded), id, localized, MAX_PATH); + hr = pSHGetLocalizedName(startupW, module, MAX_PATH, &id); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + /* check to be removed when SHGetLocalizedName is implemented */ + if (hr == S_OK) + { + ExpandEnvironmentStringsW(module, module_expanded, MAX_PATH); + LoadStringW(GetModuleHandleW(module_expanded), id, localized, MAX_PATH); - WideCharToMultiByte(CP_ACP, 0, localized, -1, StartupTitle, sizeof(StartupTitle), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, localized, -1, StartupTitle, sizeof(StartupTitle), NULL, NULL); + } + else + lstrcpyA(StartupTitle, (strrchr(startup, '\\') + 1)); } else {

1 0

Henri Verbeet : wined3d: Remove COM from the stateblock.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 4b109ff1f8566b7a78f820c7b037cbfb8c2b04da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b109ff1f8566b7a78f820c7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:41 2011 +0100 wined3d: Remove COM from the stateblock. --- dlls/d3d8/device.c | 22 +- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 6 +- dlls/d3d9/stateblock.c | 12 +- dlls/ddraw/device.c | 20 +- dlls/wined3d/device.c | 35 ++-- dlls/wined3d/stateblock.c | 473 +++++++++++++++++++--------------------- dlls/wined3d/wined3d.spec | 5 + dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.idl | 23 +-- 10 files changed, 289 insertions(+), 317 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b109ff1f8566b7a78f82…

1 0

Nikolay Sivov : shlwapi/tests: Reset cookie after service revoked (Valgrind ).
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 219f477a050a0a1d0a8861a104e420ef4f9ed3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219f477a050a0a1d0a8861a10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 11:54:51 2011 +0300 shlwapi/tests: Reset cookie after service revoked (Valgrind). --- dlls/shlwapi/ordinal.c | 3 +++ dlls/shlwapi/tests/ordinal.c | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 3c00b8e..fbfed99 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1571,7 +1571,10 @@ HRESULT WINAPI IUnknown_ProfferService(IUnknown *lpUnknown, REFGUID service, ISe if (pService) hr = IProfferService_ProfferService(proffer, service, pService, pCookie); else + { hr = IProfferService_RevokeService(proffer, *pCookie); + *pCookie = 0; + } IProfferService_Release(proffer); } diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 0125ce4..fc788b7 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2362,6 +2362,7 @@ static ULONG WINAPI IProfferServiceImpl_Release(IProfferService *iface) static HRESULT WINAPI IProfferServiceImpl_ProfferService(IProfferService *iface, REFGUID service, IServiceProvider *pService, DWORD *pCookie) { + *pCookie = 0xdeadbeef; add_call(&trace_got, 3, service, pService, pCookie, 0, 0); return S_OK; } @@ -2419,8 +2420,10 @@ static void test_IUnknown_ProfferService(void) add_call(&trace_expected, 3, &dummy_serviceid, provider, &cookie, 0, 0); init_call_trace(&trace_got); + cookie = 0; hr = pIUnknown_ProfferService((IUnknown*)proff, &dummy_serviceid, provider, &cookie); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie == 0xdeadbeef, "got %x\n", cookie); ok_trace(&trace_expected, &trace_got); free_call_trace(&trace_got); @@ -2434,8 +2437,10 @@ static void test_IUnknown_ProfferService(void) add_call(&trace_expected, 4, (void*)(DWORD_PTR)cookie, 0, 0, 0, 0); init_call_trace(&trace_got); + ok(cookie != 0, "got %x\n", cookie); hr = pIUnknown_ProfferService((IUnknown*)proff, &dummy_serviceid, 0, &cookie); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie == 0, "got %x\n", cookie); ok_trace(&trace_expected, &trace_got); free_call_trace(&trace_got); free_call_trace(&trace_expected);

1 0