mirror of
https://github.com/reactos/reactos.git
synced 2025-02-21 16:04:57 +00:00
[QMGR] Sync with Wine Staging 3.3. CORE-14434
This commit is contained in:
parent
80b69aa034
commit
017748ce69
12 changed files with 82 additions and 34 deletions
|
@ -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)
|
||||
|
|
|
@ -19,6 +19,9 @@
|
|||
*/
|
||||
|
||||
#include "qmgr.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
|
|
@ -19,6 +19,9 @@
|
|||
*/
|
||||
|
||||
#include "qmgr.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
|
|
@ -19,6 +19,9 @@
|
|||
*/
|
||||
|
||||
#include "qmgr.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
|
||||
|
||||
static ULONG WINAPI
|
||||
BITS_IClassFactory_AddRef(IClassFactory *iface)
|
||||
|
|
|
@ -18,10 +18,18 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "qmgr.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <urlmon.h>
|
||||
#include <winhttp.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"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
|
||||
|
||||
static inline BackgroundCopyFileImpl *impl_from_IBackgroundCopyFile2(
|
||||
IBackgroundCopyFile2 *iface)
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
22
dll/win32/qmgr/precomp.h
Normal file
22
dll/win32/qmgr/precomp.h
Normal file
|
@ -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_ */
|
|
@ -19,6 +19,9 @@
|
|||
*/
|
||||
|
||||
#include "qmgr.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
|
||||
|
||||
BackgroundCopyManagerImpl globalMgr;
|
||||
|
||||
|
|
|
@ -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 "bits.h"
|
||||
#include "bits1_5.h"
|
||||
#include "bits2_0.h"
|
||||
#include "bits2_5.h"
|
||||
#include "bits3_0.h"
|
||||
|
||||
#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 <string.h>
|
||||
#include "wine/list.h"
|
||||
#include "wine/unicode.h"
|
||||
|
||||
/* Background copy job vtbl and related data */
|
||||
typedef struct
|
||||
|
|
|
@ -21,16 +21,21 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "qmgr.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <winuser.h>
|
||||
#include <winreg.h>
|
||||
#include <advpub.h>
|
||||
#include <olectl.h>
|
||||
#include <rpcproxy.h>
|
||||
#include <initguid.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 "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(qmgr);
|
||||
|
||||
/* Handle to the base address of this DLL */
|
||||
static HINSTANCE hInst;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue