March 2013 - Wine-Commits - list.winehq.org

Austin English : ntdll: Add a stub for RtlConvertToAutoInheritSecurityObject.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 56057acdcddd91169c94c996113b9b379ccb58a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56057acdcddd91169c94c9961… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 26 15:38:08 2013 -0700 ntdll: Add a stub for RtlConvertToAutoInheritSecurityObject. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b0cb43a..60f70b1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -463,7 +463,7 @@ # @ stub RtlConvertPropertyToVariant @ stub RtlConvertSharedToExclusive @ stdcall RtlConvertSidToUnicodeString(ptr ptr long) -# @ stub RtlConvertToAutoInheritSecurityObject +@ stdcall RtlConvertToAutoInheritSecurityObject(ptr ptr ptr ptr long ptr) @ stub RtlConvertUiListToApiList @ stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) # @ stub RtlConvertVariantToProperty diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 5e27730..b9eeccd 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1807,3 +1807,16 @@ NTSTATUS WINAPI RtlQueryInformationAcl( return status; } + +BOOL WINAPI RtlConvertToAutoInheritSecurityObject( + PSECURITY_DESCRIPTOR pdesc, + PSECURITY_DESCRIPTOR cdesc, + PSECURITY_DESCRIPTOR* ndesc, + GUID* objtype, + BOOL isdir, + PGENERIC_MAPPING genmap ) +{ + FIXME("%p %p %p %p %d %p - stub\n", pdesc, cdesc, ndesc, objtype, isdir, genmap); + + return FALSE; +}

1 0

Jacek Caban : jscript: Use helpers to access string buffer in object.c.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: b7ffca591d20c839ddc18ba01e352ae4d6fd0774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ffca591d20c839ddc18ba01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 11:04:09 2013 +0100 jscript: Use helpers to access string buffer in object.c. --- dlls/jscript/object.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 6f597d6..4ad764b 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -130,9 +130,14 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return hres; if(is_jsdisp(jsthis)) { + const WCHAR *name_str; BOOL result; - hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name->str, &result); + name_str = jsstr_flatten(name); + if(name_str) + hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name_str, &result); + else + hres = E_OUTOFMEMORY; jsstr_release(name); if(FAILED(hres)) return hres; @@ -164,7 +169,8 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsstr_t *name; + const WCHAR *name; + jsstr_t *name_str; BOOL ret; HRESULT hres; @@ -180,12 +186,12 @@ static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, W return E_FAIL; } - hres = to_string(ctx, argv[0], &name); + hres = to_flat_string(ctx, argv[0], &name_str, &name); if(FAILED(hres)) return hres; - hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name->str, &ret); - jsstr_release(name); + hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name, &ret); + jsstr_release(name_str); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Use to_flat_string to access string buffer in array. c.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: ecdf62d3244baf464765ded17565d3ec6409e842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdf62d3244baf464765ded17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 11:01:59 2013 +0100 jscript: Use to_flat_string to access string buffer in array.c. --- dlls/jscript/array.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 49a39dd..c98f4fe 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -337,15 +337,16 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne return hres; if(argc) { - jsstr_t *sep; + const WCHAR *sep; + jsstr_t *sep_str; - hres = to_string(ctx, argv[0], &sep); + hres = to_flat_string(ctx, argv[0], &sep_str, &sep); if(FAILED(hres)) return hres; - hres = array_join(ctx, jsthis, length, sep->str, r); + hres = array_join(ctx, jsthis, length, sep, r); - jsstr_release(sep); + jsstr_release(sep_str); }else { hres = array_join(ctx, jsthis, length, default_separatorW, r); }

1 0

Piotr Caban : shell32: Match parameters list with function we' re forwarding to.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 6a0f7521ed439bada37573996524f2d1a699b8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0f7521ed439bada37573996… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:15 2013 +0100 shell32: Match parameters list with function we're forwarding to. --- dlls/shell32/shell32.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 790cc9f..0f991a4 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -114,7 +114,7 @@ 119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() 121 stdcall -noname SHFlushClipboard() - 122 stdcall -private @(long long long str long) shell.dll16.RunDLL_CallEntry16 + 122 stdcall -private @(long long ptr str long) shell.dll16.RunDLL_CallEntry16 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr) @@ -445,13 +445,13 @@ @ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW @ stdcall StrCpyNA (ptr str long) kernel32.lstrcpynA -@ stdcall StrCpyNW(wstr wstr long) shlwapi.StrCpyNW +@ stdcall StrCpyNW(ptr wstr long) shlwapi.StrCpyNW @ stdcall StrNCmpA(str str long) shlwapi.StrCmpNA @ stdcall StrNCmpIA(str str long) shlwapi.StrCmpNIA @ stdcall StrNCmpIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrNCmpW(wstr wstr long) shlwapi.StrCmpNW @ stdcall StrNCpyA (ptr str long) kernel32.lstrcpynA -@ stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW +@ stdcall StrNCpyW(ptr wstr long) shlwapi.StrCpyNW @ stdcall StrRChrA(str str long) shlwapi.StrRChrA @ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA @ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW

1 0

Nikolay Sivov : hlink: Implement IHlinkBrowseContext_SetCurrentHlink().
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 29d37bd71468f5d10abe6e1bceb1eab1e17f8132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d37bd71468f5d10abe6e1bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 27 10:41:07 2013 +0400 hlink: Implement IHlinkBrowseContext_SetCurrentHlink(). --- dlls/hlink/browse_ctx.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index d09d59d..d90aad9 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -295,11 +295,19 @@ static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, return S_OK; } -static HRESULT WINAPI IHlinkBC_SetCurrentHlink( IHlinkBrowseContext* iface, - ULONG uHLID) +static HRESULT WINAPI IHlinkBC_SetCurrentHlink(IHlinkBrowseContext* iface, ULONG hlid) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *link; + + TRACE("(%p)->(0x%08x)\n", This, hlid); + + link = context_get_entry(This, hlid); + if (!link) + return E_FAIL; + + This->current = link; + return S_OK; } static HRESULT WINAPI IHlinkBC_Clone( IHlinkBrowseContext* iface,

1 0

Jacek Caban : jscript: Added to_flat_string helper and use it to access string buffer in activex. c.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 3bf7255d2335dfe49359a7b17c551149a55c513f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf7255d2335dfe49359a7b17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 11:01:43 2013 +0100 jscript: Added to_flat_string helper and use it to access string buffer in activex.c. --- dlls/jscript/activex.c | 9 +++++---- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 58c2574..c7d9a66 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -143,7 +143,8 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsstr_t * progid; + jsstr_t * progid_str; + const WCHAR *progid; IDispatch *disp; IUnknown *obj; HRESULT hres; @@ -166,12 +167,12 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return E_NOTIMPL; } - hres = to_string(ctx, argv[0], &progid); + hres = to_flat_string(ctx, argv[0], &progid_str, &progid); if(FAILED(hres)) return hres; - obj = create_activex_object(ctx, progid->str); - jsstr_release(progid); + obj = create_activex_object(ctx, progid); + jsstr_release(progid_str); if(!obj) return throw_generic_error(ctx, JS_E_CANNOT_CREATE_OBJ, NULL); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 135b77f..aed2585 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -322,6 +322,7 @@ HRESULT to_integer(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,jsval_t,INT*) DECLSPEC_HIDDEN; HRESULT to_uint32(script_ctx_t*,jsval_t,UINT32*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,jsval_t,jsstr_t**) DECLSPEC_HIDDEN; +HRESULT to_flat_string(script_ctx_t*,jsval_t,jsstr_t**,const WCHAR**) DECLSPEC_HIDDEN; HRESULT to_object(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index d141378..60ca474 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -776,6 +776,23 @@ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsstr_t **str) return *str ? S_OK : E_OUTOFMEMORY; } +HRESULT to_flat_string(script_ctx_t *ctx, jsval_t val, jsstr_t **str, const WCHAR **ret_str) +{ + HRESULT hres; + + hres = to_string(ctx, val, str); + if(FAILED(hres)) + return hres; + + *ret_str = jsstr_flatten(*str); + if(!*ret_str) { + jsstr_release(*str); + return E_OUTOFMEMORY; + } + + return S_OK; +} + /* ECMA-262 3rd Edition 9.9 */ HRESULT to_object(script_ctx_t *ctx, jsval_t val, IDispatch **disp) {

1 0

Piotr Caban : msvcrt: Added _set_output_format tests.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 343122a494b66ad5b58b6f064604a405b36334d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=343122a494b66ad5b58b6f064… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 10:39:42 2013 +0100 msvcrt: Added _set_output_format tests. --- dlls/msvcrt/tests/printf.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 0d4a241..e61ca5f 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -44,6 +44,7 @@ static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number, static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); static unsigned int (__cdecl *p__get_output_format)(void); +static unsigned int (__cdecl *p__set_output_format)(unsigned int); static int (__cdecl *p__vsprintf_p)(char*, size_t, const char*, __ms_va_list); static int (__cdecl *p_vswprintf)(wchar_t *str, const wchar_t *format, __ms_va_list valist); static int (__cdecl *p__vswprintf)(wchar_t *str, const wchar_t *format, __ms_va_list valist); @@ -66,6 +67,7 @@ static void init( void ) p__ecvt_s = (void *)GetProcAddress(hmod, "_ecvt_s"); p__fcvt_s = (void *)GetProcAddress(hmod, "_fcvt_s"); p__get_output_format = (void *)GetProcAddress(hmod, "_get_output_format"); + p__set_output_format = (void *)GetProcAddress(hmod, "_set_output_format"); p__vsprintf_p = (void*)GetProcAddress(hmod, "_vsprintf_p"); p_vswprintf = (void*)GetProcAddress(hmod, "vswprintf"); p__vswprintf = (void*)GetProcAddress(hmod, "_vswprintf"); @@ -1316,15 +1318,34 @@ static void test_vsprintf_p(void) static void test__get_output_format(void) { unsigned int ret; + char buf[64]; + int c; - if (!p__get_output_format) + if (!p__get_output_format || !p__set_output_format) { - win_skip("_get_output_format not available\n"); + win_skip("_get_output_format or _set_output_format is not available\n"); return; } ret = p__get_output_format(); ok(ret == 0, "got %d\n", ret); + + c = sprintf(buf, "%E", 1.23); + ok(c == 13, "c = %d\n", c); + ok(!strcmp(buf, "1.230000E+000"), "buf = %s\n", buf); + + ret = p__set_output_format(_TWO_DIGIT_EXPONENT); + ok(ret == 0, "got %d\n", ret); + + c = sprintf(buf, "%E", 1.23); + ok(c == 12, "c = %d\n", c); + ok(!strcmp(buf, "1.230000E+00"), "buf = %s\n", buf); + + ret = p__get_output_format(); + ok(ret == _TWO_DIGIT_EXPONENT, "got %d\n", ret); + + ret = p__set_output_format(_TWO_DIGIT_EXPONENT); + ok(ret == _TWO_DIGIT_EXPONENT, "got %d\n", ret); } START_TEST(printf)

1 0

Alexandre Julliard : msiexec: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: bed3e87d4e893b779e7e09280ac51b9eff4f097b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed3e87d4e893b779e7e09280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:49:40 2013 +0100 msiexec: Add a 256x256 icon. --- programs/msiexec/msiexec.ico | Bin 25214 -> 49609 bytes programs/msiexec/msiexec.svg | 2157 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 1903 insertions(+), 254 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bed3e87d4e893b779e7e0…

1 0

Alexandre Julliard : iexplore: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 2cf2741a3072bd8b19b1310408c6f932edab9194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf2741a3072bd8b19b131040… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:47:12 2013 +0100 iexplore: Add a 256x256 icon. --- programs/iexplore/iexplore.ico | Bin 25214 -> 82992 bytes programs/iexplore/iexplore.svg | 2620 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 2358 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cf2741a3072bd8b19b13…

1 0

Alexandre Julliard : cmd: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 64ea72b66797bc105e37e50b26b72b37b4dfbc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ea72b66797bc105e37e50b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:44:19 2013 +0100 cmd: Add a 256x256 icon. --- programs/cmd/wcmd.ico | Bin 25214 -> 55841 bytes programs/cmd/wcmd.svg | 2680 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 2391 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64ea72b66797bc105e37e…

1 0