https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7a1924215b7d9e13430896543142801bc7924d9
commit c7a1924215b7d9e13430896543142801bc7924d9 Author: James Tabor <[email protected]> AuthorDate: Mon Aug 3 23:03:40 2020 -0500 Commit: James Tabor <[email protected]> CommitDate: Mon Aug 3 23:03:40 2020 -0500 [WinSpool] Fix RC Build II Fix rc build. --- win32ss/printing/base/winspool/precomp.h | 10 ++-------- win32ss/printing/base/winspool/winspool.rc | 4 +--- win32ss/printing/base/winspool/wspool.h | 30 ++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/win32ss/printing/base/winspool/precomp.h b/win32ss/printing/base/winspool/precomp.h index 05eb85098b2..267f07351c9 100644 --- a/win32ss/printing/base/winspool/precomp.h +++ b/win32ss/printing/base/winspool/precomp.h @@ -24,6 +24,8 @@ #include <spoolss.h> #include <marshalling/marshalling.h> +#include "wspool.h" + #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winspool); @@ -69,14 +71,6 @@ extern void RosConvertAnsiDevModeToUnicodeDevmode(PDEVMODEA pDevModeInput, PDEVM extern void RosConvertUnicodeDevModeToAnsiDevmode(PDEVMODEW pDevModeInput, PDEVMODEA pDevModeOutput); -// RC - -#define IDS_CAPTION 10 -#define IDS_FILE_EXISTS 11 -#define IDS_CANNOT_OPEN 12 -#define FILENAME_DIALOG 100 -#define EDITBOX 201 - // // [MS-EMF] 2.2.27 UniversalFontId Object // diff --git a/win32ss/printing/base/winspool/winspool.rc b/win32ss/printing/base/winspool/winspool.rc index bfd3e3462b5..fabdcb5aca4 100644 --- a/win32ss/printing/base/winspool/winspool.rc +++ b/win32ss/printing/base/winspool/winspool.rc @@ -1,5 +1,5 @@ -#include "precomp.h" +#include "wspool.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Spooler API" @@ -31,5 +31,3 @@ FONT 8, "MS Shell Dlg" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -/* @makedep: generic.ppd */ -/*1 PPDFILE generic.ppd*/ diff --git a/win32ss/printing/base/winspool/wspool.h b/win32ss/printing/base/winspool/wspool.h new file mode 100644 index 00000000000..cb652d56628 --- /dev/null +++ b/win32ss/printing/base/winspool/wspool.h @@ -0,0 +1,30 @@ +/****************************************************************************** + * winspool internal include file + * + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> +#include <winuser.h> + +#define IDS_CAPTION 10 +#define IDS_FILE_EXISTS 11 +#define IDS_CANNOT_OPEN 12 + +#define FILENAME_DIALOG 100 +#define EDITBOX 201
