Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-03 03:04:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MSVFW32]

Browse source 
* 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/resource file.
CORE-7716

svn path=/trunk/; revision=61790
This commit is contained in:
Amine Khaldi 2014-01-24 18:03:28 +00:00
parent 4c38d2c309
commit 0be7d31f22
27 changed files with 58 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/dll/win32/msvfw32/drawdib.c
View file

@ -20,21 +20,7 @@
* Handle palettes
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
//#include <stdio.h>
//#include <string.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
#include <vfw.h>
#include <wine/debug.h>
#include "msvideo_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(msvideo);

2
reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95

2
reactos/dll/win32/msvfw32/lang/msvfw32_De.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
#pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

2
reactos/dll/win32/msvfw32/lang/msvfw32_En.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95

2
reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
#pragma code_page(65001)
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

2
reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/msvfw32/lang/msvfw32_He.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95

2
reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95

4
reactos/dll/win32/msvfw32/lang/msvfw32_It.rc
View file

@ -16,9 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/*UTF-8*/
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

2
reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95

2
reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95

2
reactos/dll/win32/msvfw32/lang/msvfw32_No.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95

2
reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 207, 95

2
reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95

2
reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)

2
reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

2
reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc
View file

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95

2
reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95

2
reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)

13
reactos/dll/win32/msvfw32/mciwnd.c
View file

@ -21,23 +21,12 @@
* Add support for MCIWNDF_RECORD.
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include "msvideo_private.h"
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
//#include "winnls.h"
#include <wingdi.h>
//#include "winuser.h"
#include <winternl.h>
#include <vfw.h>
#include <digitalv.h>
#include <commctrl.h>
#include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mci);

22
reactos/dll/win32/msvfw32/msvideo_main.c
View file

@ -26,24 +26,12 @@
* - no thread safety
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
//#include <stdio.h>
//#include <string.h>
#include <windef.h>
#include <winbase.h>
#include <winreg.h>
#include <winnls.h>
#include <wingdi.h>
#include <winuser.h>
#include <commdlg.h>
#include <vfw.h>
#include "msvideo_private.h"
#include <wine/debug.h>
#include <winreg.h>
#include <commdlg.h>
#include "resource.h"
/* Drivers32 settings */
#define HKLM_DRIVERS32 "Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32"

27
reactos/dll/win32/msvfw32/msvideo_private.h
View file

@ -19,12 +19,22 @@
#ifndef __WINE_MSVIDEO_PRIVATE_H
#define __WINE_MSVIDEO_PRIVATE_H
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <windef.h>
#include <winuser.h>
#include <winbase.h>
#include <winnls.h>
#include <wingdi.h>
#include <vfw.h>
#include <wine/debug.h>
#define ICM_CHOOSE_COMPRESSOR 1
#define IDC_COMP_LIST 880
#define IDS_FULLFRAMES 901
/* HIC struct (same layout as Win95 one) */
typedef struct tagWINE_HIC {
@ -46,17 +56,4 @@ typedef struct tagWINE_HIC {
extern HMODULE MSVFW32_hModule DECLSPEC_HIDDEN;
#define IDC_CONFIGURE 882
#define IDC_ABOUT 883
#define IDC_QUALITY_SCROLL 884
#define IDC_QUALITY_TXT 886
#define IDC_KEYFRAME_CHECKBOX 887
#define IDC_KEYFRAME 888
#define IDC_KEYFRAME_FRAMES 889
#define IDC_DATARATE_CHECKBOX 894
#define IDC_DATARATE 895
#define IDC_DATARATE_KB 896
#endif /* __WINE_MSVIDEO_PRIVATE_H */

34
reactos/dll/win32/msvfw32/resource.h Normal file
View file

@ -0,0 +1,34 @@
/*
* Copyright 1999 Marcus Meissner
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#pragma once
#define IDS_FULLFRAMES 901
#define IDC_CONFIGURE 882
#define IDC_ABOUT 883
#define IDC_QUALITY_SCROLL 884
#define IDC_QUALITY_TXT 886
#define IDC_KEYFRAME_CHECKBOX 887
#define IDC_KEYFRAME 888
#define IDC_KEYFRAME_FRAMES 889
#define IDC_DATARATE_CHECKBOX 894
#define IDC_DATARATE 895
#define IDC_DATARATE_KB 896

7
reactos/dll/win32/msvfw32/rsrc.rc
View file

@ -16,9 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
//#include "windef.h"
//#include "winuser.h"
//#include "msvideo_private.h"
#include <windef.h>
#include <winuser.h>
#include "resource.h"
#ifdef LANGUAGE_DA_DK
#include "lang/msvfw32_Da.rc"