Skip to content

Commit c4b5e28

Browse files
MishaProductionsMishaProductions
committed
[PSDK][QCAP][BROWSEUI][QUARTZ] Add required changes
1 parent 9e3a4d5 commit c4b5e28

7 files changed

Lines changed: 102 additions & 42 deletions

File tree

‎dll/directx/wine/qcap/vfwcapture.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,13 @@ PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag,
545545
{
546546
VfwPinImpl *pin;
547547

548+
#ifdef __REACTOS__
549+
This->driver_info = qcap_driver_init( This->pOutputPin,
550+
var.ulVal );
551+
#else
548552
This->driver_info = qcap_driver_init( This->pOutputPin,
549553
var.__VARIANT_NAME_1.__VARIANT_NAME_2.__VARIANT_NAME_3.ulVal );
554+
#endif
550555
if (This->driver_info)
551556
{
552557
pin = (VfwPinImpl *)This->pOutputPin;

‎dll/win32/browseui/shellbars/CBandSite.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Rebar band site
33
*
4-
* Copyright 2007 Hervé Poussineau
4+
* Copyright 2007 Herv� Poussineau
55
* Copyright 2009 Andrew Hill
66
*
77
* This library is free software; you can redistribute it and/or
@@ -901,8 +901,8 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::Exec(const GUID *pguidCmdGroup, DWORD n
901901
else
902902
{
903903
/* Update a single band */
904-
if (pvaIn->n1.n2.vt == VT_I4)
905-
hRet = _UpdateBand(pvaIn->n1.n2.n3.lVal);
904+
if (pvaIn->vt == VT_I4)
905+
hRet = _UpdateBand(pvaIn->lVal);
906906
else
907907
hRet = E_FAIL;
908908
}

‎dll/win32/dbghelp/compat.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2361,7 +2361,7 @@ typedef struct tagSAFEARRAY {
23612361
} SAFEARRAY;
23622362
typedef SAFEARRAY *LPSAFEARRAY;
23632363

2364-
#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
2364+
#ifdef NONAMELESSUNION
23652365
#define __VARIANT_NAME_1 n1
23662366
#define __VARIANT_NAME_2 n2
23672367
#define __VARIANT_NAME_3 n3

‎modules/rostests/winetests/quartz/dsoundrender.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var,
8080
char temp[50];
8181
WideCharToMultiByte(CP_ACP, 0, name, -1, temp, sizeof(temp)-1, NULL, NULL);
8282
temp[sizeof(temp)-1] = 0;
83-
trace("Trying to read %s, type %u\n", temp, var->n1.n2.vt);
83+
trace("Trying to read %s, type %u\n", temp, var->vt);
8484
if (!lstrcmpW(name, dsguid))
8585
{
8686
static const WCHAR defaultplayback[] =
@@ -90,8 +90,8 @@ static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var,
9090
'A','A','F','1','-','4','D','D','A','8',
9191
'F','2','B','5','C','0','3','}',0
9292
};
93-
ok(var->n1.n2.vt == VT_BSTR, "Wrong type asked: %u\n", var->n1.n2.vt);
94-
var->n1.n2.n3.bstrVal = SysAllocString(defaultplayback);
93+
ok(var->vt == VT_BSTR, "Wrong type asked: %u\n", var->vt);
94+
var->bstrVal = SysAllocString(defaultplayback);
9595
return S_OK;
9696
}
9797
ok(0, "Unknown property '%s' queried\n", temp);

‎sdk/include/psdk/oaidl.idl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const USHORT FADF_CREATEVECTOR = 0x2000; /* This array is a vector */
142142

143143
/* Variant */
144144

145-
cpp_quote("#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)")
145+
cpp_quote("#ifdef NONAMELESSUNION")
146146
cpp_quote("#define __VARIANT_NAME_1 n1")
147147
cpp_quote("#define __VARIANT_NAME_2 n2")
148148
cpp_quote("#define __VARIANT_NAME_3 n3")

‎sdk/include/psdk/oleauto.h‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFGUID,IRecordIn
202202
*/
203203

204204
/* Macros for accessing the fields of the VARIANT type */
205-
#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
205+
#ifdef NONAMELESSUNION
206206
#define V_VT(A) ((A)->n1.n2.vt)
207207
#define V_UNION(A,B) ((A)->n1.n2.n3.B)
208208
#define V_RECORD(A) (V_UNION(A,brecVal).pvRecord)
@@ -230,7 +230,7 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFGUID,IRecordIn
230230
#define V_CYREF(A) V_UNION(A,pcyVal)
231231
#define V_DATE(A) V_UNION(A,date)
232232
#define V_DATEREF(A) V_UNION(A,pdate)
233-
#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
233+
#ifdef NONAMELESSUNION
234234
#define V_DECIMAL(A) ((A)->n1.decVal)
235235
#else
236236
#define V_DECIMAL(A) ((A)->decVal)
@@ -284,15 +284,15 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFGUID,IRecordIn
284284

285285
void WINAPI VariantInit(_Out_ VARIANT*);
286286
HRESULT WINAPI VariantClear(_Inout_ VARIANT*);
287-
_Check_return_ HRESULT WINAPI VariantCopy(_Inout_ VARIANT*, _In_ VARIANT*);
288-
_Check_return_ HRESULT WINAPI VariantCopyInd(_Inout_ VARIANT*, _In_ VARIANT*);
287+
_Check_return_ HRESULT WINAPI VariantCopy(_Inout_ VARIANT*, _In_ const VARIANT*);
288+
_Check_return_ HRESULT WINAPI VariantCopyInd(_Inout_ VARIANT*, _In_ const VARIANT*);
289289

290290
_Check_return_
291291
HRESULT
292292
WINAPI
293293
VariantChangeType(
294294
_Inout_ VARIANT*,
295-
_In_ VARIANT*,
295+
_In_ const VARIANT*,
296296
_In_ USHORT,
297297
_In_ VARTYPE);
298298

@@ -301,7 +301,7 @@ HRESULT
301301
WINAPI
302302
VariantChangeTypeEx(
303303
_Inout_ VARIANT*,
304-
_In_ VARIANT*,
304+
_In_ const VARIANT*,
305305
_In_ LCID,
306306
_In_ USHORT,
307307
_In_ VARTYPE);
@@ -352,9 +352,9 @@ HRESULT WINAPI VarUI1FromI1(signed char, _Out_ BYTE*);
352352
HRESULT WINAPI VarUI1FromUI2(USHORT, _Out_ BYTE*);
353353
HRESULT WINAPI VarUI1FromUI4(ULONG, _Out_ BYTE*);
354354
HRESULT WINAPI VarUI1FromUI8(ULONG64, _Out_ BYTE*);
355-
HRESULT WINAPI VarUI1FromStr(_In_ OLECHAR*, LCID, ULONG, _Out_ BYTE*);
355+
HRESULT WINAPI VarUI1FromStr(_In_ const OLECHAR*, LCID, ULONG, _Out_ BYTE*);
356356
HRESULT WINAPI VarUI1FromCy(CY, _Out_ BYTE*);
357-
HRESULT WINAPI VarUI1FromDec(_In_ DECIMAL*, _Out_ BYTE*);
357+
HRESULT WINAPI VarUI1FromDec(_In_ const DECIMAL*, _Out_ BYTE*);
358358
HRESULT WINAPI VarUI1FromDisp(IDispatch*, LCID, _Out_ BYTE*);
359359

360360
HRESULT WINAPI VarI2FromUI1(BYTE, _Out_ SHORT*);
@@ -368,9 +368,9 @@ HRESULT WINAPI VarI2FromI1(signed char, _Out_ SHORT*);
368368
HRESULT WINAPI VarI2FromUI2(USHORT, _Out_ SHORT*);
369369
HRESULT WINAPI VarI2FromUI4(ULONG, _Out_ SHORT*);
370370
HRESULT WINAPI VarI2FromUI8(ULONG64, _Out_ SHORT*);
371-
HRESULT WINAPI VarI2FromStr(_In_ OLECHAR*, LCID, ULONG, _Out_ SHORT*);
371+
HRESULT WINAPI VarI2FromStr(_In_ const OLECHAR*, LCID, ULONG, _Out_ SHORT*);
372372
HRESULT WINAPI VarI2FromCy(CY,SHORT*);
373-
HRESULT WINAPI VarI2FromDec(_In_ DECIMAL*, _Out_ SHORT*);
373+
HRESULT WINAPI VarI2FromDec(_In_ const DECIMAL*, _Out_ SHORT*);
374374
HRESULT WINAPI VarI2FromDisp(IDispatch*, LCID, _Out_ SHORT*);
375375

376376
HRESULT WINAPI VarI4FromUI1(BYTE, _Out_ LONG*);
@@ -384,9 +384,9 @@ HRESULT WINAPI VarI4FromI1(signed char, _Out_ LONG*);
384384
HRESULT WINAPI VarI4FromUI2(USHORT, _Out_ LONG*);
385385
HRESULT WINAPI VarI4FromUI4(ULONG, _Out_ LONG*);
386386
HRESULT WINAPI VarI4FromUI8(ULONG64, _Out_ LONG*);
387-
HRESULT WINAPI VarI4FromStr(_In_ OLECHAR*, LCID, ULONG, _Out_ LONG*);
387+
HRESULT WINAPI VarI4FromStr(_In_ const OLECHAR*, LCID, ULONG, _Out_ LONG*);
388388
HRESULT WINAPI VarI4FromCy(CY, _Out_ LONG*);
389-
HRESULT WINAPI VarI4FromDec(_In_ DECIMAL*, _Out_ LONG*);
389+
HRESULT WINAPI VarI4FromDec(_In_ const DECIMAL*, _Out_ LONG*);
390390
HRESULT WINAPI VarI4FromDisp(IDispatch*, _In_ LCID, _Out_ LONG*);
391391

392392
HRESULT WINAPI VarI8FromUI1(BYTE, _Out_ LONG64*);
@@ -395,13 +395,13 @@ HRESULT WINAPI VarI8FromI4(LONG,LONG64*);
395395
HRESULT WINAPI VarI8FromR4(FLOAT, _Out_ LONG64*);
396396
HRESULT WINAPI VarI8FromR8(DOUBLE, _Out_ LONG64*);
397397
HRESULT WINAPI VarI8FromDate(DATE, _Out_ LONG64*);
398-
HRESULT WINAPI VarI8FromStr(_In_ OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ LONG64*);
398+
HRESULT WINAPI VarI8FromStr(_In_ const OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ LONG64*);
399399
HRESULT WINAPI VarI8FromBool(VARIANT_BOOL, _Out_ LONG64*);
400400
HRESULT WINAPI VarI8FromI1(signed char, _Out_ LONG64*);
401401
HRESULT WINAPI VarI8FromUI2(USHORT, _Out_ LONG64*);
402402
HRESULT WINAPI VarI8FromUI4(ULONG, _Out_ LONG64*);
403403
HRESULT WINAPI VarI8FromUI8(ULONG64, _Out_ LONG64*);
404-
HRESULT WINAPI VarI8FromDec(_In_ DECIMAL *pdecIn, _Out_ LONG64*);
404+
HRESULT WINAPI VarI8FromDec(_In_ const DECIMAL *pdecIn, _Out_ LONG64*);
405405
HRESULT WINAPI VarI8FromInt(INT intIn,LONG64*);
406406
HRESULT WINAPI VarI8FromCy(_In_ CY, _Out_ LONG64*);
407407
HRESULT WINAPI VarI8FromDisp(IDispatch*, _In_ LCID, _Out_ LONG64*);
@@ -417,9 +417,9 @@ HRESULT WINAPI VarR4FromI1(signed char, _Out_ FLOAT*);
417417
HRESULT WINAPI VarR4FromUI2(USHORT, _Out_ FLOAT*);
418418
HRESULT WINAPI VarR4FromUI4(ULONG, _Out_ FLOAT*);
419419
HRESULT WINAPI VarR4FromUI8(ULONG64, _Out_ FLOAT*);
420-
HRESULT WINAPI VarR4FromStr(_In_ OLECHAR*, LCID, ULONG, _Out_ FLOAT*);
420+
HRESULT WINAPI VarR4FromStr(_In_ const OLECHAR*, LCID, ULONG, _Out_ FLOAT*);
421421
HRESULT WINAPI VarR4FromCy(CY,FLOAT*);
422-
HRESULT WINAPI VarR4FromDec(_In_ DECIMAL*, _Out_ FLOAT*);
422+
HRESULT WINAPI VarR4FromDec(_In_ const DECIMAL*, _Out_ FLOAT*);
423423
HRESULT WINAPI VarR4FromDisp(IDispatch*, LCID, _Out_ FLOAT*);
424424

425425
HRESULT WINAPI VarR8FromUI1(BYTE, _Out_ double*);
@@ -433,7 +433,7 @@ HRESULT WINAPI VarR8FromI1(signed char,double*);
433433
HRESULT WINAPI VarR8FromUI2(USHORT, _Out_ double*);
434434
HRESULT WINAPI VarR8FromUI4(ULONG, _Out_ double*);
435435
HRESULT WINAPI VarR8FromUI8(ULONG64, _Out_ double*);
436-
HRESULT WINAPI VarR8FromStr(_In_ OLECHAR*, LCID, ULONG, _Out_ double*);
436+
HRESULT WINAPI VarR8FromStr(_In_ const OLECHAR*, LCID, ULONG, _Out_ double*);
437437
HRESULT WINAPI VarR8FromCy(CY,double*);
438438
HRESULT WINAPI VarR8FromDec(_In_ const DECIMAL*, _Out_ double*);
439439
HRESULT WINAPI VarR8FromDisp(IDispatch*, LCID, _Out_ double*);
@@ -444,14 +444,14 @@ HRESULT WINAPI VarDateFromI4(LONG, _Out_ DATE*);
444444
HRESULT WINAPI VarDateFromI8(LONG64, _Out_ DATE*);
445445
HRESULT WINAPI VarDateFromR4(FLOAT, _Out_ DATE*);
446446
HRESULT WINAPI VarDateFromR8(DOUBLE, _Out_ DATE*);
447-
HRESULT WINAPI VarDateFromStr(_In_ OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ DATE*);
447+
HRESULT WINAPI VarDateFromStr(_In_ const OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ DATE*);
448448
HRESULT WINAPI VarDateFromI1(signed char, _Out_ DATE*);
449449
HRESULT WINAPI VarDateFromUI2(USHORT, _Out_ DATE*);
450450
HRESULT WINAPI VarDateFromUI4(ULONG, _Out_ DATE*);
451451
HRESULT WINAPI VarDateFromUI8(ULONG64, _Out_ DATE*);
452452
HRESULT WINAPI VarDateFromBool(VARIANT_BOOL, _Out_ DATE*);
453453
HRESULT WINAPI VarDateFromCy(CY, _Out_ DATE*);
454-
HRESULT WINAPI VarDateFromDec(_In_ DECIMAL*, _Out_ DATE*);
454+
HRESULT WINAPI VarDateFromDec(_In_ const DECIMAL*, _Out_ DATE*);
455455
HRESULT WINAPI VarDateFromDisp(IDispatch*, LCID, _Out_ DATE*);
456456

457457
HRESULT WINAPI VarCyFromUI1(BYTE, _Out_ CY*);
@@ -461,13 +461,13 @@ HRESULT WINAPI VarCyFromI8(LONG64, _Out_ CY*);
461461
HRESULT WINAPI VarCyFromR4(FLOAT, _Out_ CY*);
462462
HRESULT WINAPI VarCyFromR8(DOUBLE, _Out_ CY*);
463463
HRESULT WINAPI VarCyFromDate(DATE, _Out_ CY*);
464-
HRESULT WINAPI VarCyFromStr(_In_ OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ CY*);
464+
HRESULT WINAPI VarCyFromStr(_In_ const OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ CY*);
465465
HRESULT WINAPI VarCyFromBool(VARIANT_BOOL, _Out_ CY*);
466466
HRESULT WINAPI VarCyFromI1(signed char, _Out_ CY*);
467467
HRESULT WINAPI VarCyFromUI2(USHORT, _Out_ CY*);
468468
HRESULT WINAPI VarCyFromUI4(ULONG, _Out_ CY*);
469469
HRESULT WINAPI VarCyFromUI8(ULONG64, _Out_ CY*);
470-
HRESULT WINAPI VarCyFromDec(_In_ DECIMAL*, _Out_ CY*);
470+
HRESULT WINAPI VarCyFromDec(_In_ const DECIMAL*, _Out_ CY*);
471471
HRESULT WINAPI VarCyFromDisp(_In_ IDispatch*, LCID, _Out_ CY*);
472472

473473
HRESULT WINAPI VarBstrFromUI1(BYTE, LCID, ULONG, _Out_ BSTR*);
@@ -483,7 +483,7 @@ HRESULT WINAPI VarBstrFromUI2(USHORT, LCID, ULONG, _Out_ BSTR*);
483483
HRESULT WINAPI VarBstrFromUI8(ULONG64, LCID, ULONG, _Out_ BSTR*);
484484
HRESULT WINAPI VarBstrFromUI4(ULONG, LCID, ULONG, _Out_ BSTR*);
485485
HRESULT WINAPI VarBstrFromCy(CY, LCID, ULONG, _Out_ BSTR*);
486-
HRESULT WINAPI VarBstrFromDec(_In_ DECIMAL*, _In_ LCID, _In_ ULONG, _Out_ BSTR*);
486+
HRESULT WINAPI VarBstrFromDec(_In_ const DECIMAL*, _In_ LCID, _In_ ULONG, _Out_ BSTR*);
487487
HRESULT WINAPI VarBstrFromDisp(IDispatch*, LCID, ULONG, _Out_ BSTR*);
488488

489489
HRESULT WINAPI VarBoolFromUI1(BYTE, _Out_ VARIANT_BOOL*);
@@ -493,13 +493,13 @@ HRESULT WINAPI VarBoolFromI8(LONG64, _Out_ VARIANT_BOOL*);
493493
HRESULT WINAPI VarBoolFromR4(FLOAT, _Out_ VARIANT_BOOL*);
494494
HRESULT WINAPI VarBoolFromR8(DOUBLE, _Out_ VARIANT_BOOL*);
495495
HRESULT WINAPI VarBoolFromDate(DATE, _Out_ VARIANT_BOOL*);
496-
HRESULT WINAPI VarBoolFromStr(_In_ OLECHAR*, LCID, ULONG, _Out_ VARIANT_BOOL*);
496+
HRESULT WINAPI VarBoolFromStr(_In_ const OLECHAR*, LCID, ULONG, _Out_ VARIANT_BOOL*);
497497
HRESULT WINAPI VarBoolFromI1(signed char, _Out_ VARIANT_BOOL*);
498498
HRESULT WINAPI VarBoolFromUI2(USHORT, _Out_ VARIANT_BOOL*);
499499
HRESULT WINAPI VarBoolFromUI4(ULONG, _Out_ VARIANT_BOOL*);
500500
HRESULT WINAPI VarBoolFromUI8(ULONG64, _Out_ VARIANT_BOOL*);
501501
HRESULT WINAPI VarBoolFromCy(CY, _Out_ VARIANT_BOOL*);
502-
HRESULT WINAPI VarBoolFromDec(_In_ DECIMAL*, _Out_ VARIANT_BOOL*);
502+
HRESULT WINAPI VarBoolFromDec(_In_ const DECIMAL*, _Out_ VARIANT_BOOL*);
503503
HRESULT WINAPI VarBoolFromDisp(IDispatch*, LCID, _Out_ VARIANT_BOOL*);
504504

505505
HRESULT WINAPI VarI1FromUI1(_In_ BYTE, _Out_ signed char*);
@@ -509,13 +509,13 @@ HRESULT WINAPI VarI1FromI8(_In_ LONG64, _Out_ signed char*);
509509
HRESULT WINAPI VarI1FromR4(_In_ FLOAT, _Out_ signed char*);
510510
HRESULT WINAPI VarI1FromR8(_In_ DOUBLE, _Out_ signed char*);
511511
HRESULT WINAPI VarI1FromDate(_In_ DATE, _Out_ signed char*);
512-
HRESULT WINAPI VarI1FromStr(_In_ OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ signed char*);
512+
HRESULT WINAPI VarI1FromStr(_In_ const OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ signed char*);
513513
HRESULT WINAPI VarI1FromBool(_In_ VARIANT_BOOL, _Out_ signed char*);
514514
HRESULT WINAPI VarI1FromUI2(_In_ USHORT, _Out_ signed char*);
515515
HRESULT WINAPI VarI1FromUI4(_In_ ULONG, _Out_ signed char*);
516516
HRESULT WINAPI VarI1FromUI8(_In_ ULONG64, _Out_ signed char*);
517517
HRESULT WINAPI VarI1FromCy(_In_ CY, _Out_ signed char*);
518-
HRESULT WINAPI VarI1FromDec(_In_ DECIMAL*, _Out_ signed char*);
518+
HRESULT WINAPI VarI1FromDec(_In_ const DECIMAL*, _Out_ signed char*);
519519
HRESULT WINAPI VarI1FromDisp(_In_ IDispatch*, _In_ LCID, _Out_ signed char*);
520520

521521
HRESULT WINAPI VarUI2FromUI1(BYTE, _Out_ USHORT*);
@@ -525,16 +525,16 @@ HRESULT WINAPI VarUI2FromI8(LONG64, _Out_ USHORT*);
525525
HRESULT WINAPI VarUI2FromR4(FLOAT, _Out_ USHORT*);
526526
HRESULT WINAPI VarUI2FromR8(DOUBLE,USHORT*);
527527
HRESULT WINAPI VarUI2FromDate(DATE, _Out_ USHORT*);
528-
HRESULT WINAPI VarUI2FromStr(_In_ OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ USHORT*);
528+
HRESULT WINAPI VarUI2FromStr(_In_ const OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ USHORT*);
529529
HRESULT WINAPI VarUI2FromBool(VARIANT_BOOL, _Out_ USHORT*);
530530
HRESULT WINAPI VarUI2FromI1(signed char, _Out_ USHORT*);
531531
HRESULT WINAPI VarUI2FromUI4(ULONG, _Out_ USHORT*);
532532
HRESULT WINAPI VarUI2FromUI8(ULONG64, _Out_ USHORT*);
533533
HRESULT WINAPI VarUI2FromCy(CY, _Out_ USHORT*);
534-
HRESULT WINAPI VarUI2FromDec(_In_ DECIMAL*, _Out_ USHORT*);
534+
HRESULT WINAPI VarUI2FromDec(_In_ const DECIMAL*, _Out_ USHORT*);
535535
HRESULT WINAPI VarUI2FromDisp(_In_ IDispatch*, LCID, _Out_ USHORT*);
536536

537-
HRESULT WINAPI VarUI4FromStr(_In_ OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ ULONG*);
537+
HRESULT WINAPI VarUI4FromStr(_In_ const OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ ULONG*);
538538
HRESULT WINAPI VarUI4FromUI1(BYTE, _Out_ ULONG*);
539539
HRESULT WINAPI VarUI4FromI2(_In_ SHORT, _Out_ ULONG*);
540540
HRESULT WINAPI VarUI4FromI4(LONG, _Out_ ULONG*);
@@ -547,7 +547,7 @@ HRESULT WINAPI VarUI4FromI1(signed char, _Out_ ULONG*);
547547
HRESULT WINAPI VarUI4FromUI2(USHORT, _Out_ ULONG*);
548548
HRESULT WINAPI VarUI4FromUI8(ULONG64, _Out_ ULONG*);
549549
HRESULT WINAPI VarUI4FromCy(CY, _Out_ ULONG*);
550-
HRESULT WINAPI VarUI4FromDec(_In_ DECIMAL*, _Out_ ULONG*);
550+
HRESULT WINAPI VarUI4FromDec(_In_ const DECIMAL*, _Out_ ULONG*);
551551
HRESULT WINAPI VarUI4FromDisp(_In_ IDispatch*, LCID, _Out_ ULONG*);
552552

553553
HRESULT WINAPI VarUI8FromUI1(BYTE, _Out_ ULONG64*);
@@ -557,12 +557,12 @@ HRESULT WINAPI VarUI8FromI8(LONG64, _Out_ ULONG64*);
557557
HRESULT WINAPI VarUI8FromR4(FLOAT, _Out_ ULONG64*);
558558
HRESULT WINAPI VarUI8FromR8(DOUBLE, _Out_ ULONG64*);
559559
HRESULT WINAPI VarUI8FromDate(DATE, _Out_ ULONG64*);
560-
HRESULT WINAPI VarUI8FromStr(_In_ OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ ULONG64*);
560+
HRESULT WINAPI VarUI8FromStr(_In_ const OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ ULONG64*);
561561
HRESULT WINAPI VarUI8FromBool(VARIANT_BOOL, _Out_ ULONG64*);
562562
HRESULT WINAPI VarUI8FromI1(signed char, _Out_ ULONG64*);
563563
HRESULT WINAPI VarUI8FromUI2(USHORT, _Out_ ULONG64*);
564564
HRESULT WINAPI VarUI8FromUI4(ULONG, _Out_ ULONG64*);
565-
HRESULT WINAPI VarUI8FromDec(_In_ DECIMAL*, _Out_ ULONG64*);
565+
HRESULT WINAPI VarUI8FromDec(_In_ const DECIMAL*, _Out_ ULONG64*);
566566
HRESULT WINAPI VarUI8FromInt(INT,ULONG64*);
567567
HRESULT WINAPI VarUI8FromCy(CY, _Out_ ULONG64*);
568568
HRESULT WINAPI VarUI8FromDisp(_In_ IDispatch*, LCID, _Out_ ULONG64*);
@@ -574,7 +574,7 @@ HRESULT WINAPI VarDecFromI8(LONG64, _Out_ DECIMAL*);
574574
HRESULT WINAPI VarDecFromR4(_In_ FLOAT, _Out_ DECIMAL*);
575575
HRESULT WINAPI VarDecFromR8(_In_ DOUBLE, _Out_ DECIMAL*);
576576
HRESULT WINAPI VarDecFromDate(_In_ DATE, _Out_ DECIMAL*);
577-
HRESULT WINAPI VarDecFromStr(_In_ OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ DECIMAL*);
577+
HRESULT WINAPI VarDecFromStr(_In_ const OLECHAR*, _In_ LCID, _In_ ULONG, _Out_ DECIMAL*);
578578
HRESULT WINAPI VarDecFromBool(_In_ VARIANT_BOOL, _Out_ DECIMAL*);
579579
HRESULT WINAPI VarDecFromI1(_In_ signed char, _Out_ DECIMAL*);
580580
HRESULT WINAPI VarDecFromUI2(_In_ USHORT, _Out_ DECIMAL*);
@@ -766,7 +766,7 @@ _Check_return_
766766
HRESULT
767767
WINAPI
768768
VarParseNumFromStr(
769-
_In_ OLECHAR*,
769+
_In_ const OLECHAR*,
770770
_In_ LCID,
771771
_In_ ULONG,
772772
_Out_ NUMPARSE*,

‎sdk/include/wine/test.h‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -927,6 +927,8 @@ static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_w
927927
#if defined(__oaidl_h__) && defined(V_VT)
928928
extern const char *wine_dbgstr_variant(const VARIANT *var);
929929
static inline const char *debugstr_variant( const VARIANT *v ) { return wine_dbgstr_variant( v ); }
930+
extern const char *wine_dbgstr_vt(VARTYPE vt);
931+
static inline const char *debugstr_vt(VARTYPE vt) { return wine_dbgstr_vt(vt); }
930932
#endif
931933
extern const char * __cdecl __wine_dbg_strdup( const char *str );
932934

@@ -1306,6 +1308,59 @@ const char *wine_dbgstr_longlong( ULONGLONG ll )
13061308
#endif
13071309

13081310
#if defined(__oaidl_h__) && defined(V_VT)
1311+
const char *wine_dbgstr_vt( VARTYPE vt )
1312+
{
1313+
static char buf[400];
1314+
static const char *const variant_types[] =
1315+
{
1316+
"VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE",
1317+
"VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN",
1318+
"VT_DECIMAL","15","VT_I1","VT_UI1","VT_UI2","VT_UI4","VT_I8","VT_UI8",
1319+
"VT_INT","VT_UINT","VT_VOID","VT_HRESULT","VT_PTR","VT_SAFEARRAY",
1320+
"VT_CARRAY","VT_USERDEFINED","VT_LPSTR","VT_LPWSTR","32","33","34","35",
1321+
"VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45",
1322+
"46","47","48","49","50","51","52","53","54","55","56","57","58","59","60",
1323+
"61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE",
1324+
"VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID",
1325+
"VT_VERSIONED_STREAM"
1326+
};
1327+
1328+
static const char *const variant_flags[16] =
1329+
{
1330+
"",
1331+
"|VT_VECTOR",
1332+
"|VT_ARRAY",
1333+
"|VT_VECTOR|VT_ARRAY",
1334+
"|VT_BYREF",
1335+
"|VT_VECTOR|VT_BYREF",
1336+
"|VT_ARRAY|VT_BYREF",
1337+
"|VT_VECTOR|VT_ARRAY|VT_BYREF",
1338+
"|VT_RESERVED",
1339+
"|VT_VECTOR|VT_RESERVED",
1340+
"|VT_ARRAY|VT_RESERVED",
1341+
"|VT_VECTOR|VT_ARRAY|VT_RESERVED",
1342+
"|VT_BYREF|VT_RESERVED",
1343+
"|VT_VECTOR|VT_BYREF|VT_RESERVED",
1344+
"|VT_ARRAY|VT_BYREF|VT_RESERVED",
1345+
"|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED",
1346+
};
1347+
1348+
if (vt & ~VT_TYPEMASK)
1349+
{
1350+
sprintf(buf, "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] );
1351+
return buf;
1352+
}
1353+
1354+
if (vt < sizeof(variant_types)/sizeof(*variant_types))
1355+
return variant_types[vt];
1356+
1357+
if (vt == VT_BSTR_BLOB)
1358+
return "VT_BSTR_BLOB";
1359+
1360+
sprintf(buf, "vt(invalid %x)", vt );
1361+
return buf;
1362+
}
1363+
13091364
const char *wine_dbgstr_variant(const VARIANT *var)
13101365
{
13111366
static char buf[400];

0 commit comments

Comments
 (0)