February 2014 - Wine-Commits

Jacek Caban : atl: Moved source files from atl100 to atl directory.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: 1334fd9d70e0990ac883564d83b8ec08d56e0740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1334fd9d70e0990ac883564d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 10:44:55 2014 +0100 atl: Moved source files from atl100 to atl directory. --- dlls/atl/Makefile.in | 1 - dlls/{atl100 => atl}/atl.c | 0 dlls/{atl100 => atl}/atl_ax.c | 0 dlls/{atl100 => atl}/registrar.c | 0 dlls/atl100/Makefile.in | 1 + dlls/atl110/Makefile.in | 2 +- dlls/atl80/Makefile.in | 2 +- dlls/atl90/Makefile.in | 2 +- 8 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index c2c56fd..4f87b27 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -2,7 +2,6 @@ MODULE = atl.dll IMPORTLIB = atl IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 EXTRADEFS = -D_ATL_VER=_ATL_VER_30 -PARENTSRC = ../atl100 C_SRCS = \ atl.c \ diff --git a/dlls/atl100/atl.c b/dlls/atl/atl.c similarity index 100% rename from dlls/atl100/atl.c rename to dlls/atl/atl.c diff --git a/dlls/atl100/atl_ax.c b/dlls/atl/atl_ax.c similarity index 100% rename from dlls/atl100/atl_ax.c rename to dlls/atl/atl_ax.c diff --git a/dlls/atl100/registrar.c b/dlls/atl/registrar.c similarity index 100% rename from dlls/atl100/registrar.c rename to dlls/atl/registrar.c diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in index 1b06680..35b37ac 100644 --- a/dlls/atl100/Makefile.in +++ b/dlls/atl100/Makefile.in @@ -2,6 +2,7 @@ MODULE = atl100.dll IMPORTLIB = atl100 IMPORTS = uuid ole32 oleaut32 user32 gdi32 advapi32 EXTRADEFS = -D_ATL_VER=_ATL_VER_100 +PARENTSRC = ../atl C_SRCS = \ atl.c \ diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index 3b6ccfe..ed357f6 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -1,7 +1,7 @@ MODULE = atl110.dll IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_110 -PARENTSRC = ../atl100 +PARENTSRC = ../atl C_SRCS = \ atl.c \ diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index cbd10ec..2ada925 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -2,7 +2,7 @@ MODULE = atl80.dll IMPORTLIB = atl80 IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_80 -PARENTSRC = ../atl100 +PARENTSRC = ../atl C_SRCS = \ atl.c \ diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 3e5114b..a5082bc 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,7 +1,7 @@ MODULE = atl90.dll IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 -PARENTSRC = ../atl100 +PARENTSRC = ../atl C_SRCS = \ atl.c \

1 0

Henri Verbeet : d3d10: Release sampler state references in d3d10_effect_variable_destroy().
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: d3aba2d635cd7d4325d60636b41137a8bfdcee52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3aba2d635cd7d4325d60636b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 14 10:50:21 2014 +0100 d3d10: Release sampler state references in d3d10_effect_variable_destroy(). --- dlls/d3d10/effect.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4eb01fc..c7eed1a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2305,6 +2305,11 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) ID3D10RasterizerState_Release(v->u.state.object.rasterizer); break; + case D3D10_SVT_SAMPLER: + if (v->u.state.object.sampler) + ID3D10SamplerState_Release(v->u.state.object.sampler); + break; + default: break; }

1 0

Henri Verbeet : d3d10: Release rasterizer state references in d3d10_effect_variable_destroy().
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: 7c70f5434e942052386d40b6b3186aeb6fc25e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c70f5434e942052386d40b6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 14 10:50:20 2014 +0100 d3d10: Release rasterizer state references in d3d10_effect_variable_destroy(). --- dlls/d3d10/effect.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1b1d554..4eb01fc 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2300,6 +2300,11 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) ID3D10BlendState_Release(v->u.state.object.blend); break; + case D3D10_SVT_RASTERIZER: + if (v->u.state.object.rasterizer) + ID3D10RasterizerState_Release(v->u.state.object.rasterizer); + break; + default: break; }

1 0

Henri Verbeet : d3d10: Release blend state references in d3d10_effect_variable_destroy().
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: 577217f91a918928f18ed0a102eb03b3a28614cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=577217f91a918928f18ed0a10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 14 10:50:19 2014 +0100 d3d10: Release blend state references in d3d10_effect_variable_destroy(). --- dlls/d3d10/effect.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1cda7c8..1b1d554 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2295,6 +2295,11 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) ID3D10DepthStencilState_Release(v->u.state.object.depth_stencil); break; + case D3D10_SVT_BLEND: + if (v->u.state.object.blend) + ID3D10BlendState_Release(v->u.state.object.blend); + break; + default: break; }

1 0

Henri Verbeet : d3d10: Release depth stencil state references in d3d10_effect_variable_destroy() .
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: bf17789a3380a92dad2f376fe2e81690a1602838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf17789a3380a92dad2f376fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 14 10:50:18 2014 +0100 d3d10: Release depth stencil state references in d3d10_effect_variable_destroy(). --- dlls/d3d10/effect.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cda9bbd..1cda7c8 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2290,6 +2290,11 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) d3d10_effect_shader_variable_destroy(&v->u.shader, v->type->basetype); break; + case D3D10_SVT_DEPTHSTENCIL: + if (v->u.state.object.depth_stencil) + ID3D10DepthStencilState_Release(v->u.state.object.depth_stencil); + break; + default: break; }

1 0

Nikolay Sivov : msxml3: Pass XSL processor parameters to libxml2.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: ff847e8cb3a2f13e18adf8e844a61ad10a0550c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff847e8cb3a2f13e18adf8e84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 14 09:52:56 2014 +0400 msxml3: Pass XSL processor parameters to libxml2. --- dlls/msxml3/dispex.c | 1 - dlls/msxml3/domdoc.c | 1 - dlls/msxml3/httprequest.c | 1 - dlls/msxml3/main.c | 9 ++++++++ dlls/msxml3/msxml_private.h | 16 ++++++++++++++ dlls/msxml3/mxnamespace.c | 1 - dlls/msxml3/node.c | 49 +++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/saxreader.c | 1 - dlls/msxml3/stylesheet.c | 22 +++++++------------ 9 files changed, 79 insertions(+), 22 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 3c84e09..272f302 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -38,7 +38,6 @@ #include "shlwapi.h" #include "wine/debug.h" -#include "wine/list.h" #include "wine/unicode.h" #include "msxml_private.h" diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b094b58..e981b94 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -49,7 +49,6 @@ #include "objsafe.h" #include "wine/debug.h" -#include "wine/list.h" #include "msxml_private.h" diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 0fe36ed..cf53db4 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -47,7 +47,6 @@ #include "msxml_private.h" #include "wine/debug.h" -#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index ae93ec9..1381904 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -36,6 +36,7 @@ # include <libxslt/transform.h> # endif # include <libxslt/xsltutils.h> +# include <libxslt/variables.h> # include <libxslt/xsltInternals.h> # endif #endif @@ -165,9 +166,13 @@ void* libxslt_handle = NULL; #ifdef SONAME_LIBXSLT # define DECL_FUNCPTR(f) typeof(f) * p##f = NULL DECL_FUNCPTR(xsltApplyStylesheet); +DECL_FUNCPTR(xsltApplyStylesheetUser); DECL_FUNCPTR(xsltCleanupGlobals); DECL_FUNCPTR(xsltFreeStylesheet); +DECL_FUNCPTR(xsltFreeTransformContext); +DECL_FUNCPTR(xsltNewTransformContext); DECL_FUNCPTR(xsltParseStylesheetDoc); +DECL_FUNCPTR(xsltQuoteUserParams); # undef DECL_FUNCPTR #endif @@ -185,9 +190,13 @@ static void init_libxslt(void) if (needed) { WARN("Can't find symbol %s\n", #f); goto sym_not_found; } LOAD_FUNCPTR(xsltInit, 0); LOAD_FUNCPTR(xsltApplyStylesheet, 1); + LOAD_FUNCPTR(xsltApplyStylesheetUser, 1); LOAD_FUNCPTR(xsltCleanupGlobals, 1); LOAD_FUNCPTR(xsltFreeStylesheet, 1); + LOAD_FUNCPTR(xsltFreeTransformContext, 1); + LOAD_FUNCPTR(xsltNewTransformContext, 1); LOAD_FUNCPTR(xsltParseStylesheetDoc, 1); + LOAD_FUNCPTR(xsltQuoteUserParams, 1); #undef LOAD_FUNCPTR if (pxsltInit) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index e584d99..5d2010f 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -24,6 +24,7 @@ #include "dispex.h" #include "wine/unicode.h" +#include "wine/list.h" #ifndef __WINE_CONFIG_H # error You must include config.h to use this header @@ -217,6 +218,20 @@ static inline LPSTR heap_strdupWtoA(LPCWSTR str) return ret; } +/* XSLProcessor parameter list */ +struct xslprocessor_par +{ + struct list entry; + BSTR name; + BSTR value; +}; + +struct xslprocessor_params +{ + struct list list; + unsigned int count; +}; + #ifdef HAVE_LIBXML2 extern void schemasInit(void) DECLSPEC_HIDDEN; @@ -354,6 +369,7 @@ extern HRESULT node_get_text(const xmlnode*,BSTR*) DECLSPEC_HIDDEN; extern HRESULT node_select_nodes(const xmlnode*,BSTR,IXMLDOMNodeList**) DECLSPEC_HIDDEN; extern HRESULT node_select_singlenode(const xmlnode*,BSTR,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_transform_node(const xmlnode*,IXMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; +extern HRESULT node_transform_node_params(const xmlnode*,IXMLDOMNode*,BSTR*,const struct xslprocessor_params*) DECLSPEC_HIDDEN; extern HRESULT node_create_supporterrorinfo(const tid_t*,void**) DECLSPEC_HIDDEN; extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index c2d9cc3..14dfdd7 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -39,7 +39,6 @@ #include "msxml_private.h" #include "wine/debug.h" -#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 4c03571..8b067b6 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -35,6 +35,7 @@ # ifdef HAVE_LIBXSLT_TRANSFORM_H # include <libxslt/transform.h> # endif +# include <libxslt/variables.h> # include <libxslt/xsltutils.h> # include <libxslt/xsltInternals.h> # endif @@ -59,9 +60,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); extern void* libxslt_handle; # define MAKE_FUNCPTR(f) extern typeof(f) * p##f MAKE_FUNCPTR(xsltApplyStylesheet); +MAKE_FUNCPTR(xsltApplyStylesheetUser); MAKE_FUNCPTR(xsltCleanupGlobals); MAKE_FUNCPTR(xsltFreeStylesheet); +MAKE_FUNCPTR(xsltFreeTransformContext); +MAKE_FUNCPTR(xsltNewTransformContext); MAKE_FUNCPTR(xsltParseStylesheetDoc); +MAKE_FUNCPTR(xsltQuoteUserParams); # undef MAKE_FUNCPTR #endif @@ -996,7 +1001,8 @@ static const xmlChar *get_output_buffer_content(xmlOutputBufferPtr output) #endif } -HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p) +HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p, + const struct xslprocessor_params *params) { #ifdef SONAME_LIBXSLT xsltStylesheetPtr xsltSS; @@ -1013,7 +1019,41 @@ HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR * xsltSS = pxsltParseStylesheetDoc(sheet->node->doc); if(xsltSS) { - xmlDocPtr result = pxsltApplyStylesheet(xsltSS, This->node->doc, NULL); + const char **xslparams = NULL; + xmlDocPtr result; + unsigned int i; + + /* convert our parameter list to libxml2 format */ + if (params && params->count) + { + struct xslprocessor_par *par; + + i = 0; + xslparams = heap_alloc((params->count*2 + 1)*sizeof(char*)); + LIST_FOR_EACH_ENTRY(par, &params->list, struct xslprocessor_par, entry) + { + xslparams[i++] = (char*)xmlchar_from_wchar(par->name); + xslparams[i++] = (char*)xmlchar_from_wchar(par->value); + } + xslparams[i] = NULL; + } + + if (xslparams) + { + xsltTransformContextPtr ctxt = pxsltNewTransformContext(xsltSS, This->node->doc); + + /* push parameters to user context */ + pxsltQuoteUserParams(ctxt, xslparams); + result = pxsltApplyStylesheetUser(xsltSS, This->node->doc, NULL, NULL, NULL, ctxt); + pxsltFreeTransformContext(ctxt); + + for (i = 0; i < params->count*2; i++) + heap_free((char*)xslparams[i]); + heap_free(xslparams); + } + else + result = pxsltApplyStylesheet(xsltSS, This->node->doc, NULL); + if(result) { const xmlChar *content; @@ -1060,6 +1100,11 @@ HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR * #endif } +HRESULT node_transform_node(const xmlnode *node, IXMLDOMNode *stylesheet, BSTR *p) +{ + return node_transform_node_params(node, stylesheet, p, NULL); +} + HRESULT node_select_nodes(const xmlnode *This, BSTR query, IXMLDOMNodeList **nodes) { xmlChar* str; diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 8c407bd..baabdd4 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -42,7 +42,6 @@ #include "shlwapi.h" #include "wine/debug.h" -#include "wine/list.h" #include "msxml_private.h" diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index f0fa299..8073dde 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -37,7 +37,6 @@ #include "msxml_private.h" #include "wine/debug.h" -#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -50,19 +49,6 @@ typedef struct IXMLDOMNode *node; } xsltemplate; -struct xslprocessor_par -{ - struct list entry; - BSTR name; - BSTR value; -}; - -struct xslprocessor_params -{ - struct list list; - unsigned int count; -}; - typedef struct { DispatchEx dispex; @@ -534,6 +520,7 @@ static HRESULT WINAPI xslprocessor_transform( IXSLProcessor *iface, VARIANT_BOOL *ret) { +#ifdef HAVE_LIBXML2 xslprocessor *This = impl_from_IXSLProcessor( iface ); HRESULT hr; @@ -542,7 +529,8 @@ static HRESULT WINAPI xslprocessor_transform( if (!ret) return E_INVALIDARG; SysFreeString(This->outstr); - hr = IXMLDOMNode_transformNode(This->input, This->stylesheet->node, &This->outstr); + + hr = node_transform_node_params(get_node_obj(This->input), This->stylesheet->node, &This->outstr, &This->params); if (hr == S_OK) { if (This->output) @@ -558,6 +546,10 @@ static HRESULT WINAPI xslprocessor_transform( *ret = VARIANT_FALSE; return hr; +#else + FIXME("libxml2 is required but wasn't present at compile time\n"); + return E_NOTIMPL; +#endif } static HRESULT WINAPI xslprocessor_reset( IXSLProcessor *iface )

1 0

Jacek Caban : atl: Renamed atl_main.c to atl30.c.
by Alexandre Julliard Feb. 14, 2014

Feb. 14, 2014

Module: wine Branch: master Commit: 9a483d08e0b22879d26cb50b60a391d0627e2f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a483d08e0b22879d26cb50b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 14 10:43:40 2014 +0100 atl: Renamed atl_main.c to atl30.c. --- dlls/atl/Makefile.in | 2 +- dlls/atl/{atl_main.c => atl30.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 396b9d6..c2c56fd 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -6,8 +6,8 @@ PARENTSRC = ../atl100 C_SRCS = \ atl.c \ + atl30.c \ atl_ax.c \ - atl_main.c \ registrar.c IDL_SRCS = atl_classes.idl diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl30.c similarity index 100% rename from dlls/atl/atl_main.c rename to dlls/atl/atl30.c

1 0

Jacek Caban : urlmon: Unregister window class on DLL unload.
by Alexandre Julliard Feb. 13, 2014

Feb. 13, 2014

Module: wine Branch: master Commit: 9ca4f9b65a2aa28c0a00a729efcb36bafc20d666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca4f9b65a2aa28c0a00a729e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 18:02:24 2014 +0100 urlmon: Unregister window class on DLL unload. --- dlls/urlmon/bindprot.c | 50 +++++++++++++++++++++++++++------------------ dlls/urlmon/urlmon_main.c | 1 + dlls/urlmon/urlmon_main.h | 1 + 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index b11856b..7f2bea1 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -83,14 +83,36 @@ static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM return DefWindowProcW(hwnd, msg, wParam, lParam); } +static const WCHAR wszURLMonikerNotificationWindow[] = + {'U','R','L',' ','M','o','n','i','k','e','r',' ', + 'N','o','t','i','f','i','c','a','t','i','o','n',' ','W','i','n','d','o','w',0}; + +static ATOM notif_wnd_class; + +static BOOL WINAPI register_notif_wnd_class(INIT_ONCE *once, void *param, void **context) +{ + static WNDCLASSEXW wndclass = { + sizeof(wndclass), 0, notif_wnd_proc, 0, 0, + NULL, NULL, NULL, NULL, NULL, + wszURLMonikerNotificationWindow, NULL + }; + + wndclass.hInstance = hProxyDll; + notif_wnd_class = RegisterClassExW(&wndclass); + return TRUE; +} + +void unregister_notif_wnd_class(void) +{ + if(notif_wnd_class) + UnregisterClassW(MAKEINTRESOURCEW(notif_wnd_class), hProxyDll); +} + HWND get_notif_hwnd(void) { - static ATOM wnd_class = 0; tls_data_t *tls_data; - static const WCHAR wszURLMonikerNotificationWindow[] = - {'U','R','L',' ','M','o','n','i','k','e','r',' ', - 'N','o','t','i','f','i','c','a','t','i','o','n',' ','W','i','n','d','o','w',0}; + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; tls_data = get_tls_data(); if(!tls_data) @@ -101,23 +123,11 @@ HWND get_notif_hwnd(void) return tls_data->notif_hwnd; } - if(!wnd_class) { - static WNDCLASSEXW wndclass = { - sizeof(wndclass), 0, - notif_wnd_proc, 0, 0, - NULL, NULL, NULL, NULL, NULL, - wszURLMonikerNotificationWindow, - NULL - }; - - wndclass.hInstance = hProxyDll; - - wnd_class = RegisterClassExW(&wndclass); - if (!wnd_class && GetLastError() == ERROR_CLASS_ALREADY_EXISTS) - wnd_class = 1; - } + InitOnceExecuteOnce(&init_once, register_notif_wnd_class, NULL, NULL); + if(!notif_wnd_class) + return NULL; - tls_data->notif_hwnd = CreateWindowExW(0, wszURLMonikerNotificationWindow, + tls_data->notif_hwnd = CreateWindowExW(0, MAKEINTRESOURCEW(notif_wnd_class), wszURLMonikerNotificationWindow, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, hProxyDll, NULL); if(tls_data->notif_hwnd) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 7b3f1fd..1204a62 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -139,6 +139,7 @@ static void process_detach(void) free_session(); free_tls_list(); + unregister_notif_wnd_class(); } /*********************************************************************** diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index faab45a..14a4f08 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -225,6 +225,7 @@ typedef struct { tls_data_t *get_tls_data(void) DECLSPEC_HIDDEN; +void unregister_notif_wnd_class(void) DECLSPEC_HIDDEN; HWND get_notif_hwnd(void) DECLSPEC_HIDDEN; void release_notif_hwnd(HWND) DECLSPEC_HIDDEN;

1 0

Jacek Caban : atl: Share atl_ax.c with atl100.
by Alexandre Julliard Feb. 13, 2014

Feb. 13, 2014

Module: wine Branch: master Commit: 383cacea8fa9ce2e0408292af4a6c917ac700465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383cacea8fa9ce2e0408292af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 19:02:48 2014 +0100 atl: Share atl_ax.c with atl100. --- dlls/atl/Makefile.in | 5 ++++- dlls/atl/atl.spec | 18 +++++++++--------- dlls/atl/atl_main.c | 48 ------------------------------------------------ dlls/atl100/atl_ax.c | 17 +++++++++++------ 4 files changed, 24 insertions(+), 64 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 8cc63bb..3fc9591 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -2,7 +2,10 @@ MODULE = atl.dll IMPORTLIB = atl IMPORTS = uuid atl80 atl100 oleaut32 ole32 user32 EXTRADEFS = -D_ATL_VER=_ATL_VER_30 +PARENTSRC = ../atl100 -C_SRCS = atl_main.c +C_SRCS = \ + atl_ax.c \ + atl_main.c IDL_SRCS = atl_classes.idl diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 4737580..2dca559 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -26,20 +26,20 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW -36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA -37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW -38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA -39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl -40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx -41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) +38 stdcall AtlAxCreateDialogA(long str long ptr long) +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) +41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) 44 stdcall AtlModuleExtractCreateWndData(ptr) 45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) 46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) -47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +47 stdcall AtlAxGetControl(long ptr) +48 stdcall AtlAxGetHost(long ptr) 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 509d4bb..6288ff8 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -593,51 +593,3 @@ DWORD WINAPI AtlGetVersion(void *pReserved) TRACE("version %04x (%p)\n", _ATL_VER, pReserved); return _ATL_VER; } - -/********************************************************************** - * AtlAxWin class window procedure - */ -static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) -{ - if ( wMsg == WM_CREATE ) - { - DWORD len = GetWindowTextLengthW( hWnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - if (!ptr) - return 1; - GetWindowTextW( hWnd, ptr, len ); - AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); - return 0; - } - return DefWindowProcW( hWnd, wMsg, wParam, lParam ); -} - -BOOL WINAPI AtlAxWinInit(void) -{ - WNDCLASSEXW wcex; - const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; - - FIXME("version %04x semi-stub\n", _ATL_VER); - - if ( FAILED( OleInitialize(NULL) ) ) - return FALSE; - - wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = GetModuleHandleW( NULL ); - wcex.hIcon = NULL; - wcex.hCursor = NULL; - wcex.hbrBackground = NULL; - wcex.lpszMenuName = NULL; - wcex.hIconSm = 0; - - wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - return TRUE; -} diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index be52917..0a16010 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -87,7 +87,9 @@ BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; -#if _ATL_VER == _ATL_VER_80 +#if _ATL_VER <= _ATL_VER_30 +#define ATL_NAME_SUFFIX 0 +#elif _ATL_VER == _ATL_VER_80 #define ATL_NAME_SUFFIX '8','0',0 #elif _ATL_VER == _ATL_VER_90 #define ATL_NAME_SUFFIX '9','0',0 @@ -100,7 +102,6 @@ BOOL WINAPI AtlAxWinInit(void) #endif const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; - const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; FIXME("version %04x semi-stub\n", _ATL_VER); @@ -108,7 +109,7 @@ BOOL WINAPI AtlAxWinInit(void) return FALSE; wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; + wcex.style = CS_GLOBALCLASS | (_ATL_VER > _ATL_VER_30 ? CS_DBLCLKS : 0); wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = GetModuleHandleW( NULL ); @@ -123,9 +124,13 @@ BOOL WINAPI AtlAxWinInit(void) if ( !RegisterClassExW( &wcex ) ) return FALSE; - wcex.lpszClassName = AtlAxWinLicW; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; + if(_ATL_VER > _ATL_VER_30) { + const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; + + wcex.lpszClassName = AtlAxWinLicW; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + } return TRUE; }

1 0

Jacek Caban : atl: Share sources with atl100 instead of forwarding calls.
by Alexandre Julliard Feb. 13, 2014

Feb. 13, 2014

Module: wine Branch: master Commit: f285b06738676856487a5a0a8756716e10abb9fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f285b06738676856487a5a0a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 16:00:27 2014 +0100 atl: Share sources with atl100 instead of forwarding calls. --- dlls/atl/Makefile.in | 6 ++++-- dlls/atl/atl.spec | 34 +++++++++++++++++----------------- dlls/atl/atl_main.c | 45 +++------------------------------------------ dlls/atl100/atl.c | 25 ++++++++++++++++++++----- tools/make_specfiles | 4 ---- 5 files changed, 44 insertions(+), 70 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 3fc9591..cf61896 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -1,11 +1,13 @@ MODULE = atl.dll IMPORTLIB = atl -IMPORTS = uuid atl80 atl100 oleaut32 ole32 user32 +IMPORTS = uuid atl80 oleaut32 ole32 user32 gdi32 advapi32 EXTRADEFS = -D_ATL_VER=_ATL_VER_30 PARENTSRC = ../atl100 C_SRCS = \ + atl.c \ atl_ax.c \ - atl_main.c + atl_main.c \ + registrar.c IDL_SRCS = atl_classes.idl diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 2dca559..aa0f44b 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -2,11 +2,11 @@ 2 stdcall -private DllGetClassObject(ptr ptr ptr) 3 stdcall -private DllRegisterServer() 4 stdcall -private DllUnregisterServer() -10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise -11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise -12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream -13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc -14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr +10 stdcall AtlAdvise(ptr ptr ptr ptr) +11 stdcall AtlUnadvise(ptr ptr long) +12 stdcall AtlFreeMarshalStream(ptr) +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) 15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) 16 stdcall AtlModuleInit(ptr long long) 17 stdcall AtlModuleRegisterClassObjects(ptr long long) @@ -16,15 +16,15 @@ 21 stdcall AtlModuleTerm(ptr) 22 stdcall AtlModuleUnregisterServer(ptr ptr) 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) -24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +26 stdcall AtlCreateTargetDC(long ptr) +27 stdcall AtlHiMetricToPixel(ptr ptr) +28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign -31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign -32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +30 stdcall AtlComPtrAssign(ptr ptr) +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) 35 stdcall AtlAxDialogBoxW(long wstr long ptr long) 36 stdcall AtlAxDialogBoxA(long str long ptr long) @@ -40,12 +40,12 @@ 46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper -50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load -51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) 53 stub AtlIPersistPropertyBag_Save -54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 6288ff8..d89cf06 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -33,18 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -static HINSTANCE hInst; - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - if (fdwReason == DLL_PROCESS_ATTACH) { - DisableThreadLibraryCalls(hinstDLL); - hInst = hinstDLL; - } - return TRUE; -} +extern HINSTANCE atl_instance; #define ATLVer1Size FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer) @@ -142,25 +131,6 @@ HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM) return S_OK; } -HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw) -{ - _ATL_TERMFUNC_ELEM *termfunc_elem; - - TRACE("version %04x (%p %p %ld)\n", _ATL_VER, pM, pFunc, dw); - - if (pM->cbSize > ATLVer1Size) - { - termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); - termfunc_elem->pFunc = pFunc; - termfunc_elem->dw = dw; - termfunc_elem->pNext = pM->m_pTermFuncs; - - pM->m_pTermFuncs = termfunc_elem; - } - - return S_OK; -} - HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContext, DWORD dwFlags) { @@ -566,7 +536,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) */ HRESULT WINAPI DllRegisterServer(void) { - return __wine_register_resources( hInst ); + return __wine_register_resources( atl_instance ); } /*********************************************************************** @@ -574,7 +544,7 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - return __wine_unregister_resources( hInst ); + return __wine_unregister_resources( atl_instance ); } /*********************************************************************** @@ -584,12 +554,3 @@ HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; } - -/*********************************************************************** - * AtlGetVersion [ATL.@] - */ -DWORD WINAPI AtlGetVersion(void *pReserved) -{ - TRACE("version %04x (%p)\n", _ATL_VER, pReserved); - return _ATL_VER; -} diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 82412b7..afd8f77 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -26,6 +26,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); +#define ATLVer1Size FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer) + +HINSTANCE atl_instance; + typedef unsigned char cpp_bool; static inline void *heap_alloc(size_t len) @@ -301,16 +305,20 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD TRACE("version %04x (%p %p %ld)\n", _ATL_VER, pM, pFunc, dw); - termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); - termfunc_elem->pFunc = pFunc; - termfunc_elem->dw = dw; - termfunc_elem->pNext = pM->m_pTermFuncs; + if (_ATL_VER > _ATL_VER_30 || pM->cbSize > ATLVer1Size) { + termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); + termfunc_elem->pFunc = pFunc; + termfunc_elem->dw = dw; + termfunc_elem->pNext = pM->m_pTermFuncs; - pM->m_pTermFuncs = termfunc_elem; + pM->m_pTermFuncs = termfunc_elem; + } return S_OK; } +#if _ATL_VER > _ATL_VER_30 + /*********************************************************************** * AtlCallTermFunc [atl100.@] */ @@ -330,6 +338,8 @@ void WINAPI AtlCallTermFunc(_ATL_MODULE *pM) pM->m_pTermFuncs = NULL; } +#endif + /*********************************************************************** * AtlLoadTypeLib [atl100.56] */ @@ -386,6 +396,8 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, return S_OK; } +#if _ATL_VER > _ATL_VER_30 + /*********************************************************************** * AtlWinModuleInit [atl100.65] */ @@ -578,6 +590,8 @@ HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeL return S_OK; } +#endif + /*********************************************************************** * AtlRegisterClassCategoriesHelper [atl100.49] */ @@ -819,6 +833,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch(fdwReason) { case DLL_PROCESS_ATTACH: + atl_instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: diff --git a/tools/make_specfiles b/tools/make_specfiles index 2ae321a..a525e0c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -119,10 +119,6 @@ my @dll_groups = "vcomp90", ], [ - "atl100", - "atl", - ], - [ "advapi32", "api-ms-win-core-localregistry-l1-1-0", "api-ms-win-downlevel-advapi32-l1-1-0",

1 0