Michael Stefaniuc : wineqtdecoder: Use the ARRAY_SIZE() macro.
Alexandre Julliard
julliard at winehq.org
Tue Nov 6 15:10:06 CST 2018
Module: wine
Branch: master
Commit: 9629769fe7a6fee0e5adaafad3545516ef478461
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9629769fe7a6fee0e5adaafad3545516ef478461
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Tue Nov 6 21:01:07 2018 +0100
wineqtdecoder: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 c7dd76c..ac9268d 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 bfbeab9..c88b354 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 2b9ec88..c0a9b93 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;
More information about the wine-cvs
mailing list