mirror of
https://github.com/reactos/reactos.git
synced 2024-10-02 07:26:47 +00:00
Autosyncing with Wine HEAD
svn path=/trunk/; revision=27910
This commit is contained in:
parent
cb1824c717
commit
2a21dbe77b
|
@ -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 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa
|
|||
{
|
||||
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 @@ end_of_mci_open:
|
|||
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 @@ end_of_mci_open:
|
|||
{
|
||||
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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -107,9 +107,8 @@ typedef BOOL (*enum_handler_t)(const char*, int, void*);
|
|||
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 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param)
|
|||
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 @@ HANDLE VFWAPI ICImageDecompress(
|
|||
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;
|
||||
|
|
Loading…
Reference in a new issue