February 2008 - Wine-Commits

Alexander Dorofeyev : ddraw/tests: Add test for palette handling in IDirect3DTexture_Load.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 74c380cb7b6594ba0a917cf27d33b04b859c68e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c380cb7b6594ba0a917cf27… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Feb 17 17:36:56 2008 -0800 ddraw/tests: Add test for palette handling in IDirect3DTexture_Load. --- dlls/ddraw/tests/d3d.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f4e2c80..e51f476 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1347,6 +1347,159 @@ static void Direct3D1Test(void) ok(hr == D3D_OK, "IDirect3DDevice_DeleteViewport returned %08x\n", hr); } +static BOOL colortables_check_equality(PALETTEENTRY table1[256], PALETTEENTRY table2[256]) +{ + int i; + + for (i = 0; i < 256; i++) { + if (table1[i].peRed != table2[i].peRed || table1[i].peGreen != table2[i].peGreen || + table1[i].peBlue != table2[i].peBlue) return FALSE; + } + + return TRUE; +} + +/* test palette handling in IDirect3DTexture_Load */ +static void TextureLoadTest(void) +{ + IDirectDrawSurface *TexSurface = NULL; + IDirect3DTexture *Texture = NULL; + IDirectDrawSurface *TexSurface2 = NULL; + IDirect3DTexture *Texture2 = NULL; + IDirectDrawPalette *palette = NULL; + IDirectDrawPalette *palette2 = NULL; + IDirectDrawPalette *palette_tmp = NULL; + PALETTEENTRY table1[256], table2[256], table_tmp[256]; + HRESULT hr; + DDSURFACEDESC ddsd; + int i; + + memset (&ddsd, 0, sizeof (ddsd)); + ddsd.dwSize = sizeof (ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwHeight = 128; + ddsd.dwWidth = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 8; + + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &TexSurface, NULL); + ok(hr==D3D_OK, "CreateSurface returned: %x\n", hr); + if (FAILED(hr)) { + skip("IDirectDraw_CreateSurface failed; skipping further tests\n"); + goto cleanup; + } + + hr = IDirectDrawSurface_QueryInterface(TexSurface, &IID_IDirect3DTexture, + (void *)&Texture); + ok(hr==D3D_OK, "IDirectDrawSurface_QueryInterface returned: %x\n", hr); + if (FAILED(hr)) { + skip("Can't get IDirect3DTexture interface; skipping further tests\n"); + goto cleanup; + } + + hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &TexSurface2, NULL); + ok(hr==D3D_OK, "CreateSurface returned: %x\n", hr); + if (FAILED(hr)) { + skip("IDirectDraw_CreateSurface failed; skipping further tests\n"); + goto cleanup; + } + + hr = IDirectDrawSurface_QueryInterface(TexSurface2, &IID_IDirect3DTexture, + (void *)&Texture2); + ok(hr==D3D_OK, "IDirectDrawSurface_QueryInterface returned: %x\n", hr); + if (FAILED(hr)) { + skip("Can't get IDirect3DTexture interface; skipping further tests\n"); + goto cleanup; + } + + /* test Load when both textures have no palette */ + hr = IDirect3DTexture_Load(Texture2, Texture); + ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr); + + for (i = 0; i < 256; i++) { + table1[i].peRed = i; + table1[i].peGreen = i; + table1[i].peBlue = i; + table1[i].peFlags = 0; + } + + hr = IDirectDraw_CreatePalette(DirectDraw1, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, table1, &palette, NULL); + ok(hr == DD_OK, "CreatePalette returned %08x\n", hr); + if (FAILED(hr)) { + skip("IDirectDraw_CreatePalette failed; skipping further tests\n"); + goto cleanup; + } + + /* test Load when source texture has palette and destination has no palette */ + hr = IDirectDrawSurface_SetPalette(TexSurface, palette); + ok(hr == DD_OK, "IDirectDrawSurface_SetPalette returned %08x\n", hr); + hr = IDirect3DTexture_Load(Texture2, Texture); + ok(hr == DDERR_NOPALETTEATTACHED, "IDirect3DTexture_Load returned %08x\n", hr); + + for (i = 0; i < 256; i++) { + table2[i].peRed = 255 - i; + table2[i].peGreen = 255 - i; + table2[i].peBlue = 255 - i; + table2[i].peFlags = 0; + } + + hr = IDirectDraw_CreatePalette(DirectDraw1, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, table2, &palette2, NULL); + ok(hr == DD_OK, "CreatePalette returned %08x\n", hr); + if (FAILED(hr)) { + skip("IDirectDraw_CreatePalette failed; skipping further tests\n"); + goto cleanup; + } + + /* test Load when source has no palette and destination has a palette */ + hr = IDirectDrawSurface_SetPalette(TexSurface, NULL); + ok(hr == DD_OK, "IDirectDrawSurface_SetPalette returned %08x\n", hr); + hr = IDirectDrawSurface_SetPalette(TexSurface2, palette2); + ok(hr == DD_OK, "IDirectDrawSurface_SetPalette returned %08x\n", hr); + hr = IDirect3DTexture_Load(Texture2, Texture); + ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr); + hr = IDirectDrawSurface_GetPalette(TexSurface2, &palette_tmp); + ok(hr == DD_OK, "IDirectDrawSurface_GetPalette returned %08x\n", hr); + if (!palette_tmp) { + skip("IDirectDrawSurface_GetPalette failed; skipping color table check\n"); + goto cleanup; + } else { + hr = IDirectDrawPalette_GetEntries(palette_tmp, 0, 0, 256, table_tmp); + ok(hr == DD_OK, "IDirectDrawPalette_GetEntries returned %08x\n", hr); + ok(colortables_check_equality(table2, table_tmp), "Unexpected palettized texture color table\n"); + IDirectDrawPalette_Release(palette_tmp); + } + + /* test Load when both textures have palettes */ + hr = IDirectDrawSurface_SetPalette(TexSurface, palette); + ok(hr == DD_OK, "IDirectDrawSurface_SetPalette returned %08x\n", hr); + hr = IDirect3DTexture_Load(Texture2, Texture); + ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr); + hr = IDirect3DTexture_Load(Texture2, Texture); + ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr); + hr = IDirectDrawSurface_GetPalette(TexSurface2, &palette_tmp); + ok(hr == DD_OK, "IDirectDrawSurface_GetPalette returned %08x\n", hr); + if (!palette_tmp) { + skip("IDirectDrawSurface_GetPalette failed; skipping color table check\n"); + goto cleanup; + } else { + hr = IDirectDrawPalette_GetEntries(palette_tmp, 0, 0, 256, table_tmp); + ok(hr == DD_OK, "IDirectDrawPalette_GetEntries returned %08x\n", hr); + ok(colortables_check_equality(table1, table_tmp), "Unexpected palettized texture color table\n"); + IDirectDrawPalette_Release(palette_tmp); + } + + cleanup: + + if (palette) IDirectDrawPalette_Release(palette); + if (palette2) IDirectDrawPalette_Release(palette2); + if (TexSurface) IDirectDrawSurface_Release(TexSurface); + if (Texture) IDirect3DTexture_Release(Texture); + if (TexSurface2) IDirectDrawSurface_Release(TexSurface2); + if (Texture2) IDirect3DTexture_Release(Texture2); +} + START_TEST(d3d) { init_function_pointers(); @@ -1372,6 +1525,7 @@ START_TEST(d3d) skip("Skipping d3d1 tests\n"); } else { Direct3D1Test(); + TextureLoadTest(); D3D1_releaseObjects(); } }

1 0

Mikołaj Zalewski : devenum: Convert resource file to UTF-8.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: b536702b60378f18ef338769adb9be1746ded59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b536702b60378f18ef338769a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 18 17:15:42 2008 +0100 devenum: Convert resource file to UTF-8. --- dlls/devenum/devenum.rc | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index cde4780..1f22158 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) + #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -45,10 +47,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { - 7 "DirectSound par d�faut" - 8 "DirectSound�: %s" - 9 "P�riph�rique WaveOut par d�faut" - 10 "P�riph�rique MidiOut par d�faut" + 7 "DirectSound par défaut" + 8 "DirectSound : %s" + 9 "Périphérique WaveOut par défaut" + 10 "Périphérique MidiOut par défaut" } STRINGTABLE DISCARDABLE @@ -56,8 +58,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { 7 "Standard DirectSound" 8 "DirectSound: %s" - 9 "Standard WaveOut - Ger�t" - 10 "Standard MidiOut - Ger�t" + 9 "Standard WaveOut - Gerät" + 10 "Standard MidiOut - Gerät" } STRINGTABLE DISCARDABLE @@ -72,10 +74,10 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT { - 7 "DirectSound padr�o" + 7 "DirectSound padrão" 8 "DirectSound: %s" - 9 "Dispositivo padr�o WaveOut" - 10 "Dispositivo padr�o MidiOut" + 9 "Dispositivo padrão WaveOut" + 10 "Dispositivo padrão MidiOut" } STRINGTABLE DISCARDABLE @@ -90,10 +92,10 @@ LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT { - 7 "Dafaultn� DirectSound" + 7 "Dafaultní DirectSound" 8 "DirectSound: %s" - 9 "Standardn� za��zen� WaveOut" - 10 "Standardn� za��zen� MidiOut" + 9 "Standardní zařízení WaveOut" + 10 "Standardní zařízení MidiOut" } STRINGTABLE DISCARDABLE

1 0

Alexander Dorofeyev : ddraw: Fix palette handling in IDirect3DTexture_Load.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: ed44f9d13003307d385d88f120bc7fe5d729332a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed44f9d13003307d385d88f12… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Feb 17 17:36:46 2008 -0800 ddraw: Fix palette handling in IDirect3DTexture_Load. This fixes a potential refcounting problem and makes the function fail with NULL destination texture's palette and non-NULL source palette like it does on native. --- dlls/ddraw/texture.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index 7542ef2..5d5bd52 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -365,15 +365,11 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, } } - /* After seeing some logs, not sure at all about this... */ - if (pal == NULL) - { - IWineD3DSurface_SetPalette(This->WineD3DSurface, wine_pal); - if (pal_src != NULL) IDirectDrawPalette_AddRef(pal_src); - } - else if (pal_src != NULL) + if (pal_src != NULL) { PALETTEENTRY palent[256]; + + if (pal == NULL) return DDERR_NOPALETTEATTACHED; IDirectDrawPalette_GetEntries(pal_src, 0, 0, 256, palent); IDirectDrawPalette_SetEntries(pal, 0, 0, 256, palent); }

1 0

Alexander Dorofeyev : ddraw/tests: Add test for branch instruction with non-zero offset.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: ddd0ec16701e53d1300e3321303888bb9c2d9bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddd0ec16701e53d1300e33213… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Feb 17 17:36:39 2008 -0800 ddraw/tests: Add test for branch instruction with non-zero offset. --- dlls/ddraw/tests/d3d.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index fb9e51e..9dac748 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -979,6 +979,8 @@ static void Direct3D1Test(void) hr = IDirect3DExecuteBuffer_Lock(exebuf, &desc); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_Lock failed: %08x\n", hr); + + memset(desc.lpData, 0, 128); instr = desc.lpData; instr[idx].bOpcode = D3DOP_BRANCHFORWARD; instr[idx].bSize = sizeof(*branch); @@ -992,7 +994,7 @@ static void Direct3D1Test(void) idx += (sizeof(*branch) / sizeof(*instr)); instr[idx].bOpcode = D3DOP_EXIT; instr[idx].bSize = 0; - instr[idx].bSize = 0; + instr[idx].wCount = 0; hr = IDirect3DExecuteBuffer_Unlock(exebuf); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_Unlock failed: %08x\n", hr); @@ -1020,6 +1022,34 @@ static void Direct3D1Test(void) hr = IDirect3DDevice_Execute(dev1, exebuf, vp, D3DEXECUTE_CLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute returned %08x\n", hr); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + + hr = IDirect3DExecuteBuffer_Lock(exebuf, &desc); + ok(hr == D3D_OK, "IDirect3DExecuteBuffer_Lock failed: %08x\n", hr); + + memset(desc.lpData, 0, 128); + instr = desc.lpData; + idx = 0; + instr[idx].bOpcode = D3DOP_BRANCHFORWARD; + instr[idx].bSize = sizeof(*branch); + instr[idx].wCount = 1; + idx++; + branch = (D3DBRANCH *) &instr[idx]; + branch->dwMask = 0x0; + branch->dwValue = 1; + branch->bNegate = TRUE; + branch->dwOffset = 64; + instr = (D3DINSTRUCTION*)((char*)desc.lpData + 64); + instr[0].bOpcode = D3DOP_EXIT; + instr[0].bSize = 0; + instr[0].wCount = 0; + hr = IDirect3DExecuteBuffer_Unlock(exebuf); + ok(hr == D3D_OK, "IDirect3DExecuteBuffer_Unlock failed: %08x\n", hr); + + hr = IDirect3DDevice_Execute(dev1, exebuf, vp, D3DEXECUTE_CLIPPED); + ok(hr == D3D_OK, "IDirect3DDevice_Execute returned %08x\n", hr); + memset(&transformdata, 0, sizeof(transformdata)); transformdata.dwSize = sizeof(transformdata); transformdata.lpIn = (void *) testverts;

1 0

Alexander Dorofeyev : ddraw: Fix executebuffer branching with non-zero offset.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 4981eda8951a5bbe0d4b6aea7777078903c05f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4981eda8951a5bbe0d4b6aea7… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Feb 17 17:36:35 2008 -0800 ddraw: Fix executebuffer branching with non-zero offset. Fixes a crash in Moto Racer 2. --- dlls/ddraw/executebuffer.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 49b6d6c..fce3c4f 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -524,12 +524,18 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, if ((This->data.dsStatus.dwStatus & ci->dwMask) == ci->dwValue) { if (!ci->bNegate) { TRACE(" Branch to %d\n", ci->dwOffset); - instr = (char*)current + ci->dwOffset; + if (ci->dwOffset) { + instr = (char*)current + ci->dwOffset; + break; + } } } else { if (ci->bNegate) { TRACE(" Branch to %d\n", ci->dwOffset); - instr = (char*)current + ci->dwOffset; + if (ci->dwOffset) { + instr = (char*)current + ci->dwOffset; + break; + } } }

1 0

Roderick Colenbrander : gdi32: GetPaletteEntries should not filter peFlags (test included).
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: c937634376838ef81aa3543f8f1a7e49b1e9ca50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c937634376838ef81aa3543f8… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Feb 17 13:57:16 2008 +0000 gdi32: GetPaletteEntries should not filter peFlags (test included). --- dlls/gdi32/palette.c | 3 --- dlls/gdi32/tests/palette.c | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index ddf597e..1b6a966 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -300,9 +300,6 @@ UINT WINAPI GetPaletteEntries( } memcpy( entries, &palPtr->logpalette.palPalEntry[start], count * sizeof(PALETTEENTRY) ); - for( numEntries = 0; numEntries < count ; numEntries++ ) - if (entries[numEntries].peFlags & 0xF0) - entries[numEntries].peFlags = 0; } GDI_ReleaseObj( hpalette ); diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 40e6c7c..c9455ca 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -120,7 +120,33 @@ static void test_DIB_PAL_COLORS(void) { ReleaseDC( NULL, hdc ); } +static void test_palette_entries(void) +{ + char logpalettebuf[sizeof(LOGPALETTE) + sizeof(logpalettedata)]; + PLOGPALETTE logpalette = (PLOGPALETTE)logpalettebuf; + HPALETTE hpal; + UINT res=0; + PALETTEENTRY palEntry = { 0x1, 0x2, 0x3, 0xff }; + PALETTEENTRY getEntryResult; + + /* Initalize the logical palette with a few colours */ + logpalette->palVersion = 0x300; + logpalette->palNumEntries = 8; + memcpy( logpalette->palPalEntry, logpalettedata, sizeof(logpalettedata) ); + hpal = CreatePalette( logpalette ); + + /* Set a new entry with peFlags to 0xff */ + SetPaletteEntries(hpal, 0, 1, &palEntry); + + /* Retrieve the entry to see if GDI32 performs any filtering on peFlags */ + res = GetPaletteEntries(hpal, 0, 1, &getEntryResult); + ok(res == 1, "GetPaletteEntries should have returned 1 but returned %d\n", res); + + ok( palEntry.peFlags == getEntryResult.peFlags, "palEntry.peFlags (%#x) != getEntryResult.peFlags (%#x)\n", palEntry.peFlags, getEntryResult.peFlags ); +} + START_TEST(palette) { test_DIB_PAL_COLORS(); + test_palette_entries(); }

1 0

Roderick Colenbrander : wined3d: When DDCAPS_ALLOW256 is set, palette entry 0 and 255 are filled with black and white.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 1079f3740780ba078e9490650eb03f384a5e28b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1079f3740780ba078e9490650… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Feb 17 17:02:17 2008 +0000 wined3d: When DDCAPS_ALLOW256 is set, palette entry 0 and 255 are filled with black and white. --- dlls/ddraw/tests/dsurface.c | 74 +++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/palette.c | 14 ++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 0f522db..cc7760e 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2364,6 +2364,79 @@ static void BltParamTest(void) IDirectDrawSurface_Release(surface2); } +static void PaletteTest(void) +{ + HRESULT hr; + IDirectDrawPalette *palette; + PALETTEENTRY Table[256]; + PALETTEENTRY palEntries[256]; + int i; + + for(i=0; i<256; i++) + { + Table[i].peRed = 0xff; + Table[i].peGreen = 0; + Table[i].peBlue = 0; + Table[i].peFlags = 0; + } + + /* Create a 8bit palette without DDPCAPS_ALLOW256 set */ + hr = IDirectDraw_CreatePalette(lpDD, DDPCAPS_8BIT, Table, &palette, NULL); + ok(hr == DD_OK, "CreatePalette failed with %08x\n", hr); + + /* Read back the palette and verify the entries. Without DDPCAPS_ALLOW256 set + / entry 0 and 255 should have been overwritten with black and white */ + IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); + ok(hr == DD_OK, "GetEntries failed with %08x\n", hr); + if(hr == DD_OK) + { + ok((palEntries[0].peRed == 0) && (palEntries[0].peGreen == 0) && (palEntries[0].peBlue == 0), + "Palette entry 0 of a palette without DDPCAPS_ALLOW256 set should be (0,0,0) but it is (%d,%d,%d)\n", + palEntries[0].peRed, palEntries[0].peGreen, palEntries[0].peBlue); + ok((palEntries[255].peRed == 255) && (palEntries[255].peGreen == 255) && (palEntries[255].peBlue == 255), + "Palette entry 255 of a palette without DDPCAPS_ALLOW256 set should be (255,255,255) but it is (%d,%d,%d)\n", + palEntries[255].peRed, palEntries[255].peGreen, palEntries[255].peBlue); + + /* Entry 1-254 should contain red */ + for(i=1; i<255; i++) + ok((palEntries[i].peRed == 255) && (palEntries[i].peGreen == 0) && (palEntries[i].peBlue == 0), + "Palette entry %d should have contained (255,0,0) but was set to %d,%d,%d)\n", + i, palEntries[i].peRed, palEntries[i].peGreen, palEntries[i].peBlue); + } + + /* CreatePalette without DDPCAPS_ALLOW256 ignores entry 0 and 255, + / now check we are able to update the entries afterwards. */ + IDirectDrawPalette_SetEntries(palette , 0, 0, 256, &Table[0]); + ok(hr == DD_OK, "SetEntries failed with %08x\n", hr); + IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); + ok(hr == DD_OK, "GetEntries failed with %08x\n", hr); + if(hr == DD_OK) + { + ok((palEntries[0].peRed == 0) && (palEntries[0].peGreen == 0) && (palEntries[0].peBlue == 0), + "Palette entry 0 should have been set to (0,0,0) but it contains (%d,%d,%d)\n", + palEntries[0].peRed, palEntries[0].peGreen, palEntries[0].peBlue); + ok((palEntries[255].peRed == 255) && (palEntries[255].peGreen == 255) && (palEntries[255].peBlue == 255), + "Palette entry 255 should have been set to (255,255,255) but it contains (%d,%d,%d)\n", + palEntries[255].peRed, palEntries[255].peGreen, palEntries[255].peBlue); + } + IDirectDrawPalette_Release(palette); + + /* Create a 8bit palette with DDPCAPS_ALLOW256 set */ + hr = IDirectDraw_CreatePalette(lpDD, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); + ok(hr == DD_OK, "CreatePalette failed with %08x\n", hr); + IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); + ok(hr == DD_OK, "GetEntries failed with %08x\n", hr); + if(hr == DD_OK) + { + /* All entries should contain red */ + for(i=0; i<256; i++) + ok((palEntries[i].peRed == 255) && (palEntries[i].peGreen == 0) && (palEntries[i].peBlue == 0), + "Palette entry %d should have contained (255,0,0) but was set to %d,%d,%d)\n", + i, palEntries[i].peRed, palEntries[i].peGreen, palEntries[i].peBlue); + } + IDirectDrawPalette_Release(palette); +} + static void StructSizeTest(void) { IDirectDrawSurface *surface1; @@ -2491,5 +2564,6 @@ START_TEST(dsurface) PrivateDataTest(); BltParamTest(); StructSizeTest(); + PaletteTest(); ReleaseDirectDraw(); } diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 6548c97..df72246 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -111,6 +111,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DW IWineD3DResourceImpl *res; TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt); + TRACE("Palette flags: %#x\n", This->Flags); if (This->Flags & WINEDDPCAPS_8BITENTRIES) { unsigned int i; @@ -122,6 +123,19 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DW else { memcpy(This->palents+Start, PalEnt, Count * sizeof(PALETTEENTRY)); + /* When WINEDDCAPS_ALLOW256 isn't set we need to override entry 0 with black and 255 with white */ + if(!(This->Flags & WINEDDPCAPS_ALLOW256)) + { + TRACE("WINEDDPCAPS_ALLOW256 set, overriding palette entry 0 with black and 255 with white\n"); + This->palents[0].peRed = 0; + This->palents[0].peGreen = 0; + This->palents[0].peBlue = 0; + + This->palents[255].peRed = 255; + This->palents[255].peGreen = 255; + This->palents[255].peBlue = 255; + } + if (This->hpal) SetPaletteEntries(This->hpal, Start, Count, This->palents+Start); }

1 0

Alexandre Julliard : gdi32: Move a few more gdiobj functions to gdi16.c.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 30e2cb1616b9c5f0e888e6e58d463cf1ca34c19f URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e2cb1616b9c5f0e888e6e58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 17:53:43 2008 +0100 gdi32: Move a few more gdiobj functions to gdi16.c. --- dlls/gdi32/gdi16.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdiobj.c | 74 ------------------------------------------------- 2 files changed, 77 insertions(+), 74 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 8e9d90d..069c528 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -2268,6 +2268,31 @@ BOOL16 WINAPI FastWindowFrame16( HDC16 hdc, const RECT16 *rect, /*********************************************************************** + * GdiInit2 (GDI.403) + * + * See "Undocumented Windows" + * + * PARAMS + * h1 [I] GDI object + * h2 [I] global data + */ +HANDLE16 WINAPI GdiInit216( HANDLE16 h1, HANDLE16 h2 ) +{ + FIXME("(%04x, %04x), stub.\n", h1, h2); + if (h2 == 0xffff) return 0xffff; /* undefined return value */ + return h1; /* FIXME: should be the memory handle of h1 */ +} + + +/*********************************************************************** + * FinalGdiInit (GDI.405) + */ +void WINAPI FinalGdiInit16( HBRUSH16 hPattern /* [in] fill pattern of desktop */ ) +{ +} + + +/*********************************************************************** * CreateUserBitmap (GDI.407) */ HBITMAP16 WINAPI CreateUserBitmap16( INT16 width, INT16 height, UINT16 planes, @@ -2456,6 +2481,39 @@ HRGN16 WINAPI CreatePolyPolygonRgn16( const POINT16 *points, /*********************************************************************** + * GdiSeeGdiDo (GDI.452) + */ +DWORD WINAPI GdiSeeGdiDo16( WORD wReqType, WORD wParam1, WORD wParam2, + WORD wParam3 ) +{ + DWORD ret = ~0U; + + switch (wReqType) + { + case 0x0001: /* LocalAlloc */ + WARN("LocalAlloc16(%x, %x): ignoring\n", wParam1, wParam3); + ret = 0; + break; + case 0x0002: /* LocalFree */ + WARN("LocalFree16(%x): ignoring\n", wParam1); + ret = 0; + break; + case 0x0003: /* LocalCompact */ + WARN("LocalCompact16(%x): ignoring\n", wParam3); + ret = 65000; /* lie about the amount of free space */ + break; + case 0x0103: /* LocalHeap */ + WARN("LocalHeap16(): ignoring\n"); + break; + default: + WARN("(wReqType=%04x): Unknown\n", wReqType); + break; + } + return ret; +} + + +/*********************************************************************** * SetObjectOwner (GDI.461) */ void WINAPI SetObjectOwner16( HGDIOBJ16 handle, HANDLE16 owner ) @@ -3021,6 +3079,25 @@ DWORD WINAPI GetRegionData16( HRGN16 hrgn, DWORD count, LPRGNDATA rgndata ) /*********************************************************************** + * GdiFreeResources (GDI.609) + */ +WORD WINAPI GdiFreeResources16( DWORD reserve ) +{ + return 90; /* lie about it, it shouldn't matter */ +} + + +/*********************************************************************** + * GdiSignalProc32 (GDI.610) + */ +WORD WINAPI GdiSignalProc( UINT uCode, DWORD dwThreadOrProcessID, + DWORD dwFlags, HMODULE16 hModule ) +{ + return 0; +} + + +/*********************************************************************** * GetTextCharset (GDI.612) */ UINT16 WINAPI GetTextCharset16( HDC16 hdc ) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index e05c1b9..34dafaf 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1292,80 +1292,6 @@ DWORD WINAPI GdiSetBatchLimit( DWORD limit ) } -/*********************************************************************** - * GdiSeeGdiDo (GDI.452) - */ -DWORD WINAPI GdiSeeGdiDo16( WORD wReqType, WORD wParam1, WORD wParam2, - WORD wParam3 ) -{ - DWORD ret = ~0U; - - switch (wReqType) - { - case 0x0001: /* LocalAlloc */ - WARN("LocalAlloc16(%x, %x): ignoring\n", wParam1, wParam3); - ret = 0; - break; - case 0x0002: /* LocalFree */ - WARN("LocalFree16(%x): ignoring\n", wParam1); - ret = 0; - break; - case 0x0003: /* LocalCompact */ - WARN("LocalCompact16(%x): ignoring\n", wParam3); - ret = 65000; /* lie about the amount of free space */ - break; - case 0x0103: /* LocalHeap */ - WARN("LocalHeap16(): ignoring\n"); - break; - default: - WARN("(wReqType=%04x): Unknown\n", wReqType); - break; - } - return ret; -} - -/*********************************************************************** - * GdiSignalProc32 (GDI.610) - */ -WORD WINAPI GdiSignalProc( UINT uCode, DWORD dwThreadOrProcessID, - DWORD dwFlags, HMODULE16 hModule ) -{ - return 0; -} - -/*********************************************************************** - * GdiInit2 (GDI.403) - * - * See "Undocumented Windows" - * - * PARAMS - * h1 [I] GDI object - * h2 [I] global data - */ -HANDLE16 WINAPI GdiInit216( HANDLE16 h1, HANDLE16 h2 ) -{ - FIXME("(%04x, %04x), stub.\n", h1, h2); - if (h2 == 0xffff) - return 0xffff; /* undefined return value */ - return h1; /* FIXME: should be the memory handle of h1 */ -} - -/*********************************************************************** - * FinalGdiInit (GDI.405) - */ -void WINAPI FinalGdiInit16( HBRUSH16 hPattern /* [in] fill pattern of desktop */ ) -{ -} - -/*********************************************************************** - * GdiFreeResources (GDI.609) - */ -WORD WINAPI GdiFreeResources16( DWORD reserve ) -{ - return 90; /* lie about it, it shouldn't matter */ -} - - /******************************************************************* * GetColorAdjustment [GDI32.@] *

1 0

Alexandre Julliard : gdi32: Get rid of the 16-bit GetObject functions.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: aa500d266f0ee1efa6c3b6af824ce1931704b5be URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa500d266f0ee1efa6c3b6af8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 17:50:35 2008 +0100 gdi32: Get rid of the 16-bit GetObject functions. --- dlls/gdi32/bitmap.c | 48 ---------------------------------------------- dlls/gdi32/brush.c | 19 ------------------ dlls/gdi32/dc.c | 1 - dlls/gdi32/font.c | 17 ---------------- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/palette.c | 1 - dlls/gdi32/pen.c | 25 ----------------------- dlls/gdi32/region.c | 1 - 8 files changed, 0 insertions(+), 113 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index c468920..94061f8 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -34,14 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(bitmap); static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ); -static INT BITMAP_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static INT BITMAP_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static BOOL BITMAP_DeleteObject( HGDIOBJ handle, void *obj ); static const struct gdi_obj_funcs bitmap_funcs = { BITMAP_SelectObject, /* pSelectObject */ - BITMAP_GetObject16, /* pGetObject16 */ BITMAP_GetObject, /* pGetObjectA */ BITMAP_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ @@ -668,52 +666,6 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle, void *obj ) /*********************************************************************** - * BITMAP_GetObject16 - */ -static INT BITMAP_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ) -{ - BITMAPOBJ *bmp = obj; - - if (bmp->dib) - { - if ( count <= sizeof(BITMAP16) ) - { - BITMAP *bmp32 = &bmp->dib->dsBm; - BITMAP16 bmp16; - bmp16.bmType = bmp32->bmType; - bmp16.bmWidth = bmp32->bmWidth; - bmp16.bmHeight = bmp32->bmHeight; - bmp16.bmWidthBytes = bmp32->bmWidthBytes; - bmp16.bmPlanes = bmp32->bmPlanes; - bmp16.bmBitsPixel = bmp32->bmBitsPixel; - bmp16.bmBits = (SEGPTR)0; - memcpy( buffer, &bmp16, count ); - return count; - } - else - { - FIXME("not implemented for DIBs: count %d\n", count); - return 0; - } - } - else - { - BITMAP16 bmp16; - bmp16.bmType = bmp->bitmap.bmType; - bmp16.bmWidth = bmp->bitmap.bmWidth; - bmp16.bmHeight = bmp->bitmap.bmHeight; - bmp16.bmWidthBytes = bmp->bitmap.bmWidthBytes; - bmp16.bmPlanes = bmp->bitmap.bmPlanes; - bmp16.bmBitsPixel = bmp->bitmap.bmBitsPixel; - bmp16.bmBits = (SEGPTR)0; - if (count < sizeof(bmp16)) return 0; - memcpy( buffer, &bmp16, sizeof(bmp16) ); - return sizeof(bmp16); - } -} - - -/*********************************************************************** * BITMAP_GetObject */ static INT BITMAP_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 95da9b1..0a6b652 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -43,14 +43,12 @@ typedef struct #define NB_HATCH_STYLES 6 static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ); -static INT BRUSH_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static INT BRUSH_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static BOOL BRUSH_DeleteObject( HGDIOBJ handle, void *obj ); static const struct gdi_obj_funcs brush_funcs = { BRUSH_SelectObject, /* pSelectObject */ - BRUSH_GetObject16, /* pGetObject16 */ BRUSH_GetObject, /* pGetObjectA */ BRUSH_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ @@ -425,23 +423,6 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle, void *obj ) /*********************************************************************** - * BRUSH_GetObject16 - */ -static INT BRUSH_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ) -{ - BRUSHOBJ *brush = obj; - LOGBRUSH16 logbrush; - - logbrush.lbStyle = brush->logbrush.lbStyle; - logbrush.lbColor = brush->logbrush.lbColor; - logbrush.lbHatch = brush->logbrush.lbHatch; - if (count > sizeof(logbrush)) count = sizeof(logbrush); - memcpy( buffer, &logbrush, count ); - return count; -} - - -/*********************************************************************** * BRUSH_GetObject */ static INT BRUSH_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3678791..3c3f4ce 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -44,7 +44,6 @@ static BOOL DC_DeleteObject( HGDIOBJ handle, void *obj ); static const struct gdi_obj_funcs dc_funcs = { NULL, /* pSelectObject */ - NULL, /* pGetObject16 */ NULL, /* pGetObjectA */ NULL, /* pGetObjectW */ NULL, /* pUnrealizeObject */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3624e97..86b3003 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -87,7 +87,6 @@ static inline INT INTERNAL_YWSTODS(DC *dc, INT height) } static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ); -static INT FONT_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static INT FONT_GetObjectA( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static INT FONT_GetObjectW( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static BOOL FONT_DeleteObject( HGDIOBJ handle, void *obj ); @@ -95,7 +94,6 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle, void *obj ); static const struct gdi_obj_funcs font_funcs = { FONT_SelectObject, /* pSelectObject */ - FONT_GetObject16, /* pGetObject16 */ FONT_GetObjectA, /* pGetObjectA */ FONT_GetObjectW, /* pGetObjectW */ NULL, /* pUnrealizeObject */ @@ -617,21 +615,6 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) /*********************************************************************** - * FONT_GetObject16 - */ -static INT FONT_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ) -{ - FONTOBJ *font = obj; - LOGFONT16 lf16; - - FONT_LogFontWTo16( &font->logfont, &lf16 ); - - if (count > sizeof(LOGFONT16)) count = sizeof(LOGFONT16); - memcpy( buffer, &lf16, count ); - return count; -} - -/*********************************************************************** * FONT_GetObjectA */ static INT FONT_GetObjectA( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 51932b0..dc66a0c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -72,7 +72,6 @@ typedef struct { struct gdi_obj_funcs { HGDIOBJ (*pSelectObject)( HGDIOBJ handle, HDC hdc ); - INT (*pGetObject16)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); INT (*pGetObjectA)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); INT (*pGetObjectW)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); BOOL (*pUnrealizeObject)( HGDIOBJ handle, void *obj ); diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index b55a6f8..ddf597e 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -52,7 +52,6 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle, void *obj ); static const struct gdi_obj_funcs palette_funcs = { NULL, /* pSelectObject */ - PALETTE_GetObject, /* pGetObject16 */ PALETTE_GetObject, /* pGetObjectA */ PALETTE_GetObject, /* pGetObjectW */ PALETTE_UnrealizeObject, /* pUnrealizeObject */ diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 971dadd..81fcc1d 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -28,7 +28,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/wingdi16.h" #include "gdi_private.h" #include "wine/debug.h" @@ -43,13 +42,11 @@ typedef struct static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ); -static INT PEN_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static INT PEN_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static const struct gdi_obj_funcs pen_funcs = { PEN_SelectObject, /* pSelectObject */ - PEN_GetObject16, /* pGetObject16 */ PEN_GetObject, /* pGetObjectA */ PEN_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ @@ -248,28 +245,6 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) /*********************************************************************** - * PEN_GetObject16 - */ -static INT PEN_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ) -{ - PENOBJ *pen = obj; - LOGPEN16 *logpen; - - if (!buffer) return sizeof(LOGPEN16); - - if (count < sizeof(LOGPEN16)) return 0; - - logpen = buffer; - logpen->lopnStyle = pen->logpen.elpPenStyle; - logpen->lopnColor = pen->logpen.elpColor; - logpen->lopnWidth.x = pen->logpen.elpWidth; - logpen->lopnWidth.y = 0; - - return sizeof(LOGPEN16); -} - - -/*********************************************************************** * PEN_GetObject */ static INT PEN_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index b06727d..6494840 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -126,7 +126,6 @@ static BOOL REGION_DeleteObject( HGDIOBJ handle, void *obj ); static const struct gdi_obj_funcs region_funcs = { REGION_SelectObject, /* pSelectObject */ - NULL, /* pGetObject16 */ NULL, /* pGetObjectA */ NULL, /* pGetObjectW */ NULL, /* pUnrealizeObject */

1 0

Alexandre Julliard : gdi32: Reimplemented IsGDIObject16 and moved it to gdi16.c.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 1fdae2b2a5b75ca8f7c64bda8f973280107c46ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdae2b2a5b75ca8f7c64bda8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 17:26:31 2008 +0100 gdi32: Reimplemented IsGDIObject16 and moved it to gdi16.c. --- dlls/gdi32/gdi16.c | 33 +++++++++++++++++++++++++++++++++ dlls/gdi32/gdiobj.c | 20 -------------------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index b0cea2e..8d7875b 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -2357,6 +2357,39 @@ void WINAPI SetObjectOwner16( HGDIOBJ16 handle, HANDLE16 owner ) /*********************************************************************** + * IsGDIObject (GDI.462) + * + * returns type of object if valid (W95 system programming secrets p. 264-5) + */ +BOOL16 WINAPI IsGDIObject16( HGDIOBJ16 handle16 ) +{ + static const BYTE type_map[] = + { + 0, /* bad */ + 1, /* OBJ_PEN */ + 2, /* OBJ_BRUSH */ + 7, /* OBJ_DC */ + 9, /* OBJ_METADC */ + 4, /* OBJ_PAL */ + 3, /* OBJ_FONT */ + 5, /* OBJ_BITMAP */ + 6, /* OBJ_REGION */ + 10, /* OBJ_METAFILE */ + 7, /* OBJ_MEMDC */ + 0, /* OBJ_EXTPEN */ + 9, /* OBJ_ENHMETADC */ + 12, /* OBJ_ENHMETAFILE */ + 0 /* OBJ_COLORSPACE */ + }; + + UINT type = GetObjectType( HGDIOBJ_32( handle16 )); + + if (type >= sizeof(type_map)/sizeof(type_map[0])) return 0; + return type_map[type]; +} + + +/*********************************************************************** * RectVisible (GDI.465) * RectVisibleOld (GDI.104) */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index e2c9533..560d519 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1257,26 +1257,6 @@ INT WINAPI EnumObjects( HDC hdc, INT nObjType, /*********************************************************************** - * IsGDIObject (GDI.462) - * - * returns type of object if valid (W95 system programming secrets p. 264-5) - */ -BOOL16 WINAPI IsGDIObject16( HGDIOBJ16 handle16 ) -{ - UINT16 magic = 0; - HGDIOBJ handle = HGDIOBJ_32( handle16 ); - - GDIOBJHDR *object = GDI_GetObjPtr( handle, MAGIC_DONTCARE ); - if (object) - { - magic = GDIMAGIC(object->wMagic) - FIRST_MAGIC + 1; - GDI_ReleaseObj( handle ); - } - return magic; -} - - -/*********************************************************************** * SetObjectOwner (GDI32.@) */ void WINAPI SetObjectOwner( HGDIOBJ handle, HANDLE owner )

1 0