December 2010 - Wine-Commits

Alexandre Julliard : dmloader: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 4e4ea3f0a16a3a9909ee3fc73fadda14e5e55cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4ea3f0a16a3a9909ee3fc73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 12:36:54 2010 +0100 dmloader: Convert dll registration to the IRegistrar mechanism. --- dlls/dmloader/Makefile.in | 5 +- dlls/dmloader/dmloader.idl | 35 +++ dlls/dmloader/dmloader_main.c | 19 ++ dlls/dmloader/regsvr.c | 476 ----------------------------------------- 4 files changed, 57 insertions(+), 478 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e4ea3f0a16a3a9909ee3…

1 0

Austin Lund : shell32/tests: Fixed SHPathPrepareForWriteW tests on Asian platforms.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 8446f5c0a79599c9ba9523197101709f0b5372d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8446f5c0a79599c9ba9523197… Author: Austin Lund <austin.lund(a)gmail.com> Date: Thu Dec 2 09:34:26 2010 +1000 shell32/tests: Fixed SHPathPrepareForWriteW tests on Asian platforms. --- dlls/shell32/tests/shlfileop.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 3e9a2e4..a58b4fd 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2065,6 +2065,7 @@ static void test_sh_path_prepare(void) HRESULT res; CHAR path[MAX_PATH]; CHAR UNICODE_PATH_A[MAX_PATH]; + BOOL UsedDefaultChar; if(!pSHPathPrepareForWriteA) { @@ -2156,7 +2157,19 @@ static void test_sh_path_prepare(void) win_skip("Skipping SHPathPrepareForWriteW tests\n"); return; } - WideCharToMultiByte(CP_ACP, 0, UNICODE_PATH, -1, UNICODE_PATH_A, sizeof(UNICODE_PATH_A), NULL, NULL); + + SetLastError(0xdeadbeef); + UsedDefaultChar = FALSE; + if (WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, UNICODE_PATH, -1, UNICODE_PATH_A, sizeof(UNICODE_PATH_A), NULL, &UsedDefaultChar) == 0) + { + win_skip("Could not convert Unicode path name to multibyte (%d)\n", GetLastError()); + return; + } + if (UsedDefaultChar) + { + win_skip("Could not find unique multibyte representation for directory name using default codepage\n"); + return; + } /* unicode directory doesn't exist, SHPPFW_NONE */ RemoveDirectoryA(UNICODE_PATH_A);

1 0

Alexandre Julliard : configure: Fix the OpenCL detection for Mac OS.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: fac67412123e8162fa7fba3d82e3dae6f30ed732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac67412123e8162fa7fba3d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 14:16:55 2010 +0100 configure: Fix the OpenCL detection for Mac OS. --- configure | 10 ++++++++-- configure.ac | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 88d9b31..5abdaac 100755 --- a/configure +++ b/configure @@ -640,7 +640,6 @@ HALINCL XSLTINCL XML2INCL XML2LIBS -LIBOPENCL NASLIBS X_EXTRA_LIBS X_LIBS @@ -653,6 +652,7 @@ CROSSCC CROSSTEST_DISABLE PRELINK CARBONLIB +LIBOPENCL FRAMEWORK_OPENAL COREAUDIO DISKARBITRATIONLIB @@ -6541,6 +6541,12 @@ _ACEOF ac_cv_lib_openal=yes fi + if test "$ac_cv_header_OpenCL_opencl_h" = "yes" + then + LIBOPENCL="-framework OpenCL" + + ac_cv_lib_OpenCL_clGetPlatformInfo=yes + fi if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" then ac_save_LIBS="$LIBS" @@ -9063,7 +9069,7 @@ Use the --without-x option if you really want this." "$LINENO" 5 ;; esac fi -if test "$ac_cv_header_CL_opencl_h" = "yes" -o "$ac_cv_header_OpenCL_opencl_h" = "yes" +if test "$ac_cv_header_CL_opencl_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clGetPlatformInfo in -lOpenCL" >&5 $as_echo_n "checking for clGetPlatformInfo in -lOpenCL... " >&6; } diff --git a/configure.ac b/configure.ac index b0f576b..2431c7f 100644 --- a/configure.ac +++ b/configure.ac @@ -719,6 +719,11 @@ case $host_os in AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available]) ac_cv_lib_openal=yes fi + if test "$ac_cv_header_OpenCL_opencl_h" = "yes" + then + AC_SUBST(LIBOPENCL,"-framework OpenCL") + ac_cv_lib_OpenCL_clGetPlatformInfo=yes + fi if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" then ac_save_LIBS="$LIBS" @@ -1102,7 +1107,7 @@ without X support, which probably isn't what you want. You will need to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.]) dnl **** Check for OpenCL **** -if test "$ac_cv_header_CL_opencl_h" = "yes" -o "$ac_cv_header_OpenCL_opencl_h" = "yes" +if test "$ac_cv_header_CL_opencl_h" = "yes" then AC_CHECK_LIB(OpenCL,clGetPlatformInfo,[AC_SUBST(LIBOPENCL,["-lOpenCL"])]) fi

1 0

Peter Urbanec : opencl: Basic OpenCL 1.0 implementation.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: e40093f70af78addaff04a0c891a742c7638d293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40093f70af78addaff04a0c8… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Thu Dec 2 23:41:51 2010 +1100 opencl: Basic OpenCL 1.0 implementation. --- dlls/opencl/opencl.c | 870 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/opencl/opencl.spec | 159 +++++---- 2 files changed, 960 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e40093f70af78addaff04…

1 0

Peter Urbanec : opencl: Initial stub implementation of OpenCL 1.0.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 65c84d773f6026a32d9be52668ffccadb00d50b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c84d773f6026a32d9be5266… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Thu Dec 2 23:41:48 2010 +1100 opencl: Initial stub implementation of OpenCL 1.0. --- configure | 66 +++++++++++++++++++++++++++++++++++++++++ configure.ac | 14 +++++++++ dlls/opencl/Makefile.in | 7 ++++ dlls/opencl/opencl.c | 30 +++++++++++++++++++ dlls/opencl/opencl.spec | 75 +++++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 ++++ 6 files changed, 198 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65c84d773f6026a32d9be…

1 0

Alexandre Julliard : amstream: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 025a84a15a87ea2d82d5ca3b436dbcba16aa8695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025a84a15a87ea2d82d5ca3b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 11:51:35 2010 +0100 amstream: Convert dll registration to the IRegistrar mechanism. --- dlls/amstream/Makefile.in | 5 +- dlls/amstream/amstream_classes.idl | 40 +++ dlls/amstream/main.c | 19 ++ dlls/amstream/regsvr.c | 505 ------------------------------------ 4 files changed, 62 insertions(+), 507 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=025a84a15a87ea2d82d5c…

1 0

Nikolay Sivov : comctl32/listview: Don't touch out text pointer if it wasn' t requested.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: f0f3157da1af733271a25b22e05c8df8f6969dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f3157da1af733271a25b22e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 20:26:01 2010 +0300 comctl32/listview: Don't touch out text pointer if it wasn't requested. --- dlls/comctl32/listview.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fd9a499..8c8637f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -982,7 +982,7 @@ static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISP TRACE(" pdi->item=%s\n", debuglvitem_t(&pdi->item, infoPtr->notifyFormat != NFR_ANSI)); ret = notify_hdr(infoPtr, code, &pdi->hdr); - TRACE(" resulting code=0x%08x\n", pdi->hdr.code); + TRACE(" resulting code=%d\n", pdi->hdr.code); if (return_ansi || return_unicode) { @@ -1011,7 +1011,7 @@ static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISP } /* if dipsinfo holder changed notification code then convert */ - if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW)) + if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW) && (pdi->item.mask & LVIF_TEXT)) { length = WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); @@ -6472,6 +6472,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, return FALSE; if (lpLVItem->mask == 0) return TRUE; + TRACE("mask=%x\n", lpLVItem->mask); /* make a local copy */ isubitem = lpLVItem->iSubItem; @@ -8901,10 +8902,10 @@ static HWND LISTVIEW_SetToolTips( LISTVIEW_INFO *infoPtr, HWND hwndNewToolTip) * RETURN: * Old Unicode Format */ -static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL fUnicode) +static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL unicode) { SHORT rc = infoPtr->notifyFormat; - infoPtr->notifyFormat = (fUnicode) ? NFR_UNICODE : NFR_ANSI; + infoPtr->notifyFormat = (unicode) ? NFR_UNICODE : NFR_ANSI; return rc == NFR_UNICODE; } @@ -9322,6 +9323,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) (WPARAM)infoPtr->hwndSelf, NF_QUERY); /* on error defaulting to ANSI notifications */ if (infoPtr->notifyFormat == 0) infoPtr->notifyFormat = NFR_ANSI; + TRACE("notify format=%d\n", infoPtr->notifyFormat); if ((infoPtr->uView == LV_VIEW_DETAILS) && (lpcs->style & WS_VISIBLE)) {

1 0

Jacek Caban : mshtml: Added NP_GetEntryPoints implementation.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: b00b8631a6ecfad417899eddfccf31a495295bba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00b8631a6ecfad417899eddf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 13:49:51 2010 +0100 mshtml: Added NP_GetEntryPoints implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/main.c | 9 -- dlls/mshtml/npplugin.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 119 +++++++++++++++++++++++++++ 4 files changed, 328 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b00b8631a6ecfad417899…

1 0

Jacek Caban : npmshtml: Added Mozilla plugin for mshtml ActiveX controls.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 4a91265b4f156e1b1f8ad3088e7e64f162a66f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a91265b4f156e1b1f8ad3088… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 19:15:28 2010 +0100 npmshtml: Added Mozilla plugin for mshtml ActiveX controls. --- configure | 1 + configure.ac | 1 + dlls/mshtml/main.c | 9 ++++++++ dlls/mshtml/mshtml.spec | 3 ++ dlls/mshtml/nsembed.c | 8 +++++++ dlls/npmshtml/Makefile.in | 7 ++++++ dlls/npmshtml/main.c | 42 +++++++++++++++++++++++++++++++++++++++ dlls/npmshtml/npmshtml.spec | 3 ++ dlls/npmshtml/rsrc.rc | 24 ++++++++++++++++++++++ include/wine/wine_common_ver.rc | 3 ++ tools/wine.inf.in | 1 + 11 files changed, 102 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 83a3205..9ce65b3 100755 --- a/configure +++ b/configure @@ -15022,6 +15022,7 @@ wine_fn_config_dll nddeapi enable_nddeapi nddeapi wine_fn_config_dll netapi32 enable_netapi32 netapi32 wine_fn_config_test dlls/netapi32/tests netapi32_test wine_fn_config_dll newdev enable_newdev newdev +wine_fn_config_dll npmshtml enable_npmshtml wine_fn_config_dll ntdll enable_ntdll ntdll wine_fn_config_test dlls/ntdll/tests ntdll_test wine_fn_config_dll ntdsapi enable_ntdsapi ntdsapi diff --git a/configure.ac b/configure.ac index de1ba7d..14f9718 100644 --- a/configure.ac +++ b/configure.ac @@ -2599,6 +2599,7 @@ WINE_CONFIG_DLL(nddeapi,,[nddeapi]) WINE_CONFIG_DLL(netapi32,,[netapi32]) WINE_CONFIG_TEST(dlls/netapi32/tests) WINE_CONFIG_DLL(newdev,,[newdev]) +WINE_CONFIG_DLL(npmshtml) WINE_CONFIG_DLL(ntdll,,[ntdll]) WINE_CONFIG_TEST(dlls/ntdll/tests) WINE_CONFIG_DLL(ntdsapi,,[ntdsapi]) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 679c206..1b3c767 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -520,3 +520,12 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{vt %d}", V_VT(v)); } } + +/*********************************************************************** + * NP_GetEntryPoints (npmshtml.@) + */ +INT16 WINAPI NP_GetEntryPoints(void *funcs) +{ + FIXME("(%p)\n", funcs); + return 1; +} diff --git a/dlls/mshtml/mshtml.spec b/dlls/mshtml/mshtml.spec index 5dfcdcd..81f9f0e 100644 --- a/dlls/mshtml/mshtml.spec +++ b/dlls/mshtml/mshtml.spec @@ -19,3 +19,6 @@ @ stub com_ms_osp_ospmrshl_copyToExternal @ stub com_ms_osp_ospmrshl_releaseByValExternal @ stub com_ms_osp_ospmrshl_toJava + +#Wine extension for Mozilla plugin support +@ stdcall NP_GetEntryPoints(ptr) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f282b03..5d21a1f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -244,6 +244,8 @@ static void set_environment(LPCWSTR gre_path) static const WCHAR nspr_log_modulesW[] = {'N','S','P','R','_','L','O','G','_','M','O','D','U','L','E','S',0}; static const WCHAR debug_formatW[] = {'a','l','l',':','%','d',0}; + static const WCHAR moz_plugin_pathW[] = {'M','O','Z','_','P','L','U','G','I','N','_','P','A','T','H',0}; + static const WCHAR gecko_pluginW[] = {'\\','g','e','c','k','o','\\','p','l','u','g','i','n',0}; /* We have to modify PATH as XPCOM loads other DLLs from this directory. */ GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); @@ -263,6 +265,12 @@ static void set_environment(LPCWSTR gre_path) sprintfW(buf, debug_formatW, debug_level); SetEnvironmentVariableW(nspr_log_modulesW, buf); + + len = GetSystemDirectoryW(path_env, (sizeof(path_env)-sizeof(gecko_pluginW))/sizeof(WCHAR)+1); + if(len) { + strcpyW(path_env+len, gecko_pluginW); + SetEnvironmentVariableW(moz_plugin_pathW, path_env); + } } static BOOL load_xpcom(const PRUnichar *gre_path) diff --git a/dlls/npmshtml/Makefile.in b/dlls/npmshtml/Makefile.in new file mode 100644 index 0000000..3e3c54f --- /dev/null +++ b/dlls/npmshtml/Makefile.in @@ -0,0 +1,7 @@ +MODULE = npmshtml.dll +IMPORTS = mshtml + +C_SRCS = main.c +RC_SRCS = rsrc.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/npmshtml/main.c b/dlls/npmshtml/main.c new file mode 100644 index 0000000..9beaa35 --- /dev/null +++ b/dlls/npmshtml/main.c @@ -0,0 +1,42 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(npmshtml); + +/*********************************************************************** + * NP_Initialize (npmshtml.@) + */ +INT16 WINAPI NP_Initialize(void *arg) +{ + return 0; +} + +/*********************************************************************** + * NP_Shutdown (npmshtml.@) + */ +INT16 WINAPI NP_Shutdown(void) +{ + return 0; +} diff --git a/dlls/npmshtml/npmshtml.spec b/dlls/npmshtml/npmshtml.spec new file mode 100644 index 0000000..e0b6dea --- /dev/null +++ b/dlls/npmshtml/npmshtml.spec @@ -0,0 +1,3 @@ +1 stdcall NP_GetEntryPoints(ptr) mshtml.NP_GetEntryPoints +2 stdcall NP_Initialize(ptr) +3 stdcall NP_Shutdown() diff --git a/dlls/npmshtml/rsrc.rc b/dlls/npmshtml/rsrc.rc new file mode 100644 index 0000000..2ed88ac --- /dev/null +++ b/dlls/npmshtml/rsrc.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine ActiveX plugin" +#define WINE_FILENAME_STR "npmshtml.dll" +#define WINE_MIMETYPE "application/x-oleobject" + +#include "wine/wine_common_ver.rc" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 29dcd98..a6f40a0 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -111,6 +111,9 @@ FILESUBTYPE WINE_FILESUBTYPE #ifdef WINE_OLESELFREGISTER VALUE "OLESelfRegister", "" #endif +#ifdef WINE_MIMETYPE + VALUE "MIMEType", WINE_MIMETYPE +#endif } } BLOCK "VarFileInfo" diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 1ceb2e4..8d8ac3f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2607,6 +2607,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe 10,Microsoft.NET\Framework\v4.0.30319,ngen.exe 10,Microsoft.NET\Framework\v4.0.30319,fusion.dll +11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe 16422,Internet Explorer,iexplore.exe 11,,*

1 0

Thomas Mullaly : urlmon: Implemented PARSE_DOMAIN for CoInternetParseIUri.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 4a9d2d43fe2534c4141599f5f11ae66b2c2db32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9d2d43fe2534c4141599f5f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Dec 2 21:45:22 2010 -0500 urlmon: Implemented PARSE_DOMAIN for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 8 +++++++- dlls/urlmon/uri.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 057850a..1a02f8a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5966,7 +5966,13 @@ static const uri_parse_test uri_parse_tests[] = { {"http://google.uk.com/",0,PARSE_SITE,0,"google.uk.com",S_OK,FALSE}, {"http://google.com.com/",0,PARSE_SITE,0,"google.com.com",S_OK,FALSE}, {"google.com",Uri_CREATE_ALLOW_RELATIVE,PARSE_SITE,0,"",S_OK,FALSE}, - {"file://server/test",0,PARSE_SITE,0,"server",S_OK,FALSE} + {"file://server/test",0,PARSE_SITE,0,"server",S_OK,FALSE}, + + /* PARSE_DOMAIN tests. */ + {"http://google.com.uk/",0,PARSE_DOMAIN,0,"google.com.uk",S_OK,FALSE}, + {"http://google.com.com/",0,PARSE_DOMAIN,0,"com.com",S_OK,FALSE}, + {"test/test",Uri_CREATE_ALLOW_RELATIVE,PARSE_DOMAIN,0,"",S_OK,FALSE}, + {"file://server/test",0,PARSE_DOMAIN,0,"",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 54f7118..8698266 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6442,6 +6442,34 @@ static HRESULT parse_site(IUri *uri, LPWSTR output, DWORD output_len, DWORD *res return S_OK; } +static HRESULT parse_domain(IUri *uri, LPWSTR output, DWORD output_len, DWORD *result_len) +{ + HRESULT hr; + DWORD len; + BSTR received; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_DOMAIN, &len, 0); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + *result_len = len; + if(len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + hr = IUri_GetDomain(uri, &received); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + memcpy(output, received, (len+1)*sizeof(WCHAR)); + SysFreeString(received); + + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6512,6 +6540,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d case PARSE_SITE: hr = parse_site(pIUri, pwzResult, cchResult, pcchResult); break; + case PARSE_DOMAIN: + hr = parse_domain(pIUri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0