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

Esdras Tarsis : bthprops.cpl: Add BluetoothGetRadioInfo stub.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 4ffaf9016e5e2887d47c090ae5a25c9f12a7c44c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ffaf9016e5e2887d47c090a… Author: Esdras Tarsis <esdrastarsis(a)gmail.com> Date: Sat Aug 14 19:34:15 2021 -0300 bthprops.cpl: Add BluetoothGetRadioInfo stub. Needed for War Dust. Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 9 +++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 49b181763ee..d57eb9136e6 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -35,7 +35,7 @@ @ stdcall BluetoothFindRadioClose(ptr) @ stub BluetoothFindServiceClose @ stub BluetoothGetDeviceInfo -@ stub BluetoothGetRadioInfo +@ stdcall BluetoothGetRadioInfo(ptr ptr) @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable @ stub BluetoothIsVersionAvailable diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 943c9dcb764..672b682a29d 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -80,3 +80,12 @@ BOOL WINAPI BluetoothFindNextRadio(HBLUETOOTH_RADIO_FIND find, HANDLE *radio) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************* + * BluetoothGetRadioInfo + */ +DWORD WINAPI BluetoothGetRadioInfo(HANDLE radio, PBLUETOOTH_RADIO_INFO info) +{ + FIXME("(%p, %p): stub!\n", radio, info); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index f2fa18aab89..a3e5faa7076 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -31,7 +31,7 @@ @ stdcall BluetoothFindRadioClose(ptr) bthprops.cpl.BluetoothFindRadioClose @ stub BluetoothFindServiceClose @ stub BluetoothGetDeviceInfo -@ stub BluetoothGetRadioInfo +@ stdcall BluetoothGetRadioInfo(ptr ptr) bthprops.cpl.BluetoothGetRadioInfo @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable @ stub BluetoothMapClassOfDeviceToImageIndex

1 0

Esdras Tarsis : bthprops.cpl: Add BluetoothFindNextDevice stub.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 43a9783585eb4ce747eebe3dbb611fcd147310d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a9783585eb4ce747eebe3d… Author: Esdras Tarsis <esdrastarsis(a)gmail.com> Date: Sat Aug 14 19:34:16 2021 -0300 bthprops.cpl: Add BluetoothFindNextDevice stub. Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 10 ++++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index d57eb9136e6..30b5bfa0040 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -23,7 +23,7 @@ @ stub BluetoothFindFirstServiceEx @ stub BluetoothFindNextBrowseGroup @ stub BluetoothFindNextClassId -@ stub BluetoothFindNextDevice +@ stdcall BluetoothFindNextDevice(ptr ptr) @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 672b682a29d..2dcb18458b7 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -89,3 +89,13 @@ DWORD WINAPI BluetoothGetRadioInfo(HANDLE radio, PBLUETOOTH_RADIO_INFO info) FIXME("(%p, %p): stub!\n", radio, info); return ERROR_CALL_NOT_IMPLEMENTED; } + +/********************************************************************* + * BluetoothFindNextDevice + */ +BOOL WINAPI BluetoothFindNextDevice(HBLUETOOTH_DEVICE_FIND find, BLUETOOTH_DEVICE_INFO *info) +{ + FIXME("(%p, %p): stub!\n", find, info); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index a3e5faa7076..252410f589f 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -19,7 +19,7 @@ @ stub BluetoothFindFirstService @ stub BluetoothFindNextBrowseGroup @ stub BluetoothFindNextClassId -@ stub BluetoothFindNextDevice +@ stdcall BluetoothFindNextDevice(ptr ptr) bthprops.cpl.BluetoothFindNextDevice @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry

1 0

Damjan Jovanovic : nsiproxy: Include netinet/ip_var.h.
by Alexandre Julliard 16 Aug '21

16 Aug '21

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

Jinoh Kang : gdi32: Add missing release_dc_ptr to NtGdiSetLayout.
by Alexandre Julliard 16 Aug '21

16 Aug '21

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

Jacek Caban : gdi32: Use NtGdiCreatePaletteInternal for CreatePalette.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 3787b43428c68214c6687fbd56db9404964af84d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3787b43428c68214c6687fbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:26:58 2021 +0200 gdi32: Use NtGdiCreatePaletteInternal for CreatePalette. 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 | 9 +++++++++ dlls/gdi32/palette.c | 13 ++++--------- include/ntgdi.h | 1 + 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 0832095f4c3..6516ac533f5 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -516,3 +516,12 @@ HCOLORSPACE WINAPI SetColorSpace( HDC hdc, HCOLORSPACE cs ) FIXME( "stub\n" ); return cs; } + +/*********************************************************************** + * CreatePalette (GDI32.@) + */ +HPALETTE WINAPI CreatePalette( const LOGPALETTE *palette ) +{ + if (!palette) return 0; + return NtGdiCreatePaletteInternal( palette, palette->palNumEntries ); +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index e767bd7e949..ae5a0b8bcc4 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -94,28 +94,23 @@ HPALETTE PALETTE_Init(void) /*********************************************************************** - * CreatePalette [GDI32.@] + * NtGdiCreatePaletteInternal (win32u.@) * * Creates a logical color palette. - * - * RETURNS - * Success: Handle to logical palette - * Failure: NULL */ -HPALETTE WINAPI CreatePalette( - const LOGPALETTE* palette) /* [in] Pointer to logical color palette */ +HPALETTE WINAPI NtGdiCreatePaletteInternal( const LOGPALETTE *palette, UINT count ) { PALETTEOBJ * palettePtr; HPALETTE hpalette; int size; if (!palette) return 0; - TRACE("entries=%i\n", palette->palNumEntries); + TRACE( "entries=%u\n", count ); if (!(palettePtr = HeapAlloc( GetProcessHeap(), 0, sizeof(*palettePtr) ))) return 0; palettePtr->unrealize = NULL; palettePtr->version = palette->palVersion; - palettePtr->count = palette->palNumEntries; + palettePtr->count = count; size = palettePtr->count * sizeof(*palettePtr->entries); if (!(palettePtr->entries = HeapAlloc( GetProcessHeap(), 0, size ))) { diff --git a/include/ntgdi.h b/include/ntgdi.h index a48464f67a8..077f845512e 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -164,6 +164,7 @@ BOOL WINAPI NtGdiComputeXformCoefficients( HDC hdc ); HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, UINT bpp, const void *bits ); HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen ); +HPALETTE WINAPI NtGdiCreatePaletteInternal( const LOGPALETTE *palette, UINT count ); BOOL WINAPI NtGdiEllipse( HDC hdc, INT left, INT top, INT right, INT bottom ); INT WINAPI NtGdiEndDoc(HDC hdc); BOOL WINAPI NtGdiEndPath( HDC hdc );

1 0

Jacek Caban : gdi32: Use ntgdi names for palette functions.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 4d55d754555dbb63f6b97523930a0e781ece5ea4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d55d754555dbb63f6b97523… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:27:16 2021 +0200 gdi32: Use ntgdi names for palette functions. 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/enhmetafile.c | 4 ++-- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdi32.spec | 16 ++++++------- dlls/gdi32/palette.c | 58 +++++++++++++++--------------------------------- include/ntgdi.h | 6 +++++ 5 files changed, 35 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d55d754555dbb63f6b9…

1 0

Jacek Caban : gdi32: Use NtGdiDoPalette for GetPaletteEntries.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: ad00037c279de5ee0e795cf46e6fd1018e8ae1ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad00037c279de5ee0e795cf4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:27:30 2021 +0200 gdi32: Use NtGdiDoPalette for GetPaletteEntries. 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/bitblt.c | 4 ++-- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 4 ++-- dlls/gdi32/ntgdi_private.h | 2 ++ dlls/gdi32/objects.c | 8 ++++++++ dlls/gdi32/palette.c | 35 +++++++++++++++++++---------------- include/ntgdi.h | 10 ++++++++++ 7 files changed, 45 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 0024234ac2d..09bb7a4c683 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -236,8 +236,8 @@ static RGBQUAD get_dc_rgb_color( DC *dc, int color_table_size, COLORREF color ) { PALETTEENTRY pal; - if (!GetPaletteEntries( dc->hPalette, LOWORD(color), 1, &pal )) - GetPaletteEntries( dc->hPalette, 0, 1, &pal ); + if (!get_palette_entries( dc->hPalette, LOWORD(color), 1, &pal )) + get_palette_entries( dc->hPalette, 0, 1, &pal ); ret.rgbRed = pal.peRed; ret.rgbGreen = pal.peGreen; ret.rgbBlue = pal.peBlue; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 59725537bbd..738151aa14d 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -261,7 +261,7 @@ static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) if (!palette) return 0; memset( palEntry, 0, sizeof(palEntry) ); - if (!GetPaletteEntries( palette, 0, colors, palEntry )) + if (!get_palette_entries( palette, 0, colors, palEntry )) return 0; for (i = 0; i < colors; i++) @@ -285,7 +285,7 @@ BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) if (!colors) return TRUE; if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return FALSE; - if (!(count = GetPaletteEntries( palette, 0, colors, entries ))) return FALSE; + if (!(count = get_palette_entries( palette, 0, colors, entries ))) return FALSE; for (i = 0; i < colors; i++, index++) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index c5c805ff77e..4e24de0b3aa 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -145,8 +145,8 @@ static COLORREF make_rgb_colorref( DC *dc, const dib_info *dib, COLORREF color, { PALETTEENTRY pal_ent; - if (!GetPaletteEntries( dc->hPalette, LOWORD(color), 1, &pal_ent )) - GetPaletteEntries( dc->hPalette, 0, 1, &pal_ent ); + if (!get_palette_entries( dc->hPalette, LOWORD(color), 1, &pal_ent )) + get_palette_entries( dc->hPalette, 0, 1, &pal_ent ); return RGB( pal_ent.peRed, pal_ent.peGreen, pal_ent.peBlue ); } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index ad4872da5ec..d9b016c213f 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -482,6 +482,8 @@ extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPE /* palette.c */ extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) DECLSPEC_HIDDEN; extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; +extern UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count, + PALETTEENTRY *entries ) DECLSPEC_HIDDEN; /* region.c */ extern BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 6516ac533f5..cce783d8cfe 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -525,3 +525,11 @@ HPALETTE WINAPI CreatePalette( const LOGPALETTE *palette ) if (!palette) return 0; return NtGdiCreatePaletteInternal( palette, palette->palNumEntries ); } + +/*********************************************************************** + * GetPaletteEntries (GDI32.@) + */ +UINT WINAPI GetPaletteEntries( HPALETTE palette, UINT start, UINT count, PALETTEENTRY *entries ) +{ + return NtGdiDoPalette( palette, start, count, entries, NtGdiGetPaletteEntries, TRUE ); +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index c92b4dfb9d5..804d2ecbf92 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -162,20 +162,7 @@ HPALETTE WINAPI NtGdiCreateHalftonePalette( HDC hdc ) } -/*********************************************************************** - * GetPaletteEntries [GDI32.@] - * - * Retrieves palette entries. - * - * RETURNS - * Success: Number of entries from logical palette - * Failure: 0 - */ -UINT WINAPI GetPaletteEntries( - HPALETTE hpalette, /* [in] Handle of logical palette */ - UINT start, /* [in] First entry to receive */ - UINT count, /* [in] Number of entries to receive */ - LPPALETTEENTRY entries) /* [out] Address of array receiving entries */ +UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count, PALETTEENTRY *entries ) { PALETTEOBJ * palPtr; UINT numEntries; @@ -495,10 +482,10 @@ COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) else /* PALETTEINDEX */ index = LOWORD(color); - if (!GetPaletteEntries( hpal, index, 1, &entry )) + if (!get_palette_entries( hpal, index, 1, &entry )) { WARN("RGB(%x) : idx %d is out of bounds, assuming NULL\n", color, index ); - if (!GetPaletteEntries( hpal, 0, 1, &entry )) return CLR_INVALID; + if (!get_palette_entries( hpal, 0, 1, &entry )) return CLR_INVALID; } color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); } @@ -695,3 +682,19 @@ BOOL WINAPI NtGdiSetMagicColors( HDC hdc, DWORD magic, ULONG index ) FIXME( "(%p 0x%08x 0x%08x): stub\n", hdc, magic, index ); return TRUE; } + +/********************************************************************* + * NtGdiDoPalette (win32u.@) + */ +LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entries, + DWORD func, BOOL inbound ) +{ + switch (func) + { + case NtGdiGetPaletteEntries: + return get_palette_entries( handle, start, count, entries ); + default: + WARN( "invalid func %u\n", func ); + return 0; + } +} diff --git a/include/ntgdi.h b/include/ntgdi.h index 0e9d5cce59a..9da053e10a8 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -105,6 +105,16 @@ enum NtGdiSetMapMode = 8, }; +enum +{ + NtGdiAnimatePalette, + NtGdiSetPaletteEntries, + NtGdiGetPaletteEntries, + NtGdiGetSystemPaletteEntries, + NtGdiGetDIBColorTable, + NtGdiSetDIBColorTable, +}; + #define MWT_SET 4 /* structs not compatible with native Windows */

1 0

Jacek Caban : gdi32: Use NtGdiDoPalette for SetPaletteEntries.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 4fc5f0ff70dfec40b0d50af93b0beba47659009f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc5f0ff70dfec40b0d50af9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:27:37 2021 +0200 gdi32: Use NtGdiDoPalette for SetPaletteEntries. 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 | 9 +++++++++ dlls/gdi32/palette.c | 18 ++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index cce783d8cfe..b1723b20085 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -533,3 +533,12 @@ UINT WINAPI GetPaletteEntries( HPALETTE palette, UINT start, UINT count, PALETTE { return NtGdiDoPalette( palette, start, count, entries, NtGdiGetPaletteEntries, TRUE ); } + +/*********************************************************************** + * SetPaletteEntries (GDI32.@) + */ +UINT WINAPI SetPaletteEntries( HPALETTE palette, UINT start, UINT count, + const PALETTEENTRY *entries ) +{ + return NtGdiDoPalette( palette, start, count, (void *)entries, NtGdiSetPaletteEntries, FALSE ); +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 804d2ecbf92..a46d75e9970 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -193,20 +193,8 @@ UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count, PALETTEENTR } -/*********************************************************************** - * SetPaletteEntries [GDI32.@] - * - * Sets color values for range in palette. - * - * RETURNS - * Success: Number of entries that were set - * Failure: 0 - */ -UINT WINAPI SetPaletteEntries( - HPALETTE hpalette, /* [in] Handle of logical palette */ - UINT start, /* [in] Index of first entry to set */ - UINT count, /* [in] Number of entries to set */ - const PALETTEENTRY *entries) /* [in] Address of array of structures */ +static UINT set_palette_entries( HPALETTE hpalette, UINT start, UINT count, + const PALETTEENTRY *entries ) { PALETTEOBJ * palPtr; UINT numEntries; @@ -691,6 +679,8 @@ LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entrie { switch (func) { + case NtGdiSetPaletteEntries: + return set_palette_entries( handle, start, count, entries ); case NtGdiGetPaletteEntries: return get_palette_entries( handle, start, count, entries ); default:

1 0

Jacek Caban : gdi32: Use NtGdiDoPalette for AnimatePalette.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 44313dcb49327fe166a4b298b0a2fb133e27ea47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44313dcb49327fe166a4b298… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:27:50 2021 +0200 gdi32: Use NtGdiDoPalette for AnimatePalette. 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 | 8 ++++++++ dlls/gdi32/palette.c | 22 +++++----------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b1723b20085..4f7932be329 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -542,3 +542,11 @@ UINT WINAPI SetPaletteEntries( HPALETTE palette, UINT start, UINT count, { return NtGdiDoPalette( palette, start, count, (void *)entries, NtGdiSetPaletteEntries, FALSE ); } + +/*********************************************************************** + * AnimatePalette (GDI32.@) + */ +BOOL WINAPI AnimatePalette( HPALETTE palette, UINT start, UINT count, const PALETTEENTRY *entries ) +{ + return NtGdiDoPalette( palette, start, count, (void *)entries, NtGdiAnimatePalette, FALSE ); +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index a46d75e9970..cd4fac217be 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -248,23 +248,9 @@ BOOL WINAPI NtGdiResizePalette( HPALETTE hPal, UINT cEntries ) } -/*********************************************************************** - * AnimatePalette [GDI32.@] - * - * Replaces entries in logical palette. - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * FIXME - * Should use existing mapping when animating a primary palette - */ -BOOL WINAPI AnimatePalette( - HPALETTE hPal, /* [in] Handle to logical palette */ - UINT StartIndex, /* [in] First entry in palette */ - UINT NumEntries, /* [in] Count of entries in palette */ - const PALETTEENTRY* PaletteColors) /* [in] Pointer to first replacement */ +/* Replaces entries in logical palette. */ +static BOOL animate_palette( HPALETTE hPal, UINT StartIndex, UINT NumEntries, + const PALETTEENTRY *PaletteColors ) { TRACE("%p (%i - %i)\n", hPal, StartIndex,StartIndex+NumEntries); @@ -679,6 +665,8 @@ LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entrie { switch (func) { + case NtGdiAnimatePalette: + return animate_palette( handle, start, count, entries ); case NtGdiSetPaletteEntries: return set_palette_entries( handle, start, count, entries ); case NtGdiGetPaletteEntries:

1 0

Jacek Caban : gdi32: Use NtGdiDoPalette for GetSystemPaletteEntries.
by Alexandre Julliard 16 Aug '21

16 Aug '21

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