Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 75894: [PROPSYS] Sync with Wine Staging 2.16. CORE-13762 7960ed9 propsys: Don't use the format string size as buffer size.
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:56:55 2017 New Revision: 75894 URL: http://svn.reactos.org/svn/reactos?rev=75894&view=rev Log: [PROPSYS] Sync with Wine Staging 2.16. CORE-13762 7960ed9 propsys: Don't use the format string size as buffer size. Modified: trunk/reactos/dll/win32/propsys/propvar.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/propsys/propvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propvar.… ============================================================================== --- trunk/reactos/dll/win32/propsys/propvar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/propvar.c [iso-8859-1] Sun Sep 17 22:56:55 2017 @@ -34,22 +34,16 @@ switch (vt) { case VT_LPSTR: - { - static const char format[] = "%04d/%02d/%02d:%02d:%02d:%02d.%03d"; - - ppropvarDest->u.pszVal = HeapAlloc(GetProcessHeap(), 0, - sizeof(format)); + ppropvarDest->u.pszVal = HeapAlloc(GetProcessHeap(), 0, 64); if (!ppropvarDest->u.pszVal) return E_OUTOFMEMORY; - snprintf( ppropvarDest->u.pszVal, sizeof(format), - format, + sprintf( ppropvarDest->u.pszVal, "%04d/%02d/%02d:%02d:%02d:%02d.%03d", time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond, time.wMilliseconds ); return S_OK; - } default: FIXME("Unhandled target type: %d\n", vt); @@ -102,14 +96,24 @@ *res = 0; break; case VT_LPSTR: - *res = _strtoi64(pv->u.pszVal, NULL, 0); + { + char *end; + *res = _strtoi64(pv->u.pszVal, &end, 0); + if (pv->u.pszVal == end) + return DISP_E_TYPEMISMATCH; src_signed = *res < 0; break; + } case VT_LPWSTR: case VT_BSTR: - *res = strtolW(pv->u.pwszVal, NULL, 0); + { + WCHAR *end; + *res = strtolW(pv->u.pwszVal, &end, 0); + if (pv->u.pwszVal == end) + return DISP_E_TYPEMISMATCH; src_signed = *res < 0; break; + } default: FIXME("unhandled vt %d\n", pv->vt); return E_NOTIMPL; @@ -240,7 +244,7 @@ case VT_BSTR: if (propvarIn->u.pwszVal) { - DWORD size = (strlenW(propvarIn->u.pwszVal) + 1) * sizeof(WCHAR); + DWORD size = (lstrlenW(propvarIn->u.pwszVal) + 1) * sizeof(WCHAR); res = CoTaskMemAlloc(size); if(!res) return E_OUTOFMEMORY; memcpy(res, propvarIn->u.pwszVal, size); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 22:56:55 2017 @@ -151,7 +151,7 @@ reactos/dll/win32/pidgen # Synced to WineStaging-2.9 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-2.9 -reactos/dll/win32/propsys # Synced to WineStaging-2.9 +reactos/dll/win32/propsys # Synced to WineStaging-2.16 reactos/dll/win32/pstorec # Synced to WineStaging-2.2 reactos/dll/win32/qmgr # Synced to WineStaging-2.9 reactos/dll/win32/qmgrprxy # Synced to WineStaging-2.9

1 0

[akhaldi] 75893: [OLEAUT32_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:56:47 2017 New Revision: 75893 URL: http://svn.reactos.org/svn/reactos?rev=75893&view=rev Log: [OLEAUT32_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/oleaut32/typelib.c trunk/rostests/winetests/oleaut32/vartest.c trunk/rostests/winetests/oleaut32/vartype.c Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… ============================================================================== --- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Sun Sep 17 22:56:47 2017 @@ -5053,6 +5053,22 @@ hres = LoadTypeLib(kernel32_dllW, &tl); ok(hres == TYPE_E_CANTLOADLIBRARY, "LoadTypeLib returned: %08x, expected TYPE_E_CANTLOADLIBRARY\n", hres); + + hres = LoadTypeLib(NULL, NULL); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + + tl = (void *)0xdeadbeef; + hres = LoadTypeLib(NULL, &tl); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + ok(tl == (void *)0xdeadbeef, "Got %p.\n", tl); + + hres = LoadTypeLibEx(NULL, REGKIND_NONE, NULL); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + + tl = (void *)0xdeadbeef; + hres = LoadTypeLibEx(NULL, REGKIND_NONE, &tl); + ok(hres == E_INVALIDARG, "Got %#x.\n", hres); + ok(tl == (void *)0xdeadbeef, "Got %p.\n", tl); } static void test_SetVarHelpContext(void) Modified: trunk/rostests/winetests/oleaut32/vartest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartes… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] Sun Sep 17 22:56:47 2017 @@ -6097,7 +6097,7 @@ SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); CHECK_CALLED(dispatch_invoke); @@ -6112,7 +6112,7 @@ SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); CHECK_CALLED(dispatch_invoke); @@ -6144,7 +6144,21 @@ SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_NULL, &dispatch); + dispatch.result = DISP_E_TYPEMISMATCH; + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); CHECK_CALLED(dispatch_invoke); VariantClear(&left); Modified: trunk/rostests/winetests/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] Sun Sep 17 22:56:47 2017 @@ -57,11 +57,6 @@ static HMODULE hOleaut32; -/* Get a conversion function ptr, return if function not available */ -#define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ - if (!p##func) { \ - win_skip("function " # func " not available, not testing it\n"); return; } - /* Has I8/UI8 data type? */ static BOOL has_i8; /* Has proper locale conversions? */ @@ -89,7 +84,7 @@ #define EXPECT_DBL(x) \ ok(hres == S_OK && fabs(out-(x))<=1e-14*(x), "expected %16.16g, got %16.16g; hres=0x%08x\n", (x), out, hres) -#define CONVERT(func, val) in = val; hres = p##func(in, &out) +#define CONVERT(func, val) in = val; hres = func(in, &out) #define CONVERTRANGE(func,start,end) for (i = start; i < end; i+=1) { CONVERT(func, i); EXPECT(i); }; #define OVERFLOWRANGE(func,start,end) for (i = start; i < end; i+=1) { CONVERT(func, i); EXPECT_OVERFLOW; }; @@ -98,11 +93,11 @@ #define DATE_MIN -657434 #define DATE_MAX 2958465 -#define CONVERT_I8(func,hi,lo) in = hi; in = (in << 32) | lo; hres = p##func(in, &out) - -#define CONVERT_CY(func,val) in.int64 = (LONGLONG)(val * CY_MULTIPLIER); hres = p##func(in, &out) - -#define CONVERT_CY64(func,hi,lo) S(in).Hi = hi; S(in).Lo = lo; in.int64 *= CY_MULTIPLIER; hres = p##func(in, &out) +#define CONVERT_I8(func,hi,lo) in = hi; in = (in << 32) | lo; hres = func(in, &out) + +#define CONVERT_CY(func,val) in.int64 = (LONGLONG)(val * CY_MULTIPLIER); hres = func(in, &out) + +#define CONVERT_CY64(func,hi,lo) S(in).Hi = hi; S(in).Lo = lo; in.int64 *= CY_MULTIPLIER; hres = func(in, &out) #define SETDEC(dec, scl, sgn, hi, lo) S(U(dec)).scale = (BYTE)scl; S(U(dec)).sign = (BYTE)sgn; \ dec.Hi32 = (ULONG)hi; U1(dec).Lo64 = (ULONG64)lo @@ -110,9 +105,9 @@ #define SETDEC64(dec, scl, sgn, hi, mid, lo) S(U(dec)).scale = (BYTE)scl; S(U(dec)).sign = (BYTE)sgn; \ dec.Hi32 = (ULONG)hi; S1(U1(dec)).Mid32 = mid; S1(U1(dec)).Lo32 = lo; -#define CONVERT_DEC(func,scl,sgn,hi,lo) SETDEC(in,scl,sgn,hi,lo); hres = p##func(&in, &out) - -#define CONVERT_DEC64(func,scl,sgn,hi,mid,lo) SETDEC64(in,scl,sgn,hi,mid,lo); hres = p##func(&in, &out) +#define CONVERT_DEC(func,scl,sgn,hi,lo) SETDEC(in,scl,sgn,hi,lo); hres = func(&in, &out) + +#define CONVERT_DEC64(func,scl,sgn,hi,mid,lo) SETDEC64(in,scl,sgn,hi,mid,lo); hres = func(&in, &out) #define CONVERT_BADDEC(func) \ CONVERT_DEC(func,29,0,0,0); EXPECT_INVALID; \ @@ -123,7 +118,7 @@ #define CONVERT_STR(func,str,flags) \ SetLastError(0); \ if (str) MultiByteToWideChar(CP_ACP,0,str,-1,buff,sizeof(buff)/sizeof(WCHAR)); \ - hres = p##func(str ? buff : NULL,in,flags,&out) + hres = func(str ? buff : NULL,in,flags,&out) #define COPYTEST(val, vt, srcval, dstval, srcref, dstref, fs) do { \ HRESULT hres; VARIANTARG vSrc, vDst; CONV_TYPE in = val; \ @@ -283,243 +278,6 @@ DEFINE_EXPECT(dispatch_invoke); -/* Early versions of oleaut32 are missing many functions */ -static HRESULT (WINAPI *pVarI1FromUI1)(BYTE,signed char*); -static HRESULT (WINAPI *pVarI1FromI2)(SHORT,signed char*); -static HRESULT (WINAPI *pVarI1FromI4)(LONG,signed char*); -static HRESULT (WINAPI *pVarI1FromR4)(FLOAT,signed char*); -static HRESULT (WINAPI *pVarI1FromR8)(double,signed char*); -static HRESULT (WINAPI *pVarI1FromDate)(DATE,signed char*); -static HRESULT (WINAPI *pVarI1FromCy)(CY,signed char*); -static HRESULT (WINAPI *pVarI1FromStr)(OLECHAR*,LCID,ULONG,signed char*); -static HRESULT (WINAPI *pVarI1FromBool)(VARIANT_BOOL,signed char*); -static HRESULT (WINAPI *pVarI1FromUI2)(USHORT,signed char*); -static HRESULT (WINAPI *pVarI1FromUI4)(ULONG,signed char*); -static HRESULT (WINAPI *pVarI1FromDec)(DECIMAL*,signed char*); -static HRESULT (WINAPI *pVarI1FromI8)(LONG64,signed char*); -static HRESULT (WINAPI *pVarI1FromUI8)(ULONG64,signed char*); -static HRESULT (WINAPI *pVarUI1FromI2)(SHORT,BYTE*); -static HRESULT (WINAPI *pVarUI1FromI4)(LONG,BYTE*); -static HRESULT (WINAPI *pVarUI1FromR4)(FLOAT,BYTE*); -static HRESULT (WINAPI *pVarUI1FromR8)(double,BYTE*); -static HRESULT (WINAPI *pVarUI1FromCy)(CY,BYTE*); -static HRESULT (WINAPI *pVarUI1FromDate)(DATE,BYTE*); -static HRESULT (WINAPI *pVarUI1FromStr)(OLECHAR*,LCID,ULONG,BYTE*); -static HRESULT (WINAPI *pVarUI1FromBool)(VARIANT_BOOL,BYTE*); -static HRESULT (WINAPI *pVarUI1FromI1)(signed char,BYTE*); -static HRESULT (WINAPI *pVarUI1FromUI2)(USHORT,BYTE*); -static HRESULT (WINAPI *pVarUI1FromUI4)(ULONG,BYTE*); -static HRESULT (WINAPI *pVarUI1FromDec)(DECIMAL*,BYTE*); -static HRESULT (WINAPI *pVarUI1FromI8)(LONG64,BYTE*); -static HRESULT (WINAPI *pVarUI1FromUI8)(ULONG64,BYTE*); -static HRESULT (WINAPI *pVarUI1FromDisp)(IDispatch*,LCID,BYTE*); - -static HRESULT (WINAPI *pVarI2FromUI1)(BYTE,SHORT*); -static HRESULT (WINAPI *pVarI2FromI4)(LONG,SHORT*); -static HRESULT (WINAPI *pVarI2FromR4)(FLOAT,SHORT*); -static HRESULT (WINAPI *pVarI2FromR8)(double,SHORT*); -static HRESULT (WINAPI *pVarI2FromCy)(CY,SHORT*); -static HRESULT (WINAPI *pVarI2FromDate)(DATE,SHORT*); -static HRESULT (WINAPI *pVarI2FromStr)(OLECHAR*,LCID,ULONG,SHORT*); -static HRESULT (WINAPI *pVarI2FromBool)(VARIANT_BOOL,SHORT*); -static HRESULT (WINAPI *pVarI2FromI1)(signed char,SHORT*); -static HRESULT (WINAPI *pVarI2FromUI2)(USHORT,SHORT*); -static HRESULT (WINAPI *pVarI2FromUI4)(ULONG,SHORT*); -static HRESULT (WINAPI *pVarI2FromDec)(DECIMAL*,SHORT*); -static HRESULT (WINAPI *pVarI2FromI8)(LONG64,SHORT*); -static HRESULT (WINAPI *pVarI2FromUI8)(ULONG64,SHORT*); -static HRESULT (WINAPI *pVarUI2FromUI1)(BYTE,USHORT*); -static HRESULT (WINAPI *pVarUI2FromI2)(SHORT,USHORT*); -static HRESULT (WINAPI *pVarUI2FromI4)(LONG,USHORT*); -static HRESULT (WINAPI *pVarUI2FromR4)(FLOAT,USHORT*); -static HRESULT (WINAPI *pVarUI2FromR8)(double,USHORT*); -static HRESULT (WINAPI *pVarUI2FromDate)(DATE,USHORT*); -static HRESULT (WINAPI *pVarUI2FromCy)(CY,USHORT*); -static HRESULT (WINAPI *pVarUI2FromStr)(OLECHAR*,LCID,ULONG,USHORT*); -static HRESULT (WINAPI *pVarUI2FromBool)(VARIANT_BOOL,USHORT*); -static HRESULT (WINAPI *pVarUI2FromI1)(signed char,USHORT*); -static HRESULT (WINAPI *pVarUI2FromUI4)(ULONG,USHORT*); -static HRESULT (WINAPI *pVarUI2FromDec)(DECIMAL*,USHORT*); -static HRESULT (WINAPI *pVarUI2FromI8)(LONG64,USHORT*); -static HRESULT (WINAPI *pVarUI2FromUI8)(ULONG64,USHORT*); - -static HRESULT (WINAPI *pVarI4FromUI1)(BYTE,LONG*); -static HRESULT (WINAPI *pVarI4FromI2)(SHORT,LONG*); -static HRESULT (WINAPI *pVarI4FromR4)(FLOAT,LONG*); -static HRESULT (WINAPI *pVarI4FromR8)(DOUBLE,LONG*); -static HRESULT (WINAPI *pVarI4FromCy)(CY,LONG*); -static HRESULT (WINAPI *pVarI4FromDate)(DATE,LONG*); -static HRESULT (WINAPI *pVarI4FromStr)(OLECHAR*,LCID,ULONG,LONG*); -static HRESULT (WINAPI *pVarI4FromBool)(VARIANT_BOOL,LONG*); -static HRESULT (WINAPI *pVarI4FromI1)(signed char,LONG*); -static HRESULT (WINAPI *pVarI4FromUI2)(USHORT,LONG*); -static HRESULT (WINAPI *pVarI4FromUI4)(ULONG,LONG*); -static HRESULT (WINAPI *pVarI4FromDec)(DECIMAL*,LONG*); -static HRESULT (WINAPI *pVarI4FromI8)(LONG64,LONG*); -static HRESULT (WINAPI *pVarI4FromUI8)(ULONG64,LONG*); -static HRESULT (WINAPI *pVarUI4FromUI1)(BYTE,ULONG*); -static HRESULT (WINAPI *pVarUI4FromI2)(SHORT,ULONG*); -static HRESULT (WINAPI *pVarUI4FromI4)(LONG,ULONG*); -static HRESULT (WINAPI *pVarUI4FromR4)(FLOAT,ULONG*); -static HRESULT (WINAPI *pVarUI4FromR8)(DOUBLE,ULONG*); -static HRESULT (WINAPI *pVarUI4FromDate)(DATE,ULONG*); -static HRESULT (WINAPI *pVarUI4FromCy)(CY,ULONG*); -static HRESULT (WINAPI *pVarUI4FromStr)(OLECHAR*,LCID,ULONG,ULONG*); -static HRESULT (WINAPI *pVarUI4FromBool)(VARIANT_BOOL,ULONG*); -static HRESULT (WINAPI *pVarUI4FromI1)(signed char,ULONG*); -static HRESULT (WINAPI *pVarUI4FromUI2)(USHORT,ULONG*); -static HRESULT (WINAPI *pVarUI4FromDec)(DECIMAL*,ULONG*); -static HRESULT (WINAPI *pVarUI4FromI8)(LONG64,ULONG*); -static HRESULT (WINAPI *pVarUI4FromUI8)(ULONG64,ULONG*); - -static HRESULT (WINAPI *pVarI8FromUI1)(BYTE,LONG64*); -static HRESULT (WINAPI *pVarI8FromI2)(SHORT,LONG64*); -static HRESULT (WINAPI *pVarI8FromR4)(FLOAT,LONG64*); -static HRESULT (WINAPI *pVarI8FromR8)(double,LONG64*); -static HRESULT (WINAPI *pVarI8FromCy)(CY,LONG64*); -static HRESULT (WINAPI *pVarI8FromDate)(DATE,LONG64*); -static HRESULT (WINAPI *pVarI8FromStr)(OLECHAR*,LCID,ULONG,LONG64*); -static HRESULT (WINAPI *pVarI8FromBool)(VARIANT_BOOL,LONG64*); -static HRESULT (WINAPI *pVarI8FromI1)(signed char,LONG64*); -static HRESULT (WINAPI *pVarI8FromUI2)(USHORT,LONG64*); -static HRESULT (WINAPI *pVarI8FromUI4)(ULONG,LONG64*); -static HRESULT (WINAPI *pVarI8FromDec)(DECIMAL*,LONG64*); -static HRESULT (WINAPI *pVarI8FromUI8)(ULONG64,LONG64*); -static HRESULT (WINAPI *pVarUI8FromI8)(LONG64,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromUI1)(BYTE,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromI2)(SHORT,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromR4)(FLOAT,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromR8)(double,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromCy)(CY,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromDate)(DATE,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromStr)(OLECHAR*,LCID,ULONG,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromBool)(VARIANT_BOOL,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromI1)(signed char,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromUI2)(USHORT,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromUI4)(ULONG,ULONG64*); -static HRESULT (WINAPI *pVarUI8FromDec)(DECIMAL*,ULONG64*); - -static HRESULT (WINAPI *pVarR4FromUI1)(BYTE,float*); -static HRESULT (WINAPI *pVarR4FromI2)(SHORT,float*); -static HRESULT (WINAPI *pVarR4FromI4)(LONG,float*); -static HRESULT (WINAPI *pVarR4FromR8)(double,float*); -static HRESULT (WINAPI *pVarR4FromCy)(CY,float*); -static HRESULT (WINAPI *pVarR4FromDate)(DATE,float*); -static HRESULT (WINAPI *pVarR4FromStr)(OLECHAR*,LCID,ULONG,float*); -static HRESULT (WINAPI *pVarR4FromBool)(VARIANT_BOOL,float*); -static HRESULT (WINAPI *pVarR4FromI1)(signed char,float*); -static HRESULT (WINAPI *pVarR4FromUI2)(USHORT,float*); -static HRESULT (WINAPI *pVarR4FromUI4)(ULONG,float*); -static HRESULT (WINAPI *pVarR4FromDec)(DECIMAL*,float*); -static HRESULT (WINAPI *pVarR4FromI8)(LONG64,float*); -static HRESULT (WINAPI *pVarR4FromUI8)(ULONG64,float*); - -static HRESULT (WINAPI *pVarR8FromUI1)(BYTE,double*); -static HRESULT (WINAPI *pVarR8FromI2)(SHORT,double*); -static HRESULT (WINAPI *pVarR8FromI4)(LONG,double*); -static HRESULT (WINAPI *pVarR8FromR4)(FLOAT,double*); -static HRESULT (WINAPI *pVarR8FromCy)(CY,double*); -static HRESULT (WINAPI *pVarR8FromDate)(DATE,double*); -static HRESULT (WINAPI *pVarR8FromStr)(OLECHAR*,LCID,ULONG,double*); -static HRESULT (WINAPI *pVarR8FromBool)(VARIANT_BOOL,double*); -static HRESULT (WINAPI *pVarR8FromI1)(signed char,double*); -static HRESULT (WINAPI *pVarR8FromUI2)(USHORT,double*); -static HRESULT (WINAPI *pVarR8FromUI4)(ULONG,double*); -static HRESULT (WINAPI *pVarR8FromDec)(DECIMAL*,double*); -static HRESULT (WINAPI *pVarR8FromI8)(LONG64,double*); -static HRESULT (WINAPI *pVarR8FromUI8)(ULONG64,double*); -static HRESULT (WINAPI *pVarR8Round)(double,int,double*); - -static HRESULT (WINAPI *pVarDateFromUI1)(BYTE,DATE*); -static HRESULT (WINAPI *pVarDateFromI2)(SHORT,DATE*); -static HRESULT (WINAPI *pVarDateFromI4)(LONG,DATE*); -static HRESULT (WINAPI *pVarDateFromR4)(FLOAT,DATE*); -static HRESULT (WINAPI *pVarDateFromCy)(CY,DATE*); -static HRESULT (WINAPI *pVarDateFromR8)(double,DATE*); -static HRESULT (WINAPI *pVarDateFromStr)(OLECHAR*,LCID,ULONG,DATE*); -static HRESULT (WINAPI *pVarDateFromBool)(VARIANT_BOOL,DATE*); -static HRESULT (WINAPI *pVarDateFromI1)(signed char,DATE*); -static HRESULT (WINAPI *pVarDateFromUI2)(USHORT,DATE*); -static HRESULT (WINAPI *pVarDateFromUI4)(ULONG,DATE*); -static HRESULT (WINAPI *pVarDateFromDec)(DECIMAL*,DATE*); -static HRESULT (WINAPI *pVarDateFromI8)(LONG64,DATE*); -static HRESULT (WINAPI *pVarDateFromUI8)(ULONG64,DATE*); - -static HRESULT (WINAPI *pVarCyFromUI1)(BYTE,CY*); -static HRESULT (WINAPI *pVarCyFromI2)(SHORT,CY*); -static HRESULT (WINAPI *pVarCyFromI4)(LONG,CY*); -static HRESULT (WINAPI *pVarCyFromR4)(FLOAT,CY*); -static HRESULT (WINAPI *pVarCyFromR8)(double,CY*); -static HRESULT (WINAPI *pVarCyFromDate)(DATE,CY*); -static HRESULT (WINAPI *pVarCyFromBool)(VARIANT_BOOL,CY*); -static HRESULT (WINAPI *pVarCyFromI1)(signed char,CY*); -static HRESULT (WINAPI *pVarCyFromUI2)(USHORT,CY*); -static HRESULT (WINAPI *pVarCyFromUI4)(ULONG,CY*); -static HRESULT (WINAPI *pVarCyFromDec)(DECIMAL*,CY*); -static HRESULT (WINAPI *pVarCyFromI8)(LONG64,CY*); -static HRESULT (WINAPI *pVarCyFromUI8)(ULONG64,CY*); -static HRESULT (WINAPI *pVarCyAdd)(const CY,const CY,CY*); -static HRESULT (WINAPI *pVarCyMul)(const CY,const CY,CY*); -static HRESULT (WINAPI *pVarCyMulI4)(const CY,LONG,CY*); -static HRESULT (WINAPI *pVarCySub)(const CY,const CY,CY*); -static HRESULT (WINAPI *pVarCyAbs)(const CY,CY*); -static HRESULT (WINAPI *pVarCyFix)(const CY,CY*); -static HRESULT (WINAPI *pVarCyInt)(const CY,CY*); -static HRESULT (WINAPI *pVarCyNeg)(const CY,CY*); -static HRESULT (WINAPI *pVarCyRound)(const CY,int,CY*); -static HRESULT (WINAPI *pVarCyCmp)(const CY,const CY); -static HRESULT (WINAPI *pVarCyCmpR8)(const CY,double); -static HRESULT (WINAPI *pVarCyMulI8)(const CY,LONG64,CY*); - -static HRESULT (WINAPI *pVarDecFromUI1)(BYTE,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromI2)(SHORT,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromI4)(LONG,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromI8)(LONG64,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromR4)(FLOAT,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromR8)(DOUBLE,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromDate)(DATE,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromStr)(OLECHAR*,LCID,ULONG,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromBool)(VARIANT_BOOL,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromI1)(signed char,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromUI2)(USHORT,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromUI4)(ULONG,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromUI8)(ULONG64,DECIMAL*); -static HRESULT (WINAPI *pVarDecFromCy)(CY,DECIMAL*); -static HRESULT (WINAPI *pVarDecAbs)(const DECIMAL*,DECIMAL*); -static HRESULT (WINAPI *pVarDecAdd)(const DECIMAL*,const DECIMAL*,DECIMAL*); -static HRESULT (WINAPI *pVarDecSub)(const DECIMAL*,const DECIMAL*,DECIMAL*); -static HRESULT (WINAPI *pVarDecMul)(const DECIMAL*,const DECIMAL*,DECIMAL*); -static HRESULT (WINAPI *pVarDecDiv)(const DECIMAL*,const DECIMAL*,DECIMAL*); -static HRESULT (WINAPI *pVarDecCmp)(const DECIMAL*,const DECIMAL*); -static HRESULT (WINAPI *pVarDecCmpR8)(const DECIMAL*,double); -static HRESULT (WINAPI *pVarDecNeg)(const DECIMAL*,DECIMAL*); -static HRESULT (WINAPI *pVarDecRound)(const DECIMAL*,int,DECIMAL*); - -static HRESULT (WINAPI *pVarBoolFromUI1)(BYTE,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromI2)(SHORT,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromI4)(LONG,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromR4)(FLOAT,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromR8)(DOUBLE,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromDate)(DATE,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromCy)(CY,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromStr)(OLECHAR*,LCID,ULONG,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromI1)(signed char,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromUI2)(USHORT,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromUI4)(ULONG,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromDec)(DECIMAL*,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromI8)(LONG64,VARIANT_BOOL*); -static HRESULT (WINAPI *pVarBoolFromUI8)(ULONG64,VARIANT_BOOL*); - -static HRESULT (WINAPI *pVarBstrFromR4)(FLOAT,LCID,ULONG,BSTR*); -static HRESULT (WINAPI *pVarBstrFromDate)(DATE,LCID,ULONG,BSTR*); -static HRESULT (WINAPI *pVarBstrFromCy)(CY,LCID,ULONG,BSTR*); -static HRESULT (WINAPI *pVarBstrFromDec)(DECIMAL*,LCID,ULONG,BSTR*); -static HRESULT (WINAPI *pVarBstrCmp)(BSTR,BSTR,LCID,ULONG); -static HRESULT (WINAPI *pVarBstrCat)(BSTR,BSTR,BSTR*); - -static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*); -static void (WINAPI *pClearCustData)(LPCUSTDATA); - /* Internal representation of a BSTR */ typedef struct tagINTERNAL_BSTR { @@ -658,7 +416,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarI1FromI2); OVERFLOWRANGE(VarI1FromI2, -32768, -128); CONVERTRANGE(VarI1FromI2, -128, 128); OVERFLOWRANGE(VarI1FromI2, 129, 32768); @@ -669,7 +426,6 @@ CONVVARS(LONG); int i; - CHECKPTR(VarI1FromI4); CONVERT(VarI1FromI4, -129); EXPECT_OVERFLOW; CONVERTRANGE(VarI1FromI4, -128, 128); CONVERT(VarI1FromI4, 128); EXPECT_OVERFLOW; @@ -680,7 +436,6 @@ CONVVARS(LONG64); int i; - CHECKPTR(VarI1FromI8); CONVERT(VarI1FromI8, -129); EXPECT_OVERFLOW; CONVERTRANGE(VarI1FromI8, -127, 128); CONVERT(VarI1FromI8, 128); EXPECT_OVERFLOW; @@ -691,7 +446,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarI1FromUI1); CONVERTRANGE(VarI1FromUI1, 0, 127); OVERFLOWRANGE(VarI1FromUI1, 128, 255); } @@ -701,7 +455,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarI1FromUI2); CONVERTRANGE(VarI1FromUI2, 0, 127); OVERFLOWRANGE(VarI1FromUI2, 128, 32768); } @@ -711,7 +464,6 @@ CONVVARS(ULONG); int i; - CHECKPTR(VarI1FromUI4); CONVERTRANGE(VarI1FromUI4, 0, 127); CONVERT(VarI1FromUI4, 128); EXPECT_OVERFLOW; } @@ -721,7 +473,6 @@ CONVVARS(ULONG64); int i; - CHECKPTR(VarI1FromUI8); CONVERTRANGE(VarI1FromUI8, 0, 127); CONVERT(VarI1FromUI8, 128); EXPECT_OVERFLOW; } @@ -731,7 +482,6 @@ CONVVARS(VARIANT_BOOL); int i; - CHECKPTR(VarI1FromBool); /* Note that conversions from bool wrap around! */ CONVERT(VarI1FromBool, -129); EXPECT(127); CONVERTRANGE(VarI1FromBool, -128, 128); @@ -742,7 +492,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarI1FromR4); CONVERT(VarI1FromR4, -129.0f); EXPECT_OVERFLOW; CONVERT(VarI1FromR4, -128.51f); EXPECT_OVERFLOW; CONVERT(VarI1FromR4, -128.5f); EXPECT(-128); @@ -769,7 +518,6 @@ { CONVVARS(DOUBLE); - CHECKPTR(VarI1FromR8); CONVERT(VarI1FromR8, -129.0); EXPECT_OVERFLOW; CONVERT(VarI1FromR8, -128.51); EXPECT_OVERFLOW; CONVERT(VarI1FromR8, -128.5); EXPECT(-128); @@ -796,7 +544,6 @@ { CONVVARS(DATE); - CHECKPTR(VarI1FromDate); CONVERT(VarI1FromDate, -129.0); EXPECT_OVERFLOW; CONVERT(VarI1FromDate, -128.0); EXPECT(-128); CONVERT(VarI1FromDate, -1.0); EXPECT(-1); @@ -819,7 +566,6 @@ { CONVVARS(CY); - CHECKPTR(VarI1FromCy); CONVERT_CY(VarI1FromCy,-129); EXPECT_OVERFLOW; CONVERT_CY(VarI1FromCy,-128); EXPECT(128); CONVERT_CY(VarI1FromCy,-1); EXPECT(-1); @@ -842,8 +588,6 @@ { CONVVARS(DECIMAL); - CHECKPTR(VarI1FromDec); - CONVERT_BADDEC(VarI1FromDec); CONVERT_DEC(VarI1FromDec,0,0x80,0,129); EXPECT_OVERFLOW; @@ -864,8 +608,6 @@ OLECHAR buff[128]; in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarI1FromStr); CONVERT_STR(VarI1FromStr,NULL, 0); EXPECT_MISMATCH; CONVERT_STR(VarI1FromStr,"0", 0); EXPECT(0); @@ -910,7 +652,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarUI1FromI1); OVERFLOWRANGE(VarUI1FromI1, -128, 0); CONVERTRANGE(VarUI1FromI1, 0, 128); } @@ -920,7 +661,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarUI1FromI2); OVERFLOWRANGE(VarUI1FromI2, -32768, 0); CONVERTRANGE(VarUI1FromI2, 0, 256); OVERFLOWRANGE(VarUI1FromI2, 256, 32768); @@ -931,7 +671,6 @@ CONVVARS(LONG); int i; - CHECKPTR(VarUI1FromI4); CONVERT(VarUI1FromI4, -1); EXPECT_OVERFLOW; CONVERTRANGE(VarUI1FromI4, 0, 256); CONVERT(VarUI1FromI4, 256); EXPECT_OVERFLOW; @@ -942,7 +681,6 @@ CONVVARS(LONG64); int i; - CHECKPTR(VarUI1FromI8); CONVERT(VarUI1FromI8, -1); EXPECT_OVERFLOW; CONVERTRANGE(VarUI1FromI8, 0, 256); CONVERT(VarUI1FromI8, 256); EXPECT_OVERFLOW; @@ -953,7 +691,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarUI1FromUI2); CONVERTRANGE(VarUI1FromUI2, 0, 256); OVERFLOWRANGE(VarUI1FromUI2, 256, 65536); } @@ -963,7 +700,6 @@ CONVVARS(ULONG); int i; - CHECKPTR(VarUI1FromUI4); CONVERTRANGE(VarUI1FromUI4, 0, 256); CONVERT(VarUI1FromUI4, 256); EXPECT_OVERFLOW; } @@ -973,7 +709,6 @@ CONVVARS(ULONG64); int i; - CHECKPTR(VarUI1FromUI8); CONVERTRANGE(VarUI1FromUI8, 0, 256); CONVERT(VarUI1FromUI8, 256); EXPECT_OVERFLOW; } @@ -983,7 +718,6 @@ CONVVARS(VARIANT_BOOL); int i; - CHECKPTR(VarUI1FromBool); /* Note that conversions from bool overflow! */ CONVERT(VarUI1FromBool, -1); EXPECT(255); CONVERTRANGE(VarUI1FromBool, 0, 256); @@ -994,7 +728,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarUI1FromR4); CONVERT(VarUI1FromR4, -1.0f); EXPECT_OVERFLOW; CONVERT(VarUI1FromR4, -0.51f); EXPECT_OVERFLOW; CONVERT(VarUI1FromR4, -0.5f); EXPECT(0); @@ -1020,7 +753,6 @@ { CONVVARS(DOUBLE); - CHECKPTR(VarUI1FromR8); CONVERT(VarUI1FromR8, -1.0); EXPECT_OVERFLOW; CONVERT(VarUI1FromR8, -0.51); EXPECT_OVERFLOW; CONVERT(VarUI1FromR8, -0.5); EXPECT(0); @@ -1046,7 +778,6 @@ { CONVVARS(DATE); - CHECKPTR(VarUI1FromDate); CONVERT(VarUI1FromDate, -1.0); EXPECT_OVERFLOW; CONVERT(VarUI1FromDate, 0.0); EXPECT(0); CONVERT(VarUI1FromDate, 1.0); EXPECT(1); @@ -1068,7 +799,6 @@ { CONVVARS(CY); - CHECKPTR(VarUI1FromCy); CONVERT_CY(VarUI1FromCy,-1); EXPECT_OVERFLOW; CONVERT_CY(VarUI1FromCy,0); EXPECT(0); CONVERT_CY(VarUI1FromCy,1); EXPECT(1); @@ -1090,8 +820,6 @@ { CONVVARS(DECIMAL); - CHECKPTR(VarUI1FromDec); - CONVERT_BADDEC(VarUI1FromDec); CONVERT_DEC(VarUI1FromDec,0,0x80,0,1); EXPECT_OVERFLOW; @@ -1110,8 +838,6 @@ OLECHAR buff[128]; in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarUI1FromStr); CONVERT_STR(VarUI1FromStr,NULL, 0); EXPECT_MISMATCH; CONVERT_STR(VarUI1FromStr,"0", 0); EXPECT(0); @@ -1135,8 +861,6 @@ DummyDispatch dispatch; CONVVARS(LCID); VARIANTARG vSrc, vDst; - - CHECKPTR(VarUI1FromDisp); /* FIXME * Conversions from IDispatch should get the default 'value' property @@ -1161,7 +885,7 @@ SET_EXPECT(dispatch_invoke); out = 10; - hres = pVarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); + hres = VarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); ok(broken(hres == DISP_E_BADVARTYPE) || hres == S_OK, "got 0x%08x\n", hres); ok(broken(out == 10) || out == 1, "got %d\n", out); CHECK_CALLED(dispatch_invoke); @@ -1179,7 +903,7 @@ SET_EXPECT(dispatch_invoke); out = 10; - hres = pVarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); + hres = VarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); ok(out == 10, "got %d\n", out); CHECK_CALLED(dispatch_invoke); @@ -1222,7 +946,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarI2FromI1); CONVERTRANGE(VarI2FromI1, -128, 128); } @@ -1231,7 +954,6 @@ CONVVARS(LONG); int i; - CHECKPTR(VarI2FromI4); CONVERT(VarI2FromI4, -32769); EXPECT_OVERFLOW; CONVERTRANGE(VarI2FromI4, -32768, 32768); CONVERT(VarI2FromI4, 32768); EXPECT_OVERFLOW; @@ -1241,7 +963,6 @@ { CONVVARS(LONG64); - CHECKPTR(VarI2FromI8); CONVERT(VarI2FromI8, -32769); EXPECT_OVERFLOW; CONVERT(VarI2FromI8, -32768); EXPECT(-32768); CONVERT(VarI2FromI8, 32767); EXPECT(32767); @@ -1253,7 +974,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarI2FromUI1); CONVERTRANGE(VarI2FromUI1, 0, 256); } @@ -1262,7 +982,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarI2FromUI2); CONVERTRANGE(VarI2FromUI2, 0, 32768); CONVERT(VarI2FromUI2, 32768); EXPECT_OVERFLOW; } @@ -1272,7 +991,6 @@ CONVVARS(ULONG); int i; - CHECKPTR(VarI2FromUI4); CONVERTRANGE(VarI2FromUI4, 0, 32768); CONVERT(VarI2FromUI4, 32768); EXPECT_OVERFLOW; } @@ -1282,7 +1000,6 @@ CONVVARS(ULONG64); int i; - CHECKPTR(VarI2FromUI8); CONVERTRANGE(VarI2FromUI8, 0, 32768); CONVERT(VarI2FromUI8, 32768); EXPECT_OVERFLOW; } @@ -1292,7 +1009,6 @@ CONVVARS(VARIANT_BOOL); int i; - CHECKPTR(VarI2FromBool); CONVERTRANGE(VarI2FromBool, -32768, 32768); } @@ -1300,7 +1016,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarI2FromR4); CONVERT(VarI2FromR4, -32769.0f); EXPECT_OVERFLOW; CONVERT(VarI2FromR4, -32768.51f); EXPECT_OVERFLOW; CONVERT(VarI2FromR4, -32768.5f); EXPECT(-32768); @@ -1328,7 +1043,6 @@ { CONVVARS(DOUBLE); - CHECKPTR(VarI2FromR8); CONVERT(VarI2FromR8, -32769.0); EXPECT_OVERFLOW; CONVERT(VarI2FromR8, -32768.51); EXPECT_OVERFLOW; CONVERT(VarI2FromR8, -32768.5); EXPECT(-32768); @@ -1356,7 +1070,6 @@ { CONVVARS(DATE); - CHECKPTR(VarI2FromDate); CONVERT(VarI2FromDate, -32769.0); EXPECT_OVERFLOW; CONVERT(VarI2FromDate, -32768.0); EXPECT(-32768); CONVERT(VarI2FromDate, -1.0); EXPECT(-1); @@ -1380,7 +1093,6 @@ { CONVVARS(CY); - CHECKPTR(VarI2FromCy); CONVERT_CY(VarI2FromCy,-32769); EXPECT_OVERFLOW; CONVERT_CY(VarI2FromCy,-32768); EXPECT(32768); CONVERT_CY(VarI2FromCy,-1); EXPECT(-1); @@ -1404,8 +1116,6 @@ { CONVVARS(DECIMAL); - CHECKPTR(VarI2FromDec); - CONVERT_BADDEC(VarI2FromDec); CONVERT_DEC(VarI2FromDec,0,0x80,0,32769); EXPECT_OVERFLOW; @@ -1427,8 +1137,6 @@ OLECHAR buff[128]; in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarI2FromStr); CONVERT_STR(VarI2FromStr,NULL, 0); EXPECT_MISMATCH; CONVERT_STR(VarI2FromStr,"0", 0); EXPECT(0); @@ -1474,7 +1182,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarUI2FromI1); OVERFLOWRANGE(VarUI2FromI1, -128, 0); CONVERTRANGE(VarUI2FromI1, 0, 128); } @@ -1484,7 +1191,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarUI2FromI2); OVERFLOWRANGE(VarUI2FromI2, -32768, 0); CONVERTRANGE(VarUI2FromI2, 0, 32768); } @@ -1494,7 +1200,6 @@ CONVVARS(LONG); int i; - CHECKPTR(VarUI2FromI4); OVERFLOWRANGE(VarUI2FromI4, -32768, 0); CONVERT(VarUI2FromI4, 0); EXPECT(0); CONVERT(VarUI2FromI4, 65535); EXPECT(65535); @@ -1506,7 +1211,6 @@ CONVVARS(LONG64); int i; - CHECKPTR(VarUI2FromI8); OVERFLOWRANGE(VarUI2FromI8, -32768, 0); CONVERT(VarUI2FromI8, 0); EXPECT(0); CONVERT(VarUI2FromI8, 65535); EXPECT(65535); @@ -1518,7 +1222,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarUI2FromUI1); CONVERTRANGE(VarUI2FromUI1, 0, 256); } @@ -1526,7 +1229,6 @@ { CONVVARS(ULONG); - CHECKPTR(VarUI2FromUI4); CONVERT(VarUI2FromUI4, 0); EXPECT(0); CONVERT(VarUI2FromUI4, 65535); EXPECT(65535); CONVERT(VarUI2FromUI4, 65536); EXPECT_OVERFLOW; @@ -1536,7 +1238,6 @@ { CONVVARS(ULONG64); - CHECKPTR(VarUI2FromUI8); CONVERT(VarUI2FromUI8, 0); EXPECT(0); CONVERT(VarUI2FromUI8, 65535); EXPECT(65535); CONVERT(VarUI2FromUI8, 65536); EXPECT_OVERFLOW; @@ -1547,7 +1248,6 @@ CONVVARS(VARIANT_BOOL); int i; - CHECKPTR(VarUI2FromBool); CONVERT(VarUI2FromBool, -1); EXPECT(65535); /* Wraps! */ CONVERTRANGE(VarUI2FromBool, 0, 32768); } @@ -1556,7 +1256,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarUI2FromR4); CONVERT(VarUI2FromR4, -1.0f); EXPECT_OVERFLOW; CONVERT(VarUI2FromR4, -0.51f); EXPECT_OVERFLOW; CONVERT(VarUI2FromR4, -0.5f); EXPECT(0); @@ -1582,7 +1281,6 @@ { CONVVARS(DOUBLE); - CHECKPTR(VarUI2FromR8); CONVERT(VarUI2FromR8, -1.0); EXPECT_OVERFLOW; CONVERT(VarUI2FromR8, -0.51); EXPECT_OVERFLOW; CONVERT(VarUI2FromR8, -0.5); EXPECT(0); @@ -1608,7 +1306,6 @@ { CONVVARS(DATE); - CHECKPTR(VarUI2FromDate); CONVERT(VarUI2FromDate, -1.0); EXPECT_OVERFLOW; CONVERT(VarUI2FromDate, 0.0); EXPECT(0); CONVERT(VarUI2FromDate, 1.0); EXPECT(1); @@ -1630,7 +1327,6 @@ { CONVVARS(CY); - CHECKPTR(VarUI2FromCy); CONVERT_CY(VarUI2FromCy,-1); EXPECT_OVERFLOW; CONVERT_CY(VarUI2FromCy,0); EXPECT(0); CONVERT_CY(VarUI2FromCy,1); EXPECT(1); @@ -1652,8 +1348,6 @@ { CONVVARS(DECIMAL); - CHECKPTR(VarUI2FromDec); - CONVERT_BADDEC(VarUI2FromDec); CONVERT_DEC(VarUI2FromDec,0,0x80,0,1); EXPECT_OVERFLOW; @@ -1673,8 +1367,6 @@ OLECHAR buff[128]; in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarUI2FromStr); CONVERT_STR(VarUI2FromStr,NULL, 0); EXPECT_MISMATCH; CONVERT_STR(VarUI2FromStr,"0", 0); EXPECT(0); @@ -1723,7 +1415,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarI4FromI1); CONVERTRANGE(VarI4FromI1, -128, 128); } @@ -1732,16 +1423,12 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarI4FromI2); CONVERTRANGE(VarI4FromI2, -32768, 32768); } static void test_VarI4FromI8(void) { CONVVARS(LONG64); - - CHECKPTR(VarI4FromI8); - CHECKPTR(VarI4FromDec); CONVERT(VarI4FromI8, -1); EXPECT(-1); CONVERT(VarI4FromI8, 0); EXPECT(0); @@ -1758,7 +1445,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarI4FromUI1); CONVERTRANGE(VarI4FromUI1, 0, 256); } @@ -1767,7 +1453,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarI4FromUI2); CONVERTRANGE(VarI4FromUI2, 0, 65536); } @@ -1775,7 +1460,6 @@ { CONVVARS(ULONG); - CHECKPTR(VarI4FromUI4); CONVERT(VarI4FromUI4, 0); EXPECT(0); CONVERT(VarI4FromUI4, 1); EXPECT(1); CONVERT(VarI4FromUI4, 2147483647); EXPECT(2147483647); @@ -1786,7 +1470,6 @@ { CONVVARS(ULONG64); - CHECKPTR(VarI4FromUI8); CONVERT(VarI4FromUI8, 0); EXPECT(0); CONVERT(VarI4FromUI8, 1); EXPECT(1); CONVERT(VarI4FromUI8, 2147483647); EXPECT(2147483647); @@ -1798,15 +1481,12 @@ CONVVARS(VARIANT_BOOL); int i; - CHECKPTR(VarI4FromBool); CONVERTRANGE(VarI4FromBool, -32768, 32768); } static void test_VarI4FromR4(void) { CONVVARS(FLOAT); - - CHECKPTR(VarI4FromR4); /* min/max values are not exactly representable in a float */ CONVERT(VarI4FromR4, -1.0f); EXPECT(-1); @@ -1827,7 +1507,6 @@ { CONVVARS(DOUBLE); - CHECKPTR(VarI4FromR8); CONVERT(VarI4FromR8, -2147483649.0); EXPECT_OVERFLOW; CONVERT(VarI4FromR8, -2147483648.51); EXPECT_OVERFLOW; CONVERT(VarI4FromR8, -2147483648.5); EXPECT(-2147483647 - 1); @@ -1854,7 +1533,6 @@ { CONVVARS(DATE); - CHECKPTR(VarI4FromDate); CONVERT(VarI4FromDate, -2147483649.0); EXPECT_OVERFLOW; CONVERT(VarI4FromDate, -2147483648.0); EXPECT(-2147483647 - 1); CONVERT(VarI4FromDate, -1.0); EXPECT(-1); @@ -1877,7 +1555,6 @@ { CONVVARS(CY); - CHECKPTR(VarI4FromCy); CONVERT_CY(VarI4FromCy,-1); EXPECT(-1); CONVERT_CY(VarI4FromCy,0); EXPECT(0); CONVERT_CY(VarI4FromCy,1); EXPECT(1); @@ -1901,8 +1578,6 @@ { CONVVARS(DECIMAL); - CHECKPTR(VarI4FromDec); - CONVERT_BADDEC(VarI4FromDec); CONVERT_DEC(VarI4FromDec,0,0x80,0,1); EXPECT(-1); @@ -1926,8 +1601,6 @@ OLECHAR buff[128]; in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarI4FromStr); CONVERT_STR(VarI4FromStr,NULL,0); EXPECT_MISMATCH; CONVERT_STR(VarI4FromStr,"0",0); EXPECT(0); @@ -1975,7 +1648,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarUI4FromI1); OVERFLOWRANGE(VarUI4FromI1, -127, 0); CONVERTRANGE(VarUI4FromI1, 0, 128); } @@ -1985,7 +1657,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarUI4FromI2); OVERFLOWRANGE(VarUI4FromI2, -32768, 0); CONVERTRANGE(VarUI4FromI2, 0, 32768); } @@ -1995,7 +1666,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarUI4FromUI2); CONVERTRANGE(VarUI4FromUI2, 0, 65536); } @@ -2003,7 +1673,6 @@ { CONVVARS(LONG64); - CHECKPTR(VarUI4FromI8); CONVERT(VarUI4FromI8, -1); EXPECT_OVERFLOW; CONVERT(VarUI4FromI8, 0); EXPECT(0); CONVERT(VarUI4FromI8, 1); EXPECT(1); @@ -2016,7 +1685,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarUI4FromUI1); CONVERTRANGE(VarUI4FromUI1, 0, 256); } @@ -2024,7 +1692,6 @@ { CONVVARS(int); - CHECKPTR(VarUI4FromI4); CONVERT(VarUI4FromI4, -1); EXPECT_OVERFLOW; CONVERT(VarUI4FromI4, 0); EXPECT(0); CONVERT(VarUI4FromI4, 1); EXPECT(1); @@ -2035,7 +1702,6 @@ { CONVVARS(ULONG64); - CHECKPTR(VarUI4FromUI8); CONVERT(VarUI4FromUI8, 0); EXPECT(0); CONVERT(VarUI4FromUI8, 1); EXPECT(1); CONVERT(VarUI4FromI8, 4294967295ul); EXPECT(4294967295ul); @@ -2047,7 +1713,6 @@ CONVVARS(VARIANT_BOOL); int i; - CHECKPTR(VarUI4FromBool); CONVERTRANGE(VarUI4FromBool, -32768, 32768); } @@ -2055,7 +1720,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarUI4FromR4); /* We can't test max values as they are not exactly representable in a float */ CONVERT(VarUI4FromR4, -1.0f); EXPECT_OVERFLOW; CONVERT(VarUI4FromR4, -0.51f); EXPECT_OVERFLOW; @@ -2078,7 +1742,6 @@ { CONVVARS(DOUBLE); - CHECKPTR(VarUI4FromR8); CONVERT(VarUI4FromR8, -1.0); EXPECT_OVERFLOW; CONVERT(VarUI4FromR4, -0.51f); EXPECT_OVERFLOW; CONVERT(VarUI4FromR4, -0.5f); EXPECT(0); @@ -2103,7 +1766,6 @@ { CONVVARS(DOUBLE); - CHECKPTR(VarUI4FromDate); CONVERT(VarUI4FromDate, -1.0); EXPECT_OVERFLOW; CONVERT(VarUI4FromDate, 0.0); EXPECT(0); CONVERT(VarUI4FromDate, 1.0); EXPECT(1); @@ -2124,7 +1786,6 @@ { CONVVARS(CY); - CHECKPTR(VarUI4FromCy); CONVERT_CY(VarUI4FromCy,-1); EXPECT_OVERFLOW; CONVERT_CY(VarUI4FromCy,0); EXPECT(0); CONVERT_CY(VarUI4FromCy,1); EXPECT(1); @@ -2145,8 +1806,6 @@ { CONVVARS(DECIMAL); - CHECKPTR(VarUI4FromDec); - CONVERT_BADDEC(VarUI4FromDec); CONVERT_DEC(VarUI4FromDec,0,0x80,0,1); EXPECT_OVERFLOW; @@ -2165,8 +1824,6 @@ OLECHAR buff[128]; in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarUI4FromStr); CONVERT_STR(VarUI4FromStr,NULL,0); EXPECT_MISMATCH; CONVERT_STR(VarUI4FromStr,"-1",0); EXPECT_OVERFLOW; @@ -2227,7 +1884,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarI8FromI1); for (i = -128; i < 128; i++) { CONVERT(VarI8FromI1,i); EXPECTI8(i); @@ -2239,7 +1895,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarI8FromUI1); for (i = 0; i < 256; i++) { CONVERT(VarI8FromUI1,i); EXPECTI8(i); @@ -2251,7 +1906,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarI8FromI2); for (i = -32768; i < 32768; i++) { CONVERT(VarI8FromI2,i); EXPECTI8(i); @@ -2263,7 +1917,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarI8FromUI2); for (i = -0; i < 65535; i++) { CONVERT(VarI8FromUI2,i); EXPECTI8(i); @@ -2274,7 +1927,6 @@ { CONVVARS(ULONG); - CHECKPTR(VarI8FromUI4); CONVERT(VarI8FromUI4, 0); EXPECTI8(0); CONVERT(VarI8FromUI4, 1); EXPECTI8(1); CONVERT(VarI8FromUI4, 4294967295ul); EXPECTI8(4294967295ul); @@ -2283,8 +1935,6 @@ static void test_VarI8FromR4(void) { CONVVARS(FLOAT); - - CHECKPTR(VarI8FromR4); CONVERT(VarI8FromR4, -128.0f); EXPECTI8(-128); CONVERT(VarI8FromR4, -1.0f); EXPECTI8(-1); @@ -2306,7 +1956,6 @@ { CONVVARS(DOUBLE); - CHECKPTR(VarI8FromR8); CONVERT(VarI8FromR8, -128.0); EXPECTI8(-128); CONVERT(VarI8FromR8, -1.0); EXPECTI8(-1); CONVERT(VarI8FromR8, 0.0); EXPECTI8(0); @@ -2327,7 +1976,6 @@ { CONVVARS(DATE); - CHECKPTR(VarI8FromDate); CONVERT(VarI8FromDate, -128.0); EXPECTI8(-128); CONVERT(VarI8FromDate, -1.0); EXPECTI8(-1); CONVERT(VarI8FromDate, 0.0); EXPECTI8(0); @@ -2349,7 +1997,6 @@ CONVVARS(VARIANT_BOOL); int i; - CHECKPTR(VarI8FromBool); for (i = -32768; i < 32768; i++) { CONVERT(VarI8FromBool,i); EXPECTI8(i); @@ -2360,7 +2007,6 @@ { CONVVARS(ULONG64); - CHECKPTR(VarI8FromUI8); CONVERT(VarI8FromUI8, 0); EXPECTI8(0); CONVERT(VarI8FromUI8, 1); EXPECTI8(1); CONVERT_I8(VarI8FromUI8, 0x7fffffff, 0xffffffff); EXPECTI864(0x7fffffff, 0xffffffff); @@ -2371,7 +2017,6 @@ { CONVVARS(CY); - CHECKPTR(VarI8FromCy); CONVERT_CY(VarI8FromCy,-128); EXPECTI8(-129); CONVERT_CY(VarI8FromCy,-1); EXPECTI8(-2); CONVERT_CY(VarI8FromCy,0); EXPECTI8(0); @@ -2392,8 +2037,6 @@ { CONVVARS(DECIMAL); - CHECKPTR(VarI8FromDec); - CONVERT_BADDEC(VarI8FromDec); CONVERT_DEC(VarI8FromDec,0,0x80,0,128); EXPECTI8(-128); @@ -2412,8 +2055,6 @@ OLECHAR buff[128]; in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarI8FromStr); CONVERT_STR(VarI8FromStr,NULL,0); EXPECT_MISMATCH; CONVERT_STR(VarI8FromStr,"0",0); EXPECTI8(0); @@ -2488,7 +2129,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarUI8FromI1); for (i = -128; i < 128; i++) { CONVERT(VarUI8FromI1,i); @@ -2504,7 +2144,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarUI8FromUI1); for (i = 0; i < 256; i++) { CONVERT(VarUI8FromUI1,i); EXPECTI8(i); @@ -2516,7 +2155,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarUI8FromI2); for (i = -32768; i < 32768; i++) { CONVERT(VarUI8FromI2,i); @@ -2532,7 +2170,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarUI8FromUI2); for (i = 0; i < 65535; i++) { CONVERT(VarUI8FromUI2,i); EXPECTI8(i); @@ -2543,7 +2180,6 @@ { CONVVARS(ULONG); - CHECKPTR(VarUI8FromUI4); CONVERT(VarUI8FromUI4, 0); EXPECTI8(0); CONVERT(VarUI8FromUI4, 0xffffffff); EXPECTI8(0xffffffff); } @@ -2552,7 +2188,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarUI8FromR4); CONVERT(VarUI8FromR4, -1.0f); EXPECT_OVERFLOW; CONVERT(VarUI8FromR4, 0.0f); EXPECTI8(0); CONVERT(VarUI8FromR4, 1.0f); EXPECTI8(1); @@ -2572,7 +2207,6 @@ { CONVVARS(DOUBLE); - CHECKPTR(VarUI8FromR8); CONVERT(VarUI8FromR8, -1.0); EXPECT_OVERFLOW; CONVERT(VarUI8FromR8, 0.0); EXPECTI8(0); CONVERT(VarUI8FromR8, 1.0); EXPECTI8(1); @@ -2592,7 +2226,6 @@ { CONVVARS(DATE); - CHECKPTR(VarUI8FromDate); CONVERT(VarUI8FromDate, -1.0); EXPECT_OVERFLOW; CONVERT(VarUI8FromDate, 0.0); EXPECTI8(0); CONVERT(VarUI8FromDate, 1.0); EXPECTI8(1); @@ -2613,7 +2246,6 @@ CONVVARS(VARIANT_BOOL); int i; - CHECKPTR(VarUI8FromBool); for (i = -32768; i < 32768; i++) { CONVERT(VarUI8FromBool, i); EXPECTI8(i); @@ -2624,7 +2256,6 @@ { CONVVARS(LONG64); - CHECKPTR(VarUI8FromI8); CONVERT(VarUI8FromI8, -1); EXPECT_OVERFLOW; CONVERT(VarUI8FromI8, 0); EXPECTI8(0); CONVERT(VarUI8FromI8, 1); EXPECTI8(1); @@ -2634,7 +2265,6 @@ { CONVVARS(CY); - CHECKPTR(VarUI8FromCy); CONVERT_CY(VarUI8FromCy,-1); EXPECT_OVERFLOW; CONVERT_CY(VarUI8FromCy,0); EXPECTI8(0); CONVERT_CY(VarUI8FromCy,1); EXPECTI8(1); @@ -2654,8 +2284,6 @@ { CONVVARS(DECIMAL); - CHECKPTR(VarUI8FromDec); - CONVERT_BADDEC(VarUI8FromDec); /* This returns 1 under native; Wine fixes this bug and returns overflow */ @@ -2678,8 +2306,6 @@ OLECHAR buff[128]; in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarUI8FromStr); CONVERT_STR(VarUI8FromStr,NULL,0); EXPECT_MISMATCH; CONVERT_STR(VarUI8FromStr,"0",0); EXPECTI8(0); @@ -2762,7 +2388,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarR4FromI1); CONVERTRANGE(VarR4FromI1, -128, 128); } @@ -2771,7 +2396,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarR4FromUI1); CONVERTRANGE(VarR4FromUI1, 0, 256); } @@ -2780,7 +2404,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarR4FromI2); CONVERTRANGE(VarR4FromI2, -32768, 32768); } @@ -2789,7 +2412,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarR4FromUI2); CONVERTRANGE(VarR4FromUI2, 0, 65536); } @@ -2797,7 +2419,6 @@ { CONVVARS(int); - CHECKPTR(VarR4FromI4); CONVERT(VarR4FromI4, -2147483647-1); EXPECT(-2147483648.0f); CONVERT(VarR4FromI4, -1); EXPECT(-1.0f); CONVERT(VarR4FromI4, 0); EXPECT(0.0f); @@ -2809,7 +2430,6 @@ { CONVVARS(unsigned int); - CHECKPTR(VarR4FromUI4); CONVERT(VarR4FromUI4, 0); EXPECT(0.0f); CONVERT(VarR4FromUI4, 1); EXPECT(1.0f); #if defined(__i386__) && (defined(_MSC_VER) || defined(__GNUC__)) @@ -2821,7 +2441,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarR4FromR8); CONVERT(VarR4FromR8, -1.0); EXPECT(-1.0f); CONVERT(VarR4FromR8, 0.0); EXPECT(0.0f); CONVERT(VarR4FromR8, 1.0); EXPECT(1.0f); @@ -2834,7 +2453,6 @@ { CONVVARS(VARIANT_BOOL); - CHECKPTR(VarR4FromBool); CONVERT(VarR4FromBool, VARIANT_TRUE); EXPECT(VARIANT_TRUE * 1.0f); CONVERT(VarR4FromBool, VARIANT_FALSE); EXPECT(VARIANT_FALSE * 1.0f); } @@ -2843,7 +2461,6 @@ { CONVVARS(CY); - CHECKPTR(VarR4FromCy); CONVERT_CY(VarR4FromCy,-32768); EXPECT(-32768.0f); CONVERT_CY(VarR4FromCy,-1); EXPECT(-1.0f); CONVERT_CY(VarR4FromCy,0); EXPECT(0.0f); @@ -2864,7 +2481,6 @@ { CONVVARS(LONG64); - CHECKPTR(VarR4FromI8); CONVERT(VarR4FromI8, -1); EXPECT(-1.0f); CONVERT(VarR4FromI8, 0); EXPECT(0.0f); CONVERT(VarR4FromI8, 1); EXPECT(1.0f); @@ -2874,7 +2490,6 @@ { CONVVARS(ULONG64); - CHECKPTR(VarR4FromUI8); CONVERT(VarR4FromUI8, 0); EXPECT(0.0f); CONVERT(VarR4FromUI8, 1); EXPECT(1.0f); } @@ -2882,8 +2497,6 @@ static void test_VarR4FromDec(void) { CONVVARS(DECIMAL); - - CHECKPTR(VarR4FromDec); CONVERT_BADDEC(VarR4FromDec); @@ -2904,7 +2517,6 @@ { CONVVARS(DATE); - CHECKPTR(VarR4FromDate); CONVERT(VarR4FromDate, -1.0); EXPECT(-1.0f); CONVERT(VarR4FromDate, 0.0); EXPECT(0.0f); CONVERT(VarR4FromDate, 1.0); EXPECT(1.0f); @@ -2916,8 +2528,6 @@ OLECHAR buff[128]; in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarR4FromStr); CONVERT_STR(VarR4FromStr,NULL,0); EXPECT_MISMATCH; CONVERT_STR(VarR4FromStr,"-1", 0); EXPECT(-1.0f); @@ -2965,7 +2575,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarR8FromI1); CONVERTRANGE(VarR8FromI1, -128, 128); } @@ -2974,7 +2583,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarR8FromUI1); CONVERTRANGE(VarR8FromUI1, 0, 256); } @@ -2983,7 +2591,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarR8FromI2); CONVERTRANGE(VarR8FromI2, -32768, 32768); } @@ -2992,7 +2599,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarR8FromUI2); CONVERTRANGE(VarR8FromUI2, 0, 65536); } @@ -3000,7 +2606,6 @@ { CONVVARS(int); - CHECKPTR(VarR8FromI4); CONVERT(VarR8FromI4, -2147483647-1); EXPECT(-2147483648.0); CONVERT(VarR8FromI4, -1); EXPECT(-1.0); CONVERT(VarR8FromI4, 0); EXPECT(0.0); @@ -3012,7 +2617,6 @@ { CONVVARS(unsigned int); - CHECKPTR(VarR8FromUI4); CONVERT(VarR8FromUI4, 0); EXPECT(0.0); CONVERT(VarR8FromUI4, 1); EXPECT(1.0); CONVERT(VarR8FromUI4, 0xffffffff); EXPECT(4294967295.0); @@ -3022,7 +2626,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarR8FromR4); CONVERT(VarR8FromR4, -1.0f); EXPECT(-1.0); CONVERT(VarR8FromR4, 0.0f); EXPECT(0.0); CONVERT(VarR8FromR4, 1.0f); EXPECT(1.0); @@ -3035,7 +2638,6 @@ { CONVVARS(VARIANT_BOOL); - CHECKPTR(VarR8FromBool); CONVERT(VarR8FromBool, VARIANT_TRUE); EXPECT(VARIANT_TRUE * 1.0); CONVERT(VarR8FromBool, VARIANT_FALSE); EXPECT(VARIANT_FALSE * 1.0); } @@ -3044,7 +2646,6 @@ { CONVVARS(CY); - CHECKPTR(VarR8FromCy); CONVERT_CY(VarR8FromCy,-32769); EXPECT(-32769.0); CONVERT_CY(VarR8FromCy,-32768); EXPECT(-32768.0); CONVERT_CY(VarR8FromCy,-1); EXPECT(-1.0); @@ -3067,7 +2668,6 @@ { CONVVARS(LONG64); - CHECKPTR(VarR8FromI8); CONVERT(VarR8FromI8, -1); EXPECT(-1.0); CONVERT(VarR8FromI8, 0); EXPECT(0.0); CONVERT(VarR8FromI8, 1); EXPECT(1.0); @@ -3080,7 +2680,6 @@ { CONVVARS(ULONG64); - CHECKPTR(VarR8FromUI8); CONVERT(VarR8FromUI8, 0); EXPECT(0.0); CONVERT(VarR8FromUI8, 1); EXPECT(1.0); #if defined(__i386__) && (defined(_MSC_VER) || defined(__GNUC__)) @@ -3092,8 +2691,6 @@ { CONVVARS(DECIMAL); - CHECKPTR(VarR8FromDec); - CONVERT_BADDEC(VarR8FromDec); CONVERT_DEC(VarR8FromDec,0,0x80,0,32768); EXPECT(-32768.0); @@ -3112,7 +2709,6 @@ { CONVVARS(DATE); - CHECKPTR(VarR8FromDate); CONVERT(VarR8FromDate, -1.0); EXPECT(-1.0); CONVERT(VarR8FromDate, -0.0); EXPECT(0.0); CONVERT(VarR8FromDate, 1.0); EXPECT(1.0); @@ -3124,8 +2720,6 @@ OLECHAR buff[128]; in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarR8FromStr); CONVERT_STR(VarR8FromStr,NULL,0); EXPECT_MISMATCH; CONVERT_STR(VarR8FromStr,"",0); EXPECT_MISMATCH; @@ -3163,7 +2757,7 @@ #endif } -#define MATHRND(l, r) left = l; right = r; hres = pVarR8Round(left, right, &out) +#define MATHRND(l, r) left = l; right = r; hres = VarR8Round(left, right, &out) static void test_VarR8Round(void) { @@ -3171,7 +2765,6 @@ double left = 0.0, out; int right; - CHECKPTR(VarR8Round); MATHRND(0.5432, 5); EXPECT(0.5432); MATHRND(0.5432, 4); EXPECT(0.5432); MATHRND(0.5432, 3); EXPECT(0.543); @@ -3208,7 +2801,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarDateFromI1); CONVERTRANGE(VarDateFromI1, -128, 128); } @@ -3217,7 +2809,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarDateFromUI1); CONVERTRANGE(VarDateFromUI1, 0, 256); } @@ -3226,7 +2817,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarDateFromI2); CONVERTRANGE(VarDateFromI2, -32768, 32768); } @@ -3235,7 +2825,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarDateFromUI2); CONVERTRANGE(VarDateFromUI2, 0, 65536); } @@ -3243,7 +2832,6 @@ { CONVVARS(int); - CHECKPTR(VarDateFromI4); CONVERT(VarDateFromI4, DATE_MIN-1); if (hres != DISP_E_TYPEMISMATCH) /* Early versions return this, incorrectly */ EXPECT_OVERFLOW; @@ -3261,7 +2849,6 @@ { CONVVARS(unsigned int); - CHECKPTR(VarDateFromUI4); CONVERT(VarDateFromUI4, 0); EXPECT(0.0); CONVERT(VarDateFromUI4, 1); EXPECT(1.0); CONVERT(VarDateFromUI4, DATE_MAX); EXPECT(DATE_MAX); @@ -3274,7 +2861,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarDateFromR4); CONVERT(VarDateFromR4, -1.0f); EXPECT(-1.0); CONVERT(VarDateFromR4, 0.0f); EXPECT(0.0); CONVERT(VarDateFromR4, 1.0f); EXPECT(1.0); @@ -3285,7 +2871,6 @@ { CONVVARS(double); - CHECKPTR(VarDateFromR8); CONVERT(VarDateFromR8, -1.0f); EXPECT(-1.0); CONVERT(VarDateFromR8, 0.0f); EXPECT(0.0); CONVERT(VarDateFromR8, 1.0f); EXPECT(1.0); @@ -3296,7 +2881,6 @@ { CONVVARS(VARIANT_BOOL); - CHECKPTR(VarDateFromBool); CONVERT(VarDateFromBool, VARIANT_TRUE); EXPECT(VARIANT_TRUE * 1.0); CONVERT(VarDateFromBool, VARIANT_FALSE); EXPECT(VARIANT_FALSE * 1.0); } @@ -3305,7 +2889,6 @@ { CONVVARS(CY); - CHECKPTR(VarDateFromCy); CONVERT_CY(VarDateFromCy,-32769); EXPECT(-32769.0); CONVERT_CY(VarDateFromCy,-32768); EXPECT(-32768.0); CONVERT_CY(VarDateFromCy,-1); EXPECT(-1.0); @@ -3328,7 +2911,6 @@ { CONVVARS(LONG64); - CHECKPTR(VarDateFromI8); CONVERT(VarDateFromI8, DATE_MIN-1); EXPECT_OVERFLOW; CONVERT(VarDateFromI8, DATE_MIN); EXPECT(DATE_MIN); CONVERT(VarDateFromI8, -1); EXPECT(-1.0); @@ -3342,7 +2924,6 @@ { CONVVARS(ULONG64); - CHECKPTR(VarDateFromUI8); CONVERT(VarDateFromUI8, 0); EXPECT(0.0); CONVERT(VarDateFromUI8, 1); EXPECT(1.0); CONVERT(VarDateFromUI8, DATE_MAX); EXPECT(DATE_MAX); @@ -3352,8 +2933,6 @@ static void test_VarDateFromDec(void) { CONVVARS(DECIMAL); - - CHECKPTR(VarDateFromDec); CONVERT_BADDEC(VarDateFromDec); @@ -3370,10 +2949,10 @@ #define DFS(str) \ buff[0] = '\0'; out = 0.0; \ if (str) MultiByteToWideChar(CP_ACP,0,str,-1,buff,sizeof(buff)/sizeof(WCHAR)); \ - hres = pVarDateFromStr(str ? buff : NULL,lcid,LOCALE_NOUSEROVERRIDE,&out) + hres = VarDateFromStr(str ? buff : NULL,lcid,LOCALE_NOUSEROVERRIDE,&out) #define MKRELDATE(day,mth) st.wMonth = mth; st.wDay = day; \ - pSystemTimeToVariantTime(&st,&relative) + SystemTimeToVariantTime(&st,&relative) static const char * const BadDateStrings[] = { @@ -3419,9 +2998,6 @@ '1',':','2','0',':','3','4',0 }; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - - CHECKPTR(VarDateFromStr); - CHECKPTR(SystemTimeToVariantTime); /* Some date formats are relative, so we need to find the current year */ GetSystemTime(&st); @@ -3542,7 +3118,7 @@ /* test a data with ideographic space */ out = 0.0; - hres = pVarDateFromStr(with_ideographic_spaceW, lcid, LOCALE_NOUSEROVERRIDE, &out); + hres = VarDateFromStr(with_ideographic_spaceW, lcid, LOCALE_NOUSEROVERRIDE, &out); EXPECT_DBL(40724.05594907407); /* test a non-english data string */ @@ -3638,7 +3214,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarCyFromI1); for (i = -128; i < 128; i++) { CONVERT(VarCyFromI1,i); EXPECTCY(i); @@ -3650,7 +3225,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarCyFromUI1); for (i = 0; i < 256; i++) { CONVERT(VarCyFromUI1,i); EXPECTCY(i); @@ -3662,7 +3236,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarCyFromI2); for (i = -16384; i < 16384; i++) { CONVERT(VarCyFromI2,i); EXPECTCY(i); @@ -3674,7 +3247,6 @@ CONVVARS(int); int i; - CHECKPTR(VarCyFromUI2); for (i = 0; i < 32768; i++) { CONVERT(VarCyFromUI2,i); EXPECTCY(i); @@ -3685,7 +3257,6 @@ { CONVVARS(int); - CHECKPTR(VarCyFromI4); CONVERT(VarCyFromI4, -1); EXPECTCY(-1); CONVERT(VarCyFromI4, 0); EXPECTCY(0); CONVERT(VarCyFromI4, 1); EXPECTCY(1); @@ -3697,7 +3268,6 @@ { CONVVARS(unsigned int); - CHECKPTR(VarCyFromUI4); CONVERT(VarCyFromUI4, 0); EXPECTCY(0); CONVERT(VarCyFromUI4, 1); EXPECTCY(1); CONVERT(VarCyFromUI4, 0x80000000); EXPECTCY64(5000, 0); @@ -3707,7 +3277,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarCyFromR4); CONVERT(VarCyFromR4, -1.0f); EXPECTCY(-1); CONVERT(VarCyFromR4, 0.0f); EXPECTCY(0); CONVERT(VarCyFromR4, 1.0f); EXPECTCY(1); @@ -3738,8 +3307,6 @@ static void test_VarCyFromR8(void) { CONVVARS(DOUBLE); - - CHECKPTR(VarCyFromR8); #if defined(__i386__) && (defined(_MSC_VER) || defined(__GNUC__)) /* Test our rounding is exactly the same. This fails if the special x86 @@ -3782,7 +3349,6 @@ CONVVARS(VARIANT_BOOL); int i; - CHECKPTR(VarCyFromBool); for (i = -32768; i < 32768; i++) { CONVERT(VarCyFromBool, i); EXPECTCY(i); @@ -3793,7 +3359,6 @@ { CONVVARS(LONG64); - CHECKPTR(VarCyFromI8); CONVERT_I8(VarCyFromI8, -214749, 2728163227ul); EXPECT_OVERFLOW; CONVERT_I8(VarCyFromI8, -214749, 2728163228ul); EXPECTCY64(2147483648ul,15808); CONVERT(VarCyFromI8, -1); EXPECTCY(-1); @@ -3807,7 +3372,6 @@ { CONVVARS(ULONG64); - CHECKPTR(VarCyFromUI8); CONVERT(VarCyFromUI8, 0); EXPECTCY(0); CONVERT(VarCyFromUI8, 1); EXPECTCY(1); CONVERT_I8(VarCyFromUI8, 214748, 1566804068); EXPECTCY64(2147483647ul, 4294951488ul); @@ -3819,8 +3383,6 @@ static void test_VarCyFromDec(void) { CONVVARS(DECIMAL); - - CHECKPTR(VarCyFromDec); CONVERT_BADDEC(VarCyFromDec); @@ -3847,8 +3409,6 @@ static void test_VarCyFromDate(void) { CONVVARS(DATE); - - CHECKPTR(VarCyFromDate); #if defined(__i386__) && (defined(_MSC_VER) || defined(__GNUC__)) CONVERT(VarCyFromR8, -461168601842738.7904); EXPECTCY64(0xbfffffff, 0xffffff23); @@ -3885,16 +3445,15 @@ #define MATHVARS1 HRESULT hres; double left = 0.0; CY cyLeft, out #define MATHVARS2 MATHVARS1; double right = 0.0; CY cyRight -#define MATH1(func, l) left = (double)l; pVarCyFromR8(left, &cyLeft); hres = p##func(cyLeft, &out) +#define MATH1(func, l) left = (double)l; VarCyFromR8(left, &cyLeft); hres = func(cyLeft, &out) #define MATH2(func, l, r) left = (double)l; right = (double)r; \ - pVarCyFromR8(left, &cyLeft); pVarCyFromR8(right, &cyRight); \ - hres = p##func(cyLeft, cyRight, &out) + VarCyFromR8(left, &cyLeft); VarCyFromR8(right, &cyRight); \ + hres = func(cyLeft, cyRight, &out) static void test_VarCyAdd(void) { MATHVARS2; - CHECKPTR(VarCyAdd); MATH2(VarCyAdd, 0.5, 0.5); EXPECTCY(1); MATH2(VarCyAdd, 0.5, -0.4); EXPECTCY(0.1); MATH2(VarCyAdd, 0.5, -0.6); EXPECTCY(-0.1); @@ -3909,7 +3468,6 @@ { MATHVARS2; - CHECKPTR(VarCyMul); MATH2(VarCyMul, 534443.0, 0.0); EXPECTCY(0); MATH2(VarCyMul, 0.5, 0.5); EXPECTCY(0.25); MATH2(VarCyMul, 0.5, -0.4); EXPECTCY(-0.2); @@ -3922,7 +3480,6 @@ { MATHVARS2; - CHECKPTR(VarCySub); MATH2(VarCySub, 0.5, 0.5); EXPECTCY(0); MATH2(VarCySub, 0.5, -0.4); EXPECTCY(0.9); MATH2(VarCySub, 0.5, -0.6); EXPECTCY(1.1); @@ -3937,7 +3494,6 @@ { MATHVARS1; - CHECKPTR(VarCyAbs); MATH1(VarCyAbs, 0.5); EXPECTCY(0.5); MATH1(VarCyAbs, -0.5); EXPECTCY(0.5); MATH1(VarCyAbs, 922337203685476.0); EXPECTCY64(2147483647ul,4294951488ul); @@ -3948,22 +3504,20 @@ { MATHVARS1; - CHECKPTR(VarCyNeg); MATH1(VarCyNeg, 0.5); EXPECTCY(-0.5); MATH1(VarCyNeg, -0.5); EXPECTCY(0.5); MATH1(VarCyNeg, 922337203685476.0); EXPECTCY64(2147483648ul,15808); MATH1(VarCyNeg, -922337203685476.0); EXPECTCY64(2147483647ul,4294951488ul); } -#define MATHMULI4(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \ - hres = pVarCyMulI4(cyLeft, right, &out) +#define MATHMULI4(l, r) left = l; right = r; VarCyFromR8(left, &cyLeft); \ + hres = VarCyMulI4(cyLeft, right, &out) static void test_VarCyMulI4(void) { MATHVARS1; LONG right; - CHECKPTR(VarCyMulI4); MATHMULI4(534443.0, 0); EXPECTCY(0); MATHMULI4(0.5, 1); EXPECTCY(0.5); MATHMULI4(0.5, 2); EXPECTCY(1); @@ -3971,15 +3525,14 @@ MATHMULI4(922337203685476.0, 2); EXPECT_OVERFLOW; } -#define MATHMULI8(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \ - hres = pVarCyMulI8(cyLeft, right, &out) +#define MATHMULI8(l, r) left = l; right = r; VarCyFromR8(left, &cyLeft); \ + hres = VarCyMulI8(cyLeft, right, &out) static void test_VarCyMulI8(void) { MATHVARS1; LONG64 right; - CHECKPTR(VarCyMulI8); MATHMULI8(534443.0, 0); EXPECTCY(0); MATHMULI8(0.5, 1); EXPECTCY(0.5); MATHMULI8(0.5, 2); EXPECTCY(1); @@ -3987,8 +3540,8 @@ MATHMULI8(922337203685476.0, 2); EXPECT_OVERFLOW; } -#define MATHCMP(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); pVarCyFromR8(right, &cyRight); \ - hres = pVarCyCmp(cyLeft, cyRight) +#define MATHCMP(l, r) left = l; right = r; VarCyFromR8(left, &cyLeft); VarCyFromR8(right, &cyRight); \ + hres = VarCyCmp(cyLeft, cyRight) static void test_VarCyCmp(void) { @@ -3996,7 +3549,6 @@ double left = 0.0, right = 0.0; CY cyLeft, cyRight; - CHECKPTR(VarCyCmp); MATHCMP(-1.0, -1.0); EXPECT_EQ; MATHCMP(-1.0, 0.0); EXPECT_LT; MATHCMP(-1.0, 1.0); EXPECT_LT; @@ -4010,8 +3562,8 @@ MATHCMP(1.0, 2.0); EXPECT_LT; } -#define MATHCMPR8(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \ - hres = pVarCyCmpR8(cyLeft, right); +#define MATHCMPR8(l, r) left = l; right = r; VarCyFromR8(left, &cyLeft); \ + hres = VarCyCmpR8(cyLeft, right); static void test_VarCyCmpR8(void) { @@ -4020,7 +3572,6 @@ CY cyLeft; double right; - CHECKPTR(VarCyCmpR8); MATHCMPR8(-1.0, -1.0); EXPECT_EQ; MATHCMPR8(-1.0, 0.0); EXPECT_LT; MATHCMPR8(-1.0, 1.0); EXPECT_LT; @@ -4035,15 +3586,14 @@ } #undef MATHRND -#define MATHRND(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \ - hres = pVarCyRound(cyLeft, right, &out) +#define MATHRND(l, r) left = l; right = r; VarCyFromR8(left, &cyLeft); \ + hres = VarCyRound(cyLeft, right, &out) static void test_VarCyRound(void) { MATHVARS1; int right; - CHECKPTR(VarCyRound); MATHRND(0.5432, 5); EXPECTCY(0.5432); MATHRND(0.5432, 4); EXPECTCY(0.5432); MATHRND(0.5432, 3); EXPECTCY(0.543); @@ -4068,14 +3618,13 @@ MATHRND(1.5001, 0); EXPECTCY(2); } -#define MATHFIX(l) left = l; pVarCyFromR8(left, &cyLeft); \ - hres = pVarCyFix(cyLeft, &out) +#define MATHFIX(l) left = l; VarCyFromR8(left, &cyLeft); \ + hres = VarCyFix(cyLeft, &out) static void test_VarCyFix(void) { MATHVARS1; - CHECKPTR(VarCyFix); MATHFIX(-1.0001); EXPECTCY(-1); MATHFIX(-1.4999); EXPECTCY(-1); MATHFIX(-1.5001); EXPECTCY(-1); @@ -4094,14 +3643,13 @@ MATHFIX(1.9999); EXPECTCY(1); } -#define MATHINT(l) left = l; pVarCyFromR8(left, &cyLeft); \ - hres = pVarCyInt(cyLeft, &out) +#define MATHINT(l) left = l; VarCyFromR8(left, &cyLeft); \ + hres = VarCyInt(cyLeft, &out) static void test_VarCyInt(void) { MATHVARS1; - CHECKPTR(VarCyInt); MATHINT(-1.0001); EXPECTCY(-2); MATHINT(-1.4999); EXPECTCY(-2); MATHINT(-1.5001); EXPECTCY(-2); @@ -4155,7 +3703,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarDecFromI1); for (i = -128; i < 128; i++) { CONVERT(VarDecFromI1,i); EXPECTDECI; @@ -4167,7 +3714,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarDecFromI2); for (i = -32768; i < 32768; i++) { CONVERT(VarDecFromI2,i); EXPECTDECI; @@ -4179,7 +3725,6 @@ CONVVARS(LONG); int i; - CHECKPTR(VarDecFromI4); for (i = -32768; i < 32768; i++) { CONVERT(VarDecFromI4,i); EXPECTDECI; @@ -4191,7 +3736,6 @@ CONVVARS(LONG64); int i; - CHECKPTR(VarDecFromI8); for (i = -32768; i < 32768; i++) { CONVERT(VarDecFromI8,i); EXPECTDECI; @@ -4203,7 +3747,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarDecFromUI1); for (i = 0; i < 256; i++) { CONVERT(VarDecFromUI1,i); EXPECTDECI; @@ -4215,7 +3758,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarDecFromUI2); for (i = 0; i < 65536; i++) { CONVERT(VarDecFromUI2,i); EXPECTDECI; @@ -4227,7 +3769,6 @@ CONVVARS(ULONG); int i; - CHECKPTR(VarDecFromUI4); for (i = 0; i < 65536; i++) { CONVERT(VarDecFromUI4,i); EXPECTDECI; @@ -4239,7 +3780,6 @@ CONVVARS(ULONG64); int i; - CHECKPTR(VarDecFromUI8); for (i = 0; i < 65536; i++) { CONVERT(VarDecFromUI8,i); EXPECTDECI; @@ -4251,7 +3791,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarDecFromBool); /* Test all possible type values. Note that the result is reduced to 0 or -1 */ for (i = -32768; i < 0; i++) { @@ -4267,8 +3806,6 @@ { CONVVARS(float); - CHECKPTR(VarDecFromR4); - CONVERT(VarDecFromR4,-0.6f); EXPECTDEC(1,0x80,0,6); CONVERT(VarDecFromR4,-0.5f); EXPECTDEC(1,0x80,0,5); CONVERT(VarDecFromR4,-0.4f); EXPECTDEC(1,0x80,0,4); @@ -4282,8 +3819,6 @@ { CONVVARS(double); - CHECKPTR(VarDecFromR8); - CONVERT(VarDecFromR8,-0.6); EXPECTDEC(1,0x80,0,6); CONVERT(VarDecFromR8,-0.5); EXPECTDEC(1,0x80,0,5); CONVERT(VarDecFromR8,-0.4); EXPECTDEC(1,0x80,0,4); @@ -4297,8 +3832,6 @@ { CONVVARS(DATE); - CHECKPTR(VarDecFromDate); - CONVERT(VarDecFromDate,-0.6); EXPECTDEC(1,0x80,0,6); CONVERT(VarDecFromDate,-0.5); EXPECTDEC(1,0x80,0,5); CONVERT(VarDecFromDate,-0.4); EXPECTDEC(1,0x80,0,4); @@ -4312,8 +3845,6 @@ { CONVVARS(LCID); OLECHAR buff[128]; - - CHECKPTR(VarDecFromStr); in = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); @@ -4332,8 +3863,6 @@ { CONVVARS(CY); - CHECKPTR(VarDecFromCy); - CONVERT_CY(VarDecFromCy, -1); EXPECTDEC(4,0x80,0,10000); CONVERT_CY(VarDecFromCy, 0); EXPECTDEC(4,0,0,0); CONVERT_CY(VarDecFromCy, 1); EXPECTDEC(4,0,0,10000); @@ -4345,17 +3874,16 @@ #undef MATHVARS2 #define MATHVARS2 MATHVARS1; DECIMAL r #undef MATH1 -#define MATH1(func) hres = p##func(&l, &out) +#define MATH1(func) hres = func(&l, &out) #undef MATH2 -#define MATH2(func) hres = p##func(&l, &r, &out) +#define MATH2(func) hres = func(&l, &r, &out) #undef MATH3 -#define MATH3(func) hres = p##func(&l, r) +#define MATH3(func) hres = func(&l, r) static void test_VarDecAbs(void) { MATHVARS1; - CHECKPTR(VarDecAbs); SETDEC(l,0,0x80,0,1); MATH1(VarDecAbs); EXPECTDEC(0,0,0,1); SETDEC(l,0,0,0,0); MATH1(VarDecAbs); EXPECTDEC(0,0,0,0); SETDEC(l,0,0x80,0,0); MATH1(VarDecAbs); EXPECTDEC(0,0,0,0); @@ -4370,7 +3898,6 @@ { MATHVARS1; - CHECKPTR(VarDecNeg); SETDEC(l,0,0x80,0,1); MATH1(VarDecNeg); EXPECTDEC(0,0,0,1); SETDEC(l,0,0,0,0); MATH1(VarDecNeg); EXPECTDEC(0,0x80,0,0); /* '-0'! */ SETDEC(l,0,0x80,0,0); MATH1(VarDecNeg); EXPECTDEC(0,0,0,0); @@ -4386,7 +3913,6 @@ { MATHVARS2; - CHECKPTR(VarDecAdd); SETDEC(l,0,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecAdd); EXPECTDEC(0,0,0,0); SETDEC(l,0,0,0,0); SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0x80,0,1); SETDEC(l,0,0,0,0); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0,0,1); @@ -4467,7 +3993,6 @@ { MATHVARS2; - CHECKPTR(VarDecSub); SETDEC(l,0,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecSub); EXPECTDECZERO(); SETDEC(l,0,0,0,0); SETDEC(r,0,0,0,1); MATH2(VarDecSub); EXPECTDEC(0,0x80,0,1); SETDEC(l,0,0,0,1); SETDEC(r,0,0,0,1); MATH2(VarDecSub); EXPECTDECZERO(); @@ -4478,7 +4003,6 @@ { MATHVARS2; - CHECKPTR(VarDecMul); SETDEC(l,0,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecMul); EXPECTDEC(0,0,0,0); SETDEC(l,0,0,0,1); SETDEC(r,0,0,0,0); MATH2(VarDecMul); EXPECTDEC(0,0,0,0); SETDEC(l,0,0,0,0); SETDEC(r,0,0,0,1); MATH2(VarDecMul); EXPECTDEC(0,0,0,0); @@ -4529,7 +4053,6 @@ { MATHVARS2; - CHECKPTR(VarDecDiv); /* identity divisions */ SETDEC(l,0,0,0,0); SETDEC(r,0,0,0,1); MATH2(VarDecDiv); EXPECTDEC(0,0,0,0); SETDEC(l,0,0,0,1); SETDEC(r,0,0,0,1); MATH2(VarDecDiv); EXPECTDEC(0,0,0,1); @@ -4579,8 +4102,6 @@ { MATHVARS1; - CHECKPTR(VarDecCmp); - SETDEC(l,0,0,0,1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(l,0,0,0,1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,0,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; @@ -4687,8 +4208,6 @@ HRESULT hres; DECIMAL l; double r; - - CHECKPTR(VarDecCmpR8); SETDEC(l,0,0,0,1); r = 0.0; MATH3(VarDecCmpR8); EXPECT_GT; SETDEC(l,0,0,0,1); r = 0.1; MATH3(VarDecCmpR8); EXPECT_GT; @@ -4719,30 +4238,28 @@ HRESULT hres; DECIMAL l, out; - CHECKPTR(VarDecRound); - - CLEAR(out); SETDEC(l, 0, 0, 0, 1); hres = pVarDecRound(&l, 3, &out); EXPECTDEC(0, 0, 0, 1); - - CLEAR(out); SETDEC(l, 0, 0, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, 0, 0, 1); - CLEAR(out); SETDEC(l, 1, 0, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, 0, 0, 0); - CLEAR(out); SETDEC(l, 1, 0, 0, 1); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 1); - CLEAR(out); SETDEC(l, 2, 0, 0, 11); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 1); - CLEAR(out); SETDEC(l, 2, 0, 0, 15); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 2); - CLEAR(out); SETDEC(l, 6, 0, 0, 550001); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 6); - - CLEAR(out); SETDEC(l, 0, DECIMAL_NEG, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, DECIMAL_NEG, 0, 1); - CLEAR(out); SETDEC(l, 1, DECIMAL_NEG, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, DECIMAL_NEG, 0, 0); - CLEAR(out); SETDEC(l, 1, DECIMAL_NEG, 0, 1); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 1); - CLEAR(out); SETDEC(l, 2, DECIMAL_NEG, 0, 11); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 1); - CLEAR(out); SETDEC(l, 2, DECIMAL_NEG, 0, 15); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 2); - CLEAR(out); SETDEC(l, 6, DECIMAL_NEG, 0, 550001); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 6); - - CLEAR(out); SETDEC64(l, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, 0, 0xffffffff, 0xffffffff, 0xffffffff); - CLEAR(out); SETDEC64(l, 28, 0, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, 0, 0, 0, 8); - CLEAR(out); SETDEC64(l, 0, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); - CLEAR(out); SETDEC64(l, 28, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, DECIMAL_NEG, 0, 0, 8); - - CLEAR(out); SETDEC(l, 2, 0, 0, 0); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 0); + CLEAR(out); SETDEC(l, 0, 0, 0, 1); hres = VarDecRound(&l, 3, &out); EXPECTDEC(0, 0, 0, 1); + + CLEAR(out); SETDEC(l, 0, 0, 0, 1); hres = VarDecRound(&l, 0, &out); EXPECTDEC(0, 0, 0, 1); + CLEAR(out); SETDEC(l, 1, 0, 0, 1); hres = VarDecRound(&l, 0, &out); EXPECTDEC(0, 0, 0, 0); + CLEAR(out); SETDEC(l, 1, 0, 0, 1); hres = VarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 1); + CLEAR(out); SETDEC(l, 2, 0, 0, 11); hres = VarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 1); + CLEAR(out); SETDEC(l, 2, 0, 0, 15); hres = VarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 2); + CLEAR(out); SETDEC(l, 6, 0, 0, 550001); hres = VarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 6); + + CLEAR(out); SETDEC(l, 0, DECIMAL_NEG, 0, 1); hres = VarDecRound(&l, 0, &out); EXPECTDEC(0, DECIMAL_NEG, 0, 1); + CLEAR(out); SETDEC(l, 1, DECIMAL_NEG, 0, 1); hres = VarDecRound(&l, 0, &out); EXPECTDEC(0, DECIMAL_NEG, 0, 0); + CLEAR(out); SETDEC(l, 1, DECIMAL_NEG, 0, 1); hres = VarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 1); + CLEAR(out); SETDEC(l, 2, DECIMAL_NEG, 0, 11); hres = VarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 1); + CLEAR(out); SETDEC(l, 2, DECIMAL_NEG, 0, 15); hres = VarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 2); + CLEAR(out); SETDEC(l, 6, DECIMAL_NEG, 0, 550001); hres = VarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 6); + + CLEAR(out); SETDEC64(l, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff); hres = VarDecRound(&l, 0, &out); EXPECTDEC64(0, 0, 0xffffffff, 0xffffffff, 0xffffffff); + CLEAR(out); SETDEC64(l, 28, 0, 0xffffffff, 0xffffffff, 0xffffffff); hres = VarDecRound(&l, 0, &out); EXPECTDEC64(0, 0, 0, 0, 8); + CLEAR(out); SETDEC64(l, 0, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); hres = VarDecRound(&l, 0, &out); EXPECTDEC64(0, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); + CLEAR(out); SETDEC64(l, 28, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); hres = VarDecRound(&l, 0, &out); EXPECTDEC64(0, DECIMAL_NEG, 0, 0, 8); + + CLEAR(out); SETDEC(l, 2, 0, 0, 0); hres = VarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 0); } /* @@ -4762,7 +4279,6 @@ CONVVARS(signed char); int i; - CHECKPTR(VarBoolFromI1); CONVERTRANGE(VarBoolFromI1, -128, 128); } @@ -4771,7 +4287,6 @@ CONVVARS(BYTE); int i; - CHECKPTR(VarBoolFromUI1); CONVERTRANGE(VarBoolFromUI1, 0, 256); } @@ -4780,7 +4295,6 @@ CONVVARS(SHORT); int i; - CHECKPTR(VarBoolFromI2); CONVERTRANGE(VarBoolFromI2, -32768, 32768); } @@ -4789,7 +4303,6 @@ CONVVARS(USHORT); int i; - CHECKPTR(VarBoolFromUI2); CONVERTRANGE(VarBoolFromUI2, 0, 65536); } @@ -4797,7 +4310,6 @@ { CONVVARS(int); - CHECKPTR(VarBoolFromI4); CONVERT(VarBoolFromI4, 0x80000000); EXPECT(VARIANT_TRUE); CONVERT(VarBoolFromI4, -1); EXPECT(VARIANT_TRUE); CONVERT(VarBoolFromI4, 0); EXPECT(VARIANT_FALSE); @@ -4809,7 +4321,6 @@ { CONVVARS(ULONG); - CHECKPTR(VarBoolFromUI4); CONVERT(VarBoolFromI4, 0); EXPECT(VARIANT_FALSE); CONVERT(VarBoolFromI4, 1); EXPECT(VARIANT_TRUE); CONVERT(VarBoolFromI4, 0x80000000); EXPECT(VARIANT_TRUE); @@ -4819,7 +4330,6 @@ { CONVVARS(FLOAT); - CHECKPTR(VarBoolFromR4); CONVERT(VarBoolFromR4, -1.0f); EXPECT(VARIANT_TRUE); CONVERT(VarBoolFromR4, 0.0f); EXPECT(VARIANT_FALSE); CONVERT(VarBoolFromR4, 1.0f); EXPECT(VARIANT_TRUE); @@ -4843,7 +4353,6 @@ /* Hopefully we made the point with R4 above that rounding is * irrelevant, so we'll skip that for R8 and Date */ - CHECKPTR(VarBoolFromR8); CONVERT(VarBoolFromR8, -1.0); EXPECT(VARIANT_TRUE); CONVERT(VarBoolFromR8, -0.0); EXPECT(VARIANT_FALSE); CONVERT(VarBoolFromR8, 1.0); EXPECT(VARIANT_TRUE); @@ -4853,7 +4362,6 @@ { CONVVARS(CY); - CHECKPTR(VarBoolFromCy); CONVERT_CY(VarBoolFromCy, -32769); EXPECT(VARIANT_TRUE); CONVERT_CY(VarBoolFromCy, -32768); EXPECT(VARIANT_TRUE); CONVERT_CY(VarBoolFromCy, -1); EXPECT(VARIANT_TRUE); @@ -4867,7 +4375,6 @@ { CONVVARS(LONG64); - CHECKPTR(VarBoolFromI8); CONVERT(VarBoolFromI8, -1); EXPECT(VARIANT_TRUE); CONVERT(VarBoolFromI8, 0); EXPECT(VARIANT_FALSE); CONVERT(VarBoolFromI8, 1); EXPECT(VARIANT_TRUE); @@ -4877,7 +4384,6 @@ { CONVVARS(ULONG64); - CHECKPTR(VarBoolFromUI8); CONVERT(VarBoolFromUI8, 0); EXPECT(VARIANT_FALSE); CONVERT(VarBoolFromUI8, 1); EXPECT(VARIANT_TRUE); } @@ -4886,7 +4392,6 @@ { CONVVARS(DECIMAL); - CHECKPTR(VarBoolFromDec); CONVERT_BADDEC(VarBoolFromDec); CONVERT_DEC(VarBoolFromDec,29,0,0,0); EXPECT_INVALID; @@ -4907,7 +4412,6 @@ { CONVVARS(DATE); - CHECKPTR(VarBoolFromDate); CONVERT(VarBoolFromDate, -1.0); EXPECT(VARIANT_TRUE); CONVERT(VarBoolFromDate, -0.0); EXPECT(VARIANT_FALSE); CONVERT(VarBoolFromDate, 1.0); EXPECT(VARIANT_TRUE); @@ -4917,8 +4421,6 @@ { CONVVARS(LCID); OLECHAR buff[128]; - - CHECKPTR(VarBoolFromStr); in = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); @@ -5053,12 +4555,10 @@ float f; - CHECKPTR(VarBstrFromR4); - lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); lcid_spanish = MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT); f = 654322.23456f; - hres = pVarBstrFromR4(f, lcid, 0, &bstr); + hres = VarBstrFromR4(f, lcid, 0, &bstr); ok(hres == S_OK, "got hres 0x%08x\n", hres); if (bstr) { @@ -5073,7 +4573,7 @@ } f = -0.0; - hres = pVarBstrFromR4(f, lcid, 0, &bstr); + hres = VarBstrFromR4(f, lcid, 0, &bstr); ok(hres == S_OK, "got hres 0x%08x\n", hres); if (bstr) { @@ -5086,7 +4586,7 @@ /* The following tests that lcid is used for decimal separator even without LOCALE_USE_NLS */ f = 0.5; - hres = pVarBstrFromR4(f, lcid, LOCALE_NOUSEROVERRIDE, &bstr); + hres = VarBstrFromR4(f, lcid, LOCALE_NOUSEROVERRIDE, &bstr); ok(hres == S_OK, "got hres 0x%08x\n", hres); if (bstr) { @@ -5094,7 +4594,7 @@ SysFreeString(bstr); } f = 0.5; - hres = pVarBstrFromR4(f, lcid_spanish, LOCALE_NOUSEROVERRIDE, &bstr); + hres = VarBstrFromR4(f, lcid_spanish, LOCALE_NOUSEROVERRIDE, &bstr); ok(hres == S_OK, "got hres 0x%08x\n", hres); if (bstr) { @@ -5110,7 +4610,7 @@ BSTR bstr = NULL; HRESULT hres; - hres = pVarBstrFromDate(dt, lcid, LOCALE_NOUSEROVERRIDE, &bstr); + hres = VarBstrFromDate(dt, lcid, LOCALE_NOUSEROVERRIDE, &bstr); if (bstr) { WideCharToMultiByte(CP_ACP, 0, bstr, -1, buff, sizeof(buff), 0, 0); @@ -5125,8 +4625,6 @@ static void test_VarBstrFromDate(void) { #define BSTR_DATE(dt,str) _BSTR_DATE(dt,str,__LINE__) - - CHECKPTR(VarBstrFromDate); BSTR_DATE(0.0, "12:00:00 AM"); BSTR_DATE(3.34, "1/2/1900 8:09:36 AM"); @@ -5151,7 +4649,7 @@ S(l).Lo = b; S(l).Hi = a; - hr = pVarBstrFromCy(l, lcid, LOCALE_NOUSEROVERRIDE, &bstr); + hr = VarBstrFromCy(l, lcid, LOCALE_NOUSEROVERRIDE, &bstr); ok(hr == S_OK, "got hr 0x%08x\n", hr); if(bstr) @@ -5173,8 +4671,6 @@ #define BSTR_CY(a, b, str, lcid) _BSTR_CY(a, b, str, lcid, __LINE__) LCID en_us, sp; - - CHECKPTR(VarBstrFromCy); en_us = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); sp = MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_DEFAULT), SORT_DEFAULT); @@ -5204,7 +4700,7 @@ DECIMAL dec; SETDEC64(dec, scale, sign, hi, mid, lo); - hr = pVarBstrFromDec(&dec, lcid, LOCALE_NOUSEROVERRIDE, &bstr); + hr = VarBstrFromDec(&dec, lcid, LOCALE_NOUSEROVERRIDE, &bstr); ok_(__FILE__, line)(hr == S_OK, "got hr 0x%08x\n", hr); if(bstr) @@ -5227,8 +4723,6 @@ #define BSTR_DEC64(scale, sign, hi, mid, lo, str, lcid) _BSTR_DEC(scale, sign, hi, mid, lo, str, lcid, __LINE__) LCID en_us, sp; - - CHECKPTR(VarBstrFromDec); en_us = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); sp = MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_DEFAULT), SORT_DEFAULT); @@ -5280,7 +4774,7 @@ } #define _VARBSTRCMP(left,right,lcid,flags,result) \ - hres = pVarBstrCmp(left,right,lcid,flags); \ + hres = VarBstrCmp(left,right,lcid,flags); \ ok(hres == result, "VarBstrCmp: expected " #result ", got hres=0x%x\n", hres) #define VARBSTRCMP(left,right,flags,result) \ _VARBSTRCMP(left,right,lcid,flags,result) @@ -5301,8 +4795,6 @@ static const char sbchr00[] = {0,0,0}; BSTR bstr, bstrempty, bstr2; - CHECKPTR(VarBstrCmp); - lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); bstr = SysAllocString(sz); bstrempty = SysAllocString(szempty); @@ -5711,16 +5203,14 @@ BSTR str1, str2, res; UINT len; - CHECKPTR(VarBstrCat); - if (0) { /* Crash */ - pVarBstrCat(NULL, NULL, NULL); + VarBstrCat(NULL, NULL, NULL); } /* Concatenation of two NULL strings works */ - ret = pVarBstrCat(NULL, NULL, &res); + ret = VarBstrCat(NULL, NULL, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == 0, "Expected a 0-length string\n"); @@ -5729,13 +5219,13 @@ str1 = SysAllocString(sz1); /* Concatenation with one NULL arg */ - ret = pVarBstrCat(NULL, str1, &res); + ret = VarBstrCat(NULL, str1, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == SysStringLen(str1), "Unexpected length\n"); ok(!memcmp(res, sz1, SysStringLen(str1)), "Unexpected value\n"); SysFreeString(res); - ret = pVarBstrCat(str1, NULL, &res); + ret = VarBstrCat(str1, NULL, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == SysStringLen(str1), "Unexpected length\n"); @@ -5744,7 +5234,7 @@ /* Concatenation of two zero-terminated strings */ str2 = SysAllocString(sz2); - ret = pVarBstrCat(str1, str2, &res); + ret = VarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == sizeof(sz1sz2) / sizeof(WCHAR) - 1, @@ -5759,7 +5249,7 @@ str1 = SysAllocStringLen(s1, sizeof(s1) / sizeof(WCHAR)); str2 = SysAllocStringLen(s2, sizeof(s2) / sizeof(WCHAR)); - ret = pVarBstrCat(str1, str2, &res); + ret = VarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == sizeof(s1s2) / sizeof(WCHAR), @@ -5778,7 +5268,7 @@ len = SysStringLen(str2); ok(len == (sizeof(str2A)-1)/sizeof(WCHAR), "got length %u\n", len); - ret = pVarBstrCat(str1, str2, &res); + ret = VarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); len = (sizeof(str1A) + sizeof(str2A) - 2)/sizeof(WCHAR); @@ -5797,7 +5287,7 @@ len = SysStringLen(str2); ok(len == 0, "got length %u\n", len); - ret = pVarBstrCat(str1, str2, &res); + ret = VarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == 1, "got %d, expected 1\n", SysStringLen(res)); @@ -6307,13 +5797,11 @@ CUSTDATA ci; unsigned i; - CHECKPTR(ClearCustData); - ci.cCustData = NUM_CUST_ITEMS; ci.prgCustData = CoTaskMemAlloc( sizeof(CUSTDATAITEM) * NUM_CUST_ITEMS ); for (i = 0; i < NUM_CUST_ITEMS; i++) VariantInit(&ci.prgCustData[i].varValue); - pClearCustData(&ci); + ClearCustData(&ci); ok(!ci.cCustData && !ci.prgCustData, "ClearCustData didn't clear fields!\n"); }

1 0

[akhaldi] 75892: [OLEAUT32] Sync with Wine Staging 2.16. CORE-13762 8da116d oleaut32: Don't copy uninitialized data. 0dde882 oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE...
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:56:37 2017 New Revision: 75892 URL: http://svn.reactos.org/svn/reactos?rev=75892&view=rev Log: [OLEAUT32] Sync with Wine Staging 2.16. CORE-13762 8da116d oleaut32: Don't copy uninitialized data. 0dde882 oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro. 840ab7c oleaut32: Simplify VarCat implementation. 538e46a oleaut32: Improve support for IDispatch in VarCat. cf45f3b oleaut32: Add an arguments check to LoadTypeLibEx. 4be8d83 oleaut32: Make VARIANT_GetLocalisedText() static. Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/variant.h trunk/reactos/dll/win32/oleaut32/vartype.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] Sun Sep 17 22:56:37 2017 @@ -1127,7 +1127,7 @@ DWORD x; hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD)); if (hres) ERR("Failed to read integer 4 byte\n"); - memcpy(arg,&x,2); + else memcpy(arg,&x,2); } if (debugout) TRACE_(olerelay)("%04x", *(WORD *)arg); return hres; @@ -1137,7 +1137,7 @@ DWORD x; hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD)); if (hres) ERR("Failed to read integer 4 byte\n"); - memcpy(arg,&x,1); + else memcpy(arg,&x,1); } if (debugout) TRACE_(olerelay)("%02x", *(BYTE *)arg); return hres; Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] Sun Sep 17 22:56:37 2017 @@ -4809,10 +4809,9 @@ if (!ref) { TLBImpLib *pImpLib, *pImpLibNext; - TLBRefType *ref_type; + TLBRefType *ref_type, *ref_type_next; TLBString *tlbstr, *tlbstr_next; TLBGuid *tlbguid, *tlbguid_next; - void *cursor2; int i; /* remove cache entry */ @@ -4862,7 +4861,7 @@ heap_free(pImpLib); } - LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry) + LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry) { list_remove(&ref_type->entry); heap_free(ref_type); Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] Sun Sep 17 22:56:37 2017 @@ -497,6 +497,22 @@ return SafeArrayCopy(V_ARRAY(ps), &V_ARRAY(pd)); return DISP_E_TYPEMISMATCH; +} + +static HRESULT VARIANT_FetchDispatchValue(LPVARIANT pvDispatch, LPVARIANT pValue) +{ + HRESULT hres; + static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; + + if ((V_VT(pvDispatch) & VT_TYPEMASK) == VT_DISPATCH) { + if (NULL == V_DISPATCH(pvDispatch)) return DISP_E_TYPEMISMATCH; + hres = IDispatch_Invoke(V_DISPATCH(pvDispatch), DISPID_VALUE, &IID_NULL, + LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &emptyParams, pValue, + NULL, NULL); + } else { + hres = DISP_E_TYPEMISMATCH; + } + return hres; } /****************************************************************************** @@ -2485,23 +2501,21 @@ */ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { - VARTYPE leftvt,rightvt,resultvt; + BSTR left_str = NULL, right_str = NULL; + VARTYPE leftvt, rightvt; HRESULT hres; - static const WCHAR sz_empty[] = {'\0'}; + + TRACE("%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), out); + leftvt = V_VT(left); rightvt = V_VT(right); - TRACE("%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), out); - /* when both left and right are NULL the result is NULL */ if (leftvt == VT_NULL && rightvt == VT_NULL) { V_VT(out) = VT_NULL; return S_OK; } - - hres = S_OK; - resultvt = VT_EMPTY; /* There are many special case for errors and return types */ if (leftvt == VT_VARIANT && (rightvt == VT_ERROR || @@ -2528,7 +2542,7 @@ rightvt == VT_UINT || rightvt == VT_EMPTY || rightvt == VT_NULL || rightvt == VT_DATE || rightvt == VT_DECIMAL || rightvt == VT_DISPATCH)) - resultvt = VT_BSTR; + hres = S_OK; else if (rightvt == VT_ERROR && leftvt < VT_VOID) hres = DISP_E_TYPEMISMATCH; else if (leftvt == VT_ERROR && (rightvt == VT_DATE || @@ -2558,72 +2572,72 @@ /* if result type is not S_OK, then no need to go further */ if (hres != S_OK) { - V_VT(out) = resultvt; + V_VT(out) = VT_EMPTY; return hres; } - /* Else proceed with formatting inputs to strings */ + + if (leftvt == VT_BSTR) + left_str = V_BSTR(left); else { - VARIANT bstrvar_left, bstrvar_right; - V_VT(out) = VT_BSTR; - - VariantInit(&bstrvar_left); - VariantInit(&bstrvar_right); - - /* Convert left side variant to string */ - if (leftvt != VT_BSTR) + VARIANT converted, *tmp = left; + + VariantInit(&converted); + if(leftvt == VT_DISPATCH) { - /* Fill with empty string for later concat with right side */ - if (leftvt == VT_NULL) - { - V_VT(&bstrvar_left) = VT_BSTR; - V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); - } - else - { - hres = VariantChangeTypeEx(&bstrvar_left,left,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - if (hres != S_OK) { - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return hres; - } - } + hres = VARIANT_FetchDispatchValue(left, &converted); + if(FAILED(hres)) + goto failed; + + tmp = &converted; } - /* convert right side variant to string */ - if (rightvt != VT_BSTR) + hres = VariantChangeTypeEx(&converted, tmp, 0, VARIANT_ALPHABOOL|VARIANT_LOCALBOOL, VT_BSTR); + if (SUCCEEDED(hres)) + left_str = V_BSTR(&converted); + else if (hres != DISP_E_TYPEMISMATCH) { - /* Fill with empty string for later concat with right side */ - if (rightvt == VT_NULL) - { - V_VT(&bstrvar_right) = VT_BSTR; - V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); - } - else - { - hres = VariantChangeTypeEx(&bstrvar_right,right,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - if (hres != S_OK) { - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return hres; - } - } + VariantClear(&converted); + goto failed; } - - /* Concat the resulting strings together */ - if (leftvt == VT_BSTR && rightvt == VT_BSTR) - VarBstrCat (V_BSTR(left), V_BSTR(right), &V_BSTR(out)); - else if (leftvt != VT_BSTR && rightvt != VT_BSTR) - VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(&bstrvar_right), &V_BSTR(out)); - else if (leftvt != VT_BSTR && rightvt == VT_BSTR) - VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(right), &V_BSTR(out)); - else if (leftvt == VT_BSTR && rightvt != VT_BSTR) - VarBstrCat (V_BSTR(left), V_BSTR(&bstrvar_right), &V_BSTR(out)); - - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return S_OK; - } + } + + if (rightvt == VT_BSTR) + right_str = V_BSTR(right); + else + { + VARIANT converted, *tmp = right; + + VariantInit(&converted); + if(rightvt == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(right, &converted); + if(FAILED(hres)) + goto failed; + + tmp = &converted; + } + + hres = VariantChangeTypeEx(&converted, tmp, 0, VARIANT_ALPHABOOL|VARIANT_LOCALBOOL, VT_BSTR); + if (SUCCEEDED(hres)) + right_str = V_BSTR(&converted); + else if (hres != DISP_E_TYPEMISMATCH) + { + VariantClear(&converted); + goto failed; + } + } + + + V_VT(out) = VT_BSTR; + hres = VarBstrCat(left_str, right_str, &V_BSTR(out)); + +failed: + if(V_VT(left) != VT_BSTR) + SysFreeString(left_str); + if(V_VT(right) != VT_BSTR) + SysFreeString(right_str); + return hres; } @@ -2847,22 +2861,6 @@ return E_FAIL; } #undef _VARCMP -} - -static HRESULT VARIANT_FetchDispatchValue(LPVARIANT pvDispatch, LPVARIANT pValue) -{ - HRESULT hres; - static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; - - if ((V_VT(pvDispatch) & VT_TYPEMASK) == VT_DISPATCH) { - if (NULL == V_DISPATCH(pvDispatch)) return DISP_E_TYPEMISMATCH; - hres = IDispatch_Invoke(V_DISPATCH(pvDispatch), DISPID_VALUE, &IID_NULL, - LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &emptyParams, pValue, - NULL, NULL); - } else { - hres = DISP_E_TYPEMISMATCH; - } - return hres; } /********************************************************************** Modified: trunk/reactos/dll/win32/oleaut32/variant.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.h [iso-8859-1] Sun Sep 17 22:56:37 2017 @@ -113,7 +113,6 @@ } VARIANT_NUMBER_CHARS; unsigned int get_type_size(ULONG*, VARTYPE) DECLSPEC_HIDDEN; -BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *) DECLSPEC_HIDDEN; HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN; BOOL get_date_format(LCID, DWORD, const SYSTEMTIME *, const WCHAR *, WCHAR *, int) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] Sun Sep 17 22:56:37 2017 @@ -6051,7 +6051,7 @@ * Get a localized string from the resources * */ -BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) +static BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) { HRSRC hrsrc; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 22:56:37 2017 @@ -141,7 +141,7 @@ reactos/dll/win32/odbccp32 # Synced to WineStaging-2.9 reactos/dll/win32/ole32 # Synced to WineStaging-2.16 reactos/dll/win32/oleacc # Synced to WineStaging-2.9 -reactos/dll/win32/oleaut32 # Synced to WineStaging-2.9 +reactos/dll/win32/oleaut32 # Synced to WineStaging-2.16 reactos/dll/win32/olecli32 # Synced to WineStaging-2.9 reactos/dll/win32/oledlg # Synced to WineStaging-2.9 reactos/dll/win32/olepro32 # Synced to WineStaging-2.9

1 0

[akhaldi] 75891: [OLE32_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:56:20 2017 New Revision: 75891 URL: http://svn.reactos.org/svn/reactos?rev=75891&view=rev Log: [OLE32_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/ole2.c Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Sun Sep 17 22:56:20 2017 @@ -1166,12 +1166,35 @@ {0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd} }; /* 52011640-8164-4fd0-a1a2-5d5a3654d3bd */ +static DWORD CALLBACK register_ps_clsid_thread(void *context) +{ + HRESULT hr; + CLSID clsid = {0}; + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoGetPSClsid(&IID_IWineTest, &clsid); + ok_ole_success(hr, "CoGetPSClsid"); + ok(IsEqualGUID(&clsid, &CLSID_WineTestPSFactoryBuffer), "expected %s, got %s\n", + wine_dbgstr_guid(&CLSID_WineTestPSFactoryBuffer), wine_dbgstr_guid(&clsid)); + + /* test registering a PSClsid in an apartment which is then destroyed */ + hr = CoRegisterPSClsid(&IID_TestPS, &clsid); + ok_ole_success(hr, "CoRegisterPSClsid"); + + CoUninitialize(); + + return hr; +} + static void test_CoRegisterPSClsid(void) { HRESULT hr; DWORD dwRegistrationKey; IStream *stream; CLSID clsid; + HANDLE thread; + DWORD tid; hr = CoRegisterPSClsid(&IID_IWineTest, &CLSID_WineTestPSFactoryBuffer); ok(hr == CO_E_NOTINITIALIZED, "CoRegisterPSClsid should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); @@ -1184,6 +1207,21 @@ hr = CoRegisterPSClsid(&IID_IWineTest, &CLSID_WineTestPSFactoryBuffer); ok_ole_success(hr, "CoRegisterPSClsid"); + + hr = CoGetPSClsid(&IID_IWineTest, &clsid); + ok_ole_success(hr, "CoGetPSClsid"); + ok(IsEqualGUID(&clsid, &CLSID_WineTestPSFactoryBuffer), "expected %s, got %s\n", + wine_dbgstr_guid(&CLSID_WineTestPSFactoryBuffer), wine_dbgstr_guid(&clsid)); + + thread = CreateThread(NULL, 0, register_ps_clsid_thread, NULL, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + ok(!WaitForSingleObject(thread, 10000), "wait timed out\n"); + CloseHandle(thread); + + hr = CoGetPSClsid(&IID_TestPS, &clsid); + ok_ole_success(hr, "CoGetPSClsid"); + ok(IsEqualGUID(&clsid, &CLSID_WineTestPSFactoryBuffer), "expected %s, got %s\n", + wine_dbgstr_guid(&CLSID_WineTestPSFactoryBuffer), wine_dbgstr_guid(&clsid)); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok_ole_success(hr, "CreateStreamOnHGlobal"); @@ -1204,11 +1242,11 @@ SET_EXPECT(CreateStub); hr = CoMarshalInterface(stream, &IID_IEnumOLEVERB, (IUnknown*)&EnumOLEVERB, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hr == S_OK, "CoMarshalInterface should have returned E_NOTIMPL instead of 0x%08x\n", hr); + ok(hr == S_OK, "CoMarshalInterface should have returned S_OK instead of 0x%08x\n", hr); CHECK_CALLED(CreateStub); hr = CoMarshalInterface(stream, &IID_IEnumOLEVERB, &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hr == S_OK, "CoMarshalInterface should have returned E_NOTIMPL instead of 0x%08x\n", hr); + ok(hr == S_OK, "CoMarshalInterface should have returned S_OK instead of 0x%08x\n", hr); IStream_Release(stream); IPSFactoryBuffer_Release(ps_factory_buffer); @@ -1223,6 +1261,31 @@ hr = CoGetPSClsid(&IID_IWineTest, &clsid); ok(hr == REGDB_E_IIDNOTREG, "CoGetPSClsid should have returned REGDB_E_IIDNOTREG instead of 0x%08x\n", hr); + + hr = CoGetPSClsid(&IID_TestPS, &clsid); + ok(hr == REGDB_E_IIDNOTREG, "CoGetPSClsid should have returned REGDB_E_IIDNOTREG instead of 0x%08x\n", hr); + + CoUninitialize(); + + pCoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoRegisterPSClsid(&IID_IWineTest, &CLSID_WineTestPSFactoryBuffer); + ok_ole_success(hr, "CoRegisterPSClsid"); + + hr = CoGetPSClsid(&IID_IWineTest, &clsid); + ok_ole_success(hr, "CoGetPSClsid"); + ok(IsEqualGUID(&clsid, &CLSID_WineTestPSFactoryBuffer), "expected %s, got %s\n", + wine_dbgstr_guid(&CLSID_WineTestPSFactoryBuffer), wine_dbgstr_guid(&clsid)); + + thread = CreateThread(NULL, 0, register_ps_clsid_thread, NULL, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + ok(!WaitForSingleObject(thread, 10000), "wait timed out\n"); + CloseHandle(thread); + + hr = CoGetPSClsid(&IID_TestPS, &clsid); + ok_ole_success(hr, "CoGetPSClsid"); + ok(IsEqualGUID(&clsid, &CLSID_WineTestPSFactoryBuffer), "expected %s, got %s\n", + wine_dbgstr_guid(&CLSID_WineTestPSFactoryBuffer), wine_dbgstr_guid(&clsid)); CoUninitialize(); } @@ -2184,9 +2247,17 @@ win_skip("CoGetTreatAsClass not present\n"); return; } + hr = pCoGetTreatAsClass(&deadbeef,&out); ok (hr == S_FALSE, "expected S_FALSE got %x\n",hr); ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); + + hr = pCoGetTreatAsClass(NULL, &out); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); + ok(IsEqualGUID(&out, &deadbeef), "expected no change to the clsid\n"); + + hr = pCoGetTreatAsClass(&deadbeef, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &clsidkey); ok(!lr, "Couldn't open CLSID key, error %d\n", lr); Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… ============================================================================== --- trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] Sun Sep 17 22:56:20 2017 @@ -39,10 +39,13 @@ #include <wine/test.h> +#ifndef __REACTOS__ #include "initguid.h" DEFINE_GUID(CLSID_Picture_Metafile,0x315,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(CLSID_Picture_Dib,0x316,0,0,0xc0,0,0,0,0,0,0,0x46); +DEFINE_GUID(CLSID_Picture_EnhMetafile,0x319,0,0,0xc0,0,0,0,0,0,0,0x46); +#endif #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -142,7 +145,7 @@ DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ DVASPECT dvAspect; DWORD lindex; - DWORD tymed; + DWORD advf; DWORD unknown7; /* 0 */ DWORD dwObjectExtentX; DWORD dwObjectExtentY; @@ -1180,7 +1183,7 @@ IStorage *stg; IStream *stream; IUnknown *obj; - DWORD data, i, tymed, data_size; + DWORD data, i, data_size; PresentationDataHeader header; HDC hdc; HGDIOBJ hobj; @@ -1229,12 +1232,10 @@ break; } - tymed = 1 << i; - header.unknown3 = 4; header.dvAspect = DVASPECT_CONTENT; header.lindex = -1; - header.tymed = tymed; + header.advf = 1 << i; header.unknown7 = 0; header.dwObjectExtentX = 1; header.dwObjectExtentY = 1; @@ -1254,19 +1255,19 @@ IStorage_Release(stg); continue; } - ok(hr == S_OK, "OleLoad error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + ok(hr == S_OK, "OleLoad error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); hdc = CreateCompatibleDC(0); SetRect(&rc, 0, 0, 100, 100); hr = OleDraw(obj, DVASPECT_CONTENT, hdc, &rc); DeleteDC(hdc); if (fmt == CF_METAFILEPICT) - ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); else if (fmt == CF_ENHMETAFILE) todo_wine - ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); else - ok(hr == OLE_E_BLANK || hr == OLE_E_NOTRUNNING || hr == E_FAIL, "OleDraw should fail: %#x, cfFormat = %u, tymed = %u\n", hr, fmt, header.tymed); + ok(hr == OLE_E_BLANK || hr == OLE_E_NOTRUNNING || hr == E_FAIL, "OleDraw should fail: %#x, cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); IUnknown_Release(obj); IStorage_Release(stg); @@ -1529,7 +1530,7 @@ static IUnknown unknown = { &UnknownVtbl }; -static void check_enum_cache(IOleCache2 *cache, STATDATA *expect, int num) +static void check_enum_cache(IOleCache2 *cache, const STATDATA *expect, int num) { IEnumSTATDATA *enum_stat; STATDATA stat; @@ -2149,6 +2150,7 @@ hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( hr == S_OK, "got %08x\n", hr ); + ok( conn == 2, "got %d\n", conn ); expect[0].dwConnection = conn; expect[1].dwConnection = conn; @@ -2167,6 +2169,7 @@ hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( hr == S_OK, "got %08x\n", hr ); + ok( conn == 3, "got %d\n", conn ); expect[2].dwConnection = conn; check_enum_cache( cache, expect, 3); @@ -2177,6 +2180,7 @@ hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( hr == S_OK, "got %08x\n", hr ); + ok( conn == 4, "got %d\n", conn ); expect[3].dwConnection = conn; check_enum_cache( cache, expect, 4 ); @@ -2256,6 +2260,166 @@ ReleaseStgMedium( &med ); IDataObject_Release( data ); + IOleCache2_Release( cache ); +} + +/* The CLSID_Picture_ classes automatically create appropriate cache entries */ +static void test_data_cache_init(void) +{ + HRESULT hr; + IOleCache2 *cache; + IPersistStorage *persist; + int i; + CLSID clsid; + static const STATDATA enum_expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 1 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 1 }, + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 1 }, + {{ CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 1 } + }; + static const struct + { + const CLSID *clsid; + int enum_start, enum_num; + } data[] = + { + { &CLSID_NULL, 0, 0 }, + { &CLSID_WineTestOld, 0, 0 }, + { &CLSID_Picture_Dib, 0, 2 }, + { &CLSID_Picture_Metafile, 2, 1 }, + { &CLSID_Picture_EnhMetafile, 3, 1 } + }; + + for (i = 0; i < sizeof(data) / sizeof(data[0]); i++) + { + hr = CreateDataCache( NULL, data[i].clsid, &IID_IOleCache2, (void **)&cache ); + ok( hr == S_OK, "got %08x\n", hr ); + + check_enum_cache( cache, enum_expect + data[i].enum_start , data[i].enum_num ); + + IOleCache2_QueryInterface( cache, &IID_IPersistStorage, (void **) &persist ); + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, data[i].clsid ), "class id mismatch %s %s\n", wine_dbgstr_guid( &clsid ), + wine_dbgstr_guid( data[i].clsid ) ); + + IPersistStorage_Release( persist ); + IOleCache2_Release( cache ); + } +} + +static void test_data_cache_initnew(void) +{ + HRESULT hr; + IOleCache2 *cache; + IPersistStorage *persist; + IStorage *stg_dib, *stg_mf, *stg_wine; + CLSID clsid; + static const STATDATA initnew_expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 1 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 1 }, + }; + static const STATDATA initnew2_expect[] = + { + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 1 }, + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 2 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 2 }, + }; + static const STATDATA initnew3_expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 1 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 1 }, + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 2 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 2 }, + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 3 }, + }; + static const STATDATA initnew4_expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 2 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 2 }, + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 3 }, + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 4 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 4 }, + }; + + hr = StgCreateDocfile( NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &stg_dib ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_SetClass( stg_dib, &CLSID_Picture_Dib ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = StgCreateDocfile( NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &stg_mf ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_SetClass( stg_mf, &CLSID_Picture_Metafile ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = StgCreateDocfile( NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &stg_wine ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_SetClass( stg_wine, &CLSID_WineTestOld ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = CreateDataCache( NULL, &CLSID_WineTestOld, &IID_IOleCache2, (void **)&cache ); + ok( hr == S_OK, "got %08x\n", hr ); + IOleCache2_QueryInterface( cache, &IID_IPersistStorage, (void **) &persist ); + + hr = IPersistStorage_InitNew( persist, stg_dib ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, &CLSID_Picture_Dib ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + + check_enum_cache( cache, initnew_expect, 2 ); + + hr = IPersistStorage_InitNew( persist, stg_mf ); + ok( hr == CO_E_ALREADYINITIALIZED, "got %08x\n", hr); + + hr = IPersistStorage_HandsOffStorage( persist ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, &CLSID_Picture_Dib ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + + hr = IPersistStorage_InitNew( persist, stg_mf ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, &CLSID_Picture_Metafile ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + + check_enum_cache( cache, initnew2_expect, 3 ); + + hr = IPersistStorage_HandsOffStorage( persist ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_InitNew( persist, stg_dib ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, &CLSID_Picture_Dib ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + + check_enum_cache( cache, initnew3_expect, 5 ); + + hr = IPersistStorage_HandsOffStorage( persist ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_InitNew( persist, stg_wine ); + ok( hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, &CLSID_WineTestOld ), "got %s\n", wine_dbgstr_guid( &clsid ) ); + + check_enum_cache( cache, initnew4_expect, 5 ); + + IStorage_Release( stg_wine ); + IStorage_Release( stg_mf ); + IStorage_Release( stg_dib ); + + IPersistStorage_Release( persist ); IOleCache2_Release( cache ); } @@ -3012,6 +3176,8 @@ test_data_cache_dib_contents_stream( 0 ); test_data_cache_dib_contents_stream( 1 ); test_data_cache_bitmap(); + test_data_cache_init(); + test_data_cache_initnew(); test_default_handler(); test_runnable(); test_OleRun();

1 0

[akhaldi] 75890: [OLE32] Sync with Wine Staging 2.16. CORE-13762 a56bc8f ole32: Store proxy/stub CLSIDs per process, not per apartment. 3b44927 ole32: New high resolution cursors generated from SVG...
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:56:11 2017 New Revision: 75890 URL: http://svn.reactos.org/svn/reactos?rev=75890&view=rev Log: [OLE32] Sync with Wine Staging 2.16. CORE-13762 a56bc8f ole32: Store proxy/stub CLSIDs per process, not per apartment. 3b44927 ole32: New high resolution cursors generated from SVG. 5a3b87a ole32: Avoid null pointer dereferences in CoGetTreatAsClass. 13c6d37 ole32: Add stub for OleGetIconOfFile. 33a720b ole32: InitNew() should fail if there is a current storage. 966e8a2 ole32: Create initial cache entries for the CLSID_Picture_ classes. 111b72f ole32: Add the ability to create an entry without returning it. 705ccd7 ole32: Start allocating regular cache entries with id of 2. 0267564 ole32: Fix incorrectly assigned member in the presentation stream. 85a1309 ole32: Make bitmap_info_size() static. Modified: trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/drag_copy.cur trunk/reactos/dll/win32/ole32/drag_link.cur trunk/reactos/dll/win32/ole32/drag_move.cur trunk/reactos/dll/win32/ole32/nodrop.cur trunk/reactos/dll/win32/ole32/ole2stubs.c trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -146,6 +146,17 @@ CLSID clsid; }; +static struct list registered_psclsid_list = LIST_INIT(registered_psclsid_list); + +static CRITICAL_SECTION cs_registered_psclsid_list; +static CRITICAL_SECTION_DEBUG psclsid_cs_debug = +{ + 0, 0, &cs_registered_psclsid_list, + { &psclsid_cs_debug.ProcessLocksList, &psclsid_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_registered_psclsid_list") } +}; +static CRITICAL_SECTION cs_registered_psclsid_list = { &psclsid_cs_debug, -1, 0, 0, 0, 0 }; + /* * This is a marshallable object exposing registered local servers. * IServiceProvider is used only because it happens meet requirements @@ -600,7 +611,6 @@ list_init(&apt->proxies); list_init(&apt->stubmgrs); - list_init(&apt->psclsids); list_init(&apt->loaded_dlls); apt->ipidc = 0; apt->refs = 1; @@ -709,6 +719,21 @@ } LeaveCriticalSection( &csRegisteredClassList ); +} + +static void revoke_registered_psclsids(void) +{ + struct registered_psclsid *psclsid, *psclsid2; + + EnterCriticalSection( &cs_registered_psclsid_list ); + + LIST_FOR_EACH_ENTRY_SAFE(psclsid, psclsid2, &registered_psclsid_list, struct registered_psclsid, entry) + { + list_remove(&psclsid->entry); + HeapFree(GetProcessHeap(), 0, psclsid); + } + + LeaveCriticalSection( &cs_registered_psclsid_list ); } /****************************************************************************** @@ -1149,15 +1174,6 @@ * must have a ref on the apartment and so it cannot be destroyed). */ stub_manager_int_release(stubmgr); - } - - LIST_FOR_EACH_SAFE(cursor, cursor2, &apt->psclsids) - { - struct registered_psclsid *registered_psclsid = - LIST_ENTRY(cursor, struct registered_psclsid, entry); - - list_remove(&registered_psclsid->entry); - HeapFree(GetProcessHeap(), 0, registered_psclsid); } /* if this assert fires, then another thread took a reference to a @@ -1966,6 +1982,7 @@ { TRACE("() - Releasing the COM libraries\n"); + revoke_registered_psclsids(); RunningObjectTableImpl_UnInitialize(); } else if (lCOMRefCnt<1) { @@ -2558,17 +2575,17 @@ if (!pclsid) return E_INVALIDARG; - EnterCriticalSection(&apt->cs); - - LIST_FOR_EACH_ENTRY(registered_psclsid, &apt->psclsids, struct registered_psclsid, entry) + EnterCriticalSection(&cs_registered_psclsid_list); + + LIST_FOR_EACH_ENTRY(registered_psclsid, &registered_psclsid_list, struct registered_psclsid, entry) if (IsEqualIID(&registered_psclsid->iid, riid)) { *pclsid = registered_psclsid->clsid; - LeaveCriticalSection(&apt->cs); + LeaveCriticalSection(&cs_registered_psclsid_list); return S_OK; } - LeaveCriticalSection(&apt->cs); + LeaveCriticalSection(&cs_registered_psclsid_list); data.cbSize = sizeof(data); if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, @@ -2613,6 +2630,9 @@ * * NOTES * + * Unlike CoRegisterClassObject(), CLSIDs registered with CoRegisterPSClsid() + * will be returned from other apartments in the same process. + * * This function does not add anything to the registry and the effects are * limited to the lifetime of the current process. * @@ -2632,28 +2652,28 @@ return CO_E_NOTINITIALIZED; } - EnterCriticalSection(&apt->cs); - - LIST_FOR_EACH_ENTRY(registered_psclsid, &apt->psclsids, struct registered_psclsid, entry) + EnterCriticalSection(&cs_registered_psclsid_list); + + LIST_FOR_EACH_ENTRY(registered_psclsid, &registered_psclsid_list, struct registered_psclsid, entry) if (IsEqualIID(&registered_psclsid->iid, riid)) { registered_psclsid->clsid = *rclsid; - LeaveCriticalSection(&apt->cs); + LeaveCriticalSection(&cs_registered_psclsid_list); return S_OK; } registered_psclsid = HeapAlloc(GetProcessHeap(), 0, sizeof(struct registered_psclsid)); if (!registered_psclsid) { - LeaveCriticalSection(&apt->cs); + LeaveCriticalSection(&cs_registered_psclsid_list); return E_OUTOFMEMORY; } registered_psclsid->iid = *riid; registered_psclsid->clsid = *rclsid; - list_add_head(&apt->psclsids, &registered_psclsid->entry); - - LeaveCriticalSection(&apt->cs); + list_add_head(&registered_psclsid_list, &registered_psclsid->entry); + + LeaveCriticalSection(&cs_registered_psclsid_list); return S_OK; } @@ -3803,6 +3823,10 @@ LONG len = sizeof(szClsidNew); TRACE("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); + + if (!clsidOld || !clsidNew) + return E_INVALIDARG; + *clsidNew = *clsidOld; /* copy over old value */ res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey); Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -126,7 +126,6 @@ struct list stubmgrs; /* stub managers for exported objects (CS cs) */ BOOL remunk_exported; /* has the IRemUnknown interface for this apartment been created yet? (CS cs) */ LONG remoting_started; /* has the RPC system been started for this apartment? (LOCK) */ - struct list psclsids; /* list of registered PS CLSIDs (CS cs) */ struct list loaded_dlls; /* list of dlls loaded by this apartment (CS cs) */ DWORD host_apt_tid; /* thread ID of apartment hosting objects of differing threading model (CS cs) */ HWND host_apt_hwnd; /* handle to apartment window of host apartment (CS cs) */ Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… ============================================================================== --- trunk/reactos/dll/win32/ole32/datacache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/datacache.c [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -67,7 +67,7 @@ DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ DVASPECT dvAspect; DWORD lindex; - DWORD tymed; + DWORD advf; DWORD unknown7; /* 0 */ DWORD dwObjectExtentX; DWORD dwObjectExtentY; @@ -145,7 +145,9 @@ */ DWORD sinkAspects; DWORD sinkAdviseFlag; - IAdviseSink* sinkInterface; + IAdviseSink *sinkInterface; + + CLSID clsid; IStorage *presentationStorage; /* list of cache entries */ @@ -214,7 +216,7 @@ * * Return the size of the bitmap info structure including color table. */ -int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) +static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) { unsigned int colors, size, masks = 0; @@ -305,10 +307,10 @@ /* checks that the clipformat and tymed are valid and returns an error if they * aren't and CACHE_S_NOTSUPPORTED if they are valid, but can't be rendered by * DataCache_Draw */ -static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed, BOOL load) +static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed) { if (!cfFormat || !tymed || - (cfFormat == CF_METAFILEPICT && (tymed == TYMED_MFPICT || load)) || + (cfFormat == CF_METAFILEPICT && tymed == TYMED_MFPICT) || (cfFormat == CF_BITMAP && tymed == TYMED_GDI) || (cfFormat == CF_DIB && tymed == TYMED_HGLOBAL) || (cfFormat == CF_ENHMETAFILE && tymed == TYMED_ENHMF)) @@ -345,30 +347,38 @@ } static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DWORD advf, - DataCacheEntry **cache_entry, BOOL load) + BOOL automatic, DataCacheEntry **cache_entry) { HRESULT hr; - - hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed, load); + DWORD id = automatic ? 1 : This->last_cache_id; + DataCacheEntry *entry; + + hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); if (FAILED(hr)) return hr; if (hr == CACHE_S_FORMATETC_NOTSUPPORTED) TRACE("creating unsupported format %d\n", formatetc->cfFormat); - *cache_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(**cache_entry)); - if (!*cache_entry) + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + if (!entry) return E_OUTOFMEMORY; - if (!init_cache_entry(*cache_entry, formatetc, advf, This->last_cache_id)) + if (!init_cache_entry(entry, formatetc, advf, id)) goto fail; - list_add_tail(&This->cache_list, &(*cache_entry)->entry); - This->last_cache_id++; - + if (automatic) + list_add_head(&This->cache_list, &entry->entry); + else + { + list_add_tail(&This->cache_list, &entry->entry); + This->last_cache_id++; + } + + if (cache_entry) *cache_entry = entry; return hr; fail: - HeapFree(GetProcessHeap(), 0, *cache_entry); + HeapFree(GetProcessHeap(), 0, entry); return E_OUTOFMEMORY; } @@ -783,7 +793,7 @@ header.unknown3 = 4; header.dvAspect = cache_entry->fmtetc.dwAspect; header.lindex = cache_entry->fmtetc.lindex; - header.tymed = cache_entry->stgmedium.tymed; + header.advf = cache_entry->advise_flags; header.unknown7 = 0; header.dwObjectExtentX = 0; header.dwObjectExtentY = 0; @@ -1011,6 +1021,66 @@ IStream_Release(cache_entry->stream); cache_entry->stream = NULL; } +} + +static inline DWORD tymed_from_cf( DWORD cf ) +{ + switch( cf ) + { + case CF_BITMAP: return TYMED_GDI; + case CF_METAFILEPICT: return TYMED_MFPICT; + case CF_ENHMETAFILE: return TYMED_ENHMF; + case CF_DIB: + default: return TYMED_HGLOBAL; + } +} + +/**************************************************************** + * create_automatic_entry + * + * Creates an appropriate cache entry for one of the CLSID_Picture_ + * classes. The connection id of the entry is one. Any pre-existing + * automatic entry is re-assigned a new connection id, and moved to + * the end of the list. + */ +static HRESULT create_automatic_entry(DataCache *cache, const CLSID *clsid) +{ + static const struct data + { + const CLSID *clsid; + FORMATETC fmt; + } data[] = + { + { &CLSID_Picture_Dib, { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, + { &CLSID_Picture_Metafile, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, + { &CLSID_Picture_EnhMetafile, { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, + { NULL } + }; + const struct data *ptr = data; + struct list *head; + DataCacheEntry *entry; + + if (IsEqualCLSID( &cache->clsid, clsid )) return S_OK; + + /* move and reassign any pre-existing automatic entry */ + if ((head = list_head( &cache->cache_list ))) + { + entry = LIST_ENTRY( head, DataCacheEntry, entry ); + if (entry->id == 1) + { + list_remove( &entry->entry ); + entry->id = cache->last_cache_id++; + list_add_tail( &cache->cache_list, &entry->entry ); + } + } + + while (ptr->clsid) + { + if (IsEqualCLSID( clsid, ptr->clsid )) + return DataCache_CreateEntry( cache, &ptr->fmt, 0, TRUE, NULL ); + ptr++; + } + return S_OK; } /********************************************************* @@ -1334,22 +1404,9 @@ static HRESULT WINAPI DataCache_GetClassID(IPersistStorage *iface, CLSID *clsid) { DataCache *This = impl_from_IPersistStorage( iface ); - HRESULT hr; - STATSTG statstg; - - TRACE( "(%p, %p)\n", iface, clsid ); - - if (This->presentationStorage) - { - hr = IStorage_Stat( This->presentationStorage, &statstg, STATFLAG_NONAME ); - if (SUCCEEDED(hr)) - { - *clsid = statstg.clsid; - return S_OK; - } - } - - *clsid = CLSID_NULL; + + TRACE( "(%p, %p) returning %s\n", iface, clsid, debugstr_guid(&This->clsid) ); + *clsid = This->clsid; return S_OK; } @@ -1386,22 +1443,33 @@ IStorage* pStg) { DataCache *This = impl_from_IPersistStorage(iface); + CLSID clsid; + HRESULT hr; TRACE("(%p, %p)\n", iface, pStg); if (This->presentationStorage != NULL) - IStorage_Release(This->presentationStorage); + return CO_E_ALREADYINITIALIZED; This->presentationStorage = pStg; IStorage_AddRef(This->presentationStorage); This->dirty = TRUE; + ReadClassStg( pStg, &clsid ); + hr = create_automatic_entry( This, &clsid ); + if (FAILED(hr)) + { + IStorage_Release( pStg ); + This->presentationStorage = NULL; + return hr; + } + This->clsid = clsid; return S_OK; } -static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, IStream *stm, +static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD advf, IStream *stm, enum stream_type type ) { DataCacheEntry *cache_entry; @@ -1411,7 +1479,7 @@ cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); if (!cache_entry) - hr = DataCache_CreateEntry( This, fmt, 0, &cache_entry, TRUE ); + hr = DataCache_CreateEntry( This, fmt, advf, FALSE, &cache_entry ); if (SUCCEEDED( hr )) { DataCacheEntry_DiscardData( cache_entry ); @@ -1457,9 +1525,9 @@ fmtetc.ptd = NULL; /* FIXME */ fmtetc.dwAspect = header.dvAspect; fmtetc.lindex = header.lindex; - fmtetc.tymed = header.tymed; - - add_cache_entry( This, &fmtetc, stm, pres_stream ); + fmtetc.tymed = tymed_from_cf( clipformat ); + + add_cache_entry( This, &fmtetc, header.advf, stm, pres_stream ); } IStream_Release( stm ); } @@ -1490,7 +1558,7 @@ return E_FAIL; } - return add_cache_entry( This, fmt, stm, contents_stream ); + return add_cache_entry( This, fmt, 0, stm, contents_stream ); } static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; @@ -1508,10 +1576,21 @@ DataCache *This = impl_from_IPersistStorage(iface); HRESULT hr; IStream *stm; + CLSID clsid; + DataCacheEntry *entry, *cursor2; TRACE("(%p, %p)\n", iface, pStg); IPersistStorage_HandsOffStorage( iface ); + + LIST_FOR_EACH_ENTRY_SAFE( entry, cursor2, &This->cache_list, DataCacheEntry, entry ) + DataCacheEntry_Destroy( This, entry ); + + ReadClassStg( pStg, &clsid ); + hr = create_automatic_entry( This, &clsid ); + if (FAILED( hr )) return hr; + + This->clsid = clsid; hr = IStorage_OpenStream( pStg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); @@ -2162,7 +2241,7 @@ return CACHE_S_SAMECACHE; } - hr = DataCache_CreateEntry(This, &fmt_cpy, advf, &cache_entry, FALSE); + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); if (SUCCEEDED(hr)) { @@ -2593,11 +2672,15 @@ newObject->sinkAspects = 0; newObject->sinkAdviseFlag = 0; newObject->sinkInterface = 0; + newObject->clsid = CLSID_NULL; newObject->presentationStorage = NULL; list_init(&newObject->cache_list); - newObject->last_cache_id = 1; + newObject->last_cache_id = 2; newObject->dirty = FALSE; newObject->running_object = NULL; + + create_automatic_entry( newObject, clsid ); + newObject->clsid = *clsid; return newObject; } Modified: trunk/reactos/dll/win32/ole32/drag_copy.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/drag_copy.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/ole32/drag_link.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/drag_link.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/ole32/drag_move.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/drag_move.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/ole32/nodrop.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/nodrop.cur… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/ole32/ole2stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2stubs.… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole2stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole2stubs.c [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -54,6 +54,15 @@ } /*********************************************************************** + * OleGetIconOfFile [OLE32.@] + */ +HGLOBAL WINAPI OleGetIconOfFile(LPOLESTR path, BOOL use_file_as_label) +{ + FIXME("(%s, %d), stub!\n", debugstr_w(path), use_file_as_label); + return NULL; +} + +/*********************************************************************** * OleRegEnumFormatEtc [OLE32.@] */ HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc ( @@ -74,12 +83,3 @@ FIXME("stub!\n"); return E_NOTIMPL; } - -/*********************************************************************** - * OleGetIconOfFile [OLE32.@] - */ -HGLOBAL WINAPI OleGetIconOfFile(LPOLESTR path, BOOL use_file_as_label) -{ - FIXME("(%p, %d), stub!\n", path, use_file_as_label); - return NULL; -} Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -236,7 +236,7 @@ @ stdcall OleGetAutoConvert(ptr ptr) @ stdcall OleGetClipboard(ptr) @ stdcall OleGetIconOfClass(ptr ptr long) -@ stdcall OleGetIconOfFile(ptr long) +@ stdcall OleGetIconOfFile(wstr long) @ stdcall OleInitialize(ptr) @ stdcall OleInitializeWOW(long long) @ stdcall OleIsCurrentClipboard(ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -139,7 +139,7 @@ reactos/dll/win32/objsel # Synced to WineStaging-2.9 reactos/dll/win32/odbc32 # Synced to WineStaging-2.9. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-2.9 -reactos/dll/win32/ole32 # Synced to WineStaging-2.9 +reactos/dll/win32/ole32 # Synced to WineStaging-2.16 reactos/dll/win32/oleacc # Synced to WineStaging-2.9 reactos/dll/win32/oleaut32 # Synced to WineStaging-2.9 reactos/dll/win32/olecli32 # Synced to WineStaging-2.9

1 0

[akhaldi] 75889: [MSIMG32] Sync with Wine Staging 2.16. CORE-13762 f77bf35 msimg32: Label ordinals.
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:55:42 2017 New Revision: 75889 URL: http://svn.reactos.org/svn/reactos?rev=75889&view=rev Log: [MSIMG32] Sync with Wine Staging 2.16. CORE-13762 f77bf35 msimg32: Label ordinals. Modified: trunk/reactos/dll/win32/msimg32/msimg32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msimg32/msimg32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimg32/msimg32.… ============================================================================== --- trunk/reactos/dll/win32/msimg32/msimg32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimg32/msimg32.spec [iso-8859-1] Sun Sep 17 22:55:42 2017 @@ -1,5 +1,5 @@ +1 stdcall vSetDdrawflag() @ stdcall AlphaBlend(long long long long long long long long long long long) gdi32.GdiAlphaBlend @ stdcall -private DllInitialize(long long ptr) DllMain @ stdcall GradientFill(long ptr long ptr long long) gdi32.GdiGradientFill @ stdcall TransparentBlt(long long long long long long long long long long long) gdi32.GdiTransparentBlt -@ stdcall vSetDdrawflag() Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 22:55:42 2017 @@ -113,7 +113,7 @@ reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-2.9 -reactos/dll/win32/msimg32 # Synced to WineStaging-2.9 +reactos/dll/win32/msimg32 # Synced to WineStaging-2.16 reactos/dll/win32/msimtf # Synced to WineStaging-2.9 reactos/dll/win32/msisip # Synced to WineStaging-2.9 reactos/dll/win32/msisys.ocx # Synced to WineStaging-2.9

1 0

[ekohl] 75888: syssetup: Improve Japanese translation Patch by Katayama Hirofumi MZ. CORE-13785
by ekohl＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: ekohl Date: Sun Sep 17 22:55:33 2017 New Revision: 75888 URL: http://svn.reactos.org/svn/reactos?rev=75888&view=rev Log: syssetup: Improve Japanese translation Patch by Katayama Hirofumi MZ. CORE-13785 Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Sep 17 22:55:33 2017 @@ -6,8 +6,8 @@ FONT 9, "MS UI Gothic" BEGIN LTEXT "ReactOSã»ããã¢ãã ã¦ã£ã¶ã¼ãã¸ããããã", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "ãã®ã¦ã£ã¶ã¼ãã§ã¯ãReactOS ãã³ã³ãã¥ã¼ã¿ã«ã¤ã³ã¹ãã¼ã«ãã¾ãã ReactOSãæ£ããã»ããã¢ããããããã«ãã¦ã¼ã¶ã¼ã¨ã³ã³ãã¥ã¼ã¿ã« é¢ããæå ±ãéããå¿è¦ãããã¾ãã", IDC_STATIC, 115, 40, 195, 100 - LTEXT "ã»ããã¢ãããç¶è¡ããã«ã¯ [æ¬¡ã¸] ãã¯ãªãã¯ãã¦ãã ããã", IDC_STATIC, 115, 169, 195, 17 + LTEXT "ãã®ã¦ã£ã¶ã¼ãã§ã¯ãReactOS ãã³ã³ãã¥ã¼ã¿ã«ã¤ã³ã¹ãã¼ã«ãã¾ããReactOS ãæ£ããã»ããã¢ããããããã«ãã¦ã¼ã¶ã¼ã¨ã³ã³ãã¥ã¼ã¿ã«é¢ããæå ±ãéããå¿è¦ãããã¾ãã", IDC_STATIC, 115, 40, 195, 100 + LTEXT "ã»ããã¢ãããç¶è¡ããã«ã¯ [æ¬¡ã¸] ãã¯ãªãã¯ãã¦ä¸ããã", IDC_STATIC, 115, 169, 195, 17 END IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 @@ -15,11 +15,11 @@ CAPTION "ReactOS ã»ããã¢ãã" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - LTEXT "ReactOSã®éçºèãããä¸è¨ã®ãªã¼ãã³ã½ã¼ã¹ ããã¸ã§ã¯ãã«æè¬ã®æãè¡¨æãã¾ãã ãããã®ãã¹ã¦ã¾ãã¯ä¸é¨ã¯ReactOSã®éçºã«å©ç¨ããã¾ããã", IDC_STATIC, 15, 7, 286, 19 + LTEXT "ReactOS ã®éçºèãããä¸è¨ã®ãªã¼ãã³ã½ã¼ã¹ ããã¸ã§ã¯ãã«æè¬ã®æãè¡¨æãã¾ãããããã®ãã¹ã¦ã¾ãã¯ä¸é¨ã¯ ReactOS ã®éçºã«å©ç¨ããã¾ããã", IDC_STATIC, 15, 7, 286, 19 LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOSã¯GPLã®ä¸ã«ã©ã¤ã»ã³ã¹ããã¦ããããã¹ã¦ã¾ãã¯ä¸é¨ãåå©ç¨ã åéå¸ããå ´åã¯GPLã«å¾ãå¿è¦ãããã¾ãã", IDC_STATIC, 15, 110, 227, 19 + LTEXT "ReactOS ã¯ GPL ã®ä¸ã«ã©ã¤ã»ã³ã¹ããã¦ããããã¹ã¦ã¾ãã¯ä¸é¨ãåå©ç¨ã åéå¸ããå ´åã¯ GPL ã«å¾ãå¿è¦ãããã¾ãã", IDC_STATIC, 15, 110, 227, 19 PUSHBUTTON "GPLãè¡¨ç¤º(&V)...", IDC_VIEWGPL, 251, 110, 50, 19 - LTEXT "ã»ããã¢ãããç¶è¡ããã«ã¯ [æ¬¡ã¸] ãã¯ãªãã¯ãã¦ãã ããã", IDC_STATIC, 15, 136, 195, 17 + LTEXT "ã»ããã¢ãããç¶è¡ããã«ã¯ [æ¬¡ã¸] ãã¯ãªãã¯ãã¦ä¸ããã", IDC_STATIC, 15, 136, 195, 17 END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -28,7 +28,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 - LTEXT "ååã¨ä¼ç¤¾åã¾ãã¯çµç¹åãå¥åãã¦ãã ããã", IDC_STATIC, 54, 7, 242, 21 + LTEXT "ååã¨ä¼ç¤¾åã¾ãã¯çµç¹åãå¥åãã¦ä¸ããã", IDC_STATIC, 54, 7, 242, 21 LTEXT "åå(&M):", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "çµç¹å(&O):", IDC_STATIC, 54, 57, 44, 8 @@ -41,12 +41,12 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 - LTEXT "ã³ã³ãã¥ã¼ã¿åãåè§63æåä»¥åã§å¥åãã¦ãã ããã ã³ã³ãã¥ã¼ã¿ããããã¯ã¼ã¯ä¸ã«ããå ´åã¯ãååãéè¤ããªãããã«ãã¦ãã ããã", IDC_STATIC, 54, 7, 250, 24 + LTEXT "ã³ã³ãã¥ã¼ã¿åãåè§ 63 æåä»¥åã§å¥åãã¦ä¸ãããã³ã³ãã¥ã¼ã¿ããããã¯ã¼ã¯ä¸ã«ããå ´åã¯ãååãéè¤ããªãããã«ãã¦ä¸ããã", IDC_STATIC, 54, 7, 250, 24 LTEXT "ã³ã³ãã¥ã¼ã¿å(&C):", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "Administratorã¨å¼ã°ããã¦ã¼ã¶ã¼ã¢ã«ã¦ã³ããä½æãã¾ãã ã³ã³ãã¥ã¼ã¿ã«ãã«ã¢ã¯ã»ã¹ãå¿è¦ãªã¨ãããã®ã¢ã«ã¦ã³ããä½¿ç¨ãã¾ãã", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Administratorã®ãã¹ã¯ã¼ããåè§ 127 æåä»¥åã§å¥åãã¦ãã ããã", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Administrator ã¨å¼ã°ããã¦ã¼ã¶ã¼ ã¢ã«ã¦ã³ããä½æãã¾ããã³ã³ãã¥ã¼ã¿ã«ãã«ã¢ã¯ã»ã¹ãå¿è¦ãªã¨ãããã®ã¢ã«ã¦ã³ããä½¿ç¨ãã¾ãã", IDC_STATIC, 54, 57, 250, 25 + LTEXT "Administrator ã®ãã¹ã¯ã¼ããåè§ 127 æåä»¥åã§å¥åãã¦ä¸ããã", IDC_STATIC, 54, 87, 250, 8 LTEXT "Administrator ã®ãã¹ã¯ã¼ã(&A):", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "ãã¹ã¯ã¼ãã®ç¢ºèªå¥å(&O):", IDC_STATIC, 54, 123, 105, 8 @@ -59,13 +59,13 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "ã·ã¹ãã ã®ãã±ã¼ã«ããã¢ããªã±ã¼ã·ã§ã³ã§ä½¿ç¨ãããè¨èªã«è¨å®ãã¦ãã ããã ã¦ã¼ã¶ã¼ãã±ã¼ã«ã¯ãæ°å¤ãéè²¨ãæ¥ä»ã®è¡¨ç¤ºæ¹æ³ãå¶å¾¡ãã¾ãã ", IDC_STATIC, 53, 7, 253, 20 + LTEXT "ã·ã¹ãã ã®ãã±ã¼ã«ããã¢ããªã±ã¼ã·ã§ã³ã§ä½¿ç¨ãããè¨èªã«è¨å®ãã¦ä¸ãããã¦ã¼ã¶ã¼ ãã±ã¼ã«ã¯ãæ°å¤ãéè²¨ãæ¥ä»ã®è¡¨ç¤ºæ¹æ³ãå¶å¾¡ãã¾ãã", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "ã·ã¹ãã ãã¦ã¼ã¶ã¼ãã±ã¼ã«è¨å®å¤æ´ã«ã¯[ã«ã¹ã¿ãã¤ãº]ãã¯ãªãã¯ãã¾ãã", IDC_STATIC, 53, 50, 166, 25 + LTEXT "ã·ã¹ãã ãã¦ã¼ã¶ã¼ ãã±ã¼ã«è¨å®å¤æ´ã«ã¯ [ã«ã¹ã¿ãã¤ãº] ãã¯ãªãã¯ãã¾ãã", IDC_STATIC, 53, 50, 166, 25 PUSHBUTTON "ã«ã¹ã¿ãã¤ãº(&C)...", IDC_CUSTOMLOCALE, 220, 52, 80, 14 LTEXT "ãã¼ãã¼ã ã¬ã¤ã¢ã¦ãã¯ããã¼ãæ¼ããã¨ãã«ã©ã®æåãå¥åãããããå¶å¾¡ãã¾ãã", IDC_STATIC, 53, 81, 253, 20 LTEXT "", IDC_LAYOUTTEXT, 53, 106, 250, 14 - LTEXT "ãã¼ãã¼ãã¬ã¤ã¢ã¦ãå¤æ´ã«ã¯[ã«ã¹ã¿ãã¤ãº]ãã¯ãªãã¯ãã¾ãã", IDC_STATIC, 53, 120, 166, 25 + LTEXT "ãã¼ãã¼ã ã¬ã¤ã¢ã¦ãå¤æ´ã«ã¯ [ã«ã¹ã¿ãã¤ãº] ãã¯ãªãã¯ãã¾ãã", IDC_STATIC, 53, 120, 166, 25 PUSHBUTTON "ã«ã¹ã¿ãã¤ãº(&U)...", IDC_CUSTOMLAYOUT, 220, 122, 80, 14 END @@ -110,12 +110,12 @@ LTEXT "ReactOS ã»ããã¢ãã ã¦ã£ã¶ã¼ãã®å®äº", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "ReactOS ã»ããã¢ãããæ£å¸¸ã«å®äºãã¾ããã\n\n[å®äº] ãã¯ãªãã¯ããã¨ãã³ã³ãã¥ã¼ã¿ãåèµ·åãã¾ãã", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "ãã©ã¤ãã«CDãããå ´åã¯åãåºãã¦ãã ããã åèµ·åããã«ã¯ å®äºãã¯ãªãã¯ãã¦ãã ããã", IDC_STATIC, 115, 169, 195, 17 + LTEXT "ãã©ã¤ãã« CD ãããå ´åã¯åãåºãã¦ä¸ãããåèµ·åããã«ã¯ [å®äº] ãã¯ãªãã¯ãã¦ä¸ããã", IDC_STATIC, 115, 169, 195, 17 END IDD_GPL DIALOGEX 0, 0, 333, 230 STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "GNU General Public License" +CAPTION "GNU ä¸è¬å¬è¡å©ç¨è¨±è«¾æ¸" FONT 9, "MS UI Gothic" BEGIN EDITTEXT IDC_GPL_TEXT, 7, 7, 319, 190, ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL @@ -124,7 +124,7 @@ IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "ãå¾ã¡ãã ãã..." +CAPTION "ãå¾ã¡ä¸ãã..." FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS @@ -141,10 +141,10 @@ IDS_LOCALETITLE "å°åã®è¨å®" IDS_LOCALESUBTITLE "ReactOS ãæ§ããªå°åã¨è¨èªã«ãããã¦ã«ã¹ã¿ãã¤ãºãããã¨ãã§ãã¾ãã" IDS_DATETIMETITLE "æ¥ä»ã¨æå»" - IDS_DATETIMESUBTITLE "ã³ã³ãã¥ã¼ã¿ã®æ¥ä»ã¨æå»ãæ£ããè¨å®ãã¦ãã ããã" + IDS_DATETIMESUBTITLE "ã³ã³ãã¥ã¼ã¿ã®æ¥ä»ã¨æå»ãæ£ããè¨å®ãã¦ä¸ããã" IDS_PROCESSTITLE "ã³ã³ãã¼ãã³ãã®ç»é²ä¸" - IDS_PROCESSSUBTITLE "ãå¾ã¡ãã ãã..." - IDS_THEMESELECTIONTITLE "ã¢ãã¢ã©ã³ã¹" + IDS_PROCESSSUBTITLE "ãå¾ã¡ä¸ãã..." + IDS_THEMESELECTIONTITLE "å¤è¦³" IDS_THEMESELECTIONSUBTITLE "å¥½ããªãã¼ãããé¸ã³ä¸ãã" END @@ -153,10 +153,10 @@ IDS_REACTOS_SETUP "ReactOS ã»ããã¢ãã" IDS_UNKNOWN_ERROR "ä¸æãªã¨ã©ã¼" IDS_REGISTERING_COMPONENTS "ã³ã³ãã¼ãã³ããç»é²ãã¦ãã¾ã..." - IDS_LOADLIBRARY_FAILED "LoadLibraryã«å¤±æ: " - IDS_GETPROCADDR_FAILED "GetProcAddrã«å¤±æ: " - IDS_REGSVR_FAILED "DllRegisterServerã«å¤±æ: " - IDS_DLLINSTALL_FAILED "DllInstallã«å¤±æ: " + IDS_LOADLIBRARY_FAILED "LoadLibrary ã«å¤±æ: " + IDS_GETPROCADDR_FAILED "GetProcAddr ã«å¤±æ: " + IDS_REGSVR_FAILED "DllRegisterServer ã«å¤±æ: " + IDS_DLLINSTALL_FAILED "DllInstall ã«å¤±æ: " IDS_TIMEOUT "ç»é²ä¸ã«ã¿ã¤ã ã¢ã¦ããã¾ãã" IDS_REASON_UNKNOWN "" /* @@ -174,10 +174,10 @@ IDS_WZD_NAME "ã»ããã¢ããã¯ã¦ã¼ã¶åãå¥åãããã¾ã§ç¶è¡ã§ãã¾ããã" IDS_WZD_SETCOMPUTERNAME "ã³ã³ãã¥ã¼ã¿åã®è¨å®ã«å¤±æãã¾ããã" IDS_WZD_COMPUTERNAME "ã»ããã¢ããã¯ã³ã³ãã¥ã¼ã¿åãå¥åãããã¾ã§ç¶è¡ã§ãã¾ããã" - IDS_WZD_PASSWORDEMPTY "ãã¹ã¯ã¼ããå¥åãã¦ãã ãã !" - IDS_WZD_PASSWORDMATCH "å¥åããããã¹ã¯ã¼ããä¸è´ãã¾ããã ããä¸åº¦æã¾ãããã¹ã¯ã¼ããå¥åãã¦ãã ããã" - IDS_WZD_PASSWORDCHAR "å¥åããããã¹ã¯ã¼ãã«ã¯ç¡å¹ãªæåãå«ã¾ãã¦ãã¾ãã æå¹ãªãã¹ã¯ã¼ããå¥åãã¦ãã ããã" - IDS_WZD_LOCALTIME "ã»ããã¢ããã¯ãã¼ã«ã«ã¿ã¤ã ãè¨å®ã§ãã¾ããã§ããã" + IDS_WZD_PASSWORDEMPTY "ãã¹ã¯ã¼ããå¥åãã¦ä¸ããï¼" + IDS_WZD_PASSWORDMATCH "å¥åããããã¹ã¯ã¼ããä¸è´ãã¾ãããããä¸åº¦æã¾ãããã¹ã¯ã¼ããå¥åãã¦ä¸ããã" + IDS_WZD_PASSWORDCHAR "å¥åããããã¹ã¯ã¼ãã«ã¯ç¡å¹ãªæåãå«ã¾ãã¦ãã¾ããæå¹ãªãã¹ã¯ã¼ããå¥åãã¦ä¸ããã" + IDS_WZD_LOCALTIME "ã»ããã¢ããã¯ãã¼ã«ã« ã¿ã¤ã ãè¨å®ã§ãã¾ããã§ããã" END STRINGTABLE

1 0

[akhaldi] 75887: [MSACM32_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:55:26 2017 New Revision: 75887 URL: http://svn.reactos.org/svn/reactos?rev=75887&view=rev Log: [MSACM32_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/msacm32/msacm.c Modified: trunk/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/msacm.c… ============================================================================== --- trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] Sun Sep 17 22:55:26 2017 @@ -38,9 +38,194 @@ DWORD_PTR dwInstance, DWORD fdwSupport) { + MMRESULT rc; + HACMDRIVER had; + if (winetest_interactive) trace(" Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag); + rc = acmDriverOpen(&had, hadid, 0); + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER, + "acmDriverOpen(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + if (rc == MMSYSERR_NOERROR) + { + ACMFORMATDETAILSA fd = {0}; + WAVEFORMATEX *pwfx, dst; + ACMFORMATTAGDETAILSA aftd_pcm = {0}; + DWORD dwSize, dwSizeMax; + DWORD i; + + fd.cbStruct = sizeof(fd); + if (paftd->cbFormatSize < sizeof(WAVEFORMATEX)) + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WAVEFORMATEX)); + else + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, paftd->cbFormatSize); + fd.pwfx = pwfx; + fd.cbwfx = paftd->cbFormatSize; + fd.dwFormatTag = paftd->dwFormatTag; + + /* try bad pwfx */ + fd.pwfx = NULL; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx = pwfx; + + /* try bad wFormatTag */ + fd.pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx->wFormatTag = paftd->dwFormatTag; + + /* try bad fdwSupport */ + fd.fdwSupport = 0xdeadbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.fdwSupport = 0; + + /* try bad pwfx structure size */ + fd.cbwfx = sizeof(PCMWAVEFORMAT)-1; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.cbwfx = paftd->cbFormatSize; + + /* test bad parameters (all zero) */ + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test acmFormatSuggest */ + + /* if we don't specify a format, we must give at least the driver's maximum size for any format */ + acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &dwSize); + rc = acmFormatSuggest(had, pwfx, &dst, dwSize-1, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + rc = acmFormatSuggest(had, pwfx, &dst, dwSize, 0); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* if we do specify a format, we must give at least the driver's maximum size for that format */ + aftd_pcm.cbStruct = sizeof(aftd_pcm); + aftd_pcm.dwFormatTag = WAVE_FORMAT_PCM; + rc = acmFormatTagDetailsA(had, &aftd_pcm, ACM_FORMATTAGDETAILSF_LARGESTSIZE); + ok(rc == MMSYSERR_NOERROR, "returned %08x\n", rc); + + dst.wFormatTag = WAVE_FORMAT_PCM; + rc = acmFormatSuggest(had, pwfx, &dst, aftd_pcm.cbFormatSize-1, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + rc = acmFormatSuggest(had, pwfx, &dst, aftd_pcm.cbFormatSize, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test nonexistent format */ + dst.wFormatTag = 0xbeef; + rc = acmFormatSuggest(had, pwfx, &dst, 0, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == ACMERR_NOTPOSSIBLE || rc == MMSYSERR_INVALPARAM, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* if the driver is NULL, we must give at least the maximum size for any driver */ + acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &dwSizeMax); + rc = acmFormatSuggest(NULL, pwfx, &dst, dwSizeMax-1, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + { + rc = acmFormatSuggest(NULL, pwfx, &dst, dwSizeMax, 0); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + } + + /* if we specify a dst format, we must give the maximum size for that format */ + dst.wFormatTag = WAVE_FORMAT_PCM; + rc = acmFormatSuggest(NULL, pwfx, &dst, aftd_pcm.cbFormatSize-1, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == MMSYSERR_INVALPARAM || broken (rc == ACMERR_NOTPOSSIBLE), /* WinXP */ + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + rc = acmFormatSuggest(NULL, pwfx, &dst, aftd_pcm.cbFormatSize, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + dst.wFormatTag = paftd->dwFormatTag; + rc = acmFormatSuggest(NULL, pwfx, &dst, paftd->cbFormatSize-1, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == MMSYSERR_INVALPARAM || broken (rc == ACMERR_NOTPOSSIBLE), /* WinXP */ + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + rc = acmFormatSuggest(NULL, pwfx, &dst, paftd->cbFormatSize, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test nonexistent format */ + dst.wFormatTag = 0xbeef; + rc = acmFormatSuggest(NULL, pwfx, &dst, 0, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == ACMERR_NOTPOSSIBLE || rc == MMSYSERR_INVALPARAM, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test index */ + for (i = 0; i < paftd->cStandardFormats; i++) + { + fd.dwFormatIndex = i; + + fd.fdwSupport = 0; + fd.cbwfx = paftd->cbFormatSize; + fd.pwfx->cbSize = 0xbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_NOERROR, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + /* Windows will write cbSize (and other data) even if the + * given cbwfx is not large enough */ + fd.fdwSupport = 0; + fd.cbwfx = sizeof(PCMWAVEFORMAT); + fd.pwfx->cbSize = 0xbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + todo_wine_if(rc != MMSYSERR_NOERROR) /* remove when fixed */ + ok(rc == MMSYSERR_NOERROR, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + todo_wine_if(fd.pwfx->cbSize != paftd->cbFormatSize - sizeof(WAVEFORMATEX)) /* remove when fixed */ + ok(fd.pwfx->cbSize == paftd->cbFormatSize - sizeof(WAVEFORMATEX), + "got %d\n", fd.pwfx->cbSize); + } + + /* one more */ + fd.dwFormatIndex = paftd->cStandardFormats; + fd.fdwSupport = 0; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + HeapFree(GetProcessHeap(), 0, pwfx); + } return TRUE; } @@ -49,8 +234,82 @@ DWORD_PTR dwInstance, DWORD fd) { + MMRESULT rc; + HACMDRIVER had; + WAVEFORMATEX *dst, *dstMax; + DWORD dwSize, dwSizeMax; + DWORD fdwSupport; + + acmMetrics((HACMOBJ)hadid, ACM_METRIC_DRIVER_SUPPORT, &fdwSupport); + if (winetest_interactive) trace(" 0x%04x, %s\n", pafd->dwFormatTag, pafd->szFormat); + + acmDriverOpen(&had, hadid, 0); + dwSize = pafd->cbwfx; + dst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); + + /* test acmFormatSuggest with valid src format */ + if (pafd->dwFormatTag == WAVE_FORMAT_PCM) + { + rc = acmFormatSuggest(had, pafd->pwfx, dst, dwSize, 0); + /* this fails on some decode-only drivers */ + ok(rc == MMSYSERR_NOERROR || rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + if (rc == MMSYSERR_NOERROR) + { + if (fdwSupport & ACMDRIVERDETAILS_SUPPORTF_CODEC) /* supports different conversions */ + ok(dst->wFormatTag != WAVE_FORMAT_PCM, "expected different format\n"); + else + ok(dst->wFormatTag == WAVE_FORMAT_PCM, + "expected %d, got %d\n", WAVE_FORMAT_PCM, dst->wFormatTag); + } + } + else + { + rc = acmFormatSuggest(had, pafd->pwfx, dst, dwSize, 0); + ok(rc == MMSYSERR_NOERROR, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + ok(dst->wFormatTag == WAVE_FORMAT_PCM, + "expected %d, got %d\n", WAVE_FORMAT_PCM, dst->wFormatTag); + ok(dst->nChannels == pafd->pwfx->nChannels, + "expected %d, got %d\n", pafd->pwfx->nChannels, dst->nChannels); + if (pafd->dwFormatTag != 0x42) /* codec 0x0042 returns a different sample rate */ + ok(dst->nSamplesPerSec == pafd->pwfx->nSamplesPerSec, + "expected %d, got %d\n", pafd->pwfx->nSamplesPerSec, dst->nSamplesPerSec); + ok(dst->wBitsPerSample == 16, + "expected %d, got %d\n", 16, dst->wBitsPerSample); + ok(dst->nBlockAlign == 2*pafd->pwfx->nChannels, + "expected %d, got %d\n", 2*pafd->pwfx->nChannels, dst->nBlockAlign); + + /* test with NULL driver */ + acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &dwSizeMax); + dstMax = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSizeMax); + rc = acmFormatSuggest(NULL, pafd->pwfx, dstMax, dwSizeMax, 0); + ok(rc == MMSYSERR_NOERROR, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + HeapFree(GetProcessHeap(), 0, dstMax); + } + + ZeroMemory(dst, dwSize); + dst->wFormatTag = pafd->pwfx->wFormatTag; + rc = acmFormatSuggest(had, pafd->pwfx, dst, dwSize, ACM_FORMATSUGGESTF_WFORMATTAG); + if (fdwSupport & ACMDRIVERDETAILS_SUPPORTF_CONVERTER) /* supports same conversions */ + ok(rc == MMSYSERR_NOERROR, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + else + todo_wine_if(rc != ACMERR_NOTPOSSIBLE) + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + HeapFree(GetProcessHeap(), 0, dst); + acmDriverClose(had, 0); return TRUE; } @@ -330,18 +589,46 @@ "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); - if (dwSize < sizeof(WAVEFORMATEX)) - dwSize = sizeof(WAVEFORMATEX); - pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); - pwfx->cbSize = LOWORD(dwSize) - sizeof(WAVEFORMATEX); + if (dwSize >= sizeof(WAVEFORMATEX)) + pwfx->cbSize = LOWORD(dwSize) - sizeof(WAVEFORMATEX); pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; fd.cbStruct = sizeof(fd); fd.pwfx = pwfx; fd.cbwfx = dwSize; fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; + + /* try bad callback */ + rc = acmFormatEnumA(had, &fd, NULL, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + /* try bad pwfx */ + fd.pwfx = NULL; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx = pwfx; + + /* fdwSupport must be zero */ + fd.fdwSupport = 0xdeadbeef; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.fdwSupport = 0; + + /* try bad pwfx structure size */ + fd.cbwfx = dwSize-1; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.cbwfx = dwSize; /* try valid parameters */ rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); @@ -382,6 +669,37 @@ ok(rc == MMSYSERR_NOERROR, "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); + + /* try bad pointer */ + rc = acmFormatDetailsA(had, NULL, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + /* try bad structure size */ + ZeroMemory(&fd, sizeof(fd)); + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + fd.cbStruct = sizeof(fd) - 1; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + fd.cbStruct = sizeof(fd); + fd.pwfx = pwfx; + ZeroMemory(fd.pwfx, dwSize); + fd.cbwfx = dwSize; + fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; + + /* try WAVE_FORMAT_UNKNOWN */ + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); HeapFree(GetProcessHeap(), 0, pwfx); @@ -724,11 +1042,112 @@ ok(mr == MMSYSERR_NOERROR, "close failed: 0x%x\n", mr); } +static const BYTE input[64] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}; + +struct stream_output +{ + WAVEFORMATEX src; + WAVEFORMATEX dst; + BYTE output[256]; + DWORD dst_used; + BOOL todo; +}; + +static const struct stream_output expected_output[] = { + /* #0: Identical conversion */ + {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}, 64, FALSE}, + + /* #1: 1 -> 2 channels */ + {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,30,30,31,31,32,32,33,33,34,34,35,35,36,36,37,37,38,38,39,39,40,40,41,41,42,42,43,43,44,44,45,45,46,46,47,47,48,48,49,49,50,50,51,51,52,52,53,53,54,54,55,55,56,56,57,57,58,58,59,59,60,60,61,61,62,62,63,63}, 128, FALSE}, + + /* #2: 2 -> 1 channels: all of the audio underflows due to addition */ + {{WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 32, FALSE}, + + /* #3: 2 -> 2 channels */ + {{WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}, 64, FALSE}, + + /* #4: 8 -> 16 bits per sample */ + {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 16000, 2, 16}, {0,128,0,129,0,130,0,131,0,132,0,133,0,134,0,135,0,136,0,137,0,138,0,139,0,140,0,141,0,142,0,143,0,144,0,145,0,146,0,147,0,148,0,149,0,150,0,151,0,152,0,153,0,154,0,155,0,156,0,157,0,158,0,159,0,160,0,161,0,162,0,163,0,164,0,165,0,166,0,167,0,168,0,169,0,170,0,171,0,172,0,173,0,174,0,175,0,176,0,177,0,178,0,179,0,180,0,181,0,182,0,183,0,184,0,185,0,186,0,187,0,188,0,189,0,190,0,191}, 128, FALSE}, + + /* #5: 16 -> 8 bits per sample */ + {{WAVE_FORMAT_PCM, 1, 8000, 16000, 2, 16}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {129,131,133,135,137,139,141,143,145,147,149,151,153,155,157,159,161,163,165,167,169,171,173,175,177,179,181,183,185,187,189,191}, 32, FALSE}, + + /* #6: 16 bits per sample, 2 -> 1 channels */ + {{WAVE_FORMAT_PCM, 2, 8000, 32000, 4, 16}, {WAVE_FORMAT_PCM, 1, 8000, 16000, 2, 16}, {2,4,10,12,18,20,26,28,34,36,42,44,50,52,58,60,66,68,74,76,82,84,90,92,98,100,106,108,114,116,122,124}, 32, FALSE}, + + /* #7: 8000 -> 11025 sample rate */ + /* FIXME: upsampling is slightly off on wine - the algorithm is wrong whenever error > (srcrate + dstrate) / 2 */ + {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 11025, 11025, 1, 8}, {0,1,1,2,3,4,4,5,6,7,7,8,9,9,10,11,12,12,13,14,15,15,16,17,17,18,19,20,20,21,22,22,23,24,25,25,26,27,28,28,29,30,30,31,32,33,33,34,35,36,36,37,38,38,39,40,41,41,42,43,44,44,45,46,46,47,48,49,49,50,51,52,52,53,54,54,55,56,57,57,58,59,60,60,61,62,62,63}, 88, TRUE}, + + /* #8: 8000 -> 22050 sample rate */ + {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 22050, 22050, 1, 8}, {0,0,1,1,1,2,2,3,3,3,4,4,4,5,5,5,6,6,7,7,7,8,8,8,9,9,9,10,10,11,11,11,12,12,12,13,13,13,14,14,15,15,15,16,16,16,17,17,17,18,18,19,19,19,20,20,20,21,21,21,22,22,22,23,23,24,24,24,25,25,25,26,26,26,27,27,28,28,28,29,29,29,30,30,30,31,31,32,32,32,33,33,33,34,34,34,35,35,36,36,36,37,37,37,38,38,38,39,39,40,40,40,41,41,41,42,42,42,43,43,44,44,44,45,45,45,46,46,46,47,47,48,48,48,49,49,49,50,50,50,51,51,52,52,52,53,53,53,54,54,54,55,55,56,56,56,57,57,57,58,58,58,59,59,60,60,60,61,61,61,62,62,62,63,63,63}, 176, TRUE}, + + /* #9: 11025 -> 22050 sample rate */ + {{WAVE_FORMAT_PCM, 1, 11025, 11025, 1, 8}, {WAVE_FORMAT_PCM, 1, 22050, 22050, 1, 8}, {0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,30,30,31,31,32,32,33,33,34,34,35,35,36,36,37,37,38,38,39,39,40,40,41,41,42,42,43,43,44,44,45,45,46,46,47,47,48,48,49,49,50,50,51,51,52,52,53,53,54,54,55,55,56,56,57,57,58,58,59,59,60,60,61,61,62,62,63,63}, 128, FALSE}, + + /* #10: 22050 -> 11025 sample rate */ + {{WAVE_FORMAT_PCM, 1, 22050, 22050, 1, 8}, {WAVE_FORMAT_PCM, 1, 11025, 11025, 1, 8}, {1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,37,39,41,43,45,47,49,51,53,55,57,59,61,63}, 32, FALSE}, + + /* #11: 11025 -> 8000 sample rate */ + {{WAVE_FORMAT_PCM, 1, 11025, 11025, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {0,2,3,4,6,7,8,10,11,13,14,15,17,18,19,21,22,24,25,26,28,29,31,32,33,35,36,37,39,40,42,43,44,46,47,48,50,51,53,54,55,57,58,59,61,62}, 46, FALSE}, + + /* #12: 22050 -> 8000 sample rate */ + {{WAVE_FORMAT_PCM, 1, 22050, 22050, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {1,4,6,9,12,15,17,20,23,26,28,31,34,37,39,42,45,48,50,53,56,59,62}, 23, FALSE}, + + /* #13: 44100 -> 8000 sample rate */ + {{WAVE_FORMAT_PCM, 1, 44100, 44100, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {2,8,13,19,24,30,35,41,46,52,57,63}, 12, FALSE}, +}; + +static void test_convert(void) +{ + HACMSTREAM has; + ACMSTREAMHEADER hdr = {0}; + BYTE output[256]; + MMRESULT mmr; + unsigned i; + + for (i = 0; i < sizeof(expected_output)/sizeof(struct stream_output); i++) + { + mmr = acmStreamOpen(&has, NULL, (WAVEFORMATEX *)&expected_output[i].src, (WAVEFORMATEX *)&expected_output[i].dst, NULL, 0, 0, 0); + ok(mmr == MMSYSERR_NOERROR, "#%d: open failed: 0x%x\n", i, mmr); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = (BYTE *)input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = output; + hdr.cbDstLength = sizeof(output); + + mmr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mmr == MMSYSERR_NOERROR, "#%d: prepare failed: 0x%x\n", i, mmr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "#%d: header wasn't prepared: 0x%x\n", i, hdr.fdwStatus); + + memset(&output, 0, sizeof(output)); + mmr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mmr == MMSYSERR_NOERROR, "#%d: convert failed: 0x%x\n", i, mmr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "#%d: conversion was not done: 0x%x\n", i, hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "#%d: expected %d, got %d\n", i, hdr.cbSrcLength, hdr.cbSrcLengthUsed); + ok(hdr.cbDstLengthUsed == expected_output[i].dst_used, "#%d: expected %d, got %d\n", i, expected_output[i].dst_used, hdr.cbDstLengthUsed); +todo_wine_if(expected_output[i].todo) + ok(!memcmp(expected_output[i].output, output, hdr.cbDstLengthUsed), "#%d: output does not match\n", i); + + mmr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mmr == MMSYSERR_NOERROR, "#%d: unprepare failed: 0x%x\n", i, mmr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "#%d: header wasn't unprepared: 0x%x\n", i, hdr.fdwStatus); + + mmr = acmStreamClose(has, 0); + ok(mmr == MMSYSERR_NOERROR, "#%d: close failed: 0x%x\n", i, mmr); + } +} + static void test_acmFormatSuggest(void) { WAVEFORMATEX src, dst; DWORD suggest; MMRESULT rc; + DWORD sizeMax; + + acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &sizeMax); /* Test a valid PCM format */ src.wFormatTag = WAVE_FORMAT_PCM; @@ -740,26 +1159,7 @@ src.cbSize = 0; suggest = 0; memset(&dst, 0, sizeof(dst)); - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); - ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); -todo_wine - ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); - ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); - ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %d, got %d\n", src.nSamplesPerSec, dst.nSamplesPerSec); -todo_wine - ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); -todo_wine - ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); -todo_wine - ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); - - /* All parameters from destination are valid */ - suggest = ACM_FORMATSUGGESTF_NCHANNELS - | ACM_FORMATSUGGESTF_NSAMPLESPERSEC - | ACM_FORMATSUGGESTF_WBITSPERSAMPLE - | ACM_FORMATSUGGESTF_WFORMATTAG; - dst = src; - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(PCMWAVEFORMAT), suggest); ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); @@ -768,51 +1168,58 @@ ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); - /* Test for WAVE_FORMAT_MSRT24 used in Monster Truck Madness 2 */ - src.wFormatTag = WAVE_FORMAT_MSRT24; - src.nChannels = 1; - src.nSamplesPerSec = 8000; - src.nAvgBytesPerSec = 16000; - src.nBlockAlign = 2; - src.wBitsPerSample = 16; - src.cbSize = 0; - dst = src; + /* All parameters from destination are valid */ suggest = ACM_FORMATSUGGESTF_NCHANNELS | ACM_FORMATSUGGESTF_NSAMPLESPERSEC | ACM_FORMATSUGGESTF_WBITSPERSAMPLE | ACM_FORMATSUGGESTF_WFORMATTAG; - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); - ok(rc == ACMERR_NOTPOSSIBLE, "failed with error 0x%x\n", rc); - memset(&dst, 0, sizeof(dst)); + dst = src; + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(PCMWAVEFORMAT), suggest); + ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); + ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); + ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); + ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %d, got %d\n", src.nSamplesPerSec, dst.nSamplesPerSec); + ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); + ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); + ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); + + /* Test an invalid PCM format */ + ZeroMemory(&dst, sizeof(dst)); + src.nSamplesPerSec = 0xdeadbeef; suggest = 0; - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); -todo_wine + rc = acmFormatSuggest(NULL, &src, &dst, sizeMax, suggest); + todo_wine { + ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); + ok(dst.wFormatTag == WAVE_FORMAT_PCM, "expected %d, got %d\n", WAVE_FORMAT_PCM, dst.wFormatTag); + ok(dst.nSamplesPerSec == 0xdeadbeef, "expected %d, got %d\n", 0xdeadbeef, dst.nSamplesPerSec); + } + src.nSamplesPerSec = 8000; + + /* Test a nonexistent format */ + src.wFormatTag = 0xbeef; + rc = acmFormatSuggest(NULL, &src, &dst, sizeMax-1, suggest); ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); - /* Invalid struct size */ - src.wFormatTag = WAVE_FORMAT_PCM; - rc = acmFormatSuggest(NULL, &src, &dst, 0, suggest); -todo_wine + rc = acmFormatSuggest(NULL, &src, &dst, sizeMax, suggest); + todo_wine + ok(rc == MMSYSERR_NODRIVER, "failed with error 0x%x\n", rc); + + /* Test converting between two known but incompatible formats */ + src.wFormatTag = WAVE_FORMAT_ALAW; + src.nChannels = 1; + src.nSamplesPerSec = 8000; + src.nAvgBytesPerSec = 8000; + src.nBlockAlign = 1; + src.wBitsPerSample = 8; + src.cbSize = 0; + suggest = ACM_FORMATSUGGESTF_WFORMATTAG; + dst.wFormatTag = WAVE_FORMAT_IMA_ADPCM; + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(IMAADPCMWAVEFORMAT)-1, suggest); ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) / 2, suggest); -todo_wine - ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); - /* cbSize is the last parameter and not required for PCM */ - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - 1, suggest); - ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - sizeof(dst.cbSize), suggest); - ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - sizeof(dst.cbSize) - 1, suggest); -todo_wine - ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); - /* cbSize is required for others */ - src.wFormatTag = WAVE_FORMAT_ADPCM; - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - sizeof(dst.cbSize), suggest); -todo_wine - ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - 1, suggest); -todo_wine - ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); + + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(IMAADPCMWAVEFORMAT), suggest); + todo_wine + ok(rc == MMSYSERR_NODRIVER, "failed with error 0x%x\n", rc); /* Invalid suggest flags */ src.wFormatTag = WAVE_FORMAT_PCM; @@ -830,8 +1237,46 @@ ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); } - -void test_mp3(void) +static void test_acmFormatTagDetails(void) +{ + ACMFORMATTAGDETAILSW aftd = {0}; + MMRESULT rc; + + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = WAVE_FORMAT_MPEGLAYER3; + rc = acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (rc == MMSYSERR_NOERROR) + ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); +} + +static void test_acmFormatChoose(void) +{ + ACMFORMATCHOOSEW afc = {0}; + WAVEFORMATEX *pwfx; + DWORD sizeMax; + MMRESULT rc; + + acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &sizeMax); + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeMax); + + afc.cbStruct = sizeof(afc); + afc.pwfx = pwfx; + + /* test invalid struct size */ + afc.cbStruct = sizeof(afc)-1; + rc = acmFormatChooseW(&afc); + ok(rc == MMSYSERR_INVALPARAM, "expected 0xb, got 0x%x\n", rc); + afc.cbStruct = sizeof(afc); + + afc.pwfx = NULL; + rc = acmFormatChooseW(&afc); + ok(rc == MMSYSERR_INVALPARAM, "expected 0xb, got 0x%x\n", rc); + afc.pwfx = pwfx; + + HeapFree(GetProcessHeap(), 0, pwfx); +} + +static void test_mp3(void) { MPEGLAYER3WAVEFORMAT src; WAVEFORMATEX dst; @@ -1067,7 +1512,10 @@ { driver_tests(); test_prepareheader(); + test_convert(); test_acmFormatSuggest(); + test_acmFormatTagDetails(); + test_acmFormatChoose(); test_mp3(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */

1 0

[akhaldi] 75886: [MSACM32] Sync with Wine Staging 2.16. CORE-13762 993faf5 msacm32: Implement ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT. 84e61e6 msacm32: Add invalid parameter checks for acmFormatChoo...
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:55:04 2017 New Revision: 75886 URL: http://svn.reactos.org/svn/reactos?rev=75886&view=rev Log: [MSACM32] Sync with Wine Staging 2.16. CORE-13762 993faf5 msacm32: Implement ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT. 84e61e6 msacm32: Add invalid parameter checks for acmFormatChoose(). 5e2c243 msacm32: Don't add a format entry if it is decode-only. cadedd7 msacm32: Rewrite PCM conversion functions. 7493364 msacm32: Check correct variable. ab2760e msacm32: Try to suggest PCM to PCM conversion first. 8e88af3 msacm32: Add more invalid parameter checks for acmFormatSuggest(). 1e30f79 msacm32: Add invalid parameter checks for acmFormatDetails(). c984aa5 msacm32: Add more invalid parameter checks for acmFormatEnum(). 4e0c370 msacm32: Don't write cbSize if the format is WAVE_FORMAT_PCM. Removed: trunk/reactos/dll/win32/msacm32/msacm.spec trunk/reactos/dll/win32/msacm32/msacm_main.c Modified: trunk/reactos/dll/win32/msacm32/format.c trunk/reactos/dll/win32/msacm32/pcmconverter.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msacm32/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/format.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] Sun Sep 17 22:55:04 2017 @@ -41,18 +41,29 @@ switch (affd->mode) { case WINE_ACMFF_TAG: - if (SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, - CB_FINDSTRINGEXACT, -1, - (LPARAM)paftd->szFormatTag) == CB_ERR) - SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, - CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag); + if (paftd->cStandardFormats > 0) + { + if (SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + CB_FINDSTRINGEXACT, -1, + (LPARAM)paftd->szFormatTag) == CB_ERR) + { + int index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag); + if (((affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + (paftd->dwFormatTag == affd->afc->pwfx->wFormatTag)) || + (!(affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + (paftd->dwFormatTag == WAVE_FORMAT_PCM))) + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + CB_SETCURSEL, index, 0); + } + } break; case WINE_ACMFF_FORMAT: if (strcmpW(affd->szFormatTag, paftd->szFormatTag) == 0) { HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSW afd; + ACMFORMATDETAILSW afd = {0}; unsigned int i, len; MMRESULT mmr; WCHAR buffer[ACMFORMATDETAILS_FORMAT_CHARS+16]; @@ -62,14 +73,16 @@ afd.pwfx = HeapAlloc(MSACM_hHeap, 0, paftd->cbFormatSize); if (!afd.pwfx) return FALSE; afd.pwfx->wFormatTag = paftd->dwFormatTag; - afd.pwfx->cbSize = paftd->cbFormatSize; + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + afd.pwfx->cbSize = paftd->cbFormatSize - sizeof(WAVEFORMATEX); afd.cbwfx = paftd->cbFormatSize; for (i = 0; i < paftd->cStandardFormats; i++) { static const WCHAR fmtW[] = {'%','d',' ','K','o','/','s','\0'}; - int j; + int j, index; afd.dwFormatIndex = i; + afd.fdwSupport = 0; mmr = acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_INDEX); if (mmr == MMSYSERR_NOERROR) { lstrcpynW(buffer, afd.szFormat, ACMFORMATTAGDETAILS_FORMATTAG_CHARS + 1); @@ -78,14 +91,17 @@ buffer[j] = ' '; wsprintfW(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS, fmtW, (afd.pwfx->nAvgBytesPerSec + 512) / 1024); - SendDlgItemMessageW(affd->hWnd, + index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_ADDSTRING, 0, (LPARAM)buffer); + if ((affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + affd->afc->cbwfx >= paftd->cbFormatSize && + !memcmp(afd.pwfx, affd->afc->pwfx, paftd->cbFormatSize)) + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, + CB_SETCURSEL, index, 0); } } acmDriverClose(had, 0); - SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, - CB_SETCURSEL, 0, 0); HeapFree(MSACM_hHeap, 0, afd.pwfx); } } @@ -95,7 +111,7 @@ HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSW afd; + ACMFORMATDETAILSW afd = {0}; afd.cbStruct = sizeof(afd); afd.dwFormatTag = paftd->dwFormatTag; @@ -117,7 +133,7 @@ return TRUE; } -static BOOL MSACM_FillFormatTags(HWND hWnd) +static BOOL MSACM_FillFormatTags(HWND hWnd, PACMFORMATCHOOSEW afc) { ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; @@ -127,13 +143,15 @@ affd.hWnd = hWnd; affd.mode = WINE_ACMFF_TAG; + affd.afc = afc; acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); - SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); + if (SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETCURSEL, 0, 0) == CB_ERR) + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); return TRUE; } -static BOOL MSACM_FillFormat(HWND hWnd) +static BOOL MSACM_FillFormat(HWND hWnd, PACMFORMATCHOOSEW afc) { ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; @@ -145,6 +163,7 @@ affd.hWnd = hWnd; affd.mode = WINE_ACMFF_FORMAT; + affd.afc = afc; SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETLBTEXT, SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, @@ -152,7 +171,8 @@ (LPARAM)affd.szFormatTag); acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); - SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); + if (SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_GETCURSEL, 0, 0) == CB_ERR) + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); return TRUE; } @@ -191,10 +211,11 @@ case WM_INITDIALOG: afc = (PACMFORMATCHOOSEW)lParam; SetPropW(hWnd, fmt_prop, (HANDLE)afc); - MSACM_FillFormatTags(hWnd); - MSACM_FillFormat(hWnd); + MSACM_FillFormatTags(hWnd, afc); + MSACM_FillFormat(hWnd, afc); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| ACMFORMATCHOOSE_STYLEF_SHOWHELP| + ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0) FIXME("Unsupported style %08x\n", afc->fdwStyle); @@ -213,7 +234,7 @@ case IDD_ACMFORMATCHOOSE_CMB_FORMATTAG: switch (HIWORD(wParam)) { case CBN_SELCHANGE: - MSACM_FillFormat(hWnd); + MSACM_FillFormat(hWnd, afc); break; default: TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08lx\n", @@ -266,6 +287,9 @@ LPWSTR name = NULL; LPWSTR templ = NULL; DWORD sz; + + if (pafmtc->cbStruct < sizeof(ACMFORMATCHOOSEA)) + return MMSYSERR_INVALPARAM; afcw.cbStruct = sizeof(afcw); afcw.fdwStyle = pafmtc->fdwStyle; @@ -338,6 +362,12 @@ */ MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc) { + if (pafmtc->cbStruct < sizeof(ACMFORMATCHOOSEW)) + return MMSYSERR_INVALPARAM; + + if (!pafmtc->pwfx) + return MMSYSERR_INVALPARAM; + if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE) return DialogBoxIndirectParamW(MSACM_hInstance32, (LPCDLGTEMPLATEW)pafmtc->hInstance, pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); @@ -358,11 +388,15 @@ { ACMFORMATDETAILSW afdw; MMRESULT mmr; + + if (!pafd) + return MMSYSERR_INVALPARAM; memset(&afdw, 0, sizeof(afdw)); afdw.cbStruct = sizeof(afdw); afdw.dwFormatIndex = pafd->dwFormatIndex; afdw.dwFormatTag = pafd->dwFormatTag; + afdw.fdwSupport = pafd->fdwSupport; afdw.pwfx = pafd->pwfx; afdw.cbwfx = pafd->cbwfx; @@ -384,10 +418,26 @@ MMRESULT mmr; static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; + ACMFORMATTAGDETAILSW aftd = {0}; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + if (!pafd) + return MMSYSERR_INVALPARAM; + if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; + + if (!pafd->pwfx) + return MMSYSERR_INVALPARAM; + + if (pafd->cbwfx < sizeof(PCMWAVEFORMAT)) + return MMSYSERR_INVALPARAM; + + if (pafd->fdwSupport) + return MMSYSERR_INVALPARAM; + + if (pafd->dwFormatTag == WAVE_FORMAT_UNKNOWN) + return MMSYSERR_INVALPARAM; switch (fdwDetails) { case ACM_FORMATDETAILSF_FORMAT: @@ -413,7 +463,16 @@ } break; case ACM_FORMATDETAILSF_INDEX: - /* should check pafd->dwFormatIndex < aftd->cStandardFormats */ + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = pafd->dwFormatTag; + mmr = acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (mmr != MMSYSERR_NOERROR) + break; + if (pafd->dwFormatIndex >= aftd.cStandardFormats) + { + mmr = MMSYSERR_INVALPARAM; + break; + } mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails); break; default: @@ -475,6 +534,9 @@ if (!pafda) return MMSYSERR_INVALPARAM; + if (!fnCallback) + return MMSYSERR_INVALPARAM; + if (pafda->cbStruct < sizeof(*pafda)) return MMSYSERR_INVALPARAM; @@ -482,6 +544,7 @@ afdw.cbStruct = sizeof(afdw); afdw.dwFormatIndex = pafda->dwFormatIndex; afdw.dwFormatTag = pafda->dwFormatTag; + afdw.fdwSupport = pafda->fdwSupport; afdw.pwfx = pafda->pwfx; afdw.cbwfx = pafda->cbwfx; @@ -560,6 +623,7 @@ for (j = 0; j < aftd.cStandardFormats; j++) { pafd->dwFormatIndex = j; pafd->dwFormatTag = aftd.dwFormatTag; + pafd->fdwSupport = 0; if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_INDEX) != MMSYSERR_NOERROR) continue; @@ -596,6 +660,8 @@ PWINE_ACMDRIVERID padid; WAVEFORMATEX wfxRef; BOOL ret; + DWORD cbwfxMax; + MMRESULT mmr; TRACE("(%p, %p, %p, %ld, %d)\n", had, pafd, fnCallback, dwInstance, fdwEnum); @@ -603,7 +669,16 @@ if (!pafd) return MMSYSERR_INVALPARAM; + if (!fnCallback) + return MMSYSERR_INVALPARAM; + if (pafd->cbStruct < sizeof(*pafd)) + return MMSYSERR_INVALPARAM; + + if (pafd->fdwSupport) + return MMSYSERR_INVALPARAM; + + if (!pafd->pwfx) return MMSYSERR_INVALPARAM; if (fdwEnum & (ACM_FORMATENUMF_WFORMATTAG|ACM_FORMATENUMF_NCHANNELS| @@ -621,6 +696,12 @@ if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT)) FIXME("Unsupported fdwEnum values %08x\n", fdwEnum); + + mmr = acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &cbwfxMax); + if (mmr != MMSYSERR_NOERROR) + return mmr; + if (pafd->cbwfx < cbwfxMax) + return MMSYSERR_INVALPARAM; if (had) { HACMDRIVERID hadid; @@ -650,6 +731,7 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) { + ACMFORMATTAGDETAILSW aftd = {0}; ACMDRVFORMATSUGGEST adfg; MMRESULT mmr; @@ -662,6 +744,32 @@ if (fdwSuggest & ~(ACM_FORMATSUGGESTF_NCHANNELS|ACM_FORMATSUGGESTF_NSAMPLESPERSEC| ACM_FORMATSUGGESTF_WBITSPERSAMPLE|ACM_FORMATSUGGESTF_WFORMATTAG)) return MMSYSERR_INVALFLAG; + + /* if we were given PCM, try to convert to PCM */ + if (pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && !had && + !(fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG)) + { + ACMFORMATDETAILSW afd = {0}; + afd.cbStruct = sizeof(afd); + afd.dwFormatTag = WAVE_FORMAT_PCM; + afd.pwfx = pwfxSrc; + afd.cbwfx = sizeof(PCMWAVEFORMAT); + if (!acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_FORMAT)) + { + memcpy(pwfxDst, pwfxSrc, sizeof(PCMWAVEFORMAT)); + return MMSYSERR_NOERROR; + } + } + + aftd.cbStruct = sizeof(aftd); + if (fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG) + aftd.dwFormatTag = pwfxDst->wFormatTag; + mmr = acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_LARGESTSIZE); + if ((fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG) && mmr == ACMERR_NOTPOSSIBLE) + return ACMERR_NOTPOSSIBLE; + + if (cbwfxDst < aftd.cbFormatSize) + return MMSYSERR_INVALPARAM; adfg.cbStruct = sizeof(adfg); adfg.fdwSuggest = fdwSuggest; Removed: trunk/reactos/dll/win32/msacm32/msacm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm.sp… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm.spec (removed) @@ -1,40 +0,0 @@ - 1 stub WEP - 2 stub DRIVERPROC - 3 stub ___EXPORTEDSTUB - 7 pascal acmGetVersion() acmGetVersion16 - 8 pascal -ret16 acmMetrics(word word ptr) acmMetrics16 - 10 pascal -ret16 acmDriverEnum(ptr long long) acmDriverEnum16 - 11 pascal -ret16 acmDriverDetails(word ptr long) acmDriverDetails16 - 12 pascal -ret16 acmDriverAdd(ptr word long long long) acmDriverAdd16 - 13 pascal -ret16 acmDriverRemove(word long) acmDriverRemove16 - 14 pascal -ret16 acmDriverOpen(ptr word long) acmDriverOpen16 - 15 pascal -ret16 acmDriverClose(word long) acmDriverClose16 - 16 pascal acmDriverMessage(word word long long) acmDriverMessage16 - 17 pascal -ret16 acmDriverID(word ptr long) acmDriverID16 - 18 pascal -ret16 acmDriverPriority(word long long) acmDriverPriority16 - 30 pascal -ret16 acmFormatTagDetails(word ptr long) acmFormatTagDetails16 - 31 pascal -ret16 acmFormatTagEnum(word ptr ptr long long) acmFormatTagEnum16 - 40 pascal -ret16 acmFormatChoose(ptr) acmFormatChoose16 - 41 pascal -ret16 acmFormatDetails(word ptr long) acmFormatDetails16 - 42 pascal -ret16 acmFormatEnum(word ptr ptr long long) acmFormatEnum16 - 45 pascal -ret16 acmFormatSuggest(word ptr ptr long long) acmFormatSuggest16 - 50 pascal -ret16 acmFilterTagDetails(word ptr long) acmFilterTagDetails16 - 51 pascal -ret16 acmFilterTagEnum(word ptr ptr long long) acmFilterTagEnum16 - 60 pascal -ret16 acmFilterChoose(ptr) acmFilterChoose16 - 61 pascal -ret16 acmFilterDetails(word ptr long) acmFilterDetails16 - 62 pascal -ret16 acmFilterEnum(word ptr ptr long long) acmFilterEnum16 - 70 pascal -ret16 acmStreamOpen(ptr word ptr ptr ptr long long long) acmStreamOpen16 - 71 pascal -ret16 acmStreamClose(word long) acmStreamClose16 - 72 pascal -ret16 acmStreamSize(word long ptr long) acmStreamSize16 - 75 pascal -ret16 acmStreamConvert(word ptr long) acmStreamConvert16 - 76 pascal -ret16 acmStreamReset(word long) acmStreamReset16 - 77 pascal -ret16 acmStreamPrepareHeader(word ptr long) acmStreamPrepareHeader16 - 78 pascal -ret16 acmStreamUnprepareHeader(word ptr long) acmStreamUnprepareHeader16 -150 stub ACMAPPLICATIONEXIT -175 stub ACMHUGEPAGELOCK -176 stub ACMHUGEPAGEUNLOCK -200 stub ACMOPENCONVERSION -201 stub ACMCLOSECONVERSION -202 stub ACMCONVERT -203 stub ACMCHOOSEFORMAT -255 pascal DllEntryPoint(long word word word long word) MSACM_DllEntryPoint Removed: trunk/reactos/dll/win32/msacm32/msacm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_ma… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_main.c (removed) @@ -1,451 +0,0 @@ -/* - * MSACM library - * - * Copyright 1998 Patrik Stridvall - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "wineacm.h" - -/************************************************************************** - * DllEntryPoint (MSACM.255) - * - * MSACM DLL entry point - * - */ -BOOL WINAPI MSACM_DllEntryPoint(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds, - WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) -{ - static HANDLE hndl; - - TRACE("0x%x 0x%lx\n", hinstDLL, fdwReason); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - if (!hndl && !(hndl = LoadLibraryA("MSACM32.DLL"))) { - ERR("Could not load sibling MsAcm32.dll\n"); - return FALSE; - } - break; - case DLL_PROCESS_DETACH: - FreeLibrary(hndl); - hndl = 0; - break; - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - break; - } - return TRUE; -} - -/*********************************************************************** - * acmGetVersion (MSACM.7) - */ -DWORD WINAPI acmGetVersion16(void) -{ - return acmGetVersion(); -} - -/*********************************************************************** - * acmMetrics (MSACM.8) - */ - -MMRESULT16 WINAPI acmMetrics16( - HACMOBJ16 hao, UINT16 uMetric, LPVOID pMetric) -{ - FIXME("(0x%04x, %d, %p): semi-stub\n", hao, uMetric, pMetric); - - if(!hao) return acmMetrics(0, uMetric, pMetric); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverEnum (MSACM.10) - */ -MMRESULT16 WINAPI acmDriverEnum16( - ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) -{ - FIXME("(%p, %ld, %ld): stub\n", - fnCallback, dwInstance, fdwEnum - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverDetails (MSACM.11) - */ - -MMRESULT16 WINAPI acmDriverDetails16( - HACMDRIVERID16 hadid, LPACMDRIVERDETAILS16 padd, DWORD fdwDetails) -{ - FIXME("(0x%04x, %p, %ld): stub\n", hadid, padd, fdwDetails); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverAdd (MSACM.12) - */ -MMRESULT16 WINAPI acmDriverAdd16( - LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule, - LPARAM lParam, DWORD dwPriority, DWORD fdwAdd) -{ - FIXME("(%p, 0x%04x, %ld, %ld, %ld): stub\n", - phadid, hinstModule, lParam, dwPriority, fdwAdd - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverRemove (MSACM.13) - */ -MMRESULT16 WINAPI acmDriverRemove16( - HACMDRIVERID16 hadid, DWORD fdwRemove) -{ - FIXME("(0x%04x, %ld): stub\n", hadid, fdwRemove); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverOpen (MSACM.14) - */ -MMRESULT16 WINAPI acmDriverOpen16( - LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen) -{ - FIXME("(%p, 0x%04x, %ld): stub\n", phad, hadid, fdwOpen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverClose (MSACM.15) - */ -MMRESULT16 WINAPI acmDriverClose16( - HACMDRIVER16 had, DWORD fdwClose) -{ - FIXME("(0x%04x, %ld): stub\n", had, fdwClose); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverMessage (MSACM.16) - */ -LRESULT WINAPI acmDriverMessage16( - HACMDRIVER16 had, UINT16 uMsg, LPARAM lParam1, LPARAM lParam2) -{ - FIXME("(0x%04x, %d, %ld, %ld): stub\n", - had, uMsg, lParam1, lParam2 - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/*********************************************************************** - * acmDriverID (MSACM.17) - */ -MMRESULT16 WINAPI acmDriverID16( - HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID) -{ - FIXME("(0x%04x, %p, %ld): stub\n", hao, phadid, fdwDriverID); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverPriority (MSACM.18) - */ -MMRESULT16 WINAPI acmDriverPriority16( - HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority) -{ - FIXME("(0x%04x, %ld, %ld): stub\n", - hadid, dwPriority, fdwPriority - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatTagDetails (MSACM.30) - */ -MMRESULT16 WINAPI acmFormatTagDetails16( - HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails) -{ - FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatTagEnum (MSACM.31) - */ -MMRESULT16 WINAPI acmFormatTagEnum16( - HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, - ACMFORMATTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) -{ - FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", - had, paftd, fnCallback, dwInstance, fdwEnum - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatChoose (MSACM.40) - */ -MMRESULT16 WINAPI acmFormatChoose16( - LPACMFORMATCHOOSE16 pafmtc) -{ - FIXME("(%p): stub\n", pafmtc); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatDetails (MSACM.41) - */ -MMRESULT16 WINAPI acmFormatDetails16( - HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails) -{ - FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatEnum (MSACM.42) - */ -MMRESULT16 WINAPI acmFormatEnum16( - HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, - ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) -{ - FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", - had, pafd, fnCallback, dwInstance, fdwEnum - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatSuggest (MSACM.45) - */ -MMRESULT16 WINAPI acmFormatSuggest16( - HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, - LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) -{ - FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", - had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFilterTagDetails (MSACM.50) - */ -MMRESULT16 WINAPI acmFilterTagDetails16( - HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails) -{ - FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFilterTagEnum (MSACM.51) - */ -MMRESULT16 WINAPI acmFilterTagEnum16( - HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, - ACMFILTERTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) -{ - FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", - had, paftd, fnCallback, dwInstance, fdwEnum - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFilterChoose (MSACM.60) - */ -MMRESULT16 WINAPI acmFilterChoose16( - LPACMFILTERCHOOSE16 pafltrc) -{ - FIXME("(%p): stub\n", pafltrc); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFilterDetails (MSACM.61) - */ -MMRESULT16 WINAPI acmFilterDetails16( - HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails) -{ - FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFilterEnum (MSACM.62) - */ -MMRESULT16 WINAPI acmFilterEnum16( - HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, - ACMFILTERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) -{ - FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", - had, pafd, fnCallback, dwInstance, fdwEnum - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamOpen (MSACM.70) - */ -MMRESULT16 WINAPI acmStreamOpen16( - LPHACMSTREAM16 phas, HACMDRIVER16 had, - LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst, - LPWAVEFILTER pwfltr, DWORD dwCallback, - DWORD dwInstance, DWORD fdwOpen) -{ - FIXME("(%p, 0x%04x, %p, %p, %p, %ld, %ld, %ld): stub\n", - phas, had, pwfxSrc, pwfxDst, pwfltr, - dwCallback, dwInstance, fdwOpen - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamClose (MSACM.71) - */ -MMRESULT16 WINAPI acmStreamClose16( - HACMSTREAM16 has, DWORD fdwClose) -{ - FIXME("(0x%04x, %ld): stub\n", has, fdwClose); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamSize (MSACM.72) - */ -MMRESULT16 WINAPI acmStreamSize16( - HACMSTREAM16 has, DWORD cbInput, - LPDWORD pdwOutputBytes, DWORD fdwSize) -{ - FIXME("(0x%04x, %ld, %p, %ld): stub\n", - has, cbInput, pdwOutputBytes, fdwSize - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamConvert (MSACM.75) - */ -MMRESULT16 WINAPI acmStreamConvert16( - HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert) -{ - FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwConvert); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamReset (MSACM.76) - */ -MMRESULT16 WINAPI acmStreamReset16( - HACMSTREAM16 has, DWORD fdwReset) -{ - FIXME("(0x%04x, %ld): stub\n", has, fdwReset); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamPrepareHeader (MSACM.77) - */ -MMRESULT16 WINAPI acmStreamPrepareHeader16( - HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare) -{ - FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwPrepare); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamUnprepareHeader (MSACM.78) - */ -MMRESULT16 WINAPI acmStreamUnprepareHeader16( - HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare) -{ - FIXME("(0x%04x, %p, %ld): stub\n", - has, pash, fdwUnprepare - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * ACMAPPLICATIONEXIT (MSACM.150) - * FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMHUGEPAGELOCK (MSACM.175) - *FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMHUGEPAGEUNLOCK (MSACM.176) - * FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMOPENCONVERSION (MSACM.200) - * FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMCLOSECONVERSION (MSACM.201) - * FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMCONVERT (MSACM.202) - * FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMCHOOSEFORMAT (MSACM.203) - * FIXME - * No documentation found. - */ - - Modified: trunk/reactos/dll/win32/msacm32/pcmconverter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/pcmconve… ============================================================================== --- trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] Sun Sep 17 22:55:04 2017 @@ -58,13 +58,16 @@ /* flags for fdwDriver */ #define PCM_RESAMPLE 1 +typedef void (*PCM_CONVERT_KEEP_RATE)(const unsigned char*, int, unsigned char*); + +typedef void (*PCM_CONVERT_CHANGE_RATE)(const DWORD, const unsigned char*, DWORD*, const DWORD, unsigned char*, DWORD*); + /* data used while converting */ typedef struct tagAcmPcmData { /* conversion routine, depending if rate conversion is required */ union { - void (*cvtKeepRate)(const unsigned char*, int, unsigned char*); - void (*cvtChangeRate)(DWORD, const unsigned char*, LPDWORD, - DWORD, unsigned char*, LPDWORD); + PCM_CONVERT_KEEP_RATE cvtKeepRate; + PCM_CONVERT_CHANGE_RATE cvtChangeRate; } cvt; } AcmPcmData; @@ -502,8 +505,6 @@ } -typedef void (*PCM_CONVERT_KEEP_RATE)(const unsigned char*, int, unsigned char*); - static const PCM_CONVERT_KEEP_RATE PCM_ConvertKeepRate[] = { cvtSS88K, cvtSM88K, cvtMS88K, cvtMM88K, cvtSS816K, cvtSM816K, cvtMS816K, cvtMM816K, @@ -524,397 +525,416 @@ * <M> is the number of bits of output channel (8 or 16) * */ -static void cvtSS88C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = *src; - *dst++ = *src; - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtSM88C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = M8(src[0], src[1]); - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMS88C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = *src; - *dst++ = *src; - error = error + srcRate; - while (error > dstRate) { - src++; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMM88C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = *src; - error = error + srcRate; - while (error > dstRate) { - src++; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtSS816C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, C816(src[0])); dst += 2; - W16(dst, C816(src[1])); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtSM816C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, M16(C816(src[0]), C816(src[1]))); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtMS816C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, C816(*src)); dst += 2; - W16(dst, C816(*src)); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src++; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtMM816C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, C816(*src)); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src++; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtSS168C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = C168(R16(src)); - *dst++ = C168(R16(src + 2)); - error = error + srcRate; - while (error > dstRate) { - src += 4; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtSM168C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = C168(M16(R16(src), R16(src + 2))); - error = error + srcRate; - while (error > dstRate) { - src += 4; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtMS168C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = C168(R16(src)); - *dst++ = C168(R16(src)); - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtMM168C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = C168(R16(src)); - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtSS1616C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, R16(src)); dst += 2; - W16(dst, R16(src)); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 4; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtSM1616C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, M16(R16(src), R16(src + 2))); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 4; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMS1616C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while((*ndst)--) { - W16(dst, R16(src)); dst += 2; - W16(dst, R16(src)); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMM1616C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, R16(src)); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtSS2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W24(dst, R24(src)); dst += 3; - W24(dst, R24(src)); dst += 3; - error = error + srcRate; - while (error > dstRate) { - src += 6; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtSM2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W24(dst, M24(R24(src), R24(src + 3))); dst += 3; - error = error + srcRate; - while (error > dstRate) { - src += 6; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMS2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while((*ndst)--) { - W24(dst, R24(src)); dst += 3; - W24(dst, R24(src)); dst += 3; - error = error + srcRate; - while (error > dstRate) { - src += 3; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMM2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W24(dst, R24(src)); dst += 3; - error = error + srcRate; - while (error > dstRate) { - src += 3; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -typedef void (*PCM_CONVERT_CHANGE_RATE)(DWORD, const unsigned char*, LPDWORD, DWORD, unsigned char*, LPDWORD); + +static void cvtSS88C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = src[0]; + *dst++ = src[1]; + } + src += 2; + } +} + +static void cvtSM88C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = M8(src[0], src[1]); + } + src += 2; + } +} + +static void cvtMS88C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = src[0]; + *dst++ = src[0]; + } + src += 1; + } +} + +static void cvtMM88C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = src[0]; + } + src += 1; + } +} + +static void cvtSS816C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, C816(src[0])); dst += 2; + W16(dst, C816(src[1])); dst += 2; + } + src += 2; + } +} + +static void cvtSM816C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, M16(C816(src[0]), C816(src[1]))); dst += 2; + } + src += 2; + } +} + +static void cvtMS816C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, C816(src[0])); dst += 2; + W16(dst, C816(src[0])); dst += 2; + } + src += 1; + } +} + +static void cvtMM816C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, C816(src[0])); dst += 2; + } + src += 1; + } +} + +static void cvtSS168C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = C168(R16(src)); + *dst++ = C168(R16(src + 2)); + } + src += 4; + } +} + +static void cvtSM168C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = C168(M16(R16(src), R16(src + 2))); + } + src += 4; + } +} + +static void cvtMS168C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = C168(R16(src)); + *dst++ = C168(R16(src)); + } + src += 2; + } +} + +static void cvtMM168C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = C168(R16(src)); + } + src += 2; + } +} + +static void cvtSS1616C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, R16(src)); dst += 2; + W16(dst, R16(src + 2)); dst += 2; + } + src += 4; + } +} + +static void cvtSM1616C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, M16(R16(src), R16(src + 2))); dst += 2; + } + src += 4; + } +} + +static void cvtMS1616C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, R16(src)); dst += 2; + W16(dst, R16(src)); dst += 2; + } + src += 2; + } +} + +static void cvtMM1616C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, R16(src)); dst += 2; + } + src += 2; + } +} + +static void cvtSS2424C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W24(dst, R24(src)); dst += 3; + W24(dst, R24(src + 3)); dst += 3; + } + src += 6; + } +} + +static void cvtSM2424C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W24(dst, M24(R24(src), R24(src + 3))); dst += 3; + } + src += 6; + } +} + +static void cvtMS2424C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W24(dst, R24(src)); dst += 3; + W24(dst, R24(src)); dst += 3; + } + src += 3; + } +} + +static void cvtMM2424C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W24(dst, R24(src)); dst += 3; + } + src += 3; + } +} static const PCM_CONVERT_CHANGE_RATE PCM_ConvertChangeRate[] = { cvtSS88C, cvtSM88C, cvtMS88C, cvtMM88C, @@ -1268,12 +1288,8 @@ /* do the job */ if (adsi->fdwDriver & PCM_RESAMPLE) { - DWORD nsrc2 = nsrc; - DWORD ndst2 = ndst; - apd->cvt.cvtChangeRate(adsi->pwfxSrc->nSamplesPerSec, adsh->pbSrc, &nsrc2, - adsi->pwfxDst->nSamplesPerSec, adsh->pbDst, &ndst2); - nsrc -= nsrc2; - ndst -= ndst2; + apd->cvt.cvtChangeRate(adsi->pwfxSrc->nSamplesPerSec, adsh->pbSrc, &nsrc, + adsi->pwfxDst->nSamplesPerSec, adsh->pbDst, &ndst); } else { if (nsrc < ndst) ndst = nsrc; else nsrc = ndst; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 22:55:04 2017 @@ -100,7 +100,7 @@ reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.23 reactos/dll/win32/mpr # Synced to WineStaging-2.9 reactos/dll/win32/mprapi # Synced to WineStaging-2.9 -reactos/dll/win32/msacm32 # Synced to WineStaging-2.9 +reactos/dll/win32/msacm32 # Synced to WineStaging-2.16 reactos/dll/win32/msacm32.drv # Synced to WineStaging-2.9 reactos/dll/win32/msadp32.acm # Synced to WineStaging-2.9 reactos/dll/win32/mscat32 # Synced to WineStaging-2.9

1 0

[akhaldi] 75885: [MAPI32] Sync with Wine Staging 2.16. CORE-13762 b0a31c3 mapi32: A spelling fix in a comment.
by akhaldi＠svn.reactos.org 17 Sep '17

17 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:52 2017 New Revision: 75885 URL: http://svn.reactos.org/svn/reactos?rev=75885&view=rev Log: [MAPI32] Sync with Wine Staging 2.16. CORE-13762 b0a31c3 mapi32: A spelling fix in a comment. Modified: trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Sun Sep 17 22:54:52 2017 @@ -1623,7 +1623,7 @@ * * PARAMS * iface [I] IMAPIProp object to get the property values from - * lpTags [I] Property tage of property values to be retrieved + * lpTags [I] Property tags of property values to be retrieved * ulFlags [I] Return 0=Ascii MAPI_UNICODE=Unicode strings for * unspecified types * lpCount [O] Destination for number of properties returned Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 22:54:52 2017 @@ -89,7 +89,7 @@ reactos/dll/win32/jsproxy # Synced to WineStaging-2.16 reactos/dll/win32/loadperf # Synced to WineStaging-2.9 reactos/dll/win32/lz32 # Synced to WineStaging-2.9 -reactos/dll/win32/mapi32 # Synced to WineStaging-2.9 +reactos/dll/win32/mapi32 # Synced to WineStaging-2.16 reactos/dll/win32/mciavi32 # Synced to WineStaging-2.9 reactos/dll/win32/mcicda # Synced to WineStaging-2.9 reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs