August 2021 - Wine-Commits - list.winehq.org

Jacek Caban : gdi32: Use NtGdiDoPalette for GetDIBColorTable and SetDIBColorTable.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: c230071d255032701fbc7d41e6255a8f0c6a1ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=c230071d255032701fbc7d41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:28:12 2021 +0200 gdi32: Use NtGdiDoPalette for GetDIBColorTable and SetDIBColorTable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 10 ++-------- dlls/gdi32/ntgdi_private.h | 4 ++++ dlls/gdi32/objects.c | 16 ++++++++++++++++ dlls/gdi32/palette.c | 4 ++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 738151aa14d..7da248079b2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -910,10 +910,7 @@ INT WINAPI NtGdiSetDIBitsToDeviceInternal( HDC hdc, INT xDest, INT yDest, DWORD return ret; } -/*********************************************************************** - * SetDIBColorTable (GDI32.@) - */ -UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, const RGBQUAD *colors ) +UINT set_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, const RGBQUAD *colors ) { DC * dc; UINT i, result = 0; @@ -949,10 +946,7 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, const RGBQUA } -/*********************************************************************** - * GetDIBColorTable (GDI32.@) - */ -UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries, RGBQUAD *colors ) +UINT get_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, RGBQUAD *colors ) { DC * dc; BITMAPOBJ *bitmap; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index d9b016c213f..6b3efea3ddb 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -241,6 +241,10 @@ extern DWORD get_image_from_bitmap( BITMAPOBJ *bmp, BITMAPINFO *info, extern DWORD put_image_into_bitmap( BITMAPOBJ *bmp, HRGN clip, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst ) DECLSPEC_HIDDEN; +extern UINT get_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, + RGBQUAD *colors ) DECLSPEC_HIDDEN; +extern UINT set_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, + const RGBQUAD *colors ) DECLSPEC_HIDDEN; extern void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) DECLSPEC_HIDDEN; extern NTSTATUS init_opengl_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 38a26afe774..028b9fd06ad 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -594,3 +594,19 @@ UINT WINAPI GetSystemPaletteEntries( HDC hdc, UINT start, UINT count, PALETTEENT return 0; } + +/*********************************************************************** + * GetDIBColorTable (GDI32.@) + */ +UINT WINAPI GetDIBColorTable( HDC hdc, UINT start, UINT count, RGBQUAD *colors ) +{ + return NtGdiDoPalette( hdc, start, count, colors, NtGdiGetDIBColorTable, TRUE ); +} + +/*********************************************************************** + * SetDIBColorTable (GDI32.@) + */ +UINT WINAPI SetDIBColorTable( HDC hdc, UINT start, UINT count, const RGBQUAD *colors ) +{ + return NtGdiDoPalette( hdc, start, count, (void *)colors, NtGdiSetDIBColorTable, FALSE ); +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 36335083c48..3d2e27c1fc6 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -635,6 +635,10 @@ LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entrie return get_palette_entries( handle, start, count, entries ); case NtGdiGetSystemPaletteEntries: return get_system_palette_entries( handle, start, count, entries ); + case NtGdiSetDIBColorTable: + return set_dib_dc_color_table( handle, start, count, entries ); + case NtGdiGetDIBColorTable: + return get_dib_dc_color_table( handle, start, count, entries ); default: WARN( "invalid func %u\n", func ); return 0;

1 0

Jacek Caban : gdi32: Use NtGdiGetAndSetDCDword for SetBkColor.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: a5cb435e77d1f0d25bbed1f2aed59d892dd9d4d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5cb435e77d1f0d25bbed1f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:28:29 2021 +0200 gdi32: Use NtGdiGetAndSetDCDword for SetBkColor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 41 ++++++++++++++---------------------- dlls/gdi32/enhmfdrv/dc.c | 7 ++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 ++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - include/ntgdi.h | 2 ++ 10 files changed, 40 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a5cb435e77d1f0d25bbe…

1 0

Zebediah Figura : ws2_32/tests: Fix a test failure in test_GetAddrInfoExW().
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: 17871709e582708b435fdecc786d31f5f350fbba URL: https://source.winehq.org/git/wine.git/?a=commit;h=17871709e582708b435fdecc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 11:20:17 2021 -0500 ws2_32/tests: Fix a test failure in test_GetAddrInfoExW(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 1f039e509da..bb09dc98f1c 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1910,7 +1910,9 @@ static void test_GetAddrInfoExW(void) ResetEvent(event); ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); - ok(!result, "result != NULL\n"); + /* result pointer is cleared by GetAddrInfoExW(), but may be set to the + * actual addrinfo before we can verify that */ + ok(result != (void *)0xdeadbeef, "result was not changed\n"); ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); ret = pGetAddrInfoExOverlappedResult(&overlapped); ok(!ret, "overlapped result is %d\n", ret);

1 0

Jinoh Kang : gdi32: Add missing release_dc_ptr to NtGdiSetLayout.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: 76821849fef841d4b1c4ce44ee048d43214a3fe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76821849fef841d4b1c4ce44… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Aug 16 10:26:47 2021 +0200 gdi32: Add missing release_dc_ptr to NtGdiSetLayout. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51614 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 93decc58926..9e8d2f8ad98 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1303,6 +1303,7 @@ DWORD WINAPI NtGdiSetLayout( HDC hdc, LONG wox, DWORD layout ) if (layout & LAYOUT_RTL) dc->attr->map_mode = MM_ANISOTROPIC; DC_UpdateXforms( dc ); } + release_dc_ptr( dc ); } TRACE("hdc : %p, old layout : %08x, new layout : %08x\n", hdc, old_layout, layout);

1 0

Damjan Jovanovic : nsiproxy: Include netinet/ip_var.h.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: 047da144c748d6c8d36d49906efa9bf71fdcca9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=047da144c748d6c8d36d4990… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 15 14:20:40 2021 +0200 nsiproxy: Include netinet/ip_var.h. netinet/tcp_var.h has an undefined TAILQ_ENTRY macro on FreeBSD otherwise. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index ffac9971316..5fe7fcbd72e 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -38,6 +38,10 @@ #include <netinet/in.h> #endif +#ifdef HAVE_NETINET_IP_VAR_H +#include <netinet/ip_var.h> +#endif + #ifdef HAVE_NETINET_TCP_VAR_H #include <netinet/tcp_var.h> #endif

1 0

Nikolay Sivov : msxml3: Do not depend on libxml2 for namespace object.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: 99d2bda5551d4b65472da771972aac241fe2ea87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99d2bda5551d4b65472da771… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 16 11:52:20 2021 +0300 msxml3: Do not depend on libxml2 for namespace object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxnamespace.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index dc6ff9c85ad..422bd388ced 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -20,14 +20,7 @@ #define COBJMACROS -#include "config.h" - #include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -# include <libxml/xmlerror.h> -# include <libxml/encoding.h> -#endif #include "windef.h" #include "winbase.h" @@ -35,7 +28,7 @@ #include "ole2.h" #include "msxml6.h" -#include "msxml_private.h" +#include "msxml_dispex.h" #include "wine/debug.h" @@ -101,7 +94,7 @@ static HRESULT declare_prefix(namespacemanager *This, const WCHAR *prefix, const ns = NULL; for (i = 0; i < ctxt->count; i++) - if (!strcmpW(ctxt->ns[i].prefix, prefix)) + if (!lstrcmpW(ctxt->ns[i].prefix, prefix)) { ns = &ctxt->ns[i]; break; @@ -150,7 +143,7 @@ static HRESULT get_declared_prefix_uri(const struct list *ctxts, const WCHAR *ur { int i; for (i = 0; i < ctxt->count; i++) - if (!strcmpW(ctxt->ns[i].uri, uri)) + if (!lstrcmpW(ctxt->ns[i].uri, uri)) { *prefix = ctxt->ns[i].prefix; return S_OK; @@ -166,7 +159,7 @@ static HRESULT get_uri_from_prefix(const struct nscontext *ctxt, const WCHAR *pr int i; for (i = 0; i < ctxt->count; i++) - if (!strcmpW(ctxt->ns[i].prefix, prefix)) + if (!lstrcmpW(ctxt->ns[i].prefix, prefix)) { *uri = ctxt->ns[i].uri; return S_OK; @@ -286,7 +279,7 @@ static HRESULT WINAPI namespacemanager_declarePrefix(IMXNamespaceManager *iface, TRACE("(%p)->(%s %s)\n", This, debugstr_w(prefix), debugstr_w(namespaceURI)); - if (prefix && (!strcmpW(prefix, xmlW) || !strcmpW(prefix, xmlnsW) || !namespaceURI)) + if (prefix && (!lstrcmpW(prefix, xmlW) || !lstrcmpW(prefix, xmlnsW) || !namespaceURI)) return E_INVALIDARG; return declare_prefix(This, prefix, namespaceURI); @@ -311,7 +304,7 @@ static HRESULT WINAPI namespacemanager_getDeclaredPrefix(IMXNamespaceManager *if if (prefix) { if (*prefix_len < (INT)SysStringLen(prfx)) return E_XML_BUFFERTOOSMALL; - strcpyW(prefix, prfx); + lstrcpyW(prefix, prfx); } *prefix_len = SysStringLen(prfx); @@ -339,7 +332,7 @@ static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface, if (prefix) { if (*prefix_len < (INT)SysStringLen(prfx)) return E_XML_BUFFERTOOSMALL; - strcpyW(prefix, prfx); + lstrcpyW(prefix, prfx); } *prefix_len = SysStringLen(prfx); @@ -375,7 +368,7 @@ static HRESULT WINAPI namespacemanager_getURI(IMXNamespaceManager *iface, if (uri) { if (*uri_len < (INT)SysStringLen(urib)) return E_XML_BUFFERTOOSMALL; - strcpyW(uri, urib); + lstrcpyW(uri, urib); } } else

1 0

Francois Gouget : advapi32/tests: Fix an uninitialized variable check in test_performance_keys().
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: 9572c20812b4004e6166fca6aea47e07a56966c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9572c20812b4004e6166fca6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 16 18:10:50 2021 +0200 advapi32/tests: Fix an uninitialized variable check in test_performance_keys(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index fb3d5a34f51..5ed220095bb 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3867,6 +3867,7 @@ static void test_performance_keys(void) ret = RegSetValueA(keys[i], "Global", REG_SZ, "dummy", 5); ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + key_count = 0x900ddeed; ret = RegQueryInfoKeyA(keys[i], NULL, NULL, NULL, &key_count, NULL, NULL, &value_count, NULL, NULL, NULL, NULL); todo_wine ok(!ret, "got %u\n", ret);

1 0

Francois Gouget : advapi32/tests: RegSetValueExA() should succeed when given a NULL data pointer.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: ba020f42bad61c82ce089744b18454f1da1edb7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba020f42bad61c82ce089744… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 16 17:46:28 2021 +0200 advapi32/tests: RegSetValueExA() should succeed when given a NULL data pointer. This used to fail on Windows 95 but we don't want to allow such behavior anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index bccc5706131..fb3d5a34f51 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -491,9 +491,9 @@ static void test_enum_value(void) else ok( !res, "RegSetValueExA returned %d\n", res ); res = RegSetValueExA( test_key, "Test", 0, REG_EXPAND_SZ, NULL, 0 ); - ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); + ok( ERROR_SUCCESS == res, "RegSetValueExA returned %d\n", res ); res = RegSetValueExA( test_key, "Test", 0, REG_BINARY, NULL, 0 ); - ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); + ok( ERROR_SUCCESS == res, "RegSetValueExA returned %d\n", res ); /* test reading the value and data without setting them */ val_count = 20;

1 0

Jacek Caban : gdi32: Use NtGdiGetAndSetDCDword for SetTextColor.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: fb11008bcac2a8b890e8025336ac0ebfcfb96c92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb11008bcac2a8b890e80253… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:28:42 2021 +0200 gdi32: Use NtGdiGetAndSetDCDword for SetTextColor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 39 ++++++++++++++---------------------- dlls/gdi32/enhmfdrv/dc.c | 7 ++----- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - include/ntgdi.h | 1 + 10 files changed, 38 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb11008bcac2a8b890e8…

1 0

Jacek Caban : gdi32: Use NtGdiDoPalette for GetSystemPaletteEntries.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: 1c270965a8c1f2dd9ec72c876a2ebbe8812febcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c270965a8c1f2dd9ec72c87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:28:00 2021 +0200 gdi32: Use NtGdiDoPalette for GetSystemPaletteEntries. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/palette.c | 44 ++++---------------------------------------- dlls/gdi32/tests/palette.c | 2 ++ 3 files changed, 50 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4f7932be329..38a26afe774 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -550,3 +550,47 @@ BOOL WINAPI AnimatePalette( HPALETTE palette, UINT start, UINT count, const PALE { return NtGdiDoPalette( palette, start, count, (void *)entries, NtGdiAnimatePalette, FALSE ); } + +/* first and last 10 entries are the default system palette entries */ +static const PALETTEENTRY default_system_palette_low[] = +{ + { 0x00, 0x00, 0x00 }, { 0x80, 0x00, 0x00 }, { 0x00, 0x80, 0x00 }, { 0x80, 0x80, 0x00 }, + { 0x00, 0x00, 0x80 }, { 0x80, 0x00, 0x80 }, { 0x00, 0x80, 0x80 }, { 0xc0, 0xc0, 0xc0 }, + { 0xc0, 0xdc, 0xc0 }, { 0xa6, 0xca, 0xf0 } +}; +static const PALETTEENTRY default_system_palette_high[] = +{ + { 0xff, 0xfb, 0xf0 }, { 0xa0, 0xa0, 0xa4 }, { 0x80, 0x80, 0x80 }, { 0xff, 0x00, 0x00 }, + { 0x00, 0xff, 0x00 }, { 0xff, 0xff, 0x00 }, { 0x00, 0x00, 0xff }, { 0xff, 0x00, 0xff }, + { 0x00, 0xff, 0xff }, { 0xff, 0xff, 0xff } +}; + +/*********************************************************************** + * GetSystemPaletteEntries (GDI32.@) + * + * Gets range of palette entries. + */ +UINT WINAPI GetSystemPaletteEntries( HDC hdc, UINT start, UINT count, PALETTEENTRY *entries ) +{ + UINT i, ret; + + ret = NtGdiDoPalette( hdc, start, count, (void *)entries, + NtGdiGetSystemPaletteEntries, FALSE ); + if (ret) return ret; + + /* always fill output, even if hdc is an invalid handle */ + if (!entries || start >= 256) return 0; + if (start + count > 256) count = 256 - start; + + for (i = 0; i < count; i++) + { + if (start + i < 10) + entries[i] = default_system_palette_low[start + i]; + else if (start + i >= 246) + entries[i] = default_system_palette_high[start + i - 246]; + else + memset( &entries[i], 0, sizeof(entries[i]) ); + } + + return 0; +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index cd4fac217be..36335083c48 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -333,25 +333,12 @@ UINT WINAPI NtGdiGetSystemPaletteUse( HDC hdc ) } -/*********************************************************************** - * GetSystemPaletteEntries [GDI32.@] - * - * Gets range of palette entries. - * - * RETURNS - * Success: Number of entries retrieved from palette - * Failure: 0 - */ -UINT WINAPI GetSystemPaletteEntries( - HDC hdc, /* [in] Handle of device context */ - UINT start, /* [in] Index of first entry to be retrieved */ - UINT count, /* [in] Number of entries to be retrieved */ - LPPALETTEENTRY entries) /* [out] Array receiving system-palette entries */ +static UINT get_system_palette_entries( HDC hdc, UINT start, UINT count, PALETTEENTRY *entries ) { UINT ret = 0; DC *dc; - TRACE("hdc=%p,start=%i,count=%i\n", hdc,start,count); + TRACE( "hdc=%p,start=%i,count=%i\n", hdc, start, count ); if ((dc = get_dc_ptr( hdc ))) { @@ -366,31 +353,6 @@ UINT WINAPI GetSystemPaletteEntries( /* null driver fallback implementation for GetSystemPaletteEntries */ UINT CDECL nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) { - if (entries && start < 256) - { - UINT i; - const RGBQUAD *default_entries; - - if (start + count > 256) count = 256 - start; - - default_entries = get_default_color_table( 8 ); - for (i = 0; i < count; ++i) - { - if (start + i < 10 || start + i >= 246) - { - entries[i].peRed = default_entries[start + i].rgbRed; - entries[i].peGreen = default_entries[start + i].rgbGreen; - entries[i].peBlue = default_entries[start + i].rgbBlue; - } - else - { - entries[i].peRed = 0; - entries[i].peGreen = 0; - entries[i].peBlue = 0; - } - entries[i].peFlags = 0; - } - } return 0; } @@ -671,6 +633,8 @@ LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entrie return set_palette_entries( handle, start, count, entries ); case NtGdiGetPaletteEntries: return get_palette_entries( handle, start, count, entries ); + case NtGdiGetSystemPaletteEntries: + return get_system_palette_entries( handle, start, count, entries ); default: WARN( "invalid func %u\n", func ); return 0; diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 0043f5560c4..126a53310bd 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -323,6 +323,8 @@ static void test_system_palette_entries(void) metafile = CloseMetaFile(metafile_dc); DeleteMetaFile(metafile); + + check_system_palette_entries(ULongToHandle(0xdeadbeef)); } START_TEST(palette)

1 0