December 2013 - Wine-commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 09b817aaf80d4fdc59e414fa05e21cb2dfd710fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b817aaf80d4fdc59e414fa0… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Dec 12 22:10:45 2013 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index c01331c..4aef8c5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-03 20:42+0300\n" +"PO-Revision-Date: 2013-12-12 22:08+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10082,7 +10082,7 @@ msgstr "„Wine“ komandų interpretatorius" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? "

1 0

Ken Thomases : user32: Fix distance calculation for MONITOR_DEFAULTTONEAREST.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 304ab65dbf0f143df5c92923c3b93cbeecb40d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=304ab65dbf0f143df5c92923c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 12 16:49:44 2013 -0600 user32: Fix distance calculation for MONITOR_DEFAULTTONEAREST. If the target rect is outside a monitor rect but is between its extremes in one dimension, that dimension should contribute 0 to the distance, rather than some arbitrary amount. --- dlls/user32/misc.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 732d11c..eb2631f 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -321,12 +321,14 @@ static BOOL CALLBACK monitor_enum( HMONITOR monitor, HDC hdc, LPRECT rect, LPARA else if (!info->max_area) /* if not intersecting, check for min distance */ { UINT distance; - INT x, y; - - if (rect->left >= info->rect.right) x = info->rect.right - rect->left; - else x = rect->right - info->rect.left; - if (rect->top >= info->rect.bottom) y = info->rect.bottom - rect->top; - else y = rect->bottom - info->rect.top; + UINT x, y; + + if (info->rect.right <= rect->left) x = rect->left - info->rect.right; + else if (rect->right <= info->rect.left) x = info->rect.left - rect->right; + else x = 0; + if (info->rect.bottom <= rect->top) y = rect->top - info->rect.bottom; + else if (rect->bottom <= info->rect.top) y = info->rect.top - rect->bottom; + else y = 0; distance = x * x + y * y; if (distance < info->min_distance) {

1 0

Ken Thomases : user32: Respect monitor work area when sizing or moving a top-level window.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 03f8f85ddae0cb7d7ff85d0478f1d9a77c88b26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f8f85ddae0cb7d7ff85d047… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 12 16:49:48 2013 -0600 user32: Respect monitor work area when sizing or moving a top-level window. This prevents dragging a window's title bar behind a menu bar across the top of a screen, for example. --- dlls/user32/winpos.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 22ee290..7cae0ad 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2625,6 +2625,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) BOOL moved = FALSE; DWORD dwPoint = GetMessagePos (); BOOL DragFullWindows = TRUE; + HMONITOR mon = 0; if (IsZoomed(hwnd) || !IsWindowVisible(hwnd)) return; @@ -2673,6 +2674,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) { parent = 0; mouseRect = get_virtual_screen_rect(); + mon = MonitorFromPoint( pt, MONITOR_DEFAULTTONEAREST ); } if (ON_LEFT_BORDER(hittest)) @@ -2749,6 +2751,24 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) pt.y = max( pt.y, mouseRect.top ); pt.y = min( pt.y, mouseRect.bottom ); + if (!parent) + { + HMONITOR newmon; + MONITORINFO info; + + if ((newmon = MonitorFromPoint( pt, MONITOR_DEFAULTTONULL ))) + mon = newmon; + + info.cbSize = sizeof(info); + if (mon && GetMonitorInfoW( mon, &info )) + { + pt.x = max( pt.x, info.rcWork.left ); + pt.x = min( pt.x, info.rcWork.right ); + pt.y = max( pt.y, info.rcWork.top ); + pt.y = min( pt.y, info.rcWork.bottom ); + } + } + dx = pt.x - capturePoint.x; dy = pt.y - capturePoint.y;

1 0

Michael Stefaniuc : oleaut32: Cast to the correct type instead to void pointer.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 4281d19d7634ed15f2031828b6c4fcdce8963dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4281d19d7634ed15f2031828b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 12 23:56:47 2013 +0100 oleaut32: Cast to the correct type instead to void pointer. --- dlls/oleaut32/connpt.c | 10 ++++------ dlls/oleaut32/olefont.c | 14 ++++++-------- dlls/oleaut32/olepicture.c | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index 59768a0..1d7b05c 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -254,9 +254,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%p)\n", This, ppCPC); - return IUnknown_QueryInterface(This->Obj, - &IID_IConnectionPointContainer, - (LPVOID)ppCPC); + return IUnknown_QueryInterface(This->Obj, &IID_IConnectionPointContainer, (void**)ppCPC); } /************************************************************************ @@ -273,7 +271,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, TRACE("(%p)->(%p, %p)\n", This, lpUnk, pdwCookie); *pdwCookie = 0; - if(FAILED(IUnknown_QueryInterface(lpUnk, &This->iid, (LPVOID)&lpSink))) + if(FAILED(IUnknown_QueryInterface(lpUnk, &This->iid, (void**)&lpSink))) return CONNECT_E_CANNOTCONNECT; for(i = 0; i < This->maxSinks; i++) { @@ -349,7 +347,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections( EnumObj = EnumConnectionsImpl_Construct((IUnknown*)This, This->nSinks, pCD); hr = IEnumConnections_QueryInterface(&EnumObj->IEnumConnections_iface, - &IID_IEnumConnections, (LPVOID)ppEnum); + &IID_IEnumConnections, (void**)ppEnum); IEnumConnections_Release(&EnumObj->IEnumConnections_iface); HeapFree(GetProcessHeap(), 0, pCD); @@ -623,7 +621,7 @@ HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid, if(!Obj) return E_OUTOFMEMORY; hr = IConnectionPoint_QueryInterface(&Obj->IConnectionPoint_iface, - &IID_IConnectionPoint, (LPVOID)pCP); + &IID_IConnectionPoint, (void**)pCP); IConnectionPoint_Release(&Obj->IConnectionPoint_iface); return hr; } diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index c0925a2..ba873ec 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -414,7 +414,7 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { IPropertyNotifySink *sink; - IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (LPVOID)&sink); + IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (void**)&sink); IPropertyNotifySink_OnChanged(sink, dispID); IPropertyNotifySink_Release(sink); IUnknown_Release(CD.pUnk); @@ -440,7 +440,7 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { IFontEventsDisp *disp; - IUnknown_QueryInterface(CD.pUnk, &IID_IFontEventsDisp, (LPVOID)&disp); + IUnknown_QueryInterface(CD.pUnk, &IID_IFontEventsDisp, (void**)&disp); IFontEventsDisp_Invoke(disp, DISPID_FONT_CHANGED, &IID_NULL, LOCALE_NEUTRAL, INVOKE_FUNC, &dispparams, NULL, NULL, NULL); @@ -1848,13 +1848,11 @@ static HRESULT WINAPI OLEFontImpl_FindConnectionPoint( TRACE("(%p)->(%s, %p)\n", this, debugstr_guid(riid), ppCp); if(IsEqualIID(riid, &IID_IPropertyNotifySink)) { - return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP, - &IID_IConnectionPoint, - (LPVOID)ppCp); + return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP, &IID_IConnectionPoint, + (void**)ppCp); } else if(IsEqualIID(riid, &IID_IFontEventsDisp)) { - return IConnectionPoint_QueryInterface(this->pFontEventsCP, - &IID_IConnectionPoint, - (LPVOID)ppCp); + return IConnectionPoint_QueryInterface(this->pFontEventsCP, &IID_IConnectionPoint, + (void**)ppCp); } else { FIXME("no connection point for %s\n", debugstr_guid(riid)); return CONNECT_E_NOCONNECTION; diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5e81766..2139fde 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -923,7 +923,7 @@ static HRESULT WINAPI OLEPictureImpl_FindConnectionPoint( return E_POINTER; *ppCP = NULL; if (IsEqualGUID(riid,&IID_IPropertyNotifySink)) - return IConnectionPoint_QueryInterface(This->pCP,&IID_IConnectionPoint,(LPVOID)ppCP); + return IConnectionPoint_QueryInterface(This->pCP, &IID_IConnectionPoint, (void**)ppCP); FIXME("no connection point for %s\n",debugstr_guid(riid)); return CONNECT_E_NOCONNECTION; }

1 0

Frédéric Delanoy : winemac.drv: Use BOOL type where appropriate.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: e0b68129fabf4b1027a3f40769a9a6ada0e475b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b68129fabf4b1027a3f4076… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 13 00:25:31 2013 +0100 winemac.drv: Use BOOL type where appropriate. --- dlls/winemac.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index bd710ce..c5749c8 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1933,7 +1933,7 @@ void macdrv_window_drag_begin(HWND hwnd) if (!(data = get_win_data(hwnd))) return; if (data->being_dragged) goto done; - data->being_dragged = 1; + data->being_dragged = TRUE; release_win_data(data); SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); @@ -1953,7 +1953,7 @@ void macdrv_window_drag_begin(HWND hwnd) TRACE("done\n"); if ((data = get_win_data(hwnd))) - data->being_dragged = 0; + data->being_dragged = FALSE; done: release_win_data(data);

1 0

Henri Verbeet : ddraw: Unset the primary surface' s palette when the palette is released.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: c5a8b933afb0d671da1084e4964cf1be26318369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a8b933afb0d671da1084e49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 13 09:07:45 2013 +0100 ddraw: Unset the primary surface's palette when the palette is released. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/palette.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b24376d..fb3755f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -379,6 +379,7 @@ struct ddraw_palette LONG ref; struct wined3d_palette *wineD3DPalette; + struct ddraw *ddraw; IUnknown *ifaceToRelease; DWORD flags; }; diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 0c9534d..f35531e 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -94,10 +94,10 @@ static ULONG WINAPI ddraw_palette_Release(IDirectDrawPalette *iface) { wined3d_mutex_lock(); wined3d_palette_decref(This->wineD3DPalette); - if(This->ifaceToRelease) - { + if ((This->flags & DDPCAPS_PRIMARYSURFACE) && This->ddraw->primary) + This->ddraw->primary->palette = NULL; + if (This->ifaceToRelease) IUnknown_Release(This->ifaceToRelease); - } wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, This); @@ -251,6 +251,7 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette, return hr; } + palette->ddraw = ddraw; palette->ifaceToRelease = (IUnknown *)&ddraw->IDirectDraw7_iface; IUnknown_AddRef(palette->ifaceToRelease);

1 0

Henri Verbeet : ddraw/tests: Add a test for palettes on primary surfaces.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: b9ab54a09af1600adf58133d3c3dfa8c9f2004a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9ab54a09af1600adf58133d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 13 09:07:46 2013 +0100 ddraw/tests: Add a test for palettes on primary surfaces. --- dlls/ddraw/tests/ddraw1.c | 98 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 98 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 98 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 398 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9ab54a09af1600adf581…

1 0

Henri Verbeet : ddraw: Just set the palette caps in ddraw7_GetCaps().
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 89dedf64082c23c70f320e517c5f4bea4b353fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dedf64082c23c70f320e517… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 13 09:07:47 2013 +0100 ddraw: Just set the palette caps in ddraw7_GetCaps(). --- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/directx.c | 5 +---- include/wine/wined3d.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ea24eee..7aea03e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1493,7 +1493,7 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwCaps2 = winecaps.ddraw_caps.caps2; caps.dwCKeyCaps = winecaps.ddraw_caps.color_key_caps; caps.dwFXCaps = winecaps.ddraw_caps.fx_caps; - caps.dwPalCaps = winecaps.ddraw_caps.pal_caps; + caps.dwPalCaps = DDPCAPS_8BIT | DDPCAPS_PRIMARYSURFACE; caps.ddsCaps.dwCaps = winecaps.ddraw_caps.dds_caps; caps.dwSVBCaps = winecaps.ddraw_caps.svb_caps; caps.dwSVBCKeyCaps = winecaps.ddraw_caps.svb_color_key_caps; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ce08a61..29ff883 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4105,7 +4105,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte struct shader_caps shader_caps; struct fragment_caps fragment_caps; struct wined3d_vertex_caps vertex_caps; - DWORD ckey_caps, blit_caps, fx_caps, pal_caps; + DWORD ckey_caps, blit_caps, fx_caps; TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps); @@ -4629,8 +4629,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDCAPS_COLORKEY | WINEDDCAPS_COLORKEYHWASSIST | WINEDDCAPS_ALIGNBOUNDARYSRC; - pal_caps = WINEDDPCAPS_8BIT | - WINEDDPCAPS_PRIMARYSURFACE; /* Fill the ddraw caps structure */ caps->ddraw_caps.caps = WINEDDCAPS_GDI | @@ -4643,7 +4641,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDCAPS2_CANRENDERWINDOWED; caps->ddraw_caps.color_key_caps = ckey_caps; caps->ddraw_caps.fx_caps = fx_caps; - caps->ddraw_caps.pal_caps = pal_caps; caps->ddraw_caps.svb_caps = blit_caps; caps->ddraw_caps.svb_color_key_caps = ckey_caps; caps->ddraw_caps.svb_fx_caps = fx_caps; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1c85396..4599678 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1737,7 +1737,6 @@ struct wined3d_ddraw_caps DWORD color_key_caps; DWORD fx_caps; DWORD fx_alpha_caps; - DWORD pal_caps; DWORD sv_caps; DWORD svb_caps; DWORD svb_color_key_caps;

1 0

Henri Verbeet : wined3d: Explicitly pass the palette size to wined3d_palette_create().
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: f27bb660b3046e6df18e61bc006ad7f222b28547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27bb660b3046e6df18e61bc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 13 09:07:48 2013 +0100 wined3d: Explicitly pass the palette size to wined3d_palette_create(). --- dlls/ddraw/palette.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/palette.c | 33 ++++++++------------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index f35531e..214c912 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -236,16 +236,41 @@ struct ddraw_palette *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *if return CONTAINING_RECORD(iface, struct ddraw_palette, IDirectDrawPalette_iface); } +static unsigned int palette_size(DWORD flags) +{ + switch (flags & (DDPCAPS_1BIT | DDPCAPS_2BIT | DDPCAPS_4BIT | DDPCAPS_8BIT)) + { + case DDPCAPS_1BIT: + return 2; + case DDPCAPS_2BIT: + return 4; + case DDPCAPS_4BIT: + return 16; + case DDPCAPS_8BIT: + return 256; + default: + return ~0u; + } +} + HRESULT ddraw_palette_init(struct ddraw_palette *palette, struct ddraw *ddraw, DWORD flags, PALETTEENTRY *entries) { + unsigned int entry_count; HRESULT hr; + if ((entry_count = palette_size(flags)) == ~0u) + { + WARN("Invalid flags %#x.\n", flags); + return DDERR_INVALIDPARAMS; + } + palette->IDirectDrawPalette_iface.lpVtbl = &ddraw_palette_vtbl; palette->ref = 1; palette->flags = flags; - if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device, flags, entries, &palette->wineD3DPalette))) + if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device, + flags, entry_count, entries, &palette->wineD3DPalette))) { WARN("Failed to create wined3d palette, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 555a962..27e6b24 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define SIZE_BITS (WINEDDPCAPS_1BIT | WINEDDPCAPS_2BIT | WINEDDPCAPS_4BIT | WINEDDPCAPS_8BIT) - ULONG CDECL wined3d_palette_incref(struct wined3d_palette *palette) { ULONG refcount = InterlockedIncrement(&palette->ref); @@ -55,28 +53,15 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) return refcount; } -static WORD wined3d_palette_size(DWORD flags) -{ - switch (flags & SIZE_BITS) - { - case WINEDDPCAPS_1BIT: return 2; - case WINEDDPCAPS_2BIT: return 4; - case WINEDDPCAPS_4BIT: return 16; - case WINEDDPCAPS_8BIT: return 256; - default: - FIXME("Unhandled size bits %#x.\n", flags & SIZE_BITS); - return 256; - } -} - HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries) { TRACE("palette %p, flags %#x, start %u, count %u, entries %p.\n", palette, flags, start, count, entries); - if (flags) return WINED3DERR_INVALIDCALL; /* unchecked */ - if (start + count > wined3d_palette_size(palette->flags)) + if (flags) + return WINED3DERR_INVALIDCALL; /* unchecked */ + if (start > palette->palNumEntries || count > palette->palNumEntries - start) return WINED3DERR_INVALIDCALL; if (palette->flags & WINEDDPCAPS_8BITENTRIES) @@ -146,7 +131,7 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, } static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wined3d_device *device, - DWORD flags, const PALETTEENTRY *entries) + DWORD flags, unsigned int entry_count, const PALETTEENTRY *entries) { HRESULT hr; @@ -154,7 +139,7 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine palette->device = device; palette->flags = flags; - palette->palNumEntries = wined3d_palette_size(flags); + palette->palNumEntries = entry_count; palette->hpal = CreatePalette((const LOGPALETTE *)&palette->palVersion); if (!palette->hpal) { @@ -162,8 +147,7 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine return E_FAIL; } - hr = wined3d_palette_set_entries(palette, 0, 0, wined3d_palette_size(flags), entries); - if (FAILED(hr)) + if (FAILED(hr = wined3d_palette_set_entries(palette, 0, 0, entry_count, entries))) { WARN("Failed to set palette entries, hr %#x.\n", hr); DeleteObject(palette->hpal); @@ -174,7 +158,7 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine } HRESULT CDECL wined3d_palette_create(struct wined3d_device *device, DWORD flags, - const PALETTEENTRY *entries, struct wined3d_palette **palette) + unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette) { struct wined3d_palette *object; HRESULT hr; @@ -186,8 +170,7 @@ HRESULT CDECL wined3d_palette_create(struct wined3d_device *device, DWORD flags, if (!object) return E_OUTOFMEMORY; - hr = wined3d_palette_init(object, device, flags, entries); - if (FAILED(hr)) + if (FAILED(hr = wined3d_palette_init(object, device, flags, entry_count, entries))) { WARN("Failed to initialize palette, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bbd5775..a1a99d9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -156,7 +156,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) -@ cdecl wined3d_palette_create(ptr long ptr ptr) +@ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) @ cdecl wined3d_palette_incref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4599678..52f8e52 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2234,7 +2234,7 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags, - const PALETTEENTRY *entries, struct wined3d_palette **palette); + unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette); ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries);

1 0

Henri Verbeet : wined3d: Get rid of unused palette flags.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 4e7b62a46da52e1cbc9cffd4ebc3b46c06f16edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7b62a46da52e1cbc9cffd4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 13 09:07:49 2013 +0100 wined3d: Get rid of unused palette flags. --- dlls/ddraw/palette.c | 10 +++++++++- dlls/wined3d/palette.c | 8 ++++---- dlls/wined3d/surface.c | 11 +---------- include/wine/wined3d.h | 15 +++------------ 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 214c912..d04f426 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -257,6 +257,7 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette, struct ddraw *ddraw, DWORD flags, PALETTEENTRY *entries) { unsigned int entry_count; + DWORD wined3d_flags = 0; HRESULT hr; if ((entry_count = palette_size(flags)) == ~0u) @@ -265,12 +266,19 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette, return DDERR_INVALIDPARAMS; } + if (flags & DDPCAPS_8BITENTRIES) + wined3d_flags |= WINED3D_PALETTE_8BIT_ENTRIES; + if (flags & DDPCAPS_ALLOW256) + wined3d_flags |= WINED3D_PALETTE_ALLOW_256; + if (flags & DDPCAPS_ALPHA) + wined3d_flags |= WINED3D_PALETTE_ALPHA; + palette->IDirectDrawPalette_iface.lpVtbl = &ddraw_palette_vtbl; palette->ref = 1; palette->flags = flags; if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device, - flags, entry_count, entries, &palette->wineD3DPalette))) + wined3d_flags, entry_count, entries, &palette->wineD3DPalette))) { WARN("Failed to create wined3d palette, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 27e6b24..e659952 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -64,7 +64,7 @@ HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, if (start > palette->palNumEntries || count > palette->palNumEntries - start) return WINED3DERR_INVALIDCALL; - if (palette->flags & WINEDDPCAPS_8BITENTRIES) + if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) { BYTE *entry = (BYTE *)entries; unsigned int i; @@ -87,7 +87,7 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, palette, flags, start, count, entries); TRACE("Palette flags: %#x.\n", palette->flags); - if (palette->flags & WINEDDPCAPS_8BITENTRIES) + if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) { const BYTE *entry = (const BYTE *)entries; unsigned int i; @@ -100,9 +100,9 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, memcpy(palette->palents + start, entries, count * sizeof(*palette->palents)); /* When WINEDDCAPS_ALLOW256 isn't set we need to override entry 0 with black and 255 with white */ - if (!(palette->flags & WINEDDPCAPS_ALLOW256)) + if (!(palette->flags & WINED3D_PALETTE_ALLOW_256)) { - TRACE("WINEDDPCAPS_ALLOW256 set, overriding palette entry 0 with black and 255 with white\n"); + TRACE("WINED3D_PALETTE_ALLOW_256 not set, overriding palette entry 0 with black and 255 with white.\n"); palette->palents[0].peRed = 0; palette->palents[0].peGreen = 0; palette->palents[0].peBlue = 0; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ec9ac6c..8c40516 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2498,18 +2498,9 @@ void CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct w return; } - if (surface->palette && (surface->resource.usage & WINED3DUSAGE_RENDERTARGET)) - surface->palette->flags &= ~WINEDDPCAPS_PRIMARYSURFACE; - surface->palette = palette; - if (palette) - { - if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - palette->flags |= WINEDDPCAPS_PRIMARYSURFACE; - surface->surface_ops->surface_realize_palette(surface); - } } HRESULT CDECL wined3d_surface_set_color_key(struct wined3d_surface *surface, @@ -3777,7 +3768,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 table[i][3] = i; else if (colorkey && color_in_range(&surface->src_blt_color_key, i)) table[i][3] = 0x00; - else if (pal->flags & WINEDDPCAPS_ALPHA) + else if (pal->flags & WINED3D_PALETTE_ALPHA) table[i][3] = pal->palents[i].peFlags; else table[i][3] = 0xff; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 52f8e52..47dde06 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1481,18 +1481,9 @@ enum wined3d_display_rotation #define WINEDDCAPS2_STEREO 0x02000000 #define WINEDDCAPS2_SYSTONONLOCAL_AS_SYSTOLOCAL 0x04000000 -/* DDCAPS.d */ -#define WINEDDPCAPS_4BIT 0x00000001 -#define WINEDDPCAPS_8BITENTRIES 0x00000002 -#define WINEDDPCAPS_8BIT 0x00000004 -#define WINEDDPCAPS_INITIALIZE 0x00000008 -#define WINEDDPCAPS_PRIMARYSURFACE 0x00000010 -#define WINEDDPCAPS_PRIMARYSURFACELEFT 0x00000020 -#define WINEDDPCAPS_ALLOW256 0x00000040 -#define WINEDDPCAPS_VSYNC 0x00000080 -#define WINEDDPCAPS_1BIT 0x00000100 -#define WINEDDPCAPS_2BIT 0x00000200 -#define WINEDDPCAPS_ALPHA 0x00000400 +#define WINED3D_PALETTE_8BIT_ENTRIES 0x00000001 +#define WINED3D_PALETTE_ALLOW_256 0x00000002 +#define WINED3D_PALETTE_ALPHA 0x00000004 #define WINED3D_SURFACE_MAPPABLE 0x00000001 #define WINED3D_SURFACE_DISCARD 0x00000002

1 0