April 2020 - Wine-commits - list.winehq.org

Damjan Jovanovic : winex11.drv: Ignore .dwAspect in FORMATETC during XDnD.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: b3f5764fb8ce77b11fed32d20a039b6b47e75ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3f5764fb8ce77b11fed32d2… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Dec 26 14:30:07 2019 +0200 winex11.drv: Ignore .dwAspect in FORMATETC during XDnD. Some applications pass FORMATETC.dwAspect=0 to IDataObject_[Query]GetData() during drag and drop, which is not a valid DVASPECT_* value. Tests show that Windows Explorer completely ignores .dwAspect for CF_HDROP when it is the drag source, treating all values as DVASPECT_CONTENT instead. Do the same. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43368 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 523fb9496c7758be9626d3d5b6a07014f867f640) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2ab28e43bf..80b367a4bb 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -786,11 +786,9 @@ static HRESULT WINAPI XDNDDATAOBJECT_QueryGetData(IDataObject *dataObject, FIXME("only HGLOBAL medium types supported right now\n"); return DV_E_TYMED; } - if (formatEtc->dwAspect != DVASPECT_CONTENT) - { - FIXME("only the content aspect is supported right now\n"); - return E_NOTIMPL; - } + /* Windows Explorer ignores .dwAspect and .lindex for CF_HDROP, + * and we have no way to implement them on XDnD anyway, so ignore them too. + */ LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) {

1 0

Alex Henrie : ntoskrnl: Add KeSetImportanceDpc stub.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 883e8e8580806f9347e0c09cf5f13999e61a3676 URL: https://source.winehq.org/git/wine.git/?a=commit;h=883e8e8580806f9347e0c09c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 26 02:18:54 2019 -0700 ntoskrnl: Add KeSetImportanceDpc stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48358 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f307e94c0e757bf60919fc1d1bdb2bf8f86d2c51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a84805b703..cfcd3239ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2947,6 +2947,14 @@ VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOI FIXME("stub\n"); } +/*********************************************************************** + * KeSetImportanceDpc (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeSetImportanceDpc(PRKDPC dpc, KDPC_IMPORTANCE importance) +{ + FIXME("%p, %d stub\n", dpc, importance); +} + /*********************************************************************** * KeSetTargetProcessorDpc (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 64090ac0c4..4fdbc8ac64 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -615,7 +615,7 @@ @ stdcall KeSetEvent(ptr long long) @ stub KeSetEventBoostPriority @ stub KeSetIdealProcessorThread -@ stub KeSetImportanceDpc +@ stdcall KeSetImportanceDpc(ptr long) @ stub KeSetKernelStackSwapEnable @ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 76a3e8657d..1e7593e8d3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -91,6 +91,13 @@ typedef struct _KDPC { PULONG_PTR Lock; } KDPC, *PKDPC, *RESTRICTED_POINTER PRKDPC; +typedef enum _KDPC_IMPORTANCE { + LowImportance, + MediumImportance, + HighImportance, + MediumHighImportance +} KDPC_IMPORTANCE; + typedef struct _KDEVICE_QUEUE_ENTRY { LIST_ENTRY DeviceListEntry; ULONG SortKey;

1 0

Louis Lenders : wine.inf: Install powershell.exe in WindowsPowerShell/v1.0/.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 84f800e96b9c6cc517e0cd98a25f844d1f63af69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f800e96b9c6cc517e0cd98… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Dec 10 20:08:13 2019 +0100 wine.inf: Install powershell.exe in WindowsPowerShell/v1.0/. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47820 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a2aa1b01f065ecf6efd6caced0cbdfae933d7958) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 983168f63b..7c2da6a595 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2551,6 +2551,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,gecko\plugin,npmshtml.dll 11,Speech\Common,sapi.dll 11,wbem,mofcomp.exe +11,WindowsPowerShell\v1.0,powershell.exe 10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- @@ -2630,6 +2631,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,wbem,wbemprox.dll 11,wbem,wmic.exe 11,wbem,wmiutils.dll +11,WindowsPowerShell\v1.0,powershell.exe ; empty folders to make sure the parent dirs are not removed 16410,Microsoft, 16412,Microsoft,

1 0

Alistair Leslie-Hughes : dmime: IDirectMusicSegment8 SetLoopPoints support zero start/end.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: c74ab1766f9957377df1af497e31bcc99b7241ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=c74ab1766f9957377df1af49… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jan 4 16:44:16 2020 +0100 dmime: IDirectMusicSegment8 SetLoopPoints support zero start/end. Both end and start set to zero loop the whole segement. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25728 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 01d521e5afc39dfcfc1487f60102afe0e58337b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segment.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 9a9872bd4c..0c7a9dc797 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -463,17 +463,20 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetStartPoint(IDirectMusicSegment } static HRESULT WINAPI IDirectMusicSegment8Impl_SetLoopPoints(IDirectMusicSegment8 *iface, - MUSIC_TIME mtStart, MUSIC_TIME mtEnd) + MUSIC_TIME start, MUSIC_TIME end) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d, %d)\n", This, mtStart, mtEnd); - if (mtStart >= This->header.mtLength || mtEnd > This->header.mtLength || mtStart > mtEnd) { - return DMUS_E_OUT_OF_RANGE; - } - This->header.mtLoopStart = mtStart; - This->header.mtLoopEnd = mtEnd; - return S_OK; + TRACE("(%p, %d, %d)\n", This, start, end); + + if ((end || start) && + (start >= This->header.mtLength || end > This->header.mtLength || start > end)) + return DMUS_E_OUT_OF_RANGE; + + This->header.mtLoopStart = start; + This->header.mtLoopEnd = end; + + return S_OK; } static HRESULT WINAPI IDirectMusicSegment8Impl_GetLoopPoints(IDirectMusicSegment8 *iface,

1 0

Jacek Caban : kernel32: Terminate process in unhandled exception handler.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 55adc43492d712dd96f5e8906a7b5cc507dee6c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55adc43492d712dd96f5e890… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 4 13:37:45 2019 +0200 kernel32: Terminate process in unhandled exception handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4f1185d21eaf271d60004eef744ce027ee9b8a04) Conflicts: dlls/kernel32/tests/debugger.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6636945d0c..7505451165 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1274,7 +1274,7 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) } __EXCEPT(UnhandledExceptionFilter) { - TerminateThread( GetCurrentThread(), GetExceptionCode() ); + TerminateProcess( GetCurrentProcess(), GetExceptionCode() ); } __ENDTRY abort(); /* should not be reached */

1 0

Louis Lenders : include: Add restrictederrorinfo.idl.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: ec1cd2e6c762bf878d46d89b95a375e262e92721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec1cd2e6c762bf878d46d89b… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Oct 22 02:54:31 2019 +0000 include: Add restrictederrorinfo.idl. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a619828053b9d9bd25f03c4ca338c965f06a95bb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/Makefile.in | 1 + include/restrictederrorinfo.idl | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index fd4707832a..aaadb70dd5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -535,6 +535,7 @@ SOURCES = \ reason.h \ regstr.h \ restartmanager.h \ + restrictederrorinfo.idl \ richedit.h \ richole.idl \ rmxfguid.h \ diff --git a/include/restrictederrorinfo.idl b/include/restrictederrorinfo.idl new file mode 100644 index 0000000000..e444256a04 --- /dev/null +++ b/include/restrictederrorinfo.idl @@ -0,0 +1,35 @@ +/* + * Copyright 2019 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; + +[ + object, + uuid(82ba7092-4c88-427d-a7bc-16dd93feb67e), + pointer_default(unique) +] +interface IRestrictedErrorInfo : IUnknown +{ + HRESULT GetErrorDetails ( + [out] BSTR *desc, + [out] HRESULT *error, + [out] BSTR *restricted_desc, + [out] BSTR *sid); + + HRESULT GetReference ([out] BSTR *reference); +}

1 0

Jacek Caban : include: Add roerrorapi.h header.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 01256bcaa98e49589b67c1b2d73e0b638c5a5a70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01256bcaa98e49589b67c1b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 7 20:45:17 2020 +0100 include: Add roerrorapi.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c1e73583111f83d03898f73c9c2283040dab8638) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/Makefile.in | 1 + include/roerrorapi.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index aaadb70dd5..da8d830856 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -541,6 +541,7 @@ SOURCES = \ rmxfguid.h \ rmxftmpl.x \ roapi.h \ + roerrorapi.h \ roparameterizediid.idl \ row.idl \ rowchg.idl \ diff --git a/include/roerrorapi.h b/include/roerrorapi.h new file mode 100644 index 0000000000..dd9c7f16ec --- /dev/null +++ b/include/roerrorapi.h @@ -0,0 +1,29 @@ +/* + * Copyright 2020 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _ROERROR_H +#define _ROERROR_H + +#include <hstring.h> +#include <restrictederrorinfo.h> +#include <rpc.h> + +HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); +BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); + +#endif /* _ROERROR_H */

1 0

Louis Lenders : combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 6520a179877097a7a767f64ebdfe3cbcc623514e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6520a179877097a7a767f64e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jan 7 20:45:32 2020 +0100 combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46972 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 774aaa1d309dfc9eaa0cd6390890d88387fbae4b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-winrt-error-l1-1-0.spec | 2 +- .../api-ms-win-core-winrt-error-l1-1-1.spec | 4 ++-- dlls/combase/combase.spec | 4 ++-- dlls/combase/roapi.c | 19 +++++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec index de0a6d8bd9..99f1ca357c 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo @ stub RoCaptureErrorContext @ stub RoFailFastWithErrorContext @ stub RoGetErrorReportingFlags diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec index b1ad813fcb..0b390f1f80 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -1,4 +1,4 @@ -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo @ stub IsErrorPropagationEnabled @ stub RoCaptureErrorContext @ stub RoClearError @@ -9,7 +9,7 @@ @ stub RoInspectThreadErrorInfo @ stub RoOriginateError @ stub RoOriginateErrorW -@ stub RoOriginateLanguageException +@ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException @ stub RoReportFailedDelegate @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c8a8dee43f..a72a318794 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -180,7 +180,7 @@ @ stub GetFuncDescs @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) @ stub HSTRING_UserFree @ stub HSTRING_UserFree64 @ stub HSTRING_UserMarshal @@ -260,7 +260,7 @@ @ stub RoInspectThreadErrorInfo @ stub RoOriginateError @ stub RoOriginateErrorW -@ stub RoOriginateLanguageException +@ stdcall RoOriginateLanguageException(long ptr ptr) @ stub RoParameterizedTypeExtraGetTypeSignature @ stdcall RoRegisterActivationFactories(ptr ptr long ptr) @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 63e218d910..cda910af6b 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -21,6 +21,7 @@ #include "initguid.h" #include "roapi.h" #include "roparameterizediid.h" +#include "roerrorapi.h" #include "winstring.h" #include "wine/debug.h" @@ -275,6 +276,24 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF return S_OK; } +/*********************************************************************** + * GetRestrictedErrorInfo (combase.@) + */ +HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info) +{ + FIXME( "(%p)\n", info ); + return E_NOTIMPL; +} + +/*********************************************************************** + * RoOriginateLanguageException (combase.@) + */ +BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception) +{ + FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception); + return FALSE; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */

1 0

Michael Müller : setupapi: Add support for IDF_CHECKFIRST flag in SetupPromptForDiskW.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 501eb50defda5aa1a014d0433f9ac011c83e89fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=501eb50defda5aa1a014d043… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Jan 11 21:06:39 2020 +0100 setupapi: Add support for IDF_CHECKFIRST flag in SetupPromptForDiskW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20465 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0422c6c4d0224c4e619771a0d22f4a5a1575f3f3) Conflicts: dlls/setupapi/dialog.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/dialog.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index fc74cfc172..645b82f129 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -243,6 +243,34 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk SetLastError(ERROR_INVALID_PARAMETER); return DPROMPT_CANCEL; } + + if (PathToSource && (DiskPromptStyle & IDF_CHECKFIRST)) + { + WCHAR filepath[MAX_PATH]; + + if (lstrlenW(PathToSource) + 1 + lstrlenW(FileSought) < ARRAY_SIZE(filepath)) + { + static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; + snprintfW(filepath, ARRAY_SIZE(filepath), fmtW, PathToSource, FileSought); + if (GetFileAttributesW(filepath) != INVALID_FILE_ATTRIBUTES) + { + if (PathRequiredSize) + *PathRequiredSize = lstrlenW(PathToSource) + 1; + + if (!PathBuffer) + return DPROMPT_SUCCESS; + + if (PathBufferSize >= lstrlenW(PathToSource) + 1) + { + lstrcpyW(PathBuffer, PathToSource); + return DPROMPT_SUCCESS; + } + else + return DPROMPT_BUFFERTOOSMALL; + } + } + } + params.DialogTitle = DialogTitle; params.DiskName = DiskName; params.PathToSource = PathToSource;

1 0

Jeff Smith : user.exe16: Releasing DC does not disable it.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 4818f65c04d83b67a29f8f58db682050b07d7f1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4818f65c04d83b67a29f8f58… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Jan 12 14:54:10 2020 -0600 user.exe16: Releasing DC does not disable it. ReleaseDC in user32 marks cache DCs as disabled. For user.exe (the 16-bit equivalent), this causes DCs to become inaccessible after release. On Windows, they are still accessible after release. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44408 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0778945e34968c66ccbe8a8be1f9749b8383f55e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user.exe16/window.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 10f1389f0a..bf86719325 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -23,6 +23,7 @@ #include "user_private.h" #include "wine/list.h" #include "wine/server.h" +#include "wine/gdi_driver.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); @@ -675,7 +676,9 @@ HDC16 WINAPI GetWindowDC16( HWND16 hwnd ) */ INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc ) { - return (INT16)ReleaseDC( WIN_Handle32(hwnd), HDC_32(hdc) ); + INT16 ret = (INT16)ReleaseDC( WIN_Handle32(hwnd), HDC_32(hdc) ); + SetHookFlags( HDC_32(hdc), DCHF_ENABLEDC ); + return ret; }

1 0