May 2010 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Added RegExp.rightContext implementation.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: ce67c763289f70e85a61b0182e019a847040771f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce67c763289f70e85a61b0182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 19:19:18 2010 +0200 jscript: Added RegExp.rightContext implementation. --- dlls/jscript/regexp.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 19f5f19..fb54189 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -4025,8 +4025,27 @@ static HRESULT RegExpConstr_leftContext(script_ctx_t *ctx, vdisp_t *jsthis, WORD static HRESULT RegExpConstr_rightContext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + BSTR ret; + + ret = SysAllocString(ctx->last_match+ctx->last_match_index+ctx->last_match_length); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + case DISPATCH_PROPERTYPUT: + return S_OK; + default: + FIXME("unsupported flags\n"); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp,

1 0

Jacek Caban : jscript: Added RegExp.leftContext implementation.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 9159ddce92896a21eda20c2a55fe31d43de581d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9159ddce92896a21eda20c2a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 19:18:32 2010 +0200 jscript: Added RegExp.leftContext implementation. --- dlls/jscript/regexp.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index c4c7225..19f5f19 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3999,8 +3999,27 @@ HRESULT regexp_string_match(script_ctx_t *ctx, DispatchEx *re, BSTR str, static HRESULT RegExpConstr_leftContext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + BSTR ret; + + ret = SysAllocStringLen(ctx->last_match, ctx->last_match_index); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + case DISPATCH_PROPERTYPUT: + return S_OK; + default: + FIXME("unsupported flags\n"); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT RegExpConstr_rightContext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,

1 0

Jacek Caban : jscript: Added RegExp.leftContext and RegExp. rightContext stub implementation.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 0acb7fb1e424f656224f732a223f2f11f05322a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0acb7fb1e424f656224f732a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 19:17:40 2010 +0200 jscript: Added RegExp.leftContext and RegExp.rightContext stub implementation. --- dlls/jscript/regexp.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index ff7ef29..2abf1f8 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -96,6 +96,11 @@ static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR execW[] = {'e','x','e','c',0}; static const WCHAR testW[] = {'t','e','s','t',0}; +static const WCHAR leftContextW[] = + {'l','e','f','t','C','o','n','t','e','x','t',0}; +static const WCHAR rightContextW[] = + {'r','i','g','h','t','C','o','n','t','e','x','t',0}; + static const WCHAR emptyW[] = {0}; /* FIXME: Better error handling */ @@ -3959,6 +3964,20 @@ HRESULT regexp_string_match(script_ctx_t *ctx, DispatchEx *re, BSTR str, return hres; } +static HRESULT RegExpConstr_leftContext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT RegExpConstr_rightContext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -4019,6 +4038,20 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } +static const builtin_prop_t RegExpConstr_props[] = { + {leftContextW, RegExpConstr_leftContext, 0}, + {rightContextW, RegExpConstr_rightContext, 0} +}; + +static const builtin_info_t RegExpConstr_info = { + JSCLASS_FUNCTION, + {NULL, Function_value, 0}, + sizeof(RegExpConstr_props)/sizeof(*RegExpConstr_props), + RegExpConstr_props, + NULL, + NULL +}; + HRESULT create_regexp_constr(script_ctx_t *ctx, DispatchEx *object_prototype, DispatchEx **ret) { RegExpInstance *regexp; @@ -4030,7 +4063,7 @@ HRESULT create_regexp_constr(script_ctx_t *ctx, DispatchEx *object_prototype, Di if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, RegExpConstr_value, RegExpW, NULL, + hres = create_builtin_function(ctx, RegExpConstr_value, RegExpW, &RegExpConstr_info, PROPF_CONSTR|2, &regexp->dispex, ret); jsdisp_release(&regexp->dispex);

1 0

Jacek Caban : jscript: Store builtin constructor' s length in instance object.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 0cbe1574fe3a522284ef57e22dabb12ef4177fd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbe1574fe3a522284ef57e22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 19:17:21 2010 +0200 jscript: Store builtin constructor's length in instance object. --- dlls/jscript/dispex.c | 15 +++++++++++++++ dlls/jscript/function.c | 11 ++++++++++- dlls/jscript/jscript.h | 7 +++++-- dlls/jscript/tests/api.js | 7 +++++-- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6894eae..07880bc 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -358,6 +358,9 @@ static HRESULT prop_put(DispatchEx *This, dispex_prop_t *prop, VARIANT *val, { HRESULT hres; + if(prop->flags & PROPF_CONST) + return S_OK; + switch(prop->type) { case PROP_BUILTIN: if(!(prop->flags & PROPF_METHOD)) { @@ -974,6 +977,18 @@ HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, VARIANT *val, js return prop_put(obj, prop, val, ei, caller); } +HRESULT jsdisp_propput_const(DispatchEx *obj, const WCHAR *name, VARIANT *val) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = ensure_prop_name(obj, name, FALSE, PROPF_ENUM|PROPF_CONST, &prop); + if(FAILED(hres)) + return hres; + + return VariantCopy(&prop->u.var, val); +} + HRESULT jsdisp_propput_idx(DispatchEx *obj, DWORD idx, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { WCHAR buf[12]; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index c7494cf..df46f1d 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -606,7 +606,16 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, if(FAILED(hres)) return hres; - hres = set_prototype(ctx, &function->dispex, prototype); + if(builtin_info) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_I4(&var) = function->length; + hres = jsdisp_propput_const(&function->dispex, lengthW, &var); + } + + if(SUCCEEDED(hres)) + hres = set_prototype(ctx, &function->dispex, prototype); if(FAILED(hres)) { jsdisp_release(&function->dispex); return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c1c8e60..c58c05d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -68,6 +68,7 @@ extern HINSTANCE jscript_hinstance; #define PROPF_METHOD 0x0100 #define PROPF_ENUM 0x0200 #define PROPF_CONSTR 0x0400 +#define PROPF_CONST 0x0800 /* NOTE: Keep in sync with names in Object.toString implementation */ typedef enum { @@ -203,6 +204,7 @@ HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*,IServi HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propget(DispatchEx*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propput_name(DispatchEx*,const WCHAR*,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT jsdisp_propput_const(DispatchEx*,const WCHAR*,VARIANT*); HRESULT jsdisp_propput_idx(DispatchEx*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propget_name(DispatchEx*,LPCWSTR,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_get_idx(DispatchEx*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*); @@ -318,8 +320,9 @@ typedef struct { DWORD len; } match_result_t; -#define REM_CHECK_GLOBAL 0x0001 -#define REM_RESET_INDEX 0x0002 +#define REM_CHECK_GLOBAL 0x0001 +#define REM_RESET_INDEX 0x0002 +#define REM_NO_CTX_UPDATE 0x0004 HRESULT regexp_match_next(script_ctx_t*,DispatchEx*,DWORD,const WCHAR*,DWORD,const WCHAR**,match_result_t**, DWORD*,DWORD*,match_result_t*); HRESULT regexp_match(script_ctx_t*,DispatchEx*,const WCHAR*,DWORD,BOOL,match_result_t**,DWORD*); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2fba252..2ccad3d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2129,7 +2129,7 @@ ok(ActiveXObject.length == 1, "ActiveXObject.length = " + ActiveXObject.length); ok(Array.length == 1, "Array.length = " + Array.length); ok(Boolean.length == 1, "Boolean.length = " + Boolean.length); ok(CollectGarbage.length == 0, "CollectGarbage.length = " + CollectGarbage.length); -//ok(Date.length == 7, "Date.length = " + Date.length); +ok(Date.length == 7, "Date.length = " + Date.length); ok(Enumerator.length == 7, "Enumerator.length = " + Enumerator.length); ok(Error.length == 1, "Error.length = " + Error.length); ok(EvalError.length == 1, "EvalError.length = " + EvalError.length); @@ -2147,7 +2147,7 @@ ok(ScriptEngineMajorVersion.length == 0, "ScriptEngineMajorVersion.length = " + ScriptEngineMajorVersion.length); ok(ScriptEngineMinorVersion.length == 0, "ScriptEngineMinorVersion.length = " + ScriptEngineMinorVersion.length); -//ok(String.length == 1, "String.length = " + String.length); +ok(String.length == 1, "String.length = " + String.length); ok(SyntaxError.length == 1, "SyntaxError.length = " + SyntaxError.length); ok(TypeError.length == 1, "TypeError.length = " + TypeError.length); ok(URIError.length == 1, "URIError.length = " + URIError.length); @@ -2164,4 +2164,7 @@ ok(parseFloat.length == 1, "parseFloat.length = " + parseFloat.length); ok(parseInt.length == 2, "parseInt.length = " + parseInt.length); ok(unescape.length == 1, "unescape.length = " + unescape.length); +String.length = 3; +ok(String.length == 1, "String.length = " + String.length); + reportSuccess();

1 0

Alexandre Julliard : gdi32: Return the actual DIB section bitfields instead of default values in GetDIBits .
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: f4e51a9c45715b45718b66df80365b3fafe2ef71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e51a9c45715b45718b66df8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 13:37:37 2010 +0200 gdi32: Return the actual DIB section bitfields instead of default values in GetDIBits. --- dlls/gdi32/dib.c | 20 +++++++--- dlls/gdi32/tests/bitmap.c | 90 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 102 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index b19cb9d..2725247 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -827,9 +827,13 @@ INT WINAPI GetDIBits( case 16: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - ((PDWORD)info->bmiColors)[0] = 0xf800; - ((PDWORD)info->bmiColors)[1] = 0x07e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; + if (bmp->dib) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + else + { + ((PDWORD)info->bmiColors)[0] = 0xf800; + ((PDWORD)info->bmiColors)[1] = 0x07e0; + ((PDWORD)info->bmiColors)[2] = 0x001f; + } } break; @@ -837,9 +841,13 @@ INT WINAPI GetDIBits( case 32: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - ((PDWORD)info->bmiColors)[0] = 0xff0000; - ((PDWORD)info->bmiColors)[1] = 0x00ff00; - ((PDWORD)info->bmiColors)[2] = 0x0000ff; + if (bmp->dib) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + else + { + ((PDWORD)info->bmiColors)[0] = 0xff0000; + ((PDWORD)info->bmiColors)[1] = 0x00ff00; + ((PDWORD)info->bmiColors)[2] = 0x0000ff; + } } break; } diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d94239f..b25cfd4 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1809,9 +1809,11 @@ static void test_GetDIBits_BI_BITFIELDS(void) char dibinfo_buf[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; DWORD bits[32]; LPBITMAPINFO dibinfo = (LPBITMAPINFO) dibinfo_buf; + DWORD *bitmasks = (DWORD *)dibinfo->bmiColors; HDC hdc; HBITMAP hbm; int ret; + void *ptr; memset(dibinfo, 0, sizeof(dibinfo_buf)); dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -1826,8 +1828,6 @@ static void test_GetDIBits_BI_BITFIELDS(void) ok(ret == 1, "GetDIBits failed\n"); if (dibinfo->bmiHeader.biBitCount > 8) { - DWORD *bitmasks = (DWORD *)dibinfo->bmiColors; - ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, "compression is %u\n", dibinfo->bmiHeader.biCompression ); @@ -1892,6 +1892,92 @@ static void test_GetDIBits_BI_BITFIELDS(void) else skip("not in 16 bpp BI_BITFIELDS mode, skipping that test\n"); DeleteObject(hbm); + + /* same thing now with a 32-bpp DIB section */ + + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + dibinfo->bmiHeader.biWidth = 1; + dibinfo->bmiHeader.biHeight = 1; + dibinfo->bmiHeader.biPlanes = 1; + dibinfo->bmiHeader.biBitCount = 32; + dibinfo->bmiHeader.biCompression = BI_RGB; + dibinfo->bmiHeader.biSizeImage = 0; + dibinfo->bmiHeader.biXPelsPerMeter = 0; + dibinfo->bmiHeader.biYPelsPerMeter = 0; + dibinfo->bmiHeader.biClrUsed = 0; + dibinfo->bmiHeader.biClrImportant = 0; + bitmasks[0] = 0x0000ff; + bitmasks[1] = 0x00ff00; + bitmasks[2] = 0xff0000; + hbm = CreateDIBSection( hdc, dibinfo, DIB_RGB_COLORS, &ptr, NULL, 0 ); + ok( hbm != 0, "failed to create bitmap\n" ); + + memset(dibinfo, 0, sizeof(dibinfo_buf)); + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ret = GetDIBits(hdc, hbm, 0, 0, NULL, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + ok( dibinfo->bmiHeader.biBitCount == 32, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount ); + + ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, + "compression is %u\n", dibinfo->bmiHeader.biCompression ); + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + ret = GetDIBits(hdc, hbm, 0, 1, bits, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + ok( dibinfo->bmiHeader.biBitCount == 32, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount ); + ok( bitmasks[0] == 0xff0000, "wrong red mask %08x\n", bitmasks[0] ); + ok( bitmasks[1] == 0x00ff00, "wrong green mask %08x\n", bitmasks[1] ); + ok( bitmasks[2] == 0x0000ff, "wrong blue mask %08x\n", bitmasks[2] ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef || + broken(dibinfo->bmiHeader.biSizeImage == 0xdeadbeef), /* win9x */ + "size image not set\n" ); + + DeleteObject(hbm); + + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + dibinfo->bmiHeader.biWidth = 1; + dibinfo->bmiHeader.biHeight = 1; + dibinfo->bmiHeader.biPlanes = 1; + dibinfo->bmiHeader.biBitCount = 32; + dibinfo->bmiHeader.biCompression = BI_BITFIELDS; + dibinfo->bmiHeader.biSizeImage = 0; + dibinfo->bmiHeader.biXPelsPerMeter = 0; + dibinfo->bmiHeader.biYPelsPerMeter = 0; + dibinfo->bmiHeader.biClrUsed = 0; + dibinfo->bmiHeader.biClrImportant = 0; + bitmasks[0] = 0x0000ff; + bitmasks[1] = 0x00ff00; + bitmasks[2] = 0xff0000; + hbm = CreateDIBSection( hdc, dibinfo, DIB_RGB_COLORS, &ptr, NULL, 0 ); + ok( hbm != 0 || broken(!hbm), /* win9x */ "failed to create bitmap\n" ); + + if (hbm) + { + memset(dibinfo, 0, sizeof(dibinfo_buf)); + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ret = GetDIBits(hdc, hbm, 0, 0, NULL, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + + ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, + "compression is %u\n", dibinfo->bmiHeader.biCompression ); + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + ret = GetDIBits(hdc, hbm, 0, 1, bits, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + ok( bitmasks[0] == 0x0000ff, "wrong red mask %08x\n", bitmasks[0] ); + ok( bitmasks[1] == 0x00ff00, "wrong green mask %08x\n", bitmasks[1] ); + ok( bitmasks[2] == 0xff0000, "wrong blue mask %08x\n", bitmasks[2] ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + + DeleteObject(hbm); + } + ReleaseDC(NULL, hdc); }

1 0

Alexandre Julliard : kernel32: Reset stdio handles when they are closed.
by Alexandre Julliard May 27, 2010

May 27, 2010

Module: wine Branch: master Commit: 775e5f7b3e2d4c87035b5fabf436bdea0586913f URL: http://source.winehq.org/git/wine.git/?a=commit;h=775e5f7b3e2d4c87035b5fabf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 22:10:52 2010 +0200 kernel32: Reset stdio handles when they are closed. --- dlls/kernel32/process.c | 10 ++++++---- dlls/kernel32/tests/process.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b71a390..af06392 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2713,10 +2713,12 @@ BOOL WINAPI CloseHandle( HANDLE handle ) NTSTATUS status; /* stdio handles need special treatment */ - if ((handle == (HANDLE)STD_INPUT_HANDLE) || - (handle == (HANDLE)STD_OUTPUT_HANDLE) || - (handle == (HANDLE)STD_ERROR_HANDLE)) - handle = GetStdHandle( HandleToULong(handle) ); + if (handle == (HANDLE)STD_INPUT_HANDLE) + handle = InterlockedExchangePointer( &NtCurrentTeb()->Peb->ProcessParameters->hStdInput, 0 ); + else if (handle == (HANDLE)STD_OUTPUT_HANDLE) + handle = InterlockedExchangePointer( &NtCurrentTeb()->Peb->ProcessParameters->hStdOutput, 0 ); + else if (handle == (HANDLE)STD_ERROR_HANDLE) + handle = InterlockedExchangePointer( &NtCurrentTeb()->Peb->ProcessParameters->hStdError, 0 ); if (is_console_handle(handle)) return CloseConsoleHandle(handle); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 846c338..d66d9f6 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1742,6 +1742,7 @@ static void test_ProcessName(void) static void test_Handles(void) { HANDLE handle = GetCurrentProcess(); + HANDLE h2; BOOL ret; DWORD code; @@ -1769,6 +1770,15 @@ static void test_Handles(void) ok( !ret, "GetExitCodeProcess succeeded for %p\n", handle ); ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); #endif + + handle = GetStdHandle( STD_ERROR_HANDLE ); + ok( handle != 0, "handle %p\n", handle ); + CloseHandle( (HANDLE)STD_ERROR_HANDLE ); + h2 = GetStdHandle( STD_ERROR_HANDLE ); + ok( h2 == 0 || + broken( h2 == handle) || /* nt4, w2k */ + broken( h2 == INVALID_HANDLE_VALUE), /* win9x */ + "wrong handle %p/%p\n", h2, handle ); } static void test_SystemInfo(void)

1 0

Robert Wilhelm : msvcrt90: Add stat64i32.
by Alexandre Julliard May 26, 2010

May 26, 2010

Module: wine Branch: master Commit: 5d4a7433a64dae95713fecb8a3d6c4f2a471ca37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4a7433a64dae95713fecb8a… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed May 26 10:39:06 2010 +0200 msvcrt90: Add stat64i32. --- dlls/msvcr90/msvcr90.c | 14 ++++++++++++++ dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 3372e0b..43a1834 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -189,3 +189,17 @@ int CDECL _fstat64i32(int fd, struct _stat64i32* buf) msvcrt_stat64_to_stat64i32(&buf64, buf); return ret; } + +/********************************************************************* + * _stat64i32 (MSVCRT.@) + */ +int CDECL _stat64i32(const char* path, struct _stat64i32 * buf) +{ + int ret; + struct _stat64 buf64; + + ret = _stat64(path, &buf64); + if (!ret) + msvcrt_stat64_to_stat64i32(&buf64, buf); + return ret; +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f350d18..6592e7c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -912,7 +912,7 @@ @ stub _stat32 @ stub _stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 -@ stub _stat64i32 +@ cdecl _stat64i32(str ptr) @ cdecl _statusfp() msvcrt._statusfp @ stub _statusfp2 @ stub _strcoll_l

1 0

Nikolay Sivov : shell32: Export lowlevel PIDL manipulation calls by name too.
by Alexandre Julliard May 26, 2010

May 26, 2010

Module: wine Branch: master Commit: 45d6329cbb681914219d6752881b94b67974e68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d6329cbb681914219d67528… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 26 03:01:15 2010 +0400 shell32: Export lowlevel PIDL manipulation calls by name too. --- dlls/shell32/pidl.c | 13 +++++++------ dlls/shell32/shell32.spec | 32 ++++++++++++++++---------------- dlls/shell32/tests/shlfolder.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 6f4b082..dffa2bd 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -833,7 +833,7 @@ LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST pidl) } /************************************************************************* - * ILAppend [SHELL32.154] + * ILAppendID [SHELL32.154] * * Adds the single ItemID item to the ItemIDList indicated by pidl. * If bEnd is FALSE, inserts the item in the front of the list, @@ -847,26 +847,27 @@ LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST pidl) * NOTES * Destroys the passed in idlist! (???) */ -LPITEMIDLIST WINAPI ILAppend(LPITEMIDLIST pidl, LPCITEMIDLIST item, BOOL bEnd) +LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST pidl, LPCSHITEMID item, BOOL bEnd) { LPITEMIDLIST idlRet; + LPCITEMIDLIST itemid = (LPCITEMIDLIST)item; WARN("(pidl=%p,pidl=%p,%08u)semi-stub\n",pidl,item,bEnd); pdump (pidl); - pdump (item); + pdump (itemid); if (_ILIsDesktop(pidl)) { - idlRet = ILClone(item); + idlRet = ILClone(itemid); SHFree (pidl); return idlRet; } if (bEnd) - idlRet = ILCombine(pidl, item); + idlRet = ILCombine(pidl, itemid); else - idlRet = ILCombine(item, pidl); + idlRet = ILCombine(itemid, pidl); SHFree(pidl); return idlRet; diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index c398f92..f913872 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -13,17 +13,17 @@ 11 stub -noname PifMgr_SetProperties 13 stub -noname PifMgr_CloseProperties 15 stdcall -noname ILGetDisplayName(ptr ptr) - 16 stdcall -noname ILFindLastID(ptr) - 17 stdcall -noname ILRemoveLastID(ptr) - 18 stdcall -noname ILClone(ptr) - 19 stdcall -noname ILCloneFirst(ptr) + 16 stdcall -ordinal ILFindLastID(ptr) + 17 stdcall -ordinal ILRemoveLastID(ptr) + 18 stdcall -ordinal ILClone(ptr) + 19 stdcall -ordinal ILCloneFirst(ptr) 20 stdcall -noname ILGlobalClone(ptr) - 21 stdcall -noname ILIsEqual(ptr ptr) - 23 stdcall -noname ILIsParent(ptr ptr long) - 24 stdcall -noname ILFindChild(ptr ptr) - 25 stdcall -noname ILCombine(ptr ptr) + 21 stdcall -ordinal ILIsEqual(ptr ptr) + 23 stdcall -ordinal ILIsParent(ptr ptr long) + 24 stdcall -ordinal ILFindChild(ptr ptr) + 25 stdcall -ordinal ILCombine(ptr ptr) 26 stdcall -noname ILLoadFromStream(ptr ptr) - 27 stdcall -noname ILSaveToStream(ptr ptr) + 27 stdcall -ordinal ILSaveToStream(ptr ptr) 28 stdcall -noname SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW 29 stdcall -noname PathIsRoot(ptr) PathIsRootAW 30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW @@ -141,12 +141,12 @@ 149 stdcall -noname SHFind_InitMenuPopup(long long long long) 151 stdcall -noname SHLoadOLE(long) - 152 stdcall -noname ILGetSize(ptr) - 153 stdcall -noname ILGetNext(ptr) - 154 stdcall -noname ILAppend(long long long) - 155 stdcall -noname ILFree(ptr) + 152 stdcall -ordinal ILGetSize(ptr) + 153 stdcall -ordinal ILGetNext(ptr) + 154 stdcall -ordinal ILAppendID(long long long) + 155 stdcall -ordinal ILFree(ptr) 156 stdcall -noname ILGlobalFree(ptr) - 157 stdcall -noname ILCreateFromPath(ptr) ILCreateFromPathAW + 157 stdcall -ordinal ILCreateFromPath(ptr) ILCreateFromPathAW 158 stdcall -noname PathGetExtension(str long long) PathGetExtensionAW 159 stdcall -noname PathIsDirectory(ptr) PathIsDirectoryAW 160 stub SHNetConnectionDialog @@ -178,8 +178,8 @@ 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) 187 stub ILGetPseudoNameW 188 stdcall -noname ShellDDEInit(long) - 189 stdcall -noname ILCreateFromPathA(str) - 190 stdcall -noname ILCreateFromPathW(wstr) + 189 stdcall -ordinal ILCreateFromPathA(str) + 190 stdcall -ordinal ILCreateFromPathW(wstr) 191 stdcall -noname SHUpdateImageA(str long long long) 192 stdcall -noname SHUpdateImageW(wstr long long long) 193 stdcall -noname SHHandleUpdateImage(ptr) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f63bf6e..d0055d4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -60,6 +60,7 @@ static void init_function_pointers(void) { HMODULE hmod; HRESULT hr; + void *ptr; hmod = GetModuleHandleA("shell32.dll"); @@ -81,6 +82,33 @@ static void init_function_pointers(void) MAKEFUNC_ORD(ILFree, 155); #undef MAKEFUNC_ORD + /* test named exports */ + ptr = GetProcAddress(hmod, "ILFree"); + ok(broken(ptr == 0) || ptr != 0, "expected named export for ILFree\n"); + if (ptr) + { +#define TESTNAMED(f) \ + ptr = (void*)GetProcAddress(hmod, #f); \ + ok(ptr != 0, "expected named export for " #f "\n"); + + TESTNAMED(ILAppendID); + TESTNAMED(ILClone); + TESTNAMED(ILCloneFirst); + TESTNAMED(ILCombine); + TESTNAMED(ILCreateFromPath); + TESTNAMED(ILCreateFromPathA); + TESTNAMED(ILCreateFromPathW); + TESTNAMED(ILFindChild); + TESTNAMED(ILFindLastID); + TESTNAMED(ILGetNext); + TESTNAMED(ILGetSize); + TESTNAMED(ILIsEqual); + TESTNAMED(ILIsParent); + TESTNAMED(ILRemoveLastID); + TESTNAMED(ILSaveToStream); +#undef TESTNAMED + } + hmod = GetModuleHandleA("shlwapi.dll"); pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW");

1 0

Robert Wilhelm : msvcrt90: Add fstat64i32.
by Alexandre Julliard May 26, 2010

May 26, 2010

Module: wine Branch: master Commit: d9746e3ed72bf6d6ea072fd7f1258e909b81360f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9746e3ed72bf6d6ea072fd7f… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed May 26 10:34:51 2010 +0200 msvcrt90: Add fstat64i32. --- dlls/msvcr90/msvcr90.c | 31 +++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index eaf9d66..3372e0b 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include "sys/stat.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcr90); @@ -158,3 +159,33 @@ void* CDECL _recalloc(void* mem, size_t num, size_t size) memset((BYTE*)mem+old_size, 0, size-old_size); return ret; } + +/********************************************************************* + * _fstat64i32 (MSVCRT.@) + */ + +static void msvcrt_stat64_to_stat64i32(const struct _stat64 *buf64, struct _stat64i32 *buf) +{ + buf->st_dev = buf64->st_dev; + buf->st_ino = buf64->st_ino; + buf->st_mode = buf64->st_mode; + buf->st_nlink = buf64->st_nlink; + buf->st_uid = buf64->st_uid; + buf->st_gid = buf64->st_gid; + buf->st_rdev = buf64->st_rdev; + buf->st_size = buf64->st_size; + buf->st_atime = buf64->st_atime; + buf->st_mtime = buf64->st_mtime; + buf->st_ctime = buf64->st_ctime; +} + +int CDECL _fstat64i32(int fd, struct _stat64i32* buf) +{ + int ret; + struct _stat64 buf64; + + ret = _fstat64(fd, &buf64); + if (!ret) + msvcrt_stat64_to_stat64i32(&buf64, buf); + return ret; +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index be4a675..f350d18 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -433,7 +433,7 @@ @ stub _fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ stub _fstat64i32 +@ cdecl _fstat64i32(long ptr) @ stub _ftell_nolock @ stub _ftelli64 @ stub _ftelli64_nolock

1 0

Robert Wilhelm : include: Add struct _stat32i64 and struct _stat64i32.
by Alexandre Julliard May 26, 2010

May 26, 2010

Module: wine Branch: master Commit: b3429e883c8977ceb3df6660d38b24d7d5cfbc16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3429e883c8977ceb3df6660d… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed May 26 10:13:31 2010 +0200 include: Add struct _stat32i64 and struct _stat64i32. --- include/msvcrt/sys/stat.h | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index 1712788..9362d2d 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -83,6 +83,34 @@ struct stat { time_t st_ctime; }; +struct _stat32i64 { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + __int64 DECLSPEC_ALIGN(8) st_size; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; +}; + +struct _stat64i32 { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + _off_t st_size; + __time64_t st_atime; + __time64_t st_mtime; + __time64_t st_ctime; +}; + struct _stati64 { _dev_t st_dev; _ino_t st_ino;

1 0