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

Alexander Dorofeyev : wined3d: Don' t store primary surface palette in device palettes.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: f2e03d6c3f8295da65b21723437433070c2dbbed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e03d6c3f8295da65b217234… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Mar 25 02:04:02 2008 +0200 wined3d: Don't store primary surface palette in device palettes. --- dlls/wined3d/palette.c | 11 ----------- dlls/wined3d/surface_base.c | 20 +++++--------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index df72246..95b8da9 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -157,17 +157,6 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DW } } - /* If the palette is the primary palette, set the entries to the device */ - if(This->Flags & WINEDDPCAPS_PRIMARYSURFACE) { - unsigned int i; - IWineD3DDeviceImpl *device = This->wineD3DDevice; - PALETTEENTRY *entry = PalEnt; - - for(i = Start; i < Start+Count; i++) { - device->palettes[device->currentPalette][i] = *entry++; - } - } - return WINED3D_OK; } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 00efa6c..35d099a 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -206,26 +206,16 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) This->palette->Flags &= ~WINEDDPCAPS_PRIMARYSURFACE; + This->palette = PalImpl; + if(PalImpl != NULL) { if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { - /* Set the device's main palette if the palette - * wasn't a primary palette before - */ - if(!(PalImpl->Flags & WINEDDPCAPS_PRIMARYSURFACE)) { - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - unsigned int i; - - for(i=0; i < 256; i++) { - device->palettes[device->currentPalette][i] = PalImpl->palents[i]; - } - } - (PalImpl)->Flags |= WINEDDPCAPS_PRIMARYSURFACE; } - } - This->palette = PalImpl; - return IWineD3DSurface_RealizePalette(iface); + return IWineD3DSurface_RealizePalette(iface); + } + else return WINED3D_OK; } HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, WINEDDCOLORKEY *CKey) {

1 0

Alexander Dorofeyev : wined3d: Don' t use device palettes in read_from_framebuffer.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 85fd3130466835edad7b56d17d4b3b08f92626d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85fd3130466835edad7b56d17… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Mar 25 02:03:38 2008 +0200 wined3d: Don't use device palettes in read_from_framebuffer. --- dlls/wined3d/surface.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 131de47..2c78f09 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -789,19 +789,24 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v } } + LEAVE_GL(); + /* For P8 textures we need to perform an inverse palette lookup. This is done by searching for a palette * index which matches the RGB value. Note this isn't guaranteed to work when there are multiple entries for * the same color but we have no choice. * In case of P8 render targets, the index is stored in the alpha component so no conversion is needed. */ if((This->resource.format == WINED3DFMT_P8) && !primary_render_target_is_p8(myDevice)) { - PALETTEENTRY *pal; + PALETTEENTRY *pal = NULL; DWORD width = pitch / 3; int x, y, c; + if(This->palette) { pal = This->palette->palents; } else { - pal = This->resource.wineD3DDevice->palettes[This->resource.wineD3DDevice->currentPalette]; + ERR("Palette is missing, cannot perform inverse palette lookup\n"); + HeapFree(GetProcessHeap(), 0, mem); + return ; } for(y = local_rect.top; y < local_rect.bottom; y++) { @@ -824,7 +829,6 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v } HeapFree(GetProcessHeap(), 0, mem); } - LEAVE_GL(); } /* Read the framebuffer contents into a texture */

1 0

Alexander Dorofeyev : wined3d: Don't use device palettes in GetDC.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 13ce219235734e4655423c53d1bb3face7ae7c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ce219235734e4655423c53d… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Mar 25 02:03:55 2008 +0200 wined3d: Don't use device palettes in GetDC. --- dlls/wined3d/surface.c | 37 ++++++++++++++++++++++--------------- dlls/wined3d/surface_gdi.c | 27 ++++++++++++--------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2c78f09..2f9dc66 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1359,6 +1359,14 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { if (This->Flags & SFLAG_LOCKED) return WINED3DERR_INVALIDCALL; + /* According to Direct3D9 docs, only these formats are supported */ + if (((IWineD3DImpl *)This->resource.wineD3DDevice->wineD3D)->dxVersion > 7) { + if (This->resource.format != WINED3DFMT_R5G6B5 && + This->resource.format != WINED3DFMT_X1R5G5B5 && + This->resource.format != WINED3DFMT_R8G8B8 && + This->resource.format != WINED3DFMT_X8R8G8B8) return WINED3DERR_INVALIDCALL; + } + memset(&lock, 0, sizeof(lock)); /* To be sure */ /* Create a DIB section if there isn't a hdc yet */ @@ -1392,29 +1400,28 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { if(This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8) { + /* GetDC on palettized formats is unsupported in D3D9, and the method is missing in + D3D8, so this should only be used for DX <=7 surfaces (with non-device palettes) */ unsigned int n; - if(This->palette) { - PALETTEENTRY ent[256]; + PALETTEENTRY *pal = NULL; - GetPaletteEntries(This->palette->hpal, 0, 256, ent); - for (n=0; n<256; n++) { - col[n].rgbRed = ent[n].peRed; - col[n].rgbGreen = ent[n].peGreen; - col[n].rgbBlue = ent[n].peBlue; - col[n].rgbReserved = 0; - } + if(This->palette) { + pal = This->palette->palents; } else { - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + IWineD3DSurfaceImpl *dds_primary = (IWineD3DSurfaceImpl *)This->resource.wineD3DDevice->ddraw_primary; + if (dds_primary && dds_primary->palette) + pal = dds_primary->palette->palents; + } + if (pal) { for (n=0; n<256; n++) { - col[n].rgbRed = device->palettes[device->currentPalette][n].peRed; - col[n].rgbGreen = device->palettes[device->currentPalette][n].peGreen; - col[n].rgbBlue = device->palettes[device->currentPalette][n].peBlue; + col[n].rgbRed = pal[n].peRed; + col[n].rgbGreen = pal[n].peGreen; + col[n].rgbBlue = pal[n].peBlue; col[n].rgbReserved = 0; } - + SetDIBColorTable(This->hDC, 0, 256, col); } - SetDIBColorTable(This->hDC, 0, 256, col); } *pHDC = This->hDC; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 183d552..fcbecd3 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -579,28 +579,25 @@ HRESULT WINAPI IWineGDISurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { if(This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8) { unsigned int n; - if(This->palette) { - PALETTEENTRY ent[256]; + PALETTEENTRY *pal = NULL; - GetPaletteEntries(This->palette->hpal, 0, 256, ent); - for (n=0; n<256; n++) { - col[n].rgbRed = ent[n].peRed; - col[n].rgbGreen = ent[n].peGreen; - col[n].rgbBlue = ent[n].peBlue; - col[n].rgbReserved = 0; - } + if(This->palette) { + pal = This->palette->palents; } else { - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + IWineD3DSurfaceImpl *dds_primary = (IWineD3DSurfaceImpl *)This->resource.wineD3DDevice->ddraw_primary; + if (dds_primary && dds_primary->palette) + pal = dds_primary->palette->palents; + } + if (pal) { for (n=0; n<256; n++) { - col[n].rgbRed = device->palettes[device->currentPalette][n].peRed; - col[n].rgbGreen = device->palettes[device->currentPalette][n].peGreen; - col[n].rgbBlue = device->palettes[device->currentPalette][n].peBlue; + col[n].rgbRed = pal[n].peRed; + col[n].rgbGreen = pal[n].peGreen; + col[n].rgbBlue = pal[n].peBlue; col[n].rgbReserved = 0; } - + SetDIBColorTable(This->hDC, 0, 256, col); } - SetDIBColorTable(This->hDC, 0, 256, col); } *pHDC = This->hDC;

1 0

Alistair Leslie-Hughes : msxml3: Added typelib ids for SAX interfaces.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 20f8d6396445dae376a963c02c858b3b9503ebb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f8d6396445dae376a963c02… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 25 13:53:30 2008 +1100 msxml3: Added typelib ids for SAX interfaces. --- dlls/msxml3/main.c | 15 ++++++++++++++- dlls/msxml3/msxml_private.h | 13 +++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index abbe040..7f03948 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -57,7 +57,20 @@ static REFIID tid_ids[] = { &IID_IXMLDOMSchemaCollection, &IID_IXMLDOMText, &IID_IXMLElement, - &IID_IXMLDOMDocument + &IID_IXMLDOMDocument, + &IID_IVBSAXAttributes, + &IID_IVBSAXContentHandler, + &IID_IVBSAXDeclHandler, + &IID_IVBSAXDTDHandler, + &IID_IVBSAXEntityResolver, + &IID_IVBSAXErrorHandler, + &IID_IVBSAXLexicalHandler, + &IID_IVBSAXLocator, + &IID_IVBSAXXMLFilter, + &IID_IVBSAXXMLReader, + &IID_IMXAttributes, + &IID_IMXReaderControl, + &IID_IMXWriter, }; HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3767686..69214a3 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -108,6 +108,19 @@ enum tid_t { IXMLDOMText_tid, IXMLElement_tid, IXMLDocument_tid, + IVBSAXAttributes_tid, + IVBSAXContentHandler_tid, + IVBSAXDeclHandler_tid, + IVBSAXDTDHandler_tid, + IVBSAXEntityResolver_tid, + IVBSAXErrorHandler_tid, + IVBSAXLexicalHandler_tid, + IVBSAXLocator_tid, + IVBSAXXMLFilter_tid, + IVBSAXXMLReader_tid, + IMXAttributes_tid, + IMXReaderControl_tid, + IMXWriter_tid, LAST_tid };

1 0

Dmitry Timoshkov : winex11.drv: Don't add owned windows to the taskbar.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: cb3ff54789c652b02d852f40db71cafd9fd67ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb3ff54789c652b02d852f40d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 25 16:52:41 2008 +0800 winex11.drv: Don't add owned windows to the taskbar. --- dlls/winex11.drv/winpos.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 25e643e..ad62236 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -199,6 +199,8 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data new_state |= (1 << NET_WM_STATE_ABOVE); if (ex_style & WS_EX_TOOLWINDOW) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); + if (GetWindow( data->hwnd, GW_OWNER )) + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); xev.xclient.type = ClientMessage; xev.xclient.window = data->whole_window;

1 0

Alistair Leslie-Hughes : msxml3: Added support for SAXXMLReader.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 264be58812fedf9a066bac521f9fff5821759890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=264be58812fedf9a066bac521… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 25 14:19:10 2008 +1100 msxml3: Added support for SAXXMLReader. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/factory.c | 6 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/saxreader.c | 378 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 386 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=264be58812fedf9a066ba…

1 0

Alexander Dorofeyev : wined3d: Fix comment.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 16da5943546afeec6c0498880b3a8ec39c979adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=16da5943546afeec6c0498880… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Mar 25 02:03:33 2008 +0200 wined3d: Fix comment. --- dlls/wined3d/surface.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ed98a33..131de47 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2031,15 +2031,13 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] return; } - /* Still no palette? Use the device's palette */ - /* can ddraw and d3d < 8 surfaces use device's palette (d3d >= 8 feature)? */ + /* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8, + alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device + capability flag is present (wine does advertise this capability) */ for (i = 0; i < 256; i++) { table[i][0] = device->palettes[device->currentPalette][i].peRed; table[i][1] = device->palettes[device->currentPalette][i].peGreen; table[i][2] = device->palettes[device->currentPalette][i].peBlue; - /* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8, - alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device - capability flag is present (wine does advertise this capability) */ table[i][3] = device->palettes[device->currentPalette][i].peFlags; } } else {

1 0

Alexander Dorofeyev : ddraw/tests: Add test for ddraw 8-bit mode.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 7a012df64da26700a0432b1bd1f335b8b4a1523b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a012df64da26700a0432b1bd… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Mar 25 02:03:50 2008 +0200 ddraw/tests: Add test for ddraw 8-bit mode. Adds rudimentary test for 8 bit mode ddraw (palettized primary surface). Tests things like GetDC and its palette handling and SetPalette affected by patches that follow. --- dlls/ddraw/tests/visual.c | 198 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 198 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 3d8fecb..d8eb59a 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1720,6 +1720,201 @@ static void D3D1_TextureMapBlendTest(void) if (Texture) IDirect3DTexture_Release(Texture); } +static void p8_surface_fill_rect(IDirectDrawSurface *dest, UINT x, UINT y, UINT w, UINT h, BYTE colorindex) +{ + DDSURFACEDESC ddsd; + HRESULT hr; + UINT i, i1; + BYTE *p; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + + hr = IDirectDrawSurface_Lock(dest, NULL, &ddsd, DDLOCK_WRITEONLY | DDLOCK_WAIT, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_Lock returned: %x\n", hr); + + p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y; + + for (i = 0; i < h; i++) { + for (i1 = 0; i1 < w; i1++) { + p[i1] = colorindex; + } + p += ddsd.lPitch; + } + + hr = IDirectDrawSurface_Unlock(dest, NULL); + ok(hr==DD_OK, "IDirectDrawSurface_UnLock returned: %x\n", hr); +} + +static COLORREF getPixelColor_GDI(IDirectDrawSurface *Surface, UINT x, UINT y) +{ + COLORREF clr = CLR_INVALID; + HDC hdc; + HRESULT hr; + + hr = IDirectDrawSurface_GetDC(Surface, &hdc); + ok(hr==DD_OK, "IDirectDrawSurface_GetDC returned: %x\n", hr); + + if (SUCCEEDED(hr)) { + clr = GetPixel(hdc, x, y); + + hr = IDirectDrawSurface_ReleaseDC(Surface, hdc); + ok(hr==DD_OK, "IDirectDrawSurface_ReleaseDC returned: %x\n", hr); + } + + return clr; +} + +static BOOL colortables_check_equality(PALETTEENTRY table1[256], RGBQUAD table2[256]) +{ + int i; + + for (i = 0; i < 256; i++) { + if (table1[i].peRed != table2[i].rgbRed || table1[i].peGreen != table2[i].rgbGreen || + table1[i].peBlue != table2[i].rgbBlue) return FALSE; + } + + return TRUE; +} + +static void p8_primary_test() +{ + /* Test 8bit mode used by games like StarCraft, C&C Red Alert I etc */ + DDSURFACEDESC ddsd; + HDC hdc; + HRESULT hr; + PALETTEENTRY entries[256]; + RGBQUAD coltable[256]; + UINT i; + IDirectDrawPalette *ddprimpal; + IDirectDrawSurface *offscreen = NULL; + WNDCLASS wc = {0}; + DDBLTFX ddbltfx; + COLORREF color; + + /* An IDirect3DDevice cannot be queryInterfaced from an IDirect3DDevice7 on windows */ + hr = DirectDrawCreate(NULL, &DirectDraw1, NULL); + + ok(hr==DD_OK || hr==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreate returned: %x\n", hr); + if (FAILED(hr)) { + goto out; + } + + wc.lpfnWndProc = &DefWindowProc; + wc.lpszClassName = "p8_primary_test_wc"; + RegisterClass(&wc); + window = CreateWindow("p8_primary_test_wc", "p8_primary_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw_SetCooperativeLevel(DirectDraw1, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr==DD_OK, "SetCooperativeLevel returned: %x\n", hr); + if(FAILED(hr)) { + goto out; + } + + hr = IDirectDraw_SetDisplayMode(DirectDraw1, 640, 480, 8); + ok(hr==DD_OK || hr == DDERR_UNSUPPORTED, "SetDisplayMode returned: %x\n", hr); + if (FAILED(hr)) { + goto out; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Surface1, NULL); + ok(hr==DD_OK, "CreateSurface returned: %x\n", hr); + if (FAILED(hr)) { + goto out; + } + + memset(entries, 0, sizeof(entries)); + entries[0].peRed = 0xff; + entries[1].peGreen = 0xff; + entries[2].peBlue = 0xff; + + hr = IDirectDraw_CreatePalette(DirectDraw1, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, entries, &ddprimpal, NULL); + ok(hr == DD_OK, "CreatePalette returned %08x\n", hr); + if (FAILED(hr)) { + skip("IDirectDraw_CreatePalette failed; skipping further tests\n"); + goto out; + } + + hr = IDirectDrawSurface_SetPalette(Surface1, ddprimpal); + ok(hr==DD_OK, "IDirectDrawSurface_SetPalette returned: %x\n", hr); + + p8_surface_fill_rect(Surface1, 0, 0, 640, 480, 2); + + color = getPixelColor_GDI(Surface1, 10, 10); + ok(GetRValue(color) == 0 && GetGValue(color) == 0 && GetBValue(color) == 0xFF, + "got R %02X G %02X B %02X, expected R 00 G 00 B FF\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + + memset(&ddbltfx, 0, sizeof(ddbltfx)); + ddbltfx.dwSize = sizeof(ddbltfx); + U5(ddbltfx).dwFillColor = 0; + hr = IDirectDrawSurface_Blt(Surface1, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); + ok(hr == DD_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); + + color = getPixelColor_GDI(Surface1, 10, 10); + ok(GetRValue(color) == 0xFF && GetGValue(color) == 0 && GetBValue(color) == 0, + "got R %02X G %02X B %02X, expected R FF G 00 B 00\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + + memset (&ddsd, 0, sizeof (ddsd)); + ddsd.dwSize = sizeof (ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 8; + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &offscreen, NULL); + ok(hr == DD_OK, "IDirectDraw_CreateSurface returned %08x\n", hr); + if (FAILED(hr)) goto out; + + memset(entries, 0, sizeof(entries)); + for (i = 0; i < 256; i++) { + entries[i].peBlue = i; + } + hr = IDirectDrawPalette_SetEntries(ddprimpal, 0, 0, 256, entries); + ok(hr == DD_OK, "IDirectDrawPalette_SetEntries failed with %08x\n", hr); + + hr = IDirectDrawSurface_GetDC(offscreen, &hdc); + ok(hr==DD_OK, "IDirectDrawSurface_GetDC returned: %x\n", hr); + i = GetDIBColorTable(hdc, 0, 256, coltable); + ok(i == 256, "GetDIBColorTable returned %u, last error: %x\n", i, GetLastError()); + hr = IDirectDrawSurface_ReleaseDC(offscreen, hdc); + ok(hr==DD_OK, "IDirectDrawSurface_ReleaseDC returned: %x\n", hr); + + ok(colortables_check_equality(entries, coltable), "unexpected colortable on offscreen surface\n"); + + p8_surface_fill_rect(offscreen, 0, 0, 16, 16, 1); + + memset(entries, 0, sizeof(entries)); + entries[0].peRed = 0xff; + entries[1].peGreen = 0xff; + entries[2].peBlue = 0xff; + hr = IDirectDrawPalette_SetEntries(ddprimpal, 0, 0, 256, entries); + ok(hr == DD_OK, "IDirectDrawPalette_SetEntries failed with %08x\n", hr); + + hr = IDirectDrawSurface_BltFast(Surface1, 0, 0, offscreen, NULL, 0); + ok(hr==DD_OK, "IDirectDrawSurface_BltFast returned: %x\n", hr); + + color = getPixelColor_GDI(Surface1, 1, 1); + ok(GetRValue(color) == 0 && GetGValue(color) == 0xFF && GetBValue(color) == 0, + "got R %02X G %02X B %02X, expected R 00 G FF B 00\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + + out: + + if(ddprimpal) IDirectDrawPalette_Release(ddprimpal); + if(offscreen) IDirectDrawSurface_Release(offscreen); + if(Surface1) IDirectDrawSurface_Release(Surface1); + if(DirectDraw1) IDirectDraw_Release(DirectDraw1); + if(window) DestroyWindow(window); +} + START_TEST(visual) { HRESULT hr; @@ -1776,6 +1971,9 @@ START_TEST(visual) D3D1_TextureMapBlendTest(); } D3D1_releaseObjects(); + + p8_primary_test(); + return ; cleanup:

1 0

Christian Costa : ddraw: DDRAW_dump_flags_nolf must not add LF.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: c8837b8205f2665b52c2ae507336c4807aff12f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8837b8205f2665b52c2ae507… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 24 23:14:45 2008 +0100 ddraw: DDRAW_dump_flags_nolf must not add LF. --- dlls/ddraw/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index eada7a5..cddc2fd 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -640,7 +640,7 @@ static void DDRAW_dump_flags_nolf(DWORD flags, const flag_info* names, for (i=0; i < num_names; i++) if ((flags & names[i].val) || /* standard flag value */ ((!flags) && (!names[i].val))) /* zero value only */ - TRACE("%s\n", names[i].name); + TRACE("%s ", names[i].name); } static void DDRAW_dump_flags(DWORD flags, const flag_info* names, size_t num_names)

1 0

Andrew Talbot : winealsa.drv: Assign to structs instead of using memcpy.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 687af6b2bc84edd9a1d79a894fd96f4f61d269bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=687af6b2bc84edd9a1d79a894… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 24 21:37:37 2008 +0000 winealsa.drv: Assign to structs instead of using memcpy. --- dlls/winealsa.drv/dscapture.c | 4 ++-- dlls/winealsa.drv/dsoutput.c | 6 +++--- dlls/winealsa.drv/midi.c | 8 ++++---- dlls/winealsa.drv/wavein.c | 2 +- dlls/winealsa.drv/waveout.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 168fc91..98fe195 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -850,7 +850,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_GetDriverDesc(PIDSCDRIVER iface, PDSD { IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pDesc); - memcpy(pDesc, &(WInDev[This->wDevID].ds_desc), sizeof(DSDRIVERDESC)); + *pDesc = WInDev[This->wDevID].ds_desc; pDesc->dwFlags = 0; pDesc->dnDevNode = WInDev[This->wDevID].waveDesc.dnDevNode; pDesc->wVxdId = 0; @@ -1026,7 +1026,7 @@ DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv) */ DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc) { - memcpy(desc, &(WInDev[wDevID].ds_desc), sizeof(DSDRIVERDESC)); + *desc = WInDev[wDevID].ds_desc; return MMSYSERR_NOERROR; } diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 8d91abf..130e181 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -661,7 +661,7 @@ static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDES { IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pDesc); - memcpy(pDesc, &(WOutDev[This->wDevID].ds_desc), sizeof(DSDRIVERDESC)); + *pDesc = WOutDev[This->wDevID].ds_desc; pDesc->dwFlags = DSDDESC_DONTNEEDSECONDARYLOCK | DSDDESC_DONTNEEDWRITELEAD; pDesc->dnDevNode = WOutDev[This->wDevID].waveDesc.dnDevNode; pDesc->wVxdId = 0; @@ -730,7 +730,7 @@ static HRESULT WINAPI IDsDriverImpl_GetCaps(PIDSDRIVER iface, PDSDRIVERCAPS pCap { IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pCaps); - memcpy(pCaps, &(WOutDev[This->wDevID].ds_caps), sizeof(DSDRIVERCAPS)); + *pCaps = WOutDev[This->wDevID].ds_caps; return DS_OK; } @@ -844,7 +844,7 @@ DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) { - memcpy(desc, &(WOutDev[wDevID].ds_desc), sizeof(DSDRIVERDESC)); + *desc = WOutDev[wDevID].ds_desc; return MMSYSERR_NOERROR; } diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 9667736..3e791d5 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1128,8 +1128,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* if (!type) return; - memcpy(&MidiOutDev[MODM_NumDevs].addr, snd_seq_port_info_get_addr(pinfo), sizeof(snd_seq_addr_t)); - + MidiOutDev[MODM_NumDevs].addr = *snd_seq_port_info_get_addr(pinfo); + /* Manufac ID. We do not have access to this with soundcard.h * Does not seem to be a problem, because in mmsystem.h only * Microsoft's ID is listed. @@ -1184,8 +1184,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* if (!type) return; - memcpy(&MidiInDev[MIDM_NumDevs].addr, snd_seq_port_info_get_addr(pinfo), sizeof(snd_seq_addr_t)); - + MidiInDev[MIDM_NumDevs].addr = *snd_seq_port_info_get_addr(pinfo); + /* Manufac ID. We do not have access to this with soundcard.h * Does not seem to be a problem, because in mmsystem.h only * Microsoft's ID is listed. diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 2c574f1..9c89fde 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -385,7 +385,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - memcpy(&wwi->waveDesc, lpDesc, sizeof(WAVEOPENDESC)); + wwi->waveDesc = *lpDesc; ALSA_copyFormat(lpDesc->lpFormat, &wwi->format); if (wwi->format.Format.wBitsPerSample == 0) { diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 516aa3f..f4452e5 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -640,7 +640,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - memcpy(&wwo->waveDesc, lpDesc, sizeof(WAVEOPENDESC)); + wwo->waveDesc = *lpDesc; ALSA_copyFormat(lpDesc->lpFormat, &wwo->format); TRACE("Requested this format: %dx%dx%d %s\n",

1 0