[ros-diffs] [winesync] 27910: Autosyncing with Wine HEAD
winesync at svn.reactos.org
winesync at svn.reactos.org
Fri Jul 27 11:45:03 CEST 2007
Author: winesync
Date: Fri Jul 27 13:45:02 2007
New Revision: 27910
URL: http://svn.reactos.org/svn/reactos?rev=27910&view=rev
Log:
Autosyncing with Wine HEAD
Modified:
trunk/reactos/dll/win32/msvfw32/mciwnd.c
trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc
trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc
trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc
trunk/reactos/dll/win32/msvfw32/msvideo_main.c
Modified: trunk/reactos/dll/win32/msvfw32/mciwnd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/mciwnd.c?rev=27910&r1=27909&r2=27910&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/mciwnd.c (original)
+++ trunk/reactos/dll/win32/msvfw32/mciwnd.c Fri Jul 27 13:45:02 2007
@@ -28,7 +28,6 @@
#include "winnls.h"
#include "wingdi.h"
#include "winuser.h"
-#include "winreg.h"
#include "winternl.h"
#include "vfw.h"
#include "digitalv.h"
@@ -448,7 +447,7 @@
{
MCIWndInfo *mwi;
- TRACE("%p %04x %08x %08lx\n", hWnd, wMsg, wParam, lParam);
+ TRACE("%p %04x %08lx %08lx\n", hWnd, wMsg, wParam, lParam);
mwi = (MCIWndInfo*)GetWindowLongW(hWnd, 0);
if (!mwi && wMsg != WM_CREATE)
@@ -1057,7 +1056,7 @@
return mwi->inactive_timer;
case MCIWNDM_CHANGESTYLES:
- TRACE("MCIWNDM_CHANGESTYLES mask %08x, set %08lx\n", wParam, lParam);
+ TRACE("MCIWNDM_CHANGESTYLES mask %08lx, set %08lx\n", wParam, lParam);
/* FIXME: update the visual window state as well:
* add/remove trackbar, autosize, etc.
*/
@@ -1121,7 +1120,7 @@
{
MCI_STATUS_PARMS mci_status;
- TRACE("MCIWNDM_GETTIMEFORMAT %08x %08lx\n", wParam, lParam);
+ TRACE("MCIWNDM_GETTIMEFORMAT %08lx %08lx\n", wParam, lParam);
/* get format string if requested */
if (wParam && lParam)
Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc?rev=27910&r1=27909&r2=27910&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc (original)
+++ trunk/reactos/dll/win32/msvfw32/msvfw32_En.rc Fri Jul 27 13:45:02 2007
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc?rev=27910&r1=27909&r2=27910&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc (original)
+++ trunk/reactos/dll/win32/msvfw32/msvfw32_Ko.rc Fri Jul 27 13:45:02 2007
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
Modified: trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc?rev=27910&r1=27909&r2=27910&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc (original)
+++ trunk/reactos/dll/win32/msvfw32/msvfw32_No.rc Fri Jul 27 13:45:02 2007
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
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=27910&r1=27909&r2=27910&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvideo_main.c (original)
+++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c Fri Jul 27 13:45:02 2007
@@ -107,9 +107,8 @@
static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param)
{
CHAR buf[2048], fccTypeStr[5], *s;
- DWORD i, cnt = 0, bufLen, lRet;
+ DWORD i, cnt = 0, lRet;
BOOL result = FALSE;
- FILETIME lastWrite;
HKEY hKey;
fourcc_to_string(fccTypeStr, fccType);
@@ -119,14 +118,17 @@
lRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, HKLM_DRIVERS32, 0, KEY_QUERY_VALUE, &hKey);
if (lRet == ERROR_SUCCESS)
{
- DWORD numkeys;
- RegQueryInfoKeyA( hKey, 0, 0, 0, &numkeys, 0, 0, 0, 0, 0, 0, 0);
- for (i = 0; i < numkeys; i++)
+ DWORD name, data, type;
+ i = 0;
+ for (;;)
{
- bufLen = sizeof(buf) / sizeof(buf[0]);
- lRet = RegEnumKeyExA(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite);
+ name = 10;
+ data = sizeof buf - name;
+ lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name), &data);
+ if (lRet == ERROR_NO_MORE_ITEMS) break;
if (lRet != ERROR_SUCCESS) continue;
- if (strncasecmp(buf, fccTypeStr, 5) || buf[9] != '=') continue;
+ if (name != 9 || strncasecmp(buf, fccTypeStr, 5)) continue;
+ buf[name] = '=';
if ((result = handler(buf, cnt++, param))) break;
}
RegCloseKey( hKey );
@@ -1294,10 +1296,9 @@
cbHdr = ICDecompressGetFormatSize(hic,lpbiIn);
if ( cbHdr < sizeof(BITMAPINFOHEADER) )
goto err;
- pHdr = HeapAlloc(GetProcessHeap(),0,cbHdr+sizeof(RGBQUAD)*256);
+ pHdr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,cbHdr+sizeof(RGBQUAD)*256);
if ( pHdr == NULL )
goto err;
- ZeroMemory( pHdr, cbHdr+sizeof(RGBQUAD)*256 );
if ( ICDecompressGetFormat( hic, lpbiIn, (BITMAPINFO*)pHdr ) != ICERR_OK )
goto err;
lpbiOut = (BITMAPINFO*)pHdr;
More information about the Ros-diffs
mailing list