May 2020 - Wine-Commits - list.winehq.org

Jacek Caban : wine/test.h: Remove NAN and INFINITY macros.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: b9fe0ecd3a566dbf485e8e09c5ae08b4d54f5bc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9fe0ecd3a566dbf485e8e09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 14:32:31 2020 +0200 wine/test.h: Remove NAN and INFINITY macros. Those are available in UCRT (MSVC since 2015) and cause redefinition warnings if math.h is included after test.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 9967094671..84ac1e516b 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -44,15 +44,6 @@ #define INVALID_SET_FILE_POINTER (~0u) #endif -#ifdef _MSC_VER -# ifndef INFINITY -# define INFINITY ((float)HUGE_VAL) -# endif -# ifndef NAN -# define NAN (INFINITY * 0.0f) -# endif -#endif - /* debug level */ extern int winetest_debug;

1 0

Derek Lesho : mfreadwrite/reader: Add recognition of ftypemp42 mp4 header.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 2fb948e0eaa607307fe30b55762803a7103fb1dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fb948e0eaa607307fe30b55… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon May 18 15:41:31 2020 +0300 mfreadwrite/reader: Add recognition of ftypemp42 mp4 header. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index e69c2b980b..96a82b798a 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2162,6 +2162,7 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) static const unsigned char wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; static const unsigned char wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const unsigned char isommagic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'i', 's', 'o', 'm',0x00,0x00,0x00,0x00}; + static const unsigned char mp42magic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'm', 'p', '4', '2',0x00,0x00,0x00,0x00}; static const unsigned char mp4mask[] = {0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00}; static const struct stream_content_url_hint { @@ -2174,6 +2175,7 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { asfmagic, L".asf" }, { wavmagic, L".wav", wavmask }, { isommagic, L".mp4", mp4mask }, + { mp42magic, L".mp4", mp4mask }, }; unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; unsigned int i, j, length = 0, caps = 0;

1 0

Martin Storsjo : ntdll: Pass a nonnull handler_data when continuing after a collided unwind on arm64.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 93ecc54ae560a3677dfa78ca0f5448d7aef0cbd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93ecc54ae560a3677dfa78ca… Author: Martin Storsjo <martin(a)martin.st> Date: Mon May 18 15:16:28 2020 +0300 ntdll: Pass a nonnull handler_data when continuing after a collided unwind on arm64. This fixes crashes when handling GNU/mingw style SEH based C++ exceptions on arm64; in these cases unwind_full_data ended up where it tries to write handler_rva + 1 to *handler_data. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 30d445b408..e81ea8f82e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1843,7 +1843,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, - &new_context, NULL, &frame, NULL ); + &new_context, &dispatch.HandlerData, &frame, + NULL ); rec->ExceptionFlags |= EH_COLLIDED_UNWIND; goto unwind_done; } @@ -1866,7 +1867,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.ContextRecord = context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, - &new_context, NULL, &frame, NULL ); + &new_context, &dispatch.HandlerData, + &frame, NULL ); rec->ExceptionFlags |= EH_COLLIDED_UNWIND; goto unwind_done; }

1 0

Martin Storsjo : ntdll: Fix arm64 unwind across ELF/PE boundaries.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 93082b3d52b4b2489e75be80347a0ea2a0ddb607 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93082b3d52b4b2489e75be80… Author: Martin Storsjo <martin(a)martin.st> Date: Mon May 18 15:16:27 2020 +0300 ntdll: Fix arm64 unwind across ELF/PE boundaries. The previous implementation might have given the impression of working, as long in some cases where the PE code actually used frame pointers, but turned out to be subly wrong. This essentially reverts the functional aspects of 1c9fdaab0f4. Use the new value of the Lr register, after fetching the registers from unw_step, as the return value. To make single-stepping unwinding work properly, treat the registers consistently: - Make RtlCaptureContext store the current values of x29/Fp and x30/Lr from within the function, not the ones backed up from the stack. - After unwinding one step, first fetch the new values of all registers, including the new value of Lr - then use this value of Lr to set the new value of Pc (the address to actually return to). This makes the unwinding actually coherent in reading unwind opcodes and return addresses from one single function; previously these were out of sync where the return address ended up being read from the function one step further up in the call stack. This fixes unwinding for setjmp for binaries compiled with clang (in mingw mode). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 9f84d3fbfd..30d445b408 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -265,8 +265,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "stp x23, x24, [x0, #0xc0]\n\t" /* context->X23,X24 */ "stp x25, x26, [x0, #0xd0]\n\t" /* context->X25,X26 */ "stp x27, x28, [x0, #0xe0]\n\t" /* context->X27,X28 */ - "ldp x1, x2, [x29]\n\t" - "stp x1, x2, [x0, #0xf0]\n\t" /* context->Fp,Lr */ + "stp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ "add x1, x29, #0x10\n\t" "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ @@ -545,7 +544,6 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX *handler = (void *)info.handler; *handler_data = (void *)info.lsda; *frame = context->Sp; - context->Pc = context->u.s.Lr; unw_get_reg( &cursor, UNW_AARCH64_X0, (unw_word_t *)&context->u.s.X0 ); unw_get_reg( &cursor, UNW_AARCH64_X1, (unw_word_t *)&context->u.s.X1 ); unw_get_reg( &cursor, UNW_AARCH64_X2, (unw_word_t *)&context->u.s.X2 ); @@ -578,6 +576,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX unw_get_reg( &cursor, UNW_AARCH64_X29, (unw_word_t *)&context->u.s.Fp ); unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->u.s.Lr ); unw_get_reg( &cursor, UNW_AARCH64_SP, (unw_word_t *)&context->Sp ); + context->Pc = context->u.s.Lr; TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" ); TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n",

1 0

Jacek Caban : gdiplusenums.h: Remove PaletteFlags.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: f7ab5c6d792212b0f3e9f4dd5f005f2905fe131e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ab5c6d792212b0f3e9f4dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 14:46:56 2020 +0200 gdiplusenums.h: Remove PaletteFlags. It's not present there in Windows SDK. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/gdiplusenums.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 0fcc11d4b9..522c82f67b 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -784,7 +784,6 @@ typedef enum FontStyle FontStyle; typedef enum StringFormatFlags StringFormatFlags; typedef enum HotkeyPrefix HotkeyPrefix; typedef enum PenAlignment PenAlignment; -typedef enum PaletteFlags PaletteFlags; typedef enum ImageCodecFlags ImageCodecFlags; typedef enum EncoderParameterValueType EncoderParameterValueType; typedef enum EncoderValue EncoderValue;

1 0

Francois Gouget : rsaenh: Remove an unnecessary reference to wine-devel.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 940c249b315fb586cbcaef5915bf706a7f2a6946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=940c249b315fb586cbcaef59… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 16 12:19:22 2020 +0200 rsaenh: Remove an unnecessary reference to wine-devel. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 9119d4be2d..38c4831864 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4005,7 +4005,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, * IE6 SP1 asks for it in the 'About' dialog. * Returning this BLOB seems to satisfy IE. The marked 0x00 seem * to be 'don't care's. If you know anything more specific about - * this provider parameter, please report to wine-devel(a)winehq.org */ + * this provider parameter, please contact the Wine developers */ static const BYTE abWTF[96] = { 0xb0, 0x25, 0x63, 0x86, 0x9c, 0xab, 0xb6, 0x37, 0xe8, 0x82, /**/0x00,/**/ 0x72, 0x06, 0xb2, /**/0x00,/**/ 0x3b,

1 0

Francois Gouget : winebus.sys: Fix the spelling of HID_USAGE_SIMULATION_ACCELERATOR.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 335656e433a6ac959257a2863ed49c92e6c21f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=335656e433a6ac959257a286… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 16 12:18:17 2020 +0200 winebus.sys: Fix the spelling of HID_USAGE_SIMULATION_ACCELERATOR. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- include/hidusage.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 51940ba088..1473579c72 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -139,7 +139,7 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ - {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELLERATOR}, /*ABS_GAS*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELERATOR}, /*ABS_GAS*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ {0,0}, /*ABS_HAT0X*/ {0,0}, /*ABS_HAT0Y*/ diff --git a/include/hidusage.h b/include/hidusage.h index c45e2712fc..d5f55bd227 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -200,7 +200,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) -#define HID_USAGE_SIMULATION_ACCELLERATOR ((USAGE) 0xC4) +#define HID_USAGE_SIMULATION_ACCELERATOR ((USAGE) 0xC4) #define HID_USAGE_SIMULATION_BRAKE ((USAGE) 0xC5) #define HID_USAGE_SIMULATION_STEERING ((USAGE) 0xC8)

1 0

Francois Gouget : wineusb.sys: Fix the spelling of an ERR() message.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: e328a600172f46133f6fdd61deb107cc85b32cfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e328a600172f46133f6fdd61… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 16 12:18:12 2020 +0200 wineusb.sys: Fix the spelling of an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 3e6a959a78..f70197704b 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -641,7 +641,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER | LIBUSB_TRANSFER_FREE_TRANSFER; ret = libusb_submit_transfer(transfer); if (ret < 0) - ERR("Failed to submit GET_DESRIPTOR transfer: %s\n", libusb_strerror(ret)); + ERR("Failed to submit GET_DESCRIPTOR transfer: %s\n", libusb_strerror(ret)); return STATUS_PENDING; }

1 0

Jacek Caban : winnt.h: Add ARRAYSIZE macro.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 6cad7dd2a7100d9322317cfa5b3b58bb9e1137c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cad7dd2a7100d9322317cfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 14:03:23 2020 +0200 winnt.h: Add ARRAYSIZE macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index cc2099086d..46e17c546a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -796,6 +796,7 @@ typedef struct _MEMORY_BASIC_INFORMATION #define CONTAINING_RECORD(address, type, field) \ ((type *)((PCHAR)(address) - offsetof(type, field))) +#define ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0])) #ifdef __WINESRC__ # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #endif

1 0

Zebediah Figura : explorer: Look for an existing window browsing the given path first.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 1a7b4fb9c15ddd3d107af73a68fd312ea9c52e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7b4fb9c15ddd3d107af73a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 17 23:29:44 2020 -0500 explorer: Look for an existing window browsing the given path first. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 164 +++++++++++++++++++++++++++++-------------- 1 file changed, 110 insertions(+), 54 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 763fca381b..43bd4ef13a 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -70,6 +70,9 @@ typedef struct LPITEMIDLIST pidl; IImageList *icon_list; DWORD advise_cookie; + + IShellWindows *sw; + LONG sw_cookie; } explorer_info; enum @@ -77,6 +80,13 @@ enum BACK_BUTTON,FORWARD_BUTTON,UP_BUTTON }; +static void variant_from_pidl(VARIANT *var, const ITEMIDLIST *pidl) +{ + V_VT(var) = VT_ARRAY | VT_UI1; + V_ARRAY(var) = SafeArrayCreateVector(VT_UI1, 0, ILGetSize(pidl)); + memcpy(V_ARRAY(var)->pvData, pidl, ILGetSize(pidl)); +} + typedef struct { IExplorerBrowserEvents IExplorerBrowserEvents_iface; @@ -265,6 +275,15 @@ static HRESULT WINAPI IExplorerBrowserEventsImpl_fnOnNavigationComplete(IExplore STRRET strret; WCHAR *name; + if (This->info->sw) + { + VARIANT var; + + variant_from_pidl(&var, pidl); + IShellWindows_OnNavigate(This->info->sw, This->info->sw_cookie, &var); + VariantClear(&var); + } + ILFree(This->info->pidl); This->info->pidl = ILClone(pidl); update_path_box(This->info); @@ -325,7 +344,35 @@ static IExplorerBrowserEvents *make_explorer_events(explorer_info *info) return &ret->IExplorerBrowserEvents_iface; } -static void make_explorer_window(IShellFolder* startFolder) +static IShellFolder *get_starting_shell_folder(WCHAR *path) +{ + IShellFolder* desktop,*folder; + LPITEMIDLIST root_pidl; + HRESULT hres; + + SHGetDesktopFolder(&desktop); + + if (!path) + return desktop; + + hres = IShellFolder_ParseDisplayName(desktop, NULL, NULL, path, NULL, &root_pidl, NULL); + if(FAILED(hres)) + { + return desktop; + } + hres = IShellFolder_BindToObject(desktop,root_pidl,NULL, + &IID_IShellFolder, + (void**)&folder); + ILFree(root_pidl); + if(FAILED(hres)) + { + return desktop; + } + IShellFolder_Release(desktop); + return folder; +} + +static void make_explorer_window(parameters_struct *params) { RECT rect; HWND rebar,nav_toolbar; @@ -339,8 +386,49 @@ static void make_explorer_window(IShellFolder* startFolder) TBBUTTON nav_buttons[3]; int hist_offset,view_offset; REBARBANDINFOW band_info; + VARIANT var, empty_var; + IShellFolder *folder; + IDispatch *dispatch; + WCHAR *path = NULL; + IShellWindows *sw; + ITEMIDLIST *pidl; UINT dpix, dpiy; + DWORD size; + LONG hwnd; HDC hdc; + MSG msg; + + CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, + &IID_IShellWindows, (void **)&sw); + + if (params->root[0]) + { + size = GetFullPathNameW(params->root, 0, NULL, NULL); + path = malloc(size); + GetFullPathNameW(params->root, size, path, NULL); + } + + if (sw && path) + { + if (!(pidl = ILCreateFromPathW(path))) + { + ERR("Failed to create PIDL for %s.\n", debugstr_w(path)); + IShellWindows_Release(sw); + return; + } + + variant_from_pidl(&var, pidl); + V_VT(&empty_var) = VT_EMPTY; + if (IShellWindows_FindWindowSW(sw, &var, &empty_var, SWC_EXPLORER, &hwnd, 0, &dispatch) == S_OK) + { + TRACE("Found window %#x already browsing path %s.\n", hwnd, debugstr_w(path)); + SetForegroundWindow((HWND)(LONG_PTR)hwnd); + IShellWindows_Release(sw); + return; + } + ILFree(pidl); + VariantClear(&var); + } memset(nav_buttons,0,sizeof(nav_buttons)); @@ -376,6 +464,12 @@ static void make_explorer_window(IShellFolder* startFolder) CW_USEDEFAULT,CW_USEDEFAULT,default_width, default_height,NULL,NULL,explorer_hInstance,NULL); + if (sw) + { + IShellWindows_Register(sw, NULL, (LONG_PTR)info->main_window, SWC_EXPLORER, &info->sw_cookie); + info->sw = sw; + } + fs.ViewMode = FVM_DETAILS; fs.fFlags = FWF_AUTOARRANGE; @@ -439,11 +533,20 @@ static void make_explorer_window(IShellFolder* startFolder) SendMessageW(rebar,RB_INSERTBANDW,-1,(LPARAM)&band_info); events = make_explorer_events(info); IExplorerBrowser_Advise(info->browser,events,&info->advise_cookie); - IExplorerBrowser_BrowseToObject(info->browser,(IUnknown*)startFolder, - SBSP_ABSOLUTE); + + folder = get_starting_shell_folder(path); + IExplorerBrowser_BrowseToObject(info->browser, (IUnknown *)folder, SBSP_ABSOLUTE); + IShellFolder_Release(folder); + ShowWindow(info->main_window,SW_SHOWDEFAULT); UpdateWindow(info->main_window); IExplorerBrowserEvents_Release(events); + + while (GetMessageW(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } } static void update_window_size(explorer_info *info, int height, int width) @@ -568,6 +671,9 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L switch(uMsg) { case WM_DESTROY: + IShellWindows_Revoke(info->sw, info->sw_cookie); + IShellWindows_Release(info->sw); + IExplorerBrowser_Unadvise(browser,info->advise_cookie); IExplorerBrowser_Destroy(browser); IExplorerBrowser_Release(browser); @@ -625,47 +731,6 @@ static void register_explorer_window_class(void) RegisterClassExW(&window_class); } -static IShellFolder* get_starting_shell_folder(parameters_struct* params) -{ - IShellFolder* desktop,*folder; - LPITEMIDLIST root_pidl; - WCHAR *fullpath = NULL; - HRESULT hres; - DWORD size; - - SHGetDesktopFolder(&desktop); - if (!params->root[0]) - { - return desktop; - } - - size = GetFullPathNameW(params->root, 0, fullpath, NULL); - if (!size) - return desktop; - fullpath = heap_alloc(size * sizeof(WCHAR)); - GetFullPathNameW(params->root, size, fullpath, NULL); - - hres = IShellFolder_ParseDisplayName(desktop,NULL,NULL, - fullpath,NULL, - &root_pidl,NULL); - heap_free(fullpath); - - if(FAILED(hres)) - { - return desktop; - } - hres = IShellFolder_BindToObject(desktop,root_pidl,NULL, - &IID_IShellFolder, - (void**)&folder); - ILFree(root_pidl); - if(FAILED(hres)) - { - return desktop; - } - IShellFolder_Release(desktop); - return folder; -} - static WCHAR *copy_path_string(WCHAR *target, WCHAR *source) { INT i = 0; @@ -793,8 +858,6 @@ int WINAPI wWinMain(HINSTANCE hinstance, parameters_struct parameters; HRESULT hres; - MSG msg; - IShellFolder *folder; INITCOMMONCONTROLSEX init_info; memset(&parameters,0,sizeof(parameters)); @@ -817,13 +880,6 @@ int WINAPI wWinMain(HINSTANCE hinstance, ExitProcess(EXIT_FAILURE); } register_explorer_window_class(); - folder = get_starting_shell_folder(&parameters); - make_explorer_window(folder); - IShellFolder_Release(folder); - while(GetMessageW( &msg, NULL, 0, 0 ) != 0) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } + make_explorer_window(&parameters); return 0; }

1 0