[ros-diffs] [winesync] 32852: Autosyncing with Wine HEAD
winesync at svn.reactos.org
winesync at svn.reactos.org
Fri Apr 4 15:49:06 CEST 2008
Author: winesync
Date: Fri Apr 4 08:49:05 2008
New Revision: 32852
URL: http://svn.reactos.org/svn/reactos?rev=32852&view=rev
Log:
Autosyncing with Wine HEAD
Added:
trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc (with props)
Modified:
trunk/reactos/dll/win32/msvfw32/drawdib.c
trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild
trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc
trunk/reactos/dll/win32/msvfw32/msvideo_main.c
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.c?rev=32852&r1=32851&r2=32852&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/drawdib.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/drawdib.c [iso-8859-1] Fri Apr 4 08:49:05 2008
@@ -133,6 +133,8 @@
TRACE("(%p)\n", hdd);
+ if (!whdd) return FALSE;
+
whdd->hpal = 0; /* Do not free this */
whdd->hdc = 0;
HeapFree(GetProcessHeap(), 0, whdd->lpbi);
Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild?rev=32852&r1=32851&r2=32852&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild [iso-8859-1] Fri Apr 4 08:49:05 2008
@@ -8,6 +8,11 @@
<define name="__WINESRC__" />
<define name="WINVER">0x600</define>
<define name="_WIN32_WINNT">0x600</define>
+ <file>mciwnd.c</file>
+ <file>msvideo_main.c</file>
+ <file>drawdib.c</file>
+ <file>rsrc.rc</file>
+ <file>msvfw32.spec</file>
<library>wine</library>
<library>winmm</library>
<library>version</library>
@@ -17,10 +22,5 @@
<library>advapi32</library>
<library>kernel32</library>
<library>ntdll</library>
- <file>mciwnd.c</file>
- <file>msvideo_main.c</file>
- <file>drawdib.c</file>
- <file>rsrc.rc</file>
- <file>msvfw32.spec</file>
</module>
</group>
Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc?rev=32852&r1=32851&r2=32852&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/msvfw32_Es.rc [iso-8859-1] Fri Apr 4 08:49:05 2008
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
Added: trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc?rev=32852&view=auto
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc (added)
+++ trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc [iso-8859-1] Fri Apr 4 08:49:05 2008
@@ -1,0 +1,51 @@
+/*
+ * Copyright 2008 Frans Kool
+ *
+ * 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_DUTCH, SUBLANG_NEUTRAL
+
+ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Video Compressie"
+FONT 8, "MS Shell Dlg"
+{
+ DEFPUSHBUTTON "OK",IDOK,129,2,49,14
+ PUSHBUTTON "Annuleren",IDCANCEL,129,18,49,14
+
+ LTEXT "&Compressor:",-1,9,6,105,8
+ COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
+
+ PUSHBUTTON "Con&figureer...",882,129,36,49,14
+ PUSHBUTTON "&Over...",883,129,52,49,14
+
+ SCROLLBAR 884,9,44,111,9,WS_TABSTOP
+
+ LTEXT "Compressie &Kwaliteit:",886,9,34,80,8
+
+ CONTROL "&Key Frame Elke",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 Snelheid",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 "Volledige Frames (Ongecomprimeerd)"
+}
Propchange: trunk/reactos/dll/win32/msvfw32/msvfw32_Nl.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_main.c?rev=32852&r1=32851&r2=32852&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] Fri Apr 4 08:49:05 2008
@@ -753,7 +753,7 @@
idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)icinfo.szDescription);
ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info));
- memcpy(&ic->icinfo, &icinfo, sizeof(ICINFO));
+ ic->icinfo = icinfo;
ic->hic = hic;
SendMessageW(list, CB_SETITEMDATA, idx, (LPARAM)ic);
}
@@ -1449,7 +1449,7 @@
if (!pc->lpbiIn)
return FALSE;
- memcpy(pc->lpbiIn, lpbiIn, sizeof(BITMAPINFO));
+ *pc->lpbiIn = *lpbiIn;
pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage);
if (!pc->lpBitsPrev)
{
Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?rev=32852&r1=32851&r2=32852&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] Fri Apr 4 08:49:05 2008
@@ -26,6 +26,7 @@
#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_Sv.rc"
More information about the Ros-diffs
mailing list