diff --git a/reactos/dll/win32/msvfw32/drawdib.c b/reactos/dll/win32/msvfw32/drawdib.c index 734f0e20b49..3b308237f2f 100644 --- a/reactos/dll/win32/msvfw32/drawdib.c +++ b/reactos/dll/win32/msvfw32/drawdib.c @@ -183,7 +183,7 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd, WINE_HDD *whdd; TRACE("(%p,%p,%d,%d,%p,%d,%d,0x%08x)\n", - hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, (DWORD)wFlags); + hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, wFlags); TRACE("lpbi: %d,%d/%d,%d,%d,%d,%d,%d,%d,%d,%d\n", lpbi->biSize, lpbi->biWidth, lpbi->biHeight, lpbi->biPlanes, @@ -305,7 +305,7 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, BOOL ret = TRUE; TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08x)\n", - hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, (DWORD)wFlags); + hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, wFlags); whdd = MSVIDEO_GetHddPtr(hdd); if (!whdd) return FALSE; @@ -313,7 +313,7 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, TRACE("whdd=%p\n", whdd); if (wFlags & ~(DDF_SAME_HDC | DDF_SAME_DRAW | DDF_NOTKEYFRAME | DDF_UPDATE | DDF_DONTDRAW | DDF_BACKGROUNDPAL)) - FIXME("wFlags == 0x%08x not handled\n", (DWORD)wFlags); + FIXME("wFlags == 0x%08x not handled\n", wFlags); if (!lpBits) { diff --git a/reactos/dll/win32/msvfw32/msvfw32.rbuild b/reactos/dll/win32/msvfw32/msvfw32.rbuild index 3b6171614e0..5d6735078d2 100644 --- a/reactos/dll/win32/msvfw32/msvfw32.rbuild +++ b/reactos/dll/win32/msvfw32/msvfw32.rbuild @@ -1,5 +1,6 @@ + . @@ -9,8 +10,8 @@ 0x600 wine winmm - comctl32 version + comctl32 user32 gdi32 advapi32 @@ -22,3 +23,4 @@ rsrc.rc msvfw32.spec + diff --git a/reactos/dll/win32/msvfw32/msvfw32_Es.rc b/reactos/dll/win32/msvfw32/msvfw32_Es.rc new file mode 100644 index 00000000000..0f3803bb91a --- /dev/null +++ b/reactos/dll/win32/msvfw32/msvfw32_Es.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2007 Luis Carlos Busquets Pérez + * + * 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 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Compresión de vídeo" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "Aceptar",IDOK,129,2,49,14 + PUSHBUTTON "Cancelar",IDCANCEL,129,18,49,14 + + LTEXT "&Compresor:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "C&onfigurar...",882,129,36,49,14 + PUSHBUTTON "&Acerca de...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "C&alidad de compresión:",886,9,34,80,8 + + CONTROL "C&uadro clave cada",887,"Botón",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "cuadros",889,103,62,26,10 + + CONTROL "&Velocidad de datos",894,"Botón",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/s",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Cuadros completos (no comprimidos)" +} diff --git a/reactos/dll/win32/msvfw32/msvideo16.c b/reactos/dll/win32/msvfw32/msvideo16.c index 00e08890596..221542c5cc3 100644 --- a/reactos/dll/win32/msvfw32/msvideo16.c +++ b/reactos/dll/win32/msvfw32/msvideo16.c @@ -693,7 +693,7 @@ static LRESULT CALLBACK IC_Callback3216(HIC hic, HDRVR hdrv, UINT msg, DWORD l args[2] = LOWORD(lp1); args[1] = HIWORD(lp2); args[0] = LOWORD(lp2); - WOWCallback16Ex( (DWORD)whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &ret ); + WOWCallback16Ex( whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &ret ); switch (msg) { @@ -745,7 +745,7 @@ LRESULT VFWAPI ICSendMessage16(HIC16 hic, UINT16 msg, DWORD lParam1, DWORD lPara args[2] = LOWORD(lParam1); args[1] = HIWORD(lParam2); args[0] = LOWORD(lParam2); - WOWCallback16Ex( (DWORD)whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &result ); + WOWCallback16Ex( whic->driverproc16, WCB16_PASCAL, sizeof(args), args, &result ); ret = result; } else @@ -813,7 +813,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len, } } - if (nr || !found) + if (!found) { TRACE("No more VID* entries found nr=%d\n", nr); return 20; diff --git a/reactos/dll/win32/msvfw32/msvideo_main.c b/reactos/dll/win32/msvfw32/msvideo_main.c index 85a08fa4a73..aaf8d0c07e2 100644 --- a/reactos/dll/win32/msvfw32/msvideo_main.c +++ b/reactos/dll/win32/msvfw32/msvideo_main.c @@ -87,7 +87,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); - MSVFW32_hModule = (HMODULE)hinst; + MSVFW32_hModule = hinst; break; } return TRUE; @@ -327,7 +327,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, (DRIVERPROC)driver->proc, (DWORD)NULL); + return MSVIDEO_OpenFunction(fccType, fccHandler, wMode, driver->proc, 0); /* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the * same layout as ICOPEN @@ -1088,7 +1088,7 @@ LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, DWORD_P XX(ICM_DECOMPRESSEX_END); XX(ICM_SET_STATUS_PROC); default: - FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,(DWORD)msg,lParam1,lParam2); + FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,msg,lParam1,lParam2); } #undef XX @@ -1360,7 +1360,7 @@ err: GlobalFree(hMem); hMem = NULL; } - return (HANDLE)hMem; + return hMem; } /*********************************************************************** diff --git a/reactos/dll/win32/msvfw32/rsrc.rc b/reactos/dll/win32/msvfw32/rsrc.rc index 089c0b2980c..802ffb32018 100644 --- a/reactos/dll/win32/msvfw32/rsrc.rc +++ b/reactos/dll/win32/msvfw32/rsrc.rc @@ -22,6 +22,7 @@ #include "msvfw32_De.rc" #include "msvfw32_En.rc" +#include "msvfw32_Es.rc" #include "msvfw32_Fr.rc" #include "msvfw32_Hu.rc" #include "msvfw32_Ko.rc"