system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 20:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

strmbase: Build with msvcrt.

Browse source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-08-05 10:25:58 -05:00 committed by Alexandre Julliard
parent 0e55edaac5
commit fb504baaa8
26 changed files with 91 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/amstream/Makefile.in
View file

@ -1,6 +1,8 @@
MODULE = amstream.dll
IMPORTS = strmiids strmbase uuid ole32 advapi32 ddraw
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
amstream.c \
audiodata.c \

2
dlls/evr/Makefile.in
View file

@ -1,6 +1,8 @@
MODULE = evr.dll
IMPORTS = mfuuid strmiids strmbase uuid ole32 oleaut32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
evr.c \
main.c

1
dlls/evr/evr.c
View file

@ -18,7 +18,6 @@
#define COBJMACROS
#include "config.h"
#include "wine/debug.h"
#include <stdio.h>

2
dlls/evr/main.c
View file

@ -18,8 +18,6 @@
#define COBJMACROS
#include "config.h"
#include <stdarg.h>
#include "windef.h"

2
dlls/qedit/Makefile.in
View file

@ -1,6 +1,8 @@
MODULE = qedit.dll
IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
main.c \
mediadet.c \

2
dlls/quartz/Makefile.in
View file

@ -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 \

3
dlls/quartz/acmwrapper.c
View file

@ -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);

3
dlls/quartz/avidec.c
View file

@ -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);

1
dlls/quartz/avisplit.c
View file

@ -38,7 +38,6 @@
#include "vfwmsgs.h"
#include "amvideo.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include <math.h>

3
dlls/quartz/dsoundrender.c
View file

@ -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);

9
dlls/quartz/enumregfilters.c
View file

@ -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;

39
dlls/quartz/filesource.c
View file

@ -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;

12
dlls/quartz/filtergraph.c
View file

@ -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))

101
dlls/quartz/filtermapper.c
View file

@ -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);
}
}
@ -853,7 +852,7 @@ static BOOL MatchTypes(
}
/* internal helper function for qsort of MONIKER_MERIT array */
static int mm_compare(const void * left, const void * right)
static int __cdecl mm_compare(const void * left, const void * right)
{
const struct MONIKER_MERIT * mmLeft = left;
const struct MONIKER_MERIT * mmRight = right;
@ -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);

4
dlls/quartz/main.c
View file

@ -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;
}

1
dlls/quartz/mpegsplit.c
View file

@ -33,7 +33,6 @@
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include "parser.h"

1
dlls/quartz/parser.c
View file

@ -25,7 +25,6 @@
#include "vfwmsgs.h"
#include "amvideo.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include <math.h>

3
dlls/quartz/pin.c
View file

@ -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));

1
dlls/quartz/quartz_private.h
View file

@ -21,6 +21,7 @@
#define __QUARTZ_PRIVATE_INCLUDED__
#include <stdarg.h>
#include <wchar.h>
#define COBJMACROS

1
dlls/quartz/regsvr.c
View file

@ -36,7 +36,6 @@
#include "strmif.h"
#include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(quartz);

1
dlls/quartz/systemclock.c
View file

@ -21,7 +21,6 @@
#include "quartz_private.h"
#include "wine/debug.h"
#include "wine/unicode.h"
#include <assert.h>
WINE_DEFAULT_DEBUG_CHANNEL(quartz);

3
dlls/quartz/videorenderer.c
View file

@ -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);

3
dlls/quartz/vmr9.c
View file

@ -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);

1
dlls/quartz/waveparser.c
View file

@ -26,7 +26,6 @@
#include "vfwmsgs.h"
#include "mmsystem.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include <math.h>

2
dlls/strmbase/Makefile.in
View file

@ -1,5 +1,7 @@
MODULE = libstrmbase.a
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
dispatch.c \
dllfunc.c \

1
dlls/strmbase/strmbase_private.h
View file

@ -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 {