wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Michael Stefaniuc : dmusic: Use the debug functions provided by dmobject.[ch].
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 7e69bdafea21ef80f9f5d46c592fdfa9eb14d4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e69bdafea21ef80f9f5d46c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 13 00:29:06 2019 +0100 dmusic: Use the debug functions provided by dmobject.[ch]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/buffer.c | 1 + dlls/dmusic/clock.c | 1 + dlls/dmusic/dmobject.c | 247 +++++++++++++++++++++++++++++++++++++++++-- dlls/dmusic/dmobject.h | 14 ++- dlls/dmusic/dmusic.c | 1 + dlls/dmusic/dmusic_main.c | 239 +---------------------------------------- dlls/dmusic/dmusic_private.h | 12 --- dlls/dmusic/download.c | 1 + dlls/dmusic/instrument.c | 1 + dlls/dmusic/port.c | 1 + 10 files changed, 260 insertions(+), 258 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e69bdafea21ef80f9f5…

1 0

Michael Stefaniuc : dmstyle: Use the debug functions provided by dmobject.[ch].
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: bcd88ea3ea791b4ed31f6b008e1921fd27dafd33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcd88ea3ea791b4ed31f6b00… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 13 00:29:05 2019 +0100 dmstyle: Use the debug functions provided by dmobject.[ch]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/dmobject.c | 247 +++++++++++++++++++++++++++++++++++- dlls/dmstyle/dmobject.h | 14 +- dlls/dmstyle/dmstyle_main.c | 1 + dlls/dmstyle/dmutils.c | 302 +------------------------------------------- dlls/dmstyle/dmutils.h | 26 ---- 5 files changed, 255 insertions(+), 335 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bcd88ea3ea791b4ed31f…

1 0

Michael Stefaniuc : dmscript: Use the debug functions provided by dmobject.[ch].
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: eb60619ead22e3470c5e4ef5f485a943cbc71ee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb60619ead22e3470c5e4ef5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 13 00:29:04 2019 +0100 dmscript: Use the debug functions provided by dmobject.[ch]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/dmobject.c | 247 ++++++++++++++++++++++++++++++++++- dlls/dmscript/dmobject.h | 14 +- dlls/dmscript/dmscript_main.c | 272 +-------------------------------------- dlls/dmscript/dmscript_private.h | 21 --- dlls/dmscript/script.c | 3 +- dlls/dmscript/scripttrack.c | 1 + 6 files changed, 257 insertions(+), 301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb60619ead22e3470c5e…

1 0

Alexandre Julliard : kernelbase: No longer import kernel32.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 3318278bfd9c69436421e0cc33ac3be14cf96c18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3318278bfd9c69436421e0cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 09:50:15 2019 +0100 kernelbase: No longer import kernel32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 2 +- dlls/kernelbase/debug.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index aa2a79b910..9279ddbb57 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,6 +1,6 @@ MODULE = kernelbase.dll IMPORTLIB = kernelbase -IMPORTS = uuid ntdll winecrt0 kernel32 +IMPORTS = uuid ntdll winecrt0 EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -mno-cygwin C_SRCS = \ diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index f79be7fa6f..53b95aa6dd 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -43,6 +43,8 @@ typedef INT (WINAPI *MessageBoxW_funcptr)(HWND,LPCWSTR,LPCWSTR,UINT); static PTOP_LEVEL_EXCEPTION_FILTER top_filter; +void *dummy = RtlUnwind; /* force importing RtlUnwind from ntdll */ + /*********************************************************************** * CheckRemoteDebuggerPresent (kernelbase.@) */

1 0

Alexandre Julliard : kernelbase: Remove support for LZ files in 32-bit version functions.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 9fba161dfd842d6bd15d713496cacdbf2cdecf46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fba161dfd842d6bd15d7134… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 09:49:52 2019 +0100 kernelbase: Remove support for LZ files in 32-bit version functions. Windows doesn't support it either. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/version.c | 150 +++++++++++++++++++--------------------------- 1 file changed, 61 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9fba161dfd842d6bd15d…

1 0

Alexandre Julliard : kernel32: Disable relay trace for __wine_start_process().
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 4cb8497c8fba7e99138dc3fcb45cb4a22063f0c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cb8497c8fba7e99138dc3fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 08:37:12 2019 +0100 kernel32: Disable relay trace for __wine_start_process(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48273 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5ba9729086..408ea41540 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1686,4 +1686,4 @@ @ cdecl wine_get_dos_file_name(str) # Init code -@ cdecl __wine_start_process() +@ cdecl -norelay -private __wine_start_process()

1 0

Gijs Vermeulen : shell32/tests: Add PathResolve tests.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 750d382f54e494771128c6b331122be2bc747484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=750d382f54e494771128c6b3… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Dec 11 11:16:18 2019 +0100 shell32/tests: Add PathResolve tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 119 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 262714a9f3..4ea2ef14cd 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -99,6 +99,7 @@ static HRESULT (WINAPI *pSHSetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD); static BOOL (WINAPI *pPathYetAnotherMakeUniqueName)(PWSTR, PCWSTR, PCWSTR, PCWSTR); static HRESULT (WINAPI *pSHGetKnownFolderIDList)(REFKNOWNFOLDERID, DWORD, HANDLE, PIDLIST_ABSOLUTE*); +static BOOL (WINAPI *pPathResolve)(PWSTR, PZPCWSTR, UINT); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; @@ -207,6 +208,7 @@ static void loadShell32(void) GET_PROC(SHGetMalloc) GET_PROC(PathYetAnotherMakeUniqueName) GET_PROC(SHGetKnownFolderIDList) + GET_PROC(PathResolve); ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n"); if (pSHGetMalloc) @@ -2864,6 +2866,122 @@ if (0) { /* crashes on native */ ILFree(pidl); } +static void test_PathResolve(void) +{ + WCHAR testfile[MAX_PATH], testfile_lnk[MAX_PATH], regedit_in_testdir[MAX_PATH], regedit_cmd[MAX_PATH]; + WCHAR tempdir[MAX_PATH], path[MAX_PATH]; + const WCHAR *dirs[2] = { tempdir, NULL }; + HANDLE file, file2; + BOOL ret; + int i; + struct { + const WCHAR *path; + UINT flags; + BOOL expected; + const WCHAR *expected_path; + } tests[] = { + /* no flags */ + { L"test", 0, FALSE, L"test" }, + { L"C:\\test", 0, TRUE, L"C:\\test" }, + { L"regedit", 0, FALSE, L"regedit" }, + { testfile, 0, TRUE, testfile }, + + /* PRF_VERIFYEXISTS */ + { L"test", PRF_VERIFYEXISTS, TRUE, testfile_lnk }, + { L"C:\\test", PRF_VERIFYEXISTS, FALSE, L"C:\\test" }, + /* common extensions are tried even if PRF_TRYPROGRAMEXTENSIONS isn't passed */ + /* directories in dirs parameter are always searched first even if PRF_FIRSTDIRDEF isn't passed */ + { L"regedit", PRF_VERIFYEXISTS, TRUE, regedit_cmd }, + /* .dll is not tried */ + { L"bcrypt", PRF_VERIFYEXISTS, FALSE, L"bcrypt" }, + { testfile, PRF_VERIFYEXISTS, TRUE, testfile_lnk }, + { regedit_in_testdir, PRF_VERIFYEXISTS, TRUE, regedit_cmd }, + + /* PRF_FIRSTDIRDEF */ + { L"regedit", PRF_FIRSTDIRDEF, FALSE, L"regedit" }, + + /* RF_VERIFYEXISTS | PRF_FIRSTDIRDEF */ + { L"regedit", PRF_VERIFYEXISTS | PRF_FIRSTDIRDEF, TRUE, regedit_cmd }, + + /* PRF_DONTFINDLNK */ + { testfile, PRF_DONTFINDLNK, TRUE, testfile }, + { regedit_in_testdir, PRF_DONTFINDLNK, TRUE, regedit_in_testdir }, + + /* RF_VERIFYEXISTS | PRF_DONTFINDLNK */ + { testfile, PRF_VERIFYEXISTS | PRF_DONTFINDLNK, FALSE, testfile }, + /* cmd is also ignored when passing PRF_VERIFYEXISTS | PRF_DONTFINDLNK */ + { regedit_in_testdir, PRF_VERIFYEXISTS | PRF_DONTFINDLNK, FALSE, regedit_in_testdir }, + + /* PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE */ + /* only PRF_VERIFYEXISTS matters*/ + { L"test", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, TRUE, testfile_lnk }, + { L"C:\\test", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, FALSE, L"C:\\test" }, + { L"regedit", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, TRUE, regedit_cmd }, + { testfile, PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, TRUE, testfile_lnk }, + + /* PRF_TRYPROGRAMEXTENSIONS */ + { L"test", PRF_TRYPROGRAMEXTENSIONS, TRUE, testfile_lnk}, + { L"C:\\test", PRF_TRYPROGRAMEXTENSIONS, FALSE, L"C:\\test" }, + { L"regedit", PRF_TRYPROGRAMEXTENSIONS, TRUE, regedit_cmd }, + /* .dll is not tried */ + { L"bcrypt", PRF_TRYPROGRAMEXTENSIONS, FALSE, L"bcrypt" }, + { testfile, PRF_TRYPROGRAMEXTENSIONS, TRUE, testfile_lnk }, + { regedit_in_testdir, PRF_TRYPROGRAMEXTENSIONS, TRUE, regedit_cmd }, + + /* PRF_TRYPROGRAMEXTENSIONS | PRF_DONTFINDLNK */ + { testfile, PRF_TRYPROGRAMEXTENSIONS | PRF_DONTFINDLNK, FALSE, testfile }, + /* cmd is also ignored when passing PRF_TRYPROGRAMEXTENSIONS | PRF_DONTFINDLNK */ + { regedit_in_testdir, PRF_TRYPROGRAMEXTENSIONS | PRF_DONTFINDLNK, FALSE, regedit_in_testdir } + }; + + if (!pPathResolve) + { + win_skip("PathResolve not available\n"); + return; + } + + GetTempPathW(MAX_PATH, tempdir); + + lstrcpyW(testfile, tempdir); + lstrcatW(testfile, L"test"); + lstrcpyW(testfile_lnk, testfile); + lstrcatW(testfile_lnk, L".lnk"); + + file = CreateFileW(testfile_lnk, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + + lstrcpyW(regedit_in_testdir, tempdir); + lstrcatW(regedit_in_testdir, L"regedit"); + lstrcpyW(regedit_cmd, regedit_in_testdir); + lstrcatW(regedit_cmd, L".cmd"); + + file2 = CreateFileW(regedit_cmd, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(file2 != INVALID_HANDLE_VALUE, "got %p\n", file); + + /* show that resolving regedit with NULL dirs returns regedit.exe */ + lstrcpyW(path, L"regedit"); + ret = pPathResolve(path, NULL, PRF_VERIFYEXISTS); + ok(ret, "resolving regedit failed unexpectedly\n"); + ok(!lstrcmpiW(path, L"C:\\windows\\regedit.exe") || !lstrcmpiW(path, L"C:\\windows\\system32\\regedit.exe"), + "unexpected path %s\n", wine_dbgstr_w(path)); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + lstrcpyW(path, tests[i].path); + + if (!tests[i].expected) SetLastError(0xdeadbeef); + ret = pPathResolve(path, dirs, tests[i].flags); + ok(ret == tests[i].expected, "test %d: expected %d, got %d\n", i, tests[i].expected, ret); + ok(!lstrcmpiW(path, tests[i].expected_path), + "test %d: expected %s, got %s\n", i, wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); + if (!tests[i].expected) + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + } + + CloseHandle(file); + CloseHandle(file2); +} + START_TEST(shellpath) { if (!init()) return; @@ -2894,5 +3012,6 @@ START_TEST(shellpath) test_DoEnvironmentSubst(); test_PathYetAnotherMakeUniqueName(); test_SHGetKnownFolderIDList(); + test_PathResolve(); } }

1 0

Gijs Vermeulen : shell32: Implement PathResolve.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: a5a2749cfe5fe6c73fa344ddc2f564bd6cb85356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5a2749cfe5fe6c73fa344dd… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Dec 11 11:16:17 2019 +0100 shell32: Implement PathResolve. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48082 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 69 +++++++++++++++++++++++++++++++++++++++++------- include/shlobj.h | 3 +-- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 06be794812..b6350ea060 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -684,27 +684,78 @@ BOOL WINAPI PathQualifyAW(LPCVOID pszPath) return PathQualifyA(pszPath); } -static BOOL PathResolveA(LPSTR path, LPCSTR *paths, DWORD flags) +BOOL WINAPI PathFindOnPathExA(LPSTR,LPCSTR *,DWORD); +BOOL WINAPI PathFindOnPathExW(LPWSTR,LPCWSTR *,DWORD); +BOOL WINAPI PathFileExistsDefExtA(LPSTR,DWORD); +BOOL WINAPI PathFileExistsDefExtW(LPWSTR,DWORD); + +static BOOL PathResolveA(char *path, const char **dirs, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", debugstr_a(path), paths, flags); - return FALSE; + BOOL is_file_spec = PathIsFileSpecA(path); + DWORD dwWhich = flags & PRF_DONTFINDLNK ? 0xf : 0xff; + + TRACE("(%s,%p,0x%08x)\n", debugstr_a(path), dirs, flags); + + if (flags & PRF_VERIFYEXISTS && !PathFileExistsA(path)) + { + if (PathFindOnPathExA(path, dirs, dwWhich)) + return TRUE; + if (PathFileExistsDefExtA(path, dwWhich)) + return TRUE; + if (!is_file_spec) GetFullPathNameA(path, MAX_PATH, path, NULL); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + if (is_file_spec) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + GetFullPathNameA(path, MAX_PATH, path, NULL); + + return TRUE; } -static BOOL PathResolveW(LPWSTR path, LPCWSTR *paths, DWORD flags) +static BOOL PathResolveW(WCHAR *path, const WCHAR **dirs, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", debugstr_w(path), paths, flags); - return FALSE; + BOOL is_file_spec = PathIsFileSpecW(path); + DWORD dwWhich = flags & PRF_DONTFINDLNK ? 0xf : 0xff; + + TRACE("(%s,%p,0x%08x)\n", debugstr_w(path), dirs, flags); + + if (flags & PRF_VERIFYEXISTS && !PathFileExistsW(path)) + { + if (PathFindOnPathExW(path, dirs, dwWhich)) + return TRUE; + if (PathFileExistsDefExtW(path, dwWhich)) + return TRUE; + if (!is_file_spec) GetFullPathNameW(path, MAX_PATH, path, NULL); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + if (is_file_spec) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + GetFullPathNameW(path, MAX_PATH, path, NULL); + + return TRUE; } /************************************************************************* * PathResolve [SHELL32.51] */ -BOOL WINAPI PathResolveAW(LPVOID path, LPCVOID *paths, DWORD flags) +BOOL WINAPI PathResolveAW(void *path, const void **paths, DWORD flags) { if (SHELL_OsIsUnicode()) - return PathResolveW(path, (LPCWSTR*)paths, flags); + return PathResolveW(path, (const WCHAR **)paths, flags); else - return PathResolveA(path, (LPCSTR*)paths, flags); + return PathResolveA(path, (const char **)paths, flags); } /************************************************************************* diff --git a/include/shlobj.h b/include/shlobj.h index 9a7741a193..bc1150bf91 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1752,10 +1752,9 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *); /* PathResolve flags */ #define PRF_VERIFYEXISTS 0x01 -#define PRF_EXECUTABLE 0x02 #define PRF_TRYPROGRAMEXTENSIONS 0x03 #define PRF_FIRSTDIRDEF 0x04 -#define PRF_DONTFINDLINK 0x08 +#define PRF_DONTFINDLNK 0x08 #define PRF_REQUIREABSOLUTE 0x10 VOID WINAPI PathGetShortPath(LPWSTR pszPath);

1 0

Andrey Gusev : ole32: Fix typos in comments.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: b26f9d199621d401e465bd64f1c99fe92f091cfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b26f9d199621d401e465bd64… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Dec 12 18:19:12 2019 +0200 ole32: Fix typos in comments. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 2 +- dlls/ole32/storage32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a91067fcb7..daa405356f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4763,7 +4763,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, * PARAMS * pszName [I] String representing the object. * pBindOptions [I] Parameters affecting the binding to the named object. - * riid [I] Interface to bind to on the objecct. + * riid [I] Interface to bind to on the object. * ppv [O] On output, the interface riid of the object represented * by pszName. * diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 52ecf59028..58fb055993 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8621,7 +8621,7 @@ end: * pwcsName [ I] Unicode string with filename (can be relative or NULL) * grfMode [ I] Access mode for opening the new storage object (see STGM_ constants) * reserved [ ?] unused?, usually 0 - * ppstgOpen [IO] A pointer to IStorage pointer to the new onject + * ppstgOpen [IO] A pointer to IStorage pointer to the new object * * RETURNS * S_OK if the file was successfully created

1 0

Andrey Gusev : ntoskrnl.exe/tests: Fix typos in ok() messages.
by Alexandre Julliard 12 Dec '19

12 Dec '19

Module: wine Branch: master Commit: 8cd122549700df441a515eb5efc8aa88af0491ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd122549700df441a515eb5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Dec 12 17:55:11 2019 +0200 ntoskrnl.exe/tests: Fix typos in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6827b74a3c..10f3865515 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -800,7 +800,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); @@ -824,7 +824,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); ok(status == STATUS_TIMEOUT, "got %#x\n", status);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2019