June 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32: Forward RtlUnwindEx to ntdll for x86_64.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 31b96c6f3b34f8607bd47983d1440c0e31715701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b96c6f3b34f8607bd47983d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 10 13:21:10 2009 +0200 kernel32: Forward RtlUnwindEx to ntdll for x86_64. --- dlls/kernel32/kernel32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b555621..1734460 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -928,6 +928,7 @@ @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory @ stdcall -i386 -norelay SMapLS()

1 0

Alexandre Julliard : winebuild: Properly restore %rax and %rbx in call_from_regs on x86_64.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: e00b4582a14529f29bdfbf3116c3e065b6db7303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00b4582a14529f29bdfbf311… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 10 13:22:04 2009 +0200 winebuild: Properly restore %rax and %rbx in call_from_regs on x86_64. --- tools/winebuild/relay.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index ddc8051..f049c9e 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -1121,6 +1121,8 @@ static void build_call_from_regs_x86_64(void) output( "\tmovq %%rax,0x18(%%rsp)\n" ); output( "\tmovw 0x42(%%rbx),%%ax\n" ); /* ss */ output( "\tmovq %%rax,0x20(%%rsp)\n" ); + output( "\tmovq 0x78(%%rbx),%%rax\n" ); + output( "\tmovq 0x90(%%rbx),%%rbx\n" ); output( "\tiretq\n" ); output_function_size( "__wine_call_from_regs" );

1 0

Alexandre Julliard : rpcrt4: Adjust the start of the proxy virtual table for stubless proxies.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: c35aa1d46d0a05ce1e738d14867c3e233e04fd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35aa1d46d0a05ce1e738d148… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 10 16:54:30 2009 +0200 rpcrt4: Adjust the start of the proxy virtual table for stubless proxies. --- dlls/rpcrt4/cpsf.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index fe55185..ac1eccf 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -167,8 +167,9 @@ static void init_psfactory( CStdPSFactoryBuffer *psfac, const ProxyFileInfo **fi if (file_list[i]->pDelegatedIIDs && file_list[i]->pDelegatedIIDs[j]) { - fill_delegated_proxy_table( (IUnknownVtbl *)proxies[j]->Vtbl, - stubs[j]->header.DispatchTableCount ); + void **vtbl = proxies[j]->Vtbl; + if (file_list[i]->TableVersion > 1) vtbl++; + fill_delegated_proxy_table( (IUnknownVtbl *)vtbl, stubs[j]->header.DispatchTableCount ); pSrcRpcStubVtbl = (void * const *)&CStdStubBuffer_Delegating_Vtbl; }

1 0

Paul Vriens : riched32/tests: Correct a test to better show the behavior.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 3a228fb59382d692d3005dae468f0905ed463a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a228fb59382d692d3005dae4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 10 13:17:45 2009 +0200 riched32/tests: Correct a test to better show the behavior. --- dlls/riched32/tests/editor.c | 56 ++++++++++++++++++++++++++++++----------- 1 files changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 8e0388c..da74b72 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -827,7 +827,7 @@ static void test_word_wrap(void) POINTL point = {0, 60}; /* This point must be below the first line */ const char *text = "Must be long enough to test line wrapping"; DWORD dwCommonStyle = WS_VISIBLE|WS_POPUP|WS_VSCROLL|ES_MULTILINE; - int res, pos, lines; + int res, pos, lines, prevlines, reflines[3]; /* Test the effect of WS_HSCROLL and ES_AUTOHSCROLL styles on wrapping * when specified on window creation and set later. */ @@ -920,29 +920,55 @@ static void test_word_wrap(void) ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); DestroyWindow(hwnd); - /* Test to see if wrapping happens with redraw disabled. */ + /* First lets see if the text would wrap normally (needed for reference) */ hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle, - 0, 0, 400, 80, NULL, NULL, hmoduleRichEdit, NULL); + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + ok(IsWindowVisible(hwnd), "Window should be visible.\n"); + res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); + ok(res, "EM_REPLACESEL failed.\n"); + /* Should have wrapped */ + reflines[0] = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(reflines[0] > 1, "Line was expected to wrap (%d lines).\n", reflines[0]); + /* Resize the window to fit the line */ + MoveWindow(hwnd, 0, 0, 600, 80, TRUE); + /* Text should not be wrapped */ + reflines[1] = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(reflines[1] == 1, "Line wasn't expected to wrap (%d lines).\n", reflines[1]); + /* Resize the window again to make sure the line wraps again */ + MoveWindow(hwnd, 0, 0, 10, 80, TRUE); + reflines[2] = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(reflines[2] > 1, "Line was expected to wrap (%d lines).\n", reflines[2]); + DestroyWindow(hwnd); + + /* Same test with redraw disabled */ + hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); + /* Redraw is disabled by making the window invisible. */ SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); - /* redraw is disabled by making the window invisible. */ ok(!IsWindowVisible(hwnd), "Window shouldn't be visible.\n"); res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); ok(res, "EM_REPLACESEL failed.\n"); - MoveWindow(hwnd, 0, 0, 100, 80, TRUE); - SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); - /* Wrapping didn't happen while redraw was disabled. */ + /* Should have wrapped */ + prevlines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(prevlines == reflines[0], + "Line was expected to wrap (%d lines).\n", prevlines); + /* Resize the window to fit the line, no change to the number of lines */ + MoveWindow(hwnd, 0, 0, 600, 80, TRUE); lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); - todo_wine ok(lines == 1, "Line wasn't expected to wrap (lines=%d).\n", lines); - /* There isn't even a rewrap from resizing the window. */ + todo_wine + ok(lines == prevlines || + broken(lines == reflines[1]), /* Win98, WinME and NT4 */ + "Expected no change in the number of lines\n"); + /* Resize the window again to make sure the line wraps again */ + MoveWindow(hwnd, 0, 0, 10, 80, TRUE); lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); - todo_wine ok(lines == 1, "Line wasn't expected to wrap (lines=%d).\n", lines); - res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); - ok(res, "EM_REPLACESEL failed.\n"); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); - ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); - + todo_wine + ok(lines == prevlines || + broken(lines == reflines[2]), /* Win98, WinME and NT4 */ + "Expected no change in the number of lines\n"); DestroyWindow(hwnd); }

1 0

Ken Sharp : olesvr32: Add OleRevokeServer stub.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: a277da5b480429be0fd2cc9af1f13c04d8f51524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a277da5b480429be0fd2cc9af… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 10 13:08:12 2009 +0100 olesvr32: Add OleRevokeServer stub. --- dlls/olesvr32/olesvr32.spec | 2 +- dlls/olesvr32/olesvr_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/olesvr32/olesvr32.spec b/dlls/olesvr32/olesvr32.spec index 9fdd02d..9db60ec 100644 --- a/dlls/olesvr32/olesvr32.spec +++ b/dlls/olesvr32/olesvr32.spec @@ -1,6 +1,6 @@ 1 stub WEP 2 stdcall OleRegisterServer(str ptr ptr long long) - 3 stub OleRevokeServer + 3 stdcall OleRevokeServer(long) 4 stdcall OleBlockServer(long) 5 stdcall OleUnblockServer(long ptr) 6 stdcall OleRegisterServerDoc(ptr str ptr ptr) diff --git a/dlls/olesvr32/olesvr_main.c b/dlls/olesvr32/olesvr_main.c index b48d58b..57c28e1 100644 --- a/dlls/olesvr32/olesvr_main.c +++ b/dlls/olesvr32/olesvr_main.c @@ -210,3 +210,13 @@ OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC hDoc) FIXME("(%d): stub.\n", hDoc); return OLE_OK; } + +/****************************************************************************** + * OleRevokeServer [OLESVR32.3] + * + */ +OLESTATUS WINAPI OleRevokeServer(LHSERVER hServer) +{ + FIXME("(%d): stub.\n", hServer); + return OLE_OK; +}

1 0

Piotr Caban : jscript: Added Date_getHours and Date_getUTCHours implementation.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: cfb7617688c1b255e3aeaa3caaad67dee4dd8365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb7617688c1b255e3aeaa3ca… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jun 9 15:39:18 2009 +0200 jscript: Added Date_getHours and Date_getUTCHours implementation. --- dlls/jscript/date.c | 42 ++++++++++++++++++++++++++++++++++++++---- dlls/jscript/tests/api.js | 6 +++++- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 8056cc2..1dd9b96 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -85,6 +85,7 @@ static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l', /*ECMA-262 3th Edition 15.9.1.2 */ #define MS_PER_DAY 86400000 +#define MS_PER_HOUR 3600000 #define MS_PER_MINUTE 60000 /* ECMA-262 3th Edition 15.9.1.2 */ @@ -215,6 +216,15 @@ static inline DOUBLE week_day(DOUBLE time) return (int)(day(time)+4) % 7; } +/* ECMA-262 3th Edition 15.9.1.10 */ +static inline DOUBLE hour_from_time(DOUBLE time) +{ + if(isnan(time)) + return ret_nan(); + + return (int)floor(time/MS_PER_HOUR) % 24; +} + /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { @@ -472,18 +482,42 @@ static HRESULT Date_getUTCDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return S_OK; } +/* ECMA-262 3th Edition 15.9.1.10 */ static HRESULT Date_getHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + + num_set_val(retv, hour_from_time(time)); + } + return S_OK; } +/* ECMA-262 3th Edition 15.9.1.10 */ static HRESULT Date_getUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + num_set_val(retv, hour_from_time(date->time)); + } + return S_OK; } static HRESULT Date_getMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2238a94..ceb314f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -950,22 +950,26 @@ ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullY ok(date.getUTCMonth() === 0, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay()); +ok(date.getUTCHours() === 0, "date.getUTCHours() = " + date.getUTCHours()); date.setTime(60*24*60*60*1000); ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); ok(date.getUTCMonth() === 2, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCDate() === 2, "date.getUTCDate() = " + date.getUTCDate()); ok(date.getUTCDay() === 1, "date.getUTCDay() = " + date.getUTCDay()); -date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000); +ok(date.getUTCHours() === 0, "date.getUTCHours() = " + date.getUTCHours()); +date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000 + 1000*60*60); ok(date.getUTCFullYear() === 1974, "date.getUTCFullYear() = " + date.getUTCFullYear()); ok(date.getUTCMonth() === 1, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCMonth(123) === 1, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCDate() === 28, "date.getUTCDate() = " + date.getUTCDate()); ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay()); +ok(date.getUTCHours() === 1, "date.getUTCHours() = " + date.getUTCHours()); date.setTime(Infinity); ok(isNaN(date.getUTCFullYear()), "date.getUTCFullYear() is not NaN"); ok(isNaN(date.getUTCMonth()), "date.getUTCMonth() is not NaN"); ok(isNaN(date.getUTCDate()), "date.getUTCDate() is not NaN"); ok(isNaN(date.getUTCDay()), "date.getUTCDay() is not NaN"); +ok(isNaN(date.getUTCHours()), "date.getUTCHours() is not NaN"); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Henri Verbeet : wined3d: Set explicitly sized internal formats for color key conversion in d3dfmt_get_conv ().
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 5ac8a7b054e75912c9ca1e99d3de242e11ebfe51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac8a7b054e75912c9ca1e99d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 10 09:44:04 2009 +0200 wined3d: Set explicitly sized internal formats for color key conversion in d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 81c93e2..11e467b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1691,7 +1691,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if (colorkey_active) { *convert = CONVERT_CK_565; *format = GL_RGBA; - *internal = GL_RGBA; + *internal = GL_RGB5_A1; *type = GL_UNSIGNED_SHORT_5_5_5_1; } break; @@ -1700,7 +1700,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if (colorkey_active) { *convert = CONVERT_CK_5551; *format = GL_BGRA; - *internal = GL_RGBA; + *internal = GL_RGB5_A1; *type = GL_UNSIGNED_SHORT_1_5_5_5_REV; } break; @@ -1709,7 +1709,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if (colorkey_active) { *convert = CONVERT_CK_RGB24; *format = GL_RGBA; - *internal = GL_RGBA; + *internal = GL_RGBA8; *type = GL_UNSIGNED_INT_8_8_8_8; *target_bpp = 4; } @@ -1719,7 +1719,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if (colorkey_active) { *convert = CONVERT_RGB32_888; *format = GL_RGBA; - *internal = GL_RGBA; + *internal = GL_RGBA8; *type = GL_UNSIGNED_INT_8_8_8_8; } break;

1 0

Henri Verbeet : wined3d: Check the correct extensions in d3dfmt_get_conv().
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: a25e63c62d3232563d6537149d40edf413ec10cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a25e63c62d3232563d6537149… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 10 09:44:04 2009 +0200 wined3d: Check the correct extensions in d3dfmt_get_conv(). According to Stefan these are either typos or leftovers from using GL_HILO8_NV. --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 11e467b..a20ecd2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1725,7 +1725,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ break; case WINED3DFMT_R8G8_SNORM: - if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; + if (GL_SUPPORT(NV_TEXTURE_SHADER)) break; *convert = CONVERT_V8U8; *format = GL_BGR; *type = GL_UNSIGNED_BYTE; @@ -1762,7 +1762,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ break; case WINED3DFMT_R8G8B8A8_SNORM: - if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; + if (GL_SUPPORT(NV_TEXTURE_SHADER)) break; *convert = CONVERT_Q8W8V8U8; *format = GL_BGRA; *type = GL_UNSIGNED_BYTE; @@ -1770,7 +1770,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ break; case WINED3DFMT_R16G16_SNORM: - if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; + if (GL_SUPPORT(NV_TEXTURE_SHADER)) break; *convert = CONVERT_V16U16; *format = GL_BGR; *type = GL_UNSIGNED_SHORT;

1 0

Henri Verbeet : wined3d: Round rows up to whole blocks for compressed surface blits in BltFast().
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 9d71a5f1e09420bc91d1e5d167f3e5bc0fa97d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d71a5f1e09420bc91d1e5d16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 10 09:44:04 2009 +0200 wined3d: Round rows up to whole blocks for compressed surface blits in BltFast(). --- dlls/wined3d/surface_base.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index d487f80..50faf9a 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1656,6 +1656,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst UINT block_width; UINT block_height; UINT block_byte_size; + UINT row_block_count; TRACE("Fourcc -> Fourcc copy\n"); if (trans) @@ -1692,9 +1693,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst block_byte_size = This->resource.format_desc->byte_count; } + row_block_count = (w + block_width - 1) / block_width; for (y = 0; y < h; y += block_height) { - memcpy(dbuf, sbuf, (w / block_width) * block_byte_size); + memcpy(dbuf, sbuf, row_block_count * block_byte_size); dbuf += dlock.Pitch; sbuf += slock.Pitch; }

1 0

Henri Verbeet : wined3d: Store compression information about compressed formats.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 61fd875bb40cb039dee55eb3cefd5189bd7e1346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fd875bb40cb039dee55eb3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 10 09:44:04 2009 +0200 wined3d: Store compression information about compressed formats. --- dlls/wined3d/utils.c | 70 +++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 5 +++ 2 files changed, 64 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 93c65fb..55c806b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -134,6 +134,24 @@ static const struct StaticPixelFormatDesc formats[] = {WINED3DFMT_NVHS, 0x0, 0x0, 0x0, 0x0, 2, 0, 0, TRUE }, }; +struct wined3d_format_compression_info +{ + WINED3DFORMAT format; + UINT block_width; + UINT block_height; + UINT block_byte_count; +}; + +static const struct wined3d_format_compression_info format_compression_info[] = +{ + {WINED3DFMT_DXT1, 4, 4, 8}, + {WINED3DFMT_DXT2, 4, 4, 16}, + {WINED3DFMT_DXT3, 4, 4, 16}, + {WINED3DFMT_DXT4, 4, 4, 16}, + {WINED3DFMT_DXT5, 4, 4, 16}, + {WINED3DFMT_ATI2N, 4, 4, 16}, +}; + struct wined3d_format_vertex_info { WINED3DFORMAT format; @@ -511,6 +529,32 @@ static BOOL init_format_base_info(WineD3D_GL_Info *gl_info) return TRUE; } +static BOOL init_format_compression_info(WineD3D_GL_Info *gl_info) +{ + unsigned int i; + + for (i = 0; i < (sizeof(format_compression_info) / sizeof(*format_compression_info)); ++i) + { + struct GlPixelFormatDesc *format_desc; + int fmt_idx = getFmtIdx(format_compression_info[i].format); + + if (fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(format_compression_info[i].format), format_compression_info[i].format); + return FALSE; + } + + format_desc = &gl_info->gl_formats[fmt_idx]; + format_desc->block_width = format_compression_info[i].block_width; + format_desc->block_height = format_compression_info[i].block_height; + format_desc->block_byte_count = format_compression_info[i].block_byte_count; + format_desc->Flags |= WINED3DFMT_FLAG_COMPRESSED; + } + + return TRUE; +} + #define GLINFO_LOCATION (*gl_info) static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_format, GLenum format, GLenum type) @@ -772,29 +816,33 @@ static BOOL init_format_vertex_info(WineD3D_GL_Info *gl_info) BOOL initPixelFormatsNoGL(WineD3D_GL_Info *gl_info) { - return init_format_base_info(gl_info); -} - -BOOL initPixelFormats(WineD3D_GL_Info *gl_info) -{ if (!init_format_base_info(gl_info)) return FALSE; - if (!init_format_texture_info(gl_info)) + if (!init_format_compression_info(gl_info)) { HeapFree(GetProcessHeap(), 0, gl_info->gl_formats); return FALSE; } - if (!init_format_vertex_info(gl_info)) - { - HeapFree(GetProcessHeap(), 0, gl_info->gl_formats); - return FALSE; - } + return TRUE; +} + +BOOL initPixelFormats(WineD3D_GL_Info *gl_info) +{ + if (!init_format_base_info(gl_info)) return FALSE; + + if (!init_format_compression_info(gl_info)) goto fail; + if (!init_format_texture_info(gl_info)) goto fail; + if (!init_format_vertex_info(gl_info)) goto fail; apply_format_fixups(gl_info); init_format_fbo_compat_info(gl_info); return TRUE; + +fail: + HeapFree(GetProcessHeap(), 0, gl_info->gl_formats); + return FALSE; } #undef GLINFO_LOCATION diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index adf6235..9cb3b76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2750,6 +2750,7 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth); #define WINED3DFMT_FLAG_RENDERTARGET 0x10 #define WINED3DFMT_FLAG_FOURCC 0x20 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x40 +#define WINED3DFMT_FLAG_COMPRESSED 0x80 struct GlPixelFormatDesc { @@ -2762,6 +2763,10 @@ struct GlPixelFormatDesc WORD depth_size; WORD stencil_size; + UINT block_width; + UINT block_height; + UINT block_byte_count; + enum wined3d_ffp_emit_idx emit_idx; GLint component_count; GLenum gl_vtx_type;

1 0