November 2006 - Wine-Commits

Jacek Caban : mshtml: Added put_fontFamily implementation.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 7c478bf71943b2e0c9f004a087c1780e098fb114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c478bf71943b2e0c9f004a08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:05:48 2006 +0100 mshtml: Added put_fontFamily implementation. --- dlls/mshtml/htmlstyle.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 9bc0333..e9c6529 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -46,6 +46,33 @@ typedef struct { #define HTMLSTYLE(x) ((IHTMLStyle*) &(x)->lpHTMLStyleVtbl); +static const WCHAR attrFontFamily[] = + {'f','o','n','t','-','f','a','m','i','l','y',0}; + +static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value) +{ + nsAString str_name, str_value, str_empty; + nsresult nsres; + + static const PRUnichar wszEmpty[] = {0}; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_w(value)); + + nsAString_Init(&str_name, name); + nsAString_Init(&str_value, value); + nsAString_Init(&str_empty, wszEmpty); + + nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->nsstyle, &str_name, &str_value, &str_empty); + if(NS_FAILED(nsres)) + ERR("SetProperty failed: %08x\n", nsres); + + nsAString_Finish(&str_name); + nsAString_Finish(&str_value); + nsAString_Finish(&str_empty); + + return S_OK; +} + #define HTMLSTYLE_THIS(iface) DEFINE_THIS(HTMLStyle, HTMLStyle, iface) static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, void **ppv) @@ -135,8 +162,10 @@ static HRESULT WINAPI HTMLStyle_Invoke(I static HRESULT WINAPI HTMLStyle_put_fontFamily(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, attrFontFamily, v); } static HRESULT WINAPI HTMLStyle_get_fontFamily(IHTMLStyle *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Store nsIDOMCSSStyleDeclaration in HTMLStyle.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 5a9980e1b73c591c1f682cb6142b6fb19cc9012e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9980e1b73c591c1f682cb61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:05:01 2006 +0100 mshtml: Store nsIDOMCSSStyleDeclaration in HTMLStyle. --- dlls/mshtml/htmlelem.c | 23 +++++++++++++++++++++-- dlls/mshtml/htmlstyle.c | 7 ++++++- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsiface.idl | 30 ++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 57419b0..37abb51 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -243,11 +243,30 @@ static HRESULT WINAPI HTMLElement_get_pa static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p) { HTMLElement *This = HTMLELEM_THIS(iface); + nsIDOMElementCSSInlineStyle *nselemstyle; + nsIDOMCSSStyleDeclaration *nsstyle; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - /* FIXME: Store IHTMLStyle instead of creating a new instance in every call. */ - *p = HTMLStyle_Create(); + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMElementCSSInlineStyle, + (void**)&nselemstyle); + if(NS_FAILED(nsres)) { + ERR("Coud not get nsIDOMCSSStyleDeclaration interface: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMElementCSSInlineStyle_GetStyle(nselemstyle, &nsstyle); + nsIDOMElementCSSInlineStyle_Release(nselemstyle); + if(NS_FAILED(nsres)) { + ERR("GetStyle failed: %08x\n", nsres); + return E_FAIL; + } + + /* FIXME: Store style instead of creating a new instance in each call */ + *p = HTMLStyle_Create(nsstyle); + + nsIDOMCSSStyleDeclaration_Release(nsstyle); return S_OK; } diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 57000d7..9bc0333 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -40,6 +40,8 @@ typedef struct { const IHTMLStyleVtbl *lpHTMLStyleVtbl; LONG ref; + + nsIDOMCSSStyleDeclaration *nsstyle; } HTMLStyle; #define HTMLSTYLE(x) ((IHTMLStyle*) &(x)->lpHTMLStyleVtbl); @@ -1578,12 +1580,15 @@ static const IHTMLStyleVtbl HTMLStyleVtb HTMLStyle_toString }; -IHTMLStyle *HTMLStyle_Create(void) +IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration *nsstyle) { HTMLStyle *ret = mshtml_alloc(sizeof(HTMLStyle)); ret->lpHTMLStyleVtbl = &HTMLStyleVtbl; ret->ref = 1; + ret->nsstyle = nsstyle; + + nsIDOMCSSStyleDeclaration_AddRef(nsstyle); return HTMLSTYLE(ret); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 287d574..abc283b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -329,7 +329,7 @@ void set_document_bscallback(HTMLDocumen IHlink *Hlink_Create(void); IHTMLSelectionObject *HTMLSelectionObject_Create(nsISelection*); IHTMLTxtRange *HTMLTxtRange_Create(nsISelection*); -IHTMLStyle *HTMLStyle_Create(void); +IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration*); void HTMLElement_Create(HTMLDOMNode*); void HTMLBodyElement_Create(HTMLElement*); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 0e59bc9..39a9da7 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -110,6 +110,8 @@ typedef nsISupports nsIDOMHTMLCollection typedef nsISupports nsIDOMRange; typedef nsISupports nsIEditor; typedef nsISupports nsIWebProgressListener; +typedef nsISupports nsIDOMCSSValue; +typedef nsISupports nsIDOMCSSRule; [ object, @@ -377,6 +379,25 @@ interface nsIUploadChannel : nsISupports [ object, + uuid(a6cf90be-15b3-11d2-932e-00805f8add32) +] +interface nsIDOMCSSStyleDeclaration : nsISupports +{ + nsresult GetCssText(nsAString *aCssText); + nsresult SetCssText(const nsAString *aCssText); + nsresult GetPropertyValue(const nsAString *propertyName, nsAString *_retval); + nsresult GetPropertyCSSValue(const nsAString *propertyName, nsIDOMCSSValue **_retval); + nsresult RemoveProperty(const nsAString *propertyName, nsAString *_retval); + nsresult GetPropertyPriority(const nsAString *propertyName, nsAString *_retval); + nsresult SetProperty(const nsAString *propertyName, const nsAString *value, + const nsAString *priority); + nsresult GetLength(PRUint32 *aLength); + nsresult Item(PRUint32 index, nsAString *_retval); + nsresult GetParentRule(nsIDOMCSSRule **aParentRule); +} + +[ + object, uuid(a6cf907d-15b3-11d2-932e-00805f8add32) ] interface nsIDOMNodeList : nsISupports @@ -462,6 +483,15 @@ interface nsIDOMElement : nsIDOMNode PRBool *_retval); } +[ + object, + uuid(99715845-95fc-4a56-aa53-214b65c26e22) +] +interface nsIDOMElementCSSInlineStyle : nsISupports +{ + nsresult GetStyle(nsIDOMCSSStyleDeclaration **aStyle); +} + cpp_quote("#undef GetClassName"); [

1 0

Jacek Caban : mshtml: Added get_style implementation.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 5b1af5b7d16452794f600c05b9460118cea34478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1af5b7d16452794f600c05b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:04:06 2006 +0100 mshtml: Added get_style implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 8 +- dlls/mshtml/htmlstyle.c | 1589 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 1597 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b1af5b7d16452794f600…

1 0

Alexandre Julliard : include: Install adshlp.h too.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 1447e6f63496a3d39631ffccc33a7ec464c2ac59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1447e6f63496a3d39631ffccc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 15:47:16 2006 +0100 include: Install adshlp.h too. --- include/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index c55919b..2dc8a68 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -70,6 +70,7 @@ WINDOWS_INCLUDES = \ $(WINDOWS_IDL_INCLUDES) \ accctrl.h \ aclapi.h \ + adshlp.h \ advpub.h \ appmgmt.h \ audevcod.h \

1 0

Alexandre Julliard : include: Get rid of heap.h.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 2731998ae6f08effced497ba115b67ab3232ecc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2731998ae6f08effced497ba1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 15:29:40 2006 +0100 include: Get rid of heap.h. --- dlls/wineps.drv/escape.c | 37 ++++++++++++++++++++++++++----------- dlls/wineps.drv/init.c | 10 +++++++--- dlls/winspool.drv/info.c | 23 +++++++++++++++++------ include/heap.h | 46 ---------------------------------------------- 4 files changed, 50 insertions(+), 66 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 3572084..dcc972e 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -28,7 +28,6 @@ #include "psdrv.h" #include "wine/debug.h" #include "winspool.h" -#include "heap.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); @@ -434,22 +433,38 @@ INT PSDRV_StartDocA( PSDRV_PDEVICE *phys INT PSDRV_StartDoc( PSDRV_PDEVICE *physDev, const DOCINFOW *doc ) { DOCINFOA docA; - INT ret; + INT ret, len; + LPSTR docname = NULL, output = NULL, datatype = NULL; docA.cbSize = doc->cbSize; - docA.lpszDocName = doc->lpszDocName ? - HEAP_strdupWtoA( GetProcessHeap(), 0, doc->lpszDocName ) : NULL; - docA.lpszOutput = doc->lpszOutput ? - HEAP_strdupWtoA( GetProcessHeap(), 0, doc->lpszOutput ) : NULL; - docA.lpszDatatype = doc->lpszDatatype ? - HEAP_strdupWtoA( GetProcessHeap(), 0, doc->lpszDatatype ) : NULL; + if (doc->lpszDocName) + { + len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, NULL, 0, NULL, NULL ); + if ((docname = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, docname, len, NULL, NULL ); + } + if (doc->lpszOutput) + { + len = WideCharToMultiByte( CP_ACP, 0, doc->lpszOutput, -1, NULL, 0, NULL, NULL ); + if ((output = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_ACP, 0, doc->lpszOutput, -1, output, len, NULL, NULL ); + } + if (doc->lpszDatatype) + { + len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDatatype, -1, NULL, 0, NULL, NULL ); + if ((datatype = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_ACP, 0, doc->lpszDatatype, -1, datatype, len, NULL, NULL ); + } + docA.lpszDocName = docname; + docA.lpszOutput = output; + docA.lpszDatatype = datatype; docA.fwType = doc->fwType; ret = PSDRV_StartDocA(physDev, &docA); - HeapFree( GetProcessHeap(), 0, (LPSTR)docA.lpszDocName ); - HeapFree( GetProcessHeap(), 0, (LPSTR)docA.lpszOutput ); - HeapFree( GetProcessHeap(), 0, (LPSTR)docA.lpszDatatype ); + HeapFree( GetProcessHeap(), 0, docname ); + HeapFree( GetProcessHeap(), 0, output ); + HeapFree( GetProcessHeap(), 0, datatype ); return ret; } diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0868e22..8ec88b5 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -22,6 +22,7 @@ #include "config.h" #include "wine/port.h" +#include <stdarg.h> #include <string.h> #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -33,13 +34,14 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" #include "winerror.h" #include "wownt32.h" -#include "heap.h" #include "winreg.h" #include "psdrv.h" #include "winspool.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); @@ -353,7 +355,9 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEV physDev->logPixelsY = physDev->pi->ppd->DefaultResolution; if (output) { - physDev->job.output = HEAP_strdupWtoA( PSDRV_Heap, 0, output ); + INT len = WideCharToMultiByte( CP_ACP, 0, output, -1, NULL, 0, NULL, NULL ); + if ((physDev->job.output = HeapAlloc( PSDRV_Heap, 0, len ))) + WideCharToMultiByte( CP_ACP, 0, output, -1, physDev->job.output, len, NULL, NULL ); } else physDev->job.output = NULL; physDev->job.hJob = 0; diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8759257..38e4dc8 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -58,7 +58,6 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" -#include "heap.h" #include "winnls.h" #include "ddk/winsplp.h" @@ -332,6 +331,18 @@ static LPWSTR strdupW(LPCWSTR p) return ret; } +static LPSTR strdupWtoA( LPCWSTR str ) +{ + LPSTR ret; + INT len; + + if (!str) return NULL; + len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); + ret = HeapAlloc( GetProcessHeap(), 0, len ); + if(ret) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + return ret; +} + /* Returns the number of bytes in an ansi \0\0 terminated string (multi_sz). The result includes all \0s (specifically the last two). */ static int multi_sz_lenA(const char *str) @@ -1589,8 +1600,8 @@ INT WINAPI DeviceCapabilitiesW(LPCWSTR p const DEVMODEW *pDevMode) { LPDEVMODEA dmA = DEVMODEdupWtoA(GetProcessHeap(), pDevMode); - LPSTR pDeviceA = HEAP_strdupWtoA(GetProcessHeap(),0,pDevice); - LPSTR pPortA = HEAP_strdupWtoA(GetProcessHeap(),0,pPort); + LPSTR pDeviceA = strdupWtoA(pDevice); + LPSTR pPortA = strdupWtoA(pPort); INT ret; if(pOutput && (fwCapability == DC_BINNAMES || @@ -1653,7 +1664,7 @@ LONG WINAPI DocumentPropertiesA(HWND hWn SetLastError(ERROR_INVALID_HANDLE); return -1; } - lpName = HEAP_strdupWtoA(GetProcessHeap(),0,lpNameW); + lpName = strdupWtoA(lpNameW); } if (!GDI_CallExtDeviceMode16) @@ -1685,7 +1696,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWn LPDEVMODEW pDevModeInput, DWORD fMode) { - LPSTR pDeviceNameA = HEAP_strdupWtoA(GetProcessHeap(),0,pDeviceName); + LPSTR pDeviceNameA = strdupWtoA(pDeviceName); LPDEVMODEA pDevModeInputA = DEVMODEdupWtoA(GetProcessHeap(),pDevModeInput); LPDEVMODEA pDevModeOutputA = NULL; LONG ret; @@ -3228,7 +3239,7 @@ static BOOL WINSPOOL_GetStringFromReg(HK if(unicode) ret = RegQueryValueExW(hkey, ValueName, 0, &type, ptr, &sz); else { - LPSTR ValueNameA = HEAP_strdupWtoA(GetProcessHeap(),0,ValueName); + LPSTR ValueNameA = strdupWtoA(ValueName); ret = RegQueryValueExA(hkey, ValueNameA, 0, &type, ptr, &sz); HeapFree(GetProcessHeap(),0,ValueNameA); } diff --git a/include/heap.h b/include/heap.h deleted file mode 100644 index b0432f7..0000000 --- a/include/heap.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Win32 heap definitions - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_HEAP_H -#define __WINE_HEAP_H - -#include <stdarg.h> -#include <string.h> - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> - -/* strdup macros */ -/* DO NOT USE IT!! it will go away soon */ - -inline static LPSTR HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str ) -{ - LPSTR ret; - INT len; - - if (!str) return NULL; - len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); - ret = HeapAlloc( heap, flags, len ); - if(ret) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); - return ret; -} - -#endif /* __WINE_HEAP_H */

1 0

Alexandre Julliard : gdi32: Get rid of the gdi.h include.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

1 0

Alexandre Julliard : gdi32: Stop exporting GDI_GetObjPtr and GDI_ReleaseObj .
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 456891b37771583ab70f72687ba9343aed582b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=456891b37771583ab70f72687… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 14:39:04 2006 +0100 gdi32: Stop exporting GDI_GetObjPtr and GDI_ReleaseObj. --- dlls/gdi32/gdi32.spec | 6 ------ dlls/gdi32/gdi_private.h | 37 +++++++++++++++++++++++++++++++++++++ include/gdi.h | 43 ------------------------------------------- 3 files changed, 37 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index cea9a5c..10ec996 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -528,9 +528,3 @@ # GDI objects @ cdecl __wine_make_gdi_object_system(long long) - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl GDI_GetObjPtr(long long) -@ cdecl GDI_ReleaseObj(long) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 31130a6..f4d8900 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -39,6 +39,33 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) + /* GDI objects magic numbers */ +#define FIRST_MAGIC 0x4f47 +#define PEN_MAGIC 0x4f47 +#define BRUSH_MAGIC 0x4f48 +#define FONT_MAGIC 0x4f49 +#define PALETTE_MAGIC 0x4f4a +#define BITMAP_MAGIC 0x4f4b +#define REGION_MAGIC 0x4f4c +#define DC_MAGIC 0x4f4d +#define DISABLED_DC_MAGIC 0x4f4e +#define META_DC_MAGIC 0x4f4f +#define METAFILE_MAGIC 0x4f50 +#define METAFILE_DC_MAGIC 0x4f51 +#define ENHMETAFILE_MAGIC 0x4f52 +#define ENHMETAFILE_DC_MAGIC 0x4f53 +#define MEMORY_DC_MAGIC 0x4f54 +#define EXT_PEN_MAGIC 0x4f55 +#define LAST_MAGIC 0x4f55 + +#define MAGIC_DONTCARE 0xffff + +/* GDI constants for making objects private/system (naming undoc. !) */ +#define OBJECT_PRIVATE 0x2000 +#define OBJECT_NOSYSTEM 0x8000 + +#define GDIMAGIC(magic) ((magic) & ~(OBJECT_PRIVATE|OBJECT_NOSYSTEM)) + struct gdi_obj_funcs { HGDIOBJ (*pSelectObject)( HGDIOBJ handle, void *obj, HDC hdc ); @@ -55,6 +82,14 @@ struct hdc_list struct hdc_list *next; }; +typedef struct tagGDIOBJHDR +{ + WORD wMagic; + DWORD dwCount; + const struct gdi_obj_funcs *funcs; + struct hdc_list *hdcs; +} GDIOBJHDR; + /* Device functions for the Wine driver interface */ typedef struct { int opaque; } *PHYSDEV; /* PHYSDEV is an opaque pointer */ @@ -406,6 +441,8 @@ extern BOOL GDI_Init(void); extern void *GDI_AllocObject( WORD, WORD, HGDIOBJ *, const struct gdi_obj_funcs *funcs ); extern void *GDI_ReallocObject( WORD, HGDIOBJ, void *obj ); extern BOOL GDI_FreeObject( HGDIOBJ, void *obj ); +extern void *GDI_GetObjPtr( HGDIOBJ, WORD ); +extern void GDI_ReleaseObj( HGDIOBJ ); extern void GDI_CheckNotLock(void); extern BOOL GDI_hdc_using_object(HGDIOBJ obj, HDC hdc); extern BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc); diff --git a/include/gdi.h b/include/gdi.h index 487e78c..a5ad7f4 100644 --- a/include/gdi.h +++ b/include/gdi.h @@ -28,51 +28,8 @@ #include <wine/wingdi16.h> #include <math.h> - /* GDI objects magic numbers */ -#define FIRST_MAGIC 0x4f47 -#define PEN_MAGIC 0x4f47 -#define BRUSH_MAGIC 0x4f48 -#define FONT_MAGIC 0x4f49 -#define PALETTE_MAGIC 0x4f4a -#define BITMAP_MAGIC 0x4f4b -#define REGION_MAGIC 0x4f4c -#define DC_MAGIC 0x4f4d -#define DISABLED_DC_MAGIC 0x4f4e -#define META_DC_MAGIC 0x4f4f -#define METAFILE_MAGIC 0x4f50 -#define METAFILE_DC_MAGIC 0x4f51 -#define ENHMETAFILE_MAGIC 0x4f52 -#define ENHMETAFILE_DC_MAGIC 0x4f53 -#define MEMORY_DC_MAGIC 0x4f54 -#define EXT_PEN_MAGIC 0x4f55 -#define LAST_MAGIC 0x4f55 - -#define MAGIC_DONTCARE 0xffff - -/* GDI constants for making objects private/system (naming undoc. !) */ -#define OBJECT_PRIVATE 0x2000 -#define OBJECT_NOSYSTEM 0x8000 - -#define GDIMAGIC(magic) ((magic) & ~(OBJECT_PRIVATE|OBJECT_NOSYSTEM)) - -struct gdi_obj_funcs; -struct hdc_list; - -typedef struct tagGDIOBJHDR -{ - WORD wMagic; - DWORD dwCount; - const struct gdi_obj_funcs *funcs; - struct hdc_list *hdcs; -} GDIOBJHDR; - #define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ - /* GDI local heap */ - -extern void *GDI_GetObjPtr( HGDIOBJ, WORD ); -extern void GDI_ReleaseObj( HGDIOBJ ); - /* GetGlyphOutline */ #define WINE_GGO_GRAY16_BITMAP 0x7f

1 0

Alexandre Julliard : winex11.drv: Store the palette mapping in an X context instead of the GDI object.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 5e7afb8c3bda9cff32d698220d9511b1e90892de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7afb8c3bda9cff32d698220… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 14:38:43 2006 +0100 winex11.drv: Store the palette mapping in an X context instead of the GDI object. --- dlls/winex11.drv/palette.c | 59 +++++++++++++++++++++++++------------ dlls/winex11.drv/winex11.drv.spec | 1 + 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 026b28c..7ccfed7 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -20,11 +20,12 @@ #include "config.h" +#include <stdarg.h> #include <stdlib.h> #include <string.h> -#include "gdi.h" #include "windef.h" +#include "winbase.h" #include "winreg.h" #include "x11drv.h" #include "wine/debug.h" @@ -48,6 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(palette); * http://premium.microsoft.com/msdn/library/techart/f30/f34/f40/d4d/sa942.htm */ +#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ + #define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ #define PC_SYS_RESERVED 0x40 /* system palentry is not to be mapped to */ @@ -81,6 +84,8 @@ static int palette_size; static int X11DRV_PALETTE_firstFree = 0; static unsigned char X11DRV_PALETTE_freeList[256]; +static XContext palette_context; /* X context to associate a color mapping to a palette */ + /**********************************************************************/ /* Map an EGA index (0..15) to a pixel value in the system color space. */ @@ -114,14 +119,11 @@ static int X11DRV_PALETTE_LookupSystemXP */ static int *palette_get_mapping( HPALETTE hpal ) { - int *mapping = NULL; - PALETTEOBJ *ptr; + int *mapping; - if ((ptr = GDI_GetObjPtr( hpal, PALETTE_MAGIC ))) - { - mapping = ptr->mapping; - GDI_ReleaseObj( hpal ); - } + wine_tsx11_lock(); + if (XFindContext( gdi_display, (XID)hpal, palette_context, (char **)&mapping )) mapping = NULL; + wine_tsx11_unlock(); return mapping; } @@ -129,18 +131,11 @@ static int *palette_get_mapping( HPALETT /*********************************************************************** * palette_set_mapping */ -static int *palette_set_mapping( HPALETTE hpal, int *mapping ) +static void palette_set_mapping( HPALETTE hpal, int *mapping ) { - int *old_mapping = NULL; - PALETTEOBJ *ptr; - - if ((ptr = GDI_GetObjPtr( hpal, PALETTE_MAGIC ))) - { - old_mapping = ptr->mapping; - ptr->mapping = mapping; - GDI_ReleaseObj( hpal ); - } - return old_mapping; + wine_tsx11_lock(); + XSaveContext( gdi_display, (XID)hpal, palette_context, (char *)mapping ); + wine_tsx11_unlock(); } @@ -153,10 +148,14 @@ int X11DRV_PALETTE_Init(void) { int mask, white, black; int monoPlane; + int *mapping; PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS]; TRACE("initializing palette manager...\n"); + wine_tsx11_lock(); + palette_context = XUniqueContext(); + wine_tsx11_unlock(); white = WhitePixel( gdi_display, DefaultScreen(gdi_display) ); black = BlackPixel( gdi_display, DefaultScreen(gdi_display) ); monoPlane = 1; @@ -244,6 +243,9 @@ int X11DRV_PALETTE_Init(void) GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, sys_pal_template ); + if ((mapping = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(int) * NB_RESERVED_COLORS ))) + palette_set_mapping( GetStockObject(DEFAULT_PALETTE), mapping ); + if( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL ) { palette_size = 0; @@ -1195,6 +1197,25 @@ UINT X11DRV_RealizePalette( X11DRV_PDEVI return iRemapped; } + +/*********************************************************************** + * UnrealizePalette (X11DRV.@) + */ +BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) +{ + int *mapping = palette_get_mapping( hpal ); + + if (mapping) + { + wine_tsx11_lock(); + XDeleteContext( gdi_display, (XID)hpal, palette_context ); + wine_tsx11_unlock(); + HeapFree( GetProcessHeap(), 0, mapping ); + } + return TRUE; +} + + /*********************************************************************** * GetSystemPaletteEntries (X11DRV.@) */ diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index e6dc141..92756a6 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -59,6 +59,7 @@ @ cdecl SetTextColor(ptr long) X11DRV_SetTextColor @ cdecl StretchBlt(ptr long long long long ptr long long long long long) X11DRV_StretchBlt @ cdecl SwapBuffers(ptr) X11DRV_SwapBuffers +@ cdecl UnrealizePalette(long) X11DRV_UnrealizePalette # USER driver

1 0

Alexandre Julliard : gdi32: Get rid of the palette mapping handling and leave it up to the driver.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: bb51f96907fc3c6eb7691aa8eaf650b9e71e61fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb51f96907fc3c6eb7691aa8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 14:38:11 2006 +0100 gdi32: Get rid of the palette mapping handling and leave it up to the driver. --- dlls/gdi32/driver.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/palette.c | 82 ++++++++++++++++---------------------------- include/gdi.h | 9 ----- 6 files changed, 34 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f5ff9af..f08141c 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -193,6 +193,7 @@ static struct graphics_driver *create_dr GET_FUNC(StrokeAndFillPath); GET_FUNC(StrokePath); GET_FUNC(SwapBuffers); + GET_FUNC(UnrealizePalette); GET_FUNC(WidenPath); /* OpenGL32 */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 119bf76..1191c72 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -152,6 +152,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_StrokeAndFillPath, /* pStrokeAndFillPath */ EMFDRV_StrokePath, /* pStrokePath */ NULL, /* pSwapBuffers */ + NULL, /* pUnrealizePalette */ EMFDRV_WidenPath /* pWidenPath */ }; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0d3f1d0..31130a6 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -181,6 +181,7 @@ typedef struct tagDC_FUNCS BOOL (*pStrokeAndFillPath)(PHYSDEV); BOOL (*pStrokePath)(PHYSDEV); BOOL (*pSwapBuffers)(PHYSDEV); + BOOL (*pUnrealizePalette)(HPALETTE); BOOL (*pWidenPath)(PHYSDEV); /* OpenGL32 */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 82fe4ce..ab3ec3e 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -152,6 +152,7 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_StrokeAndFillPath, /* pStrokeAndFillPath */ MFDRV_StrokePath, /* pStrokePath */ NULL, /* pSwapBuffers */ + NULL, /* pUnrealizePalette */ MFDRV_WidenPath /* pWidenPath */ }; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index c136656..98d6a69 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -39,6 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(palette); +typedef struct tagPALETTEOBJ +{ + GDIOBJHDR header; + const DC_FUNCTIONS *funcs; /* DC function table */ + LOGPALETTE logpalette; /* _MUST_ be the last field */ +} PALETTEOBJ; + static INT PALETTE_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static BOOL PALETTE_UnrealizeObject( HGDIOBJ handle, void *obj ); static BOOL PALETTE_DeleteObject( HGDIOBJ handle, void *obj ); @@ -62,7 +69,6 @@ static UINT SystemPaletteUse = SYSPAL_ST static HPALETTE hPrimaryPalette = 0; /* used for WM_PALETTECHANGED */ static HPALETTE hLastRealizedPalette = 0; /* UnrealizeObject() needs it */ -static const DC_FUNCTIONS *pLastRealizedDC; static const PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS] = { @@ -106,7 +112,6 @@ HPALETTE PALETTE_Init(void) { HPALETTE hpalette; LOGPALETTE * palPtr; - PALETTEOBJ* palObj; /* create default palette (20 system colors) */ @@ -119,14 +124,6 @@ HPALETTE PALETTE_Init(void) memcpy( palPtr->palPalEntry, sys_pal_template, sizeof(sys_pal_template) ); hpalette = CreatePalette( palPtr ); HeapFree( GetProcessHeap(), 0, palPtr ); - - palObj = (PALETTEOBJ*) GDI_GetObjPtr( hpalette, PALETTE_MAGIC ); - if (palObj) - { - if (!(palObj->mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(int) * NB_RESERVED_COLORS ))) - ERR("Cannot create palette mapping -- out of memory!\n"); - GDI_ReleaseObj( hpalette ); - } return hpalette; } @@ -156,7 +153,7 @@ HPALETTE WINAPI CreatePalette( PALETTE_MAGIC, (HGDIOBJ *)&hpalette, &palette_funcs ))) return 0; memcpy( &palettePtr->logpalette, palette, size ); - palettePtr->mapping = NULL; + palettePtr->funcs = NULL; GDI_ReleaseObj( hpalette ); TRACE(" returning %p\n", hpalette); @@ -368,7 +365,6 @@ BOOL WINAPI ResizePalette( PALETTEOBJ * palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hPal, PALETTE_MAGIC ); UINT cPrevEnt, prevVer; int prevsize, size = sizeof(LOGPALETTE) + (cEntries - 1) * sizeof(PALETTEENTRY); - int* mapping = NULL; TRACE("hpal = %p, prev = %i, new = %i\n", hPal, palPtr ? palPtr->logpalette.palNumEntries : -1, cEntries ); @@ -378,28 +374,12 @@ BOOL WINAPI ResizePalette( prevsize = sizeof(LOGPALETTE) + (cPrevEnt - 1) * sizeof(PALETTEENTRY) + sizeof(int*) + sizeof(GDIOBJHDR); size += sizeof(int*) + sizeof(GDIOBJHDR); - mapping = palPtr->mapping; if (!(palPtr = GDI_ReallocObject( size, hPal, palPtr ))) return FALSE; - if( mapping ) - { - int *newMap = HeapReAlloc(GetProcessHeap(), 0, mapping, cEntries * sizeof(int) ); - if(newMap == NULL) - { - ERR("Cannot resize mapping -- out of memory!\n"); - GDI_ReleaseObj( hPal ); - return FALSE; - } - palPtr->mapping = newMap; - } + PALETTE_UnrealizeObject( hPal, palPtr ); - if( cEntries > cPrevEnt ) - { - if( mapping ) - memset(palPtr->mapping + cPrevEnt, 0, (cEntries - cPrevEnt)*sizeof(int)); - memset( (BYTE*)palPtr + prevsize, 0, size - prevsize ); - } + if( cEntries > cPrevEnt ) memset( (BYTE*)palPtr + prevsize, 0, size - prevsize ); palPtr->logpalette.palNumEntries = cEntries; palPtr->logpalette.palVersion = prevVer; GDI_ReleaseObj( hPal ); @@ -458,14 +438,10 @@ BOOL WINAPI AnimatePalette( TRACE("Not animating entry %d -- not PC_RESERVED\n", StartIndex); } } - - GDI_ReleaseObj( hPal ); - - TRACE("pLastRealizedDC %p -- pLastRealizedDC->pRealizePalette %p\n", - pLastRealizedDC, pLastRealizedDC ? pLastRealizedDC->pRealizePalette : 0); + if (palPtr->funcs && palPtr->funcs->pRealizePalette) + palPtr->funcs->pRealizePalette( NULL, hPal, hPal == hPrimaryPalette ); - if (pLastRealizedDC && pLastRealizedDC->pRealizePalette) - pLastRealizedDC->pRealizePalette( NULL, hPal, hPal == hPrimaryPalette ); + GDI_ReleaseObj( hPal ); } return TRUE; } @@ -678,14 +654,17 @@ static BOOL PALETTE_UnrealizeObject( HGD { PALETTEOBJ *palette = obj; - HeapFree( GetProcessHeap(), 0, palette->mapping ); - palette->mapping = NULL; + if (palette->funcs) + { + if (palette->funcs->pUnrealizePalette) + palette->funcs->pUnrealizePalette( handle ); + palette->funcs = NULL; + } if (hLastRealizedPalette == handle) { TRACE("unrealizing palette %p\n", handle); hLastRealizedPalette = 0; - pLastRealizedDC = NULL; } return TRUE; } @@ -696,15 +675,7 @@ static BOOL PALETTE_UnrealizeObject( HGD */ static BOOL PALETTE_DeleteObject( HGDIOBJ handle, void *obj ) { - PALETTEOBJ *palette = obj; - - HeapFree( GetProcessHeap(), 0, palette->mapping ); - if (hLastRealizedPalette == handle) - { - TRACE("unrealizing palette %p\n", handle); - hLastRealizedPalette = 0; - pLastRealizedDC = NULL; - } + PALETTE_UnrealizeObject( handle, obj ); return GDI_FreeObject( handle, obj ); } @@ -758,10 +729,17 @@ UINT WINAPI GDIRealizePalette( HDC hdc ) else if(dc->hPalette != hLastRealizedPalette ) { if (dc->funcs->pRealizePalette) - realized = dc->funcs->pRealizePalette( dc->physDev, dc->hPalette, - (dc->hPalette == hPrimaryPalette) ); + { + PALETTEOBJ *palPtr = GDI_GetObjPtr( dc->hPalette, PALETTE_MAGIC ); + if (palPtr) + { + realized = dc->funcs->pRealizePalette( dc->physDev, dc->hPalette, + (dc->hPalette == hPrimaryPalette) ); + palPtr->funcs = dc->funcs; + GDI_ReleaseObj( dc->hPalette ); + } + } hLastRealizedPalette = dc->hPalette; - pLastRealizedDC = dc->funcs; } else TRACE(" skipping (hLastRealizedPalette = %p)\n", hLastRealizedPalette); diff --git a/include/gdi.h b/include/gdi.h index 49b231f..487e78c 100644 --- a/include/gdi.h +++ b/include/gdi.h @@ -66,17 +66,8 @@ typedef struct tagGDIOBJHDR struct hdc_list *hdcs; } GDIOBJHDR; -/* palette object */ - #define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ -typedef struct tagPALETTEOBJ -{ - GDIOBJHDR header; - int *mapping; - LOGPALETTE logpalette; /* _MUST_ be the last field */ -} PALETTEOBJ; - /* GDI local heap */ extern void *GDI_GetObjPtr( HGDIOBJ, WORD );

1 0

Alexandre Julliard : winex11.drv: Abstract accesses to the palette color mapping.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 719b7068a95659baff94598b561aa730c64537bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=719b7068a95659baff94598b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 14:36:34 2006 +0100 winex11.drv: Abstract accesses to the palette color mapping. --- dlls/winex11.drv/palette.c | 143 ++++++++++++++++++++----------------------- 1 files changed, 67 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=719b7068a95659baff945…

1 0