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

Piotr Caban : jscript: Added Date_getDate and Date_getUTCDate implementation.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 190ed2ef99bc5a20afc8a193d5b37588062bf01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=190ed2ef99bc5a20afc8a193d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jun 9 14:04:09 2009 +0200 jscript: Added Date_getDate and Date_getUTCDate implementation. --- dlls/jscript/date.c | 56 +++++++++++++++++++++++++++++++++++++++++--- dlls/jscript/tests/api.js | 4 +++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d018a10..84d4170 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -182,6 +182,30 @@ static inline DOUBLE month_from_time(DOUBLE time) return 11; } +/* ECMA-262 3th Edition 15.9.1.5 */ +static inline DOUBLE date_from_time(DOUBLE time) +{ + int dwy = day_within_year(time); + int ily = in_leap_year(time); + int mft = month_from_time(time); + + if(isnan(time)) + return ret_nan(); + + if(mft==0) return dwy+1; + if(mft==1) return dwy-30; + if(mft==2) return dwy-58-ily; + if(mft==3) return dwy-89-ily; + if(mft==4) return dwy-119-ily; + if(mft==5) return dwy-150-ily; + if(mft==6) return dwy-180-ily; + if(mft==7) return dwy-211-ily; + if(mft==8) return dwy-242-ily; + if(mft==9) return dwy-272-ily; + if(mft==10) return dwy-303-ily; + return dwy-333-ily; +} + /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { @@ -363,18 +387,42 @@ static HRESULT Date_getUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } +/* ECMA-262 3th Edition 15.9.1.5 */ static HRESULT Date_getDate(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, date_from_time(time)); + } + return S_OK; } +/* ECMA-262 3th Edition 15.9.1.5 */ static HRESULT Date_getUTCDate(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, date_from_time(date->time)); + } + return S_OK; } static HRESULT Date_getDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1a10863..8616cc0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -948,16 +948,20 @@ ok(isNaN(date.setTime(NaN)), "date.setTime(NaN) is not NaN"); ok(date.setTime(0) === date.getTime(), "date.setTime(0) !== date.getTime()"); ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); ok(date.getUTCMonth() === 0, "date.getUTCMonth() = " + date.getUTCMonth()); +ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); 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()); date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000); 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()); 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(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Piotr Caban : jscript: Added Date_getDay and Date_getUTCDay implementation.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 28e033e359ce5a509bf148c45b7db2c8b85e9120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e033e359ce5a509bf148c45… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jun 9 14:05:23 2009 +0200 jscript: Added Date_getDay and Date_getUTCDay implementation. --- dlls/jscript/date.c | 41 +++++++++++++++++++++++++++++++++++++---- dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 84d4170..8056cc2 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -206,6 +206,15 @@ static inline DOUBLE date_from_time(DOUBLE time) return dwy-333-ily; } +/* ECMA-262 3th Edition 15.9.1.6 */ +static inline DOUBLE week_day(DOUBLE time) +{ + if(isnan(time)) + return ret_nan(); + + return (int)(day(time)+4) % 7; +} + /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { @@ -425,18 +434,42 @@ static HRESULT Date_getUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA return S_OK; } +/* ECMA-262 3th Edition 15.9.1.6 */ static HRESULT Date_getDay(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, week_day(time)); + } + return S_OK; } +/* ECMA-262 3th Edition 15.9.1.6 */ static HRESULT Date_getUTCDay(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, week_day(date->time)); + } + return S_OK; } static HRESULT Date_getHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 8616cc0..2238a94 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -949,19 +949,23 @@ ok(date.setTime(0) === date.getTime(), "date.setTime(0) !== date.getTime()"); ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); ok(date.getUTCMonth() === 0, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); +ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay()); 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.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()); 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(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Nikolay Sivov : comctl32/listview: Implement callback functionality for item indentation.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: abe5dee0bb7f3854a6cb2519faf75facdd08fe6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe5dee0bb7f3854a6cb2519f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 10 03:23:17 2009 +0400 comctl32/listview: Implement callback functionality for item indentation. --- dlls/comctl32/listview.c | 21 +++++++++++++++++++-- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index df07384..55519dd 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6,6 +6,7 @@ * Copyright 2000 Jason Mawdsley * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun + * Copyright 2009 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -5746,6 +5747,14 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, dispInfo.item.iImage = I_IMAGECALLBACK; } + /* Only items support indentation */ + if ((lpLVItem->mask & LVIF_INDENT) && lpItem->iIndent == I_INDENTCALLBACK && + (isubitem == 0)) + { + dispInfo.item.mask |= LVIF_INDENT; + dispInfo.item.iIndent = I_INDENTCALLBACK; + } + /* Apps depend on calling back for text if it is NULL or LPSTR_TEXTCALLBACKW */ if ((lpLVItem->mask & LVIF_TEXT) && !(lpLVItem->mask & LVIF_NORECOMPUTE) && !is_textW(pItemHdr->pszText)) @@ -5837,8 +5846,16 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } /* and last, but not least, the indent field */ - if (lpLVItem->mask & LVIF_INDENT) - lpLVItem->iIndent = lpItem->iIndent; + if (dispInfo.item.mask & LVIF_INDENT) + { + lpLVItem->iIndent = dispInfo.item.iIndent; + if ((dispInfo.item.mask & LVIF_DI_SETITEM) && lpItem->iIndent == I_INDENTCALLBACK) + lpItem->iIndent = dispInfo.item.iIndent; + } + else if (lpLVItem->mask & LVIF_INDENT) + { + lpLVItem->iIndent = lpItem->iIndent; + } return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e7cbe03..2dce945 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3304,7 +3304,7 @@ static void test_indentation(void) expect(TRUE, r); ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq, - "get indent dispinfo", TRUE); + "get indent dispinfo", FALSE); DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Test for indentation callback.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 5e5a58b138d501ffac962aedb811e8bc46c7b387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5a58b138d501ffac962aedb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jun 9 23:16:21 2009 +0400 comctl32/listview: Test for indentation callback. --- dlls/comctl32/tests/listview.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ca72fa5..e7cbe03 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3280,6 +3280,35 @@ static void test_notifyformat(void) DestroyWindow(hwndparentW); } +static void test_indentation(void) +{ + HWND hwnd; + LVITEMA item; + DWORD r; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_INDENT; + item.iItem = 0; + item.iIndent = I_INDENTCALLBACK; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + expect(0, r); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.iItem = 0; + item.mask = LVIF_INDENT; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + + ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq, + "get indent dispinfo", TRUE); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3330,6 +3359,7 @@ START_TEST(listview) test_columnscreation(); test_editbox(); test_notifyformat(); + test_indentation(); DestroyWindow(hwndparent); }

1 0

Vladimir Pankratov : advpack: Add stub for ExtractFilesW.
by Alexandre Julliard June 10, 2009

June 10, 2009

Module: wine Branch: master Commit: 49cc1fa0ce176817e2267860de94ded919b78621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49cc1fa0ce176817e2267860d… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jun 9 22:15:12 2009 +0500 advpack: Add stub for ExtractFilesW. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/files.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 2ba1057..665d1e1 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -17,7 +17,7 @@ @ stdcall ExecuteCabW(ptr ptr ptr) @ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA @ stdcall ExtractFilesA(str str long ptr ptr long) -# stdcall ExtractFilesW(wstr wstr long ptr ptr long) +@ stdcall ExtractFilesW(wstr wstr long ptr ptr long) @ stdcall ExtractFiles(str str long ptr ptr long) ExtractFilesA @ stdcall FileSaveMarkNotExistA(str str str) @ stdcall FileSaveMarkNotExistW(wstr wstr wstr) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 63f4080..216b863 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -749,6 +749,44 @@ done: } /*********************************************************************** + * ExtractFilesW (ADVPACK.@) + * + * Extracts the specified files from a cab archive into + * a destination directory. + * + * PARAMS + * CabName [I] Filename of the cab archive. + * ExpandDir [I] Destination directory for the extracted files. + * Flags [I] Reserved. + * FileList [I] Optional list of files to extract. See NOTES. + * LReserved [I] Reserved. Must be NULL. + * Reserved [I] Reserved. Must be 0. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * NOTES + * FileList is a colon-separated list of filenames. If FileList is + * non-NULL, only the files in the list will be extracted from the + * cab file, otherwise all files will be extracted. Any number of + * spaces, tabs, or colons can be before or after the list, but + * the list itself must only be separated by colons. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI ExtractFilesW(LPCWSTR CabName, LPCWSTR ExpandDir, DWORD Flags, + LPCWSTR FileList, LPVOID LReserved, DWORD Reserved) +{ + + FIXME("(%s, %s, %d, %s, %p, %d) stub!\n", debugstr_w(CabName), debugstr_w(ExpandDir), + Flags, debugstr_w(FileList), LReserved, Reserved); + + return E_FAIL; +} + +/*********************************************************************** * FileSaveMarkNotExistA (ADVPACK.@) * * See FileSaveMarkNotExistW.

1 0

Paul Vriens : riched32/tests: Fix some test failures on Win9x/WinME/NT4.
by Alexandre Julliard June 9, 2009

June 9, 2009

Module: wine Branch: master Commit: 8e0849f7a64eeb2348b9a75461386f73f2ad87b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0849f7a64eeb2348b9a7546… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 9 16:08:29 2009 +0200 riched32/tests: Fix some test failures on Win9x/WinME/NT4. --- dlls/riched32/tests/editor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 269a425..cb5db77 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -650,6 +650,7 @@ static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, ft.chrg.cpMin = f->start; ft.chrg.cpMax = f->end; ft.lpstrText = f->needle; + ft.chrgText.cpMax = 0xdeadbeef; findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &ft); ok(findloc == f->expected_loc, "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", @@ -659,7 +660,8 @@ static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMin, f->expected_loc); expected_end_loc = ((f->expected_loc == -1) ? -1 : f->expected_loc + strlen(f->needle)); - ok(ft.chrgText.cpMax == expected_end_loc, + ok(ft.chrgText.cpMax == expected_end_loc || + broken(ft.chrgText.cpMin == -1 && ft.chrgText.cpMax == 0xdeadbeef), /* Win9x, WinME and NT4 */ "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n", name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax, expected_end_loc); }

1 0

Huw Davies : oleaut32: TLibAttr. lcid is read from the second lcid field in the header. Confirmed by manually editing a tlb file.
by Alexandre Julliard June 9, 2009

June 9, 2009

Module: wine Branch: master Commit: 9da0b352f640f33da4ea8be36b5ddab48abef790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da0b352f640f33da4ea8be36… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 9 14:59:52 2009 +0100 oleaut32: TLibAttr.lcid is read from the second lcid field in the header. Confirmed by manually editing a tlb file. --- dlls/oleaut32/typelib.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5ddbe1b..10f5e23 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2872,13 +2872,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) /* TLIBATTR fields */ MSFT_ReadGuid(&pTypeLibImpl->LibAttr.guid, tlbHeader.posguid, &cx); - /* pTypeLibImpl->LibAttr.lcid = tlbHeader.lcid;*/ - /* Windows seems to have zero here, is this correct? */ - if(SUBLANGID(tlbHeader.lcid) == SUBLANG_NEUTRAL) - pTypeLibImpl->LibAttr.lcid = MAKELCID(MAKELANGID(PRIMARYLANGID(tlbHeader.lcid),0),0); - else - pTypeLibImpl->LibAttr.lcid = 0; - + pTypeLibImpl->LibAttr.lcid = tlbHeader.lcid2; pTypeLibImpl->LibAttr.syskind = tlbHeader.varflags & 0x0f; /* check the mask */ pTypeLibImpl->LibAttr.wMajorVerNum = LOWORD(tlbHeader.version); pTypeLibImpl->LibAttr.wMinorVerNum = HIWORD(tlbHeader.version);

1 0

Henri Verbeet : wined3d: Add some FIXMEs about blitting with unsupported fixups.
by Alexandre Julliard June 9, 2009

June 9, 2009

Module: wine Branch: master Commit: 910455e435dfca026cf2571edb34100132fc2d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=910455e435dfca026cf2571ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 9 10:47:20 2009 +0200 wined3d: Add some FIXMEs about blitting with unsupported fixups. --- dlls/wined3d/surface.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4db01cd..81c93e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3540,6 +3540,20 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const rect.y1 += This->currentDesc.Height - h; rect.y2 += This->currentDesc.Height - h; } + if (!is_identity_fixup(This->resource.format_desc->color_fixup)) + { + FIXME("Destination format %s has a fixup, this is not supported.\n", + debug_d3dformat(This->resource.format_desc->format)); + dump_color_fixup_desc(This->resource.format_desc->color_fixup); + } + + if (!myDevice->blitter->color_fixup_supported(Src->resource.format_desc->color_fixup)) + { + FIXME("Source format %s has an unsupported fixup:\n", + debug_d3dformat(Src->resource.format_desc->format)); + dump_color_fixup_desc(Src->resource.format_desc->color_fixup); + } + myDevice->blitter->set_shader((IWineD3DDevice *) myDevice, Src->resource.format_desc, Src->glDescription.target, Src->pow2Width, Src->pow2Height);

1 0

Henri Verbeet : wined3d: Don' t modify the internal format in d3dfmt_get_conv().
by Alexandre Julliard June 9, 2009

June 9, 2009

Module: wine Branch: master Commit: 08d95233e35d55966c0e2e23aeed015efb4b5af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d95233e35d55966c0e2e23a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 9 10:47:20 2009 +0200 wined3d: Don't modify the internal format in d3dfmt_get_conv(). For most conversions the internal format is irrelevant. Color key conversions are an exception, because they need to ensure an alpha channel is present. --- dlls/wined3d/surface.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2f5554f..4db01cd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1670,7 +1670,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } else if(!GL_SUPPORT(EXT_PALETTED_TEXTURE) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { *format = GL_ALPHA; - *internal = GL_RGBA; *type = GL_UNSIGNED_BYTE; *target_bpp = 1; } @@ -1729,7 +1728,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; *convert = CONVERT_V8U8; *format = GL_BGR; - *internal = GL_RGB8; *type = GL_UNSIGNED_BYTE; *target_bpp = 3; break; @@ -1743,7 +1741,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ /* Load it into unsigned R5G6B5, swap L and V channels, and revert that in the shader */ *target_bpp = 2; *format = GL_RGB; - *internal = GL_RGB5; *type = GL_UNSIGNED_SHORT_5_6_5; } break; @@ -1760,7 +1757,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ */ } else { *format = GL_BGRA; - *internal = GL_RGB8; *type = GL_UNSIGNED_INT_8_8_8_8_REV; } break; @@ -1769,7 +1765,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; *convert = CONVERT_Q8W8V8U8; *format = GL_BGRA; - *internal = GL_RGBA8; *type = GL_UNSIGNED_BYTE; *target_bpp = 4; break; @@ -1778,7 +1773,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; *convert = CONVERT_V16U16; *format = GL_BGR; - *internal = GL_RGB16_EXT; *type = GL_UNSIGNED_SHORT; *target_bpp = 6; break; @@ -1790,7 +1784,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ */ *convert = CONVERT_A4L4; *format = GL_LUMINANCE_ALPHA; - *internal = GL_LUMINANCE4_ALPHA4; *type = GL_UNSIGNED_BYTE; *target_bpp = 2; break; @@ -1798,7 +1791,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R16G16_UNORM: *convert = CONVERT_G16R16; *format = GL_RGB; - *internal = GL_RGB16_EXT; *type = GL_UNSIGNED_SHORT; *target_bpp = 6; break; @@ -1806,7 +1798,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R16G16_FLOAT: *convert = CONVERT_R16G16F; *format = GL_RGB; - *internal = GL_RGB16F_ARB; *type = GL_HALF_FLOAT_ARB; *target_bpp = 6; break; @@ -1814,7 +1805,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R32G32_FLOAT: *convert = CONVERT_R32G32F; *format = GL_RGB; - *internal = GL_RGB32F_ARB; *type = GL_FLOAT; *target_bpp = 12; break;

1 0

Henri Verbeet : wined3d: Get rid of the silly pointers in WINED3DVOLUME_DESC.
by Alexandre Julliard June 9, 2009

June 9, 2009

Module: wine Branch: master Commit: 621da64245fafac6f192be464a230bde7b392d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=621da64245fafac6f192be464… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 9 10:47:20 2009 +0200 wined3d: Get rid of the silly pointers in WINED3DVOLUME_DESC. --- dlls/d3d8/volume.c | 22 +++++++++++----------- dlls/d3d8/volumetexture.c | 23 +++++++++++------------ dlls/d3d9/device.c | 9 +-------- dlls/d3d9/volume.c | 23 ++++++++++------------- dlls/d3d9/volumetexture.c | 23 ++++++++++------------- dlls/wined3d/volume.c | 17 +++++++++-------- include/wine/wined3d.idl | 16 ++++++++-------- 7 files changed, 60 insertions(+), 73 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 474aad8..4a7066c 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -154,21 +154,21 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ - wined3ddesc.Format = (WINED3DFORMAT *)&pDesc->Format; - wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; - wined3ddesc.Usage = &pDesc->Usage; - wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &pDesc->Size; - wined3ddesc.Width = &pDesc->Width; - wined3ddesc.Height = &pDesc->Height; - wined3ddesc.Depth = &pDesc->Depth; - EnterCriticalSection(&d3d8_cs); hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); LeaveCriticalSection(&d3d8_cs); - if (SUCCEEDED(hr)) pDesc->Format = d3dformat_from_wined3dformat(pDesc->Format); + if (SUCCEEDED(hr)) + { + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Size = wined3ddesc.Size; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; + } return hr; } diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 098827a..25aa93d 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -197,26 +197,25 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLevelCount(LPDIRECT3DVOLUMETE static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DVOLUME_DESC* pDesc) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; WINED3DVOLUME_DESC wined3ddesc; - UINT tmpInt = -1; HRESULT hr; TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d8 structures differ, pass in ptrs to where data needs to go */ - wined3ddesc.Format = (WINED3DFORMAT *)&pDesc->Format; - wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; - wined3ddesc.Usage = &pDesc->Usage; - wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &tmpInt; - wined3ddesc.Width = &pDesc->Width; - wined3ddesc.Height = &pDesc->Height; - wined3ddesc.Depth = &pDesc->Depth; - EnterCriticalSection(&d3d8_cs); hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, Level, &wined3ddesc); LeaveCriticalSection(&d3d8_cs); - if (SUCCEEDED(hr)) pDesc->Format = d3dformat_from_wined3dformat(pDesc->Format); + if (SUCCEEDED(hr)) + { + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Size = wined3ddesc.Size; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; + } return hr; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8f95ad1..c711087 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -454,15 +454,8 @@ static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data break; case D3DRTYPE_VOLUME: - volume_desc.Format = &dummy_format; - volume_desc.Type = &type; - volume_desc.Usage = &dummy_dword; - volume_desc.Pool = &pool; - volume_desc.Size = &dummy_dword; - volume_desc.Width = &dummy_dword; - volume_desc.Height = &dummy_dword; - volume_desc.Depth = &dummy_dword; IWineD3DVolume_GetDesc((IWineD3DVolume *) resource, &volume_desc); + pool = volume_desc.Pool; break; case D3DRTYPE_INDEXBUFFER: diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 93b06b5..7c49a9a 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -167,29 +167,26 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(LPDIRECT3DVOLUME9 iface, D3DVOLUME_DESC* pDesc) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; WINED3DVOLUME_DESC wined3ddesc; - UINT tmpInt = -1; - WINED3DFORMAT format; HRESULT hr; TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ - wined3ddesc.Format = &format; - wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; - wined3ddesc.Usage = &pDesc->Usage; - wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &tmpInt; - wined3ddesc.Width = &pDesc->Width; - wined3ddesc.Height = &pDesc->Height; - wined3ddesc.Depth = &pDesc->Depth; - EnterCriticalSection(&d3d9_cs); hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); LeaveCriticalSection(&d3d9_cs); - if (SUCCEEDED(hr)) pDesc->Format = d3dformat_from_wined3dformat(format); + if (SUCCEEDED(hr)) + { + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; + } return hr; } diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 07b686f..efeb919 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -281,29 +281,26 @@ static void WINAPI IDirect3DVolumeTexture9Impl_GenerateMipSubLevels(LPDIRECT3DVO static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, D3DVOLUME_DESC* pDesc) { IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; WINED3DVOLUME_DESC wined3ddesc; - UINT tmpInt = -1; - WINED3DFORMAT format; HRESULT hr; TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ - wined3ddesc.Format = &format; - wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; - wined3ddesc.Usage = &pDesc->Usage; - wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &tmpInt; - wined3ddesc.Width = &pDesc->Width; - wined3ddesc.Height = &pDesc->Height; - wined3ddesc.Depth = &pDesc->Depth; - EnterCriticalSection(&d3d9_cs); hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, Level, &wined3ddesc); LeaveCriticalSection(&d3d9_cs); - if (SUCCEEDED(hr)) pDesc->Format = d3dformat_from_wined3dformat(format); + if (SUCCEEDED(hr)) + { + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; + } return hr; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 64d871b..829607d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -196,14 +196,15 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DV IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); - *(pDesc->Format) = This->resource.format_desc->format; - *(pDesc->Type) = This->resource.resourceType; - *(pDesc->Usage) = This->resource.usage; - *(pDesc->Pool) = This->resource.pool; - *(pDesc->Size) = This->resource.size; /* dx8 only */ - *(pDesc->Width) = This->currentDesc.Width; - *(pDesc->Height) = This->currentDesc.Height; - *(pDesc->Depth) = This->currentDesc.Depth; + pDesc->Format = This->resource.format_desc->format; + pDesc->Type = This->resource.resourceType; + pDesc->Usage = This->resource.usage; + pDesc->Pool = This->resource.pool; + pDesc->Size = This->resource.size; /* dx8 only */ + pDesc->Width = This->currentDesc.Width; + pDesc->Height = This->currentDesc.Height; + pDesc->Depth = This->currentDesc.Depth; + return WINED3D_OK; } diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 51d886c..4a7dcb0 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1737,14 +1737,14 @@ typedef struct _WINED3DSURFACE_DESC typedef struct _WINED3DVOLUME_DESC { - WINED3DFORMAT *Format; - WINED3DRESOURCETYPE *Type; - DWORD *Usage; - WINED3DPOOL *Pool; - UINT *Size; - UINT *Width; - UINT *Height; - UINT *Depth; + WINED3DFORMAT Format; + WINED3DRESOURCETYPE Type; + DWORD Usage; + WINED3DPOOL Pool; + UINT Size; + UINT Width; + UINT Height; + UINT Depth; } WINED3DVOLUME_DESC; typedef struct _WINED3DCLIPSTATUS

1 0