Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da50a61f0f346a64ed6bb… commit da50a61f0f346a64ed6bbf4fde4b95152608ed92 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:39:13 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:39:13 2018 +0100 [MSTASK] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mstask/CMakeLists.txt | 4 ++-- dll/win32/mstask/factory.c | 3 +++ dll/win32/mstask/mstask_main.c | 9 ++++++++- dll/win32/mstask/mstask_private.h | 16 +++++----------- dll/win32/mstask/precomp.h | 13 +++++++++++++ dll/win32/mstask/task.c | 3 +++ dll/win32/mstask/task_scheduler.c | 4 +++- dll/win32/mstask/task_trigger.c | 5 ++++- media/doc/README.WINE | 2 +- 9 files changed, 42 insertions(+), 17 deletions(-) diff --git a/dll/win32/mstask/CMakeLists.txt b/dll/win32/mstask/CMakeLists.txt index 1d616fb633..de210746d5 100644 --- a/dll/win32/mstask/CMakeLists.txt +++ b/dll/win32/mstask/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND SOURCE task.c task_scheduler.c task_trigger.c - mstask_private.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c ${CMAKE_CURRENT_BINARY_DIR}/mstask_stubs.c) @@ -22,5 +22,5 @@ add_library(mstask SHARED set_module_type(mstask win32dll) target_link_libraries(mstask uuid wine) add_importlibs(mstask ole32 msvcrt kernel32 ntdll) -add_pch(mstask mstask_private.h SOURCE) +add_pch(mstask precomp.h SOURCE) add_cd_file(TARGET mstask DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mstask/factory.c b/dll/win32/mstask/factory.c index 25ec76f391..f85a5f9c11 100644 --- a/dll/win32/mstask/factory.c +++ b/dll/win32/mstask/factory.c @@ -17,6 +17,9 @@ */ #include "mstask_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mstask); struct ClassFactoryImpl { diff --git a/dll/win32/mstask/mstask_main.c b/dll/win32/mstask/mstask_main.c index 512e0b278e..aa6693d1e8 100644 --- a/dll/win32/mstask/mstask_main.c +++ b/dll/win32/mstask/mstask_main.c @@ -16,9 +16,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> + #include "mstask_private.h" +#include "objbase.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + -#include <rpcproxy.h> +WINE_DEFAULT_DEBUG_CHANNEL(mstask); static HINSTANCE hInst; LONG dll_ref = 0; diff --git a/dll/win32/mstask/mstask_private.h b/dll/win32/mstask/mstask_private.h index b8f5042085..17c20fee43 100644 --- a/dll/win32/mstask/mstask_private.h +++ b/dll/win32/mstask/mstask_private.h @@ -21,19 +21,13 @@ #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 <mstask.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(mstask); +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "mstask.h" extern LONG dll_ref DECLSPEC_HIDDEN; diff --git a/dll/win32/mstask/precomp.h b/dll/win32/mstask/precomp.h new file mode 100644 index 0000000000..06be6b9d7a --- /dev/null +++ b/dll/win32/mstask/precomp.h @@ -0,0 +1,13 @@ + +#ifndef __MSTASK_PRECOMP_H__ +#define __MSTASK_PRECOMP_H__ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include "mstask_private.h" + +#include <wine/debug.h> + +#endif /* !__MSTASK_PRECOMP_H__ */ diff --git a/dll/win32/mstask/task.c b/dll/win32/mstask/task.c index fa4d098f69..97ae8b7b67 100644 --- a/dll/win32/mstask/task.c +++ b/dll/win32/mstask/task.c @@ -17,6 +17,9 @@ */ #include "mstask_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mstask); typedef struct { diff --git a/dll/win32/mstask/task_scheduler.c b/dll/win32/mstask/task_scheduler.c index f2103b9d86..1f367edb3d 100644 --- a/dll/win32/mstask/task_scheduler.c +++ b/dll/win32/mstask/task_scheduler.c @@ -16,9 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "corerror.h" #include "mstask_private.h" +#include "wine/debug.h" -#include <corerror.h> +WINE_DEFAULT_DEBUG_CHANNEL(mstask); typedef struct { diff --git a/dll/win32/mstask/task_trigger.c b/dll/win32/mstask/task_trigger.c index 9e98232bc8..448cf08708 100644 --- a/dll/win32/mstask/task_trigger.c +++ b/dll/win32/mstask/task_trigger.c @@ -16,9 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include "winternl.h" #include "mstask_private.h" +#include "wine/debug.h" -#include <winternl.h> +WINE_DEFAULT_DEBUG_CHANNEL(mstask); typedef struct { diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 79c05ad60f..5a8dc0f250 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -122,7 +122,7 @@ reactos/dll/win32/mspatcha # Synced to WineStaging-3.3 reactos/dll/win32/msrle32 # Synced to WineStaging-3.3 reactos/dll/win32/mssign32 # Synced to WineStaging-3.3 reactos/dll/win32/mssip32 # Synced to WineStaging-3.3 -reactos/dll/win32/mstask # Synced to WineStaging-2.9 +reactos/dll/win32/mstask # Synced to WineStaging-3.3 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to Wine-3.0

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6fb6297add51b43f1af5… commit b6fb6297add51b43f1af59ac8a681f59ec8fb6d6 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:38:07 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:38:07 2018 +0100 [MSSIP32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mssip32/main.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dll/win32/mssip32/main.c b/dll/win32/mssip32/main.c index 1d1270aa85..a72c34662f 100644 --- a/dll/win32/mssip32/main.c +++ b/dll/win32/mssip32/main.c @@ -16,15 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> +#include "config.h" #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mssip32); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 25dde3835b..79c05ad60f 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -121,7 +121,7 @@ reactos/dll/win32/msnet32 # Synced to WineStaging-2.9 reactos/dll/win32/mspatcha # Synced to WineStaging-3.3 reactos/dll/win32/msrle32 # Synced to WineStaging-3.3 reactos/dll/win32/mssign32 # Synced to WineStaging-3.3 -reactos/dll/win32/mssip32 # Synced to WineStaging-2.9 +reactos/dll/win32/mssip32 # Synced to WineStaging-3.3 reactos/dll/win32/mstask # Synced to WineStaging-2.9 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d03add49a7071a4cdab6… commit 3d03add49a7071a4cdab6c4fef613e4f8f57618e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:37:23 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:37:23 2018 +0100 [MSSIGN32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mssign32/mssign32_main.c | 12 +++++------- media/doc/README.WINE | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dll/win32/mssign32/mssign32_main.c b/dll/win32/mssign32/mssign32_main.c index 45424430fd..e35488bad3 100644 --- a/dll/win32/mssign32/mssign32_main.c +++ b/dll/win32/mssign32/mssign32_main.c @@ -18,17 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> +#include "config.h" #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wincrypt.h> +#include "windef.h" +#include "winbase.h" +#include "wincrypt.h" -#include <wine/debug.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mssign); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 355759c775..25dde3835b 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -120,7 +120,7 @@ reactos/dll/win32/msisys.ocx # Synced to WineStaging-3.3 reactos/dll/win32/msnet32 # Synced to WineStaging-2.9 reactos/dll/win32/mspatcha # Synced to WineStaging-3.3 reactos/dll/win32/msrle32 # Synced to WineStaging-3.3 -reactos/dll/win32/mssign32 # Synced to WineStaging-2.9 +reactos/dll/win32/mssign32 # Synced to WineStaging-3.3 reactos/dll/win32/mssip32 # Synced to WineStaging-2.9 reactos/dll/win32/mstask # Synced to WineStaging-2.9 reactos/dll/win32/msvcrt20 # Out of sync

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad72601ed001790cd0792… commit ad72601ed001790cd07923640d31bdb94fc5261f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:36:35 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:36:35 2018 +0100 [MSRLE32_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/msrle32/msrle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/winetests/msrle32/msrle.c b/modules/rostests/winetests/msrle32/msrle.c index d526c3c80d..14ddddb342 100644 --- a/modules/rostests/winetests/msrle32/msrle.c +++ b/modules/rostests/winetests/msrle32/msrle.c @@ -22,7 +22,7 @@ #include <aviriff.h> #include <stdio.h> -#include <wine/test.h> +#include "wine/test.h" static void test_output(const BYTE *output, int out_size, const BYTE *expect, int size) {

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2b54264dc301cf14cac1… commit b2b54264dc301cf14cac10ae465355cf0001a75a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:35:58 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:35:58 2018 +0100 [MSRLE32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msrle32/msrle32.c | 6 +++--- dll/win32/msrle32/msrle_private.h | 16 ++++++---------- dll/win32/msrle32/rsrc.rc | 6 ++---- media/doc/README.WINE | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dll/win32/msrle32/msrle32.c b/dll/win32/msrle32/msrle32.c index 0cca8c1700..66880408d4 100644 --- a/dll/win32/msrle32/msrle32.c +++ b/dll/win32/msrle32/msrle32.c @@ -25,10 +25,10 @@ #include "msrle_private.h" -//#include "winnls.h" -//#include "winuser.h" +#include "winnls.h" +#include "winuser.h" -#include <wine/debug.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msrle32); diff --git a/dll/win32/msrle32/msrle_private.h b/dll/win32/msrle32/msrle_private.h index 88b9074026..d182fef1f0 100644 --- a/dll/win32/msrle32/msrle_private.h +++ b/dll/win32/msrle32/msrle_private.h @@ -19,20 +19,16 @@ #ifndef __MSRLE32_PRIVATE_H #define __MSRLE32_PRIVATE_H -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #ifndef RC_INVOKED #include <stdarg.h> #endif -#include <windef.h> -#include <winbase.h> -//#include "mmsystem.h" -#include <wingdi.h> -//#include "winuser.h" -#include <vfw.h> +#include "windef.h" +#include "winbase.h" +#include "mmsystem.h" +#include "wingdi.h" +#include "winuser.h" +#include "vfw.h" #define IDS_NAME 100 #define IDS_DESCRIPTION 101 diff --git a/dll/win32/msrle32/rsrc.rc b/dll/win32/msrle32/rsrc.rc index 680d6e653c..ffe5817620 100644 --- a/dll/win32/msrle32/rsrc.rc +++ b/dll/win32/msrle32/rsrc.rc @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" +#include "msrle_private.h" -//#include "msrle_private.h" /* * Everything specific to any language goes @@ -108,4 +106,4 @@ #endif #ifdef LANGUAGE_ZH_CN #include "lang/msrle_Zh.rc" -#endif \ No newline at end of file +#endif diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 8f1f6dd332..355759c775 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -119,7 +119,7 @@ reactos/dll/win32/msisip # Synced to WineStaging-3.3 reactos/dll/win32/msisys.ocx # Synced to WineStaging-3.3 reactos/dll/win32/msnet32 # Synced to WineStaging-2.9 reactos/dll/win32/mspatcha # Synced to WineStaging-3.3 -reactos/dll/win32/msrle32 # Synced to WineStaging-2.9 +reactos/dll/win32/msrle32 # Synced to WineStaging-3.3 reactos/dll/win32/mssign32 # Synced to WineStaging-2.9 reactos/dll/win32/mssip32 # Synced to WineStaging-2.9 reactos/dll/win32/mstask # Synced to WineStaging-2.9

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4aebe9e75d7eb4c3f173f… commit 4aebe9e75d7eb4c3f173ff27b67cff26cb22b272 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:35:08 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:35:08 2018 +0100 [MSPATCHA] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mspatcha/mspatcha_main.c | 13 ++++++------- media/doc/README.WINE | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dll/win32/mspatcha/mspatcha_main.c b/dll/win32/mspatcha/mspatcha_main.c index 4103eacf39..f78b8ab352 100644 --- a/dll/win32/mspatcha/mspatcha_main.c +++ b/dll/win32/mspatcha/mspatcha_main.c @@ -18,16 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/config.h> +#include "config.h" #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <patchapi.h> - -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "patchapi.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5a0df169a2..8f1f6dd332 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -118,7 +118,7 @@ reactos/dll/win32/msimtf # Synced to WineStaging-3.3 reactos/dll/win32/msisip # Synced to WineStaging-3.3 reactos/dll/win32/msisys.ocx # Synced to WineStaging-3.3 reactos/dll/win32/msnet32 # Synced to WineStaging-2.9 -reactos/dll/win32/mspatcha # Synced to WineStaging-2.9 +reactos/dll/win32/mspatcha # Synced to WineStaging-3.3 reactos/dll/win32/msrle32 # Synced to WineStaging-2.9 reactos/dll/win32/mssign32 # Synced to WineStaging-2.9 reactos/dll/win32/mssip32 # Synced to WineStaging-2.9

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd13be0d6ebae605eaf68… commit bd13be0d6ebae605eaf68adca65b5bc0dbc60298 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:34:18 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:34:18 2018 +0100 [MSISYS.OCX] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msisys.ocx/msisys.c | 18 ++++++++---------- media/doc/README.WINE | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dll/win32/msisys.ocx/msisys.c b/dll/win32/msisys.ocx/msisys.c index 786d42748f..e4b0df02fb 100644 --- a/dll/win32/msisys.ocx/msisys.c +++ b/dll/win32/msisys.ocx/msisys.c @@ -18,20 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> +#include "config.h" #include <stdarg.h> -#include <windef.h> -//#include "winerror.h" -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" -//#include "objbase.h" +#include "windef.h" +#include "winerror.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" -#include <wine/debug.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msisys); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 09bb6dd7ae..5a0df169a2 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -116,7 +116,7 @@ reactos/dll/win32/msi # Synced to WineStaging-3.3 reactos/dll/win32/msimg32 # Synced to WineStaging-3.3 reactos/dll/win32/msimtf # Synced to WineStaging-3.3 reactos/dll/win32/msisip # Synced to WineStaging-3.3 -reactos/dll/win32/msisys.ocx # Synced to WineStaging-2.9 +reactos/dll/win32/msisys.ocx # Synced to WineStaging-3.3 reactos/dll/win32/msnet32 # Synced to WineStaging-2.9 reactos/dll/win32/mspatcha # Synced to WineStaging-2.9 reactos/dll/win32/msrle32 # Synced to WineStaging-2.9

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b5f701d8ae915fe75dc0… commit 4b5f701d8ae915fe75dc0096f7cc8fb997085957 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:33:33 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:33:33 2018 +0100 [MSISIP] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msisip/main.c | 20 ++++++++------------ media/doc/README.WINE | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dll/win32/msisip/main.c b/dll/win32/msisip/main.c index 421e9ab1c4..882db3d9d8 100644 --- a/dll/win32/msisip/main.c +++ b/dll/win32/msisip/main.c @@ -16,20 +16,16 @@ * 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 <config.h> +#include "config.h" #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wincrypt.h> -#include <mssip.h> +#include "windef.h" +#include "winbase.h" +#include "wincrypt.h" +#include "mssip.h" #define COBJMACROS -#include <objbase.h> -#include <initguid.h> -#include <wine/debug.h> +#include "objbase.h" +#include "initguid.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msisip); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5ff19beb5c..09bb6dd7ae 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -115,7 +115,7 @@ reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-3.3 reactos/dll/win32/msimg32 # Synced to WineStaging-3.3 reactos/dll/win32/msimtf # Synced to WineStaging-3.3 -reactos/dll/win32/msisip # Synced to WineStaging-2.9 +reactos/dll/win32/msisip # Synced to WineStaging-3.3 reactos/dll/win32/msisys.ocx # Synced to WineStaging-2.9 reactos/dll/win32/msnet32 # Synced to WineStaging-2.9 reactos/dll/win32/mspatcha # Synced to WineStaging-2.9

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=034ec2e0fccc6efbe29eb… commit 034ec2e0fccc6efbe29ebd31c9a58751c1c6f98e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:32:52 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:32:52 2018 +0100 [MSIMTF] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msimtf/activeimmapp.c | 22 +++++++++++++++++++++- dll/win32/msimtf/main.c | 19 +++++++++++++++++-- dll/win32/msimtf/precomp.h | 4 ++-- media/doc/README.WINE | 2 +- 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dll/win32/msimtf/activeimmapp.c b/dll/win32/msimtf/activeimmapp.c index 973a7d5722..fb5ef40be5 100644 --- a/dll/win32/msimtf/activeimmapp.c +++ b/dll/win32/msimtf/activeimmapp.c @@ -18,7 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winreg.h" +#include "winuser.h" +#include "winerror.h" +#include "objbase.h" +#include "dimm.h" +#include "imm.h" + +#include "wine/unicode.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msimtf); typedef struct tagActiveIMMApp { IActiveIMMApp IActiveIMMApp_iface; diff --git a/dll/win32/msimtf/main.c b/dll/win32/msimtf/main.c index 9f341403ea..78c26cb10e 100644 --- a/dll/win32/msimtf/main.c +++ b/dll/win32/msimtf/main.c @@ -16,9 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" -#include <rpcproxy.h> +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "ole2.h" +#include "rpcproxy.h" +#include "dimm.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msimtf); extern HRESULT ActiveIMMApp_Constructor(IUnknown *punkOuter, IUnknown **ppOut); diff --git a/dll/win32/msimtf/precomp.h b/dll/win32/msimtf/precomp.h index 43a5d4a4df..6daa8c5a88 100644 --- a/dll/win32/msimtf/precomp.h +++ b/dll/win32/msimtf/precomp.h @@ -1,3 +1,4 @@ + #ifndef _MSIMTF_PCH_ #define _MSIMTF_PCH_ @@ -19,6 +20,5 @@ #include <dimm.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msimtf); -#endif /* _MSIMTF_PCH_ */ +#endif /* !_MSIMTF_PCH_ */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6b5100495f..5ff19beb5c 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -114,7 +114,7 @@ reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-3.3 reactos/dll/win32/msimg32 # Synced to WineStaging-3.3 -reactos/dll/win32/msimtf # Synced to WineStaging-2.9 +reactos/dll/win32/msimtf # Synced to WineStaging-3.3 reactos/dll/win32/msisip # Synced to WineStaging-2.9 reactos/dll/win32/msisys.ocx # Synced to WineStaging-2.9 reactos/dll/win32/msnet32 # Synced to WineStaging-2.9

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c28484cc004b62ad56b24… commit c28484cc004b62ad56b24a3cc19f4e58f9b6ed57 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:32:05 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:32:05 2018 +0100 [MSIMG32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msimg32/msimg32_main.c | 12 +++++------- media/doc/README.WINE | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dll/win32/msimg32/msimg32_main.c b/dll/win32/msimg32/msimg32_main.c index d5198b1dbc..34beb3c0ed 100644 --- a/dll/win32/msimg32/msimg32_main.c +++ b/dll/win32/msimg32/msimg32_main.c @@ -16,15 +16,13 @@ * 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 "winerror.h" -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winerror.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msimg32); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 2f006c5934..6b5100495f 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -113,7 +113,7 @@ reactos/dll/win32/msgsm32.acm # Synced to WineStaging-3.3 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-3.3 -reactos/dll/win32/msimg32 # Synced to WineStaging-2.16 +reactos/dll/win32/msimg32 # Synced to WineStaging-3.3 reactos/dll/win32/msimtf # Synced to WineStaging-2.9 reactos/dll/win32/msisip # Synced to WineStaging-2.9 reactos/dll/win32/msisys.ocx # Synced to WineStaging-2.9

6 years, 6 months

← Newer
1
...
23
24
25
26
27
28
29
...
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