April 2008 - Wine-commits - list.winehq.org

Dmitry Timoshkov : gdi32: Fully initialize face->ntmFlags on font load.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 1f35b6e62ef920e2f783cbfa86bdc337f17e3c5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f35b6e62ef920e2f783cbfa8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 7 16:11:42 2008 +0900 gdi32: Fully initialize face->ntmFlags on font load. --- dlls/gdi32/freetype.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0284a00..be8688a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -256,11 +256,9 @@ typedef struct tagFace { void *font_data_ptr; DWORD font_data_size; FT_Long face_index; - BOOL Italic; - BOOL Bold; FONTSIGNATURE fs; FONTSIGNATURE fs_links; - DWORD ntmFlags; /* Only some bits stored here. Others are computed on the fly */ + DWORD ntmFlags; FT_Fixed font_version; BOOL scalable; Bitmap_Size size; /* set if face is a bitmap */ @@ -1380,8 +1378,12 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ face->font_data_size = font_data_size; } face->face_index = face_index; - face->Italic = (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) ? 1 : 0; - face->Bold = (ft_face->style_flags & FT_STYLE_FLAG_BOLD) ? 1 : 0; + face->ntmFlags = 0; + if (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) + face->ntmFlags |= NTM_ITALIC; + if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) + face->ntmFlags |= NTM_BOLD; + if (face->ntmFlags == 0) face->ntmFlags = NTM_REGULAR; face->font_version = pHeader ? pHeader->Font_Revision : 0; face->family = family; face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; @@ -1409,10 +1411,8 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if (pFT_Load_Sfnt_Table && !pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) { TRACE("Font %s/%p is OTF Type1\n", wine_dbgstr_a(file), font_data_ptr); - face->ntmFlags = NTM_PS_OPENTYPE; + face->ntmFlags |= NTM_PS_OPENTYPE; } - else - face->ntmFlags = 0; TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", face->fs.fsCsb[0], face->fs.fsCsb[1], @@ -3335,11 +3335,15 @@ found: { if((csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) || !csi.fs.fsCsb[0]) { - new_score = (face->Italic ^ it) + (face->Bold ^ bd); + BOOL italic, bold; + + italic = (face->ntmFlags & NTM_ITALIC) ? 1 : 0; + bold = (face->ntmFlags & NTM_BOLD) ? 1 : 0; + new_score = (italic ^ it) + (bold ^ bd); if(!best || new_score <= score) { TRACE("(it=%d, bd=%d) is selected for (it=%d, bd=%d)\n", - face->Italic, face->Bold, it, bd); + italic, bold, it, bd); score = new_score; best = face; if(best->scalable && score == 0) break; @@ -3363,8 +3367,8 @@ found: } if(best) face = best->scalable ? best : best_bitmap; - ret->fake_italic = (it && !face->Italic); - ret->fake_bold = (bd && !face->Bold); + ret->fake_italic = (it && !(face->ntmFlags & NTM_ITALIC)); + ret->fake_bold = (bd && !(face->ntmFlags & NTM_BOLD)); ret->fs = face->fs;

1 0

Hwang YunSong(황윤성) : progman: Updated Korean resource.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: a96ad868ff88f15f21796c3f10fa698167dcd444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96ad868ff88f15f21796c3f1… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Apr 7 09:27:12 2008 +0900 progman: Updated Korean resource. --- programs/progman/Ko.rc | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/programs/progman/Ko.rc b/programs/progman/Ko.rc index b0a56f4..600e8e4 100644 --- a/programs/progman/Ko.rc +++ b/programs/progman/Ko.rc @@ -69,7 +69,6 @@ DIALOG_NEW DIALOG 0, 0, 170, 65 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�� ۾�" -FONT 9, "MS Shell Dlg" { RADIOBUTTON "", PM_NEW_GROUP, 10, 15, 10, 15 LTEXT "Ǯ�׸� �׷�(&G)", PM_NEW_GROUP, 20, 18, 80, 15 @@ -86,7 +85,6 @@ PUSHBUTTON " LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� �̵�" -FONT 9, "MS Shell Dlg" { LTEXT "Ǯ�׸� �̵�:", IDIGNORE, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 @@ -105,7 +103,6 @@ DIALOG_COPY DIALOG 0, 0, 250, 65 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� ��" -FONT 9, "MS Shell Dlg" { LTEXT "Ǯ�׸� ��:", IDIGNORE, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 @@ -124,7 +121,6 @@ DIALOG_GROUP DIALOG 0, 0, 230, 65 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� �׷� �Ӽ�" -FONT 9, "MS Shell Dlg" { LTEXT "��(&D):", PM_DESCRIPTION_TXT, 05, 18, 50, 10 EDITTEXT PM_DESCRIPTION, 60, 18, 90, 15, WS_TABSTOP @@ -141,7 +137,6 @@ DIALOG_PROGRAM DIALOG 0, 0, 250, 105 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� �Ӽ�" -FONT 9, "MS Shell Dlg" { LTEXT "��(&D):", PM_DESCRIPTION_TXT, 05, 10, 60, 10 EDITTEXT PM_DESCRIPTION, 80, 10, 90, 15, WS_TABSTOP @@ -167,7 +162,6 @@ DIALOG_SYMBOL DIALOG 0, 0, 200, 85 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�� ٲٱ�" -FONT 9, "MS Shell Dlg" { LTEXT "��̸�(&F):", PM_ICON_FILE_TXT, 5, 15, 40, 10 EDITTEXT PM_ICON_FILE, 45, 15, 85, 15, WS_TABSTOP @@ -186,7 +180,6 @@ DIALOG_EXECUTE DIALOG 0, 0, 200, 85 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ǯ�׸� ��" -FONT 9, "MS Shell Dlg" { LTEXT "�� (&C):", IDIGNORE, 05, 15, 120, 10 EDITTEXT PM_COMMAND, 05, 25, 120, 15, WS_TABSTOP

1 0

Alexander Nicolaysen Sørnes : shell32: Update Norwegian Bokmål resource.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: bc9f05f50b0ec6691d0a20034ad31be3752d3b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9f05f50b0ec6691d0a20034… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Apr 6 22:17:38 2008 +0200 shell32: Update Norwegian Bokmål resource. --- dlls/shell32/shell32_No.rc | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index 413d072..c1160eb 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -136,17 +136,19 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "Lisens . . .", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 - LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 - LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 - LTEXT "Wine er laget av", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 42, 22, 170, 10 + LTEXT "Kj�rer p� %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine er laget av", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -248,3 +250,20 @@ STRINGTABLE IDS_NEWFOLDER "Ny mappe" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "Lisensbetingelser" +IDS_LICENSE, +"Wine er fri programvare; du kan distribuere det og/eller \ +endre det i henhold til vilk�rene i �GNU Lesser General Public \ +License�, utgitt av the Free Software Foundation; enten \ +versjon 2.1 av Lisensen, eller (hvis du �nsker det) en nyere versjon.\n\n\ +Wine utgis i h�p om at det er nyttig, \ +men UTEN ENHVER GARANTI; uten engang den antydede garantien om \ +HANDELSEGNETHET eller EGNETHET FOR ET SPESIELT FORM�L. Se �GNU \ +Lesser General Public License� for flere detaljer.\n\n\ +Du skal ha mottatt et eksemplar av �GNU Lesser General Public \ +License� sammen med dette programmet; hvis ikke, skriv til: the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." +}

1 0

Alexander Nicolaysen Sørnes : oledlg: Fix control class in Norwegian Bokmål resource.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7d712909bb90cf1c347cdb79050ee015d66b3f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d712909bb90cf1c347cdb790… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Apr 6 22:05:52 2008 +0200 oledlg: Fix control class in Norwegian Bokmål resource. --- dlls/oledlg/oledlg_No.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/oledlg_No.rc b/dlls/oledlg/oledlg_No.rc index e56c721..a92317c 100644 --- a/dlls/oledlg/oledlg_No.rc +++ b/dlls/oledlg/oledlg_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -77,7 +77,7 @@ BEGIN CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 CONTROL "<< resultatet kommer her >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 CONTROL "Resultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 - CONTROL "", IDC_PS_SOURCETEXT, "Rediger", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END STRINGTABLE DISCARDABLE

1 0

Roderick Colenbrander : wined3d: Remove a PBO when a converted surface is detected.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f04d870a8d9dcadd6d4db3864ddb914a9ced555b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04d870a8d9dcadd6d4db3864… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Apr 5 23:54:26 2008 +0000 wined3d: Remove a PBO when a converted surface is detected. This can happen e.g. when suddenly color keying is activated and at some stages we don't know if we will need conversion at PBO creation time. --- dlls/wined3d/surface.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 33812b7..ddd0f32 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); static inline void clear_unused_channels(IWineD3DSurfaceImpl *This); +static void surface_remove_pbo(IWineD3DSurfaceImpl *This); static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { GLint active_texture; @@ -4038,6 +4039,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D width = This->currentDesc.Width; pitch = IWineD3DSurface_GetPitch(iface); + /* Don't use PBOs for converted surfaces. During PBO conversion we look at SFLAG_CONVERTED + * but it isn't set (yet) in all cases it is getting called. */ + if((convert != NO_CONVERSION) && (This->Flags & SFLAG_PBO)) { + TRACE("Removing the pbo attached to surface %p\n", This); + surface_remove_pbo(This); + } + if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { int height = This->currentDesc.Height; @@ -4092,6 +4100,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D width = This->currentDesc.Width; pitch = IWineD3DSurface_GetPitch(iface); + /* Don't use PBOs for converted surfaces. During PBO conversion we look at SFLAG_CONVERTED + * but it isn't set (yet) in all cases it is getting called. */ + if((convert != NO_CONVERSION) && (This->Flags & SFLAG_PBO)) { + TRACE("Removing the pbo attached to surface %p\n", This); + surface_remove_pbo(This); + } + if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { int height = This->currentDesc.Height;

1 0

Alexander Nicolaysen Sørnes : comdlg32: Update Norwegian Bokmål resource.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 0f3921886088ec80633931a552d7d109631503ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3921886088ec80633931a55… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Apr 6 22:00:13 2008 +0200 comdlg32: Update Norwegian Bokmål resource. --- dlls/comdlg32/cdlg_No.rc | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_No.rc b/dlls/comdlg32/cdlg_No.rc index ce8013c..fdd0659 100644 --- a/dlls/comdlg32/cdlg_No.rc +++ b/dlls/comdlg32/cdlg_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005-2007 Alexander N. S�rnes + * Copyright 2005-2008 Alexander N. S�rnes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -439,6 +439,14 @@ Oppgi en verdi mellom %d og %d." PD32_PRINTER_STATUS_POWER_SAVE "Str�msparingsmodus; " } +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "Normal" + IDS_FONT_BOLD "Fet" + IDS_FONT_ITALIC "Kursiv" + IDS_FONT_BOLD_ITALIC "Fet kursiv" +} + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "Svart"

1 0

Rico Schüller : d3d9: Make the shader test more precision tolerant.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 82521353f5f898f4a19ce65afaec55dfe732caca URL: http://source.winehq.org/git/wine.git/?a=commit;h=82521353f5f898f4a19ce65af… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 6 00:14:00 2008 +0200 d3d9: Make the shader test more precision tolerant. --- dlls/d3d9/tests/visual.c | 54 ++++++++++++++++++++++++++++++--------------- 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b33f7d5..6d9ad39 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4801,31 +4801,37 @@ static void cnd_test(IDirect3DDevice9 *device) color = getPixelColor(device, 158, 358); ok(color == 0x00ffffff, "pixel 158, 358 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 162, 358); - ok(color == 0x00000000, "pixel 162, 358 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 162, 358 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 158, 362); ok(color == 0x00ffffff, "pixel 158, 362 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 162, 362); - ok(color == 0x00000000, "pixel 162, 362 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 162, 362 has color %08x, expected 0x00000000\n", color); /* 1.2 shader */ color = getPixelColor(device, 478, 358); ok(color == 0x00ffffff, "pixel 478, 358 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 482, 358); - ok(color == 0x00000000, "pixel 482, 358 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 358 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 478, 362); ok(color == 0x00ffffff, "pixel 478, 362 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 482, 362); - ok(color == 0x00000000, "pixel 482, 362 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 362 has color %08x, expected 0x00000000\n", color); /* 1.3 shader */ color = getPixelColor(device, 478, 118); ok(color == 0x00ffffff, "pixel 478, 118 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 482, 118); - ok(color == 0x00000000, "pixel 482, 118 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 118 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 478, 122); ok(color == 0x00ffffff, "pixel 478, 122 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 482, 122); - ok(color == 0x00000000, "pixel 482, 122 has color %08x, expected 0x00000000\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) <= 0x01) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 122 has color %08x, expected 0x00000000\n", color); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr)); @@ -4878,33 +4884,45 @@ static void cnd_test(IDirect3DDevice9 *device) /* 1.1 shader. coissue flag changed the semantic of cnd, c1 is always selected */ color = getPixelColor(device, 158, 358); - ok(color == 0x0000ff00, "pixel 158, 358 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 158, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 358); - ok(color == 0x0000ff00, "pixel 162, 358 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 162, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 158, 362); - ok(color == 0x0000ff00, "pixel 158, 362 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 158, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 362); - ok(color == 0x0000ff00, "pixel 162, 362 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 162, 362 has color %08x, expected 0x0000ff00\n", color); /* 1.2 shader */ color = getPixelColor(device, 478, 358); - ok(color == 0x0000ff00, "pixel 478, 358 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 478, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 358); - ok(color == 0x0000ff00, "pixel 482, 358 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 362); - ok(color == 0x0000ff00, "pixel 478, 362 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 478, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 362); - ok(color == 0x0000ff00, "pixel 482, 362 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 362 has color %08x, expected 0x0000ff00\n", color); /* 1.3 shader */ color = getPixelColor(device, 478, 118); - ok(color == 0x0000ff00, "pixel 478, 118 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 478, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 118); - ok(color == 0x0000ff00, "pixel 482, 118 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 122); - ok(color == 0x0000ff00, "pixel 478, 122 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 478, 122 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 122); - ok(color == 0x0000ff00, "pixel 482, 122 has color %08x, expected 0x0000ff00\n", color); + ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + "pixel 482, 122 has color %08x, expected 0x0000ff00\n", color); IDirect3DPixelShader9_Release(shader_14_coissue); IDirect3DPixelShader9_Release(shader_13_coissue);

1 0

Rico Schüller : d3d9: fix two copy and paste mistakes.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 29713df8d93bf8cfc1b97b5d6e790c263a3bd4a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29713df8d93bf8cfc1b97b5d6… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 6 10:37:22 2008 +0200 d3d9: fix two copy and paste mistakes. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6d9ad39..76623e6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2761,9 +2761,9 @@ static void release_buffer_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetIndices(device, ib); - ok(hr == D3D_OK, "IDirect3DIndexBuffer8_Unlock failed with %s\n", DXGetErrorString9(hr)); + ok(hr == D3D_OK, "IDirect3DDevice9_SetIndices failed with %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(quad[0])); - ok(hr == D3D_OK, "IDirect3DIndexBuffer8_Unlock failed with %s\n", DXGetErrorString9(hr)); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %s\n", DXGetErrorString9(hr));

1 0

Hans Leidekker : winebrowser: Convert to Unicode.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e547cf7043e36fecfe5e23d1d6f93a9c5ba89c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e547cf7043e36fecfe5e23d1d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 6 14:44:31 2008 +0200 winebrowser: Convert to Unicode. --- programs/winebrowser/Makefile.in | 2 +- programs/winebrowser/main.c | 164 +++++++++++++++++++++++-------------- 2 files changed, 103 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e547cf7043e36fecfe5e2…

1 0

Roderick Colenbrander : wined3d: Use the render target its palette when performing a texture copy as the texture doesn 't hold one.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 0efefef34b7e0eae68d90683a2cd8f1d3d94ed7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0efefef34b7e0eae68d90683a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Apr 3 22:45:28 2008 +0000 wined3d: Use the render target its palette when performing a texture copy as the texture doesn't hold one. --- dlls/wined3d/surface.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ac4224e..33812b7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3093,6 +3093,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Blit from render target to texture */ WINED3DRECT srect; BOOL upsideDown, stretchx; + BOOL paletteOverride = FALSE; if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { TRACE("Color keying not supported by frame buffer to texture blit\n"); @@ -3139,6 +3140,14 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * stretchx = FALSE; } + /* When blitting from a render target a texture, the texture isn't required to have a palette. + * In this case grab the palette from the render target. */ + if((This->resource.format == WINED3DFMT_P8) && (This->palette == NULL)) { + paletteOverride = TRUE; + TRACE("Source surface (%p) lacks palette, overriding palette with palette %p of destination surface (%p)\n", Src, This->palette, This); + This->palette = Src->palette; + } + /* Blt is a pretty powerful call, while glCopyTexSubImage2D is not. glCopyTexSubImage cannot * flip the image nor scale it. * @@ -3166,6 +3175,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * fb_copy_to_texture_hwstretch(This, SrcSurface, srcSwapchain, &srect, &rect, upsideDown, Filter); } + /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */ + if(paletteOverride) + This->palette = NULL; + if(!(This->Flags & SFLAG_DONOTFREE)) { HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL;

1 0