wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Jacek Caban : dmusicf.h: Move typedef below enum declarations.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: f6c3b07e9f5acf01c76520462f1ffdde5e711522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6c3b07e9f5acf01c7652046… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 14:46:50 2020 +0200 dmusicf.h: Move typedef below enum declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dmusicf.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/dmusicf.h b/include/dmusicf.h index bf488e563e..ebf5e551e6 100644 --- a/include/dmusicf.h +++ b/include/dmusicf.h @@ -320,11 +320,6 @@ extern "C" { /***************************************************************************** * Enumerations */ -/* typedef definitions */ -typedef enum enumDMUS_VARIATIONT_TYPES DMUS_VARIATIONT_TYPES; -typedef enum enumDMUS_EMBELLISHT_TYPES DMUS_EMBELLISHT_TYPES; -typedef enum enumDMUS_PATTERNT_TYPES DMUS_PATTERNT_TYPES; - /* actual enumerations */ enum enumDMUS_VARIATIONT_TYPES { DMUS_VARIATIONT_SEQUENTIAL = 0x0, @@ -353,6 +348,10 @@ enum enumDMUS_PATTERNT_TYPES { DMUS_PATTERNT_RANDOM_ROW = 0x5 }; +typedef enum enumDMUS_VARIATIONT_TYPES DMUS_VARIATIONT_TYPES; +typedef enum enumDMUS_EMBELLISHT_TYPES DMUS_EMBELLISHT_TYPES; +typedef enum enumDMUS_PATTERNT_TYPES DMUS_PATTERNT_TYPES; + /***************************************************************************** * Structures

1 0

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

18 May '20

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

Jacek Caban : winnt.h: Add ARRAYSIZE macro.
by Alexandre Julliard 18 May '20

18 May '20

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

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

18 May '20

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 18 May '20

18 May '20

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 18 May '20

18 May '20

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

Emilio Cobos Álvarez : api-ms-win-crt-private-l1-1-0: Implement _o__fileno, _o__setmode, _o__wfopen.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 950dac9104fe5620520c090ecf441041a445dae6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=950dac9104fe5620520c090e… Author: Emilio Cobos Álvarez <emilio(a)crisal.io> Date: Fri May 15 19:48:27 2020 +0200 api-ms-win-crt-private-l1-1-0: Implement _o__fileno, _o__setmode, _o__wfopen. Signed-off-by: Emilio Cobos Álvarez <emilio(a)crisal.io> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 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 8d6ff5e89f..8e00661c8c 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 @@ -270,7 +270,7 @@ @ stub _o__fgetwchar @ stub _o__filelength @ stub _o__filelengthi64 -@ stub _o__fileno +@ cdecl _o__fileno(ptr) ucrtbase._o__fileno @ stub _o__findclose @ stub _o__findfirst32 @ stub _o__findfirst32i64 @@ -673,7 +673,7 @@ @ stub _o__set_thread_local_invalid_parameter_handler @ stub _o__seterrormode @ stub _o__setmbcp -@ stub _o__setmode +@ cdecl _o__setmode(long long) ucrtbase._o__setmode @ stub _o__setsystime @ stub _o__sleep @ stub _o__sopen @@ -832,7 +832,7 @@ @ stub _o__wfindnext32i64 @ stub _o__wfindnext64 @ stub _o__wfindnext64i32 -@ stub _o__wfopen +@ cdecl _o__wfopen(wstr wstr) ucrtbase._o__wfopen @ stub _o__wfopen_s @ stub _o__wfreopen @ stub _o__wfreopen_s diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d7c0700696..2d77c74274 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -934,7 +934,7 @@ @ stub _o__fgetwchar @ stub _o__filelength @ stub _o__filelengthi64 -@ stub _o__fileno +@ cdecl _o__fileno(ptr) MSVCRT__fileno @ stub _o__findclose @ stub _o__findfirst32 @ stub _o__findfirst32i64 @@ -1337,7 +1337,7 @@ @ stub _o__set_thread_local_invalid_parameter_handler @ stub _o__seterrormode @ stub _o__setmbcp -@ stub _o__setmode +@ cdecl _o__setmode(long long) MSVCRT__setmode @ stub _o__setsystime @ stub _o__sleep @ stub _o__sopen @@ -1496,7 +1496,7 @@ @ stub _o__wfindnext32i64 @ stub _o__wfindnext64 @ stub _o__wfindnext64i32 -@ stub _o__wfopen +@ cdecl _o__wfopen(wstr wstr) MSVCRT__wfopen @ stub _o__wfopen_s @ stub _o__wfreopen @ stub _o__wfreopen_s

1 0

Gijs Vermeulen : ucrtbase: Add more _o forwards.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 8119865d479fe54bac27f996f153091b479735bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8119865d479fe54bac27f996… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 15 17:35:26 2020 +0200 ucrtbase: Add more _o forwards. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49146 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 502 ++++++++++---------- dlls/ucrtbase/ucrtbase.spec | 504 ++++++++++----------- 2 files changed, 503 insertions(+), 503 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8119865d479fe54bac27…

1 0

Paul Gofman : ntoskrnl.exe: Emulate full user shared data area range.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: b40be1d43bba7749d9c45dcd42219393300c8124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b40be1d43bba7749d9c45dcd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon May 18 12:25:50 2020 +0300 ntoskrnl.exe: Emulate full user shared data area range. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 0973b3a80a..dad4e5d660 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -33,6 +33,8 @@ #include "wine/debug.h" #include "wine/exception.h" +#define KSHARED_USER_DATA_PAGE_SIZE 0x1000 + #ifdef __i386__ WINE_DEFAULT_DEBUG_CHANNEL(int); @@ -790,9 +792,11 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) unsigned int data_size = (instr[1] == 0xb7) ? 2 : 1; SIZE_T offset = data - user_shared_data; - if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { ULONGLONG temp = 0; + + TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); memcpy( &temp, wine_user_shared_data + offset, data_size ); store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex ); context->Rip += prefixlen + len + 2; @@ -811,8 +815,9 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) unsigned int data_size = (*instr == 0x8b) ? get_op_size( long_op, rex ) : 1; SIZE_T offset = data - user_shared_data; - if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { + TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); switch (*instr) { case 0x8a: store_reg_byte( context, instr[1], wine_user_shared_data + offset, rex ); break; @@ -832,8 +837,9 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) SIZE_T offset = data - user_shared_data; len = long_addr ? sizeof(DWORD64) : sizeof(DWORD); - if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { + TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); memcpy( &context->Rax, wine_user_shared_data + offset, data_size ); context->Rip += prefixlen + len + 1; return ExceptionContinueExecution;

1 0

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

18 May '20

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

← Newer
1
...
33
34
35
36
37
38
39
...
75
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 May 2020