[PATCH v3 1/4] winmm: Always allocate at least MAX_PATH bytes in mmioOpenW().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/winmm/mmio.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index 48bbd3ed48d..cb3175c5cd7 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -734,6 +734,7 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo,
     if (szFileName)
     {
         INT     len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL );
+        if (len < MAX_PATH) len = MAX_PATH;
         szFn = HeapAlloc( GetProcessHeap(), 0, len );
         if (!szFn) return NULL;
         WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL );

[PATCH v3 2/4] winmm/tests: Test the mmioOpen() search path with various flags.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c
index e3984fbaf3a..0236855f246 100644
--- a/dlls/winmm/tests/mmio.c
+++ b/dlls/winmm/tests/mmio.c
@@ -478,23 +478,34 @@ static void test_mmioOpen_create(void)
     WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH];
     /* According to docs, filename must be no more than 128 bytes, but it will
      * actually allow longer than that. */
-    WCHAR filename[] = L"very_long_filename_"
+    WCHAR long_filename[] = L"very_long_filename_"
         L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
         L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
         L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+    WCHAR buffer[MAX_PATH], expect[MAX_PATH];
+    char exedir_filename[MAX_PATH];
+    MMIOINFO info = {0};
+    BOOL ret;
+    FILE *f;
+
+    GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename));
+    strcpy(strrchr(exedir_filename, '\') + 1, "test_mmio_path");
+    f = fopen(exedir_filename, "w");
+    ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno));
+    fclose(f);

GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd);
     GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir);
     SetCurrentDirectoryW(temp_dir);

-    DeleteFileW(filename);
+    DeleteFileW(long_filename);

/* open with MMIO_DENYNONE */
-    hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE);
+    hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE);
     ok(hmmio != NULL, "mmioOpen failed\n");

/* MMIO_DENYNONE lets us open it here, too */
-    handle = CreateFileW(filename, GENERIC_READ,
+    handle = CreateFileW(long_filename, GENERIC_READ,
             FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL,
             OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n");
@@ -502,14 +513,14 @@ static void test_mmioOpen_create(void)

mmioClose(hmmio, 0);

-    DeleteFileW(filename);
+    DeleteFileW(long_filename);

/* open with MMIO_EXCLUSIVE */
-    hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE);
+    hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE);
     ok(hmmio != NULL, "mmioOpen failed\n");

/* should fail due to MMIO_EXCLUSIVE */
-    handle = CreateFileW(filename, GENERIC_READ,
+    handle = CreateFileW(long_filename, GENERIC_READ,
             FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL,
             OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n");
@@ -518,9 +529,42 @@ static void test_mmioOpen_create(void)

mmioClose(hmmio, 0);

-    DeleteFileW(filename);
+    DeleteFileW(long_filename);
+
+    wcscpy(buffer, L"test_mmio_path");
+    hmmio = mmioOpenW(buffer, &info, MMIO_WRITE);
+    todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);
+    mmioClose(hmmio, 0);
+
+    wcscpy(buffer, L"test_mmio_path");
+    hmmio = mmioOpenW(buffer, &info, MMIO_PARSE);
+    ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet);
+    wcscpy(expect, temp_dir);
+    wcscat(expect, L"test_mmio_path");
+    todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer));
+
+    wcscpy(buffer, L"test_mmio_path");
+    info.wErrorRet = 0xdead;
+    hmmio = mmioOpenW(buffer, &info, MMIO_EXIST);
+    ok(hmmio == (HMMIO)FALSE, "file should exist\n");
+    todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet);
+
+    ret = DeleteFileA("test_mmio_path");
+    ok(!ret, "expected failure\n");
+    ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError());
+
+    wcscpy(buffer, L"test_mmio_path");
+    hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE);
+    ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);
+    mmioClose(hmmio, 0);
+
+    ret = DeleteFileA("test_mmio_path");
+    ok(ret, "got error %u\n", GetLastError());

SetCurrentDirectoryW(cwd);
+
+    ret = DeleteFileA(exedir_filename);
+    ok(ret, "got error %u\n", GetLastError());
 }

static void test_mmioSetBuffer(char *fname)

[PATCH v3 2/4] winmm/tests: Test the mmioOpen() search path with various flags.

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Thu, Dec 17, 2020 at 04:40:49PM -0600, Zebediah Figura wrote:
> Signed-off-by: Zebediah Figura
>
> dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------
>  1 file changed, 52 insertions(+), 8 deletions(-)
>
> diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c
> index e3984fbaf3a..0236855f246 100644
> --- a/dlls/winmm/tests/mmio.c
> +++ b/dlls/winmm/tests/mmio.c
> @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void)
>      WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH];
>      /* According to docs, filename must be no more than 128 bytes, but it will
>       * actually allow longer than that. */
> - WCHAR filename[] = L"very_long_filename_"
> -
>
> WCHAR long_filename[] = L"very_long_filename_"
>     L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
>     L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
>     L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
> -
>
> WCHAR buffer[MAX_PATH], expect[MAX_PATH];
> -
>
> char exedir_filename[MAX_PATH];
> -
>
> MMIOINFO info = {0};
> -
>
> BOOL ret;
> -
>
> FILE *f;
> -
> -
>
> GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename));
> -
>
> strcpy(strrchr(exedir_filename, '\') + 1, "test_mmio_path");
> -
>
> f = fopen(exedir_filename, "w");
> -
>
> ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno));
> -
>
> fclose(f);
>
> GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd);
> GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir);
> SetCurrentDirectoryW(temp_dir);
> - DeleteFileW(filename);
> -
>
> DeleteFileW(long_filename);
>
> /* open with MMIO_DENYNONE */
> - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE);
> -
>
> hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE);
> ok(hmmio != NULL, "mmioOpen failed\n");
>
> /* MMIO_DENYNONE lets us open it here, too */
> - handle = CreateFileW(filename, GENERIC_READ,
> - handle = CreateFileW(long_filename, GENERIC_READ,
>         FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL,
>         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
> ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n");
>
> @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void)
>  mmioClose(hmmio, 0);
>
> - DeleteFileW(filename);
> -
>
> DeleteFileW(long_filename);
>
> /* open with MMIO_EXCLUSIVE */
> - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE);
> -
>
> hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE);
> ok(hmmio != NULL, "mmioOpen failed\n");
>
> /* should fail due to MMIO_EXCLUSIVE */
> - handle = CreateFileW(filename, GENERIC_READ,
> - handle = CreateFileW(long_filename, GENERIC_READ,
>         FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL,
>         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
> ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n");
>
> @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void)
>  mmioClose(hmmio, 0);
>
> - DeleteFileW(filename);
> -
>
> DeleteFileW(long_filename);
> -
> -
>
> wcscpy(buffer, L"test_mmio_path");
> -
>
> hmmio = mmioOpenW(buffer, &info, MMIO_WRITE);
> -
>
> todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);
> -
>
> mmioClose(hmmio, 0);
> -
> -
>
> wcscpy(buffer, L"test_mmio_path");
> -
>
> hmmio = mmioOpenW(buffer, &info, MMIO_PARSE);
> -
>
> ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet);
> -
>
> wcscpy(expect, temp_dir);
> -
>
> wcscat(expect, L"test_mmio_path");
> -
>
> todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer));
> -
> -
>
> wcscpy(buffer, L"test_mmio_path");
> -
>
> info.wErrorRet = 0xdead;
> -
>
> hmmio = mmioOpenW(buffer, &info, MMIO_EXIST);
> -
>
> ok(hmmio == (HMMIO)FALSE, "file should exist\n");
> -
>
> todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet);
> -
> -
>
> ret = DeleteFileA("test_mmio_path");
> -
>
> ok(!ret, "expected failure\n");
> -
>
> ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError());
> -
> -
>
> wcscpy(buffer, L"test_mmio_path");
> -
>
> hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE);
> -
>
> ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);
> -
>
> mmioClose(hmmio, 0);
> -
> -
>
> ret = DeleteFileA("test_mmio_path");
> -
>
> ok(ret, "got error %u\n", GetLastError());
>
> SetCurrentDirectoryW(cwd);
> -
> -
>
> ret = DeleteFileA(exedir_filename);
> -
>
> ok(ret, "got error %u\n", GetLastError());
>
> }
> static void test_mmioSetBuffer(char *fname)
>
> 2.29.2

[PATCH v3 3/4] winmm/tests: Add some tests for MMIO_PARSE with long file names.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/winmm/tests/mmio.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c
index 0236855f246..c9ceda24f3f 100644
--- a/dlls/winmm/tests/mmio.c
+++ b/dlls/winmm/tests/mmio.c
@@ -483,7 +483,7 @@ static void test_mmioOpen_create(void)
         L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
         L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
     WCHAR buffer[MAX_PATH], expect[MAX_PATH];
-    char exedir_filename[MAX_PATH];
+    char exedir_filename[MAX_PATH], bufferA[MAX_PATH], expectA[MAX_PATH];
     MMIOINFO info = {0};
     BOOL ret;
     FILE *f;
@@ -531,6 +531,24 @@ static void test_mmioOpen_create(void)

DeleteFileW(long_filename);

+    wcscpy(buffer, long_filename);
+    info.wErrorRet = 0xdead;
+    hmmio = mmioOpenW(buffer, &info, MMIO_PARSE);
+    todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet);
+    todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet);
+    wcscpy(expect, temp_dir);
+    wcscat(expect, long_filename);
+    expect[127] = 0;
+    todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer));
+
+    WideCharToMultiByte(CP_ACP, 0, long_filename, -1, bufferA, sizeof(bufferA), NULL, NULL);
+    info.wErrorRet = 0xdead;
+    hmmio = mmioOpenA(bufferA, &info, MMIO_PARSE);
+    todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet);
+    todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet);
+    WideCharToMultiByte(CP_ACP, 0, long_filename, -1, expectA, sizeof(expectA), NULL, NULL);
+    todo_wine ok(!strcmp(bufferA, expectA), "expected %s, got %s\n", debugstr_a(expectA), debugstr_a(bufferA));
+
     wcscpy(buffer, L"test_mmio_path");
     hmmio = mmioOpenW(buffer, &info, MMIO_WRITE);
     todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);

[PATCH v3 3/4] winmm/tests: Add some tests for MMIO_PARSE with long file names.

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Thu, Dec 17, 2020 at 04:40:50PM -0600, Zebediah Figura wrote:
> Signed-off-by: Zebediah Figura
>
> dlls/winmm/tests/mmio.c | 20 +++++++++++++++++++-
>  1 file changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c
> index 0236855f246..c9ceda24f3f 100644
> --- a/dlls/winmm/tests/mmio.c
> +++ b/dlls/winmm/tests/mmio.c
> @@ -483,7 +483,7 @@ static void test_mmioOpen_create(void)
>          L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
>          L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
>      WCHAR buffer[MAX_PATH], expect[MAX_PATH];
> - char exedir_filename[MAX_PATH];
> - char exedir_filename[MAX_PATH], bufferA[MAX_PATH], expectA[MAX_PATH];
> MMIOINFO info = {0};
> BOOL ret;
> FILE *f;
>
> @@ -531,6 +531,24 @@ static void test_mmioOpen_create(void)
>  DeleteFileW(long_filename);
>
> - wcscpy(buffer, long_filename);
> - info.wErrorRet = 0xdead;
> - hmmio = mmioOpenW(buffer, &info, MMIO_PARSE);
> - todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet);
> - todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet);
> - wcscpy(expect, temp_dir);
> - wcscat(expect, long_filename);
> - expect[127] = 0;
> - todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer));
> -
> - WideCharToMultiByte(CP_ACP, 0, long_filename, -1, bufferA, sizeof(bufferA), NULL, NULL);
> - info.wErrorRet = 0xdead;
> - hmmio = mmioOpenA(bufferA, &info, MMIO_PARSE);
> - todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet);
> - todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet);
> - WideCharToMultiByte(CP_ACP, 0, long_filename, -1, expectA, sizeof(expectA), NULL, NULL);
> - todo_wine ok(!strcmp(bufferA, expectA), "expected %s, got %s\n", debugstr_a(expectA), debugstr_a(bufferA));
> - wcscpy(buffer, L"test_mmio_path");
>    hmmio = mmioOpenW(buffer, &info, MMIO_WRITE);
>    todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);
>
> -- 
> 2.29.2

[PATCH v3 4/4] winmm: Search the default path when opening an existing file in create_file_OF().

[Zebediah Figura]

Based on a patch by Alistair Leslie-Hughes.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650
Signed-off-by: Zebediah Figura 
---
 dlls/winmm/mmio.c       | 24 ++++++++++++++++++++++--
 dlls/winmm/tests/mmio.c |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index cb3175c5cd7..da536357416 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList;
 /* From kernel32 */
 static HANDLE create_file_OF( LPCSTR path, INT mode )
 {
-    DWORD access, sharing, creation;
+    DWORD access, sharing, creation, len;
+    char *full_path;
+    HANDLE ret;

if (mode & OF_CREATE)
     {
@@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode )
     case OF_SHARE_COMPAT:
     default:                  sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break;
     }
-    return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 );
+
+    if (mode & OF_CREATE)
+        return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 );
+
+    if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL )))
+        return INVALID_HANDLE_VALUE;
+    if (!(full_path = malloc(len + 1)))
+    {
+        SetLastError( ERROR_OUTOFMEMORY );
+        return INVALID_HANDLE_VALUE;
+    }
+    if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL ))
+    {
+        free(full_path);
+        return INVALID_HANDLE_VALUE;
+    }
+    ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 );
+    free(full_path);
+    return ret;
 }

/**************************************************************************
diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c
index c9ceda24f3f..a232070064c 100644
--- a/dlls/winmm/tests/mmio.c
+++ b/dlls/winmm/tests/mmio.c
@@ -551,7 +551,7 @@ static void test_mmioOpen_create(void)

wcscpy(buffer, L"test_mmio_path");
     hmmio = mmioOpenW(buffer, &info, MMIO_WRITE);
-    todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);
+    ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);
     mmioClose(hmmio, 0);

wcscpy(buffer, L"test_mmio_path");

[PATCH v3 4/4] winmm: Search the default path when opening an existing file in create_file_OF().

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Thu, Dec 17, 2020 at 04:40:51PM -0600, Zebediah Figura wrote:
> Based on a patch by Alistair Leslie-Hughes.
>
> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650
> Signed-off-by: Zebediah Figura
>
> dlls/winmm/mmio.c       | 24 ++++++++++++++++++++++--
>  dlls/winmm/tests/mmio.c |  2 +-
>  2 files changed, 23 insertions(+), 3 deletions(-)
>
> diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
> index cb3175c5cd7..da536357416 100644
> --- a/dlls/winmm/mmio.c
> +++ b/dlls/winmm/mmio.c
> @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList;
>  /* From kernel32 */
>  static HANDLE create_file_OF( LPCSTR path, INT mode )
>  {
> - DWORD access, sharing, creation;
> -
>
> DWORD access, sharing, creation, len;
> -
>
> char *full_path;
> -
>
> HANDLE ret;
>
> if (mode & OF_CREATE)
> {
>
> @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode )
>      case OF_SHARE_COMPAT:
>      default:                  sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break;
>      }
> - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 );
> -
> - if (mode & OF_CREATE)
> -
>    return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 );
> -
> - if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL )))
> -
>    return INVALID_HANDLE_VALUE;
> - if (!(full_path = malloc(len + 1)))
> - {
> -
>    SetLastError( ERROR_OUTOFMEMORY );
> -
>    return INVALID_HANDLE_VALUE;
> - }
> - if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL ))
> - {
> -
>    free(full_path);
> -
>    return INVALID_HANDLE_VALUE;
> - }
> - ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 );
> - free(full_path);
> - return ret;
>
> }
>
> /**************************************************************************
> diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c
> index c9ceda24f3f..a232070064c 100644
> --- a/dlls/winmm/tests/mmio.c
> +++ b/dlls/winmm/tests/mmio.c
> @@ -551,7 +551,7 @@ static void test_mmioOpen_create(void)
>  wcscpy(buffer, L"test_mmio_path");
>  hmmio = mmioOpenW(buffer, &info, MMIO_WRITE);
> - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);
> -
>
> ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet);
> mmioClose(hmmio, 0);
>
> wcscpy(buffer, L"test_mmio_path");
>
> -- 
> 2.29.2

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Thu, Dec 17, 2020 at 04:40:48PM -0600, Zebediah Figura wrote:
> Signed-off-by: Zebediah Figura
>
> dlls/winmm/mmio.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
> index 48bbd3ed48d..cb3175c5cd7 100644
> --- a/dlls/winmm/mmio.c
> +++ b/dlls/winmm/mmio.c
> @@ -734,6 +734,7 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo,
>      if (szFileName)
>      {
>          INT     len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL );
> -
>    if (len < MAX_PATH) len = MAX_PATH;
>    szFn = HeapAlloc( GetProcessHeap(), 0, len );
>    if (!szFn) return NULL;
>    WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL );
>
> -- 
> 2.29.2