Module: wine Branch: master Commit: 71e7e73fc092b3594dde0fe3b99ae0552c626013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71e7e73fc092b3594dde0fe3b...
Author: Alexandre Julliard julliard@winehq.org Date: Fri May 3 12:32:45 2019 +0200
strmbase: Avoid using wine/unicode.h.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/strmbase/audio.c | 1 - dlls/strmbase/dispatch.c | 1 - dlls/strmbase/dllfunc.c | 2 -- dlls/strmbase/filter.c | 7 +++---- dlls/strmbase/outputqueue.c | 1 - dlls/strmbase/pin.c | 7 +++---- dlls/strmbase/renderer.c | 1 - dlls/strmbase/transform.c | 3 +-- dlls/strmbase/video.c | 1 - dlls/strmbase/window.c | 1 - 10 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c index 1b79ec5..260e5ed 100644 --- a/dlls/strmbase/audio.c +++ b/dlls/strmbase/audio.c @@ -24,7 +24,6 @@ #include "dshow.h" #include "uuids.h" #include "vfwmsgs.h" -#include "wine/unicode.h" #include "wine/strmbase.h"
diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 62bc397..6976185 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -21,7 +21,6 @@ #define COBJMACROS
#include "dshow.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 195a409..da4f450 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h"
#include <stdarg.h> #include <assert.h> @@ -36,7 +35,6 @@ #include "uuids.h" #include "strmif.h"
-#include "wine/unicode.h" #include "wine/debug.h" #include "wine/strmbase.h"
diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 9b14cf0..f133f1c 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -22,7 +22,6 @@
#include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.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 (!strcmpW(id, info.achName)) + if (!lstrcmpW(id, info.achName)) { *ret = pin; return S_OK; @@ -179,7 +178,7 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO * BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, pInfo);
- strcpyW(pInfo->achName, This->filterInfo.achName); + lstrcpyW(pInfo->achName, This->filterInfo.achName); pInfo->pGraph = This->filterInfo.pGraph;
if (pInfo->pGraph) @@ -197,7 +196,7 @@ HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph EnterCriticalSection(&This->csFilter); { if (pName) - strcpyW(This->filterInfo.achName, pName); + lstrcpyW(This->filterInfo.achName, pName); else *This->filterInfo.achName = '\0'; This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 5513193..ba61c1f 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -22,7 +22,6 @@
#include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "wine/strmbase.h" #include "uuids.h" diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index a100ae1..3075207 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -23,7 +23,6 @@
#include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" @@ -146,7 +145,7 @@ out: static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) { /* avoid copying uninitialized data */ - strcpyW(pDest->achName, pSrc->achName); + lstrcpyW(pDest->achName, pSrc->achName); pDest->dir = pSrc->dir; pDest->pFilter = pSrc->pFilter; } @@ -296,11 +295,11 @@ HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * 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) return E_OUTOFMEMORY;
- strcpyW(*Id, This->pinInfo.achName); + lstrcpyW(*Id, This->pinInfo.achName);
return S_OK; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 499bc2b..4e24ce1 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -22,7 +22,6 @@
#include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index c62e49a..d741e92 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" + #include <stdarg.h>
#define COBJMACROS @@ -32,7 +32,6 @@
#include <assert.h>
-#include "wine/unicode.h" #include "wine/debug.h" #include "wine/strmbase.h" #include "strmbase_private.h" diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index a03ba55..f536641 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -25,7 +25,6 @@ #include "uuids.h" #include "vfwmsgs.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index b08608e..64e9bc1 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -22,7 +22,6 @@
#include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h"