From: Mark Jansen Date: Sat, 7 Oct 2017 21:43:57 +0000 (+0200) Subject: [URLMON] Convert urlmon.inf to utf8 since git insists on fucking up utf16 files. X-Git-Tag: 0.4.8-dev~167 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=48fe08654d7ee94baad7ae3768a095749cc81b29;ds=inline [URLMON] Convert urlmon.inf to utf8 since git insists on fucking up utf16 files. --- diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index ab1765033a4..6194ab74315 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -11,6 +11,16 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB) add_rpcproxy_files(urlmon_urlmon.idl) +set(_source_file ${CMAKE_CURRENT_SOURCE_DIR}/urlmon.inf) +set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/urlmon_utf16.inf) +add_custom_command( + OUTPUT "${_converted_file}" + COMMAND native-utf16le "${_source_file}" "${_converted_file}" + DEPENDS native-utf16le "${_source_file}") + +set_source_files_properties(${_converted_file} PROPERTIES GENERATED TRUE) +set_source_files_properties(urlmon.rc PROPERTIES OBJECT_DEPENDS "${_converted_file}") + list(APPEND SOURCE axinstall.c bindctx.c diff --git a/dll/win32/urlmon/urlmon.inf b/dll/win32/urlmon/urlmon.inf index 91d3af2e3c0..d92f7ed1078 100644 Binary files a/dll/win32/urlmon/urlmon.inf and b/dll/win32/urlmon/urlmon.inf differ diff --git a/dll/win32/urlmon/urlmon.rc b/dll/win32/urlmon/urlmon.rc index 098f398f6c8..cea1099888c 100644 --- a/dll/win32/urlmon/urlmon.rc +++ b/dll/win32/urlmon/urlmon.rc @@ -55,7 +55,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 2 WINE_REGISTRY "urlmon_urlmon.rgs" /* @makedep: urlmon.inf */ -REGINST REGINST urlmon.inf +REGINST REGINST urlmon_utf16.inf #define WINE_FILENAME_STR "urlmon.dll" #define WINE_FILEVERSION 6,0,2800,1485