December 2010 - Wine-Commits

Henri Verbeet : wined3d: Store implementation pointers in struct glsl_shader_prog_link.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: dd1ba15ec7453b5514e9e686b52a839823fdb86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1ba15ec7453b5514e9e686b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 17:58:45 2010 +0100 wined3d: Store implementation pointers in struct glsl_shader_prog_link. --- dlls/wined3d/glsl_shader.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b8022e1..1ee8e1f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -109,8 +109,8 @@ struct glsl_shader_prog_link { GLint luminanceoffset_location[MAX_TEXTURES]; GLint ycorrection_location; GLenum vertex_color_clamp; - IWineD3DVertexShader *vshader; - IWineD3DPixelShader *pshader; + IWineD3DVertexShaderImpl *vshader; + IWineD3DPixelShaderImpl *pshader; struct vs_compile_args vs_args; struct ps_compile_args ps_args; UINT constant_version; @@ -3691,8 +3691,8 @@ static void shader_glsl_input_pack(IWineD3DPixelShader *iface, struct wined3d_sh static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_shader_prog_link *entry) { glsl_program_key_t key; - key.vshader = entry->vshader; - key.pshader = entry->pshader; + key.vshader = (IWineD3DVertexShader *)entry->vshader; + key.pshader = (IWineD3DPixelShader *)entry->pshader; key.vs_args = entry->vs_args; key.ps_args = entry->ps_args; @@ -3723,8 +3723,8 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struc { glsl_program_key_t key; - key.vshader = entry->vshader; - key.pshader = entry->pshader; + key.vshader = (IWineD3DVertexShader *)entry->vshader; + key.pshader = (IWineD3DPixelShader *)entry->pshader; key.vs_args = entry->vs_args; key.ps_args = entry->ps_args; wine_rb_remove(&priv->program_lookup, &key); @@ -4317,8 +4317,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, /* Create the entry */ entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link)); entry->programId = programId; - entry->vshader = (IWineD3DVertexShader *)vshader; - entry->pshader = (IWineD3DPixelShader *)pshader; + entry->vshader = vshader; + entry->pshader = pshader; entry->vs_args = vs_compile_args; entry->ps_args = ps_compile_args; entry->constant_version = 0; @@ -4788,11 +4788,11 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry const struct glsl_shader_prog_link, program_lookup_entry); int cmp; - if (k->vshader > prog->vshader) return 1; - else if (k->vshader < prog->vshader) return -1; + if (k->vshader > (IWineD3DVertexShader *)prog->vshader) return 1; + else if (k->vshader < (IWineD3DVertexShader *)prog->vshader) return -1; - if (k->pshader > prog->pshader) return 1; - else if (k->pshader < prog->pshader) return -1; + if (k->pshader > (IWineD3DPixelShader *)prog->pshader) return 1; + else if (k->pshader < (IWineD3DPixelShader *)prog->pshader) return -1; if (k->vshader && (cmp = memcmp(&k->vs_args, &prog->vs_args, sizeof(prog->vs_args)))) return cmp; if (k->pshader && (cmp = memcmp(&k->ps_args, &prog->ps_args, sizeof(prog->ps_args)))) return cmp;

1 0

Henri Verbeet : wined3d: Avoid some interface pointers in set_glsl_shader_program().
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: 77beea98b9e889e4bf8bb96a511ebe708ec180ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=77beea98b9e889e4bf8bb96a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 17:58:43 2010 +0100 wined3d: Avoid some interface pointers in set_glsl_shader_program(). --- dlls/wined3d/glsl_shader.c | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a2fb79a..72251eb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4289,8 +4289,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, IWineD3DDeviceImpl *device, BOOL use_ps, BOOL use_vs) { const struct wined3d_state *state = &device->stateBlock->state; - IWineD3DVertexShader *vshader = use_vs ? (IWineD3DVertexShader *)state->vertex_shader : NULL; - IWineD3DPixelShader *pshader = use_ps ? (IWineD3DPixelShader *)state->pixel_shader : NULL; + IWineD3DVertexShaderImpl *vshader = use_vs ? state->vertex_shader : NULL; + IWineD3DPixelShaderImpl *pshader = use_ps ? state->pixel_shader : NULL; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = device->shader_priv; struct glsl_shader_prog_link *entry = NULL; @@ -4301,11 +4301,13 @@ static void set_glsl_shader_program(const struct wined3d_context *context, struct ps_compile_args ps_compile_args; struct vs_compile_args vs_compile_args; - if (vshader) find_vs_compile_args(state, (IWineD3DVertexShaderImpl *)vshader, &vs_compile_args); - if (pshader) find_ps_compile_args(state, (IWineD3DPixelShaderImpl *)pshader, &ps_compile_args); + if (vshader) find_vs_compile_args(state, vshader, &vs_compile_args); + if (pshader) find_ps_compile_args(state, pshader, &ps_compile_args); - entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); - if (entry) { + entry = get_glsl_program_entry(priv, (IWineD3DVertexShader *)vshader, (IWineD3DPixelShader *)pshader, + &vs_compile_args, &ps_compile_args); + if (entry) + { priv->glsl_program = entry; return; } @@ -4317,8 +4319,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, /* Create the entry */ entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link)); entry->programId = programId; - entry->vshader = vshader; - entry->pshader = pshader; + entry->vshader = (IWineD3DVertexShader *)vshader; + entry->pshader = (IWineD3DPixelShader *)pshader; entry->vs_args = vs_compile_args; entry->ps_args = ps_compile_args; entry->constant_version = 0; @@ -4332,12 +4334,12 @@ static void set_glsl_shader_program(const struct wined3d_context *context, /* Attach GLSL vshader */ if (vshader) { - GLhandleARB vshader_id = find_glsl_vshader(context, &priv->shader_buffer, - (IWineD3DVertexShaderImpl *)vshader, &vs_compile_args); - WORD map = ((IWineD3DBaseShaderImpl *)vshader)->baseShader.reg_maps.input_registers; + GLhandleARB vshader_id = find_glsl_vshader(context, &priv->shader_buffer, vshader, &vs_compile_args); + WORD map = vshader->baseShader.reg_maps.input_registers; char tmp_name[10]; - reorder_shader_id = generate_param_reorder_function(&priv->shader_buffer, vshader, pshader, gl_info); + reorder_shader_id = generate_param_reorder_function(&priv->shader_buffer, + (IWineD3DVertexShader *)vshader, (IWineD3DPixelShader *)pshader, gl_info); TRACE("Attaching GLSL shader object %u to program %u\n", reorder_shader_id, programId); GL_EXTCALL(glAttachObjectARB(programId, reorder_shader_id)); checkGLcall("glAttachObjectARB"); @@ -4368,19 +4370,19 @@ static void set_glsl_shader_program(const struct wined3d_context *context, } checkGLcall("glBindAttribLocationARB"); - list_add_head(&((IWineD3DBaseShaderImpl *)vshader)->baseShader.linked_programs, &entry->vshader_entry); + list_add_head(&vshader->baseShader.linked_programs, &entry->vshader_entry); } /* Attach GLSL pshader */ if (pshader) { GLhandleARB pshader_id = find_glsl_pshader(context, &priv->shader_buffer, - (IWineD3DPixelShaderImpl *)pshader, &ps_compile_args, &entry->np2Fixup_info); + pshader, &ps_compile_args, &entry->np2Fixup_info); TRACE("Attaching GLSL shader object %u to program %u\n", pshader_id, programId); GL_EXTCALL(glAttachObjectARB(programId, pshader_id)); checkGLcall("glAttachObjectARB"); - list_add_head(&((IWineD3DBaseShaderImpl *)pshader)->baseShader.linked_programs, &entry->pshader_entry); + list_add_head(&pshader->baseShader.linked_programs, &entry->pshader_entry); } /* Link the program */ @@ -4439,8 +4441,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, checkGLcall("Find glsl program uniform locations"); if (pshader - && ((IWineD3DPixelShaderImpl *)pshader)->baseShader.reg_maps.shader_version.major >= 3 - && ((IWineD3DPixelShaderImpl *)pshader)->declared_in_count > vec4_varyings(3, gl_info)) + && pshader->baseShader.reg_maps.shader_version.major >= 3 + && pshader->declared_in_count > vec4_varyings(3, gl_info)) { TRACE("Shader %d needs vertex color clamping disabled\n", programId); entry->vertex_color_clamp = GL_FALSE; @@ -4467,11 +4469,11 @@ static void set_glsl_shader_program(const struct wined3d_context *context, * load them now to have them hardcoded in the GLSL program. This saves some CPU cycles * later */ - if (pshader && !((IWineD3DBaseShaderImpl *)pshader)->baseShader.load_local_constsF) + if (pshader && !pshader->baseShader.load_local_constsF) { hardcode_local_constants((IWineD3DBaseShaderImpl *) pshader, gl_info, programId, 'P'); } - if (vshader && !((IWineD3DBaseShaderImpl *)vshader)->baseShader.load_local_constsF) + if (vshader && !vshader->baseShader.load_local_constsF) { hardcode_local_constants((IWineD3DBaseShaderImpl *) vshader, gl_info, programId, 'V'); }

1 0

Jerome Leclanche : winemenubuilder: Add a trailing semicolon to MimeType in desktop files.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: 33c7105ecf8b1f7243c001de2fce1e85d4c150d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c7105ecf8b1f7243c001de2… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Dec 13 17:17:17 2010 +0000 winemenubuilder: Add a trailing semicolon to MimeType in desktop files. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index bb045a4..8414d7b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2135,7 +2135,7 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c fprintf(desktop, "[Desktop Entry]\n"); fprintf(desktop, "Type=Application\n"); fprintf(desktop, "Name=%s\n", friendlyAppName); - fprintf(desktop, "MimeType=%s\n", mimeType); + fprintf(desktop, "MimeType=%s;\n", mimeType); fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", progId); fprintf(desktop, "NoDisplay=true\n"); fprintf(desktop, "StartupNotify=true\n");

1 0

Henri Verbeet : wined3d: Pass implementation pointers to generate_param_reorder_function().
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: b0bc24eec34dbefaea216062bfde7fc68c927ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0bc24eec34dbefaea216062b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 17:58:44 2010 +0100 wined3d: Pass implementation pointers to generate_param_reorder_function(). --- dlls/wined3d/glsl_shader.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 72251eb..b8022e1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3830,11 +3830,9 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, /* GL locking is done by the caller */ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer *buffer, - IWineD3DVertexShader *vertexshader, IWineD3DPixelShader *pixelshader, const struct wined3d_gl_info *gl_info) + IWineD3DVertexShaderImpl *vs, IWineD3DPixelShaderImpl *ps, const struct wined3d_gl_info *gl_info) { GLhandleARB ret = 0; - IWineD3DVertexShaderImpl *vs = (IWineD3DVertexShaderImpl *) vertexshader; - IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) pixelshader; DWORD ps_major = ps ? ps->baseShader.reg_maps.shader_version.major : 0; unsigned int i; const char *semantic_name; @@ -4338,8 +4336,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, WORD map = vshader->baseShader.reg_maps.input_registers; char tmp_name[10]; - reorder_shader_id = generate_param_reorder_function(&priv->shader_buffer, - (IWineD3DVertexShader *)vshader, (IWineD3DPixelShader *)pshader, gl_info); + reorder_shader_id = generate_param_reorder_function(&priv->shader_buffer, vshader, pshader, gl_info); TRACE("Attaching GLSL shader object %u to program %u\n", reorder_shader_id, programId); GL_EXTCALL(glAttachObjectARB(programId, reorder_shader_id)); checkGLcall("glAttachObjectARB");

1 0

Alexandre Julliard : dispex: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: 7f1f8b61725c08adf25ccb928da99f0147bb2006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1f8b61725c08adf25ccb928… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 21:27:00 2010 +0100 dispex: Convert dll registration to the IRegistrar mechanism. --- dlls/dispex/Makefile.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in index f091bfd..aaa8c5e 100644 --- a/dlls/dispex/Makefile.in +++ b/dlls/dispex/Makefile.in @@ -1,6 +1,6 @@ MODULE = dispex.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 -EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_DELEGATION +EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION EXTRA_OBJS = dlldata.o @@ -10,4 +10,7 @@ C_SRCS = \ IDL_P_SRCS = \ disp_ex.idl +IDL_R_SRCS = \ + disp_ex.idl + @MAKE_DLL_RULES@

1 0

Alexandre Julliard : qmgrprxy: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: a925e3fae6bbfc23c7dbbd0dc8d75a96c91c8af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a925e3fae6bbfc23c7dbbd0dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 21:27:07 2010 +0100 qmgrprxy: Convert dll registration to the IRegistrar mechanism. --- dlls/qmgrprxy/Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/qmgrprxy/Makefile.in b/dlls/qmgrprxy/Makefile.in index d986070..bba3e25 100644 --- a/dlls/qmgrprxy/Makefile.in +++ b/dlls/qmgrprxy/Makefile.in @@ -1,9 +1,10 @@ MODULE = qmgrprxy.dll IMPORTS = rpcrt4 -EXTRADEFS = -DREGISTER_PROXY_DLL +EXTRADEFS = -DWINE_REGISTER_DLL IDL_I_SRCS = qmgrprxy.idl IDL_P_SRCS = qmgrprxy.idl +IDL_R_SRCS = qmgrprxy.idl EXTRA_OBJS = dlldata.o

1 0

Alexandre Julliard : itss: Convert protocol registration to the IRegistrar format.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: 41eb98e4b7079b02e3f4ad0773a577edb3b5f5e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41eb98e4b7079b02e3f4ad077… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 21:18:15 2010 +0100 itss: Convert protocol registration to the IRegistrar format. --- dlls/itss/Makefile.in | 2 + dlls/itss/itss.c | 58 ++---------------------------------- dlls/itss/itss.idl | 55 ++++++++++++++++++++++++++++++++++ dlls/itss/itss.inf | 79 ------------------------------------------------- dlls/itss/itss.rgs | 51 +++++++++++++++++++++++++++++++ dlls/itss/rsrc.rc | 4 +- 6 files changed, 113 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41eb98e4b7079b02e3f4a…

1 0

Alexandre Julliard : actxprxy: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: a5859c800e08bdc255511487829690c3bd92b3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5859c800e08bdc2555114878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 21:25:41 2010 +0100 actxprxy: Convert dll registration to the IRegistrar mechanism. --- dlls/actxprxy/Makefile.in | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 09ef8b0..15f8e3d 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -1,6 +1,6 @@ MODULE = actxprxy.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 -EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_DELEGATION +EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION EXTRA_OBJS = dlldata.o @@ -19,4 +19,16 @@ IDL_P_SRCS = \ actxprxy_shobjidl.idl \ actxprxy_urlhist.idl +IDL_R_SRCS = \ + actxprxy_activscp.idl \ + actxprxy_comcat.idl \ + actxprxy_docobj.idl \ + actxprxy_hlink.idl \ + actxprxy_htiframe.idl \ + actxprxy_objsafe.idl \ + actxprxy_ocmm.idl \ + actxprxy_servprov.idl \ + actxprxy_shobjidl.idl \ + actxprxy_urlhist.idl + @MAKE_DLL_RULES@

1 0

Alexandre Julliard : urlmon: Convert the coclasses registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: 889ac56f5079ac6785a9998383072b7c557a1b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=889ac56f5079ac6785a999838… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 20:33:36 2010 +0100 urlmon: Convert the coclasses registration to the IRegistrar mechanism. --- dlls/urlmon/Makefile.in | 3 +- dlls/urlmon/regsvr.c | 66 -------------------------------- dlls/urlmon/urlmon.inf | 12 +----- dlls/urlmon/urlmon_urlmon.idl | 84 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 77 deletions(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 65384e8..41368d9 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -1,7 +1,7 @@ MODULE = urlmon.dll IMPORTLIB = urlmon IMPORTS = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32 -EXTRADEFS = -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL \ +EXTRADEFS = -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL \ -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}" C_SRCS = \ @@ -31,6 +31,7 @@ C_SRCS = \ RC_SRCS = rsrc.rc IDL_P_SRCS = urlmon_urlmon.idl +IDL_R_SRCS = urlmon_urlmon.idl EXTRA_OBJS = dlldata.o diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 6e417ac..ec70465 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -435,72 +435,6 @@ error_close_progid_key: * coclass list */ static struct regsvr_coclass const coclass_list[] = { - { &CLSID_StdURLMoniker, - "URL Moniker", - NULL, - "urlmon.dll", - "Apartment" - }, - { &CLSID_CdlProtocol, - "CDL: Asynchronous Pluggable Protocol Handler", - NULL, - "urlmon.dll", - "Apartment" - }, - { &CLSID_FileProtocol, - "file:, local: Asynchronous Pluggable Protocol Handler", - NULL, - "urlmon.dll", - "Apartment" - }, - { &CLSID_FtpProtocol, - "ftp: Asynchronous Pluggable Protocol Handler", - NULL, - "urlmon.dll", - "Apartment" - }, - { &CLSID_GopherProtocol, - "gopher: Asynchronous Pluggable Protocol Handler", - NULL, - "urlmon.dll", - "Apartment" - }, - { &CLSID_HttpProtocol, - "http: Asynchronous Pluggable Protocol Handler", - NULL, - "urlmon.dll", - "Apartment" - }, - { &CLSID_HttpSProtocol, - "https: Asynchronous Pluggable Protocol Handler", - NULL, - "urlmon.dll", - "Apartment" - }, - { &CLSID_MkProtocol, - "mk: Asynchronous Pluggable Protocol Handler", - NULL, - "urlmon.dll", - "Apartment" - }, - { &CLSID_InternetSecurityManager, - "Security Manager", - NULL, - "urlmon.dll", - "Both" - }, - { &CLSID_InternetZoneManager, - "URL Zone Manager", - NULL, - "urlmon.dll", - "Both" - }, - { &CLSID_PSFactoryBuffer, - "URLMoniker ProxyStub Factory", - NULL, - "urlmon.dll", - "Apartment" - }, { NULL } /* list terminator */ }; diff --git a/dlls/urlmon/urlmon.inf b/dlls/urlmon/urlmon.inf index c9debb4..da5778d 100644 --- a/dlls/urlmon/urlmon.inf +++ b/dlls/urlmon/urlmon.inf @@ -3,19 +3,11 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg, Misc.Reg +AddReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg, Misc.Reg [UnregisterDll] -DelReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg, Misc.Reg - - -[Classes.Reg] - -;; CLSID_DeCompMimeFilter -HKCR,"CLSID\%CLSID_DeCompMimeFilter%",,,"AP lzdhtml encoding/decoding Filter" -HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32",,,"%MODULE%" -HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32","ThreadingModel",,"Apartment" +DelReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg, Misc.Reg [Protocols.Reg] diff --git a/dlls/urlmon/urlmon_urlmon.idl b/dlls/urlmon/urlmon_urlmon.idl index d45ba07..ad23dee 100644 --- a/dlls/urlmon/urlmon_urlmon.idl +++ b/dlls/urlmon/urlmon_urlmon.idl @@ -17,3 +17,87 @@ */ #include "urlmon.idl" + +[ + helpstring("URL Moniker"), + threading(apartment), + uuid(79eac9e0-baf9-11ce-8c82-00aa004ba90b) +] +coclass StdURLMoniker { interface IMoniker; } + +[ + helpstring("http: Asynchronous Pluggable Protocol Handler"), + threading(apartment), + uuid(79eac9e2-baf9-11ce-8c82-00aa004ba90b) +] +coclass HttpProtocol { interface IInternetProtocolEx; interface IInternetPriority; } + +[ + helpstring("ftp: Asynchronous Pluggable Protocol Handler"), + threading(apartment), + uuid(79eac9e3-baf9-11ce-8c82-00aa004ba90b) +] +coclass FtpProtocol { interface IInternetProtocolEx; interface IInternetPriority; } + +[ + helpstring("gopher: Asynchronous Pluggable Protocol Handler"), + threading(apartment), + uuid(79eac9e4-baf9-11ce-8c82-00aa004ba90b) +] +coclass GopherProtocol { interface IInternetProtocolEx; interface IInternetPriority; } + +[ + helpstring("https: Asynchronous Pluggable Protocol Handler"), + threading(apartment), + uuid(79eac9e5-baf9-11ce-8c82-00aa004ba90b) +] +coclass HttpsProtocol { interface IInternetProtocolEx; interface IInternetPriority; } + +[ + helpstring("mk: Asynchronous Pluggable Protocol Handler"), + threading(apartment), + uuid(79eac9e6-baf9-11ce-8c82-00aa004ba90b) +] +coclass MkProtocol { interface IInternetProtocolEx; interface IInternetPriority; } + +[ + helpstring("file:, local: Asynchronous Pluggable Protocol Handler"), + threading(apartment), + uuid(79eac9e7-baf9-11ce-8c82-00aa004ba90b) +] +coclass FileProtocol { interface IInternetProtocolEx; interface IInternetPriority; } + +[ + helpstring("CDL: Asynchronous Pluggable Protocol Handler"), + threading(apartment), + uuid(3dd53d40-7b8b-11d0-b013-00aa0059ce02) +] +coclass CdlProtocol { interface IInternetProtocolEx; interface IInternetPriority; } + +[ + helpstring("Security Manager"), + threading(both), + uuid(7b8a2d94-0ac9-11d1-896c-00c04fb6bfc4) +] +coclass InternetSecurityManager { interface IInternetSecurityManager; } + +[ + helpstring("URL Zone Manager"), + threading(both), + uuid(7b8a2d95-0ac9-11d1-896c-00c04fb6bfc4) +] +coclass InternetZoneManager { interface IInternetZoneManagerEx2; } + +[ + helpstring("URLMoniker ProxyStub Factory"), + threading(apartment), + uuid(79eac9f1-baf9-11ce-8c82-00aa004ba90b) +] +coclass PSFactoryBuffer { interface IPSFactoryBuffer; } + +[ + helpstring("AP lzdhtml encoding/decoding Filter"), + threading(apartment), + uuid(8f6b0360-b80d-11d0-a9b3-006097942311) +] +coclass DeCompMimeFilter { interface IInternetProtocol; interface IInternetProtocolSink; }

1 0

Alexandre Julliard : windowscodecs: Convert the coclasses registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 14, 2010

Dec. 14, 2010

Module: wine Branch: master Commit: 779f88ec904aa3b8270a88a21307915b9c44c3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=779f88ec904aa3b8270a88a21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 17:58:31 2010 +0100 windowscodecs: Convert the coclasses registration to the IRegistrar mechanism. --- dlls/windowscodecs/Makefile.in | 6 +- dlls/windowscodecs/regsvr.c | 322 ------------------------- dlls/windowscodecs/windowscodecs_wincodec.idl | 84 +++++++ 3 files changed, 87 insertions(+), 325 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=779f88ec904aa3b8270a8…

1 0