wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Nikolay Sivov : comctl32/listview: Test for indentation callback.
by Alexandre Julliard 10 Jun '09

10 Jun '09

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

Andrew Talbot : comdlg32: Constify some variables.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 764974e59d4785e17ab4ffd91c9e3bda248e087e URL: http://source.winehq.org/git/wine.git/?a=commit;h=764974e59d4785e17ab4ffd91… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jun 9 22:41:27 2009 +0100 comdlg32: Constify some variables. --- dlls/comdlg32/filedlg.c | 2 +- dlls/comdlg32/printdlg.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 10fccc2..b820624 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3297,7 +3297,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) * Although shell32 is already linked the behaviour of exported StrRetToStrN * is dependent on whether emulated OS is unicode or not. */ -static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl) +static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) { switch (src->uType) { diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 6726c6a..21366fd 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2364,7 +2364,7 @@ static inline BOOL is_metric(const pagesetup_data *data) return pagesetup_get_flags(data) & PSD_INHUNDREDTHSOFMILLIMETERS; } -static inline LONG tenths_mm_to_size(pagesetup_data *data, LONG size) +static inline LONG tenths_mm_to_size(const pagesetup_data *data, LONG size) { if (is_metric(data)) return 10 * size; @@ -2372,7 +2372,7 @@ static inline LONG tenths_mm_to_size(pagesetup_data *data, LONG size) return 10 * size * 100 / 254; } -static inline LONG thousandths_inch_to_size(pagesetup_data *data, LONG size) +static inline LONG thousandths_inch_to_size(const pagesetup_data *data, LONG size) { if (is_metric(data)) return size * 254 / 100; @@ -2537,7 +2537,7 @@ typedef enum } devnames_name; -static inline WORD get_devname_offset(DEVNAMES *dn, devnames_name which) +static inline WORD get_devname_offset(const DEVNAMES *dn, devnames_name which) { switch(which) { @@ -3010,7 +3010,7 @@ static void update_margin_edits(HWND hDlg, const pagesetup_data *data, WORD id) } } -static void margin_edit_notification(HWND hDlg, pagesetup_data *data, WORD msg, WORD id) +static void margin_edit_notification(HWND hDlg, const pagesetup_data *data, WORD msg, WORD id) { switch (msg) {

1 0

André Hentschel : cryptui: Improve German translation.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 7db8ecb61101c747a92bd720030e78bdf208bd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db8ecb61101c747a92bd7200… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 9 20:21:02 2009 +0200 cryptui: Improve German translation. --- dlls/cryptui/cryptui_De.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/cryptui_De.rc b/dlls/cryptui/cryptui_De.rc index 3049f42..e9c8182 100644 --- a/dlls/cryptui/cryptui_De.rc +++ b/dlls/cryptui/cryptui_De.rc @@ -198,14 +198,14 @@ STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Anzeigen:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14, + COMBOBOX IDC_DETAIL_SELECT, 43,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 - PUSHBUTTON "&Eigenschaften bearbeiten...", IDC_EDITPROPERTIES,83,216,90,14 + PUSHBUTTON "&Eigenschaften bearbeiten...", IDC_EDITPROPERTIES,75,216,98,14 PUSHBUTTON "In &Datei kopieren...", IDC_EXPORT,177,216,70,14 END @@ -230,8 +230,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_USERNOTICE,"RichEdit20W", WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 - PUSHBUTTON "Schließen", IDOK,103,216,70,14 - PUSHBUTTON "weitere &Informationen", IDC_CPS,177,216,70,14 + PUSHBUTTON "Schließen", IDOK,95,216,70,14 + PUSHBUTTON "weitere &Informationen", IDC_CPS,171,216,76,14 END IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -239,7 +239,7 @@ CAPTION "Allgemein" STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Angezeigter &Name:", -1, 6,14,60,14 + LTEXT "&Name:", -1, 6,14,60,14 EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP LTEXT "&Beschreibung:", -1, 6,32,60,14 EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL @@ -253,7 +253,7 @@ BEGIN CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 24,100,220,90 - PUSHBUTTON "&Zweck hinzufügen...", IDC_ADD_PURPOSE,184,194,60,14 + PUSHBUTTON "&Zweck hinzufügen...", IDC_ADD_PURPOSE,173,194,71,14 END IDD_ADD_CERT_PURPOSE DIALOG DISCARDABLE 0,0,200,68 @@ -300,7 +300,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Dateiname:", -1, 21,1,195,10 EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP - PUSHBUTTON "D&rchsuchen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + PUSHBUTTON "D&urchsuchen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 LTEXT "Hinweis: Es können mehrere Zertifikate in einer Datei folgender Formate gespeichert werden:", -1, 21,26,265,16 LTEXT "Syntaxstandard kryptografischer Meldungen /PKCS #7 Messages (.p7b)",

1 0

Vincent Povirk : gdiplus: Stub GdipSetPathGradientPresetBlend.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: edce2c124af85b31f2accfca89e5236807ec6168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edce2c124af85b31f2accfca8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 9 12:11:38 2009 -0500 gdiplus: Stub GdipSetPathGradientPresetBlend. --- dlls/gdiplus/brush.c | 7 +++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 92052f7..824ece0 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1315,6 +1315,13 @@ GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient *brush, GDIPCONST RE return NotImplemented; } +GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient *brush, + GDIPCONST ARGB *blend, GDIPCONST REAL *pos, INT count) +{ + FIXME("(%p,%p,%p,%i): stub\n", brush, blend, pos, count); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, ARGB argb) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c658e00..72fdcb6 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -556,7 +556,7 @@ @ stdcall GdipSetPathGradientGammaCorrection(ptr long) @ stub GdipSetPathGradientLinearBlend @ stub GdipSetPathGradientPath -@ stub GdipSetPathGradientPresetBlend +@ stdcall GdipSetPathGradientPresetBlend(ptr ptr ptr long) @ stdcall GdipSetPathGradientSigmaBlend(ptr long long) @ stdcall GdipSetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipSetPathGradientTransform

1 0

Vladimir Pankratov : advpack: Add stub for ExtractFilesW.
by Alexandre Julliard 10 Jun '09

10 Jun '09

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 09 Jun '09

09 Jun '09

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 09 Jun '09

09 Jun '09

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

Huw Davies : widl: Fix typelib lcid fields to match those produced by midl.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 7857219ac1e9c99d6fe28cb7ce5b2b9b7451d547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7857219ac1e9c99d6fe28cb7c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 9 14:58:28 2009 +0100 widl: Fix typelib lcid fields to match those produced by midl. --- tools/widl/write_msft.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index a22b8b3..7a709bc 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -141,7 +141,7 @@ static void ctl2_init_header( typelib->typelib_header.magic1 = 0x5446534d; typelib->typelib_header.magic2 = 0x00010002; typelib->typelib_header.posguid = -1; - typelib->typelib_header.lcid = 0x0409; /* or do we use the current one? */ + typelib->typelib_header.lcid = 0x0409; typelib->typelib_header.lcid2 = 0x0; typelib->typelib_header.varflags = 0x40; typelib->typelib_header.version = 0; @@ -2362,7 +2362,11 @@ static void set_help_string_context(msft_typelib_t *typelib) static void set_lcid(msft_typelib_t *typelib) { const expr_t *lcid_expr = get_attrp( typelib->typelib->attrs, ATTR_LIBLCID ); - typelib->typelib_header.lcid2 = lcid_expr ? lcid_expr->cval : 0x0; + if(lcid_expr) + { + typelib->typelib_header.lcid = lcid_expr->cval; + typelib->typelib_header.lcid2 = lcid_expr->cval; + } } static void set_lib_flags(msft_typelib_t *typelib)

1 0

Alexandre Julliard : ole32: Get rid of line feeds and tabs in traces.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: c98ce23fd292a7bd3ed9b0ef0f562fe126b9f75d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98ce23fd292a7bd3ed9b0ef0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 13:00:30 2009 +0200 ole32: Get rid of line feeds and tabs in traces. --- dlls/ole32/clipboard.c | 3 +-- dlls/ole32/comcat.c | 26 +++++++++++++------------- dlls/ole32/compobj.c | 6 +++--- dlls/ole32/errorinfo.c | 2 +- dlls/ole32/ftmarshal.c | 2 +- dlls/ole32/marshal.c | 4 ++-- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 1e72ec2..81231aa 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -997,8 +997,7 @@ static HRESULT get_priv_data(ole_priv_data **data) { char buf[100]; GetClipboardFormatNameA(cf, buf, sizeof(buf)); - TRACE("\tcf %04x %s\n", cf, buf); - ; + TRACE("cf %04x %s\n", cf, buf); } TRACE("count %d\n", count); size += count * sizeof(ret->entries[0]); diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index cee1ebb..b8060bd 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -278,7 +278,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_QueryInterface( LPVOID *ppvObj) { ComCatMgrImpl *This = (ComCatMgrImpl *)iface; - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid)); if (ppvObj == NULL) return E_POINTER; @@ -515,7 +515,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_GetCategoryDesc( HKEY key; HRESULT res; - TRACE("\n\tCATID:\t%s\n\tLCID:\t%X\n",debugstr_guid(rcatid), lcid); + TRACE("CATID: %s LCID: %x\n",debugstr_guid(rcatid), lcid); if (rcatid == NULL || ppszDesc == NULL) return E_INVALIDARG; @@ -596,12 +596,12 @@ static HRESULT WINAPI COMCAT_ICatInformation_IsClassOfCategories( if (WINE_TRACE_ON(ole)) { ULONG count; - TRACE("\n\tCLSID:\t%s\n\tImplemented %u\n",debugstr_guid(rclsid),cImplemented); + TRACE("CLSID: %s Implemented %u\n",debugstr_guid(rclsid),cImplemented); for (count = 0; count < cImplemented; ++count) - TRACE("\t\t%s\n",debugstr_guid(&rgcatidImpl[count])); - TRACE("\tRequired %u\n",cRequired); + TRACE(" %s\n",debugstr_guid(&rgcatidImpl[count])); + TRACE("Required %u\n",cRequired); for (count = 0; count < cRequired; ++count) - TRACE("\t\t%s\n",debugstr_guid(&rgcatidReq[count])); + TRACE(" %s\n",debugstr_guid(&rgcatidReq[count])); } if ((cImplemented && rgcatidImpl == NULL) || @@ -637,7 +637,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumImplCategoriesOfClass( 'n', 't', 'e', 'd', ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', 'i', 'e', 's', 0 }; - TRACE("\n\tCLSID:\t%s\n",debugstr_guid(rclsid)); + TRACE("%s\n",debugstr_guid(rclsid)); if (rclsid == NULL || ppenumCATID == NULL) return E_POINTER; @@ -659,7 +659,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumReqCategoriesOfClass( 'd', ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', 'i', 'e', 's', 0 }; - TRACE("\n\tCLSID:\t%s\n",debugstr_guid(rclsid)); + TRACE("%s\n",debugstr_guid(rclsid)); if (rclsid == NULL || ppenumCATID == NULL) return E_POINTER; @@ -719,7 +719,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface( REFIID riid, LPVOID *ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid)); if (ppvObj == NULL) return E_POINTER; @@ -760,7 +760,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_CreateInstance( LPVOID *ppvObj) { HRESULT res; - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid)); if (ppvObj == NULL) return E_POINTER; @@ -834,7 +834,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_QueryInterface( REFIID riid, LPVOID *ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid)); if (ppvObj == NULL) return E_POINTER; @@ -1017,7 +1017,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_QueryInterface( REFIID riid, LPVOID *ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid)); if (ppvObj == NULL) return E_POINTER; @@ -1203,7 +1203,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_QueryInterface( REFIID riid, LPVOID *ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("%s\n",debugstr_guid(riid)); if (ppvObj == NULL) return E_POINTER; diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 154c18d..586a930 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2265,7 +2265,7 @@ HRESULT WINAPI CoGetClassObject( APARTMENT *apt; BOOL release_apt = FALSE; - TRACE("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + TRACE("CLSID: %s,IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); if (!ppv) return E_INVALIDARG; @@ -2283,8 +2283,8 @@ HRESULT WINAPI CoGetClassObject( } if (pServerInfo) { - FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName)); - FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo); + FIXME("pServerInfo->name=%s pAuthInfo=%p\n", + debugstr_w(pServerInfo->pwszName), pServerInfo->pAuthInfo); } /* diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 64b81ff..f69635b 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -191,7 +191,7 @@ static HRESULT WINAPI IErrorInfoImpl_QueryInterface( VOID** ppvoid) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvoid); + TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvoid); *ppvoid = NULL; diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index f82410e..1380285 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -110,7 +110,7 @@ FTMarshalImpl_QueryInterface (LPMARSHAL iface, REFIID riid, LPVOID * ppv) FTMarshalImpl *This = impl_from_IMarshal(iface); - TRACE ("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid (riid), ppv); + TRACE ("(%p)->(%s,%p)\n", This, debugstr_guid (riid), ppv); return IUnknown_QueryInterface (This->pUnkOuter, riid, ppv); } diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 0066153..3703de9 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -431,7 +431,7 @@ static HRESULT WINAPI Proxy_MarshalInterface( if (SUCCEEDED(hr)) { - TRACE("writing stdobjref:\n\tflags = %04x\n\tcPublicRefs = %d\n\toxid = %s\n\toid = %s\n\tipid = %s\n", + TRACE("writing stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", stdobjref.flags, stdobjref.cPublicRefs, wine_dbgstr_longlong(stdobjref.oxid), wine_dbgstr_longlong(stdobjref.oid), @@ -1239,7 +1239,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, assert(apt); - TRACE("stdobjref:\n\tflags = %04x\n\tcPublicRefs = %d\n\toxid = %s\n\toid = %s\n\tipid = %s\n", + TRACE("stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", stdobjref->flags, stdobjref->cPublicRefs, wine_dbgstr_longlong(stdobjref->oxid), wine_dbgstr_longlong(stdobjref->oid),

1 0

Henri Verbeet : wined3d: Add some FIXMEs about blitting with unsupported fixups.
by Alexandre Julliard 09 Jun '09

09 Jun '09

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009