Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[akhaldi] 61349: [CRTDLL] * Cleanup unused header inclusions.

by akhaldi＠svn.reactos.org

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 */

10 years, 10 months

[akhaldi] 61348: [USBSTOR] * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

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>

10 years, 10 months

[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

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); /***********************************************************************/

10 years, 10 months

[akhaldi] 61346: [AUTHZ] * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

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,

10 years, 10 months

[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

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};

10 years, 10 months

[akhaldi] 61344: [COMDLG32] * Skip itemdlg.c.

by akhaldi＠svn.reactos.org

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)

10 years, 10 months

[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

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,

10 years, 10 months

[akhaldi] 61342: [PSAPI] * This module doesn't need a PCH (one source file). CORE-7716

by akhaldi＠svn.reactos.org

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>

10 years, 10 months

[akhaldi] 61341: [COMCTL32] * 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. * Rem...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 22 19:02:59 2013 New Revision: 61341 URL: http://svn.reactos.org/svn/reactos?rev=61341&view=rev Log: [COMCTL32] * 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. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Added: trunk/reactos/dll/win32/comctl32/resource.h (with props) Modified: trunk/reactos/dll/win32/comctl32/animate.c trunk/reactos/dll/win32/comctl32/comboex.c trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/draglist.c trunk/reactos/dll/win32/comctl32/dsa.c trunk/reactos/dll/win32/comctl32/flatsb.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/hotkey.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/nativefont.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comctl32/smoothscroll.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/string.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/theme_button.c trunk/reactos/dll/win32/comctl32/theme_combo.c trunk/reactos/dll/win32/comctl32/theme_dialog.c trunk/reactos/dll/win32/comctl32/theme_edit.c trunk/reactos/dll/win32/comctl32/theme_listbox.c trunk/reactos/dll/win32/comctl32/theming.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c Modified: trunk/reactos/dll/win32/comctl32/animate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/animate… ============================================================================== --- trunk/reactos/dll/win32/comctl32/animate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/animate.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -33,22 +33,9 @@ * - check for the 'rec ' list in some AVI files */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <string.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -#include <winnls.h> -//#include "commctrl.h" +#include "comctl32.h" + #include <vfw.h> -//#include "mmsystem.h" -#include "comctl32.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(animate); Modified: trunk/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comboex… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comboex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comboex.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -30,17 +30,7 @@ * */ -//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/debug.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(comboex); Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -24,84 +24,35 @@ #ifndef __WINE_COMCTL32_H #define __WINE_COMCTL32_H -#define WIN32_NO_STATUS +#include <config.h> + +#include <stdarg.h> +#include <assert.h> + #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#ifndef RC_INVOKED -#include <stdarg.h> -#endif +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#define COBJMACROS #include <windef.h> #include <winbase.h> #include <wingdi.h> #include <winuser.h> -//#include "winnls.h" +#include <winreg.h> #include <commctrl.h> +#include <uxtheme.h> +#include <vssym32.h> + +#include <wine/unicode.h> +#include <wine/debug.h> + +#include "resource.h" extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; - -/* Property sheet / Wizard */ -#define IDD_PROPSHEET 1006 -#define IDD_WIZARD 1020 - -#define IDC_TABCONTROL 12320 -#define IDC_APPLY_BUTTON 12321 -#define IDC_BACK_BUTTON 12323 -#define IDC_NEXT_BUTTON 12324 -#define IDC_FINISH_BUTTON 12325 -#define IDC_SUNKEN_LINE 12326 -#define IDC_SUNKEN_LINEHEADER 12327 - -#define IDS_CLOSE 4160 - -/* Toolbar customization dialog */ -#define IDD_TBCUSTOMIZE 200 - -#define IDC_AVAILBTN_LBOX 201 -#define IDC_RESET_BTN 202 -#define IDC_TOOLBARBTN_LBOX 203 -#define IDC_REMOVE_BTN 204 -#define IDC_HELP_BTN 205 -#define IDC_MOVEUP_BTN 206 -#define IDC_MOVEDN_BTN 207 - -#define IDS_SEPARATOR 1024 - -/* Toolbar imagelist bitmaps */ -#define IDB_STD_SMALL 120 -#define IDB_STD_LARGE 121 -#define IDB_VIEW_SMALL 124 -#define IDB_VIEW_LARGE 125 -#define IDB_HIST_SMALL 130 -#define IDB_HIST_LARGE 131 - -#define IDM_TODAY 4163 -#define IDM_GOTODAY 4164 - -/* Treeview Checkboxes */ - -#define IDT_CHECK 401 - - -/* Cursors */ -#define IDC_MOVEBUTTON 102 -#define IDC_COPY 104 -#define IDC_DIVIDER 106 -#define IDC_DIVIDEROPEN 107 - - -/* DragList resources */ -#define IDI_DRAGARROW 501 - -/* HOTKEY internal strings */ -#define HKY_NONE 2048 - -/* Tooltip icons */ -#define IDI_TT_INFO_SM 22 -#define IDI_TT_WARN_SM 25 -#define IDI_TT_ERROR_SM 28 typedef struct { @@ -137,8 +88,6 @@ INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN; BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN; - -#define COMCTL32_VERSION_MINOR 81 /* Our internal stack structure of the window procedures to subclass */ typedef struct _SUBCLASSPROCS { Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32undoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32undoc.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -26,36 +26,8 @@ * COMCTL32.DLL (internally). * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <string.h> -//#include <ctype.h> -//#include <limits.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -#include <winreg.h> -//#include "commctrl.h" -//#include "objbase.h" -//#include "winerror.h" - -#include <wine/unicode.h> + #include "comctl32.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(commctrl); Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -52,26 +52,10 @@ * -- ICC_WIN95_CLASSES */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" -#include <winnls.h> -//#include "commctrl.h" -//#include "winerror.h" -#include <winreg.h> +#include "comctl32.h" + #define NO_SHLWAPI_STREAM #include <shlwapi.h> -#include "comctl32.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(commctrl); Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim… ============================================================================== --- trunk/reactos/dll/win32/comctl32/datetime.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/datetime.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -40,20 +40,8 @@ */ #include <math.h> -//#include <string.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <limits.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" + #include "comctl32.h" -#include <wine/debug.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(datetime); Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/dpa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/dpa.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -29,23 +29,9 @@ * http://members.ozemail.com.au/~geoffch/samples/win32/shell/comctl32 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> -//#include <limits.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "commctrl.h" +#include "comctl32.h" + #include <objbase.h> - -#include "comctl32.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(dpa); Modified: trunk/reactos/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/draglis… ============================================================================== --- trunk/reactos/dll/win32/comctl32/draglist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/draglist.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -29,16 +29,7 @@ * */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(commctrl); Modified: trunk/reactos/dll/win32/comctl32/dsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dsa.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/dsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/dsa.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -29,15 +29,7 @@ * http://members.ozemail.com.au/~geoffch/samples/win32/shell/comctl32 */ -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <commctrl.h> - #include "comctl32.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(dsa); Modified: trunk/reactos/dll/win32/comctl32/flatsb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/flatsb.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/flatsb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/flatsb.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -29,15 +29,7 @@ * */ -#include <stdarg.h> -#include <string.h> -#include <windef.h> -#include <winbase.h> -#include <winerror.h> -#include <winuser.h> -#include <commctrl.h> #include "comctl32.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(commctrl); Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -27,25 +27,7 @@ * - New Windows Vista features */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <stdarg.h> -#include <stdlib.h> -//#include <string.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wine/unicode.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <vssym32.h> -#include <uxtheme.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(header); Modified: trunk/reactos/dll/win32/comctl32/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/hotkey.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/hotkey.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -28,16 +28,7 @@ * */ -//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(hotkey); Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -37,26 +37,10 @@ * - Thread-safe locking */ -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> -//#include <stdlib.h> -//#include <string.h> - -#define COBJMACROS - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> +#include "comctl32.h" + #include <objbase.h> -//#include "wingdi.h" -#include <winnls.h> -//#include "winuser.h" -//#include "commctrl.h" -#include "comctl32.h" #include <commoncontrols.h> -#include <wine/debug.h> #include <wine/exception.h> WINE_DEFAULT_DEBUG_CHANNEL(imagelist); Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddre… ============================================================================== --- trunk/reactos/dll/win32/comctl32/ipaddress.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/ipaddress.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -32,21 +32,7 @@ * */ -//#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 "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ipaddress); Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -134,28 +134,9 @@ * -- LVGroupComparE */ -#include <config.h> -//#include "wine/port.h" - -#include <assert.h> -//#include <ctype.h> -//#include <string.h> -//#include <stdlib.h> -//#include <stdarg.h> #include <stdio.h> -//#include "windef.h" -//#include "winbase.h" -//#include "winnt.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> - -#include <wine/debug.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(listview); Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -39,23 +39,7 @@ * -- search for FIXME */ -//#include <math.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(monthcal); Modified: trunk/reactos/dll/win32/comctl32/nativefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/nativef… ============================================================================== --- trunk/reactos/dll/win32/comctl32/nativefont.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/nativefont.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -27,15 +27,7 @@ * - All notifications. */ -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> #include "comctl32.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(nativefont); Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/pager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/pager.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -52,16 +52,7 @@ * Robert Shearman <rob(a)codeweavers.com> */ -//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(pager); Modified: trunk/reactos/dll/win32/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/progres… ============================================================================== --- trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -34,18 +34,7 @@ * */ -//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(progress); Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -52,23 +52,7 @@ * o PSP_USEREFPARENT */ -//#include <stdarg.h> -//#include <string.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" -//#include "prsht.h" #include "comctl32.h" -#include <uxtheme.h> - -#include <wine/debug.h> -#include <wine/unicode.h> /****************************************************************************** * Data structures Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -77,22 +77,7 @@ * at least RB_INSERTBAND */ -#include <assert.h> -//#include <stdarg.h> -#include <stdlib.h> -//#include <string.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "wine/unicode.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(rebar); Added: trunk/reactos/dll/win32/comctl32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/resourc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/resource.h (added) +++ trunk/reactos/dll/win32/comctl32/resource.h [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -0,0 +1,62 @@ +#pragma once + +/* Property sheet / Wizard */ +#define IDD_PROPSHEET 1006 +#define IDD_WIZARD 1020 + +#define IDC_TABCONTROL 12320 +#define IDC_APPLY_BUTTON 12321 +#define IDC_BACK_BUTTON 12323 +#define IDC_NEXT_BUTTON 12324 +#define IDC_FINISH_BUTTON 12325 +#define IDC_SUNKEN_LINE 12326 +#define IDC_SUNKEN_LINEHEADER 12327 + +#define IDS_CLOSE 4160 + +/* Toolbar customization dialog */ +#define IDD_TBCUSTOMIZE 200 + +#define IDC_AVAILBTN_LBOX 201 +#define IDC_RESET_BTN 202 +#define IDC_TOOLBARBTN_LBOX 203 +#define IDC_REMOVE_BTN 204 +#define IDC_HELP_BTN 205 +#define IDC_MOVEUP_BTN 206 +#define IDC_MOVEDN_BTN 207 + +#define IDS_SEPARATOR 1024 + +/* Toolbar imagelist bitmaps */ +#define IDB_STD_SMALL 120 +#define IDB_STD_LARGE 121 +#define IDB_VIEW_SMALL 124 +#define IDB_VIEW_LARGE 125 +#define IDB_HIST_SMALL 130 +#define IDB_HIST_LARGE 131 + +#define IDM_TODAY 4163 +#define IDM_GOTODAY 4164 + +/* Treeview Checkboxes */ + +#define IDT_CHECK 401 + +/* Cursors */ +#define IDC_MOVEBUTTON 102 +#define IDC_COPY 104 +#define IDC_DIVIDER 106 +#define IDC_DIVIDEROPEN 107 + +/* DragList resources */ +#define IDI_DRAGARROW 501 + +/* HOTKEY internal strings */ +#define HKY_NONE 2048 + +/* Tooltip icons */ +#define IDI_TT_INFO_SM 22 +#define IDI_TT_WARN_SM 25 +#define IDI_TT_ERROR_SM 28 + +#define COMCTL32_VERSION_MINOR 81 Propchange: trunk/reactos/dll/win32/comctl32/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,11 +19,11 @@ * 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 "comctl32.h" +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + +#include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/comctl32/smoothscroll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/smooths… ============================================================================== --- trunk/reactos/dll/win32/comctl32/smoothscroll.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/smoothscroll.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -21,14 +21,7 @@ * - actually add smooth scrolling */ -#include <stdarg.h> - -#include <windef.h> -//#include "winbase.h" -#include <winreg.h> -//#include "winerror.h" -#include <winuser.h> -#include <wine/debug.h> +#include "comctl32.h" WINE_DEFAULT_DEBUG_CHANNEL(commctrl); Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/status.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/status.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -40,20 +40,7 @@ * -- CCS_VERT (defaults to RIGHT) */ -#include <stdarg.h> -#include <string.h> - -#include <windef.h> -#include <winbase.h> -#include <wine/unicode.h> -#include <wingdi.h> -#include <winuser.h> -#include <winnls.h> -#include <commctrl.h> #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(statusbar); Modified: trunk/reactos/dll/win32/comctl32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/string.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/string.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -22,23 +22,7 @@ * */ -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> /* atoi */ - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winnls.h" - #include "comctl32.h" - -#include <wine/unicode.h> - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(commctrl); Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink… ============================================================================== --- trunk/reactos/dll/win32/comctl32/syslink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/syslink.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -27,17 +27,7 @@ * If you discover missing features, or bugs, please note them below. */ -//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(syslink); Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tab.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -52,21 +52,7 @@ * */ -#include <assert.h> -//#include <stdarg.h> -//#include <string.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h> -//#include <math.h> WINE_DEFAULT_DEBUG_CHANNEL(tab); Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,16 +19,6 @@ * */ -#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <uxtheme.h> -#include <vssym32.h> #include "comctl32.h" #define BUTTON_TYPE 0x0f /* bit mask for the available button types */ Modified: trunk/reactos/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_combo.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,18 +19,7 @@ * */ -#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <uxtheme.h> -#include <vssym32.h> #include "comctl32.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(themingcombo); Modified: trunk/reactos/dll/win32/comctl32/theme_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_d… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_dialog.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,18 +19,7 @@ * */ -#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <uxtheme.h> -#include <vssym32.h> #include "comctl32.h" -#include <wine/debug.h> /********************************************************************** * The dialog subclass window proc. Modified: trunk/reactos/dll/win32/comctl32/theme_edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_e… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_edit.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,18 +19,7 @@ * */ -#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <uxtheme.h> -#include <vssym32.h> #include "comctl32.h" -#include <wine/debug.h> /* Draw themed border */ static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) Modified: trunk/reactos/dll/win32/comctl32/theme_listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_l… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_listbox.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,18 +19,7 @@ * */ -#include <stdarg.h> -//#include <string.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <uxtheme.h> -#include <vssym32.h> #include "comctl32.h" -#include <wine/debug.h> /* Draw themed border */ static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) Modified: trunk/reactos/dll/win32/comctl32/theming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theming… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -19,15 +19,7 @@ * */ -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> #include "comctl32.h" -#include <uxtheme.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(theming); Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -68,21 +68,7 @@ * */ -#include <stdarg.h> -#include <string.h> - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <wingdi.h> -#include <winuser.h> -#include <wine/unicode.h> -#include <winnls.h> -#include <commctrl.h> #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(toolbar); Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -89,20 +89,7 @@ * */ - - -//#include <stdarg.h> -//#include <string.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(tooltips); Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -29,21 +29,6 @@ * If you discover missing features, or bugs, please note them below. * */ - -#include <stdarg.h> -//#include <stdio.h> -#include <stdlib.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -//#include "winnls.h" -//#include "commctrl.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/debug.h> #include "comctl32.h" Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -40,29 +40,7 @@ * Scroll (instead of repaint) as much as possible. */ -#include <config.h> -//#include "wine/port.h" - -#include <assert.h> -//#include <ctype.h> -//#include <stdarg.h> -//#include <string.h> -//#include <limits.h> -//#include <stdlib.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(treeview); Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/updown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/updown.c [iso-8859-1] Sun Dec 22 19:02:59 2013 @@ -28,22 +28,7 @@ * */ -//#include <stdlib.h> -//#include <string.h> -//#include <stdarg.h> -//#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winnls.h" -//#include "commctrl.h" #include "comctl32.h" -#include <uxtheme.h> -#include <vssym32.h> -#include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(updown);

10 years, 10 months

[akhaldi] 61340: [KERNEL32] * Add stdio.h inclusion to the main header. * Add some missing definitions to the internal header. * Remove inclusions and definitions that already exist in the main hea...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 22 18:10:41 2013 New Revision: 61340 URL: http://svn.reactos.org/svn/reactos?rev=61340&view=rev Log: [KERNEL32] * Add stdio.h inclusion to the main header. * Add some missing definitions to the internal header. * Remove inclusions and definitions that already exist in the main header. * Make the Wine synced source files use the main header. CORE-7716 Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/k32.h trunk/reactos/dll/win32/kernel32/wine/actctx.c trunk/reactos/dll/win32/kernel32/wine/comm.c trunk/reactos/dll/win32/kernel32/wine/lzexpand.c trunk/reactos/dll/win32/kernel32/wine/muldiv.c trunk/reactos/dll/win32/kernel32/wine/profile.c trunk/reactos/dll/win32/kernel32/wine/res.c trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c trunk/reactos/dll/win32/kernel32/winnls/string/fold.c trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c trunk/reactos/dll/win32/kernel32/winnls/string/lang.c trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c trunk/reactos/dll/win32/kernel32/winnls/string/nls.c trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -8,6 +8,9 @@ #define actctx 202 #define resource 203 #define kernel32session 204 +#define comm 205 +#define profile 206 +#define nls 207 #if DBG @@ -27,6 +30,7 @@ #define debugstr_a #define debugstr_w +#define debugstr_wn #define wine_dbgstr_w #define debugstr_guid @@ -61,6 +65,9 @@ #define FIELD_OFFSET(type,fld) ((LONG)&(((type *)0)->fld)) #endif +#define __TRY _SEH2_TRY +#define __EXCEPT_PAGE_FAULT _SEH2_EXCEPT(_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) +#define __ENDTRY _SEH2_END /* Undocumented CreateProcess flag */ #define STARTF_SHELLPRIVATE 0x400 @@ -159,7 +166,7 @@ #define HeapAlloc RtlAllocateHeap #define HeapReAlloc RtlReAllocateHeap #define HeapFree RtlFreeHeap -#define _lread (_readfun)_hread +#define _lread(a, b, c) (long)(_hread(a, b, (long)c)) PLARGE_INTEGER WINAPI Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… ============================================================================== --- trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -14,6 +14,7 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS #include <stdarg.h> +#include <stdio.h> #include <windef.h> #include <winbase.h> #include <wingdi.h> @@ -49,16 +50,9 @@ #include <win/conmsg.h> #include <win/winmsg.h> -/* C Headers */ -//#include <ctype.h> -//#include <limits.h> -//#include <stdio.h> -//#include <wchar.h> - /* DDK Driver Headers */ #include <ntddbeep.h> #include <mountmgr.h> -//#include <mountdev.h> /* Internal Kernel32 Header */ #include "include/kernel32.h" Modified: trunk/reactos/dll/win32/kernel32/wine/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/actctx.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -13,6 +13,7 @@ /* synched with wine 1.1.26 */ #include <k32.h> + #define NDEBUG #include <debug.h> DEBUG_CHANNEL(actctx); Modified: trunk/reactos/dll/win32/kernel32/wine/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/comm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/comm.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "config.h" -//#include "wine/port.h" - -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winioctl.h" -#include "winternl.h" -//#include "ddk/ntddser.h" +#include <k32.h> typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; #undef SERIAL_LSRMST_ESCAPE @@ -55,14 +41,9 @@ #undef IOCTL_SERIAL_LSRMST_INSERT #include <ntddser.h> -#include "wine/unicode.h" - -#include "wine/debug.h" - -#define HeapAlloc RtlAllocateHeap -#define HeapReAlloc RtlReAllocateHeap -#define HeapFree RtlFreeHeap -WINE_DEFAULT_DEBUG_CHANNEL(comm); +#define NDEBUG +#include <debug.h> +DEBUG_CHANNEL(comm); /*********************************************************************** * COMM_Parse* (Internal) Modified: trunk/reactos/dll/win32/kernel32/wine/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/lz… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/lzexpand.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/lzexpand.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -32,33 +32,19 @@ * o Check whether the return values are correct * */ -//#include <k32.h> + +#include <k32.h> + +#define NDEBUG +#include <debug.h> +DEBUG_CHANNEL(kernel32file); + #define HFILE_ERROR ((HFILE)-1) -//#include "config.h" -#include <string.h> -#include <ctype.h> -#include <sys/types.h> -#include <stdarg.h> -#include <stdio.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include "windef.h" -#include "winbase.h" #include "lzexpand.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "winternl.h" -#define HeapAlloc RtlAllocateHeap -#define HeapReAlloc RtlReAllocateHeap -#define HeapFree RtlFreeHeap -#define _lread(a, b, c) (long)(_hread(a, b, (long)c)) #define _lwrite(a, b, c) (long)(_hwrite(a, b, (long)c)) -WINE_DEFAULT_DEBUG_CHANNEL(file); - + /* The readahead length of the decompressor. Reading single bytes * using _lread() would be SLOW. */ Modified: trunk/reactos/dll/win32/kernel32/wine/muldiv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/mu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/muldiv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/muldiv.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -10,7 +10,6 @@ */ #include <k32.h> - /*********************************************************************** * MulDiv (KERNEL32.@) Modified: trunk/reactos/dll/win32/kernel32/wine/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/profile.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -19,25 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "config.h" -//#include "wine/port.h" - -#include <string.h> -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winerror.h" -#include "winternl.h" -#include "wine/unicode.h" -#include "wine/library.h" -#include "wine/debug.h" - -#define HeapAlloc RtlAllocateHeap -#define HeapReAlloc RtlReAllocateHeap -#define HeapFree RtlFreeHeap -WINE_DEFAULT_DEBUG_CHANNEL(profile); +#include <k32.h> + +#define NDEBUG +#include <debug.h> +DEBUG_CHANNEL(profile); static const char bom_utf8[] = {0xEF,0xBB,0xBF}; @@ -277,7 +263,7 @@ return isspaceW(c) || c == 0x1a; } -static inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len) +static inline ENCODING PROFILE_DetectTextEncoding(void * buffer, int * len) { int flags = IS_TEXT_UNICODE_SIGNATURE | IS_TEXT_UNICODE_REVERSE_SIGNATURE | @@ -484,7 +470,7 @@ prev_key = key; TRACE("New key: name=%s, value=%s\n", - debugstr_w(key->name), key->value ? debugstr_w(key->value) : "(none)"); + debugstr_w(key->name), key->value ? debugstr_w(key->value) : L"(none)"); } } if (szFile != pBuffer) Modified: trunk/reactos/dll/win32/kernel32/wine/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/re… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/res.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/res.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -20,30 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "config.h" -//#include "wine/port.h" - -#include <stdarg.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winternl.h" -#include "wine/debug.h" -#include "wine/exception.h" -#include "wine/unicode.h" -#include "wine/list.h" - -#define HeapAlloc RtlAllocateHeap -#define HeapReAlloc RtlReAllocateHeap -#define HeapFree RtlFreeHeap -WINE_DEFAULT_DEBUG_CHANNEL(resource); - -/* we don't want to include winuser.h just for this */ -#define IS_INTRESOURCE(x) (((ULONG_PTR)(x) >> 16) == 0) +#include <k32.h> + +#include <wine/list.h> + +#define NDEBUG +#include <debug.h> +DEBUG_CHANNEL(resource); /* retrieve the resource name to pass to the ntdll functions */ static NTSTATUS get_res_nameA( LPCSTR name, UNICODE_STRING *str ) @@ -94,7 +77,7 @@ NTSTATUS status; UNICODE_STRING nameW, typeW; LDR_RESOURCE_INFO info; - const IMAGE_RESOURCE_DATA_ENTRY *entry = NULL; + IMAGE_RESOURCE_DATA_ENTRY *entry = NULL; nameW.Buffer = NULL; typeW.Buffer = NULL; @@ -128,7 +111,7 @@ NTSTATUS status; UNICODE_STRING nameW, typeW; LDR_RESOURCE_INFO info; - const IMAGE_RESOURCE_DATA_ENTRY *entry = NULL; + IMAGE_RESOURCE_DATA_ENTRY *entry = NULL; nameW.Buffer = typeW.Buffer = NULL; @@ -206,7 +189,7 @@ LPSTR type = NULL; DWORD len = 0, newlen; NTSTATUS status; - const IMAGE_RESOURCE_DIRECTORY *resdir; + IMAGE_RESOURCE_DIRECTORY *resdir; const IMAGE_RESOURCE_DIRECTORY_ENTRY *et; const IMAGE_RESOURCE_DIR_STRING_U *str; @@ -222,9 +205,9 @@ et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { - if (et[i].u1.s1.NameIsString) - { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].u1.s1.NameOffset); + if (et[i].NameIsString) + { + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].NameOffset); newlen = WideCharToMultiByte( CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL); if (newlen + 1 > len) { @@ -238,7 +221,7 @@ } else { - ret = lpfun( hmod, UIntToPtr(et[i].u1.Id), lparam ); + ret = lpfun( hmod, UIntToPtr(et[i].Id), lparam ); } if (!ret) break; } @@ -256,7 +239,7 @@ BOOL ret = FALSE; LPWSTR type = NULL; NTSTATUS status; - const IMAGE_RESOURCE_DIRECTORY *resdir; + IMAGE_RESOURCE_DIRECTORY *resdir; const IMAGE_RESOURCE_DIRECTORY_ENTRY *et; const IMAGE_RESOURCE_DIR_STRING_U *str; @@ -272,9 +255,9 @@ et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) { - if (et[i].u1.s1.NameIsString) - { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].u1.s1.NameOffset); + if (et[i].NameIsString) + { + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].NameOffset); if (str->Length + 1 > len) { len = str->Length + 1; @@ -287,7 +270,7 @@ } else { - ret = lpfun( hmod, UIntToPtr(et[i].u1.Id), lparam ); + ret = lpfun( hmod, UIntToPtr(et[i].Id), lparam ); } if (!ret) break; } @@ -308,7 +291,7 @@ NTSTATUS status; UNICODE_STRING typeW; LDR_RESOURCE_INFO info; - const IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; + IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; const IMAGE_RESOURCE_DIRECTORY_ENTRY *et; const IMAGE_RESOURCE_DIR_STRING_U *str; @@ -329,9 +312,9 @@ { for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { - if (et[i].u1.s1.NameIsString) + if (et[i].NameIsString) { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].NameOffset); newlen = WideCharToMultiByte(CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL); if (newlen + 1 > len) { @@ -349,7 +332,7 @@ } else { - ret = lpfun( hmod, type, UIntToPtr(et[i].u1.Id), lparam ); + ret = lpfun( hmod, type, UIntToPtr(et[i].Id), lparam ); } if (!ret) break; } @@ -380,7 +363,7 @@ NTSTATUS status; UNICODE_STRING typeW; LDR_RESOURCE_INFO info; - const IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; + IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; const IMAGE_RESOURCE_DIRECTORY_ENTRY *et; const IMAGE_RESOURCE_DIR_STRING_U *str; @@ -401,9 +384,9 @@ { for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { - if (et[i].u1.s1.NameIsString) + if (et[i].NameIsString) { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].NameOffset); if (str->Length + 1 > len) { len = str->Length + 1; @@ -420,7 +403,7 @@ } else { - ret = lpfun( hmod, type, UIntToPtr(et[i].u1.Id), lparam ); + ret = lpfun( hmod, type, UIntToPtr(et[i].Id), lparam ); } if (!ret) break; } @@ -450,7 +433,7 @@ NTSTATUS status; UNICODE_STRING typeW, nameW; LDR_RESOURCE_INFO info; - const IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; + IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; const IMAGE_RESOURCE_DIRECTORY_ENTRY *et; TRACE( "%p %s %s %p %lx\n", hmod, debugstr_a(type), debugstr_a(name), lpfun, lparam ); @@ -473,7 +456,7 @@ { for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) { - ret = lpfun( hmod, type, name, et[i].u1.Id, lparam ); + ret = lpfun( hmod, type, name, et[i].Id, lparam ); if (!ret) break; } } @@ -502,7 +485,7 @@ NTSTATUS status; UNICODE_STRING typeW, nameW; LDR_RESOURCE_INFO info; - const IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; + IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; const IMAGE_RESOURCE_DIRECTORY_ENTRY *et; TRACE( "%p %s %s %p %lx\n", hmod, debugstr_w(type), debugstr_w(name), lpfun, lparam ); @@ -525,7 +508,7 @@ { for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) { - ret = lpfun( hmod, type, name, et[i].u1.Id, lparam ); + ret = lpfun( hmod, type, name, et[i].Id, lparam ); if (!ret) break; } } @@ -951,10 +934,10 @@ const IMAGE_RESOURCE_DIR_STRING_U* string; LPWSTR s; - if (!entry->u1.s1.NameIsString) - return UIntToPtr(entry->u1.Id); - - string = (const IMAGE_RESOURCE_DIR_STRING_U*) (((const char *)root) + entry->u1.s1.NameOffset); + if (!entry->NameIsString) + return UIntToPtr(entry->Id); + + string = (const IMAGE_RESOURCE_DIR_STRING_U*) (((const char *)root) + entry->NameOffset); s = HeapAlloc(GetProcessHeap(), 0, (string->Length + 1)*sizeof (WCHAR) ); memcpy( s, string->NameString, (string->Length + 1)*sizeof (WCHAR) ); s[string->Length] = 0; @@ -983,7 +966,7 @@ Type = resource_dup_string( root, e1 ); - namedir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e1->u2.s2.OffsetToDirectory); + namedir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e1->OffsetToDirectory); for (j = 0; j < namedir->NumberOfNamedEntries + namedir->NumberOfIdEntries; j++) { LPWSTR Name; @@ -992,7 +975,7 @@ Name = resource_dup_string( root, e2 ); - langdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e2->u2.s2.OffsetToDirectory); + langdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e2->OffsetToDirectory); for (k = 0; k < langdir->NumberOfNamedEntries + langdir->NumberOfIdEntries; k++) { LANGID Lang; @@ -1001,9 +984,9 @@ e3 = (const IMAGE_RESOURCE_DIRECTORY_ENTRY*)(langdir + 1) + k; - Lang = e3->u1.Id; - - data = (const IMAGE_RESOURCE_DATA_ENTRY *)((const char *)root + e3->u2.OffsetToData); + Lang = e3->Id; + + data = (const IMAGE_RESOURCE_DATA_ENTRY *)((const char *)root + e3->OffsetToData); p = address_from_rva( base, mapping_size, data->OffsetToData, data->Size ); @@ -1238,8 +1221,8 @@ DWORD len; root->NumberOfNamedEntries++; - e1->u1.s1.NameIsString = 1; - e1->u1.s1.NameOffset = si->strings_ofs; + e1->NameIsString = 1; + e1->NameOffset = si->strings_ofs; strings = (WCHAR*) &base[si->strings_ofs]; len = lstrlenW( types->id ); @@ -1250,10 +1233,10 @@ else { root->NumberOfIdEntries++; - e1->u1.Id = LOWORD( types->id ); - } - e1->u2.s2.OffsetToDirectory = si->names_ofs; - e1->u2.s2.DataIsDirectory = TRUE; + e1->Id = LOWORD( types->id ); + } + e1->OffsetToDirectory = si->names_ofs; + e1->DataIsDirectory = TRUE; si->types_ofs += sizeof (IMAGE_RESOURCE_DIRECTORY_ENTRY); namedir = (IMAGE_RESOURCE_DIRECTORY*) &base[si->names_ofs]; @@ -1274,8 +1257,8 @@ DWORD len; namedir->NumberOfNamedEntries++; - e2->u1.s1.NameIsString = 1; - e2->u1.s1.NameOffset = si->strings_ofs; + e2->NameIsString = 1; + e2->NameOffset = si->strings_ofs; strings = (WCHAR*) &base[si->strings_ofs]; len = lstrlenW( names->id ); @@ -1286,10 +1269,10 @@ else { namedir->NumberOfIdEntries++; - e2->u1.Id = LOWORD( names->id ); + e2->Id = LOWORD( names->id ); } - e2->u2.s2.OffsetToDirectory = si->langs_ofs; - e2->u2.s2.DataIsDirectory = TRUE; + e2->OffsetToDirectory = si->langs_ofs; + e2->DataIsDirectory = TRUE; si->names_ofs += sizeof (IMAGE_RESOURCE_DIRECTORY_ENTRY); langdir = (IMAGE_RESOURCE_DIRECTORY*) &base[si->langs_ofs]; @@ -1306,8 +1289,8 @@ e3 = (IMAGE_RESOURCE_DIRECTORY_ENTRY*) &base[si->langs_ofs]; memset( e3, 0, sizeof *e3 ); langdir->NumberOfIdEntries++; - e3->u1.Id = LOWORD( data->lang ); - e3->u2.OffsetToData = si->data_entry_ofs; + e3->Id = LOWORD( data->lang ); + e3->OffsetToData = si->data_entry_ofs; si->langs_ofs += sizeof (IMAGE_RESOURCE_DIRECTORY_ENTRY); Modified: trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -1,7 +1,7 @@ /* Unicode case mappings */ /* Automatically generated; DO NOT EDIT!! */ -#include "wine/unicode.h" +#include <wine/unicode.h> const WCHAR wine_casemap_lower[3802] = { Modified: trunk/reactos/dll/win32/kernel32/winnls/string/fold.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/fold.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/fold.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/unicode.h" +#include <wine/unicode.h> static inline WCHAR to_unicode_digit( WCHAR ch ) { Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -19,27 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> -#include <string.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winternl.h" -#include "winuser.h" -#include "winnls.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include <k32.h> + +#define NDEBUG +#include <debug.h> +DEBUG_CHANNEL(resource); extern HMODULE kernel32_handle; - -#define HeapAlloc RtlAllocateHeap -#define HeapReAlloc RtlReAllocateHeap -#define HeapFree RtlFreeHeap -WINE_DEFAULT_DEBUG_CHANNEL(resource); struct format_args { @@ -77,7 +63,7 @@ */ static LPWSTR load_message( HMODULE module, UINT id, WORD lang ) { - const MESSAGE_RESOURCE_ENTRY *mre; + MESSAGE_RESOURCE_ENTRY *mre; WCHAR *buffer; NTSTATUS status; Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -21,39 +21,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "config.h" -//#include "wine/port.h" - -#include <assert.h> -#include <locale.h> -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <ctype.h> -#include <stdlib.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" /* for RT_STRINGW */ -#include "winternl.h" -#include "wine/unicode.h" -#include "winnls.h" -#include "winerror.h" -#include "winver.h" -#include "wine/debug.h" +#include <k32.h> + +#define NDEBUG +#include <debug.h> +DEBUG_CHANNEL(nls); #include "lcformat_private.h" + #define REG_SZ 1 extern int wine_fold_string(int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen); extern int wine_get_sortkey(int flags, const WCHAR *src, int srclen, char *dst, int dstlen); extern int wine_compare_string(int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2); - -#define HeapAlloc RtlAllocateHeap -#define HeapReAlloc RtlReAllocateHeap -#define HeapFree RtlFreeHeap -WINE_DEFAULT_DEBUG_CHANNEL(nls); extern HMODULE kernel32_handle; @@ -997,7 +976,7 @@ if (!(hkey = create_registry_key())) return FALSE; RtlInitUnicodeString( &valueW, value ); - status = NtSetValueKey( hkey, &valueW, 0, REG_SZ, data, (strlenW(data)+1)*sizeof(WCHAR) ); + status = NtSetValueKey( hkey, &valueW, 0, REG_SZ, (PVOID)data, (strlenW(data)+1)*sizeof(WCHAR) ); if (lctype == LOCALE_SSHORTDATE || lctype == LOCALE_SLONGDATE) { Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -22,29 +22,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "config.h" -//#include "wine/port.h" - -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "wine/debug.h" -#include "winternl.h" +#include <k32.h> + +#define NDEBUG +#include <debug.h> +DEBUG_CHANNEL(nls); #define CRITICAL_SECTION RTL_CRITICAL_SECTION #define CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG #define CALINFO_MAX_YEAR 2029 - -#define HeapAlloc RtlAllocateHeap -#define HeapReAlloc RtlReAllocateHeap -#define HeapFree RtlFreeHeap - -WINE_DEFAULT_DEBUG_CHANNEL(nls); #define DATE_DATEVARSONLY 0x0100 /* only date stuff: yMdg */ #define TIME_TIMEVARSONLY 0x0200 /* only time stuff: hHmst */ Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -14,6 +14,7 @@ /* INCLUDES *******************************************************************/ #include <k32.h> + #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c [iso-8859-1] Sun Dec 22 18:10:41 2013 @@ -17,7 +17,8 @@ * 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 "wine/unicode.h" + +#include <wine/unicode.h> #define get_char_typeW(x) iswctype((x) >> 8, (x) & 0xFF) extern int get_decomposition(WCHAR src, WCHAR *dst, unsigned int dstlen);

10 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2013