* Sync to Wine 1.5.4.

svn path=/trunk/; revision=56636
This commit is contained in:
Amine Khaldi 2012-05-19 15:01:23 +00:00
parent 9f4e3a2396
commit e46d08cab2
4 changed files with 12 additions and 9 deletions

View file

@ -10,11 +10,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/url.def) ${CMAKE_CURRENT_BINARY_DIR}/url.def)
add_library(url SHARED ${SOURCE}) add_library(url SHARED ${SOURCE})
set_module_type(url win32dll) set_module_type(url win32dll)
target_link_libraries(url wine) target_link_libraries(url wine)
add_importlibs(url shell32 shlwapi msvcrt kernel32 ntdll) add_importlibs(url shell32 shlwapi msvcrt kernel32 ntdll)
add_cd_file(TARGET url DESTINATION reactos/system32 FOR all) add_cd_file(TARGET url DESTINATION reactos/system32 FOR all)

View file

@ -1,7 +1,5 @@
@ stdcall AddMIMEFileTypesPS(ptr ptr) @ stdcall AddMIMEFileTypesPS(ptr ptr)
@ stub AutodialHookCallback @ stub AutodialHookCallback
@ stub -private DllCanUnloadNow
@ stub -private DllGetClassObject
@ stub DummyEntryPoint @ stub DummyEntryPoint
@ stub DummyEntryPointA @ stub DummyEntryPointA
@ stdcall FileProtocolHandler(long ptr str long) FileProtocolHandlerA @ stdcall FileProtocolHandler(long ptr str long) FileProtocolHandlerA
@ -13,8 +11,8 @@
@ stub MailToProtocolHandlerA @ stub MailToProtocolHandlerA
@ stub NewsProtocolHandler @ stub NewsProtocolHandler
@ stub NewsProtocolHandlerA @ stub NewsProtocolHandlerA
@ stub OpenURL @ stdcall OpenURL(long long str long) OpenURLA
@ stub OpenURLA @ stdcall OpenURLA(long long str long)
@ stdcall TelnetProtocolHandler(long str) TelnetProtocolHandlerA @ stdcall TelnetProtocolHandler(long str) TelnetProtocolHandlerA
@ stdcall TelnetProtocolHandlerA(long str) @ stdcall TelnetProtocolHandlerA(long str)
@ stub TranslateURLA @ stub TranslateURLA

View file

@ -105,6 +105,15 @@ HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl,
return S_OK; 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.@) * TelnetProtocolHandlerA (URL.@)
* *

View file

@ -166,7 +166,7 @@ reactos/dll/win32/tapi32 # Autosync
reactos/dll/win32/traffic # Synced to Wine-1.5.4 reactos/dll/win32/traffic # Synced to Wine-1.5.4
reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/twain_32 # Out of sync
reactos/dll/win32/updspapi # Synced to Wine-1.3.37 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/urlmon # Autosync
reactos/dll/win32/usp10 # Synced to Wine-1.4 reactos/dll/win32/usp10 # Synced to Wine-1.4
reactos/dll/win32/uxtheme # Forked reactos/dll/win32/uxtheme # Forked