[PATCH 4/4] strmbase: Build with msvcrt.
Zebediah Figura
zfigura at codeweavers.com
Mon Aug 5 10:25:58 CDT 2019
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
dlls/amstream/Makefile.in | 2 +
dlls/evr/Makefile.in | 2 +
dlls/evr/evr.c | 1 -
dlls/evr/main.c | 2 -
dlls/qedit/Makefile.in | 2 +
dlls/quartz/Makefile.in | 2 +
dlls/quartz/acmwrapper.c | 3 -
dlls/quartz/avidec.c | 3 -
dlls/quartz/avisplit.c | 1 -
dlls/quartz/dsoundrender.c | 3 -
dlls/quartz/enumregfilters.c | 9 ++-
dlls/quartz/filesource.c | 39 ++++++-------
dlls/quartz/filtergraph.c | 12 ++--
dlls/quartz/filtermapper.c | 99 ++++++++++++++++----------------
dlls/quartz/main.c | 4 +-
dlls/quartz/mpegsplit.c | 1 -
dlls/quartz/parser.c | 1 -
dlls/quartz/pin.c | 3 +-
dlls/quartz/quartz_private.h | 1 +
dlls/quartz/regsvr.c | 1 -
dlls/quartz/systemclock.c | 1 -
dlls/quartz/videorenderer.c | 3 -
dlls/quartz/vmr9.c | 3 -
dlls/quartz/waveparser.c | 1 -
dlls/strmbase/Makefile.in | 2 +
dlls/strmbase/strmbase_private.h | 1 -
26 files changed, 90 insertions(+), 112 deletions(-)
diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in
index c00822b2de1..c38b9744e23 100644
--- a/dlls/amstream/Makefile.in
+++ b/dlls/amstream/Makefile.in
@@ -1,6 +1,8 @@
MODULE = amstream.dll
IMPORTS = strmiids strmbase uuid ole32 advapi32 ddraw
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
amstream.c \
audiodata.c \
diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in
index dc7989e8359..053d80e61d7 100644
--- a/dlls/evr/Makefile.in
+++ b/dlls/evr/Makefile.in
@@ -1,6 +1,8 @@
MODULE = evr.dll
IMPORTS = mfuuid strmiids strmbase uuid ole32 oleaut32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
evr.c \
main.c
diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c
index b64b0468acb..655ca79b0d7 100644
--- a/dlls/evr/evr.c
+++ b/dlls/evr/evr.c
@@ -18,7 +18,6 @@
#define COBJMACROS
-#include "config.h"
#include "wine/debug.h"
#include <stdio.h>
diff --git a/dlls/evr/main.c b/dlls/evr/main.c
index ba482073268..000ed7c55be 100644
--- a/dlls/evr/main.c
+++ b/dlls/evr/main.c
@@ -18,8 +18,6 @@
#define COBJMACROS
-#include "config.h"
-
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
index b47ee260ab7..4891328c7a9 100644
--- a/dlls/qedit/Makefile.in
+++ b/dlls/qedit/Makefile.in
@@ -1,6 +1,8 @@
MODULE = qedit.dll
IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
main.c \
mediadet.c \
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 56ca40da1be..3824efbfa98 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -2,6 +2,8 @@ MODULE = quartz.dll
IMPORTLIB = quartz
IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
acmwrapper.c \
avidec.c \
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index d1047a12aa2..c6ff1d7c113 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include "quartz_private.h"
#include "pin.h"
@@ -34,7 +32,6 @@
#include <assert.h>
-#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c
index c207b5f6cd2..cd92b646977 100644
--- a/dlls/quartz/avidec.c
+++ b/dlls/quartz/avidec.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include "quartz_private.h"
#include "pin.h"
@@ -35,7 +33,6 @@
#include <assert.h>
-#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c
index dcaefc528b9..fd67379f2be 100644
--- a/dlls/quartz/avisplit.c
+++ b/dlls/quartz/avisplit.c
@@ -38,7 +38,6 @@
#include "vfwmsgs.h"
#include "amvideo.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
#include <math.h>
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index 930b7a9e345..ae4bdf8239b 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include "quartz_private.h"
#include "pin.h"
@@ -33,7 +31,6 @@
#include "dsound.h"
#include "amaudio.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
diff --git a/dlls/quartz/enumregfilters.c b/dlls/quartz/enumregfilters.c
index a116063268d..42dccf3b625 100644
--- a/dlls/quartz/enumregfilters.c
+++ b/dlls/quartz/enumregfilters.c
@@ -20,7 +20,6 @@
#include "quartz_private.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
@@ -72,7 +71,7 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER* pInRegFilters, const ULONG size
for(i = 0; i < size; i++)
{
pRegFilters[i].Clsid = pInRegFilters[i].Clsid;
- pRegFilters[i].Name = CoTaskMemAlloc((strlenW(pInRegFilters[i].Name)+1)*sizeof(WCHAR));
+ pRegFilters[i].Name = CoTaskMemAlloc((lstrlenW(pInRegFilters[i].Name)+1)*sizeof(WCHAR));
if (!pRegFilters[i].Name)
{
while(i)
@@ -81,7 +80,7 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER* pInRegFilters, const ULONG size
CoTaskMemFree(pEnumRegFilters);
return E_OUTOFMEMORY;
}
- CopyMemory(pRegFilters[i].Name, pInRegFilters[i].Name, (strlenW(pInRegFilters[i].Name)+1)*sizeof(WCHAR));
+ CopyMemory(pRegFilters[i].Name, pInRegFilters[i].Name, (lstrlenW(pInRegFilters[i].Name)+1)*sizeof(WCHAR));
}
pEnumRegFilters->IEnumRegFilters_iface.lpVtbl = &IEnumRegFiltersImpl_Vtbl;
@@ -164,7 +163,7 @@ static HRESULT WINAPI IEnumRegFiltersImpl_Next(IEnumRegFilters * iface, ULONG cF
for(i = 0; i < cFetched; i++)
{
/* The string in the REGFILTER structure must be allocated in the same block as the REGFILTER structure itself */
- ppRegFilter[i] = CoTaskMemAlloc(sizeof(REGFILTER)+(strlenW(This->RegFilters[This->uIndex + i].Name)+1)*sizeof(WCHAR));
+ ppRegFilter[i] = CoTaskMemAlloc(sizeof(REGFILTER)+(lstrlenW(This->RegFilters[This->uIndex + i].Name)+1)*sizeof(WCHAR));
if (!ppRegFilter[i])
{
while(i)
@@ -177,7 +176,7 @@ static HRESULT WINAPI IEnumRegFiltersImpl_Next(IEnumRegFilters * iface, ULONG cF
ppRegFilter[i]->Clsid = This->RegFilters[This->uIndex + i].Clsid;
ppRegFilter[i]->Name = (WCHAR*)((char*)ppRegFilter[i]+sizeof(REGFILTER));
CopyMemory(ppRegFilter[i]->Name, This->RegFilters[This->uIndex + i].Name,
- (strlenW(This->RegFilters[This->uIndex + i].Name)+1)*sizeof(WCHAR));
+ (lstrlenW(This->RegFilters[This->uIndex + i].Name)+1)*sizeof(WCHAR));
}
This->uIndex += cFetched;
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 9ab5d3e3cb6..e66c3fadfaf 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -24,7 +24,6 @@
#include "quartz_private.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
#include "pin.h"
#include "uuids.h"
#include "vfwmsgs.h"
@@ -115,7 +114,7 @@ static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GU
return E_POINTER;
/* Get the part of the name that matters */
- if (!(extension = strrchrW(pszFileName, '.')))
+ if (!(extension = wcsrchr(pszFileName, '.')))
return E_FAIL;
l = RegOpenKeyExW(hkeyExtensions, extension, 0, KEY_READ, &hsub);
@@ -157,7 +156,7 @@ static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GU
static unsigned char byte_from_hex_char(WCHAR wHex)
{
- switch (tolowerW(wHex))
+ switch (towlower(wHex))
{
case '0':
case '1':
@@ -196,14 +195,14 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p
/* format: "offset, bytestocompare, mask, value" */
- ulOffset = strtolW(wszPatternString, NULL, 10);
+ ulOffset = wcstol(wszPatternString, NULL, 10);
- if (!(wszPatternString = strchrW(wszPatternString, ',')))
+ if (!(wszPatternString = wcschr(wszPatternString, ',')))
return E_INVALIDARG;
wszPatternString++; /* skip ',' */
- ulBytes = strtolW(wszPatternString, NULL, 10);
+ ulBytes = wcstol(wszPatternString, NULL, 10);
pbMask = HeapAlloc(GetProcessHeap(), 0, ulBytes);
pbValue = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ulBytes);
@@ -212,15 +211,15 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p
/* default mask is match everything */
memset(pbMask, 0xFF, ulBytes);
- if (!(wszPatternString = strchrW(wszPatternString, ',')))
+ if (!(wszPatternString = wcschr(wszPatternString, ',')))
hr = E_INVALIDARG;
if (hr == S_OK)
{
wszPatternString++; /* skip ',' */
- while (!isxdigitW(*wszPatternString) && (*wszPatternString != ',')) wszPatternString++;
+ while (!iswxdigit(*wszPatternString) && (*wszPatternString != ',')) wszPatternString++;
- for (strpos = 0; isxdigitW(*wszPatternString) && (strpos/2 < ulBytes); wszPatternString++, strpos++)
+ for (strpos = 0; iswxdigit(*wszPatternString) && (strpos/2 < ulBytes); wszPatternString++, strpos++)
{
if ((strpos % 2) == 1) /* odd numbered position */
pbMask[strpos / 2] |= byte_from_hex_char(*wszPatternString);
@@ -228,7 +227,7 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p
pbMask[strpos / 2] = byte_from_hex_char(*wszPatternString) << 4;
}
- if (!(wszPatternString = strchrW(wszPatternString, ',')))
+ if (!(wszPatternString = wcschr(wszPatternString, ',')))
hr = E_INVALIDARG;
else
wszPatternString++; /* skip ',' */
@@ -236,10 +235,10 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p
if (hr == S_OK)
{
- for ( ; !isxdigitW(*wszPatternString) && (*wszPatternString != ','); wszPatternString++)
+ for ( ; !iswxdigit(*wszPatternString) && (*wszPatternString != ','); wszPatternString++)
;
- for (strpos = 0; isxdigitW(*wszPatternString) && (strpos/2 < ulBytes); wszPatternString++, strpos++)
+ for (strpos = 0; iswxdigit(*wszPatternString) && (strpos/2 < ulBytes); wszPatternString++, strpos++)
{
if ((strpos % 2) == 1) /* odd numbered position */
pbValue[strpos / 2] |= byte_from_hex_char(*wszPatternString);
@@ -268,7 +267,7 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p
/* if we encountered no errors with this string, and there is a following tuple, then we
* have to match that as well to succeed */
- if ((hr == S_OK) && (wszPatternString = strchrW(wszPatternString, ',')))
+ if ((hr == S_OK) && (wszPatternString = wcschr(wszPatternString, ',')))
return process_pattern_string(wszPatternString + 1, pReader);
else
return hr;
@@ -310,7 +309,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID *
if (RegOpenKeyExW(hkeyMediaType, wszMajorKeyName, 0, KEY_READ, &hkeyMajor) != ERROR_SUCCESS)
break;
TRACE("%s\n", debugstr_w(wszMajorKeyName));
- if (!strcmpW(wszExtensions, wszMajorKeyName))
+ if (!wcscmp(wszExtensions, wszMajorKeyName))
{
if (process_extensions(hkeyMajor, pszFileName, majorType, minorType, sourceFilter) == S_OK)
bFound = TRUE;
@@ -355,7 +354,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID *
break;
}
- if (strcmpW(wszValueName, source_filter_name)==0) {
+ if (wcscmp(wszValueName, source_filter_name)==0) {
HeapFree(GetProcessHeap(), 0, wszPatternString);
continue;
}
@@ -558,7 +557,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi
/* create pin */
pin_info.dir = PINDIR_OUTPUT;
pin_info.pFilter = &This->filter.IBaseFilter_iface;
- strcpyW(pin_info.achName, wszOutputPinName);
+ lstrcpyW(pin_info.achName, wszOutputPinName);
strmbase_source_init(&This->source, &FileAsyncReaderPin_Vtbl, &pin_info,
&output_BaseOutputFuncTable, &This->filter.csFilter);
BaseFilterImpl_IncrementPinVersion(&This->filter);
@@ -575,8 +574,8 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi
if (This->pmt)
DeleteMediaType(This->pmt);
- This->pszFileName = CoTaskMemAlloc((strlenW(pszFileName) + 1) * sizeof(WCHAR));
- strcpyW(This->pszFileName, pszFileName);
+ This->pszFileName = CoTaskMemAlloc((lstrlenW(pszFileName) + 1) * sizeof(WCHAR));
+ lstrcpyW(This->pszFileName, pszFileName);
This->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE));
if (!pmt)
@@ -606,8 +605,8 @@ static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR
/* copy file name & media type if available, otherwise clear the outputs */
if (This->pszFileName)
{
- *ppszFileName = CoTaskMemAlloc((strlenW(This->pszFileName) + 1) * sizeof(WCHAR));
- strcpyW(*ppszFileName, This->pszFileName);
+ *ppszFileName = CoTaskMemAlloc((lstrlenW(This->pszFileName) + 1) * sizeof(WCHAR));
+ lstrcpyW(*ppszFileName, This->pszFileName);
}
else
*ppszFileName = NULL;
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index c9710f12d1c..a441294b7d4 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
#include <stdarg.h>
#define COBJMACROS
@@ -38,7 +37,6 @@
#include "evcode.h"
#include "wine/heap.h"
#include "wine/list.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
@@ -535,7 +533,7 @@ static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *na
LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry)
{
- if (!strcmpW(filter->name, name))
+ if (!wcscmp(filter->name, name))
return filter->filter;
}
@@ -558,7 +556,7 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter *
if (!pFilter)
return E_POINTER;
- wszFilterName = CoTaskMemAlloc( (pName ? strlenW(pName) + 6 : 5) * sizeof(WCHAR) );
+ wszFilterName = CoTaskMemAlloc( (pName ? lstrlenW(pName) + 6 : 5) * sizeof(WCHAR) );
if (pName && find_filter_by_name(This, pName))
duplicate_name = TRUE;
@@ -573,9 +571,9 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter *
{
/* Create name */
if (pName)
- sprintfW(wszFilterName, wszFmt1, pName, This->nameIndex);
+ swprintf(wszFilterName, pName ? lstrlenW(pName) + 6 : 5, wszFmt1, pName, This->nameIndex);
else
- sprintfW(wszFilterName, wszFmt2, This->nameIndex);
+ swprintf(wszFilterName, pName ? lstrlenW(pName) + 6 : 5, wszFmt2, This->nameIndex);
TRACE("Generated name %s\n", debugstr_w(wszFilterName));
if (This->nameIndex++ == 10000)
@@ -592,7 +590,7 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter *
}
}
else
- memcpy(wszFilterName, pName, (strlenW(pName) + 1) * sizeof(WCHAR));
+ memcpy(wszFilterName, pName, (lstrlenW(pName) + 1) * sizeof(WCHAR));
hr = IBaseFilter_JoinFilterGraph(pFilter, (IFilterGraph *)&This->IFilterGraph2_iface, wszFilterName);
if (FAILED(hr))
diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c
index 1a5f76d9a8f..bb6cc5535d8 100644
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -34,7 +34,6 @@
#include "ole2.h"
#include "olectl.h"
#include "strmif.h"
-#include "wine/unicode.h"
#include "uuids.h"
#include "initguid.h"
#include "wine/fil_data.h"
@@ -278,10 +277,10 @@ static HRESULT WINAPI FilterMapper3_CreateCategory(
if (SUCCEEDED(hr))
{
- strcpyW(wszKeyName, wszClsidSlash);
- strcatW(wszKeyName, wClsidAMCat);
- strcatW(wszKeyName, wszSlashInstance);
- strcatW(wszKeyName, wClsidCategory);
+ lstrcpyW(wszKeyName, wszClsidSlash);
+ lstrcatW(wszKeyName, wClsidAMCat);
+ lstrcatW(wszKeyName, wszSlashInstance);
+ lstrcatW(wszKeyName, wClsidCategory);
lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL);
hr = HRESULT_FROM_WIN32(lRet);
@@ -289,13 +288,13 @@ static HRESULT WINAPI FilterMapper3_CreateCategory(
if (SUCCEEDED(hr))
{
- lRet = RegSetValueExW(hKey, wszFriendlyName, 0, REG_SZ, (const BYTE*)szDescription, (strlenW(szDescription) + 1) * sizeof(WCHAR));
+ lRet = RegSetValueExW(hKey, wszFriendlyName, 0, REG_SZ, (const BYTE*)szDescription, (lstrlenW(szDescription) + 1) * sizeof(WCHAR));
hr = HRESULT_FROM_WIN32(lRet);
}
if (SUCCEEDED(hr))
{
- lRet = RegSetValueExW(hKey, wszClsidName, 0, REG_SZ, (LPBYTE)wClsidCategory, (strlenW(wClsidCategory) + 1) * sizeof(WCHAR));
+ lRet = RegSetValueExW(hKey, wszClsidName, 0, REG_SZ, (LPBYTE)wClsidCategory, (lstrlenW(wClsidCategory) + 1) * sizeof(WCHAR));
hr = HRESULT_FROM_WIN32(lRet);
}
@@ -332,16 +331,16 @@ static HRESULT WINAPI FilterMapper3_UnregisterFilter(
if (SUCCEEDED(hr))
{
- strcpyW(wszKeyName, wszClsidSlash);
- strcatW(wszKeyName, wClsidCategory);
- strcatW(wszKeyName, wszSlashInstance);
+ lstrcpyW(wszKeyName, wszClsidSlash);
+ lstrcatW(wszKeyName, wClsidCategory);
+ lstrcatW(wszKeyName, wszSlashInstance);
if (szInstance)
- strcatW(wszKeyName, szInstance);
+ lstrcatW(wszKeyName, szInstance);
else
{
hr = StringFromCLSID(Filter, &wFilter);
if (SUCCEEDED(hr))
- strcatW(wszKeyName, wFilter);
+ lstrcatW(wszKeyName, wFilter);
}
}
@@ -706,7 +705,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(
nameLen = ARRAY_SIZE(wszDevice) + CHARS_IN_GUID - 1 + 1;
if (szInstance)
- nameLen += strlenW(szInstance);
+ nameLen += lstrlenW(szInstance);
else
nameLen += CHARS_IN_GUID - 1; /* CHARS_IN_GUID includes null terminator */
@@ -714,8 +713,8 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(
if (!pwszParseName)
return E_OUTOFMEMORY;
- strcpyW(pwszParseName, wszDevice);
- pCurrent += strlenW(wszDevice);
+ lstrcpyW(pwszParseName, wszDevice);
+ pCurrent += lstrlenW(wszDevice);
hr = StringFromCLSID(pclsidCategory, &szClsidTemp);
@@ -726,7 +725,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(
pCurrent[0] = '\\';
if (szInstance)
- strcpyW(pCurrent+1, szInstance);
+ lstrcpyW(pCurrent+1, szInstance);
else
{
CoTaskMemFree(szClsidTemp);
@@ -734,7 +733,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(
hr = StringFromCLSID(clsidFilter, &szClsidTemp);
if (SUCCEEDED(hr))
- strcpyW(pCurrent+1, szClsidTemp);
+ lstrcpyW(pCurrent+1, szClsidTemp);
}
}
@@ -1228,7 +1227,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
if (SUCCEEDED(hrSub))
{
- len = (strlenW(V_BSTR(&var))+1) * sizeof(WCHAR);
+ len = (lstrlenW(V_BSTR(&var))+1) * sizeof(WCHAR);
if (!(regfilters[idx].Name = CoTaskMemAlloc(len*2)))
hr = E_OUTOFMEMORY;
}
@@ -1274,8 +1273,8 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c
if (SUCCEEDED(hr))
{
- strcpyW(wszKeyName, wszFilterSlash);
- strcatW(wszKeyName, wszClsid);
+ lstrcpyW(wszKeyName, wszFilterSlash);
+ lstrcatW(wszKeyName, wszClsid);
lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL);
hr = HRESULT_FROM_WIN32(lRet);
@@ -1283,15 +1282,15 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c
if (SUCCEEDED(hr))
{
- lRet = RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE*)szName, (strlenW(szName) + 1) * sizeof(WCHAR));
+ lRet = RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE*)szName, (lstrlenW(szName) + 1) * sizeof(WCHAR));
hr = HRESULT_FROM_WIN32(lRet);
RegCloseKey(hKey);
}
if (SUCCEEDED(hr))
{
- strcpyW(wszKeyName, wszClsidSlash);
- strcatW(wszKeyName, wszClsid);
+ lstrcpyW(wszKeyName, wszClsidSlash);
+ lstrcatW(wszKeyName, wszClsid);
lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL);
hr = HRESULT_FROM_WIN32(lRet);
@@ -1344,8 +1343,8 @@ static HRESULT WINAPI FilterMapper_RegisterPin(
if (SUCCEEDED(hr))
{
- strcpyW(wszKeyName, wszClsidSlash);
- strcatW(wszKeyName, wszClsid);
+ lstrcpyW(wszKeyName, wszClsidSlash);
+ lstrcatW(wszKeyName, wszClsid);
lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey);
hr = HRESULT_FROM_WIN32(lRet);
@@ -1353,16 +1352,16 @@ static HRESULT WINAPI FilterMapper_RegisterPin(
if (SUCCEEDED(hr))
{
- wszPinsKeyName = CoTaskMemAlloc((strlenW(wszPins) + 1 + strlenW(szName) + 1) * 2);
+ wszPinsKeyName = CoTaskMemAlloc((lstrlenW(wszPins) + 1 + lstrlenW(szName) + 1) * 2);
if (!wszPinsKeyName)
hr = E_OUTOFMEMORY;
}
if (SUCCEEDED(hr))
{
- strcpyW(wszPinsKeyName, wszPins);
- strcatW(wszPinsKeyName, wszSlash);
- strcatW(wszPinsKeyName, szName);
+ lstrcpyW(wszPinsKeyName, wszPins);
+ lstrcatW(wszPinsKeyName, wszSlash);
+ lstrcatW(wszPinsKeyName, szName);
lRet = RegCreateKeyExW(hKey, wszPinsKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hPinsKey, NULL);
hr = HRESULT_FROM_WIN32(lRet);
@@ -1446,22 +1445,22 @@ static HRESULT WINAPI FilterMapper_RegisterPinType(
if (SUCCEEDED(hr))
{
- wszTypesKey = CoTaskMemAlloc((strlenW(wszClsidSlash) + strlenW(wszClsid) + strlenW(wszPins) +
- strlenW(szName) + strlenW(wszTypes) + 3 + 1) * 2);
+ wszTypesKey = CoTaskMemAlloc((lstrlenW(wszClsidSlash) + lstrlenW(wszClsid) + lstrlenW(wszPins) +
+ lstrlenW(szName) + lstrlenW(wszTypes) + 3 + 1) * 2);
if (!wszTypesKey)
hr = E_OUTOFMEMORY;
}
if (SUCCEEDED(hr))
{
- strcpyW(wszTypesKey, wszClsidSlash);
- strcatW(wszTypesKey, wszClsid);
- strcatW(wszTypesKey, wszSlash);
- strcatW(wszTypesKey, wszPins);
- strcatW(wszTypesKey, wszSlash);
- strcatW(wszTypesKey, szName);
- strcatW(wszTypesKey, wszSlash);
- strcatW(wszTypesKey, wszTypes);
+ lstrcpyW(wszTypesKey, wszClsidSlash);
+ lstrcatW(wszTypesKey, wszClsid);
+ lstrcatW(wszTypesKey, wszSlash);
+ lstrcatW(wszTypesKey, wszPins);
+ lstrcatW(wszTypesKey, wszSlash);
+ lstrcatW(wszTypesKey, szName);
+ lstrcatW(wszTypesKey, wszSlash);
+ lstrcatW(wszTypesKey, wszTypes);
lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszTypesKey, 0, KEY_WRITE, &hKey);
hr = HRESULT_FROM_WIN32(lRet);
@@ -1472,9 +1471,9 @@ static HRESULT WINAPI FilterMapper_RegisterPinType(
{
HKEY hkeyDummy = NULL;
- strcpyW(wszKeyName, wszClsidMajorType);
- strcatW(wszKeyName, wszSlash);
- strcatW(wszKeyName, wszClsidSubType);
+ lstrcpyW(wszKeyName, wszClsidMajorType);
+ lstrcatW(wszKeyName, wszSlash);
+ lstrcatW(wszKeyName, wszClsidSubType);
lRet = RegCreateKeyExW(hKey, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL);
hr = HRESULT_FROM_WIN32(lRet);
@@ -1517,8 +1516,8 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID
if (SUCCEEDED(hr))
{
- strcpyW(wszKeyName, wszClsidSlash);
- strcatW(wszKeyName, wszClsid);
+ lstrcpyW(wszKeyName, wszClsidSlash);
+ lstrcatW(wszKeyName, wszClsid);
lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey);
if (lRet == ERROR_FILE_NOT_FOUND)
@@ -1572,8 +1571,8 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi
if (SUCCEEDED(hr))
{
- strcpyW(wszKeyName, wszClsidSlash);
- strcatW(wszKeyName, wszClsid);
+ lstrcpyW(wszKeyName, wszClsidSlash);
+ lstrcatW(wszKeyName, wszClsid);
lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey);
hr = HRESULT_FROM_WIN32(lRet);
@@ -1581,16 +1580,16 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi
if (SUCCEEDED(hr))
{
- wszPinNameKey = CoTaskMemAlloc((strlenW(wszPins) + 1 + strlenW(Name) + 1) * 2);
+ wszPinNameKey = CoTaskMemAlloc((lstrlenW(wszPins) + 1 + lstrlenW(Name) + 1) * 2);
if (!wszPinNameKey)
hr = E_OUTOFMEMORY;
}
if (SUCCEEDED(hr))
{
- strcpyW(wszPinNameKey, wszPins);
- strcatW(wszPinNameKey, wszSlash);
- strcatW(wszPinNameKey, Name);
+ lstrcpyW(wszPinNameKey, wszPins);
+ lstrcatW(wszPinNameKey, wszSlash);
+ lstrcatW(wszPinNameKey, Name);
lRet = RegDeleteTreeW(hKey, wszPinNameKey);
hr = HRESULT_FROM_WIN32(lRet);
diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index 282104e19c5..2c7284de13b 100644
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -17,11 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
#include "wine/debug.h"
#include "quartz_private.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
@@ -335,7 +333,7 @@ DWORD WINAPI AMGetErrorTextW(HRESULT hr, LPWSTR buffer, DWORD maxlen)
if (!buffer) return 0;
wsprintfW(error, format, hr);
- if ((len = strlenW(error)) >= maxlen) return 0;
+ if ((len = lstrlenW(error)) >= maxlen) return 0;
lstrcpyW(buffer, error);
return len;
}
diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c
index 3bfff9f7b44..5e5a88e4612 100644
--- a/dlls/quartz/mpegsplit.c
+++ b/dlls/quartz/mpegsplit.c
@@ -33,7 +33,6 @@
#include "winternl.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
#include "parser.h"
diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c
index ca3a94f1740..3c0f4d55f4c 100644
--- a/dlls/quartz/parser.c
+++ b/dlls/quartz/parser.c
@@ -25,7 +25,6 @@
#include "vfwmsgs.h"
#include "amvideo.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
#include <math.h>
diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c
index 03ca4e6edea..2930311e2ec 100644
--- a/dlls/quartz/pin.c
+++ b/dlls/quartz/pin.c
@@ -22,7 +22,6 @@
#include "pin.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
#include "uuids.h"
#include "vfwmsgs.h"
#include <assert.h>
@@ -177,7 +176,7 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO *info,
pPinImpl->pin.pConnectedTo = NULL;
pPinImpl->pin.pCritSec = pCritSec;
/* avoid copying uninitialized data */
- strcpyW(pPinImpl->pin.pinInfo.achName, info->achName);
+ wcscpy(pPinImpl->pin.pinInfo.achName, info->achName);
pPinImpl->pin.pinInfo.dir = info->dir;
pPinImpl->pin.pinInfo.pFilter = info->pFilter;
ZeroMemory(&pPinImpl->pin.mtCurrent, sizeof(AM_MEDIA_TYPE));
diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h
index 8d4b6a3c870..a5157b12565 100644
--- a/dlls/quartz/quartz_private.h
+++ b/dlls/quartz/quartz_private.h
@@ -21,6 +21,7 @@
#define __QUARTZ_PRIVATE_INCLUDED__
#include <stdarg.h>
+#include <wchar.h>
#define COBJMACROS
diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c
index 7773caa947d..44b2f60d138 100644
--- a/dlls/quartz/regsvr.c
+++ b/dlls/quartz/regsvr.c
@@ -36,7 +36,6 @@
#include "strmif.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c
index 2b75c8da89e..652008cd01f 100644
--- a/dlls/quartz/systemclock.c
+++ b/dlls/quartz/systemclock.c
@@ -21,7 +21,6 @@
#include "quartz_private.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
#include <assert.h>
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index 37c30baa6a5..d541cca6c41 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include "quartz_private.h"
#include "pin.h"
@@ -35,7 +33,6 @@
#include "dvdmedia.h"
#include <assert.h>
-#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index f210d2cfb9a..dd060e1466c 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include "quartz_private.h"
#include "uuids.h"
@@ -38,7 +36,6 @@
#include "vmr9.h"
#include "pin.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c
index 0ab2388da45..149e69cdb61 100644
--- a/dlls/quartz/waveparser.c
+++ b/dlls/quartz/waveparser.c
@@ -26,7 +26,6 @@
#include "vfwmsgs.h"
#include "mmsystem.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
#include <math.h>
diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in
index c58a3591739..d22e986b9a0 100644
--- a/dlls/strmbase/Makefile.in
+++ b/dlls/strmbase/Makefile.in
@@ -1,5 +1,7 @@
MODULE = libstrmbase.a
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
dispatch.c \
dllfunc.c \
diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h
index 439ab9aefaf..06fbe62a425 100644
--- a/dlls/strmbase/strmbase_private.h
+++ b/dlls/strmbase/strmbase_private.h
@@ -31,7 +31,6 @@
#include "wine/heap.h"
#include "wine/list.h"
#include "wine/strmbase.h"
-#include "wine/unicode.h"
/* Quality Control */
typedef struct QualityControlImpl {
--
2.20.1
More information about the wine-devel
mailing list