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

Jacek Caban : jscript: Store match result in script context.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: 32c61c5092e76c9f50655b92880c4033fc78b3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c61c5092e76c9f50655b928… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 19:18:18 2010 +0200 jscript: Store match result in script context. --- dlls/jscript/jscript.c | 1 + dlls/jscript/jscript.h | 4 ++++ dlls/jscript/regexp.c | 23 +++++++++++++++++++++-- dlls/jscript/string.c | 27 +++++++++++++++++++++------ 4 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 9a516aa..c7c77e3 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -71,6 +71,7 @@ void script_release(script_ctx_t *ctx) return; jsheap_free(&ctx->tmp_heap); + SysFreeString(ctx->last_match); heap_free(ctx); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c58c05d..901f25d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -272,6 +272,10 @@ struct _script_ctx_t { IDispatch *host_global; + BSTR last_match; + DWORD last_match_index; + DWORD last_match_length; + DispatchEx *global; DispatchEx *function_constr; DispatchEx *activex_constr; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index da23f5c..c4c7225 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3348,8 +3348,6 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D } if(parens) { - DWORD i; - if(regexp->jsregexp->parenCount > *parens_size) { match_result_t *new_parens; @@ -3362,6 +3360,22 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D *parens = new_parens; } + } + + /* FIXME: We often already have a copy of input string that we could use to store last match */ + if(!(rem_flags & REM_NO_CTX_UPDATE) && + (!ctx->last_match || len != SysStringLen(ctx->last_match) || strncmpW(ctx->last_match, str, len))) { + BSTR last_match; + + last_match = SysAllocStringLen(str, len); + if(!last_match) + return E_OUTOFMEMORY; + SysFreeString(ctx->last_match); + ctx->last_match = last_match; + } + + if(parens) { + DWORD i; *parens_cnt = regexp->jsregexp->parenCount; @@ -3382,6 +3396,11 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D ret->len = matchlen; set_last_index(regexp, result->cp-str); + if(!(rem_flags & REM_NO_CTX_UPDATE)) { + ctx->last_match_index = ret->str-str; + ctx->last_match_length = matchlen; + } + return S_OK; } diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 510dcc2..05b9eba 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -779,9 +779,9 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI DWORD parens_cnt = 0, parens_size=0, rep_len=0, length; BSTR rep_str = NULL, match_str = NULL, ret_str, val_str; DispatchEx *rep_func = NULL, *regexp = NULL; - match_result_t *parens = NULL, match, **parens_ptr = &parens; + match_result_t *parens = NULL, match = {NULL,0}, **parens_ptr = &parens; strbuf_t ret = {NULL,0,0}; - DWORD re_flags = 0; + DWORD re_flags = REM_NO_CTX_UPDATE; VARIANT *arg_var; HRESULT hres = S_OK; @@ -860,7 +860,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(regexp) { hres = regexp_match_next(ctx, regexp, re_flags, str, length, &cp, parens_ptr, &parens_size, &parens_cnt, &match); - re_flags = REM_CHECK_GLOBAL; + re_flags |= REM_CHECK_GLOBAL; if(hres == S_FALSE) { hres = S_OK; @@ -969,13 +969,28 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(rep_func) jsdisp_release(rep_func); - if(regexp) - jsdisp_release(regexp); - SysFreeString(val_str); SysFreeString(rep_str); SysFreeString(match_str); heap_free(parens); + if(SUCCEEDED(hres) && match.str && regexp) { + if(!val_str) + val_str = SysAllocStringLen(str, length); + if(val_str) { + SysFreeString(ctx->last_match); + ctx->last_match = val_str; + val_str = NULL; + ctx->last_match_index = match.str-str; + ctx->last_match_length = match.len; + }else { + hres = E_OUTOFMEMORY; + } + } + + if(regexp) + jsdisp_release(regexp); + SysFreeString(val_str); + if(SUCCEEDED(hres) && retv) { ret_str = SysAllocStringLen(ret.buf, ret.len); if(!ret_str)

1 0

Jacek Caban : jscript: Added RegExp.leftContext implementation.
by Alexandre Julliard 27 May '10

27 May '10

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.rightContext implementation.
by Alexandre Julliard 27 May '10

27 May '10

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 leftContext and rightCont4ext tests.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: 0ce3bcee1b0a699d8743967f7a16acd258b86c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce3bcee1b0a699d8743967f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 19:19:34 2010 +0200 jscript: Added leftContext and rightCont4ext tests. --- dlls/jscript/tests/regexp.js | 72 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ce3bcee1b0a699d87439…

1 0

Alexandre Julliard : kernel32: Reset stdio handles when they are closed.
by Alexandre Julliard 27 May '10

27 May '10

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

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

27 May '10

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

Henri Verbeet : d3d8: Set the FPU control word on device creation.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 7d5666e084da03fad7f97ab235039d1afd530377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5666e084da03fad7f97ab23… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 26 09:41:37 2010 +0200 d3d8: Set the FPU control word on device creation. --- dlls/d3d8/device.c | 15 ++++++++ dlls/d3d8/tests/device.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2312a6a..12ed0fb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2764,6 +2764,19 @@ static const IWineD3DDeviceParentVtbl d3d8_wined3d_device_parent_vtbl = device_parent_CreateSwapChain, }; +static void setup_fpu(void) +{ + WORD cw; + +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnstcw %0" : "=m" (cw)); + cw = (cw & ~0xf3f) | 0x3f; + __asm__ volatile ("fldcw %0" : : "m" (cw)); +#else + FIXME("FPU setup not implemented for this platform.\n"); +#endif +} + HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) { @@ -2782,6 +2795,8 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapte } device->handle_table.table_size = D3D8_INITIAL_HANDLE_TABLE_SIZE; + if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); + wined3d_mutex_lock(); hr = IWineD3D_CreateDevice(wined3d, adapter, device_type, focus_window, flags, (IUnknown *)device, (IWineD3DDeviceParent *)&device->device_parent_vtbl, &device->WineD3DDevice); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index cd2df9a..b46ec4e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1797,6 +1797,89 @@ done: UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); } +static inline void set_fpu_cw(WORD cw) +{ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnclex"); + __asm__ volatile ("fldcw %0" : : "m" (cw)); +#endif +} + +static inline WORD get_fpu_cw(void) +{ + WORD cw = 0; +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#endif + return cw; +} + +static void test_fpu_setup(void) +{ + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice8 *device; + D3DDISPLAYMODE d3ddm; + HWND window = NULL; + IDirect3D8 *d3d8; + HRESULT hr; + WORD cw; + + d3d8 = pDirect3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a d3d8 object.\n"); + if (!d3d8) return; + + window = CreateWindowA("static", "d3d8_test", WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + if (!window) goto done; + + hr = IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &d3ddm); + ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferFormat = d3ddm.Format; + + set_fpu_cw(0xf60); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + if (FAILED(hr)) + { + skip("Failed to create a device, hr %#x.\n", hr); + set_fpu_cw(0x37f); + goto done; + } + + cw = get_fpu_cw(); + ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + + IDirect3DDevice8_Release(device); + + cw = get_fpu_cw(); + ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + set_fpu_cw(0xf60); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &present_parameters, &device); + ok(SUCCEEDED(hr), "CreateDevice failed, hr %#x.\n", hr); + + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + set_fpu_cw(0x37f); + + IDirect3DDevice8_Release(device); + +done: + if (window) DestroyWindow(window); + if (d3d8) IDirect3D8_Release(d3d8); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -1819,6 +1902,9 @@ START_TEST(device) } IDirect3D8_Release(d3d8); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + test_fpu_setup(); +#endif test_display_modes(); test_shader_versions(); test_swapchain();

1 0

Henri Verbeet : d3d9: Set the FPU control word on device creation.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: e6611e22fb037a879205f1330d1a3485f9f18705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6611e22fb037a879205f1330… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 26 09:41:38 2010 +0200 d3d9: Set the FPU control word on device creation. --- dlls/d3d9/device.c | 15 ++++++++ dlls/d3d9/tests/device.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 68516cc..b9f539e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2822,6 +2822,19 @@ static const IWineD3DDeviceParentVtbl d3d9_wined3d_device_parent_vtbl = device_parent_CreateSwapChain, }; +static void setup_fpu(void) +{ + WORD cw; + +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnstcw %0" : "=m" (cw)); + cw = (cw & ~0xf3f) | 0x3f; + __asm__ volatile ("fldcw %0" : : "m" (cw)); +#else + FIXME("FPU setup not implemented for this platform.\n"); +#endif +} + HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) { @@ -2833,6 +2846,8 @@ HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapte device->device_parent_vtbl = &d3d9_wined3d_device_parent_vtbl; device->ref = 1; + if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); + wined3d_mutex_lock(); hr = IWineD3D_CreateDevice(wined3d, adapter, device_type, focus_window, flags, (IUnknown *)device, (IWineD3DDeviceParent *)&device->device_parent_vtbl, &device->WineD3DDevice); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e21f8ad..2119995 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2641,6 +2641,84 @@ done: UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); } +static inline void set_fpu_cw(WORD cw) +{ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnclex"); + __asm__ volatile ("fldcw %0" : : "m" (cw)); +#endif +} + +static inline WORD get_fpu_cw(void) +{ + WORD cw = 0; +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#endif + return cw; +} + +static void test_fpu_setup(void) +{ + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice9 *device; + HWND window = NULL; + IDirect3D9 *d3d9; + HRESULT hr; + WORD cw; + + d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a d3d9 object.\n"); + if (!d3d9) return; + + window = CreateWindowA("static", "d3d9_test", WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + if (!window) goto done; + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + set_fpu_cw(0xf60); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + if (FAILED(hr)) + { + skip("Failed to create a device, hr %#x.\n", hr); + set_fpu_cw(0x37f); + goto done; + } + + cw = get_fpu_cw(); + ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + + IDirect3DDevice9_Release(device); + + cw = get_fpu_cw(); + ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + set_fpu_cw(0xf60); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &present_parameters, &device); + ok(SUCCEEDED(hr), "CreateDevice failed, hr %#x.\n", hr); + + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + set_fpu_cw(0x37f); + + IDirect3DDevice9_Release(device); + +done: + if (window) DestroyWindow(window); + if (d3d9) IDirect3D9_Release(d3d9); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -2662,6 +2740,9 @@ START_TEST(device) } IDirect3D9_Release(d3d9); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + test_fpu_setup(); +#endif test_multi_device(); test_display_formats(); test_display_modes();

1 0

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

26 May '10

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

Nikolay Sivov : comctl32/listview: Perform ranges validation only when tracing enabled.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 01fdf21717532e730543d34841a767c61c647d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01fdf21717532e730543d3484… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 26 03:01:56 2010 +0400 comctl32/listview: Perform ranges validation only when tracing enabled. --- dlls/comctl32/listview.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e2bd9a7..4e13577 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -168,9 +168,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(listview); -/* make sure you set this to 0 for production use! */ -#define DEBUG_RANGES 1 - typedef struct tagCOLUMN_INFO { RECT rcHeader; /* tracks the header's rectangle */ @@ -2968,11 +2965,7 @@ static INT CALLBACK ranges_cmp(LPVOID range1, LPVOID range2, LPARAM flags) return cmp; } -#if DEBUG_RANGES -#define ranges_check(ranges, desc) ranges_assert(ranges, desc, __FUNCTION__, __LINE__) -#else -#define ranges_check(ranges, desc) do { } while(0) -#endif +#define ranges_check(ranges, desc) if (TRACE_ON(listview)) ranges_assert(ranges, desc, __FUNCTION__, __LINE__) static void ranges_assert(RANGES ranges, LPCSTR desc, const char *func, int line) { @@ -6961,7 +6954,7 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR nColumn = lprc->top; - TRACE("(nItem=%d, nSubItem=%d)\n", nItem, lprc->top); + TRACE("(nItem=%d, nSubItem=%d, type=%d)\n", nItem, lprc->top, lprc->left); /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */ if (lprc->top == 0) return LISTVIEW_GetItemRect(infoPtr, nItem, lprc);

1 0