https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06f94a685ca425c6984f8d8e0767004d3af339f4
commit 06f94a685ca425c6984f8d8e0767004d3af339f4 Author: Amine Khaldi <[email protected]> AuthorDate: Fri Mar 23 12:34:38 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Fri Mar 23 12:34:38 2018 +0100 [URL] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/url/url_main.c | 26 +++++++++++--------------- media/doc/README.WINE | 2 +- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dll/win32/url/url_main.c b/dll/win32/url/url_main.c index 79eaca148f..8ad413b6ea 100644 --- a/dll/win32/url/url_main.c +++ b/dll/win32/url/url_main.c @@ -16,22 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -//#include "winerror.h" -#include <shellapi.h> -#include <shlwapi.h> -//#include "intshcut.h" -#include <winuser.h> -//#include "commctrl.h" -#include <prsht.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" +#include "shellapi.h" +#include "shlwapi.h" +#include "intshcut.h" +#include "winuser.h" +#include "commctrl.h" +#include "prsht.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(url); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 9f96e3dcbb..b19935bbf1 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -187,7 +187,7 @@ reactos/dll/win32/tapi32 # Synced to WineStaging-3.3 reactos/dll/win32/traffic # Synced to WineStaging-3.3 reactos/dll/win32/twain_32 # Synced to WineStaging-3.3 reactos/dll/win32/updspapi # Synced to WineStaging-3.3 -reactos/dll/win32/url # Synced to WineStaging-2.9 +reactos/dll/win32/url # Synced to WineStaging-3.3 reactos/dll/win32/urlmon # Synced to Wine-3.0 reactos/dll/win32/usp10 # Synced to Wine-3.0 reactos/dll/win32/uxtheme # Forked
