Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [UPDSPAPI] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49e5f260270edaac409b3… commit 49e5f260270edaac409b307c206a1e60943b7edf Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:34:04 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:34:04 2018 +0100 [UPDSPAPI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/updspapi/main.c | 14 +++++++------- media/doc/README.WINE | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/updspapi/main.c b/dll/win32/updspapi/main.c index 9e5427696c..73af32fe98 100644 --- a/dll/win32/updspapi/main.c +++ b/dll/win32/updspapi/main.c @@ -16,17 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <config.h> +#include "config.h" #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winreg.h> -#include <setupapi.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "setupapi.h" -#include <wine/debug.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(updspapi); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index f544ea18d0..9f96e3dcbb 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -186,7 +186,7 @@ reactos/dll/win32/t2embed # Synced to WineStaging-3.3 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-2.9 +reactos/dll/win32/updspapi # Synced to WineStaging-3.3 reactos/dll/win32/url # Synced to WineStaging-2.9 reactos/dll/win32/urlmon # Synced to Wine-3.0 reactos/dll/win32/usp10 # Synced to Wine-3.0

6 years, 9 months

01/01: [TWAIN_32] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f76ac9dc71a08d618b1fa… commit f76ac9dc71a08d618b1fac5c4a891cf101f532d4 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:33:24 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:33:24 2018 +0100 [TWAIN_32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/twain_32/CMakeLists.txt | 4 ++-- dll/win32/twain_32/dsm_ctrl.c | 14 ++++++++++++-- dll/win32/twain_32/precomp.h | 16 ++++++++++++++++ dll/win32/twain_32/twain32_main.c | 10 ++++++++++ dll/win32/twain_32/twain_i.h | 21 ++++++++------------- media/doc/README.WINE | 2 +- 6 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dll/win32/twain_32/CMakeLists.txt b/dll/win32/twain_32/CMakeLists.txt index ac028ed450..2861f22ba2 100644 --- a/dll/win32/twain_32/CMakeLists.txt +++ b/dll/win32/twain_32/CMakeLists.txt @@ -6,7 +6,7 @@ spec2def(twain_32.dll twain_32.spec) list(APPEND SOURCE dsm_ctrl.c twain32_main.c - twain_i.h) + precomp.h) add_library(twain_32 SHARED ${SOURCE} @@ -16,5 +16,5 @@ add_library(twain_32 SHARED set_module_type(twain_32 win32dll) target_link_libraries(twain_32 wine) add_importlibs(twain_32 user32 msvcrt kernel32 ntdll) -add_pch(twain_32 twain_i.h SOURCE) +add_pch(twain_32 precomp.h SOURCE) add_cd_file(TARGET twain_32 DESTINATION reactos FOR all) diff --git a/dll/win32/twain_32/dsm_ctrl.c b/dll/win32/twain_32/dsm_ctrl.c index ce845c9531..0b2098654f 100644 --- a/dll/win32/twain_32/dsm_ctrl.c +++ b/dll/win32/twain_32/dsm_ctrl.c @@ -19,11 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "twain_i.h" +#include "config.h" -#include <winuser.h> +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "twain.h" +#include "twain_i.h" #include "resource.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(twain); static TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */ static TW_UINT32 DSM_sourceId; /* source id generator */ diff --git a/dll/win32/twain_32/precomp.h b/dll/win32/twain_32/precomp.h new file mode 100644 index 0000000000..ac103c9644 --- /dev/null +++ b/dll/win32/twain_32/precomp.h @@ -0,0 +1,16 @@ + +#ifndef _TWAIN32_PRECOMP_H +#define _TWAIN32_PRECOMP_H + +#include <wine/config.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "twain_i.h" + +#include <winuser.h> + +#include <wine/debug.h> + +#endif /* !_TWAIN32_PRECOMP_H */ diff --git a/dll/win32/twain_32/twain32_main.c b/dll/win32/twain_32/twain32_main.c index 1607c9b2d7..016680b96e 100644 --- a/dll/win32/twain_32/twain32_main.c +++ b/dll/win32/twain_32/twain32_main.c @@ -19,7 +19,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "twain.h" #include "twain_i.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(twain); extern HINSTANCE DSM_hinstance; diff --git a/dll/win32/twain_32/twain_i.h b/dll/win32/twain_32/twain_i.h index 32ebc2a221..4d33135344 100644 --- a/dll/win32/twain_32/twain_i.h +++ b/dll/win32/twain_32/twain_i.h @@ -20,21 +20,16 @@ #ifndef _TWAIN32_H #define _TWAIN32_H -#include <wine/config.h> +#ifndef __WINE_CONFIG_H +# error You must include config.h first +#endif #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <twain.h> - -#include <wine/debug.h> -#include <wine/list.h> - -WINE_DEFAULT_DEBUG_CHANNEL(twain); +#include "windef.h" +#include "winbase.h" +#include "twain.h" +#include "wine/list.h" struct pending_message { @@ -84,4 +79,4 @@ extern TW_UINT16 TWAIN_ControlNull extern TW_UINT16 TWAIN_ProcessEvent (pTW_IDENTITY pOrigin, activeDS *pSource, TW_MEMREF pData) DECLSPEC_HIDDEN; -#endif /* _TWAIN32_H */ +#endif diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5576071605..f544ea18d0 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -185,7 +185,7 @@ reactos/dll/win32/sxs # Synced to WineStaging-3.3 reactos/dll/win32/t2embed # Synced to WineStaging-3.3 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 Wine-3.0 +reactos/dll/win32/twain_32 # Synced to WineStaging-3.3 reactos/dll/win32/updspapi # Synced to WineStaging-2.9 reactos/dll/win32/url # Synced to WineStaging-2.9 reactos/dll/win32/urlmon # Synced to Wine-3.0

6 years, 9 months

01/01: [TRAFFIC] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=302c4ae0ca06b7dd6b8c9… commit 302c4ae0ca06b7dd6b8c9ab01f10f6820267047c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:32:12 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:32:12 2018 +0100 [TRAFFIC] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/traffic/traffic_main.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dll/win32/traffic/traffic_main.c b/dll/win32/traffic/traffic_main.c index e598901005..6b8a9751e1 100644 --- a/dll/win32/traffic/traffic_main.c +++ b/dll/win32/traffic/traffic_main.c @@ -17,14 +17,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <traffic.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "traffic.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(traffic); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 10480ed1c0..5576071605 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -184,7 +184,7 @@ reactos/dll/win32/sti # Synced to WineStaging-3.3 reactos/dll/win32/sxs # Synced to WineStaging-3.3 reactos/dll/win32/t2embed # Synced to WineStaging-3.3 reactos/dll/win32/tapi32 # Synced to WineStaging-3.3 -reactos/dll/win32/traffic # Synced to WineStaging-2.9 +reactos/dll/win32/traffic # Synced to WineStaging-3.3 reactos/dll/win32/twain_32 # Synced to Wine-3.0 reactos/dll/win32/updspapi # Synced to WineStaging-2.9 reactos/dll/win32/url # Synced to WineStaging-2.9

6 years, 9 months

01/01: [TAPI32] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51fd824e2183aa5b8c704… commit 51fd824e2183aa5b8c704068d708b1ad72bfda7f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:31:40 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:31:40 2018 +0100 [TAPI32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/tapi32/assisted.c | 16 +++++++++++++++- dll/win32/tapi32/internal.c | 2 ++ dll/win32/tapi32/line.c | 17 ++++++++++++++++- dll/win32/tapi32/phone.c | 9 ++++++++- dll/win32/tapi32/precomp.h | 5 ++--- dll/win32/tapi32/tapi32.spec | 6 +++--- media/doc/README.WINE | 2 +- 7 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dll/win32/tapi32/assisted.c b/dll/win32/tapi32/assisted.c index aab6863822..57c24e8187 100644 --- a/dll/win32/tapi32/assisted.c +++ b/dll/win32/tapi32/assisted.c @@ -19,7 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winreg.h" +#include "objbase.h" +#include "tapi.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(tapi); /*********************************************************************** * tapiGetLocationInfoW (TAPI32.@) diff --git a/dll/win32/tapi32/internal.c b/dll/win32/tapi32/internal.c index c94d8befdc..53146d4000 100644 --- a/dll/win32/tapi32/internal.c +++ b/dll/win32/tapi32/internal.c @@ -20,6 +20,8 @@ #include "precomp.h" +WINE_DEFAULT_DEBUG_CHANNEL(tapi); + /*********************************************************************** * internalConfig (TAPI32.@) */ diff --git a/dll/win32/tapi32/line.c b/dll/win32/tapi32/line.c index f8e5aae776..c0e25ba4d8 100644 --- a/dll/win32/tapi32/line.c +++ b/dll/win32/tapi32/line.c @@ -18,7 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <string.h> +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winreg.h" +#include "winnls.h" +#include "winerror.h" +#include "objbase.h" +#include "tapi.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(tapi); /* registry keys */ static const char szCountrylistKey[] = diff --git a/dll/win32/tapi32/phone.c b/dll/win32/tapi32/phone.c index c03c3cc861..ed40a627ef 100644 --- a/dll/win32/tapi32/phone.c +++ b/dll/win32/tapi32/phone.c @@ -18,7 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "tapi.h" +#include "wine/debug.h" /* * Additional TSPI functions: @@ -28,6 +34,7 @@ * - TSPI_ProviderEnumDevices * - TSPI_ProviderConfig */ +WINE_DEFAULT_DEBUG_CHANNEL(tapi); /*********************************************************************** * phoneClose (TAPI32.@) diff --git a/dll/win32/tapi32/precomp.h b/dll/win32/tapi32/precomp.h index 031a8ca582..e51c67ba01 100644 --- a/dll/win32/tapi32/precomp.h +++ b/dll/win32/tapi32/precomp.h @@ -1,3 +1,4 @@ + #ifndef _TAPI32_PCH_ #define _TAPI32_PCH_ @@ -18,6 +19,4 @@ #include <wine/unicode.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(tapi); - -#endif /* _TAPI32_PCH_ */ +#endif /* !_TAPI32_PCH_ */ diff --git a/dll/win32/tapi32/tapi32.spec b/dll/win32/tapi32/tapi32.spec index dafc6ff492..7148df759e 100644 --- a/dll/win32/tapi32/tapi32.spec +++ b/dll/win32/tapi32/tapi32.spec @@ -250,7 +250,7 @@ @ stdcall phoneGetVolume(long long ptr) @ stdcall phoneInitialize(ptr long ptr str ptr) @ stdcall phoneInitializeExA(ptr long ptr str ptr ptr ptr) -@ stdcall phoneInitializeExW(ptr long ptr str ptr ptr ptr) +@ stdcall phoneInitializeExW(ptr long ptr wstr ptr ptr ptr) @ stdcall phoneNegotiateAPIVersion(long long long long ptr ptr) @ stdcall phoneNegotiateExtVersion(long long long long long ptr) @ stdcall phoneOpen(long long ptr long long long long) @@ -269,10 +269,10 @@ @ stdcall tapiGetLocationInfo(str str) tapiGetLocationInfoA @ stdcall tapiGetLocationInfoA(str str) @ stdcall tapiGetLocationInfoW(wstr wstr) -@ stub tapiRequestDrop +@ stub tapiRequestDrop @ stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCallA @ stdcall tapiRequestMakeCallA(str str str str) @ stub tapiRequestMakeCallW -@ stub tapiRequestMediaCall +@ stub tapiRequestMediaCall @ stub tapiRequestMediaCallA @ stub tapiRequestMediaCallW diff --git a/media/doc/README.WINE b/media/doc/README.WINE index fe8fd6722d..10480ed1c0 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -183,7 +183,7 @@ reactos/dll/win32/stdole32.tlb # Synced to WineStaging-3.3 reactos/dll/win32/sti # Synced to WineStaging-3.3 reactos/dll/win32/sxs # Synced to WineStaging-3.3 reactos/dll/win32/t2embed # Synced to WineStaging-3.3 -reactos/dll/win32/tapi32 # Synced to WineStaging-2.9 +reactos/dll/win32/tapi32 # Synced to WineStaging-3.3 reactos/dll/win32/traffic # Synced to WineStaging-2.9 reactos/dll/win32/twain_32 # Synced to Wine-3.0 reactos/dll/win32/updspapi # Synced to WineStaging-2.9

6 years, 9 months

01/01: [T2EMBED] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=567f50fb3fc9f4af9986e… commit 567f50fb3fc9f4af9986e98b64cec1ccf34f3647 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:30:57 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:30:57 2018 +0100 [T2EMBED] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/t2embed/main.c | 17 +++++++++-------- media/doc/README.WINE | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dll/win32/t2embed/main.c b/dll/win32/t2embed/main.c index 1b9c8f9135..766926fbfa 100644 --- a/dll/win32/t2embed/main.c +++ b/dll/win32/t2embed/main.c @@ -17,16 +17,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winreg.h> -#include <t2embapi.h> +#include "config.h" + +#include <stdarg.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winreg.h" +#include "t2embapi.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(t2embed); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index f0786bd2b1..fe8fd6722d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -182,7 +182,7 @@ reactos/dll/win32/stdole2.tlb # Synced to WineStaging-3.3 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-3.3 reactos/dll/win32/sti # Synced to WineStaging-3.3 reactos/dll/win32/sxs # Synced to WineStaging-3.3 -reactos/dll/win32/t2embed # Synced to WineStaging-2.9 +reactos/dll/win32/t2embed # Synced to WineStaging-3.3 reactos/dll/win32/tapi32 # Synced to WineStaging-2.9 reactos/dll/win32/traffic # Synced to WineStaging-2.9 reactos/dll/win32/twain_32 # Synced to Wine-3.0

6 years, 9 months

01/01: [SXS] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=640271bc371f156db3e19… commit 640271bc371f156db3e1920d8a2af671b35172ab Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:30:21 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:30:21 2018 +0100 [SXS] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/sxs/CMakeLists.txt | 4 ++-- dll/win32/sxs/cache.c | 19 +++++++++++++++---- dll/win32/sxs/name.c | 13 +++++++++++++ dll/win32/sxs/precomp.h | 23 +++++++++++++++++++++++ dll/win32/sxs/sxs.c | 6 +++++- dll/win32/sxs/sxs_private.h | 23 +---------------------- media/doc/README.WINE | 2 +- 7 files changed, 60 insertions(+), 30 deletions(-) diff --git a/dll/win32/sxs/CMakeLists.txt b/dll/win32/sxs/CMakeLists.txt index 9e44e72413..79d166e036 100644 --- a/dll/win32/sxs/CMakeLists.txt +++ b/dll/win32/sxs/CMakeLists.txt @@ -7,7 +7,7 @@ list(APPEND SOURCE cache.c name.c sxs.c - sxs_private.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c) add_library(sxs SHARED @@ -18,5 +18,5 @@ add_library(sxs SHARED set_module_type(sxs win32dll) target_link_libraries(sxs wine) add_importlibs(sxs oleaut32 ole32 msvcrt kernel32 ntdll) -add_pch(sxs sxs_private.h SOURCE) +add_pch(sxs precomp.h SOURCE) add_cd_file(TARGET sxs DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/sxs/cache.c b/dll/win32/sxs/cache.c index 7896e27573..791a6ed049 100644 --- a/dll/win32/sxs/cache.c +++ b/dll/win32/sxs/cache.c @@ -18,12 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "sxs_private.h" +#include <stdarg.h> + +#define COBJMACROS +#define INITGUID -#include <oleauto.h> -#include <msxml2.h> +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "winsxs.h" +#include "msxml2.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" +#include "sxs_private.h" -#include <wine/list.h> +WINE_DEFAULT_DEBUG_CHANNEL(sxs); static const WCHAR cache_mutex_nameW[] = {'_','_','W','I','N','E','_','S','X','S','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; diff --git a/dll/win32/sxs/name.c b/dll/win32/sxs/name.c index 5e50821736..74aece2bc3 100644 --- a/dll/win32/sxs/name.c +++ b/dll/win32/sxs/name.c @@ -18,8 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "winsxs.h" + +#include "wine/debug.h" +#include "wine/unicode.h" #include "sxs_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(sxs); + struct name { IAssemblyName IAssemblyName_iface; diff --git a/dll/win32/sxs/precomp.h b/dll/win32/sxs/precomp.h new file mode 100644 index 0000000000..52a823b3d2 --- /dev/null +++ b/dll/win32/sxs/precomp.h @@ -0,0 +1,23 @@ + +#ifndef _SXS_PRECOMP_H_ +#define _SXS_PRECOMP_H_ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <winsxs.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "sxs_private.h" + +#endif /* !_SXS_PRECOMP_H_ */ diff --git a/dll/win32/sxs/sxs.c b/dll/win32/sxs/sxs.c index f5aab4c9d0..06e6672dbf 100644 --- a/dll/win32/sxs/sxs.c +++ b/dll/win32/sxs/sxs.c @@ -18,7 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "sxs_private.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + /*********************************************************************** * DllMain (SXS.@) diff --git a/dll/win32/sxs/sxs_private.h b/dll/win32/sxs/sxs_private.h index de462512f3..1ceab265e3 100644 --- a/dll/win32/sxs/sxs_private.h +++ b/dll/win32/sxs/sxs_private.h @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _SXS_PRIVATE_H_ -#define _SXS_PRIVATE_H_ - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <winsxs.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(sxs); +#pragma once enum name_attr_id { @@ -57,5 +38,3 @@ static inline WCHAR *strdupW( const WCHAR *src ) if (dst) strcpyW( dst, src ); return dst; } - -#endif /* _SXS_PRIVATE_H_ */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d0c2a4297e..f0786bd2b1 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -181,7 +181,7 @@ reactos/dll/win32/softpub # Synced to WineStaging-2.9 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-3.3 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-3.3 reactos/dll/win32/sti # Synced to WineStaging-3.3 -reactos/dll/win32/sxs # Synced to WineStaging-2.16 +reactos/dll/win32/sxs # Synced to WineStaging-3.3 reactos/dll/win32/t2embed # Synced to WineStaging-2.9 reactos/dll/win32/tapi32 # Synced to WineStaging-2.9 reactos/dll/win32/traffic # Synced to WineStaging-2.9

6 years, 9 months

01/01: [STI] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd3274d64fe67f6e3f50b… commit cd3274d64fe67f6e3f50b770ddbcc82d36981a43 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:29:23 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:29:23 2018 +0100 [STI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/sti/precomp.h | 4 ++-- dll/win32/sti/sti.c | 16 +++++++++++++--- dll/win32/sti/sti_main.c | 17 ++++++++++++++++- media/doc/README.WINE | 2 +- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dll/win32/sti/precomp.h b/dll/win32/sti/precomp.h index 8c0b0f6342..d19191eb25 100644 --- a/dll/win32/sti/precomp.h +++ b/dll/win32/sti/precomp.h @@ -1,3 +1,4 @@ + #ifndef _STI_PCH_ #define _STI_PCH_ @@ -14,6 +15,5 @@ #include <sti.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(sti); -#endif /* _STI_PCH_ */ +#endif /* !_STI_PCH_ */ diff --git a/dll/win32/sti/sti.c b/dll/win32/sti/sti.c index 147d9ae3d4..41c94f5753 100644 --- a/dll/win32/sti/sti.c +++ b/dll/win32/sti/sti.c @@ -17,11 +17,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> -#include <winreg.h> +#define COBJMACROS -#include <wine/unicode.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" +#include "objbase.h" +#include "sti.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sti); static const WCHAR registeredAppsLaunchPath[] = { 'S','O','F','T','W','A','R','E','\\', diff --git a/dll/win32/sti/sti_main.c b/dll/win32/sti/sti_main.c index 291daebab7..c532ffbd6a 100644 --- a/dll/win32/sti/sti_main.c +++ b/dll/win32/sti/sti_main.c @@ -17,7 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" +#include "objbase.h" +#include "initguid.h" +#include "wia_lh.h" +#include "sti.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sti); extern HRESULT WINAPI STI_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; extern BOOL WINAPI STI_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 550dadc687..d0c2a4297e 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -180,7 +180,7 @@ reactos/dll/win32/snmpapi # Synced to WineStaging-3.3 reactos/dll/win32/softpub # Synced to WineStaging-2.9 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-3.3 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-3.3 -reactos/dll/win32/sti # Synced to WineStaging-2.9 +reactos/dll/win32/sti # Synced to WineStaging-3.3 reactos/dll/win32/sxs # Synced to WineStaging-2.16 reactos/dll/win32/t2embed # Synced to WineStaging-2.9 reactos/dll/win32/tapi32 # Synced to WineStaging-2.9

6 years, 9 months

01/01: [STDOLE32.TLB] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1d3793c86d3878b184ea… commit f1d3793c86d3878b184ea7e3eb149e06cce59b09 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:28:23 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:28:23 2018 +0100 [STDOLE32.TLB] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/stdole32.tlb/rsrc.rc | 10 +++++----- media/doc/README.WINE | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/stdole32.tlb/rsrc.rc b/dll/win32/stdole32.tlb/rsrc.rc index fbbf2ba5c9..e343e20ba7 100644 --- a/dll/win32/stdole32.tlb/rsrc.rc +++ b/dll/win32/stdole32.tlb/rsrc.rc @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -//#include "winbase.h" -//#include "winuser.h" -//#include "winnls.h" +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" /* @makedep: std_ole_v1.tlb */ 1 TYPELIB std_ole_v1.tlb diff --git a/media/doc/README.WINE b/media/doc/README.WINE index babf93015c..550dadc687 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -179,7 +179,7 @@ reactos/dll/win32/slbcsp # Synced to WineStaging-3.3 reactos/dll/win32/snmpapi # Synced to WineStaging-3.3 reactos/dll/win32/softpub # Synced to WineStaging-2.9 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-3.3 -reactos/dll/win32/stdole32.tlb # Synced to WineStaging-2.9 +reactos/dll/win32/stdole32.tlb # Synced to WineStaging-3.3 reactos/dll/win32/sti # Synced to WineStaging-2.9 reactos/dll/win32/sxs # Synced to WineStaging-2.16 reactos/dll/win32/t2embed # Synced to WineStaging-2.9

6 years, 9 months

01/01: [STDOLE2.TLB] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6a504349a1f83c883f47… commit b6a504349a1f83c883f47ceb13f59dc227620bc0 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:27:45 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:27:45 2018 +0100 [STDOLE2.TLB] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/stdole2.tlb/rsrc.rc | 10 +++++----- media/doc/README.WINE | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/stdole2.tlb/rsrc.rc b/dll/win32/stdole2.tlb/rsrc.rc index e376cce323..b965bea469 100644 --- a/dll/win32/stdole2.tlb/rsrc.rc +++ b/dll/win32/stdole2.tlb/rsrc.rc @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -//#include "winbase.h" -//#include "winuser.h" -//#include "winnls.h" +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" /* @makedep: std_ole_v2.tlb */ 1 TYPELIB std_ole_v2.tlb diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3753823d61..babf93015c 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -178,7 +178,7 @@ reactos/dll/win32/shlwapi # Synced to WineStaging-3.3 reactos/dll/win32/slbcsp # Synced to WineStaging-3.3 reactos/dll/win32/snmpapi # Synced to WineStaging-3.3 reactos/dll/win32/softpub # Synced to WineStaging-2.9 -reactos/dll/win32/stdole2.tlb # Synced to WineStaging-2.9 +reactos/dll/win32/stdole2.tlb # Synced to WineStaging-3.3 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-2.9 reactos/dll/win32/sti # Synced to WineStaging-2.9 reactos/dll/win32/sxs # Synced to WineStaging-2.16

6 years, 9 months

01/01: [SNMPAPI] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02fe705e3eb2e425e7832… commit 02fe705e3eb2e425e7832a6d6b8d4756eb74e4ad Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:27:09 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:27:09 2018 +0100 [SNMPAPI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/snmpapi/main.c | 12 +++++------- media/doc/README.WINE | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dll/win32/snmpapi/main.c b/dll/win32/snmpapi/main.c index ddd4d1f2ee..2101ec8d10 100644 --- a/dll/win32/snmpapi/main.c +++ b/dll/win32/snmpapi/main.c @@ -19,18 +19,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> +#include "config.h" #include <stdio.h> #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <snmp.h> +#include "windef.h" +#include "winbase.h" +#include "snmp.h" -#include <wine/debug.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(snmpapi); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index b4c886cba7..3753823d61 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -176,7 +176,7 @@ reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-3.3 reactos/dll/win32/shlwapi # Synced to WineStaging-3.3 reactos/dll/win32/slbcsp # Synced to WineStaging-3.3 -reactos/dll/win32/snmpapi # Synced to WineStaging-2.9 +reactos/dll/win32/snmpapi # Synced to WineStaging-3.3 reactos/dll/win32/softpub # Synced to WineStaging-2.9 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-2.9 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-2.9

6 years, 9 months

← Newer
1
...
14
15
16
17
18
19
20
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2018