October 2011 - Wine-commits

Marcus Meissner : mscoree: Mark cordebug_init as hidden.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: e2c5a0c23eb48ee41f9e98eaea1bff576cfa2768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c5a0c23eb48ee41f9e98eae… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:27:31 2011 +0200 mscoree: Mark cordebug_init as hidden. --- dlls/mscoree/mscoree_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index a253262..15396f8 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -161,6 +161,6 @@ extern HRESULT RuntimeHost_Destroy(RuntimeHost *This) DECLSPEC_HIDDEN; HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) DECLSPEC_HIDDEN; -extern void cordebug_init(RuntimeHost *This); +extern void cordebug_init(RuntimeHost *This) DECLSPEC_HIDDEN; #endif /* __MSCOREE_PRIVATE__ */

1 0

Marcus Meissner : mshtml: Mark replace_node_by_html as hidden.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: ac2f0ed02971f36cb65ee998f9c9f75ef3bb3c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2f0ed02971f36cb65ee998f… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:28:05 2011 +0200 mshtml: Mark replace_node_by_html as hidden. --- dlls/mshtml/mshtml_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7be212e..9123179 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -714,7 +714,7 @@ IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetLis void detach_selection(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; -HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*); +HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*) DECLSPEC_HIDDEN; HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : vbscript: Mark some symbols as hidden.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: b77770d589c9f20a723f616fec05994461001edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77770d589c9f20a723f616fe… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:28:46 2011 +0200 vbscript: Mark some symbols as hidden. --- dlls/vbscript/vbscript.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 491003b..9e18f47 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -115,12 +115,12 @@ struct _vbdisp_t { VARIANT props[1]; }; -HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); -HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*); -HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*); -HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); -HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*); -void collect_objects(script_ctx_t*); +HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; +HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; +HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; +HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; +HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*) DECLSPEC_HIDDEN; +void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; static inline unsigned arg_cnt(const DISPPARAMS *dp) { @@ -168,8 +168,8 @@ struct _script_ctx_t { struct list named_items; }; -HRESULT init_global(script_ctx_t*); -HRESULT init_err(script_ctx_t*); +HRESULT init_global(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT init_err(script_ctx_t*) DECLSPEC_HIDDEN; IUnknown *create_ax_site(script_ctx_t*) DECLSPEC_HIDDEN; @@ -321,9 +321,9 @@ TID_LIST LAST_tid } tid_t; -HRESULT get_typeinfo(tid_t,ITypeInfo**); +HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; -HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : msdaps: Mark create_* functions as hidden.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 22d7af02e68ada32fa9642b620fd171d86637818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d7af02e68ada32fa9642b62… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:29:29 2011 +0200 msdaps: Mark create_* functions as hidden. --- dlls/msdaps/row_server.idl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index afe9463..a59e6d8 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -229,7 +229,7 @@ coclass wine_rowset_proxy } -cpp_quote("extern HRESULT create_row_server( IUnknown*, LPVOID* );") -cpp_quote("extern HRESULT create_row_marshal( IUnknown*, LPVOID* );") -cpp_quote("extern HRESULT create_rowset_server( IUnknown*, LPVOID* );") -cpp_quote("extern HRESULT create_rowset_marshal( IUnknown*, LPVOID* );") +cpp_quote("extern HRESULT create_row_server( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;") +cpp_quote("extern HRESULT create_row_marshal( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;") +cpp_quote("extern HRESULT create_rowset_server( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;") +cpp_quote("extern HRESULT create_rowset_marshal( IUnknown*, LPVOID* ) DECLSPEC_HIDDEN;")

1 0

Marcus Meissner : dsound: Mark enum_callback and search_callback static.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: a664424c198a348aa9178dd5ccc930531a058299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a664424c198a348aa9178dd5c… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:24:12 2011 +0200 dsound: Mark enum_callback and search_callback static. --- dlls/dsound/propset.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index af9b26d..242b237 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -111,7 +111,7 @@ struct search_data { GUID *found_guid; }; -BOOL CALLBACK search_callback(GUID *guid, const WCHAR *desc, +static BOOL CALLBACK search_callback(GUID *guid, const WCHAR *desc, const WCHAR *module, void *user) { struct search_data *search = user; @@ -276,6 +276,7 @@ static HRESULT DSPROPERTY_DescriptionW( return S_OK; } +static BOOL CALLBACK enum_callback(GUID *guid, const WCHAR *desc, const WCHAR *module, void *user) {

1 0

Marcus Meissner : winex11.drv: Mark xrenderdrv_ExtTextOut as static.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: aee645dfc0a870d3f3b4883fc287cfc2e186d61f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee645dfc0a870d3f3b4883fc… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:28:56 2011 +0200 winex11.drv: Mark xrenderdrv_ExtTextOut as static. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index de469e2..a985898 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1943,8 +1943,8 @@ static inline BOOL is_dib_with_colortable( X11DRV_PDEVICE *physDev ) /*********************************************************************** * xrenderdrv_ExtTextOut */ -BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) +static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, + const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); XGCValues xgcval;

1 0

Marcus Meissner : winmm: Mark two functions as hidden.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: c7f8ad487d0b86a10267ffdb87bd21f732b5bcc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f8ad487d0b86a10267ffdb8… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:29:08 2011 +0200 winmm: Mark two functions as hidden. --- dlls/winmm/winemm.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 38f72b3..114811c 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -150,9 +150,9 @@ const char* WINMM_ErrorToString(MMRESULT error) DECLSPEC_HIDDEN; void TIME_MMTimeStop(void) DECLSPEC_HIDDEN; -MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer); +MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DECLSPEC_HIDDEN; -BOOL WINMM_InitWaveform(void); +BOOL WINMM_InitWaveform(void) DECLSPEC_HIDDEN; /* Global variables */ extern CRITICAL_SECTION WINMM_cs DECLSPEC_HIDDEN;

1 0

Marcus Meissner : ole32: Mark two functions as hidden.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: da0f475d4b64d3f26b3db44393f93ccdea834996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0f475d4b64d3f26b3db4439… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:28:32 2011 +0200 ole32: Mark two functions as hidden. --- dlls/ole32/compobj_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 00024ab..fc92389 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -289,8 +289,8 @@ extern HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID extern HRESULT WINAPI OLE32_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLE32_DllUnregisterServer(void) DECLSPEC_HIDDEN; -extern HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv); -extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv); +extern HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Remove no longer needed support for a source DIB color map in XRender StretchBlt .
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: e502ae4d1f6a3c46c9b41763d4fc04580a4afd39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e502ae4d1f6a3c46c9b41763d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 3 16:24:01 2011 -0500 winex11: Remove no longer needed support for a source DIB color map in XRender StretchBlt. --- dlls/winex11.drv/xrender.c | 26 ++------------------------ 1 files changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a985898..c039468 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2388,29 +2388,6 @@ static void xrender_mono_blit( Picture src_pict, Picture dst_pict, multiply_alpha( dst_pict, pict_formats[dst_format], bg->alpha, x_dst, y_dst, width, height ); } -static void get_colors( struct xrender_physdev *physdev_src, struct xrender_physdev *physdev_dst, - XRenderColor *fg, XRenderColor *bg ) -{ - if (physdev_src->format == WXR_FORMAT_MONO) - { - RGBQUAD rgb[2]; - int pixel; - - if (GetDIBColorTable( physdev_src->dev.hdc, 0, 2, rgb ) == 2) - { - pixel = X11DRV_PALETTE_ToPhysical( physdev_dst->x11dev, - RGB( rgb[0].rgbRed, rgb[0].rgbGreen, rgb[0].rgbBlue )); - get_xrender_color( physdev_dst->pict_format, pixel, fg ); - pixel = X11DRV_PALETTE_ToPhysical( physdev_dst->x11dev, - RGB( rgb[1].rgbRed, rgb[1].rgbGreen, rgb[1].rgbBlue )); - get_xrender_color( physdev_dst->pict_format, pixel, bg ); - return; - } - } - get_xrender_color( physdev_dst->pict_format, physdev_dst->x11dev->textPixel, fg ); - get_xrender_color( physdev_dst->pict_format, physdev_dst->x11dev->backgroundPixel, bg ); -} - /* create a pixmap and render picture for an image */ static DWORD create_image_pixmap( BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, enum wxr_format format, @@ -2512,7 +2489,8 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr { XRenderColor fg, bg; - get_colors( physdev_src, physdev_dst, &fg, &bg ); + get_xrender_color( physdev_dst->pict_format, physdev_dst->x11dev->textPixel, &fg ); + get_xrender_color( physdev_dst->pict_format, physdev_dst->x11dev->backgroundPixel, &bg ); fg.alpha = bg.alpha = 0; xrender_mono_blit( src_pict, dst_pict, physdev_dst->format, &fg, &bg,

1 0

Alexandre Julliard : winex11: Remove no longer needed support for a source DIB color map in X11 StretchBlt .
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: f0f1005b3750ae4977b371c3ed0e3b9eb0c29013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f1005b3750ae4977b371c3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 3 16:29:23 2011 -0500 winex11: Remove no longer needed support for a source DIB color map in X11 StretchBlt. --- dlls/winex11.drv/bitblt.c | 41 ++++++----------------------------------- 1 files changed, 6 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 355d517..c0ff7f3 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -582,24 +582,6 @@ int main() #endif /* BITBLT_TEST */ -static void get_colors(X11DRV_PDEVICE *physDevDst, X11DRV_PDEVICE *physDevSrc, - int *fg, int *bg) -{ - RGBQUAD rgb[2]; - - *fg = physDevDst->textPixel; - *bg = physDevDst->backgroundPixel; - if(physDevSrc->depth == 1) { - if(GetDIBColorTable(physDevSrc->dev.hdc, 0, 2, rgb) == 2) { - DWORD logcolor; - logcolor = RGB(rgb[0].rgbRed, rgb[0].rgbGreen, rgb[0].rgbBlue); - *fg = X11DRV_PALETTE_ToPhysical( physDevDst, logcolor ); - logcolor = RGB(rgb[1].rgbRed, rgb[1].rgbGreen,rgb[1].rgbBlue); - *bg = X11DRV_PALETTE_ToPhysical( physDevDst, logcolor ); - } - } -} - /* return a mask for meaningful bits when doing an XGetPixel on an image */ static unsigned long image_pixel_mask( X11DRV_PDEVICE *physDev ) { @@ -629,7 +611,6 @@ static int BITBLT_GetSrcArea( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDe int exposures = 0; INT width = visRectSrc->right - visRectSrc->left; INT height = visRectSrc->bottom - visRectSrc->top; - int fg, bg; BOOL memdc = (GetObjectType(physDevSrc->dev.hdc) == OBJ_MEMDC); if (physDevSrc->depth == physDevDst->depth) @@ -690,20 +671,16 @@ static int BITBLT_GetSrcArea( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDe { if (physDevSrc->depth == 1) /* monochrome -> color */ { - get_colors(physDevDst, physDevSrc, &fg, &bg); - wine_tsx11_lock(); if (X11DRV_PALETTE_XPixelToPalette) { - XSetBackground( gdi_display, gc, - X11DRV_PALETTE_XPixelToPalette[fg] ); - XSetForeground( gdi_display, gc, - X11DRV_PALETTE_XPixelToPalette[bg]); + XSetBackground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->textPixel] ); + XSetForeground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->backgroundPixel]); } else { - XSetBackground( gdi_display, gc, fg ); - XSetForeground( gdi_display, gc, bg ); + XSetBackground( gdi_display, gc, physDevDst->textPixel ); + XSetForeground( gdi_display, gc, physDevDst->backgroundPixel ); } XCopyPlane( gdi_display, physDevSrc->drawable, pixmap, gc, physDevSrc->dc_rect.left + visRectSrc->left, @@ -1004,9 +981,6 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, { wine_tsx11_lock(); XSetFunction( gdi_display, physDevDst->gc, OP_ROP(*opcode) ); - wine_tsx11_unlock(); - - wine_tsx11_lock(); XCopyArea( gdi_display, physDevSrc->drawable, physDevDst->drawable, physDevDst->gc, physDevSrc->dc_rect.left + src->visrect.left, @@ -1020,12 +994,9 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } if (physDevSrc->depth == 1) { - int fg, bg; - - get_colors(physDevDst, physDevSrc, &fg, &bg); wine_tsx11_lock(); - XSetBackground( gdi_display, physDevDst->gc, fg ); - XSetForeground( gdi_display, physDevDst->gc, bg ); + XSetBackground( gdi_display, physDevDst->gc, physDevDst->textPixel ); + XSetForeground( gdi_display, physDevDst->gc, physDevDst->backgroundPixel ); XSetFunction( gdi_display, physDevDst->gc, OP_ROP(*opcode) ); XCopyPlane( gdi_display, physDevSrc->drawable, physDevDst->drawable, physDevDst->gc,

1 0