Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LOCALUI] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-25 12:47:19 +01:00
parent 88d3620955
commit 407c54bae3
4 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/doc/README.WINE
View file

@ -222,7 +222,7 @@ reactos/dll/win32/xmllite # Synced to WineStaging-3.3
reactos/dll/cpl/inetcpl # Synced to WineStaging-3.3 reactos/dll/cpl/inetcpl # Synced to WineStaging-3.3
reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-2.9 (known there as /dll/win32/localui) reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (known there as /dll/win32/localui)
ReactOS shares the following programs with Winehq. ReactOS shares the following programs with Winehq.

22
win32ss/printing/monitors/localmon/ui/localui.c
View file

@ -18,23 +18,19 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS
#include <stdarg.h> #include <stdarg.h>
#define NONAMELESSUNION #include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winreg.h"
#include "winuser.h"
#include <windef.h> #include "winspool.h"
#include <winbase.h> #include "ddk/winsplp.h"
#include <wingdi.h>
#include <winreg.h>
#include <winuser.h>
#include <winspool.h> #include "wine/debug.h"
#include <ddk/winsplp.h> #include "wine/unicode.h"
#include <wine/debug.h>
#include <wine/unicode.h>
#include "localui.h" #include "localui.h"
WINE_DEFAULT_DEBUG_CHANNEL(localui); WINE_DEFAULT_DEBUG_CHANNEL(localui);

4
win32ss/printing/monitors/localmon/ui/localui.h
View file

@ -21,8 +21,8 @@
#ifndef __WINE_LOCALUI__ #ifndef __WINE_LOCALUI__
#define __WINE_LOCALUI__ #define __WINE_LOCALUI__
//#include <windef.h> #include <windef.h>
//#include <winuser.h> #include <winuser.h>
/* ## Resource-ID ## */ /* ## Resource-ID ## */
#define ADDPORT_DIALOG 100 #define ADDPORT_DIALOG 100

3
win32ss/printing/monitors/localmon/ui/localui.rc
View file

@ -19,9 +19,6 @@
* *
*/ */
#include <windef.h>
#include <winuser.h>
#include "localui.h" #include "localui.h"
#define WINE_FILENAME_STR "localui.dll" #define WINE_FILENAME_STR "localui.dll"