October 2011 - Wine-Commits

Marcus Meissner : winex11.drv: Mark xrenderdrv_ExtTextOut as static.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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 : mscoree: Mark cordebug_init as hidden.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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

Nikolay Sivov : comctl32/treeview: Free checkbox imagelist when control is about to be killed.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 1bc331f31f44a382a7f909d79da794d28c233fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc331f31f44a382a7f909d79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 1 23:29:10 2011 +0400 comctl32/treeview: Free checkbox imagelist when control is about to be killed. --- dlls/comctl32/tests/treeview.c | 22 ++++++++++++++++++---- dlls/comctl32/treeview.c | 34 ++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index fd4a6ce..c99d480 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -658,7 +658,7 @@ static void test_get_set_bkcolor(void) static void test_get_set_imagelist(void) { - HIMAGELIST hImageList = NULL; + HIMAGELIST himl; HWND hTree; hTree = create_treeview_control(0); @@ -667,9 +667,9 @@ static void test_get_set_imagelist(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Test a NULL HIMAGELIST */ - SendMessage( hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)hImageList ); - hImageList = (HIMAGELIST)SendMessage( hTree, TVM_GETIMAGELIST, TVSIL_NORMAL, 0 ); - ok(hImageList == NULL, "NULL image list, reported as 0x%p, expected 0.\n", hImageList); + SendMessage( hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, 0 ); + himl = (HIMAGELIST)SendMessage( hTree, TVM_GETIMAGELIST, TVSIL_NORMAL, 0 ); + ok(himl == NULL, "NULL image list, reported as %p, expected 0.\n", himl); /* TODO: Test an actual image list */ @@ -1607,6 +1607,7 @@ static void test_htreeitem_layout(void) static void test_TVS_CHECKBOXES(void) { + HIMAGELIST himl; TVITEMA item; HWND hTree; DWORD ret; @@ -1614,6 +1615,9 @@ static void test_TVS_CHECKBOXES(void) hTree = create_treeview_control(0); fill_tree(hTree); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl == NULL, "got %p\n", himl); + item.hItem = hRoot; item.mask = TVIF_STATE; item.state = INDEXTOSTATEIMAGEMASK(1); @@ -1632,6 +1636,8 @@ static void test_TVS_CHECKBOXES(void) /* enabling check boxes set all items to 1 state image index */ SetWindowLongA(hTree, GWL_STYLE, GetWindowLongA(hTree, GWL_STYLE) | TVS_CHECKBOXES); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl != NULL, "got %p\n", himl); item.hItem = hRoot; item.mask = TVIF_STATE; @@ -1652,8 +1658,16 @@ static void test_TVS_CHECKBOXES(void) DestroyWindow(hTree); /* the same, but initially created with TVS_CHECKBOXES */ + hTree = create_treeview_control(0); + fill_tree(hTree); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl == NULL, "got %p\n", himl); + DestroyWindow(hTree); + hTree = create_treeview_control(TVS_CHECKBOXES); fill_tree(hTree); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + todo_wine ok(himl == NULL, "got %p\n", himl); item.hItem = hRoot; item.mask = TVIF_STATE; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 02b5a7f..c5f3bb3 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -66,6 +66,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(treeview); +enum StateListType +{ + OriginInternal, + OriginUser +}; + /* internal structures */ typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ @@ -156,6 +162,7 @@ typedef struct tagTREEVIEW_INFO HIMAGELIST himlState; int stateImageHeight; int stateImageWidth; + enum StateListType statehimlType; HDPA items; DWORD lastKeyPressTimestamp; @@ -1756,22 +1763,21 @@ TREEVIEW_NaturalHeight(const TREEVIEW_INFO *infoPtr) } static LRESULT -TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, WPARAM wParam, HIMAGELIST himlNew) +TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, UINT type, HIMAGELIST himlNew) { HIMAGELIST himlOld = 0; int oldWidth = infoPtr->normalImageWidth; int oldHeight = infoPtr->normalImageHeight; + TRACE("%u,%p\n", type, himlNew); - TRACE("%lx,%p\n", wParam, himlNew); - - switch (wParam) + switch (type) { case TVSIL_NORMAL: himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himlNew; - if (himlNew != NULL) + if (himlNew) ImageList_GetIconSize(himlNew, &infoPtr->normalImageWidth, &infoPtr->normalImageHeight); else @@ -1786,9 +1792,12 @@ TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, WPARAM wParam, HIMAGELIST himlNew) himlOld = infoPtr->himlState; infoPtr->himlState = himlNew; - if (himlNew != NULL) + if (himlNew) + { ImageList_GetIconSize(himlNew, &infoPtr->stateImageWidth, &infoPtr->stateImageHeight); + infoPtr->statehimlType = OriginUser; + } else { infoPtr->stateImageWidth = 0; @@ -1796,6 +1805,9 @@ TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, WPARAM wParam, HIMAGELIST himlNew) } break; + + default: + ERR("unknown imagelist type %u\n", type); } if (oldWidth != infoPtr->normalImageWidth || @@ -4950,7 +4962,7 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) /* Create/Destroy *******************************************************/ static void -initialize_checkboxes(TREEVIEW_INFO *infoPtr) +TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) { RECT rc; HBITMAP hbm, hbmOld; @@ -4958,6 +4970,7 @@ initialize_checkboxes(TREEVIEW_INFO *infoPtr) int nIndex; infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); + infoPtr->statehimlType = OriginInternal; hdcScreen = GetDC(0); @@ -5089,7 +5102,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) hwnd, 0, 0, 0); if (infoPtr->dwStyle & TVS_CHECKBOXES) - initialize_checkboxes(infoPtr); + TREEVIEW_InitCheckboxes(infoPtr); /* Make sure actual scrollbar state is consistent with uInternalStatus */ ShowScrollBar(hwnd, SB_VERT, FALSE); @@ -5121,10 +5134,11 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwnd)); + if (infoPtr->statehimlType == OriginInternal) + ImageList_Destroy(infoPtr->himlState); /* Deassociate treeview from the window before doing anything drastic. */ SetWindowLongPtrW(infoPtr->hwnd, 0, 0); - DeleteObject(infoPtr->hDefaultFont); DeleteObject(infoPtr->hBoldFont); DeleteObject(infoPtr->hUnderlineFont); @@ -5459,7 +5473,7 @@ TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { if (dwNewStyle & TVS_CHECKBOXES) { - initialize_checkboxes(infoPtr); + TREEVIEW_InitCheckboxes(infoPtr); TRACE("checkboxes enabled\n"); /* set all items to state image index 1 */

1 0

Marcus Meissner : mshtml: Mark replace_node_by_html as hidden.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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 : dsound: Mark enum_callback and search_callback static.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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

Alexandre Julliard : winex11: Remove no longer needed support for a source DIB color map in XRender StretchBlt .
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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

Marcus Meissner : ole32: Mark two functions as hidden.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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

Marcus Meissner : winmm: Mark two functions as hidden.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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 : dibdrv: Mark get_rop_codes as hidden.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 9437705c2a9321daab2e3394cf177527744a2518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9437705c2a9321daab2e3394c… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:25:34 2011 +0200 dibdrv: Mark get_rop_codes as hidden. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 21549f8..5f9a31e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -177,7 +177,7 @@ typedef struct DWORD octant; } bres_params; -extern void get_rop_codes(INT rop, struct rop_codes *codes); +extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : vbscript: Mark some symbols as hidden.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

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