June 2018 - Wine-Commits - list.winehq.org

Louis Lenders : ntdll: Update version resource.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 7817056d91b5462c31f9fbdead335ffbf4ad0c34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7817056d91b5462c31f9fbde… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 19 20:38:44 2018 +0100 ntdll: Update version resource. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 670622b8fbb293466cfbd4c4ab3f802ed3586d75) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/version.rc b/dlls/ntdll/version.rc index c16ea4e..fd51d3c 100644 --- a/dlls/ntdll/version.rc +++ b/dlls/ntdll/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine ntdll" #define WINE_FILENAME_STR "ntdll.dll" -#define WINE_FILEVERSION 5,1,2600,2180 -#define WINE_FILEVERSION_STR "5.1.2600.2180" -#define WINE_PRODUCTVERSION 5,1,2600,2180 -#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" +#define WINE_FILEVERSION 6,1,7601,24059 +#define WINE_FILEVERSION_STR "6.1.7601.24059" +#define WINE_PRODUCTVERSION 6,1,7601,24059 +#define WINE_PRODUCTVERSION_STR "6.1.7601.24059" #include "wine/wine_common_ver.rc"

1 0

Tim Wanders : setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 28e3b41ff5df5852815fcfbf0d26644d7d92a69f URL: https://source.winehq.org/git/wine.git/?a=commit;h=28e3b41ff5df5852815fcfbf… Author: Tim Wanders <timwanders241(a)gmail.com> Date: Sun Apr 1 21:48:49 2018 +0000 setupapi: Return CR_NO_SUCH_DEVNODE from CM_Get_Parent stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 074345edd6147a44b1311780c073f13d8114b726) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/stubs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 990974d..7c3413a 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -180,8 +180,9 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) { FIXME("%p 0x%08x 0x%08x stub\n", pdnDevInst, dnDevInst, ulFlags); - *pdnDevInst = dnDevInst; - return CR_SUCCESS; + if(pdnDevInst) + *pdnDevInst = 0; + return CR_NO_SUCH_DEVNODE; } /***********************************************************************

1 0

Mark White : kernel32: Fix forward slash path handling to GetVolumePathNameW.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 205291791e9f70e73238866114c1cb28c3388074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=205291791e9f70e732388661… Author: Mark White <chopinbig2(a)gmail.com> Date: Sat Mar 24 01:08:02 2018 -0400 kernel32: Fix forward slash path handling to GetVolumePathNameW. Signed-off-by: Mark White <chopinbig2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d37d9860a1b598c5a32e4f42e7c5b40224a60de2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/volume.c | 4 ++++ dlls/kernel32/volume.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 365e38c..c47043d 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -772,6 +772,10 @@ static void test_GetVolumePathNameA(void) "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_FILE_NOT_FOUND, NO_ERROR }, + { /* test 42: a reasonable forward slash path that is guaranteed to exist */ + "C:/windows/system32", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, }; BOOL ret, success; DWORD error; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index b4163f0..3a4edf8 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1693,6 +1693,10 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu return FALSE; } strcpyW( volumenameW, filename ); + + /* Normalize path */ + for (c = volumenameW; *c; c++) if (*c == '/') *c = '\\'; + stop_pos = 0; /* stop searching slashes early for NT-type and nearly NT-type paths */ if (strncmpW(ntprefixW, filename, strlenW(ntprefixW)) == 0) @@ -1776,14 +1780,10 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu if (last_pos + 1 <= buflen) { - WCHAR *p; memcpy(volumepathname, filename, last_pos * sizeof(WCHAR)); if (last_pos + 2 <= buflen) volumepathname[last_pos++] = '\\'; volumepathname[last_pos] = '\0'; - /* Normalize path */ - for (p = volumepathname; *p; p++) if (*p == '/') *p = '\\'; - /* DOS-style paths always return upper-case drive letters */ if (volumepathname[1] == ':') volumepathname[0] = toupperW(volumepathname[0]);

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Implement _chkstk.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 3b216ff5ded073343b17eef5fc7b317c1b4934c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b216ff5ded073343b17eef5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 26 22:58:55 2018 +0000 ntoskrnl.exe: Implement _chkstk. These are just copied from ntdll. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 075cbd34747390720e4b28be6b105b1a026c2844) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 ++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 32 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 315402a..5bea991 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3316,3 +3316,33 @@ INT __cdecl NTOSKRNL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) { return strncmpW( str1, str2, n ); } + + +#ifdef __x86_64__ +/************************************************************************** + * __chkstk (NTOSKRNL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); + +#elif defined(__i386__) +/************************************************************************** + * _chkstk (NTOSKRNL.@) + */ +__ASM_STDCALL_FUNC( _chkstk, 0, + "negl %eax\n\t" + "addl %esp,%eax\n\t" + "xchgl %esp,%eax\n\t" + "movl 0(%eax),%eax\n\t" /* copy return address from old location */ + "movl %eax,0(%esp)\n\t" + "ret" ) +#elif defined(__arm__) +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Incoming r4 contains words to allocate, converting to bytes then return + */ +__ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" + "bx lr" ) +#endif diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index e8b8dff..0e4af90 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1397,6 +1397,7 @@ @ stdcall -private ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject @ stdcall -private ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution +@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() msvcrt._CIcos @ cdecl -private -arch=i386 _CIsin() msvcrt._CIsin @ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt @@ -1412,6 +1413,7 @@ @ stub _aulldvrm @ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) +@ stdcall -private -arch=i386 -norelay _chkstk() @ cdecl -private -arch=i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2 @ cdecl -private -arch=i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3 @ cdecl -private -arch=i386 _global_unwind2(ptr) msvcrt._global_unwind2

1 0

Martin Storsjo : ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: a37b7f4e378c40aeb66bfce06b7b19c2607105ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37b7f4e378c40aeb66bfce0… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 22 00:06:09 2018 +0200 ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae49bc94b4b49363133e31a0d6c28cfb9f99b294) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 61bd326..0edd871 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -39,7 +39,7 @@ @ stub __dcrt_initial_narrow_environment @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0d56715..00d779c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -94,7 +94,7 @@ @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) MSVCRT__setjmpex @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 5efd1a4..331a087 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -33,7 +33,7 @@ @ cdecl __current_exception() ucrtbase.__current_exception @ stub __current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy

1 0

Piotr Caban : msvcrt/tests: Add _strupr tests.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 8abe5734836f95171e8aba0ab80773bcb65dc8c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8abe5734836f95171e8aba0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 22 18:51:56 2018 +0100 msvcrt/tests: Add _strupr tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9a7cb34d0fa72f2a024dd32326fd22cd1784372c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/string.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b270366..2e963dc 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3346,6 +3346,49 @@ static void test__memicmp_l(void) ok(errno == 0xdeadbeef, "errno is %d, expected 0xdeadbeef\n", errno); } +static void test__strupr(void) +{ + const char str[] = "123"; + char str2[4]; + char *mem, *p; + DWORD prot; + + mem = VirtualAlloc(NULL, sizeof(str), MEM_COMMIT, PAGE_READWRITE); + ok(mem != NULL, "VirtualAlloc failed\n"); + memcpy(mem, str, sizeof(str)); + ok(VirtualProtect(mem, sizeof(str), PAGE_READONLY, &prot), "VirtualProtect failed\n"); + + strcpy(str2, "aBc"); + p = _strupr(str2); + ok(p == str2, "_strupr returned %p\n", p); + ok(!strcmp(str2, "ABC"), "str2 = %s\n", str2); + + p = _strupr(mem); + ok(p == mem, "_strupr returned %p\n", p); + ok(!strcmp(mem, "123"), "mem = %s\n", mem); + + if(!setlocale(LC_ALL, "english")) { + VirtualFree(mem, sizeof(str), MEM_RELEASE); + win_skip("English locale _strupr tests\n"); + return; + } + + strcpy(str2, "aBc"); + p = _strupr(str2); + ok(p == str2, "_strupr returned %p\n", p); + ok(!strcmp(str2, "ABC"), "str2 = %s\n", str2); + + if (0) /* crashes on Windows */ + { + p = _strupr(mem); + ok(p == mem, "_strupr returned %p\n", p); + ok(!strcmp(mem, "123"), "mem = %s\n", mem); + } + + setlocale(LC_ALL, "C"); + VirtualFree(mem, sizeof(str), MEM_RELEASE); +} + START_TEST(string) { char mem[100]; @@ -3468,4 +3511,5 @@ START_TEST(string) test__ismbclx(); test__memicmp(); test__memicmp_l(); + test__strupr(); }

1 0

Piotr Caban : ucrtbase: Add __current_exception() implementation.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: f6c599d507717cee05ad0dc2df42a0f69712c75d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6c599d507717cee05ad0dc2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 19 17:43:57 2018 +0100 ucrtbase: Add __current_exception() implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae5d0b22291d866a49f293e782b43ba025ab77ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/except.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 5e67f92..61bd326 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -33,7 +33,7 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) ucrtbase.__RTDynamicCast @ cdecl __RTtypeid(ptr) ucrtbase.__RTtypeid @ stub __TypeMatch -@ stub __current_exception +@ cdecl __current_exception() ucrtbase.__current_exception @ stub __current_exception_context @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 13698f8..3378283 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -508,4 +508,13 @@ void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data) data->dofree = 0; } +/********************************************************************* + * __current_exception (UCRTBASE.@) + */ +void** CDECL __current_exception(void) +{ + TRACE("()\n"); + return (void**)&msvcrt_get_thread_data()->exc_record; +} + #endif /* _MSVCR_VER>=140 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b142a17..0d56715 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -82,7 +82,7 @@ @ stub __conio_common_vcwprintf_s @ stub __conio_common_vcwscanf @ cdecl -arch=i386 __control87_2(long long ptr ptr) -@ stub __current_exception +@ cdecl __current_exception() @ stub __current_exception_context @ cdecl __daylight() MSVCRT___p__daylight @ stub __dcrt_get_wide_environment_from_os diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index b2d11bc..5efd1a4 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -30,7 +30,7 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) ucrtbase.__RTDynamicCast @ cdecl __RTtypeid(ptr) ucrtbase.__RTtypeid @ stub __TypeMatch -@ stub __current_exception +@ cdecl __current_exception() ucrtbase.__current_exception @ stub __current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex

1 0

Stefan Leichter : advapi32: Silence the fixme in EventActivityIdControl.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: de8f623827c54b135bb4c7730d872f72823b508e URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8f623827c54b135bb4c773… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Sun Mar 25 10:29:39 2018 +0200 advapi32: Silence the fixme in EventActivityIdControl. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bae48da7c5e16ec5b1a6e3db48e2eaaec7515db8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/eventlog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 34a21c8..fbab8e8 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -830,7 +830,9 @@ BOOLEAN WINAPI EventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG ke */ ULONG WINAPI EventActivityIdControl(ULONG code, GUID *guid) { - FIXME("0x%x, %p: stub\n", code, guid); + static int once; + + if (!once++) FIXME("0x%x, %p: stub\n", code, guid); return ERROR_SUCCESS; }

1 0

Alistair Leslie-Hughes : propsys: Add PSGetPropertyKeyFromName stub.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 8297cf717a7c01a1ad4bcd96adde9eebc5ec5a7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8297cf717a7c01a1ad4bcd96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 18 00:21:51 2018 +0000 propsys: Add PSGetPropertyKeyFromName stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cbd9354862fa044932b5a0cb7c4c8b141e0a4e3f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 86a5e69..70f1dcc 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -83,7 +83,7 @@ @ stub PSGetPropertyDescriptionByName @ stdcall PSGetPropertyDescriptionListFromString(wstr ptr ptr) @ stub PSGetPropertyFromPropertyStorage -@ stub PSGetPropertyKeyFromName +@ stdcall PSGetPropertyKeyFromName(wstr ptr) @ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 7631023..1dbaee4 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -268,6 +268,12 @@ HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR proplist, REFIID r return E_NOTIMPL; } +HRESULT WINAPI PSGetPropertyKeyFromName(PCWSTR name, PROPERTYKEY *key) +{ + FIXME("%s, %p\n", debugstr_w(name), key); + return E_NOTIMPL; +} + HRESULT WINAPI PSRefreshPropertySchema(void) { FIXME("\n");

1 0

Nikolay Sivov : comdlg32: Add a helper to test if file dialog hook is enabled.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: stable Commit: 7c9fa96d9fbadcf5f4d2f2cee743ea59d02bba5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9fa96d9fbadcf5f4d2f2ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 20 10:37:50 2018 +0300 comdlg32: Add a helper to test if file dialog hook is enabled. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2118ce0fa9785ce301370738b12b8f38a23ca86b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2ad7efa..b0b40e1 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -83,8 +83,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN |\ OFN_NOTESTFILECREATE /*| OFN_USEMONIKERS*/) -#define IsHooked(fodInfos) \ - ((fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook) /*********************************************************************** * Data structure and global variables */ @@ -179,6 +177,11 @@ FileOpenDlgInfos *get_filedlg_infoptr(HWND hwnd) return GetPropW(hwnd, filedlg_info_propnameW); } +static BOOL is_dialog_hooked(const FileOpenDlgInfos *info) +{ + return (info->ofnInfos->Flags & OFN_ENABLEHOOK) && info->ofnInfos->lpfnHook; +} + /*********************************************************************** * Prototypes */ @@ -294,7 +297,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) } /* old style hook messages */ - if (IsHooked(fodInfos)) + if (is_dialog_hooked(fodInfos)) { fodInfos->HookMsg.fileokstring = RegisterWindowMessageW(FILEOKSTRINGW); fodInfos->HookMsg.lbselchstring = RegisterWindowMessageW(LBSELCHSTRINGW); @@ -811,15 +814,15 @@ static HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) } if (fodInfos->unicode) hChildDlg = CreateDialogIndirectParamW(hinst, template, hwnd, - IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, + is_dialog_hooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, (LPARAM)fodInfos->ofnInfos); else hChildDlg = CreateDialogIndirectParamA(hinst, template, hwnd, - IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, + is_dialog_hooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, (LPARAM)fodInfos->ofnInfos); return hChildDlg; } - else if( IsHooked(fodInfos)) + else if (is_dialog_hooked(fodInfos)) { RECT rectHwnd; struct { @@ -1910,7 +1913,7 @@ static LRESULT FILEDLG95_OnWMGetIShellBrowser(HWND hwnd) static BOOL FILEDLG95_SendFileOK( HWND hwnd, FileOpenDlgInfos *fodInfos ) { /* ask the hook if we can close */ - if(IsHooked(fodInfos)) + if (is_dialog_hooked(fodInfos)) { LRESULT retval = 0;

1 0