Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- dlls/dmloader/loader.c | 8 ++++---- dlls/dmloader/tests/loader.c | 23 +++++++++++------------ 2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index a267d2d6b2..66c0f92b1b 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -609,7 +609,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoad static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 *iface, REFGUID rguidClass, WCHAR *pwzFileExtension, WCHAR *pwzScanFileName) { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - static const WCHAR wszAny[] = {'*',0}; WIN32_FIND_DATAW FileData; HANDLE hSearch; WCHAR wszSearchString[MAX_PATH]; @@ -631,11 +630,12 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * p = wszSearchString + lstrlenW(wszSearchString); if (p > wszSearchString && p[-1] != '\') *p++ = '\'; *p++ = '*'; /* any file */ - if (lstrcmpW (pwzFileExtension, wszAny)) *p++ = '.'; /* if we have actual extension, put a dot */ + if (lstrcmpW (pwzFileExtension, L"*")) + *p++ = '.'; /* if we have actual extension, put a dot */ lstrcpyW (p, pwzFileExtension); - + TRACE(": search string: %s\n", debugstr_w(wszSearchString)); - + hSearch = FindFirstFileW (wszSearchString, &FileData); if (hSearch == INVALID_HANDLE_VALUE) { TRACE(": no files found\n"); diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 0ab2e9eaba..bd6797f135 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -48,23 +48,22 @@ static void test_directory(void) { IDirectMusicLoader8 *loader = NULL; HRESULT hr; - WCHAR con[] = {'c', 'o', 'n', 0}; WCHAR path[MAX_PATH]; - WCHAR empty[] = {0}; - WCHAR invalid_path[] = {'/', 'i', 'n', 'v', 'a', 'l', 'i', 'd', ' ', 'p', 'a', 't', 'h', 0};
hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); ok(hr == S_OK, "Couldn't create Loader %#x\n", hr);
/* ScanDirectory without a previous SetSearchDirectory isn't failing */ - hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, con, NULL); + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, + (WCHAR *)L"con", NULL); ok(hr == S_FALSE, "ScanDirectory for "con" files failed with %#x\n", hr);
/* SetSearchDirectory with invalid path */ hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, NULL, 0); ok(hr == E_POINTER, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, invalid_path, 0); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, + (WCHAR *)L"/invalid path", 0); ok(hr == DMUS_E_LOADER_BADPATH, "SetSearchDirectory failed with %#x\n", hr);
/* SetSearchDirectory with the current directory */ @@ -88,7 +87,7 @@ static void test_directory(void) IDirectMusicLoader_SetSearchDirectory(loader, NULL, path, 0); /* Crashes on Windows */ hr = IDirectMusicLoader_SetSearchDirectory(loader, &IID_IDirectMusicLoader8, path, 0); ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_ScanDirectory(loader, &GUID_DirectMusicAllTypes, con, NULL); + hr = IDirectMusicLoader_ScanDirectory(loader, &GUID_DirectMusicAllTypes, (WCHAR *)L"con", NULL); ok(hr == REGDB_E_CLASSNOTREG, "ScanDirectory failed, received %#x\n", hr);
/* NULL extension is not an error */ @@ -101,11 +100,12 @@ static void test_directory(void) hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); ok(hr == S_OK, "Couldn't create Loader %#x\n", hr); - hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, empty, 0); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, (WCHAR *)L"", 0); ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, empty, 0); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, (WCHAR *)L"", 0); ok(hr == S_FALSE, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, con, NULL); + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, + (WCHAR *)L"con", NULL); ok(hr == S_FALSE, "ScanDirectory for "con" files failed with %#x\n", hr); IDirectMusicLoader_Release(loader); } @@ -477,7 +477,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc; HRESULT hr; DWORD valid; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -562,7 +561,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);
@@ -596,7 +595,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);