Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-30 22:31:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync mscms, msg711.acm, msgm32.acm, msimtf. msnet32, msrle32, mssip32, msvcrt20, msvfw32, msvidc32 and nddeapi to Wine 1.1.40

Browse source 
Even more will come.

svn path=/trunk/; revision=46063
This commit is contained in:
Daniel Reimer 2010-03-10 17:03:25 +00:00
parent 94e01c6025
commit 1511347fdc
78 changed files with 714 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/mscms/profile.c
View file

@ -660,8 +660,9 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi
GetColorDirectoryW( machine, rgbprofile, &len );
switch (id)
{
case SPACE_RGB: /* 'RGB ' */
case LCS_sRGB:
case LCS_WINDOWS_COLOR_SPACE: /* FIXME */
{
lstrcatW( rgbprofile, rgbprofilefile );
len = lstrlenW( rgbprofile ) * sizeof(WCHAR);

18
reactos/dll/win32/msg711.acm/msg711.c
View file

@ -832,16 +832,16 @@ static LRESULT G711_FormatSuggest(PACMDRVFORMATSUGGEST adfs)
switch (adfs->pwfxDst->wFormatTag)
{
case WAVE_FORMAT_PCM:
adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels;
adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2;
adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign;
break;
case WAVE_FORMAT_ALAW:
adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2;
adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels * 2;
adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels;
adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels;
break;
case WAVE_FORMAT_MULAW:
adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2;
adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels * 2;
adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels;
adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels;
break;
default:
FIXME("\n");
@ -993,13 +993,13 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI
(adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MULAW))
{
adss->cbSrcLength = adss->cbDstLength / 2;
adss->cbSrcLength = adss->cbDstLength * 2;
}
else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) &&
adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM)
{
adss->cbSrcLength = adss->cbDstLength * 2;
adss->cbSrcLength = adss->cbDstLength / 2;
}
else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) &&
@ -1019,13 +1019,13 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI
(adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MULAW))
{
adss->cbDstLength = adss->cbSrcLength * 2;
adss->cbDstLength = adss->cbSrcLength / 2;
}
else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) &&
adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM)
{
adss->cbDstLength = adss->cbSrcLength / 2;
adss->cbDstLength = adss->cbSrcLength * 2;
}
else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW ||
adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) &&

2
reactos/dll/win32/msgsm32.acm/msgsm32.c
View file

@ -381,7 +381,7 @@ static LRESULT GSM_StreamOpen(PACMDRVSTREAMINSTANCE adsi)
return MMSYSERR_NOMEM;
if (pgsm_option(r, GSM_OPT_WAV49, &used) < 0)
{
FIXME("Your libgsm library is doesn't support GSM_OPT_WAV49\n");
FIXME("Your libgsm library doesn't support GSM_OPT_WAV49\n");
FIXME("Please recompile libgsm with WAV49 support\n");
pgsm_destroy(r);
return MMSYSERR_NOTSUPPORTED;

8
reactos/dll/win32/msimtf/activeimmapp.c
View file

@ -642,27 +642,27 @@ static HRESULT WINAPI ActiveIMMApp_UnregisterWordW(IActiveIMMApp* This,
static HRESULT WINAPI ActiveIMMApp_Activate(IActiveIMMApp* This,
BOOL fRestoreLayout)
{
//FIXME("Stub\n");
FIXME("Stub\n");
return S_OK;
}
static HRESULT WINAPI ActiveIMMApp_Deactivate(IActiveIMMApp* This)
{
//FIXME("Stub\n");
FIXME("Stub\n");
return S_OK;
}
static HRESULT WINAPI ActiveIMMApp_OnDefWindowProc(IActiveIMMApp* This,
HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult)
{
//FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam);
FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam);
return E_FAIL;
}
static HRESULT WINAPI ActiveIMMApp_FilterClientWindows(IActiveIMMApp* This,
ATOM *aaClassList, UINT uSize)
{
//FIXME("Stub\n");
FIXME("Stub\n");
return S_OK;
}

1
reactos/dll/win32/msimtf/main.c
View file

@ -151,7 +151,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/
HRESULT WINAPI DllCanUnloadNow(void)
{
FIXME("()\n");
return S_FALSE;
}

5
reactos/dll/win32/msnet32/msnet_main.c
View file

@ -1,4 +1,9 @@
/*
* Microsoft Network API implementation
*
* Copyright 2003 Rein Klazes
* Copyright 2006 Alexandre Julliard
*
* 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

2
reactos/dll/win32/msrle32/msrle_Bg.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

2
reactos/dll/win32/msrle32/msrle_Cs.rc
View file

@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */

2
reactos/dll/win32/msrle32/msrle_Da.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

8
reactos/dll/win32/msrle32/msrle_De.rc
View file

@ -1,7 +1,7 @@
/*
* German resource file for MS-RLE
*
* Copyright 2002 Michael Günnewig
* Copyright 2002 Michael Günnewig
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -18,11 +18,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
#pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
{
IDS_NAME "WINE-MS-RLE"
IDS_DESCRIPTION "Wine MS-RLE Videodekoder"
IDS_ABOUT "Wine MS-RLE Videodekoder\nCopyright 2002 by Michael Günnewig"
IDS_ABOUT "Wine MS-RLE Videodekoder\nCopyright 2002 by Michael Günnewig"
}

8
reactos/dll/win32/msrle32/msrle_En.rc
View file

@ -1,7 +1,7 @@
/*
* English resource file for MS-RLE
*
* Copyright 2002 Michael Günnewig
* Copyright 2002 Michael Günnewig
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -18,11 +18,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
#pragma code_page(65001)
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
{
IDS_NAME "WINE-MS-RLE"
IDS_DESCRIPTION "Wine MS-RLE video codec"
IDS_ABOUT "Wine MS-RLE video codec\nCopyright 2002 by Michael Günnewig"
IDS_ABOUT "Wine MS-RLE video codec\nCopyright 2002 by Michael Günnewig"
}

2
reactos/dll/win32/msrle32/msrle_Es.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE

11
reactos/dll/win32/msrle32/msrle_Fr.rc
View file

@ -1,7 +1,7 @@
/*
* French resource file for MS-RLE
*
* Copyright 2002 Michael Günnewig
* Copyright 2002 Michael Günnewig
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -18,11 +18,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
{
IDS_NAME "WINE-MS-RLE"
IDS_DESCRIPTION "Wine: décodeur/encodeur vidéo MS-RLE"
IDS_ABOUT "Wine: décodeur/encodeur vidéo MS-RLE\nCopyright 2002 par Michael Günnewig"
IDS_DESCRIPTION "Wine : codec vidéo MS-RLE"
IDS_ABOUT "Wine : codec vidéo MS-RLE\nCopyright 2002 par Michael Günnewig"
}

2
reactos/dll/win32/msrle32/msrle_Hu.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

2
reactos/dll/win32/msrle32/msrle_It.rc
View file

@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE

4
reactos/dll/win32/msrle32/msrle_Ja.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
/* UTF-8 */
#pragma code_page(65001)
@ -29,5 +31,3 @@ STRINGTABLE DISCARDABLE
IDS_DESCRIPTION "Wine MS-RLE ビデオコーデック"
IDS_ABOUT "Wine MS-RLE ビデオコーデック\nCopyright 2002 by Michael Günewig"
}
#pragma code_page(default)

2
reactos/dll/win32/msrle32/msrle_Ko.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

33
reactos/dll/win32/msrle32/msrle_Lt.rc Normal file
View file

@ -0,0 +1,33 @@
/*
* Lithuanian resource file for MS-RLE
*
* Copyright 2009 Aurimas Fišeras <aurimas@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
{
IDS_NAME "WINE-MS-RLE"
IDS_DESCRIPTION "Wine MS-RLE vaizdo kodekas"
IDS_ABOUT "Wine MS-RLE vaizdo kodekas\nAutoriaus teisės Michael Günnewig, 2002"
}

2
reactos/dll/win32/msrle32/msrle_Nl.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE

2
reactos/dll/win32/msrle32/msrle_No.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE DISCARDABLE

2
reactos/dll/win32/msrle32/msrle_Pl.rc
View file

@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

2
reactos/dll/win32/msrle32/msrle_Pt.rc
View file

@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE DISCARDABLE

4
reactos/dll/win32/msrle32/msrle_Ro.rc
View file

@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
@ -27,5 +29,3 @@ STRINGTABLE DISCARDABLE
IDS_DESCRIPTION "Codecul video Wine MS-RLE"
IDS_ABOUT "Codecul video Wine MS-RLE\nCopyright 2002 by Michael Günnewig"
}
#pragma code_page(default)

9
reactos/dll/win32/msrle32/msrle_Ru.rc
View file

@ -18,11 +18,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
{
IDS_NAME "WINE-MS-RLE"
IDS_DESCRIPTION "Âèäåî êîäåê Wine MS-RLE"
IDS_ABOUT "Âèäåî êîäåê Wine MS-RLE\nCopyright 2002 by Michael Günnewig"
IDS_DESCRIPTION "Видео кодек Wine MS-RLE"
IDS_ABOUT "Видео кодек Wine MS-RLE\nCopyright 2002 by Michael Gьnnewig"
}

4
reactos/dll/win32/msrle32/msrle_Si.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@ -28,5 +30,3 @@ STRINGTABLE DISCARDABLE
IDS_DESCRIPTION "Wine MS-RLE video kodek"
IDS_ABOUT "Wine MS-RLE video kodek\nCopyright 2002 by Michael Günnewig"
}
#pragma code_page(default)

2
reactos/dll/win32/msrle32/msrle_Sv.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE

2
reactos/dll/win32/msrle32/msrle_Tr.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

34
reactos/dll/win32/msrle32/msrle_Uk.rc Normal file
View file

@ -0,0 +1,34 @@
/*
* Ukrainian resource file for MS-RLE
*
* Copyright 2002 Michael GГјnnewig
* Copyright 2010 Igor Paliychuk
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msrle_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
{
IDS_NAME "WINE-MS-RLE"
IDS_DESCRIPTION "Відео кодек Wine MS-RLE"
IDS_ABOUT "Відео кодек Wine MS-RLE\nCopyright 2002 by Michael GГјnnewig"
}

16
reactos/dll/win32/msrle32/rsrc.rc
View file

@ -34,20 +34,24 @@
#include "msrle_Bg.rc"
#include "msrle_Cs.rc"
#include "msrle_Da.rc"
#include "msrle_De.rc"
#include "msrle_En.rc"
#include "msrle_Es.rc"
#include "msrle_Fr.rc"
#include "msrle_Hu.rc"
#include "msrle_It.rc"
#include "msrle_Ja.rc"
#include "msrle_Ko.rc"
#include "msrle_Nl.rc"
#include "msrle_No.rc"
#include "msrle_Pl.rc"
#include "msrle_Pt.rc"
#include "msrle_Sv.rc"
#include "msrle_Tr.rc"
/* UTF-8 */
#include "msrle_De.rc"
#include "msrle_En.rc"
#include "msrle_Fr.rc"
#include "msrle_Ja.rc"
#include "msrle_Lt.rc"
#include "msrle_Ro.rc"
#include "msrle_Ru.rc"
#include "msrle_Si.rc"
#include "msrle_Sv.rc"
#include "msrle_Tr.rc"
#include "msrle_Uk.rc"

18
reactos/dll/win32/mssip32/main.c
View file

@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
}
return TRUE;
}
/*****************************************************
* DllRegisterServer (MSSIP32.@)
*/
HRESULT WINAPI DllRegisterServer(void)
{
FIXME("Not implemented.\n");
return E_UNEXPECTED;
}
/*****************************************************
* DllUnregisterServer (MSSIP32.@)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
FIXME("Not implemented.\n");
return E_UNEXPECTED;
}

4
reactos/dll/win32/mssip32/mssip32.spec
View file

@ -5,5 +5,5 @@
@ stub CryptSIPPutSignedDataMsg
@ stub CryptSIPRemoveSignedDataMsg
@ stub CryptSIPVerifyIndirectData
@ stub DllRegisterServer
@ stub DllUnregisterServer
@ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer()

6
reactos/dll/win32/msvcrt20/msvcrt20.spec
View file

@ -225,7 +225,7 @@
@ stub ??_Gstrstream@@UAEPAXI@Z #
@ stub ??_Gstrstreambuf@@UAEPAXI@Z #
@ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() msvcrt.?_query_new_handler@@YAP6AHI@ZXZ
@ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ
@ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ
@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z
@ cdecl ?_set_new_mode@@YAHH@Z(long) msvcrt.?_set_new_mode@@YAHH@Z
@ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z
@ -436,7 +436,7 @@
@ stub ?xalloc@ios@@SAHXZ #
@ stub ?xsgetn@streambuf@@UAEHPADH@Z #
@ stub ?xsputn@streambuf@@UAEHPBDH@Z #
@ stub $I10_OUTPUT #
@ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT
@ cdecl -arch=i386 _CIacos() msvcrt._CIacos
@ cdecl -arch=i386 _CIasin() msvcrt._CIasin
@ cdecl -arch=i386 _CIatan() msvcrt._CIatan
@ -464,7 +464,7 @@
@ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit
@ cdecl __doserrno() msvcrt.__doserrno
@ cdecl __fpecode() msvcrt.__fpecode
@ cdecl __getmainargs(ptr ptr ptr long ptr) MSVCRT20__getmainargs
@ cdecl __getmainargs(ptr ptr ptr long long) MSVCRT20__getmainargs
@ extern __initenv msvcrt.__initenv
@ cdecl __isascii(long) msvcrt.__isascii
@ cdecl __iscsym(long) msvcrt.__iscsym

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

@ -72,7 +72,7 @@ static WINE_HDD* MSVIDEO_GetHddPtr(HDRAWDIB hd)
return hdd;
}
static DWORD HDD_HandleRef = 1;
static UINT_PTR HDD_HandleRef = 1;
/***********************************************************************
* DrawDibOpen [MSVFW32.@]

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

@ -18,6 +18,8 @@
* 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 DISCARDABLE 36, 24, 187, 95

16
reactos/dll/win32/msvfw32/msvfw32_De.rc
View file

@ -17,6 +17,10 @@
* 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
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
@ -30,16 +34,16 @@ FONT 8, "MS Shell Dlg"
LTEXT "&Komprimierer:",-1,9,6,105,8
COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
PUSHBUTTON "Kon&figurieren...",882,129,36,49,14
PUSHBUTTON "&Über...",883,129,52,49,14
PUSHBUTTON "Kon&figurieren",882,129,36,49,14
PUSHBUTTON "&Über...",883,129,52,49,14
SCROLLBAR 884,9,44,111,9,WS_TABSTOP
LTEXT "Komprimierungsqualität:",886,9,34,80,8
LTEXT "Komprimierungsqualität:",886,9,34,80,8
CONTROL "&Key Frame aller",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12
CONTROL "&Key Frame alle",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12
EDITTEXT 888,78,60,22,12
LTEXT "frames",889,103,62,26,10
LTEXT "Frames",889,103,62,26,10
CONTROL "&Datenrate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12
EDITTEXT 895,78,76,22,12
@ -48,5 +52,5 @@ FONT 8, "MS Shell Dlg"
STRINGTABLE DISCARDABLE
{
IDS_FULLFRAMES "Vollständige Frames (Unkomprimiert)"
IDS_FULLFRAMES "Vollständige Frames (Unkomprimiert)"
}

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

@ -16,6 +16,8 @@
* 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 DISCARDABLE 36, 24, 187, 95

4
reactos/dll/win32/msvfw32/msvfw32_Es.rc
View file

@ -17,6 +17,10 @@
* 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
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95

39
reactos/dll/win32/msvfw32/msvfw32_Fr.rc
View file

@ -16,36 +16,41 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 208, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Compression vidéo"
CAPTION "Compression vidéo"
FONT 8, "MS Shell Dlg"
{
DEFPUSHBUTTON "OK",IDOK,129,2,49,14
PUSHBUTTON "Annuler",IDCANCEL,129,18,49,14
DEFPUSHBUTTON "OK",IDOK,150,2,49,14
PUSHBUTTON "Annuler",IDCANCEL,150,18,49,14
LTEXT "&Compresseur :",-1,9,6,105,8
COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
LTEXT "&Compresseur :",-1,9,6,131,8
COMBOBOX 880,9,16,135,15,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
PUSHBUTTON "Con&figurer...",882,129,36,49,14
PUSHBUTTON "À &propos",883,129,52,49,14
PUSHBUTTON "Con&figurer...",882,150,36,49,14
PUSHBUTTON "À &propos",883,150,52,49,14
SCROLLBAR 884,9,44,111,9,WS_TABSTOP
SCROLLBAR 884,9,44,133,9,WS_TABSTOP
LTEXT "&Qualité de compression :",886,9,34,80,8
LTEXT "&Qualité de compression :",886,9,34,131,8
CONTROL "Image &clé toutes les",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12
EDITTEXT 888,78,60,22,12
LTEXT "images",889,103,62,26,10
CONTROL "Image &clé toutes les",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,77,12
EDITTEXT 888,89,60,22,12
LTEXT "images",889,115,63,26,10
CONTROL "&Débit de données",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12
EDITTEXT 895,78,76,22,12
LTEXT "Kio/sec",896,102,78,26,10
CONTROL "&Débit de données",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,77,12
EDITTEXT 895,89,76,22,12
LTEXT "Kio/sec",896,115,78,26,10
}
STRINGTABLE DISCARDABLE
{
IDS_FULLFRAMES "Images complètes (non compressées)"
IDS_FULLFRAMES "Images complètes (non compressées)"
}

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

@ -16,6 +16,8 @@
* 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 DISCARDABLE 36, 24, 187, 95

56
reactos/dll/win32/msvfw32/msvfw32_It.rc Normal file
View file

@ -0,0 +1,56 @@
/*
* Copyright 2010 Luca Bennati
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/*UTF-8*/
#pragma code_page(65001)
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Compressione video"
FONT 8, "MS Shell Dlg"
{
DEFPUSHBUTTON "OK",IDOK,129,2,49,14
PUSHBUTTON "Annulla",IDCANCEL,129,18,49,14
LTEXT "&Compressore:",-1,9,6,105,8
COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
PUSHBUTTON "Con&figura...",882,129,36,49,14
PUSHBUTTON "&Informazioni...",883,129,52,49,14
SCROLLBAR 884,9,44,111,9,WS_TABSTOP
LTEXT "&Qualità della compressione:",886,9,34,80,8
CONTROL "&Key Frame Every",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12
EDITTEXT 888,78,60,22,12
LTEXT "frames",889,103,62,26,10
CONTROL "&Data Rate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12
EDITTEXT 895,78,76,22,12
LTEXT "KB/sec",896,102,78,26,10
}
STRINGTABLE DISCARDABLE
{
IDS_FULLFRAMES "Frames completi (non compresso)"
}

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

@ -17,6 +17,8 @@
* 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 DISCARDABLE 36, 24, 187, 95

56
reactos/dll/win32/msvfw32/msvfw32_Lt.rc Normal file
View file

@ -0,0 +1,56 @@
/*
* Copyright 2009 Aurimas Fišeras <aurimas@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 192, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Vaizdų glaudinimas"
FONT 8, "MS Shell Dlg"
{
DEFPUSHBUTTON "Gerai",IDOK,129,2,54,14
PUSHBUTTON "Atsisakyti",IDCANCEL,129,18,54,14
LTEXT "&Metodas:",-1,9,6,105,8
COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
PUSHBUTTON "Kon&figūruoti...",882,129,36,54,14
PUSHBUTTON "&Apie...",883,129,52,54,14
SCROLLBAR 884,9,44,111,9,WS_TABSTOP
LTEXT "Glaudinimo &kokybė:",886,9,34,80,8
CONTROL "&Rakt. kadras kas",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12
EDITTEXT 888,78,60,22,12
LTEXT "kadrų",889,103,62,26,10
CONTROL "&Duomenų sparta",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12
EDITTEXT 895,78,76,22,12
LTEXT "KB/sek",896,102,78,26,10
}
STRINGTABLE DISCARDABLE
{
IDS_FULLFRAMES "Pilni kadrai (neglaudinti)"
}

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

@ -16,6 +16,8 @@
* 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 DISCARDABLE 36, 24, 187, 95

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

@ -16,6 +16,8 @@
* 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 DISCARDABLE 36, 24, 187, 95

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

@ -17,6 +17,8 @@
* 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 DISCARDABLE 36, 24, 207, 95

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

@ -16,6 +16,8 @@
* 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 DISCARDABLE 36, 24, 187, 95

27
reactos/dll/win32/msvfw32/msvfw32_Ru.rc
View file

@ -16,36 +16,41 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Сжатие видео"
CAPTION "Сжатие видео"
FONT 8, "MS Shell Dlg"
{
DEFPUSHBUTTON "OK",IDOK,129,2,49,14
PUSHBUTTON "Отмена",IDCANCEL,129,18,49,14
PUSHBUTTON "Отмена",IDCANCEL,129,18,49,14
LTEXT "&Алгоритм сжатия:",-1,9,6,105,8
LTEXT "&Алгоритм сжатия:",-1,9,6,105,8
COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
PUSHBUTTON "&Настройки...",882,129,36,49,14
PUSHBUTTON "&Информация...",883,129,52,49,14
PUSHBUTTON "&Настройки...",882,129,36,49,14
PUSHBUTTON "&Информация...",883,129,52,49,14
SCROLLBAR 884,9,44,111,9,WS_TABSTOP
LTEXT "&Качество сжатия:",886,9,34,80,8
LTEXT "&Качество сжатия:",886,9,34,80,8
CONTROL "Кл&ючевой кадр каждые",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12
CONTROL "Кл&ючевой кадр каждые",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12
EDITTEXT 888,78,60,22,12
LTEXT "кадров",889,103,62,26,10
LTEXT "кадров",889,103,62,26,10
CONTROL "&Поток данных",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12
CONTROL "&Поток данных",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12
EDITTEXT 895,78,76,22,12
LTEXT "КБ/сек",896,102,78,26,10
LTEXT "КБ/сек",896,102,78,26,10
}
STRINGTABLE DISCARDABLE
{
IDS_FULLFRAMES "Кадры целиком (Без компрессии)"
IDS_FULLFRAMES "Кадры целиком (Без компрессии)"
}

4
reactos/dll/win32/msvfw32/msvfw32_Si.rc
View file

@ -16,6 +16,8 @@
* 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
@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE
{
IDS_FULLFRAMES "Polne slike (nestisnjeno)"
}
#pragma code_page(default)

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

@ -16,6 +16,8 @@
* 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 DISCARDABLE 36, 24, 187, 95

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

@ -18,6 +18,8 @@
* 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 DISCARDABLE 36, 24, 187, 95

57
reactos/dll/win32/msvfw32/msvfw32_Uk.rc Normal file
View file

@ -0,0 +1,57 @@
/*
* Copyright 2005 Dmitry Timoshkov
* Copyright 2010 Igor Paliychuk
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvideo_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Стиснення Відео"
FONT 8, "MS Shell Dlg"
{
DEFPUSHBUTTON "OK",IDOK,129,2,49,14
PUSHBUTTON "Скасувати",IDCANCEL,129,18,49,14
LTEXT "&Алгоритм стиснення:",-1,9,6,105,8
COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
PUSHBUTTON "Налаштува&ти...",882,129,36,49,14
PUSHBUTTON "&Інформація...",883,129,52,49,14
SCROLLBAR 884,9,44,111,9,WS_TABSTOP
LTEXT "&Якість Стиснення:",886,9,34,80,8
CONTROL "&Ключовий кадр кожні",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12
EDITTEXT 888,78,60,22,12
LTEXT "кадрів",889,103,62,26,10
CONTROL "&Потік даних",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12
EDITTEXT 895,78,76,22,12
LTEXT "KB/sec",896,102,78,26,10
}
STRINGTABLE DISCARDABLE
{
IDS_FULLFRAMES "Кадри повністю (Без стиснення)"
}

4
reactos/dll/win32/msvfw32/msvfw32_Zh.rc
View file

@ -18,6 +18,8 @@
* 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)
@ -88,5 +90,3 @@ STRINGTABLE DISCARDABLE
{
IDS_FULLFRAMES "全幀(未壓縮)"
}
#pragma code_page(default)

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

@ -53,8 +53,6 @@ static inline const char *wine_dbgstr_fcc( DWORD fcc )
LOBYTE(HIWORD(fcc)), HIBYTE(HIWORD(fcc)));
}
LRESULT (CALLBACK *pFnCallTo16)(HDRVR, HIC, UINT, LPARAM, LPARAM) = NULL;
static WINE_HIC* MSVIDEO_FirstHic /* = NULL */;
typedef struct _reg_driver reg_driver;
@ -93,6 +91,92 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
return TRUE;
}
/******************************************************************
* MSVIDEO_SendMessage
*
*
*/
static LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, DWORD_PTR lParam2)
{
LRESULT ret;
#define XX(x) case x: TRACE("(%p,"#x",0x%08lx,0x%08lx)\n",whic,lParam1,lParam2); break
switch (msg) {
/* DRV_* */
XX(DRV_LOAD);
XX(DRV_ENABLE);
XX(DRV_OPEN);
XX(DRV_CLOSE);
XX(DRV_DISABLE);
XX(DRV_FREE);
/* ICM_RESERVED+X */
XX(ICM_ABOUT);
XX(ICM_CONFIGURE);
XX(ICM_GET);
XX(ICM_GETINFO);
XX(ICM_GETDEFAULTQUALITY);
XX(ICM_GETQUALITY);
XX(ICM_GETSTATE);
XX(ICM_SETQUALITY);
XX(ICM_SET);
XX(ICM_SETSTATE);
/* ICM_USER+X */
XX(ICM_COMPRESS_FRAMES_INFO);
XX(ICM_COMPRESS_GET_FORMAT);
XX(ICM_COMPRESS_GET_SIZE);
XX(ICM_COMPRESS_QUERY);
XX(ICM_COMPRESS_BEGIN);
XX(ICM_COMPRESS);
XX(ICM_COMPRESS_END);
XX(ICM_DECOMPRESS_GET_FORMAT);
XX(ICM_DECOMPRESS_QUERY);
XX(ICM_DECOMPRESS_BEGIN);
XX(ICM_DECOMPRESS);
XX(ICM_DECOMPRESS_END);
XX(ICM_DECOMPRESS_SET_PALETTE);
XX(ICM_DECOMPRESS_GET_PALETTE);
XX(ICM_DRAW_QUERY);
XX(ICM_DRAW_BEGIN);
XX(ICM_DRAW_GET_PALETTE);
XX(ICM_DRAW_START);
XX(ICM_DRAW_STOP);
XX(ICM_DRAW_END);
XX(ICM_DRAW_GETTIME);
XX(ICM_DRAW);
XX(ICM_DRAW_WINDOW);
XX(ICM_DRAW_SETTIME);
XX(ICM_DRAW_REALIZE);
XX(ICM_DRAW_FLUSH);
XX(ICM_DRAW_RENDERBUFFER);
XX(ICM_DRAW_START_PLAY);
XX(ICM_DRAW_STOP_PLAY);
XX(ICM_DRAW_SUGGESTFORMAT);
XX(ICM_DRAW_CHANGEPALETTE);
XX(ICM_GETBUFFERSWANTED);
XX(ICM_GETDEFAULTKEYFRAMERATE);
XX(ICM_DECOMPRESSEX_BEGIN);
XX(ICM_DECOMPRESSEX_QUERY);
XX(ICM_DECOMPRESSEX);
XX(ICM_DECOMPRESSEX_END);
XX(ICM_SET_STATUS_PROC);
default:
FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,msg,lParam1,lParam2);
}
#undef XX
if (whic->driverproc) {
/* dwDriverId parameter is the value returned by the DRV_OPEN */
ret = whic->driverproc(whic->driverId, whic->hdrv, msg, lParam1, lParam2);
} else {
ret = SendDriverMessage(whic->hdrv, msg, lParam1, lParam2);
}
TRACE(" -> 0x%08lx\n", ret);
return ret;
}
static int compare_fourcc(DWORD fcc1, DWORD fcc2)
{
char fcc_str1[4];
@ -154,7 +238,7 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param)
*
*
*/
WINE_HIC* MSVIDEO_GetHicPtr(HIC hic)
static WINE_HIC* MSVIDEO_GetHicPtr(HIC hic)
{
WINE_HIC* whic;
@ -310,7 +394,6 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode)
ICOPEN icopen;
HDRVR hdrv;
WINE_HIC* whic;
BOOL bIs16;
static const WCHAR drv32W[] = {'d','r','i','v','e','r','s','3','2','\0'};
reg_driver* driver;
@ -327,7 +410,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode)
if (driver && driver->proc)
/* The driver has been registered at runtime with its driverproc */
return MSVIDEO_OpenFunction(fccType, fccHandler, wMode, driver->proc, 0);
return ICOpenFunction(fccType, fccHandler, wMode, driver->proc);
/* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the
* same layout as ICOPEN
@ -358,13 +441,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode)
if (!hdrv)
return 0;
}
bIs16 = GetDriverFlags(hdrv) & 0x10000000; /* undocumented flag: WINE_GDF_16BIT */
if (bIs16 && !pFnCallTo16)
{
FIXME("Got a 16 bit driver, but no 16 bit support in msvfw\n");
return 0;
}
whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC));
if (!whic)
{
@ -372,13 +449,11 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode)
return FALSE;
}
whic->hdrv = hdrv;
/* FIXME: is the signature the real one ? */
whic->driverproc = bIs16 ? (DRIVERPROC)pFnCallTo16 : NULL;
whic->driverproc16 = 0;
whic->driverproc = NULL;
whic->type = fccType;
whic->handler = fccHandler;
while (MSVIDEO_GetHicPtr(HIC_32(IC_HandleRef)) != NULL) IC_HandleRef++;
whic->hic = HIC_32(IC_HandleRef++);
while (MSVIDEO_GetHicPtr((HIC)(ULONG_PTR)IC_HandleRef) != NULL) IC_HandleRef++;
whic->hic = (HIC)(ULONG_PTR)IC_HandleRef++;
whic->next = MSVIDEO_FirstHic;
MSVIDEO_FirstHic = whic;
@ -387,16 +462,15 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode)
}
/***********************************************************************
* MSVIDEO_OpenFunction
* ICOpenFunction [MSVFW32.@]
*/
HIC MSVIDEO_OpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode,
DRIVERPROC lpfnHandler, DWORD lpfnHandler16)
HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPROC lpfnHandler)
{
ICOPEN icopen;
WINE_HIC* whic;
TRACE("(%s,%s,%d,%p,%08x)\n",
wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode, lpfnHandler, lpfnHandler16);
TRACE("(%s,%s,%d,%p)\n",
wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode, lpfnHandler);
icopen.dwSize = sizeof(ICOPEN);
icopen.fccType = fccType;
@ -412,9 +486,8 @@ HIC MSVIDEO_OpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode,
if (!whic) return 0;
whic->driverproc = lpfnHandler;
whic->driverproc16 = lpfnHandler16;
while (MSVIDEO_GetHicPtr(HIC_32(IC_HandleRef)) != NULL) IC_HandleRef++;
whic->hic = HIC_32(IC_HandleRef++);
while (MSVIDEO_GetHicPtr((HIC)(ULONG_PTR)IC_HandleRef) != NULL) IC_HandleRef++;
whic->hic = (HIC)(ULONG_PTR)IC_HandleRef++;
whic->next = MSVIDEO_FirstHic;
MSVIDEO_FirstHic = whic;
@ -447,14 +520,6 @@ HIC MSVIDEO_OpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode,
return whic->hic;
}
/***********************************************************************
* ICOpenFunction [MSVFW32.@]
*/
HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler)
{
return MSVIDEO_OpenFunction(fccType, fccHandler, wMode, (DRIVERPROC)lpfnHandler, 0);
}
/***********************************************************************
* ICGetInfo [MSVFW32.@]
*/
@ -680,8 +745,6 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,
TRACE("(%p,%d,%p,%p,%p,%p)\n",hic,dwFlags,lpbiFormat,lpData,lpbi,lpBits);
TRACE("lpBits[0] == %x\n",((LPDWORD)lpBits)[0]);
icd.dwFlags = dwFlags;
icd.lpbiInput = lpbiFormat;
icd.lpInput = lpData;
@ -691,8 +754,6 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,
icd.ckid = 0;
ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS));
TRACE("lpBits[0] == %x\n",((LPDWORD)lpBits)[0]);
TRACE("-> %d\n",ret);
return ret;
@ -1017,93 +1078,6 @@ void VFWAPI ICCompressorFree(PCOMPVARS pc)
}
}
/******************************************************************
* MSVIDEO_SendMessage
*
*
*/
LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, DWORD_PTR lParam2)
{
LRESULT ret;
#define XX(x) case x: TRACE("(%p,"#x",0x%08lx,0x%08lx)\n",whic,lParam1,lParam2); break
switch (msg) {
/* DRV_* */
XX(DRV_LOAD);
XX(DRV_ENABLE);
XX(DRV_OPEN);
XX(DRV_CLOSE);
XX(DRV_DISABLE);
XX(DRV_FREE);
/* ICM_RESERVED+X */
XX(ICM_ABOUT);
XX(ICM_CONFIGURE);
XX(ICM_GET);
XX(ICM_GETINFO);
XX(ICM_GETDEFAULTQUALITY);
XX(ICM_GETQUALITY);
XX(ICM_GETSTATE);
XX(ICM_SETQUALITY);
XX(ICM_SET);
XX(ICM_SETSTATE);
/* ICM_USER+X */
XX(ICM_COMPRESS_FRAMES_INFO);
XX(ICM_COMPRESS_GET_FORMAT);
XX(ICM_COMPRESS_GET_SIZE);
XX(ICM_COMPRESS_QUERY);
XX(ICM_COMPRESS_BEGIN);
XX(ICM_COMPRESS);
XX(ICM_COMPRESS_END);
XX(ICM_DECOMPRESS_GET_FORMAT);
XX(ICM_DECOMPRESS_QUERY);
XX(ICM_DECOMPRESS_BEGIN);
XX(ICM_DECOMPRESS);
XX(ICM_DECOMPRESS_END);
XX(ICM_DECOMPRESS_SET_PALETTE);
XX(ICM_DECOMPRESS_GET_PALETTE);
XX(ICM_DRAW_QUERY);
XX(ICM_DRAW_BEGIN);
XX(ICM_DRAW_GET_PALETTE);
XX(ICM_DRAW_START);
XX(ICM_DRAW_STOP);
XX(ICM_DRAW_END);
XX(ICM_DRAW_GETTIME);
XX(ICM_DRAW);
XX(ICM_DRAW_WINDOW);
XX(ICM_DRAW_SETTIME);
XX(ICM_DRAW_REALIZE);
XX(ICM_DRAW_FLUSH);
XX(ICM_DRAW_RENDERBUFFER);
XX(ICM_DRAW_START_PLAY);
XX(ICM_DRAW_STOP_PLAY);
XX(ICM_DRAW_SUGGESTFORMAT);
XX(ICM_DRAW_CHANGEPALETTE);
XX(ICM_GETBUFFERSWANTED);
XX(ICM_GETDEFAULTKEYFRAMERATE);
XX(ICM_DECOMPRESSEX_BEGIN);
XX(ICM_DECOMPRESSEX_QUERY);
XX(ICM_DECOMPRESSEX);
XX(ICM_DECOMPRESSEX_END);
XX(ICM_SET_STATUS_PROC);
default:
FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,msg,lParam1,lParam2);
}
#undef XX
if (whic->driverproc) {
/* dwDriverId parameter is the value returned by the DRV_OPEN */
ret = whic->driverproc(whic->driverId, whic->hdrv, msg, lParam1, lParam2);
} else {
ret = SendDriverMessage(whic->hdrv, msg, lParam1, lParam2);
}
TRACE(" -> 0x%08lx\n", ret);
return ret;
}
/***********************************************************************
* ICSendMessage [MSVFW32.@]
*/

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

@ -19,6 +19,9 @@
#ifndef __WINE_MSVIDEO_PRIVATE_H
#define __WINE_MSVIDEO_PRIVATE_H
#include <windef.h>
#include <winuser.h>
#define ICM_CHOOSE_COMPRESSOR 1
#define IDC_COMP_LIST 880
#define IDS_FULLFRAMES 901
@ -36,26 +39,11 @@ typedef struct tagWINE_HIC {
WORD x2; /* 20: */
DWORD x3; /* 22: */
/* 26: */
DWORD driverproc16; /* Wine specific flags */
HIC hic;
DWORD driverId;
struct tagWINE_HIC* next;
} WINE_HIC;
HIC MSVIDEO_OpenFunction(DWORD, DWORD, UINT, DRIVERPROC, DWORD);
LRESULT MSVIDEO_SendMessage(WINE_HIC*, UINT, DWORD_PTR, DWORD_PTR);
WINE_HIC* MSVIDEO_GetHicPtr(HIC);
extern LRESULT (CALLBACK *pFnCallTo16)(HDRVR, HIC, UINT, LPARAM, LPARAM);
/* handle16 --> handle conversions */
#define HDRAWDIB_32(h16) ((HDRAWDIB)(ULONG_PTR)(h16))
#define HIC_32(h16) ((HIC)(ULONG_PTR)(h16))
/* handle --> handle16 conversions */
#define HDRVR_16(h32) (LOWORD(h32))
#define HDRAWDIB_16(h32) (LOWORD(h32))
#define HIC_16(h32) (LOWORD(h32))
#define IDC_CONFIGURE 882
#define IDC_ABOUT 883

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

@ -21,18 +21,23 @@
#include "msvideo_private.h"
#include "msvfw32_Da.rc"
#include "msvfw32_De.rc"
#include "msvfw32_En.rc"
#include "msvfw32_Es.rc"
#include "msvfw32_Fr.rc"
#include "msvfw32_Hu.rc"
#include "msvfw32_Ko.rc"
#include "msvfw32_Nl.rc"
#include "msvfw32_No.rc"
#include "msvfw32_Pl.rc"
#include "msvfw32_Pt.rc"
#include "msvfw32_Ru.rc"
#include "msvfw32_Si.rc"
#include "msvfw32_Sv.rc"
#include "msvfw32_Tr.rc"
/* UTF-8 */
#include "msvfw32_De.rc"
#include "msvfw32_Es.rc"
#include "msvfw32_Fr.rc"
#include "msvfw32_It.rc"
#include "msvfw32_Lt.rc"
#include "msvfw32_Ru.rc"
#include "msvfw32_Si.rc"
#include "msvfw32_Uk.rc"
#include "msvfw32_Zh.rc"

2
reactos/dll/win32/msvidc32/msvidc32_Da.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

4
reactos/dll/win32/msvidc32/msvidc32_De.rc
View file

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

2
reactos/dll/win32/msvidc32/msvidc32_En.rc
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

7
reactos/dll/win32/msvidc32/msvidc32_Fr.rc
View file

@ -16,10 +16,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
{
IDS_NAME "MS-CRAM"
IDS_DESCRIPTION "codec vidéo Wine Video 1"
IDS_DESCRIPTION "Codec vidéo Wine Video 1"
}

2
reactos/dll/win32/msvidc32/msvidc32_Hu.rc
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

30
reactos/dll/win32/msvidc32/msvidc32_Ja.rc Normal file
View file

@ -0,0 +1,30 @@
/*
* Copyright 2009 Aric Stewart, CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
{
IDS_NAME "MS-CRAM"
IDS_DESCRIPTION "Wine ビデオ 1 ビデオコーデック"
}

2
reactos/dll/win32/msvidc32/msvidc32_Ko.rc
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

30
reactos/dll/win32/msvidc32/msvidc32_Lt.rc Normal file
View file

@ -0,0 +1,30 @@
/*
* Copyright 2009 Aurimas Fišeras <aurimas@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
{
IDS_NAME "MS-CRAM"
IDS_DESCRIPTION "Wine Video 1 vaizdo kodekas"
}

2
reactos/dll/win32/msvidc32/msvidc32_Nl.rc
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE

2
reactos/dll/win32/msvidc32/msvidc32_No.rc
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE DISCARDABLE

2
reactos/dll/win32/msvidc32/msvidc32_Pl.rc
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

2
reactos/dll/win32/msvidc32/msvidc32_Pt.rc
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE

4
reactos/dll/win32/msvidc32/msvidc32_Ro.rc
View file

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

7
reactos/dll/win32/msvidc32/msvidc32_Ru.rc
View file

@ -16,10 +16,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
{
IDS_NAME "MS-CRAM"
IDS_DESCRIPTION "Âèäåî êîäåð Wine Video 1"
IDS_DESCRIPTION "Видео кодер Wine Video 1"
}

4
reactos/dll/win32/msvidc32/msvidc32_Si.rc
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@ -25,5 +27,3 @@ STRINGTABLE DISCARDABLE
IDS_NAME "MS-CRAM"
IDS_DESCRIPTION "Wine Video 1 video kodek"
}
#pragma code_page(default)

2
reactos/dll/win32/msvidc32/msvidc32_Sv.rc
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE

2
reactos/dll/win32/msvidc32/msvidc32_Tr.rc
View file

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE

31
reactos/dll/win32/msvidc32/msvidc32_Uk.rc Normal file
View file

@ -0,0 +1,31 @@
/*
* Copyright 2005 Dmitry Timoshkov
* Copyright 2010 Igor Paliychuk
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "msvidc32_private.h"
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
{
IDS_NAME "MS-CRAM"
IDS_DESCRIPTION "Відео кодек Wine Video 1"
}

2
reactos/dll/win32/msvidc32/msvidc32_private.h
View file

@ -19,6 +19,8 @@
#ifndef __MSVIDC32_PRIVATE_H
#define __MSVIDC32_PRIVATE_H
#include <windef.h>
#define IDS_NAME 100
#define IDS_DESCRIPTION 101

8
reactos/dll/win32/msvidc32/msvideo1.c
View file

@ -132,7 +132,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s
for (pixel_y = 0; pixel_y < 4; pixel_y++) {
for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1)
{
#if ORIGINAL
#ifdef ORIGINAL
pixels[pixel_ptr++] = colors[(flags & 0x1) ^ 1];
#else
pixels[width*(height-(pixel_ptr/width)-1) +
@ -154,7 +154,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s
for (pixel_y = 0; pixel_y < 4; pixel_y++) {
for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1)
{
#if ORIGINAL
#ifdef ORIGINAL
pixels[pixel_ptr++] =
colors[((pixel_y & 0x2) << 1) +
(pixel_x & 0x2) + ((flags & 0x1) ^ 1)];
@ -175,7 +175,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s
for (pixel_y = 0; pixel_y < 4; pixel_y++) {
for (pixel_x = 0; pixel_x < 4; pixel_x++)
{
#if ORIGINAL
#ifdef ORIGINAL
pixels[pixel_ptr++] = colors[0];
#else
pixels[width*(height-(pixel_ptr/width)-1) +
@ -508,7 +508,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
info = HeapAlloc( GetProcessHeap(), 0, sizeof (Msvideo1Context) );
if( info )
{
memset( info, 0, sizeof info );
memset( info, 0, sizeof *info );
info->dwMagic = CRAM_MAGIC;
}
r = (LRESULT) info;

13
reactos/dll/win32/msvidc32/rsrc.rc
View file

@ -20,8 +20,6 @@
#include "msvidc32_private.h"
#include "msvidc32_Da.rc"
#include "msvidc32_De.rc"
#include "msvidc32_Fr.rc"
#include "msvidc32_En.rc"
#include "msvidc32_Hu.rc"
#include "msvidc32_Ko.rc"
@ -29,8 +27,15 @@
#include "msvidc32_No.rc"
#include "msvidc32_Pl.rc"
#include "msvidc32_Pt.rc"
#include "msvidc32_Sv.rc"
#include "msvidc32_Tr.rc"
/* UTF-8 */
#include "msvidc32_De.rc"
#include "msvidc32_Fr.rc"
#include "msvidc32_Ja.rc"
#include "msvidc32_Lt.rc"
#include "msvidc32_Ro.rc"
#include "msvidc32_Ru.rc"
#include "msvidc32_Si.rc"
#include "msvidc32_Sv.rc"
#include "msvidc32_Tr.rc"
#include "msvidc32_Uk.rc"

56
reactos/dll/win32/nddeapi/nddeapi.spec
View file

@ -1,28 +1,28 @@
505 stdcall NDdeGetErrorStringA(long str long)
605 stdcall NDdeGetErrorStringW(long wstr long)
509 stub NDdeGetShareSecurityA
609 stub NDdeGetShareSecurityW
511 stub NDdeGetTrustedShareA
611 stub NDdeGetTrustedShareW
507 stub NDdeIsValidAppTopicListA
607 stub NDdeIsValidAppTopicListW
506 stub NDdeIsValidShareNameA
606 stub NDdeIsValidShareNameW
510 stub NDdeSetShareSecurityA
610 stub NDdeSetShareSecurityW
512 stub NDdeSetTrustedShareA
612 stub NDdeSetTrustedShareW
500 stub NDdeShareAddA
600 stub NDdeShareAddW
501 stub NDdeShareDelA
601 stub NDdeShareDelW
502 stub NDdeShareEnumA
602 stub NDdeShareEnumW
503 stub NDdeShareGetInfoA
603 stub NDdeShareGetInfoW
504 stub NDdeShareSetInfoA
604 stub NDdeShareSetInfoW
508 stub NDdeSpecialCommandA
608 stub NDdeSpecialCommandW
513 stub NDdeTrustedShareEnumA
613 stub NDdeTrustedShareEnumW
@ stdcall NDdeGetErrorStringA(long str long)
@ stdcall NDdeGetErrorStringW(long wstr long)
@ stub NDdeGetShareSecurityA
@ stub NDdeGetShareSecurityW
@ stub NDdeGetTrustedShareA
@ stub NDdeGetTrustedShareW
@ stub NDdeIsValidAppTopicListA
@ stub NDdeIsValidAppTopicListW
@ stub NDdeIsValidShareNameA
@ stub NDdeIsValidShareNameW
@ stub NDdeSetShareSecurityA
@ stub NDdeSetShareSecurityW
@ stub NDdeSetTrustedShareA
@ stub NDdeSetTrustedShareW
@ stub NDdeShareAddA
@ stub NDdeShareAddW
@ stub NDdeShareDelA
@ stub NDdeShareDelW
@ stub NDdeShareEnumA
@ stub NDdeShareEnumW
@ stub NDdeShareGetInfoA
@ stub NDdeShareGetInfoW
@ stub NDdeShareSetInfoA
@ stub NDdeShareSetInfoW
@ stub NDdeSpecialCommandA
@ stub NDdeSpecialCommandW
@ stub NDdeTrustedShareEnumA
@ stub NDdeTrustedShareEnumW

2
reactos/include/psdk/vfw.h
View file

@ -499,7 +499,7 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR
BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags);
LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo, DWORD cb);
HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode);
HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler);
HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPROC lpfnHandler);
LRESULT VFWAPI ICClose(HIC hic);
HIC VFWAPI ICLocate(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, WORD wFlags);