Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- Not compile tested as it is MacOSX only.
dlls/wineqtdecoder/main.c | 2 +- dlls/wineqtdecoder/qtdatahandler.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index c7dd76c554..ac9268d70f 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -141,7 +141,7 @@ FactoryTemplate const g_Templates[] = { } };
-int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]); +int g_cTemplates = ARRAY_SIZE(g_Templates); static HINSTANCE hInst = NULL;
/*********************************************************************** diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index bfbeab9276..c88b354e0b 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -361,7 +361,7 @@ static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str) int i; IAsyncReader_SyncRead(data->dataRef.pReader, 0, 8, header);
- for (i=0; i < sizeof(stream_sigs)/sizeof(signature); i++) + for (i = 0; i < ARRAY_SIZE(stream_sigs); i++) if (memcmp(header, stream_sigs[i].sig, stream_sigs[i].sig_length)==0) { str[0] = strlen(stream_sigs[i].fname); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 2b9ec88ef3..c0a9b93a47 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -277,7 +277,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; piInput->pFilter = &This->filter.IBaseFilter_iface; - lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); + lstrcpynW(piInput->achName, wcsInputPinName, ARRAY_SIZE(piInput->achName)); This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL;