Index: dll/win32/CMakeLists.txt =================================================================== --- dll/win32/CMakeLists.txt (revision 69859) +++ dll/win32/CMakeLists.txt (working copy) @@ -214,6 +214,7 @@ add_subdirectory(updspapi) add_subdirectory(url) add_subdirectory(urlmon) +add_subdirectory(urlmon_xp) add_subdirectory(userenv) add_subdirectory(usp10) add_subdirectory(uxtheme) Index: dll/win32/urlmon_xp/CMakeLists.txt =================================================================== --- dll/win32/urlmon_xp/CMakeLists.txt (revision 0) +++ dll/win32/urlmon_xp/CMakeLists.txt (working copy) @@ -0,0 +1,16 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_definitions(-D__WINESRC__) +spec2def(urlmon_xp.dll urlmon_xp.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/urlmon_xp_stubs.c) + +add_library(urlmon_xp SHARED + ${SOURCE} + urlmon.rc + ${CMAKE_CURRENT_BINARY_DIR}/urlmon_xp.def) + +set_module_type(urlmon_xp win32dll) +target_link_libraries(urlmon_xp wine) +add_importlibs(urlmon_xp msvcrt kernel32 ntdll) +add_cd_file(TARGET urlmon_xp DESTINATION reactos/system32 FOR all) \ No newline at end of file Index: dll/win32/urlmon_xp/resource.h =================================================================== --- dll/win32/urlmon_xp/resource.h (revision 0) +++ dll/win32/urlmon_xp/resource.h (working copy) @@ -0,0 +1,28 @@ +/* + * Copyright 2012 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 + */ + +#pragma once + +#define ID_AXINSTALL_WARNING_DLG 1000 +#define ID_AXINSTALL_LOCATION 1001 +#define ID_AXINSTALL_INSTALL_BTN 1002 +#define ID_AXINSTALL_ICON 1003 + +#define IDS_AXINSTALL_FAILURE 1100 +#define IDS_AXINSTALL_INSTALLN 1101 +#define IDS_AXINSTALL_INSTALL 1102 Index: dll/win32/urlmon_xp/urlmon.rc =================================================================== --- dll/win32/urlmon_xp/urlmon.rc (revision 0) +++ dll/win32/urlmon_xp/urlmon.rc (working copy) @@ -0,0 +1,58 @@ +/* + * Copyright 2005 Jacek Caban + * + * 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 +#include + +#include "resource.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +ID_AXINSTALL_WARNING_DLG DIALOGEX 0, 0, 260, 115 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Security Warning" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Do you want to install this software?", + 100, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 10, 10, 240, 23 + CONTROL "Location:", 101, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 10, 26, 40, 13 + CONTROL "", ID_AXINSTALL_LOCATION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 50, 26, 200, 13 + DEFPUSHBUTTON "Don't install", IDCANCEL, 200, 48, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "", ID_AXINSTALL_INSTALL_BTN, 144, 48, 50, 14, WS_GROUP | WS_TABSTOP | WS_DISABLED + CONTROL "", 102, "static", SS_ETCHEDHORZ, 10, 70, 240, 1 + ICON "", ID_AXINSTALL_ICON, 10, 82, 32, 32, WS_CHILD | WS_VISIBLE + CONTROL "When installed, an ActiveX component has full access to your computer. Do not click install unless you have absolute trust in the above source.", + 22002, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 46, 80, 194, 23 +} + +STRINGTABLE +{ + IDS_AXINSTALL_FAILURE "Installation of component failed: %08x" + IDS_AXINSTALL_INSTALLN "Install (%d)" + IDS_AXINSTALL_INSTALL "Install" +} + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "OLE Extensions for Win32" +#define REACTOS_STR_INTERNAL_NAME "urlmon.dll" +#define REACTOS_STR_ORIGINAL_FILENAME "urlmon.dll" +#define REACTOS_STR_PRODUCT_VERSION "6.0.2900.5512" +#define REACTOS_STR_FILE_VERSION "6.0.2900.5512" +#include Index: dll/win32/urlmon_xp/urlmon_xp.spec =================================================================== --- dll/win32/urlmon_xp/urlmon_xp.spec (revision 0) +++ dll/win32/urlmon_xp/urlmon_xp.spec (working copy) @@ -0,0 +1,87 @@ +100 stub -noname Ordinal100 +101 stub AsyncGetClassBits +102 stub AsyncInstallDistributionUnit +103 stub BindAsyncMoniker +104 stub CDLGetLongPathNameA +105 stub CDLGetLongPathNameW +106 stub CoGetClassObjectFromURL +107 stub CoInstall +108 stub CoInternetCombineUrl +109 stub CoInternetCompareUrl +110 stub CoInternetCreateSecurityManager +111 stub CoInternetCreateZoneManager +112 stub CoInternetFeatureSettingsChanged +113 stub CoInternetGetProtocolFlags +114 stub CoInternetGetSecurityUrl +115 stub CoInternetGetSession +116 stub CoInternetIsFeatureEnabled +117 stub CoInternetIsFeatureEnabledForUrl +118 stub CoInternetIsFeatureZoneElevationEnabled +119 stub CoInternetParseUrl +120 stub CoInternetQueryInfo +121 stub CoInternetSetFeatureEnabled +122 stub CompareSecurityIds +123 stub CompatFlagsFromClsid +124 stub CopyBindInfo +125 stub CopyStgMedium +126 stub CreateAsyncBindCtx +127 stub CreateAsyncBindCtxEx +128 stub CreateFormatEnumerator +129 stub CreateURLMoniker +130 stub CreateURLMonikerEx +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject +133 stub DllInstall +@ stub -private DllRegisterServer +135 stub DllRegisterServerEx +@ stub -private DllUnregisterServer +137 stub Extract +138 stub FaultInIEFeature +139 stub FindMediaType +140 stub FindMediaTypeClass +141 stub FindMimeFromData +142 stub GetClassFileOrMime +143 stub GetClassURL +144 stub GetComponentIDFromCLSSPEC +145 stub GetMarkOfTheWeb +146 stub GetSoftwareUpdateInfo +147 stub HlinkGoBack +148 stub HlinkGoForward +149 stub HlinkNavigateMoniker +150 stub HlinkNavigateString +151 stub HlinkSimpleNavigateToMoniker +152 stub HlinkSimpleNavigateToString +153 stub InstallFlash +154 stub IsAsyncMoniker +155 stub IsJITInProgress +156 stub IsLoggingEnabledA +157 stub IsLoggingEnabledW +158 stub IsValidURL +159 stub MkParseDisplayNameEx +160 stub ObtainUserAgentString +161 stub PrivateCoInstall +162 stub RegisterBindStatusCallback +163 stub RegisterFormatEnumerator +164 stub RegisterMediaTypeClass +165 stub RegisterMediaTypes +166 stub ReleaseBindInfo +167 stub RevokeBindStatusCallback +168 stub RevokeFormatEnumerator +169 stub SetSoftwareUpdateAdvertisementState +170 stub URLDownloadA +171 stub URLDownloadToCacheFileA +172 stub URLDownloadToCacheFileW +173 stub URLDownloadToFileA +174 stub URLDownloadToFileW +175 stub URLDownloadW +176 stub URLOpenBlockingStreamA +177 stub URLOpenBlockingStreamW +178 stub URLOpenPullStreamA +179 stub URLOpenPullStreamW +180 stub URLOpenStreamA +181 stub URLOpenStreamW +182 stub UrlMkBuildVersion +183 stub UrlMkGetSessionOption +184 stub UrlMkSetSessionOption +185 stub WriteHitLogging +186 stub ZonesReInit \ No newline at end of file