Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61351: [UNIATA] * Use the proper debugging define.
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 15:11:00 2013 New Revision: 61351 URL: http://svn.reactos.org/svn/reactos?rev=61351&view=rev Log: [UNIATA] * Use the proper debugging define. Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Dec 23 15:11:00 2013 @@ -2236,7 +2236,7 @@ if(ChipFlags & UNIATA_AHCI) { KdPrint2((PRINT_PREFIX " AHCI path\n")); if(UniataAhciChanImplemented(deviceExtension, j)) { -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif AtapiDisableInterrupts(deviceExtension, j); @@ -4771,13 +4771,13 @@ statusByte |= IDE_STATUS_ERROR; } else { // We have only Overflow. Abort operation and continue -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif if(!UniataAhciAbortOperation(chan)) { KdPrint2((PRINT_PREFIX "need UniataAhciReset\n")); } -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif UniataAhciWaitCommandReady(chan, 10); @@ -4948,7 +4948,7 @@ if(deviceExtension->HwFlags & UNIATA_AHCI) { error = AtaReq->ahci.in_error; // wait ready -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif if(!UniataAhciAbortOperation(chan)) { @@ -4956,11 +4956,11 @@ } // clear interrupts again UniataAhciWaitCommandReady(chan, 10); -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif UniataAhciStatus(HwDeviceExtension, lChannel, DEVNUM_NOT_SPECIFIED); -#if DBG +#ifdef _DEBUG UniataDumpAhciPortRegs(chan); #endif } else {

1 0

[akhaldi] 61350: [SFC_OS] * We don't need a PCH (one source file).
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 15:08:58 2013 New Revision: 61350 URL: http://svn.reactos.org/svn/reactos?rev=61350&view=rev Log: [SFC_OS] * We don't need a PCH (one source file). Removed: trunk/reactos/dll/win32/sfc_os/precomp.h Modified: trunk/reactos/dll/win32/sfc_os/CMakeLists.txt trunk/reactos/dll/win32/sfc_os/sfc_os.c Modified: trunk/reactos/dll/win32/sfc_os/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/CMakeLists.txt [iso-8859-1] Mon Dec 23 15:08:58 2013 @@ -11,5 +11,4 @@ set_module_type(sfc_os win32dll) add_importlibs(sfc_os msvcrt kernel32 ntdll) -add_pch(sfc_os precomp.h) add_cd_file(TARGET sfc_os DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/sfc_os/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/precomp.h (removed) @@ -1,10 +0,0 @@ -#ifndef _PRECOMP_H__ -#define _PRECOMP_H__ - -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> - -#endif Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.c?… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] Mon Dec 23 15:08:58 2013 @@ -18,7 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#define WIN32_NO_STATUS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> + +#define NDEBUG #include <debug.h> HINSTANCE hLibModule; @@ -162,4 +170,4 @@ UNIMPLEMENTED; /* Always return success */ return 0; -} +}

1 0

[akhaldi] 61349: [CRTDLL] * Cleanup unused header inclusions.
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 15:07:40 2013 New Revision: 61349 URL: http://svn.reactos.org/svn/reactos?rev=61349&view=rev Log: [CRTDLL] * Cleanup unused header inclusions. Modified: trunk/reactos/dll/win32/crtdll/dllmain.c trunk/reactos/dll/win32/crtdll/precomp.h Modified: trunk/reactos/dll/win32/crtdll/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/crtdll/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/dllmain.c [iso-8859-1] Mon Dec 23 15:07:40 2013 @@ -16,12 +16,9 @@ */ #include "precomp.h" -//#include <locale.h> #include <mbctype.h> #include <sys/stat.h> #include <internal/wine/msvcrt.h> -//#include <internal/tls.h> - #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(crtdll); Modified: trunk/reactos/dll/win32/crtdll/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/crtdll/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/precomp.h [iso-8859-1] Mon Dec 23 15:07:40 2013 @@ -1,10 +1,7 @@ #ifndef _CRT_PRECOMP_H #define _CRT_PRECOMP_H -//#include <stdio.h> -//#include <windows.h> #include <stdarg.h> #include <internal/tls.h> -//#include <stdlib.h> #endif /* _CRT_PRECOMP_H */

1 0

[akhaldi] 61348: [USBSTOR] * Do not include debug.h into the main header. CORE-7716
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 14:50:17 2013 New Revision: 61348 URL: http://svn.reactos.org/svn/reactos?rev=61348&view=rev Log: [USBSTOR] * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/drivers/usb/usbstor/descriptor.c trunk/reactos/drivers/usb/usbstor/disk.c trunk/reactos/drivers/usb/usbstor/error.c trunk/reactos/drivers/usb/usbstor/fdo.c trunk/reactos/drivers/usb/usbstor/misc.c trunk/reactos/drivers/usb/usbstor/pdo.c trunk/reactos/drivers/usb/usbstor/queue.c trunk/reactos/drivers/usb/usbstor/scsi.c trunk/reactos/drivers/usb/usbstor/usbstor.c trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/usb/usbstor/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/descriptor.c [iso-8859-1] Mon Dec 23 14:50:17 2013 @@ -10,6 +10,9 @@ */ #include "usbstor.h" + +#define NDEBUG +#include <debug.h> NTSTATUS NTAPI Modified: trunk/reactos/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/disk.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/disk.c [iso-8859-1] Mon Dec 23 14:50:17 2013 @@ -10,6 +10,9 @@ */ #include "usbstor.h" + +#define NDEBUG +#include <debug.h> NTSTATUS USBSTOR_HandleInternalDeviceControl( Modified: trunk/reactos/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Mon Dec 23 14:50:17 2013 @@ -11,6 +11,9 @@ #include "usbstor.h" +#define NDEBUG +#include <debug.h> + NTSTATUS USBSTOR_GetEndpointStatus( IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] Mon Dec 23 14:50:17 2013 @@ -10,6 +10,9 @@ */ #include "usbstor.h" + +#define NDEBUG +#include <debug.h> VOID USBSTOR_DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) Modified: trunk/reactos/drivers/usb/usbstor/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/misc.c [iso-8859-1] Mon Dec 23 14:50:17 2013 @@ -10,6 +10,9 @@ */ #include "usbstor.h" + +#define NDEBUG +#include <debug.h> // // driver verifier Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Mon Dec 23 14:50:17 2013 @@ -10,6 +10,9 @@ */ #include "usbstor.h" + +#define NDEBUG +#include <debug.h> LPCSTR USBSTOR_GetDeviceType( Modified: trunk/reactos/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/queue.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/queue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/queue.c [iso-8859-1] Mon Dec 23 14:50:17 2013 @@ -11,6 +11,9 @@ #include "usbstor.h" +#define NDEBUG +#include <debug.h> + VOID USBSTOR_QueueInitialize( PFDO_DEVICE_EXTENSION FDODeviceExtension) Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Mon Dec 23 14:50:17 2013 @@ -10,6 +10,9 @@ */ #include "usbstor.h" + +#define NDEBUG +#include <debug.h> NTSTATUS USBSTOR_BuildCBW( Modified: trunk/reactos/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.c [iso-8859-1] Mon Dec 23 14:50:17 2013 @@ -10,9 +10,11 @@ /* INCLUDES ******************************************************************/ -#define NDEBUG #define INITGUID #include "usbstor.h" + +#define NDEBUG +#include <debug.h> /* PUBLIC AND PRIVATE FUNCTIONS **********************************************/ Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Mon Dec 23 14:50:17 2013 @@ -2,8 +2,6 @@ #pragma once #include <ntddk.h> -#define NDEBUG -#include <debug.h> #include <usbdi.h> #include <hubbusif.h> #include <usbbusif.h>

1 0

[akhaldi] 61347: [AVIFIL32] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Set...
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 14:44:50 2013 New Revision: 61347 URL: http://svn.reactos.org/svn/reactos?rev=61347&view=rev Log: [AVIFIL32] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 Added: trunk/reactos/dll/win32/avifil32/resource.h (with props) Modified: trunk/reactos/dll/win32/avifil32/acmstream.c trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/editstream.c trunk/reactos/dll/win32/avifil32/extrachunk.c trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/dll/win32/avifil32/icmstream.c trunk/reactos/dll/win32/avifil32/lang/avifile_Bg.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Cs.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Da.rc trunk/reactos/dll/win32/avifil32/lang/avifile_De.rc trunk/reactos/dll/win32/avifil32/lang/avifile_En.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Es.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Fr.rc trunk/reactos/dll/win32/avifil32/lang/avifile_He.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Hu.rc trunk/reactos/dll/win32/avifil32/lang/avifile_It.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Ja.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Lt.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Nl.rc trunk/reactos/dll/win32/avifil32/lang/avifile_No.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Pl.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Pt.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Ro.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Si.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Sv.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Uk.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Zh.rc trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/avifil32/tmpfile.c trunk/reactos/dll/win32/avifil32/wavfile.c Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/acmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/acmstream.c [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -16,27 +16,7 @@ * 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 <assert.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winerror.h" -//#include "mmsystem.h" -#include <vfw.h> -//#include "msacm.h" - -//#include "avifile_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); +#include "avifile_private.h" /***********************************************************************/ Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,35 +17,9 @@ * 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 <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winnls.h" -#include <wingdi.h> -//#include "winuser.h" +#include "avifile_private.h" + #include <winreg.h> -//#include "winerror.h" - -//#include "ole2.h" -//#include "shellapi.h" -//#include "shlobj.h" -#include <vfw.h> -//#include "msacm.h" - -#include "avifile_private.h" - -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); - /*********************************************************************** * for AVIBuildFilterW -- uses fixed size table Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -30,30 +30,7 @@ * When index is missing it works, but index seems to be okay. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#include <assert.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winnls.h" -//#include "winerror.h" -//#include "mmsystem.h" -#include <vfw.h> - #include "avifile_private.h" -#include "extrachunk.h" - -#include <wine/unicode.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); #ifndef IDX_PER_BLOCK #define IDX_PER_BLOCK 2730 Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -19,8 +19,29 @@ #ifndef __AVIFILE_PRIVATE_H #define __AVIFILE_PRIVATE_H -//#include "windef.h" -//#include "winuser.h" +#include <assert.h> +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <initguid.h> + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <vfw.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(avifile); + +#include "extrachunk.h" +#include "resource.h" #ifndef MAX_AVISTREAMS #define MAX_AVISTREAMS 8 @@ -35,22 +56,6 @@ #define DIBPTR(lp) ((LPBYTE)(lp) + (lp)->biSize + \ (lp)->biClrUsed * sizeof(RGBQUAD)) #endif - -#define IDD_SAVEOPTIONS 0x0100 -#define IDC_INTERLEAVE 0x0110 -#define IDC_INTERLEAVEEVERY 0x0111 -#define IDC_STREAM 0x0112 -#define IDC_OPTIONS 0x0113 -#define IDC_FORMATTEXT 0x0114 - -#define IDS_WAVESTREAMFORMAT 0x0100 -#define IDS_WAVEFILETYPE 0x0101 -#define IDS_ALLMULTIMEDIA 0x0184 -#define IDS_ALLFILES 0x0185 -#define IDS_VIDEO 0x0189 -#define IDS_AUDIO 0x0190 -#define IDS_AVIFILETYPE 0x0192 -#define IDS_UNCOMPRESSED 0x0193 DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0); DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0); Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr… ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -16,28 +16,7 @@ * 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 <assert.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <wingdi.h> -//#include "winerror.h" -//#include "mmsystem.h" -#include <vfw.h> - #include "avifile_private.h" -//#include "extrachunk.h" - -#include <wine/debug.h> -#include <initguid.h> - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/ Modified: trunk/reactos/dll/win32/avifil32/extrachunk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach… ============================================================================== --- trunk/reactos/dll/win32/avifil32/extrachunk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/extrachunk.c [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -16,21 +16,7 @@ * 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 <assert.h> - -#include "extrachunk.h" -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -#include <vfw.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); +#include "avifile_private.h" /* reads a chunk out of the extrachunk-structure */ HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lpData,LPLONG size) Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -16,29 +16,9 @@ * 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 <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winerror.h" -#include <ole2.h> +#include "avifile_private.h" + #include <rpcproxy.h> - -#include <initguid.h> -#include <vfw.h> -#include "avifile_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); HMODULE AVIFILE_hModule = NULL; Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram… ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -16,23 +16,7 @@ * 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 <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -#include <vfw.h> - #include "avifile_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); #ifndef DIBPTR #define DIBPTR(lp) ((LPBYTE)(lp) + (lp)->biSize + \ Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -16,26 +16,7 @@ * 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 <assert.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winerror.h" -//#include "mmsystem.h" -#include <vfw.h> - #include "avifile_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); #define MAX_FRAMESIZE (16 * 1024 * 1024) #define MAX_FRAMESIZE_DIFF 512 Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Bg.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Cs.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Da.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_De.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_En.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Es.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Fr.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_He.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -19,8 +19,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Hu.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_It.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Ja.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Ko.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Lt.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Nl.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_No.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Pl.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Pt.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Ro.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Si.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Sv.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -19,8 +19,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Uk.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… ============================================================================== --- trunk/reactos/dll/win32/avifil32/lang/avifile_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/lang/avifile_Zh.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -17,8 +17,6 @@ * 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 "avifile_private.h" LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL Added: trunk/reactos/dll/win32/avifil32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/resourc… ============================================================================== --- trunk/reactos/dll/win32/avifil32/resource.h (added) +++ trunk/reactos/dll/win32/avifil32/resource.h [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -0,0 +1,17 @@ +#pragma once + +#define IDD_SAVEOPTIONS 0x0100 +#define IDC_INTERLEAVE 0x0110 +#define IDC_INTERLEAVEEVERY 0x0111 +#define IDC_STREAM 0x0112 +#define IDC_OPTIONS 0x0113 +#define IDC_FORMATTEXT 0x0114 + +#define IDS_WAVESTREAMFORMAT 0x0100 +#define IDS_WAVEFILETYPE 0x0101 +#define IDS_ALLMULTIMEDIA 0x0184 +#define IDS_ALLFILES 0x0185 +#define IDS_VIDEO 0x0189 +#define IDS_AUDIO 0x0190 +#define IDS_AVIFILETYPE 0x0192 +#define IDS_UNCOMPRESSED 0x0193 Propchange: trunk/reactos/dll/win32/avifil32/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -21,7 +21,7 @@ #include <windef.h> #include <winuser.h> -//#include "avifile_private.h" +#include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -36,8 +36,7 @@ #define WINE_FILEVERSION_STR "4.03.1998" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" -#include "wine/wine_common_ver.rc" -//#include "avifile_private.h" +#include <wine/wine_common_ver.rc> /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/tmpfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/tmpfile.c [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -16,25 +16,7 @@ * 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 <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winerror.h" -#include <vfw.h> - -//#include "avifile_private.h" -//#include "extrachunk.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); +#include "avifile_private.h" /***********************************************************************/ Modified: trunk/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] Mon Dec 23 14:44:50 2013 @@ -16,30 +16,7 @@ * 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 <assert.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winnls.h" -//#include "winerror.h" -//#include "mmsystem.h" -#include <vfw.h> -//#include "msacm.h" - #include "avifile_private.h" -#include "extrachunk.h" - -#include <wine/unicode.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/

1 0

[akhaldi] 61346: [AUTHZ] * Do not include debug.h into the main header. CORE-7716
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 14:23:40 2013 New Revision: 61346 URL: http://svn.reactos.org/svn/reactos?rev=61346&view=rev Log: [AUTHZ] * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/dll/win32/authz/authz.c trunk/reactos/dll/win32/authz/clictx.c trunk/reactos/dll/win32/authz/precomp.h trunk/reactos/dll/win32/authz/resman.c Modified: trunk/reactos/dll/win32/authz/authz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/authz.c?re… ============================================================================== --- trunk/reactos/dll/win32/authz/authz.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/authz.c [iso-8859-1] Mon Dec 23 14:23:40 2013 @@ -25,7 +25,11 @@ * UPDATE HISTORY: * 09/30/2005 Created */ + #include "precomp.h" + +#define NDEBUG +#include <debug.h> HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/authz/clictx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/clictx.c?r… ============================================================================== --- trunk/reactos/dll/win32/authz/clictx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/clictx.c [iso-8859-1] Mon Dec 23 14:23:40 2013 @@ -25,8 +25,11 @@ * UPDATE HISTORY: * 10/07/2005 Created */ + #include "precomp.h" +#define NDEBUG +#include <debug.h> /* * @unimplemented Modified: trunk/reactos/dll/win32/authz/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/authz/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/precomp.h [iso-8859-1] Mon Dec 23 14:23:40 2013 @@ -12,7 +12,6 @@ #include <winbase.h> #include <authz.h> -#include <debug.h> #if DBG Modified: trunk/reactos/dll/win32/authz/resman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/resman.c?r… ============================================================================== --- trunk/reactos/dll/win32/authz/resman.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/resman.c [iso-8859-1] Mon Dec 23 14:23:40 2013 @@ -25,8 +25,11 @@ * UPDATE HISTORY: * 10/07/2005 Created */ + #include "precomp.h" +#define NDEBUG +#include <debug.h> static BOOL AuthzpQueryToken(IN OUT PAUTHZ_RESMAN ResMan,

1 0

[akhaldi] 61345: [ADVPACK] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in...
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 14:20:15 2013 New Revision: 61345 URL: http://svn.reactos.org/svn/reactos?rev=61345&view=rev Log: [ADVPACK] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/advpack/advpack.c trunk/reactos/dll/win32/advpack/advpack_private.h trunk/reactos/dll/win32/advpack/files.c trunk/reactos/dll/win32/advpack/install.c trunk/reactos/dll/win32/advpack/reg.c Modified: trunk/reactos/dll/win32/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] Mon Dec 23 14:20:15 2013 @@ -19,23 +19,7 @@ * 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 <winuser.h> -#include <winreg.h> -#include <winternl.h> -//#include "winnls.h" -//#include "setupapi.h" -#include <advpub.h> -#include <wine/unicode.h> -#include <wine/debug.h> #include "advpack_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(advpack); typedef HRESULT (WINAPI *DLLREGISTER) (void); Modified: trunk/reactos/dll/win32/advpack/advpack_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack_… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack_private.h [iso-8859-1] Mon Dec 23 14:20:15 2013 @@ -20,6 +20,24 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> +#include <winternl.h> +#include <advpub.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(advpack); HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Mon Dec 23 14:20:15 2013 @@ -18,25 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winreg.h> +#include "advpack_private.h" + #include <winver.h> -#include <winternl.h> -//#include "setupapi.h" -#include <advpub.h> #include <fdi.h> -#include <wine/debug.h> -#include <wine/unicode.h> -#include "advpack_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(advpack); /* converts an ansi double null-terminated list to a unicode list */ static LPWSTR ansi_to_unicode_list(LPCSTR ansi_list) Modified: trunk/reactos/dll/win32/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.… ============================================================================== --- trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] Mon Dec 23 14:20:15 2013 @@ -18,27 +18,9 @@ * 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 <stdarg.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winreg.h> -#include <winternl.h> -//#include "winnls.h" -//#include "setupapi.h" -#include <advpub.h> +#include "advpack_private.h" + #include <ole2.h> -#include <wine/debug.h> -#include <wine/unicode.h> -#include "advpack_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(advpack); #define SPAPI_ERROR 0xE0000000L #define SPAPI_PREFIX 0x800F0000L Modified: trunk/reactos/dll/win32/advpack/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/reg.c?re… ============================================================================== --- trunk/reactos/dll/win32/advpack/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/reg.c [iso-8859-1] Mon Dec 23 14:20:15 2013 @@ -18,20 +18,8 @@ * 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 <winreg.h> -//#include "winerror.h" -#include <winuser.h> -#include <winternl.h> -#include <advpub.h> -#include <wine/unicode.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(advpack); + +#include "advpack_private.h" static const WCHAR REGINST[] = {'R','E','G','I','N','S','T',0}; static const WCHAR Strings[] = {'S','t','r','i','n','g','s',0};

1 0

[akhaldi] 61344: [COMDLG32] * Skip itemdlg.c.
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 14:17:45 2013 New Revision: 61344 URL: http://svn.reactos.org/svn/reactos?rev=61344&view=rev Log: [COMDLG32] * Skip itemdlg.c. Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] Mon Dec 23 14:17:45 2013 @@ -14,7 +14,7 @@ filedlgbrowser.c finddlg.c fontdlg.c - itemdlg.c + #itemdlg.c /* Win 7 */ printdlg.c ${CMAKE_CURRENT_BINARY_DIR}/comdlg32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def)

1 0

[akhaldi] 61343: [COMDLG32] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Set...
by akhaldi＠svn.reactos.org 23 Dec '13

23 Dec '13

Author: akhaldi Date: Mon Dec 23 14:12:26 2013 New Revision: 61343 URL: http://svn.reactos.org/svn/reactos?rev=61343&view=rev Log: [COMDLG32] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 Added: trunk/reactos/dll/win32/comdlg32/resource.h (with props) Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h trunk/reactos/dll/win32/comdlg32/cdlg32.c trunk/reactos/dll/win32/comdlg32/cdlg_xx.rc trunk/reactos/dll/win32/comdlg32/colordlg.c trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlg31.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h trunk/reactos/dll/win32/comdlg32/finddlg.c trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/dll/win32/comdlg32/rsrc.rc Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg.h [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -21,7 +21,49 @@ #ifndef _WINE_DLL_CDLG_H #define _WINE_DLL_CDLG_H +#include <config.h> + +#include <stdarg.h> +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <winnls.h> +#include <wincon.h> +#include <winternl.h> +#include <commctrl.h> +#include <objbase.h> +#include <commdlg.h> +#include <shlobj.h> +#include <shellapi.h> #include <dlgs.h> +#include <cderr.h> + +// RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 +#include <winreg.h> + +#define NO_SHLWAPI_STREAM +#include <shlwapi.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +#include "filedlgbrowser.h" +#include "resource.h" /* Common dialogs implementation globals */ #define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ @@ -43,150 +85,6 @@ FINDREPLACEW *frw; } user_fr; } COMDLG32_FR_Data; - -#define PD32_PRINT_TITLE 7000 - -#define PD32_VALUE_UREADABLE 1104 -#define PD32_INVALID_PAGE_RANGE 1105 -#define PD32_FROM_NOT_ABOVE_TO 1106 -#define PD32_MARGINS_OVERLAP 1107 -#define PD32_NR_OF_COPIES_EMPTY 1108 -#define PD32_TOO_LARGE_COPIES 1109 -#define PD32_PRINT_ERROR 1110 -#define PD32_NO_DEFAULT_PRINTER 1111 -#define PD32_CANT_FIND_PRINTER 1112 -#define PD32_OUT_OF_MEMORY 1113 -#define PD32_GENERIC_ERROR 1114 -#define PD32_DRIVER_UNKNOWN 1115 -#define PD32_NO_DEVICES 1121 - -#define PD32_PRINTER_STATUS_READY 1536 -#define PD32_PRINTER_STATUS_PAUSED 1537 -#define PD32_PRINTER_STATUS_ERROR 1538 -#define PD32_PRINTER_STATUS_PENDING_DELETION 1539 -#define PD32_PRINTER_STATUS_PAPER_JAM 1540 -#define PD32_PRINTER_STATUS_PAPER_OUT 1541 -#define PD32_PRINTER_STATUS_MANUAL_FEED 1542 -#define PD32_PRINTER_STATUS_PAPER_PROBLEM 1543 -#define PD32_PRINTER_STATUS_OFFLINE 1544 -#define PD32_PRINTER_STATUS_IO_ACTIVE 1545 -#define PD32_PRINTER_STATUS_BUSY 1546 -#define PD32_PRINTER_STATUS_PRINTING 1547 -#define PD32_PRINTER_STATUS_OUTPUT_BIN_FULL 1548 -#define PD32_PRINTER_STATUS_NOT_AVAILABLE 1549 -#define PD32_PRINTER_STATUS_WAITING 1550 -#define PD32_PRINTER_STATUS_PROCESSING 1551 -#define PD32_PRINTER_STATUS_INITIALIZING 1552 -#define PD32_PRINTER_STATUS_WARMING_UP 1553 -#define PD32_PRINTER_STATUS_TONER_LOW 1554 -#define PD32_PRINTER_STATUS_NO_TONER 1555 -#define PD32_PRINTER_STATUS_PAGE_PUNT 1556 -#define PD32_PRINTER_STATUS_USER_INTERVENTION 1557 -#define PD32_PRINTER_STATUS_OUT_OF_MEMORY 1558 -#define PD32_PRINTER_STATUS_DOOR_OPEN 1559 -#define PD32_PRINTER_STATUS_SERVER_UNKNOWN 1560 -#define PD32_PRINTER_STATUS_POWER_SAVE 1561 - -#define PD32_DEFAULT_PRINTER 1582 -#define PD32_NR_OF_DOCUMENTS_IN_QUEUE 1583 - -#define PD32_MARGINS_IN_INCHES 1585 -#define PD32_MARGINS_IN_MILLIMETERS 1586 -#define PD32_MILLIMETERS 1587 - -/* Charset names string IDs */ - -#define IDS_CHARSET_ANSI 200 -#define IDS_CHARSET_SYMBOL 201 -#define IDS_CHARSET_JIS 202 -#define IDS_CHARSET_HANGUL 203 -#define IDS_CHARSET_GB2312 204 -#define IDS_CHARSET_BIG5 205 -#define IDS_CHARSET_GREEK 206 -#define IDS_CHARSET_TURKISH 207 -#define IDS_CHARSET_HEBREW 208 -#define IDS_CHARSET_ARABIC 209 -#define IDS_CHARSET_BALTIC 210 -#define IDS_CHARSET_VIETNAMESE 211 -#define IDS_CHARSET_RUSSIAN 212 -#define IDS_CHARSET_EE 213 -#define IDS_CHARSET_THAI 214 -#define IDS_CHARSET_JOHAB 215 -#define IDS_CHARSET_MAC 216 -#define IDS_CHARSET_OEM 217 -#define IDS_CHARSET_VISCII 218 -#define IDS_CHARSET_TCVN 219 -#define IDS_CHARSET_KOI8 220 -#define IDS_CHARSET_ISO3 221 -#define IDS_CHARSET_ISO4 222 -#define IDS_CHARSET_ISO10 223 -#define IDS_CHARSET_CELTIC 224 - -/* Font styles */ - -#define IDS_FONT_REGULAR 256 -#define IDS_FONT_BOLD 257 -#define IDS_FONT_ITALIC 258 -#define IDS_FONT_BOLD_ITALIC 259 - -/* Color names string IDs */ - -#define IDS_COLOR_BLACK 1040 -#define IDS_COLOR_MAROON 1041 -#define IDS_COLOR_GREEN 1042 -#define IDS_COLOR_OLIVE 1043 -#define IDS_COLOR_NAVY 1044 -#define IDS_COLOR_PURPLE 1045 -#define IDS_COLOR_TEAL 1046 -#define IDS_COLOR_GRAY 1047 -#define IDS_COLOR_SILVER 1048 -#define IDS_COLOR_RED 1049 -#define IDS_COLOR_LIME 1050 -#define IDS_COLOR_YELLOW 1051 -#define IDS_COLOR_BLUE 1052 -#define IDS_COLOR_FUCHSIA 1053 -#define IDS_COLOR_AQUA 1054 -#define IDS_COLOR_WHITE 1055 - -/* Color dialog controls */ -#define IDC_COLOR_LUMBAR 702 -#define IDC_COLOR_EDIT_H 703 -#define IDC_COLOR_EDIT_S 704 -#define IDC_COLOR_EDIT_L 705 -#define IDC_COLOR_EDIT_R 706 -#define IDC_COLOR_EDIT_G 707 -#define IDC_COLOR_EDIT_B 708 -#define IDC_COLOR_RESULT 709 -#define IDC_COLOR_GRAPH 710 -#define IDC_COLOR_ADD 712 -#define IDC_COLOR_RES 713 -#define IDC_COLOR_DEFINE 719 -#define IDC_COLOR_PREDEF 720 -#define IDC_COLOR_USRDEF 721 -#define IDC_COLOR_HL 723 -#define IDC_COLOR_SL 724 -#define IDC_COLOR_LL 725 -#define IDC_COLOR_RL 726 -#define IDC_COLOR_GL 727 -#define IDC_COLOR_BL 728 - -#define IDS_FONT_SIZE 1200 -#define IDS_SAVE_BUTTON 1201 -#define IDS_SAVE_IN 1202 -#define IDS_SAVE 1203 -#define IDS_SAVE_AS 1204 -#define IDS_OPEN_FILE 1205 - -#define IDS_FAKEDOCTEXT 1300 - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "shlobj.h" -#include "shellapi.h" /* Constructors */ HRESULT FileOpenDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/comdlg32/cdlg32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg32.… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg32.c [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -19,27 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include "winbase.h" -#include <winuser.h> -#include <wingdi.h> -#include <objbase.h> -#include "rpcproxy.h" -#include <commdlg.h> -#include <cderr.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - #include "cdlg.h" - DECLSPEC_HIDDEN HINSTANCE COMDLG32_hInstance = 0; Modified: trunk/reactos/dll/win32/comdlg32/cdlg_xx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_xx… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_xx.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_xx.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "cdlg.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Common Dialog Boxes" @@ -28,7 +26,7 @@ #define WINE_FILEVERSION 4,0,0,950 /* Maybe 4.1.0.980 for win98?? */ #define WINE_FILEVERSION_STR "4.0" -#include "wine/wine_common_ver.rc" +#include <wine/wine_common_ver.rc> /* Translators do not need to translate this text, unless the language uses a * different character set or if the distribution of characters looks wrong. Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/colordlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/colordlg.c [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -23,24 +23,7 @@ sometimes, especially when 2 instances of the dialog are loaded at the same time */ -#define WIN32_NO_STATUS - -//#include <ctype.h> -//#include <stdlib.h> -//#include <stdarg.h> -#include <stdio.h> -//#include <string.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <commdlg.h> -#include <dlgs.h> -#include <wine/debug.h> -#include <cderr.h> #include "cdlg.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); static INT_PTR CALLBACK ColorDlgProc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -45,45 +45,7 @@ * */ -// RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 - -#define WIN32_NO_STATUS - -#include <config.h> -//#include "wine/port.h" - -//#include <ctype.h> -//#include <stdlib.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <winternl.h> -//#include "winnls.h" -#include <winreg.h> -#include <wingdi.h> -#include <winuser.h> -#include <commdlg.h> -#include <dlgs.h> #include "cdlg.h" -#include <cderr.h> -//#include "shellapi.h" -//#include "shlobj.h" -#include "filedlgbrowser.h" -#include <shlwapi.h> - -#include <wine/unicode.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #define UNIMPLEMENTED_FLAGS \ (OFN_DONTADDTORECENT |\ Modified: trunk/reactos/dll/win32/comdlg32/filedlg31.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg31.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg31.c [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,25 +18,6 @@ * 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 <ctype.h> -//#include <stdlib.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> -#include <windef.h> -//#include "winbase.h" -//#include "winnls.h" -#include <wingdi.h> -#include <winuser.h> -#include <wine/unicode.h> -#include <wine/debug.h> -#include <winreg.h> -#include <winternl.h> -#include <commdlg.h> -#include <shlwapi.h> -//#include "cderr.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -19,35 +19,7 @@ * 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 <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winnls.h" -#include <wingdi.h> -#include <winuser.h> -#include <winreg.h> -#include <commdlg.h> - -#define NO_SHLWAPI_STREAM -#include <shlwapi.h> -#include <filedlgbrowser.h> #include "cdlg.h" -//#include "shlguid.h" -//#include "servprov.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); typedef struct { Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -21,22 +21,6 @@ #ifndef SHBROWSER_H #define SHBROWSER_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 "winuser.h" -#include "wincon.h" -#include <shlobj.h> -//#include "objbase.h" -//#include "commdlg.h" /*********************************************************************** * Defines and global variables Modified: trunk/reactos/dll/win32/comdlg32/finddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/finddlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/finddlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/finddlg.c [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -19,24 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> -//#include <string.h> -#include <windef.h> -#include <winbase.h> -//#include "winnls.h" -#include <winuser.h> -#include <wingdi.h> -#include <commdlg.h> -#include <cderr.h> -#include <dlgs.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - #include "cdlg.h" - /*-----------------------------------------------------------------------*/ Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/fontdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/fontdlg.c [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -19,25 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -//#include <ctype.h> -//#include <stdlib.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> -#include <windef.h> -#include "winbase.h" -//#include "winnls.h" -#include <wingdi.h> -#include <winuser.h> -#include <commdlg.h> -#include <dlgs.h> -#include <wine/debug.h> -#include <cderr.h> #include "cdlg.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); typedef struct { Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_GREEK, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_THAI, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -20,9 +20,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,9 +18,6 @@ * 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 "cdlg.h" -#include "filedlgbrowser.h" LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -21,35 +21,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -//#include <ctype.h> -//#include <stdlib.h> -//#include <stdarg.h> -#include <stdio.h> -//#include <string.h> + +#include "cdlg.h" #include <assert.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> #include <winspool.h> -//#include "winerror.h" -#include <objbase.h> -#include <commdlg.h> - -#include <wine/unicode.h> -#include <wine/debug.h> - -//#include "dlgs.h" -#include <cderr.h> -#include "cdlg.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); /* Yes these constants are the same, but we're just copying win98 */ #define UPDOWN_ID 0x270f Added: trunk/reactos/dll/win32/comdlg32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/resourc… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/resource.h (added) +++ trunk/reactos/dll/win32/comdlg32/resource.h [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -0,0 +1,136 @@ +#pragma once + +#define PD32_PRINT_TITLE 7000 + +#define PD32_VALUE_UREADABLE 1104 +#define PD32_INVALID_PAGE_RANGE 1105 +#define PD32_FROM_NOT_ABOVE_TO 1106 +#define PD32_MARGINS_OVERLAP 1107 +#define PD32_NR_OF_COPIES_EMPTY 1108 +#define PD32_TOO_LARGE_COPIES 1109 +#define PD32_PRINT_ERROR 1110 +#define PD32_NO_DEFAULT_PRINTER 1111 +#define PD32_CANT_FIND_PRINTER 1112 +#define PD32_OUT_OF_MEMORY 1113 +#define PD32_GENERIC_ERROR 1114 +#define PD32_DRIVER_UNKNOWN 1115 +#define PD32_NO_DEVICES 1121 + +#define PD32_PRINTER_STATUS_READY 1536 +#define PD32_PRINTER_STATUS_PAUSED 1537 +#define PD32_PRINTER_STATUS_ERROR 1538 +#define PD32_PRINTER_STATUS_PENDING_DELETION 1539 +#define PD32_PRINTER_STATUS_PAPER_JAM 1540 +#define PD32_PRINTER_STATUS_PAPER_OUT 1541 +#define PD32_PRINTER_STATUS_MANUAL_FEED 1542 +#define PD32_PRINTER_STATUS_PAPER_PROBLEM 1543 +#define PD32_PRINTER_STATUS_OFFLINE 1544 +#define PD32_PRINTER_STATUS_IO_ACTIVE 1545 +#define PD32_PRINTER_STATUS_BUSY 1546 +#define PD32_PRINTER_STATUS_PRINTING 1547 +#define PD32_PRINTER_STATUS_OUTPUT_BIN_FULL 1548 +#define PD32_PRINTER_STATUS_NOT_AVAILABLE 1549 +#define PD32_PRINTER_STATUS_WAITING 1550 +#define PD32_PRINTER_STATUS_PROCESSING 1551 +#define PD32_PRINTER_STATUS_INITIALIZING 1552 +#define PD32_PRINTER_STATUS_WARMING_UP 1553 +#define PD32_PRINTER_STATUS_TONER_LOW 1554 +#define PD32_PRINTER_STATUS_NO_TONER 1555 +#define PD32_PRINTER_STATUS_PAGE_PUNT 1556 +#define PD32_PRINTER_STATUS_USER_INTERVENTION 1557 +#define PD32_PRINTER_STATUS_OUT_OF_MEMORY 1558 +#define PD32_PRINTER_STATUS_DOOR_OPEN 1559 +#define PD32_PRINTER_STATUS_SERVER_UNKNOWN 1560 +#define PD32_PRINTER_STATUS_POWER_SAVE 1561 + +#define PD32_DEFAULT_PRINTER 1582 +#define PD32_NR_OF_DOCUMENTS_IN_QUEUE 1583 + +#define PD32_MARGINS_IN_INCHES 1585 +#define PD32_MARGINS_IN_MILLIMETERS 1586 +#define PD32_MILLIMETERS 1587 + +/* Charset names string IDs */ + +#define IDS_CHARSET_ANSI 200 +#define IDS_CHARSET_SYMBOL 201 +#define IDS_CHARSET_JIS 202 +#define IDS_CHARSET_HANGUL 203 +#define IDS_CHARSET_GB2312 204 +#define IDS_CHARSET_BIG5 205 +#define IDS_CHARSET_GREEK 206 +#define IDS_CHARSET_TURKISH 207 +#define IDS_CHARSET_HEBREW 208 +#define IDS_CHARSET_ARABIC 209 +#define IDS_CHARSET_BALTIC 210 +#define IDS_CHARSET_VIETNAMESE 211 +#define IDS_CHARSET_RUSSIAN 212 +#define IDS_CHARSET_EE 213 +#define IDS_CHARSET_THAI 214 +#define IDS_CHARSET_JOHAB 215 +#define IDS_CHARSET_MAC 216 +#define IDS_CHARSET_OEM 217 +#define IDS_CHARSET_VISCII 218 +#define IDS_CHARSET_TCVN 219 +#define IDS_CHARSET_KOI8 220 +#define IDS_CHARSET_ISO3 221 +#define IDS_CHARSET_ISO4 222 +#define IDS_CHARSET_ISO10 223 +#define IDS_CHARSET_CELTIC 224 + +/* Font styles */ + +#define IDS_FONT_REGULAR 256 +#define IDS_FONT_BOLD 257 +#define IDS_FONT_ITALIC 258 +#define IDS_FONT_BOLD_ITALIC 259 + +/* Color names string IDs */ + +#define IDS_COLOR_BLACK 1040 +#define IDS_COLOR_MAROON 1041 +#define IDS_COLOR_GREEN 1042 +#define IDS_COLOR_OLIVE 1043 +#define IDS_COLOR_NAVY 1044 +#define IDS_COLOR_PURPLE 1045 +#define IDS_COLOR_TEAL 1046 +#define IDS_COLOR_GRAY 1047 +#define IDS_COLOR_SILVER 1048 +#define IDS_COLOR_RED 1049 +#define IDS_COLOR_LIME 1050 +#define IDS_COLOR_YELLOW 1051 +#define IDS_COLOR_BLUE 1052 +#define IDS_COLOR_FUCHSIA 1053 +#define IDS_COLOR_AQUA 1054 +#define IDS_COLOR_WHITE 1055 + +/* Color dialog controls */ +#define IDC_COLOR_LUMBAR 702 +#define IDC_COLOR_EDIT_H 703 +#define IDC_COLOR_EDIT_S 704 +#define IDC_COLOR_EDIT_L 705 +#define IDC_COLOR_EDIT_R 706 +#define IDC_COLOR_EDIT_G 707 +#define IDC_COLOR_EDIT_B 708 +#define IDC_COLOR_RESULT 709 +#define IDC_COLOR_GRAPH 710 +#define IDC_COLOR_ADD 712 +#define IDC_COLOR_RES 713 +#define IDC_COLOR_DEFINE 719 +#define IDC_COLOR_PREDEF 720 +#define IDC_COLOR_USRDEF 721 +#define IDC_COLOR_HL 723 +#define IDC_COLOR_SL 724 +#define IDC_COLOR_LL 725 +#define IDC_COLOR_RL 726 +#define IDC_COLOR_GL 727 +#define IDC_COLOR_BL 728 + +#define IDS_FONT_SIZE 1200 +#define IDS_SAVE_BUTTON 1201 +#define IDS_SAVE_IN 1202 +#define IDS_SAVE 1203 +#define IDS_SAVE_AS 1204 +#define IDS_OPEN_FILE 1205 + +#define IDS_FAKEDOCTEXT 1300 Propchange: trunk/reactos/dll/win32/comdlg32/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/rsrc.rc [iso-8859-1] Mon Dec 23 14:12:26 2013 @@ -18,13 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "cdlg.h" -//#include "winspool.h" -//#include "filedlgbrowser.h" +#include <windef.h> +#include <winuser.h> +#include <dlgs.h> + +#include "filedlgbrowser.h" +#include "resource.h" /* * Everything that does not depend on language,

1 0

[akhaldi] 61342: [PSAPI] * This module doesn't need a PCH (one source file). CORE-7716
by akhaldi＠svn.reactos.org 22 Dec '13

22 Dec '13

Author: akhaldi Date: Sun Dec 22 19:06:31 2013 New Revision: 61342 URL: http://svn.reactos.org/svn/reactos?rev=61342&view=rev Log: [PSAPI] * This module doesn't need a PCH (one source file). CORE-7716 Removed: trunk/reactos/dll/win32/psapi/precomp.h Modified: trunk/reactos/dll/win32/psapi/CMakeLists.txt trunk/reactos/dll/win32/psapi/psapi.c Modified: trunk/reactos/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/psapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/CMakeLists.txt [iso-8859-1] Sun Dec 22 19:06:31 2013 @@ -12,5 +12,4 @@ target_link_libraries(psapi ${PSEH_LIB}) add_importlibs(psapi msvcrt kernel32 ntdll) -add_pch(psapi precomp.h) add_cd_file(TARGET psapi DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/psapi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/psapi/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/precomp.h (removed) @@ -1,14 +0,0 @@ -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#define NTOS_MODE_USER -#include <ndk/exfuncs.h> -#include <ndk/mmfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/rtlfuncs.h> - -#include <psapi.h> - -#include <pseh/pseh2.h> Modified: trunk/reactos/dll/win32/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.c?re… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] Sun Dec 22 19:06:31 2013 @@ -11,7 +11,21 @@ * 10/06/2002: Created */ -#include "precomp.h" +#include <stdarg.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#define NTOS_MODE_USER +#include <ndk/exfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> + +#include <psapi.h> + +#include <pseh/pseh2.h> #define NDEBUG #include <debug.h>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs