29 Nov
2007
29 Nov
'07
11:01 a.m.
Author: winesync
Date: Thu Nov 29 14:01:17 2007
New Revision: 30873
URL: http://svn.reactos.org/svn/reactos?rev=30873&view=rev
Log:
Autosyncing with Wine HEAD
Added:
trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc (with props)
Modified:
trunk/reactos/dll/win32/msvfw32/drawdib.c
trunk/reactos/dll/win32/msvfw32/mciwnd.c
trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild
trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc
trunk/reactos/dll/win32/msvfw32/rsrc.rc
Modified: trunk/reactos/dll/win32/msvfw32/drawdib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/drawdib.…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/drawdib.c (original)
+++ trunk/reactos/dll/win32/msvfw32/drawdib.c Thu Nov 29 14:01:17 2007
@@ -77,12 +77,12 @@
/***********************************************************************
* DrawDibOpen [MSVFW32.@]
*/
-HDRAWDIB VFWAPI DrawDibOpen(void)
+HDRAWDIB VFWAPI DrawDibOpen(void)
{
WINE_HDD* whdd;
TRACE("(void)\n");
-
+
whdd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_HDD));
TRACE("=> %p\n", whdd);
@@ -98,7 +98,7 @@
/***********************************************************************
* DrawDibClose [MSVFW32.@]
*/
-BOOL VFWAPI DrawDibClose(HDRAWDIB hdd)
+BOOL VFWAPI DrawDibClose(HDRAWDIB hdd)
{
WINE_HDD* whdd = MSVIDEO_GetHddPtr(hdd);
WINE_HDD** p;
@@ -126,7 +126,7 @@
/***********************************************************************
* DrawDibEnd [MSVFW32.@]
*/
-BOOL VFWAPI DrawDibEnd(HDRAWDIB hdd)
+BOOL VFWAPI DrawDibEnd(HDRAWDIB hdd)
{
BOOL ret = TRUE;
WINE_HDD *whdd = MSVIDEO_GetHddPtr(hdd);
@@ -145,7 +145,7 @@
/*if (whdd->lpvbits)
HeapFree(GetProcessHeap(), 0, whdd->lpvbuf);*/
- if (whdd->hMemDC)
+ if (whdd->hMemDC)
{
SelectObject(whdd->hMemDC, whdd->hOldDib);
DeleteDC(whdd->hMemDC);
@@ -155,7 +155,7 @@
if (whdd->hDib) DeleteObject(whdd->hDib);
whdd->hDib = 0;
- if (whdd->hic)
+ if (whdd->hic)
{
ICDecompressEnd(whdd->hic);
ICClose(whdd->hic);
@@ -177,7 +177,7 @@
LPBITMAPINFOHEADER lpbi,
INT dxSrc,
INT dySrc,
- UINT wFlags)
+ UINT wFlags)
{
BOOL ret = TRUE;
WINE_HDD *whdd;
@@ -199,28 +199,28 @@
if (whdd->begun) DrawDibEnd(hdd);
- if (lpbi->biCompression)
+ if (lpbi->biCompression)
{
DWORD size = 0;
whdd->hic = ICOpen(ICTYPE_VIDEO, lpbi->biCompression, ICMODE_DECOMPRESS);
- if (!whdd->hic)
+ if (!whdd->hic)
{
WARN("Could not open IC. biCompression == 0x%08x\n",
lpbi->biCompression);
ret = FALSE;
}
- if (ret)
+ if (ret)
{
size = ICDecompressGetFormat(whdd->hic, lpbi, NULL);
- if (size == ICERR_UNSUPPORTED)
+ if (size == ICERR_UNSUPPORTED)
{
WARN("Codec doesn't support GetFormat, giving up.\n");
ret = FALSE;
}
}
- if (ret)
+ if (ret)
{
whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, size);
@@ -228,18 +228,18 @@
ret = FALSE;
}
- if (ret)
+ if (ret)
{
/* FIXME: Use Ex functions if available? */
if (ICDecompressBegin(whdd->hic, lpbi, whdd->lpbiOut) != ICERR_OK)
ret = FALSE;
-
+
TRACE("biSizeImage == %d\n", whdd->lpbiOut->biSizeImage);
TRACE("biCompression == %d\n",
whdd->lpbiOut->biCompression);
TRACE("biBitCount == %d\n", whdd->lpbiOut->biBitCount);
}
}
- else
+ else
{
DWORD dwSize;
/* No compression */
@@ -249,14 +249,14 @@
memcpy(whdd->lpbiOut, lpbi, dwSize);
}
- if (ret)
+ if (ret)
{
/*whdd->lpvbuf = HeapAlloc(GetProcessHeap(), 0,
whdd->lpbiOut->biSizeImage);*/
whdd->hMemDC = CreateCompatibleDC(hdc);
TRACE("Creating: %d, %p\n", whdd->lpbiOut->biSize,
whdd->lpvbits);
whdd->hDib = CreateDIBSection(whdd->hMemDC, (BITMAPINFO *)whdd->lpbiOut,
DIB_RGB_COLORS, &(whdd->lpvbits), 0, 0);
- if (whdd->hDib)
+ if (whdd->hDib)
{
TRACE("Created: %p,%p\n", whdd->hDib, whdd->lpvbits);
}
@@ -268,7 +268,7 @@
whdd->hOldDib = SelectObject(whdd->hMemDC, whdd->hDib);
}
- if (ret)
+ if (ret)
{
whdd->hdc = hdc;
whdd->dxDst = dxDst;
@@ -279,8 +279,8 @@
whdd->dySrc = dySrc;
whdd->begun = TRUE;
whdd->hpal = 0;
- }
- else
+ }
+ else
{
if (whdd->hic)
ICClose(whdd->hic);
@@ -315,7 +315,7 @@
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);
- if (!lpBits)
+ if (!lpBits)
{
/* Undocumented? */
lpBits = (LPSTR)lpbi + (WORD)(lpbi->biSize) +
(WORD)(num_colours(lpbi)*sizeof(RGBQUAD));
@@ -324,9 +324,9 @@
#define CHANGED(x) (whdd->x != x)
- if ((!whdd->begun) ||
- (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) ||
- (!(wFlags & DDF_SAME_DRAW) && (CHANGED(lpbi) || CHANGED(dxSrc) ||
CHANGED(dySrc) || CHANGED(dxDst) || CHANGED(dyDst))))
+ if ((!whdd->begun) ||
+ (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) ||
+ (!(wFlags & DDF_SAME_DRAW) && (CHANGED(lpbi) || CHANGED(dxSrc) ||
CHANGED(dySrc) || CHANGED(dxDst) || CHANGED(dyDst))))
{
TRACE("Something changed!\n");
ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0);
@@ -334,13 +334,13 @@
#undef CHANGED
- if ((dxDst == -1) && (dyDst == -1))
+ if ((dxDst == -1) && (dyDst == -1))
{
dxDst = dxSrc;
dyDst = dySrc;
}
- if (!(wFlags & DDF_UPDATE))
+ if (!(wFlags & DDF_UPDATE))
{
DWORD biSizeImage = lpbi->biSizeImage;
@@ -348,7 +348,7 @@
if ((lpbi->biCompression == BI_RGB) && (biSizeImage == 0))
biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 *
lpbi->biHeight;
- if (lpbi->biCompression)
+ if (lpbi->biCompression)
{
DWORD flags = 0;
@@ -374,7 +374,7 @@
if (!(StretchBlt(whdd->hdc, xDst, yDst, dxDst, dyDst, whdd->hMemDC, xSrc, ySrc,
dxSrc, dySrc, SRCCOPY)))
ret = FALSE;
-
+
return ret;
}
@@ -406,7 +406,7 @@
/***********************************************************************
* DrawDibSetPalette [MSVFW32.@]
*/
-BOOL VFWAPI DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal)
+BOOL VFWAPI DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal)
{
WINE_HDD *whdd;
@@ -417,7 +417,7 @@
whdd->hpal = hpal;
- if (whdd->begun)
+ if (whdd->begun)
{
SelectPalette(whdd->hdc, hpal, 0);
RealizePalette(whdd->hdc);
@@ -438,7 +438,7 @@
/***********************************************************************
* DrawDibGetPalette [MSVFW32.@]
*/
-HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB hdd)
+HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB hdd)
{
WINE_HDD *whdd;
@@ -453,7 +453,7 @@
/***********************************************************************
* DrawDibRealize [MSVFW32.@]
*/
-UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground)
+UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground)
{
WINE_HDD *whdd;
HPALETTE oldPal;
@@ -464,7 +464,7 @@
whdd = MSVIDEO_GetHddPtr(hdd);
if (!whdd) return FALSE;
- if (!whdd || !(whdd->begun))
+ if (!whdd || !(whdd->begun))
{
ret = 0;
goto out;
Modified: trunk/reactos/dll/win32/msvfw32/mciwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/mciwnd.c…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/mciwnd.c (original)
+++ trunk/reactos/dll/win32/msvfw32/mciwnd.c Thu Nov 29 14:01:17 2007
@@ -1185,6 +1185,8 @@
if (!mwi->lasterror)
SendDlgItemMessageW(hWnd, CTL_TRACKBAR, TBM_SETRANGEMAX, 1,
SendMessageW(hWnd, MCIWNDM_GETLENGTH, 0, 0));
+
+ HeapFree(GetProcessHeap(), 0, cmdW);
}
if (wMsg == MCIWNDM_SETTIMEFORMATA)
Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild (original)
+++ trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild Thu Nov 29 14:01:17 2007
@@ -1,13 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="msvfw32" type="win32dll"
baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32"
installname="msvfw32.dll" allowwarnings="true">
<importlibrary definition="msvfw32.spec.def" />
<include base="msvfw32">.</include>
<include base="ReactOS">include/reactos/wine</include>
- <define name="__REACTOS__" />
<define name="__WINESRC__" />
- <define name="__USE_W32API" />
- <define name="_WIN32_IE">0x600</define>
- <define name="_WIN32_WINNT">0x501</define>
- <define name="WINVER">0x501</define>
+ <define name="WINVER">0x600</define>
+ <define name="_WIN32_WINNT">0x600</define>
<library>wine</library>
<library>winmm</library>
<library>comctl32</library>
Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc (original)
+++ trunk/reactos/dll/win32/msvfw32/msvfw32_Pl.rc Thu Nov 29 14:01:17 2007
@@ -43,7 +43,7 @@
CONTROL
"&Strumieñ",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,81,12
EDITTEXT 895,88,76,22,12
- LTEXT "KB/sec",896,114,78,31,10
+ LTEXT "KB/s",896,114,78,31,10
}
STRINGTABLE DISCARDABLE
Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc (added)
+++ trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc Thu Nov 29 14:01:17 2007
@@ -1,0 +1,51 @@
+/*
+ * Copyright 2007 Daniel Nylander
+ *
+ * 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_SWEDISH, SUBLANG_DEFAULT
+
+ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Videokomprimering"
+FONT 8, "MS Shell Dlg"
+{
+ DEFPUSHBUTTON "OK",IDOK,129,2,49,14
+ PUSHBUTTON "Avbryt",IDCANCEL,129,18,49,14
+
+ LTEXT "&Komprimering:",-1,9,6,105,8
+ COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
+
+ PUSHBUTTON "Kon&figurera...",882,129,36,49,14
+ PUSHBUTTON "&Om...",883,129,52,49,14
+
+ SCROLLBAR 884,9,44,111,9,WS_TABSTOP
+
+ LTEXT "Komprimeringsk&valitet:",886,9,34,80,8
+
+ CONTROL "&Nyckelbildrutor
varje",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12
+ EDITTEXT 888,78,60,22,12
+ LTEXT "frames",889,103,62,26,10
+
+ CONTROL
"&Datafrekvens",894,"Button",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 "Hela bildrutor (okomprimerat)"
+}
Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Sv.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/rsrc.rc (original)
+++ trunk/reactos/dll/win32/msvfw32/rsrc.rc Thu Nov 29 14:01:17 2007
@@ -27,4 +27,5 @@
#include "msvfw32_Ko.rc"
#include "msvfw32_No.rc"
#include "msvfw32_Pl.rc"
+#include "msvfw32_Sv.rc"
#include "msvfw32_Tr.rc"