January 2013 - Wine-commits

Rico Schüller : winedev: Fix winedev-testing.sgml.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: docs Branch: master Commit: 01e869a3771652ed8c2aa496973515e56c67f347 URL: http://source.winehq.org/git/docs.git/?a=commit;h=01e869a3771652ed8c2aa4969… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 3 17:18:19 2013 +0100 winedev: Fix winedev-testing.sgml. --- en/winedev-testing.sgml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index ccd1020..2f5dcab 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -206,6 +206,7 @@ thread.c: 86 tests executed, 5 marked as todo, 0 failures. </para> <para> Run <command>yum install mingw32-gcc</>. + </para> </sect3> <sect3> <title>*BSD</title>

1 0

Rico Schüller : wineusr: Fix wineusr-configuring.sgml.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: docs Branch: master Commit: 5ceebe607b8d58c416b71edc3c8fb6fd11a08fee URL: http://source.winehq.org/git/docs.git/?a=commit;h=5ceebe607b8d58c416b71edc3… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 3 17:18:37 2013 +0100 wineusr: Fix wineusr-configuring.sgml. --- en/wineusr-configuring.sgml | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 2d3fc9c..ddc896e 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -219,14 +219,15 @@ this file is a publicly available DLL or a custom DLL belonging to your program. In the latter case, check that you have installed your program correctly. + </para> <para> Most often applications will assume that a required redistributable package has already been installed and subsequently fail to run when the required dependencies are not met. For example: - <para> - <programlisting>err:module:import_dll Library MFC42.DLL (which is needed by L"C:\\Program Files\\Foo\\Bar.dll") not found</programlisting> - <para> </para> + <programlisting> + err:module:import_dll Library MFC42.DLL (which is needed by L"C:\\Program Files\\Foo\\Bar.dll") not found + </programlisting> <para> Redistributable packages which install the necessary runtimes can be obtained through the use of <ulink url="http://wiki.winehq.org/winetricks">

1 0

Rico Schüller : wineusr: Remove frankscorner.org.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: docs Branch: master Commit: 565b95f6e002a4f01f9c21bc4b6a2fabef4f4b90 URL: http://source.winehq.org/git/docs.git/?a=commit;h=565b95f6e002a4f01f9c21bc4… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 3 17:18:46 2013 +0100 wineusr: Remove frankscorner.org. --- en/wineusr-bugs.sgml | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 06b48be..b7df91e 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -134,14 +134,6 @@ </listitem> <listitem> <para> - <ulink url="http://www.frankscorner.org">Frank's Corner</ulink> - contains a list of applications and detailed instructions - for setting them up. Further help can be found in the user - forums. - </para> - </listitem> - <listitem> - <para> <ulink url="http://www.google.com">Google</ulink> can be useful depending on how you use it. You may find it helpful to search

1 0

Jacek Caban : urlmon: Added support for 'Run' setup hook.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 6f4c5f1dd8c350d2c434edf947d50248ab3386f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4c5f1dd8c350d2c434edf94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 4 14:45:48 2013 +0100 urlmon: Added support for 'Run' setup hook. --- dlls/urlmon/axinstall.c | 132 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 129 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 9f53ce0..ca1aef6 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -142,6 +142,134 @@ static HRESULT setup_dll(install_ctx_t *ctx) return hres; } +static void expand_command(install_ctx_t *ctx, const WCHAR *cmd, WCHAR *buf, size_t *size) +{ + const WCHAR *ptr = cmd, *prev_ptr = cmd; + size_t len = 0, len2; + + static const WCHAR expand_dirW[] = {'%','E','X','T','R','A','C','T','_','D','I','R','%'}; + + while((ptr = strchrW(ptr, '%'))) { + if(buf) + memcpy(buf+len, prev_ptr, ptr-prev_ptr); + len += ptr-prev_ptr; + + if(!strncmpiW(ptr, expand_dirW, sizeof(expand_dirW)/sizeof(WCHAR))) { + len2 = strlenW(ctx->tmp_dir); + if(buf) + memcpy(buf+len, ctx->tmp_dir, len2*sizeof(WCHAR)); + len += len2; + ptr += sizeof(expand_dirW)/sizeof(WCHAR); + }else { + FIXME("Can't expand %s\n", debugstr_w(ptr)); + if(buf) + buf[len] = '%'; + len++; + ptr++; + } + + prev_ptr = ptr; + } + + if(buf) + strcpyW(buf+len, prev_ptr); + *size = len + strlenW(prev_ptr) + 1; +} + +static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) +{ + WCHAR buf[2048], val[2*MAX_PATH]; + const WCHAR *key; + DWORD len; + HRESULT hres; + + static const WCHAR runW[] = {'r','u','n',0}; + + len = GetPrivateProfileStringW(sect_name, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + if(!len) + return S_OK; + + for(key = buf; *key; key += strlenW(key)+1) { + if(!strcmpiW(key, runW)) { + WCHAR *cmd; + size_t size; + + len = GetPrivateProfileStringW(sect_name, runW, NULL, val, sizeof(val)/sizeof(*val), ctx->install_file); + + TRACE("Run %s\n", debugstr_w(val)); + + expand_command(ctx, val, NULL, &size); + + cmd = heap_alloc(size*sizeof(WCHAR)); + if(!cmd) + heap_free(cmd); + + expand_command(ctx, val, cmd, &size); + hres = RunSetupCommandW(ctx->hwnd, cmd, NULL, ctx->tmp_dir, NULL, NULL, 0, NULL); + heap_free(cmd); + if(FAILED(hres)) + return hres; + }else { + FIXME("Unsupported hook %s\n", debugstr_w(key)); + return E_NOTIMPL; + } + } + + return S_OK; +} + +static HRESULT install_inf_file(install_ctx_t *ctx) +{ + WCHAR buf[2048], sect_name[128]; + BOOL default_install = TRUE; + const WCHAR *key; + DWORD len; + HRESULT hres; + + static const WCHAR setup_hooksW[] = {'S','e','t','u','p',' ','H','o','o','k','s',0}; + static const WCHAR add_codeW[] = {'A','d','d','.','C','o','d','e',0}; + + len = GetPrivateProfileStringW(setup_hooksW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + if(len) { + default_install = FALSE; + + for(key = buf; *key; key += strlenW(key)+1) { + TRACE("[Setup Hooks] key: %s\n", debugstr_w(key)); + + len = GetPrivateProfileStringW(setup_hooksW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + ctx->install_file); + if(!len) { + WARN("Could not get key value\n"); + return E_FAIL; + } + + hres = process_hook_section(ctx, sect_name); + if(FAILED(hres)) + return hres; + } + } + + len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + if(len) { + FIXME("[Add.Code] section not supported\n"); + + /* Don't throw an error if we successfully ran setup hooks; + installation is likely to be complete enough */ + if(default_install) + return E_NOTIMPL; + } + + if(default_install) { + hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, NULL, ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); + if(FAILED(hres)) { + WARN("RunSetupCommandW failed: %08x\n", hres); + return hres; + } + } + + return S_OK; +} + static HRESULT install_cab_file(install_ctx_t *ctx) { WCHAR tmp_path[MAX_PATH], tmp_dir[MAX_PATH]; @@ -169,9 +297,7 @@ static HRESULT install_cab_file(install_ctx_t *ctx) switch(ctx->install_type) { case INSTALL_INF: - hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, NULL, ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); - if(FAILED(hres)) - WARN("RunSetupCommandW failed: %08x\n", hres); + hres = install_inf_file(ctx); break; case INSTALL_DLL: FIXME("Installing DLL, registering in temporary location\n");

1 0

Andrew Talbot : d3dx9_36: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 1a45569f72336db77e6387898bdaae55fbae6a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a45569f72336db77e6387898… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 3 22:46:48 2013 +0000 d3dx9_36: Avoid signed-unsigned integer comparisons. --- dlls/d3dx9_36/skin.c | 2 +- dlls/d3dx9_36/surface.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 1525f0e..c3857d6 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -83,7 +83,7 @@ static ULONG WINAPI ID3DXSkinInfoImpl_Release(ID3DXSkinInfo *iface) TRACE("%p decreasing refcount to %u\n", This, ref); if (ref == 0) { - int i; + DWORD i; for (i = 0; i < This->num_bones; i++) { HeapFree(GetProcessHeap(), 0, This->bones[i].name); HeapFree(GetProcessHeap(), 0, This->bones[i].vertices); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 999c12e..923f17d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -49,7 +49,7 @@ static const struct static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid) { - int i; + unsigned int i; for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) { @@ -62,7 +62,7 @@ static D3DFORMAT wic_guid_to_d3dformat(const GUID *guid) static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) { - int i; + unsigned int i; for (i = 0; i < sizeof(wic_pixel_formats) / sizeof(wic_pixel_formats[0]); i++) { @@ -143,7 +143,7 @@ struct dds_header static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc) { - int i; + unsigned int i; static const DWORD known_fourcc[] = { MAKEFOURCC('U','Y','V','Y'), MAKEFOURCC('Y','U','Y','2'), @@ -193,7 +193,7 @@ static const struct { static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_format) { - int i; + unsigned int i; for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++) { @@ -278,7 +278,7 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_format, D3DFORMAT d3dformat) { - int i; + unsigned int i; memset(pixel_format, 0, sizeof(*pixel_format)); @@ -575,7 +575,7 @@ HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const vo { HRESULT hr; int face; - int mip_level; + UINT mip_level; UINT size; RECT src_rect; UINT src_pitch;

1 0

Vincent Povirk : winex11.drv: Select property change events on selection request windows.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 4013dc85e90e1124489b4055194fa789adcbca2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4013dc85e90e1124489b40551… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 3 16:59:14 2013 -0600 winex11.drv: Select property change events on selection request windows. --- dlls/winex11.drv/clipboard.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index e2f5b12..1da3a22 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -262,7 +262,11 @@ static Window thread_selection_wnd(void) w = XCreateWindow(thread_data->display, root_window, 0, 0, 1, 1, 0, CopyFromParent, InputOnly, CopyFromParent, 0, NULL); if (w) + { thread_data->selection_wnd = w; + + XSelectInput(thread_data->display, w, PropertyChangeMask); + } else FIXME("Failed to create window. Fetching selection data will fail.\n"); }

1 0

Vincent Povirk : winex11.drv: Flush property notify events before deleting properties.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 47217eaa8357df49a4eb1751319b207e3a1f3c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47217eaa8357df49a4eb17513… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 3 17:00:40 2013 -0600 winex11.drv: Flush property notify events before deleting properties. --- dlls/winex11.drv/clipboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 1da3a22..0df355a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2360,12 +2360,12 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (prop == None) return FALSE; - if (!X11DRV_CLIPBOARD_GetProperty(display, w, prop, &atype, data, datasize)) - return FALSE; - while (XCheckTypedWindowEvent(display, w, PropertyNotify, &xe)) ; + if (!X11DRV_CLIPBOARD_GetProperty(display, w, prop, &atype, data, datasize)) + return FALSE; + if (atype == x11drv_atom(INCR)) { unsigned char *buf = *data;

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 73df62c95b089a5093f0213ac756a038ed3351ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=73df62c95b089a5093f0213ac… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 4 00:54:06 2013 +0100 po: Update French translation. --- po/fr.po | 39 +++++++++++++++++---------------------- 1 files changed, 17 insertions(+), 22 deletions(-) diff --git a/po/fr.po b/po/fr.po index 86738bc..194a8a4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-12-19 21:13+0100\n" +"PO-Revision-Date: 2013-01-03 21:13+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3564,7 +3564,7 @@ msgstr "Constante chaîne de caractères non clôturée" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "Instruction « return » en dehors d'une fonction" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -8320,6 +8320,9 @@ msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Lorsqu'il est installé, ActiveX a un accès complet à votre ordinateur. Ne " +"cliquez pas sur le bouton d'installation à moins d'avoir une confiance " +"absolue dans la source ci-dessus." #: urlmon.rc:47 msgid "Installation of component failed: %08x" @@ -10231,32 +10234,32 @@ msgstr " (Oui|Non|Tous)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" -"Ne reconnaît pas « %1 » comme commande interne ou externe, ou fichier de " +"Ne reconnaît pas « %1 » comme commande interne ou externe, ou fichier de " "traitement par lots.\n" #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "Erreur de division par zéro.\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "Opérande attendu.\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "Erreur réseau inattendue.\n" +msgstr "Opérateur attendu.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "Discordance des parenthèses.\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"Nombre mal formé : doit être décimal (12),\n" +" hexadécimal (0x34) ou octal (056).\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10527,32 +10530,24 @@ msgid "DELETE_TCB" msgstr "" #: netstat.rc:40 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "Connexion réseau local (LAN)" +msgstr "Connexions actives" #: netstat.rc:41 msgid "Proto" -msgstr "" +msgstr "Proto" #: netstat.rc:42 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "Adresse électronique" +msgstr "Adresse locale" #: netstat.rc:43 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Adresse" +msgstr "Adresse distante" #: netstat.rc:44 -#, fuzzy -#| msgid "Status" msgid "State" -msgstr "Statut" +msgstr "État" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Jacek Caban : atl80: Added AtlComModuleRegisterServer implementation ( based on AtlModuleRegisterServer).
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: cc18fc0f1419ef0d029ca5acc2a85979c7684e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc18fc0f1419ef0d029ca5acc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 4 11:33:50 2013 +0100 atl80: Added AtlComModuleRegisterServer implementation (based on AtlModuleRegisterServer). --- dlls/atl80/atl80.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/atl80/atl80.spec | 2 +- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index c85f75e..278d736 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -26,6 +26,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); /*********************************************************************** + * AtlRegisterTypeLib [atl80.18] + */ +HRESULT WINAPI AtlComModuleRegisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) +{ + const struct _ATL_CATMAP_ENTRY *catmap; + _ATL_OBJMAP_ENTRY **iter; + HRESULT hres; + + TRACE("(%p %x %s)\n", mod, bRegTypeLib, debugstr_guid(clsid)); + + for(iter = mod->m_ppAutoObjMapFirst; iter < mod->m_ppAutoObjMapLast; iter++) { + if(!clsid || IsEqualCLSID((*iter)->pclsid, clsid)) { + TRACE("Registering clsid %s\n", debugstr_guid((*iter)->pclsid)); + hres = (*iter)->pfnUpdateRegistry(TRUE); + if(FAILED(hres)) + return hres; + + catmap = (*iter)->pfnGetCategoryMap(); + if(catmap) { + hres = AtlRegisterClassCategoriesHelper((*iter)->pclsid, catmap, TRUE); + if(FAILED(hres)) + return hres; + } + } + } + + if(bRegTypeLib) { + hres = AtlRegisterTypeLib(mod->m_hInstTypeLib, NULL); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} + +/*********************************************************************** * AtlRegisterTypeLib [atl80.19] */ HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE inst, const WCHAR *index) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index e4d73f1..5c5967e 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -5,7 +5,7 @@ 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject 17 stub AtlComModuleRegisterClassObjects -18 stub AtlComModuleRegisterServer(ptr long ptr) +18 stdcall AtlComModuleRegisterServer(ptr long ptr) 19 stdcall AtlRegisterTypeLib(ptr wstr) 20 stub AtlComModuleRevokeClassObjects 22 stub AtlComModuleUnregisterServer

1 0

Jacek Caban : atl: Added support for category maps in AtlModuleRegisterServer.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 732376d5b9c06987dca08c0894806611395fe802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=732376d5b9c06987dca08c089… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 4 11:34:15 2013 +0100 atl: Added support for category maps in AtlModuleRegisterServer. --- dlls/atl/atl_main.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index f75ecee..2a96369 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -220,6 +220,17 @@ HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const hRes = obj->pfnUpdateRegistry(TRUE); /* register */ if (FAILED(hRes)) return hRes; + + if(pM->cbSize > ATLVer1Size) { + const struct _ATL_CATMAP_ENTRY *catmap; + + catmap = ((const _ATL_OBJMAP_ENTRYW*)obj)->pfnGetCategoryMap(); + if(catmap) { + hRes = AtlRegisterClassCategoriesHelper(obj->pclsid, catmap, TRUE); + if(FAILED(hRes)) + return hRes; + } + } } }

1 0