marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

strmbase: Avoid using wine/unicode.h. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Alexandre Julliard 2019-05-03 12:32:45 +02:00
parent 0844e4473c
commit 71e7e73fc0
10 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/strmbase/audio.c
View File

@ -24,7 +24,6 @@
#include "dshow.h" #include "dshow.h"
#include "uuids.h" #include "uuids.h"
#include "vfwmsgs.h" #include "vfwmsgs.h"
#include "wine/unicode.h"
#include "wine/strmbase.h" #include "wine/strmbase.h"

1
dlls/strmbase/dispatch.c
View File

@ -21,7 +21,6 @@
#define COBJMACROS #define COBJMACROS
#include "dshow.h" #include "dshow.h"
#include "wine/unicode.h"
#include "wine/strmbase.h" #include "wine/strmbase.h"
#include "uuids.h" #include "uuids.h"
#include "vfwmsgs.h" #include "vfwmsgs.h"

2
dlls/strmbase/dllfunc.c
View File

@ -18,7 +18,6 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include <stdarg.h> #include <stdarg.h>
#include <assert.h> #include <assert.h>
@ -36,7 +35,6 @@
#include "uuids.h" #include "uuids.h"
#include "strmif.h" #include "strmif.h"
#include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/strmbase.h" #include "wine/strmbase.h"

7
dlls/strmbase/filter.c
View File

@ -22,7 +22,6 @@
#include "dshow.h" #include "dshow.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "wine/strmbase.h" #include "wine/strmbase.h"
#include "uuids.h" #include "uuids.h"
#include <assert.h> #include <assert.h>
@ -162,7 +161,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin
} }
if (info.pFilter) IBaseFilter_Release(info.pFilter); if (info.pFilter) IBaseFilter_Release(info.pFilter);
if (!strcmpW(id, info.achName)) if (!lstrcmpW(id, info.achName))
{ {
*ret = pin; *ret = pin;
return S_OK; return S_OK;
@ -179,7 +178,7 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *
BaseFilter *This = impl_from_IBaseFilter(iface); BaseFilter *This = impl_from_IBaseFilter(iface);
TRACE("(%p)->(%p)\n", This, pInfo); TRACE("(%p)->(%p)\n", This, pInfo);
strcpyW(pInfo->achName, This->filterInfo.achName); lstrcpyW(pInfo->achName, This->filterInfo.achName);
pInfo->pGraph = This->filterInfo.pGraph; pInfo->pGraph = This->filterInfo.pGraph;
if (pInfo->pGraph) if (pInfo->pGraph)
@ -197,7 +196,7 @@ HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph
EnterCriticalSection(&This->csFilter); EnterCriticalSection(&This->csFilter);
{ {
if (pName) if (pName)
strcpyW(This->filterInfo.achName, pName); lstrcpyW(This->filterInfo.achName, pName);
else else
*This->filterInfo.achName = '\0'; *This->filterInfo.achName = '\0';
This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */

1
dlls/strmbase/outputqueue.c
View File

@ -22,7 +22,6 @@
#include "dshow.h" #include "dshow.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "wine/list.h" #include "wine/list.h"
#include "wine/strmbase.h" #include "wine/strmbase.h"
#include "uuids.h" #include "uuids.h"

7
dlls/strmbase/pin.c
View File

@ -23,7 +23,6 @@
#include "dshow.h" #include "dshow.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "wine/strmbase.h" #include "wine/strmbase.h"
#include "uuids.h" #include "uuids.h"
#include "vfwmsgs.h" #include "vfwmsgs.h"
@ -146,7 +145,7 @@ out:
static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc)
{ {
/* avoid copying uninitialized data */ /* avoid copying uninitialized data */
strcpyW(pDest->achName, pSrc->achName); lstrcpyW(pDest->achName, pSrc->achName);
pDest->dir = pSrc->dir; pDest->dir = pSrc->dir;
pDest->pFilter = pSrc->pFilter; pDest->pFilter = pSrc->pFilter;
} }
@ -296,11 +295,11 @@ HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * Id)
TRACE("(%p)->(%p)\n", This, Id); TRACE("(%p)->(%p)\n", This, Id);
*Id = CoTaskMemAlloc((strlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); *Id = CoTaskMemAlloc((lstrlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR));
if (!*Id) if (!*Id)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
strcpyW(*Id, This->pinInfo.achName); lstrcpyW(*Id, This->pinInfo.achName);
return S_OK; return S_OK;
} }

1
dlls/strmbase/renderer.c
View File

@ -22,7 +22,6 @@
#include "dshow.h" #include "dshow.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "wine/strmbase.h" #include "wine/strmbase.h"
#include "uuids.h" #include "uuids.h"
#include "vfwmsgs.h" #include "vfwmsgs.h"

3
dlls/strmbase/transform.c
View File

@ -18,7 +18,7 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS
@ -32,7 +32,6 @@
#include <assert.h> #include <assert.h>
#include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/strmbase.h" #include "wine/strmbase.h"
#include "strmbase_private.h" #include "strmbase_private.h"

1
dlls/strmbase/video.c
View File

@ -25,7 +25,6 @@
#include "uuids.h" #include "uuids.h"
#include "vfwmsgs.h" #include "vfwmsgs.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "wine/strmbase.h" #include "wine/strmbase.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase); WINE_DEFAULT_DEBUG_CHANNEL(strmbase);

1
dlls/strmbase/window.c
View File

@ -22,7 +22,6 @@
#include "dshow.h" #include "dshow.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "wine/strmbase.h" #include "wine/strmbase.h"
#include "uuids.h" #include "uuids.h"
#include "vfwmsgs.h" #include "vfwmsgs.h"