From e46d08cab23a49d49a3cf7f5826721ef091d221b Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 19 May 2012 15:01:23 +0000 Subject: [PATCH] [URL] * Sync to Wine 1.5.4. svn path=/trunk/; revision=56636 --- reactos/dll/win32/url/CMakeLists.txt | 4 ---- reactos/dll/win32/url/url.spec | 6 ++---- reactos/dll/win32/url/url_main.c | 9 +++++++++ reactos/media/doc/README.WINE | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/reactos/dll/win32/url/CMakeLists.txt b/reactos/dll/win32/url/CMakeLists.txt index ee901a062a3..0d1cc226918 100644 --- a/reactos/dll/win32/url/CMakeLists.txt +++ b/reactos/dll/win32/url/CMakeLists.txt @@ -10,11 +10,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/url.def) add_library(url SHARED ${SOURCE}) - set_module_type(url win32dll) - target_link_libraries(url wine) - add_importlibs(url shell32 shlwapi msvcrt kernel32 ntdll) - add_cd_file(TARGET url DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/url/url.spec b/reactos/dll/win32/url/url.spec index 09fe18868a7..343d2bf1962 100644 --- a/reactos/dll/win32/url/url.spec +++ b/reactos/dll/win32/url/url.spec @@ -1,7 +1,5 @@ @ stdcall AddMIMEFileTypesPS(ptr ptr) @ stub AutodialHookCallback -@ stub -private DllCanUnloadNow -@ stub -private DllGetClassObject @ stub DummyEntryPoint @ stub DummyEntryPointA @ stdcall FileProtocolHandler(long ptr str long) FileProtocolHandlerA @@ -13,8 +11,8 @@ @ stub MailToProtocolHandlerA @ stub NewsProtocolHandler @ stub NewsProtocolHandlerA -@ stub OpenURL -@ stub OpenURLA +@ stdcall OpenURL(long long str long) OpenURLA +@ stdcall OpenURLA(long long str long) @ stdcall TelnetProtocolHandler(long str) TelnetProtocolHandlerA @ stdcall TelnetProtocolHandlerA(long str) @ stub TranslateURLA diff --git a/reactos/dll/win32/url/url_main.c b/reactos/dll/win32/url/url_main.c index 69b46eaa317..b65aa02972a 100644 --- a/reactos/dll/win32/url/url_main.c +++ b/reactos/dll/win32/url/url_main.c @@ -105,6 +105,15 @@ HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, return S_OK; } +/*********************************************************************** + * OpenURLA (URL.@) + * + */ +void WINAPI OpenURLA(HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT show) +{ + FIXME("(%p, %p, %s, %d): stub!\n", hwnd, inst, debugstr_a(cmdline), show); +} + /*********************************************************************** * TelnetProtocolHandlerA (URL.@) * diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 3060cd8aaac..2b369a1f07b 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -166,7 +166,7 @@ reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/traffic # Synced to Wine-1.5.4 reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/updspapi # Synced to Wine-1.3.37 -reactos/dll/win32/url # Autosync +reactos/dll/win32/url # Synced to Wine-1.5.4 reactos/dll/win32/urlmon # Autosync reactos/dll/win32/usp10 # Synced to Wine-1.4 reactos/dll/win32/uxtheme # Forked