September 2009 - Wine-commits

Nikolay Sivov : comctl32/monthcal: Use a style we're caching already.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: e430838e29393f84b18962c15148e783f3e10b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e430838e29393f84b18962c15… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 24 03:23:27 2009 +0400 comctl32/monthcal: Use a style we're caching already. --- dlls/comctl32/monthcal.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 7ad2d40..972c680 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -371,8 +371,7 @@ static void paint_button (const MONTHCAL_INFO *infoPtr, HDC hdc, BOOL btnNext, stateNum += 1; else { - DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); - if (dwStyle & WS_DISABLED) stateNum += 2; + if (infoPtr->dwStyle & WS_DISABLED) stateNum += 2; } DrawThemeBackground (theme, hdc, SBP_ARROWBTN, states[stateNum], r, NULL); } @@ -383,8 +382,7 @@ static void paint_button (const MONTHCAL_INFO *infoPtr, HDC hdc, BOOL btnNext, style |= DFCS_PUSHED; else { - DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); - if (dwStyle & WS_DISABLED) style |= DFCS_INACTIVE; + if (infoPtr->dwStyle & WS_DISABLED) style |= DFCS_INACTIVE; } DrawFrameControl(hdc, r, DFC_SCROLL, style); @@ -415,7 +413,6 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT WCHAR buf1[20]; WCHAR buf2[32]; COLORREF oldTextColor, oldBkColor; - DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); RECT rcTemp; RECT rcDay; /* used in MONTHCAL_CalcDayRect() */ SYSTEMTIME localtime; @@ -560,7 +557,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT if((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) && (day==infoPtr->todaysDate.wDay) && (infoPtr->currentYear == infoPtr->todaysDate.wYear)) { - if(!(dwStyle & MCS_NOTODAYCIRCLE)) + if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) MONTHCAL_CircleDay(infoPtr, hdc, day, infoPtr->currentMonth); } } @@ -582,7 +579,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT if((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) && (day==infoPtr->todaysDate.wDay) && (infoPtr->currentYear == infoPtr->todaysDate.wYear)) - if(!(dwStyle & MCS_NOTODAYCIRCLE)) + if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) MONTHCAL_CircleDay(infoPtr, hdc, day, infoPtr->currentMonth); } mask<<=1; @@ -623,8 +620,8 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT /* draw `today' date if style allows it, and draw a circle before today's * date if necessary */ - if(!(dwStyle & MCS_NOTODAY)) { - if(!(dwStyle & MCS_NOTODAYCIRCLE)) { + if(!(infoPtr->dwStyle & MCS_NOTODAY)) { + if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) { /*day is the number of days from nextmonth we put on the calendar */ MONTHCAL_CircleDay(infoPtr, hdc, day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear), @@ -650,7 +647,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT } /*eventually draw week numbers*/ - if(dwStyle & MCS_WEEKNUMBERS) { + if(infoPtr->dwStyle & MCS_WEEKNUMBERS) { /* display weeknumbers*/ int mindays; @@ -747,7 +744,7 @@ MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, LPRECT lpRect) lpRect->top = infoPtr->title.top; lpRect->right = infoPtr->title.right; lpRect->bottom = infoPtr->todayrect.bottom; - AdjustWindowRect(lpRect, GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE), FALSE); + AdjustWindowRect(lpRect, infoPtr->dwStyle, FALSE); TRACE("%s\n", wine_dbgstr_rect(lpRect));

1 0

Nikolay Sivov : comctl32/monthcal: Move helper parameter cast to winproc, remove dead parameter check code.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 6fd4ba34a396ab896de70800979ff7c7cc5238a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd4ba34a396ab896de708009… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 24 03:02:31 2009 +0400 comctl32/monthcal: Move helper parameter cast to winproc, remove dead parameter check code. --- dlls/comctl32/monthcal.c | 216 ++++++++++++++++++++-------------------------- 1 files changed, 93 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fd4ba34a396ab896de70…

1 0

Nikolay Sivov : comctl32/listview: Skip icon spacing tests when unsupported .
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: d7117d312db7fbb68f2b193a478d3bdc44555445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7117d312db7fbb68f2b193a4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 24 00:15:51 2009 +0400 comctl32/listview: Skip icon spacing tests when unsupported. --- dlls/comctl32/tests/listview.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 554c94c..31b09a3 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3,6 +3,7 @@ * * Copyright 2006 Mike McCormack for CodeWeavers * Copyright 2007 George Gov + * Copyright 2009 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1606,6 +1607,13 @@ static void test_icon_spacing(void) "Expected %d, got %d\n", MAKELONG(w, h), r); r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(25, 35)); + if (r == 0) + { + /* version 4.0 */ + win_skip("LVM_SETICONSPACING unimplemented. Skipping.\n"); + DestroyWindow(hwnd); + return; + } expect(MAKELONG(20,30), r); r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(-1,-1));

1 0

Nikolay Sivov : comctl32/listview: Skip some header tests on version 4. 0 module.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 5e3c9925f8999a03e5e64a270495b73dd0b4acb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3c9925f8999a03e5e64a270… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 24 00:04:01 2009 +0400 comctl32/listview: Skip some header tests on version 4.0 module. --- dlls/comctl32/tests/listview.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index cd79fd5..554c94c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1289,6 +1289,15 @@ static void test_create(void) hList = CreateWindow("MyListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); ok((HIMAGELIST)SendMessage(hList, LVM_GETIMAGELIST, 0, 0) == test_create_imagelist, "Image list not obtained\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + + if (!IsWindow(hHeader)) + { + /* version 4.0 */ + win_skip("LVM_GETHEADER not implemented. Skipping.\n"); + DestroyWindow(hList); + return; + } + ok(IsWindow(hHeader) && IsWindowVisible(hHeader), "Listview not in report mode\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList);

1 0

Alexandre Julliard : ntdll: Move creation of the CPU-specific registry keys to wineboot.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: a022062cab2f927d6f027c1ae36238b21782fe70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a022062cab2f927d6f027c1ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 24 14:22:57 2009 +0200 ntdll: Move creation of the CPU-specific registry keys to wineboot. --- dlls/ntdll/nt.c | 156 ------------------------------------------ programs/wineboot/wineboot.c | 122 +++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a022062cab2f927d6f027…

1 0

Jacek Caban : jscript: Throw type error from call and apply functions.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 7f2d50f3445e30453d26fc5a7c21d9fb32f4cf2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2d50f3445e30453d26fc5a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 00:45:42 2009 +0200 jscript: Throw type error from call and apply functions. --- dlls/jscript/function.c | 13 ++++--------- dlls/jscript/tests/api.js | 8 ++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 88bf9c3..cbdc08b 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -416,13 +416,10 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI TRACE("\n"); - if(!(function = function_from_vdisp(jsthis))) { - FIXME("dispex is not a function\n"); - return E_FAIL; - } + if(!(function = function_this(jsthis))) + return throw_type_error(ctx, ei, IDS_NOT_FUNC, NULL); argc = arg_cnt(dp); - if(argc) { hres = to_object(ctx, get_arg(dp,0), &this_obj); if(FAILED(hres)) @@ -471,10 +468,8 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS TRACE("\n"); - if(!(function = function_from_vdisp(jsthis))) { - FIXME("dispex is not a function\n"); - return E_FAIL; - } + if(!(function = function_this(jsthis))) + return throw_type_error(ctx, ei, IDS_NOT_FUNC, NULL); argc = arg_cnt(dp); if(argc) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 5b215f5..2e4b0aa 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1688,6 +1688,14 @@ function testArrayThis(func) { testArrayThis("toString"); +function testFunctionThis(func) { + testThisExcept(Function.prototype[func], -2146823286); +} + +testFunctionThis("toString"); +testFunctionThis("call"); +testFunctionThis("apply"); + function testArrayHostThis(func) { exception_test(function() { Array.prototype[func].call(testObj); }, "TypeError", -2146823274); }

1 0

Jacek Caban : jscript: Added Object. toString implementation for variable object.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 52ac3b3bf02792c998cc8687de43e0d8ab107074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ac3b3bf02792c998cc8687d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 00:45:21 2009 +0200 jscript: Added Object.toString implementation for variable object. --- dlls/jscript/object.c | 2 +- dlls/jscript/tests/api.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index f5bc455..8dbae52 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -51,7 +51,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ - static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, + static const WCHAR *names[] = {objectW, arrayW, booleanW, dateW, errorW, functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW}; TRACE("\n"); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index aed26ec..5b215f5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -88,7 +88,11 @@ ok(tmp.f() === "[object RegExp]", "tmp.f() = " + tmp.f()); (tmp = new String).f = Object.prototype.toString; ok(tmp.f() === "[object String]", "tmp.f() = " + tmp.f()); tmp = Object.prototype.toString.call(testObj); -ok(tmp === "[object Object]", "'' + new Object() = " + tmp); +ok(tmp === "[object Object]", "toString.call(testObj) = " + tmp); +tmp = Object.prototype.toString.call(this); +ok(tmp === "[object Object]", "toString.call(this) = " + tmp); +(function () { tmp = Object.prototype.toString.call(arguments); })(); +ok(tmp === "[object Object]", "toString.call(arguments) = " + tmp); ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); ok(Object("") instanceof String, "Object('') is not instance of String");

1 0

Jacek Caban : jscript: Throw type error fot Array.toString with wrong 'this ' call.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: c168918d7534e641f71e1972eaf2ca54be72b137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c168918d7534e641f71e1972e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 00:45:00 2009 +0200 jscript: Throw type error fot Array.toString with wrong 'this' call. --- dlls/jscript/array.c | 6 +--- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 63 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 1fa20fe..941e414 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -936,10 +936,8 @@ static HRESULT Array_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI TRACE("\n"); array = array_this(jsthis); - if(!array) { - FIXME("not Array object\n"); - return E_FAIL; - } + if(!array) + return throw_type_error(ctx, ei, IDS_ARRAY_EXPECTED, NULL); return array_join(ctx, &array->dispex, array->length, default_separatorW, retv, ei, sp); } diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 79921b4..7962ad3 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -41,4 +41,5 @@ STRINGTABLE DISCARDABLE IDS_JSCRIPT_EXPECTED "JScript object expected" IDS_REGEXP_SYNTAX_ERROR "Syntax error in regular expression" IDS_INVALID_LENGTH "Array length must be a finite positive integer" + IDS_ARRAY_EXPECTED "Array object expected" } diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 81cd74d..fcebcb9 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -37,3 +37,4 @@ #define IDS_JSCRIPT_EXPECTED 0x1396 #define IDS_REGEXP_SYNTAX_ERROR 0x1399 #define IDS_INVALID_LENGTH 0x13A5 +#define IDS_ARRAY_EXPECTED 0x13A7 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1c2f56b..aed26ec 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1621,6 +1621,69 @@ exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); exception_test(function() {eval("nonexistingfunc()")}, "TypeError", -2146823281); exception_test(function() {RegExp(/a/, "g");}, "RegExpError", -2146823271); +function testThisExcept(func, number) { + exception_test(function() {func.call(new Object())}, "TypeError", number); +} + +function testBoolThis(func) { + testThisExcept(Boolean.prototype[func], -2146823278); +} + +testBoolThis("toString"); +testBoolThis("valueOf"); + +function testDateThis(func) { + testThisExcept(Date.prototype[func], -2146823282); +} + +testDateThis("getDate"); +testDateThis("getDay"); +testDateThis("getFullYear"); +testDateThis("getHours"); +testDateThis("getMilliseconds"); +testDateThis("getMinutes"); +testDateThis("getMonth"); +testDateThis("getSeconds"); +testDateThis("getTime"); +testDateThis("getTimezoneOffset"); +testDateThis("getUTCDate"); +testDateThis("getUTCDay"); +testDateThis("getUTCFullYear"); +testDateThis("getUTCHours"); +testDateThis("getUTCMilliseconds"); +testDateThis("getUTCMinutes"); +testDateThis("getUTCMonth"); +testDateThis("getUTCSeconds"); +testDateThis("setDate"); +testDateThis("setFullYear"); +testDateThis("setHours"); +testDateThis("setMilliseconds"); +testDateThis("setMinutes"); +testDateThis("setMonth"); +testDateThis("setSeconds"); +testDateThis("setTime"); +testDateThis("setUTCDate"); +testDateThis("setUTCFullYear"); +testDateThis("setUTCHours"); +testDateThis("setUTCMilliseconds"); +testDateThis("setUTCMinutes"); +testDateThis("setUTCMonth"); +testDateThis("setUTCSeconds"); +testDateThis("toDateString"); +testDateThis("toLocaleDateString"); +testDateThis("toLocaleString"); +testDateThis("toLocaleTimeString"); +testDateThis("toString"); +testDateThis("toTimeString"); +testDateThis("toUTCString"); +testDateThis("valueOf"); + +function testArrayThis(func) { + testThisExcept(Array.prototype[func], -2146823257); +} + +testArrayThis("toString"); + function testArrayHostThis(func) { exception_test(function() { Array.prototype[func].call(testObj); }, "TypeError", -2146823274); }

1 0

Jacek Caban : jscript: Fixed to_object for NULL IDispatch.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: a8c7e97d0a20ad55640939edb380e1ab4a499d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c7e97d0a20ad55640939edb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 00:44:30 2009 +0200 jscript: Fixed to_object for NULL IDispatch. --- dlls/jscript/jsutils.c | 14 ++++++++++++-- dlls/jscript/tests/lang.js | 5 +++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index c4e3df2..80cce59 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -603,8 +603,18 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) *disp = (IDispatch*)_IDispatchEx_(dispex); break; case VT_DISPATCH: - IDispatch_AddRef(V_DISPATCH(v)); - *disp = V_DISPATCH(v); + if(V_DISPATCH(v)) { + IDispatch_AddRef(V_DISPATCH(v)); + *disp = V_DISPATCH(v); + }else { + DispatchEx *obj; + + hres = create_object(ctx, NULL, &obj); + if(FAILED(hres)) + return hres; + + *disp = (IDispatch*)_IDispatchEx_(obj); + } break; case VT_BOOL: hres = create_bool(ctx, V_BOOL(v), &dispex); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index eed0589..353dcd7 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -948,6 +948,11 @@ ok(!nullDisp === true, "!nullDisp = " + !nullDisp); ok(String(nullDisp) === "null", "String(nullDisp) = " + String(nullDisp)); ok(nullDisp != new Object(), "nullDisp == new Object()"); ok(new Object() != nullDisp, "new Object() == nullDisp"); +ok((typeof Object(nullDisp)) === "object", "typeof Object(nullDisp) !== 'object'"); +tmp = getVT(Object(nullDisp)); +ok(tmp === "VT_DISPATCH", "getVT(Object(nullDisp) = " + tmp); +tmp = Object(nullDisp).toString(); +ok(tmp === "[object Object]", "Object(nullDisp).toString() = " + tmp); function do_test() {} function nosemicolon() {} nosemicolon();

1 0

Jörg Höhle : mciwave: Require at least 16 bytes in the WAVE fmt file header.
by Alexandre Julliard 24 Sep '09

24 Sep '09

Module: wine Branch: master Commit: 1a6aa9630571e10f94b69352d80f4c289485168e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6aa9630571e10f94b69352d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 24 08:22:43 2009 +0200 mciwave: Require at least 16 bytes in the WAVE fmt file header. --- dlls/mciwave/mciwave.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index c533e85..66af58a 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -255,7 +255,7 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) wmw->lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!wmw->lpWaveFormat) return MMSYSERR_NOMEM; r = mmioRead(wmw->hFile, (HPSTR)wmw->lpWaveFormat, mmckInfo.cksize); - if (r < sizeof(WAVEFORMAT)) + if (r < sizeof(PCMWAVEFORMAT)) return MCIERR_INVALID_FILE; TRACE("wFormatTag=%04X !\n", wmw->lpWaveFormat->wFormatTag);

1 0