May 2006 - Wine-Commits - list.winehq.org

Michael Stefaniuc : janitorial: Remove redundant NULL pointer checks before HeapFree'ing them.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: a87520036f7b9ca8a7292fc8fc53df1fd4ea6ecb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a87520036f7b9ca8a7292fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 10 00:33:53 2006 +0200 janitorial: Remove redundant NULL pointer checks before HeapFree'ing them. Some HeapFree's are hidden behind macros. Found by smatch. --- dlls/advapi32/registry.c | 8 ++++---- dlls/advapi32/security.c | 4 +--- dlls/avifil32/api.c | 7 ++----- dlls/avifil32/avifile.c | 3 +-- dlls/avifil32/editstream.c | 3 +-- dlls/ddraw/device_opengl.c | 2 +- dlls/ddraw/surface_main.c | 2 +- dlls/iphlpapi/iphlpapi_main.c | 3 +-- dlls/msacm32/internal.c | 2 +- dlls/mshtml/hlink.c | 3 +-- dlls/msvfw32/msvideo_main.c | 12 ++++-------- dlls/opengl32/wgl.c | 4 +--- dlls/opengl32/wgl_ext.c | 2 +- dlls/riched20/writer.c | 6 ++---- dlls/secur32/secur32.c | 5 ++--- dlls/secur32/tests/main.c | 9 +++------ dlls/secur32/thunks.c | 12 ++++-------- dlls/urlmon/umon.c | 6 ++---- dlls/wined3d/query.c | 4 +--- dlls/wininet/internet.c | 3 +-- dlls/wininet/urlcache.c | 1 - dlls/winmm/winealsa/audio.c | 13 ++++--------- dlls/winmm/wineesd/audio.c | 8 ++------ dlls/x11drv/xrender.c | 3 +-- programs/regedit/treeview.c | 3 +-- programs/wineboot/wineboot.c | 3 +-- programs/winecfg/audio.c | 7 ++----- 27 files changed, 46 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a87520036f7b9ca8a72…

1 0

Ivan Gyurdiev : wined3d: Clean up some dead code.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 9d4960bfcb927644503861ae627cb79b9aceb81c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d4960bfcb927644503861a… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue May 9 18:09:12 2006 -0400 wined3d: Clean up some dead code. --- dlls/wined3d/pixelshader.c | 27 ++++++++++----------------- dlls/wined3d/vertexshader.c | 17 ++++++++--------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 417546c..e00eebf 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1169,12 +1169,8 @@ inline static VOID IWineD3DPixelShaderIm IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; const DWORD *pToken = pFunction; const SHADER_OPCODE *curOpcode = NULL; - const DWORD *pInstr; DWORD i; char tmpLine[255]; -#if 0 /* TODO: loop register (just another address register ) */ - BOOL hasLoops = FALSE; -#endif SHADER_BUFFER buffer; int row = 0; /* not sure, something to do with macros? */ @@ -1261,21 +1257,23 @@ #endif pToken += comment_len; continue; } -#if 0 /* Not sure what these are here for, they're not required for vshaders */ - code = *pToken; -#endif - pInstr = pToken; + + /* Read opcode */ curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); ++pToken; + + /* Unknown opcode and its parameters */ if (NULL == curOpcode) { - /* unknown current opcode ... (shouldn't be any!) */ while (*pToken & 0x80000000) { /* TODO: Think of a sensible name for 0x80000000 */ FIXME("unrecognized opcode: %08lx\n", *pToken); ++pToken; } + + /* Unhandled opcode */ } else if (GLNAME_REQUIRE_GLSL == curOpcode->glname) { - /* if the token isn't supported by this cross compiler then skip it and its parameters */ - FIXME("Token %s requires greater functionality than Fragment_Progarm_ARB supports\n", curOpcode->name); + + FIXME("Token %s requires greater functionality than " + "Fragment_Progarm_ARB supports\n", curOpcode->name); pToken += curOpcode->num_params; } else if (D3DSIO_DEF == curOpcode->opcode) { @@ -1420,13 +1418,8 @@ #endif break; default: - if (curOpcode->glname == GLNAME_REQUIRE_GLSL) { - FIXME("Opcode %s requires Gl Shader languange 1.0\n", curOpcode->name); - } else { - FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); - } + FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); pToken += curOpcode->num_params; - continue; } } } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 3e50eed..770242c 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1190,18 +1190,22 @@ #endif continue; } + /* Read opcode */ curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); ++pToken; + + /* Unknown opcode and its parameters */ if (NULL == curOpcode) { - /* unknown current opcode ... (shouldn't be any!) */ while (*pToken & 0x80000000) { FIXME("unrecognized opcode: %08lx\n", *pToken); ++pToken; } + + /* Unhandled opcode */ } else if (GLNAME_REQUIRE_GLSL == curOpcode->glname) { - /* if the token isn't supported by this cross compiler then skip it and its parameters */ - FIXME("Token %s requires greater functionality than Vertex_Progarm_ARB supports\n", curOpcode->name); + FIXME("Token %s requires greater functionality than " + "Vertex_Program_ARB supports\n", curOpcode->name); pToken += curOpcode->num_params; } else if (D3DSIO_DEF == curOpcode->opcode) { @@ -1336,12 +1340,7 @@ #endif break; default: - if (curOpcode->glname == GLNAME_REQUIRE_GLSL) { - FIXME("Opcode %s requires Gl Shader languange 1.0\n", curOpcode->name); - } else { - FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); - } - + FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); pToken += curOpcode->num_params; } }

1 0

Ivan Gyurdiev : wined3d: Break out texture instruction processing.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: b187242ab68c6bc74b1440a1ed81126eabd171be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b187242ab68c6bc74b1440a… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue May 9 18:08:02 2006 -0400 wined3d: Break out texture instruction processing. --- dlls/wined3d/pixelshader.c | 223 +++++++++++++++++++++++--------------------- 1 files changed, 116 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b187242ab68c6bc74b1…

1 0

Ivan Gyurdiev : wined3d: Break out arithmetic instruction processing.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: cdfe848b6d44d0fc2f565e9bfea2d0aa58f08380 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cdfe848b6d44d0fc2f565e9… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue May 9 18:05:26 2006 -0400 wined3d: Break out arithmetic instruction processing. --- dlls/wined3d/pixelshader.c | 424 ++++++++++++++++++++-------------------- dlls/wined3d/vertexshader.c | 223 +++++++++++---------- dlls/wined3d/wined3d_private.h | 23 ++ 3 files changed, 347 insertions(+), 323 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=cdfe848b6d44d0fc2f5…

1 0

Ivan Gyurdiev : wined3d: Merge register counting pass.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 320e33dcb31b464c0d2e900475d6dbecbc76f4a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=320e33dcb31b464c0d2e900… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue May 9 18:03:09 2006 -0400 wined3d: Merge register counting pass. --- dlls/wined3d/baseshader.c | 81 +++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 59 -------------------- dlls/wined3d/vertexshader.c | 118 +++++----------------------------------- dlls/wined3d/wined3d_private.h | 6 ++ 4 files changed, 104 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=320e33dcb31b464c0d2…

1 0

Ivan Gyurdiev : wined3d: Make register counting pass the same.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: aadafd64da53bb39492f88507928e6e486d408c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aadafd64da53bb39492f885… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue May 9 18:01:05 2006 -0400 wined3d: Make register counting pass the same. --- dlls/wined3d/vertexshader.c | 67 +++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 56d322a..122209c 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1102,12 +1102,6 @@ #endif buffer.bsize = 0; buffer.lineNo = 0; - /* Initialise the shader */ - This->namedArrays = FALSE; - This->declaredArrays = FALSE; - for (i = 0; i < WINED3DSHADERDECLUSAGE_MAX_USAGE; i++) { - This->arrayUsageMap[i] = -1; - } /* set all the tmpsUsed to not used */ memset(tmpsUsed, FALSE , sizeof(tmpsUsed)); @@ -1144,18 +1138,14 @@ #endif ++pToken; } } else { + + /* Skip declarations, handled earlier */ if (curOpcode->opcode == D3DSIO_DCL){ - INT usage = *pToken++; - INT arrayNo = (*pToken++ & D3DSP_REGNUM_MASK); - parse_decl_usage(This, usage, arrayNo); + pToken += 2; + + /* Skip definition of immediate constants, handled later */ } else if(curOpcode->opcode == D3DSIO_DEF) { - This->constantsUsedBitmap[*pToken & 0xFF] = VS_CONSTANT_CONSTANT; - FIXME("Constant %ld\n", *pToken & 0xFF); - ++pToken; - ++pToken; - ++pToken; - ++pToken; - ++pToken; + pToken += 5; } else { /* Check to see if and tmp or addressing redisters are used */ @@ -1191,19 +1181,7 @@ #endif } } } -#if 1 -#define VSHADER_ALWAYS_NUMBERED -#endif - -#ifdef VSHADER_ALWAYS_NUMBERED /* handy for debugging using numbered arrays instead of named arrays */ - /* TODO: using numbered arrays for software shaders makes things easier */ - This->declaredArrays = TRUE; -#endif - /* named arrays and declared arrays are mutually exclusive */ - if (This->declaredArrays) { - This->namedArrays = FALSE; - } /* TODO: validate nUseAddressRegister < = GL_MAX_PROGRAM_ADDRESS_REGISTERS_AR nUseTempRegister <= GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB @@ -1285,6 +1263,7 @@ #endif *(float *) (pToken + 3), *(float *) (pToken + 4)); + This->constantsUsedBitmap[*pToken & 0xFF] = VS_CONSTANT_CONSTANT; pToken += 5; continue; @@ -1876,6 +1855,12 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ DWORD i; TRACE("(%p) : Parsing programme\n", This); + /* Initialise vertex input arrays */ + This->namedArrays = FALSE; + This->declaredArrays = FALSE; + for (i = 0; i < WINED3DSHADERDECLUSAGE_MAX_USAGE; i++) + This->arrayUsageMap[i] = -1; + if (NULL != pToken) { while (D3DVS_END() != *pToken) { if (vshader_is_version_token(*pToken)) { /** version */ @@ -1907,12 +1892,16 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ } else { if (curOpcode->opcode == D3DSIO_DCL) { - vshader_program_dump_decl_usage(This, *pToken, *(pToken + 1)); - ++pToken; - ++len; - vshader_program_dump_vs_param(*pToken, 0); - ++pToken; - ++len; + + DWORD usage = *pToken; + DWORD param = *(pToken + 1); + + parse_decl_usage(This, usage, param & D3DSP_REGNUM_MASK); + vshader_program_dump_decl_usage(This, usage, param); + vshader_program_dump_vs_param(param, 0); + pToken += 2; + len += 2; + } else if (curOpcode->opcode == D3DSIO_DEF) { TRACE("def c%lu = ", *pToken & 0xFF); @@ -1952,6 +1941,16 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ This->baseShader.functionLength = 1; /* no Function defined use fixed function vertex processing */ } +/* Handy for debugging using numbered arrays instead of named arrays */ +#if 1 + /* TODO: using numbered arrays for software shaders makes things easier */ + This->declaredArrays = TRUE; +#endif + + /* named arrays and declared arrays are mutually exclusive */ + if (This->declaredArrays) + This->namedArrays = FALSE; + /* Generate HW shader in needed */ if (NULL != pFunction && wined3d_settings.vs_mode == VS_HW) { #if 1

1 0

Stefan Dösinger : wined3d: Update the DIB section' s palette on GetDC.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 7e12e2ac5b40b05d447a71bb26ac0db5a9c1da89 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e12e2ac5b40b05d447a71b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 9 21:04:07 2006 +0200 wined3d: Update the DIB section's palette on GetDC. --- dlls/wined3d/surface.c | 87 ++++++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5c95a7e..48b4e36 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -944,6 +944,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC HDC ddc; DWORD *masks; HRESULT hr; + RGBQUAD col[256]; TRACE("(%p)->(%p)\n",This,pHDC); @@ -958,17 +959,12 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC memset(&lock, 0, sizeof(lock)); /* To be sure */ /* Create a DIB section if there isn't a hdc yet */ - if(!This->hDC) - { - RGBQUAD col[256]; - - if(This->Flags & SFLAG_ACTIVELOCK) - { + if(!This->hDC) { + if(This->Flags & SFLAG_ACTIVELOCK) { ERR("Creating a DIB section while a lock is active. Uncertain consequences\n"); } - switch (This->bytesPerPixel) - { + switch (This->bytesPerPixel) { case 2: case 4: /* Allocate extra space to store the RGB bit masks. */ @@ -1003,8 +999,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC /* Get the bit masks */ masks = (DWORD *) &(b_info->bmiColors); - switch (This->resource.format) - { + switch (This->resource.format) { case WINED3DFMT_R8G8B8: usage = DIB_RGB_COLORS; b_info->bmiHeader.biCompression = BI_RGB; @@ -1037,8 +1032,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC } ddc = CreateDCA("DISPLAY", NULL, NULL, NULL); - if (ddc == 0) - { + if (ddc == 0) { HeapFree(GetProcessHeap(), 0, b_info); return HRESULT_FROM_WIN32(GetLastError()); } @@ -1047,8 +1041,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC This->dib.DIBsection = CreateDIBSection(ddc, b_info, usage, &This->dib.bitmap_data, 0 /* Handle */, 0 /* Offset */); DeleteDC(ddc); - if (!This->dib.DIBsection) - { + if (!This->dib.DIBsection) { ERR("CreateDIBSection failed!\n"); return HRESULT_FROM_WIN32(GetLastError()); } @@ -1057,8 +1050,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC TRACE("DIBSection at : %p\n", This->dib.bitmap_data); /* copy the existing surface to the dib section */ - if(This->resource.allocatedMemory) - { + if(This->resource.allocatedMemory) { memcpy(This->dib.bitmap_data, This->resource.allocatedMemory, This->resource.size); /* We won't need that any more */ HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); @@ -1075,39 +1067,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC This->palette ? This->palette->hpal : 0, FALSE); - if(This->resource.format == WINED3DFMT_P8 || - This->resource.format == WINED3DFMT_A8P8) - { - unsigned int n; - if(This->palette) - { - PALETTEENTRY ent[256]; - - 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; - } - } - else - { - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - - 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].rgbReserved = 0; - } - - } - SetDIBColorTable(This->hDC, 0, 256, col); - } - /* This is to make LockRect read the gl Texture although memory is allocated */ This->Flags |= SFLAG_NEWDC; @@ -1120,13 +1079,39 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC NULL, 0); This->Flags &= ~SFLAG_NEWDC; - if(FAILED(hr)) - { + if(FAILED(hr)) { ERR("IWineD3DSurface_LockRect failed with hr = %08lx\n", hr); /* keep the dib section */ return hr; } + if(This->resource.format == WINED3DFMT_P8 || + This->resource.format == WINED3DFMT_A8P8) { + unsigned int n; + if(This->palette) { + PALETTEENTRY ent[256]; + + 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; + } + } else { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + + 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].rgbReserved = 0; + } + + } + SetDIBColorTable(This->hDC, 0, 256, col); + } + *pHDC = This->hDC; TRACE("returning %p\n",*pHDC); This->Flags |= SFLAG_DCINUSE;

1 0

Stefan Dösinger : wined3d: Update the device palette if the primary palette is changed.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: d89080c67142cd693346f25753b07ad69ba66a16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d89080c67142cd693346f25… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 9 20:47:03 2006 +0200 wined3d: Update the device palette if the primary palette is changed. --- dlls/wined3d/palette.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 0ff130f..a83ff77 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -142,6 +142,17 @@ #endif } } + /* If the palette is the primary palette, set the entries to the device */ + if(This->Flags & DDPCAPS_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; }

1 0

Stefan Dösinger : wined3d: Implement WineD3DSurface palette methods.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: 275a0c2f2d26c73eda5844edfd9ad8d252a52f7b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=275a0c2f2d26c73eda5844e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 9 20:28:23 2006 +0200 wined3d: Implement WineD3DSurface palette methods. --- dlls/wined3d/surface.c | 62 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 254d225..5c95a7e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1759,18 +1759,68 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetPi } HRESULT WINAPI IWineD3DSurfaceImpl_GetPalette(IWineD3DSurface *iface, IWineD3DPalette **Pal) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + TRACE("(%p)->(%p)\n", This, Pal); + + *Pal = (IWineD3DPalette *) This->palette; + return DD_OK; } HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + RGBQUAD col[256]; + IWineD3DPaletteImpl *pal = This->palette; + unsigned int n; + TRACE("(%p)\n", This); + + if(This->resource.format == WINED3DFMT_P8 || + This->resource.format == WINED3DFMT_A8P8) + { + TRACE("Dirtifying surface\n"); + This->Flags |= SFLAG_DIRTY; + } + + TRACE("(%p): Updating the palette\n", This); + for (n=0; n<256; n++) { + col[n].rgbRed = pal->palents[n].peRed; + col[n].rgbGreen = pal->palents[n].peGreen; + col[n].rgbBlue = pal->palents[n].peBlue; + col[n].rgbReserved = 0; + } + SetDIBColorTable(This->hDC, 0, 256, col); + + return WINED3D_OK; } HRESULT WINAPI IWineD3DSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD3DPalette *Pal) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DPaletteImpl *PalImpl = (IWineD3DPaletteImpl *) Pal; + TRACE("(%p)->(%p)\n", This, Pal); + + if(This->palette != NULL) + if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) + This->palette->Flags &= ~DDPCAPS_PRIMARYSURFACE; + + 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 & DDPCAPS_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 |= DDPCAPS_PRIMARYSURFACE; + } + } + This->palette = PalImpl; + + return IWineD3DSurface_RealizePalette(iface); } HRESULT WINAPI IWineD3DSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, DDCOLORKEY *CKey) {

1 0

Stefan Dösinger : wined3d: Implement GetFlipStatus and GetBltStatus.
by Alexandre Julliard May 10, 2006

May 10, 2006

Module: wine Branch: refs/heads/master Commit: f8e8646fccd7bda285dab5339ae661d847d61b15 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8e8646fccd7bda285dab53… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 9 20:07:40 2006 +0200 wined3d: Implement GetFlipStatus and GetBltStatus. --- dlls/wined3d/surface.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dbd9958..254d225 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6,6 +6,7 @@ * Copyright 2002-2003 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber + * Copyright 2006 Stefan D�singer for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1703,13 +1704,32 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Blt(I } HRESULT WINAPI IWineD3DSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + TRACE("(%p)->(%lx)\n", This, Flags); + + switch (Flags) + { + case DDGBS_CANBLT: + case DDGBS_ISBLTDONE: + return DD_OK; + + default: + return DDERR_INVALIDPARAMS; + } } HRESULT WINAPI IWineD3DSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + /* XXX: DDERR_INVALIDSURFACETYPE */ + + TRACE("(%p)->(%08lx)\n",iface,Flags); + switch (Flags) { + case DDGFS_CANFLIP: + case DDGFS_ISFLIPDONE: + return DD_OK; + + default: + return DDERR_INVALIDPARAMS; + } } HRESULT WINAPI IWineD3DSurfaceImpl_IsLost(IWineD3DSurface *iface) {

1 0