https://git.reactos.org/?p=reactos.git;a=commitdiff;h=017748ce69b1c0b36e1519...
commit 017748ce69b1c0b36e1519da8c725e250cab027f Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Wed Mar 21 13:12:06 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Wed Mar 21 13:12:06 2018 +0100
[QMGR] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/qmgr/CMakeLists.txt | 4 ++-- dll/win32/qmgr/enum_files.c | 3 +++ dll/win32/qmgr/enum_jobs.c | 3 +++ dll/win32/qmgr/factory.c | 3 +++ dll/win32/qmgr/file.c | 12 ++++++++++-- dll/win32/qmgr/job.c | 7 +++++++ dll/win32/qmgr/precomp.h | 22 ++++++++++++++++++++++ dll/win32/qmgr/qmgr.c | 3 +++ dll/win32/qmgr/qmgr.h | 31 ++++++++++--------------------- dll/win32/qmgr/qmgr_main.c | 19 ++++++++++++------- dll/win32/qmgr/service.c | 5 +++++ media/doc/README.WINE | 2 +- 12 files changed, 81 insertions(+), 33 deletions(-)
diff --git a/dll/win32/qmgr/CMakeLists.txt b/dll/win32/qmgr/CMakeLists.txt index c503cf5730..21fec58fe3 100644 --- a/dll/win32/qmgr/CMakeLists.txt +++ b/dll/win32/qmgr/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND SOURCE qmgr.c qmgr_main.c service.c - qmgr.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c)
add_library(qmgr SHARED @@ -26,6 +26,6 @@ add_idl_headers(qmgr_idlheader qmgr_local.idl) set_module_type(qmgr win32dll) target_link_libraries(qmgr uuid wine) add_importlibs(qmgr winhttp ole32 advapi32 msvcrt kernel32 ntdll) -add_pch(qmgr qmgr.h SOURCE) +add_pch(qmgr precomp.h SOURCE) add_cd_file(TARGET qmgr DESTINATION reactos/system32 FOR all) add_dependencies(qmgr qmgr_idlheader) diff --git a/dll/win32/qmgr/enum_files.c b/dll/win32/qmgr/enum_files.c index 8945370ee9..67953d9e1a 100644 --- a/dll/win32/qmgr/enum_files.c +++ b/dll/win32/qmgr/enum_files.c @@ -19,6 +19,9 @@ */
#include "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
typedef struct { diff --git a/dll/win32/qmgr/enum_jobs.c b/dll/win32/qmgr/enum_jobs.c index c942547fb9..7fae597a4e 100644 --- a/dll/win32/qmgr/enum_jobs.c +++ b/dll/win32/qmgr/enum_jobs.c @@ -19,6 +19,9 @@ */
#include "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
typedef struct { diff --git a/dll/win32/qmgr/factory.c b/dll/win32/qmgr/factory.c index 69e6d98d6c..9736e00bf6 100644 --- a/dll/win32/qmgr/factory.c +++ b/dll/win32/qmgr/factory.c @@ -19,6 +19,9 @@ */
#include "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
static ULONG WINAPI BITS_IClassFactory_AddRef(IClassFactory *iface) diff --git a/dll/win32/qmgr/file.c b/dll/win32/qmgr/file.c index 19154649f7..3673ede142 100644 --- a/dll/win32/qmgr/file.c +++ b/dll/win32/qmgr/file.c @@ -18,10 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winhttp.h" +#define COBJMACROS #include "qmgr.h" +#include "wine/debug.h"
-#include <urlmon.h> -#include <winhttp.h> +WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
static inline BackgroundCopyFileImpl *impl_from_IBackgroundCopyFile2( IBackgroundCopyFile2 *iface) diff --git a/dll/win32/qmgr/job.c b/dll/win32/qmgr/job.c index 8843bfa320..a12e5111c5 100644 --- a/dll/win32/qmgr/job.c +++ b/dll/win32/qmgr/job.c @@ -18,7 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" #include "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_STATE to) { diff --git a/dll/win32/qmgr/precomp.h b/dll/win32/qmgr/precomp.h new file mode 100644 index 0000000000..ee8a716beb --- /dev/null +++ b/dll/win32/qmgr/precomp.h @@ -0,0 +1,22 @@ + +#ifndef _QMGR_PRECOMP_H_ +#define _QMGR_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 <winsvc.h> +#include <objbase.h> + +#include <wine/debug.h> + +#include "qmgr.h" + +#endif /* !_QMGR_PRECOMP_H_ */ diff --git a/dll/win32/qmgr/qmgr.c b/dll/win32/qmgr/qmgr.c index f0c8462c54..110b87bf7f 100644 --- a/dll/win32/qmgr/qmgr.c +++ b/dll/win32/qmgr/qmgr.c @@ -19,6 +19,9 @@ */
#include "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
BackgroundCopyManagerImpl globalMgr;
diff --git a/dll/win32/qmgr/qmgr.h b/dll/win32/qmgr/qmgr.h index 4615e13cdd..2bc5b8b961 100644 --- a/dll/win32/qmgr/qmgr.h +++ b/dll/win32/qmgr/qmgr.h @@ -21,28 +21,17 @@ #ifndef __QMGR_H__ #define __QMGR_H__
-#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - +#include "windef.h" #define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <winsvc.h> -#include <objbase.h> -#include <bits1_5.h> -#include <bits2_0.h> -#include <bits2_5.h> -#include <bits3_0.h> - -#include <wine/list.h> -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +#include "bits.h" +#include "bits1_5.h" +#include "bits2_0.h" +#include "bits2_5.h" +#include "bits3_0.h" + +#include <string.h> +#include "wine/list.h" +#include "wine/unicode.h"
/* Background copy job vtbl and related data */ typedef struct diff --git a/dll/win32/qmgr/qmgr_main.c b/dll/win32/qmgr/qmgr_main.c index 7576e4a1c6..7bea214ed2 100644 --- a/dll/win32/qmgr/qmgr_main.c +++ b/dll/win32/qmgr/qmgr_main.c @@ -21,16 +21,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <stdio.h> + +#define COBJMACROS +#include "objbase.h" +#include "winuser.h" +#include "winreg.h" +#include "advpub.h" +#include "olectl.h" +#include "rpcproxy.h" +#include "winsvc.h" #include "qmgr.h"
-#include <stdio.h> +#include "wine/debug.h"
-#include <winuser.h> -#include <winreg.h> -#include <advpub.h> -#include <olectl.h> -#include <rpcproxy.h> -#include <initguid.h> +WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
/* Handle to the base address of this DLL */ static HINSTANCE hInst; diff --git a/dll/win32/qmgr/service.c b/dll/win32/qmgr/service.c index 43fc091b1b..e856408d8c 100644 --- a/dll/win32/qmgr/service.c +++ b/dll/win32/qmgr/service.c @@ -18,7 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "windef.h" +#include "winsvc.h" #include "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
HANDLE stop_event = NULL;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 32a7264789..037d653948 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -153,7 +153,7 @@ reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-3.3 reactos/dll/win32/propsys # Synced to WineStaging-3.3 reactos/dll/win32/pstorec # Synced to WineStaging-3.3 -reactos/dll/win32/qmgr # Synced to WineStaging-2.9 +reactos/dll/win32/qmgr # Synced to WineStaging-3.3 reactos/dll/win32/qmgrprxy # Synced to WineStaging-2.9 reactos/dll/win32/query # Synced to WineStaging-2.9 reactos/dll/win32/rasapi32 # Synced to WineStaging-2.9
-
Amine Khaldi