December 2007 - Wine-commits

Alex Villacís Lasso : comdlg32: Fix another regression in 3.1-style file dialog from LB_DIR fix.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: c06cfa85c2ab8f792c54bf441d0b0ff9db84e5f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c06cfa85c2ab8f792c54bf441… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Dec 20 11:54:20 2007 -0500 comdlg32: Fix another regression in 3.1-style file dialog from LB_DIR fix. --- dlls/comdlg32/filedlg31.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index d2e3163..5b76d8e 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -145,8 +145,7 @@ static BOOL FD31_ScanDir(HWND hWnd, LPCWSTR newPath) if (scptr) *scptr = 0; while (*filter == ' ') filter++; TRACE("Using file spec %s\n", debugstr_w(filter)); - if (SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter) == LB_ERR) - return FALSE; + SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter); if (scptr) *scptr = ';'; filter = (scptr) ? (scptr + 1) : 0; }

1 0

Kirill K. Smirnov : winhelp: When we reuse window structure, old brush should not be reused.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 72c5aea60063f7126b3c9594c1d018ee215dd8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72c5aea60063f7126b3c9594c… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Dec 20 20:37:03 2007 +0300 winhelp: When we reuse window structure, old brush should not be reused. --- programs/winhelp/winhelp.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index ab4999b..f92a12c 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -463,8 +463,8 @@ static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, win->hButtonBoxWnd = oldwin->hButtonBoxWnd; win->hTextWnd = oldwin->hTextWnd; win->hHistoryWnd = oldwin->hHistoryWnd; - oldwin->hMainWnd = oldwin->hButtonBoxWnd = oldwin->hTextWnd = oldwin->hHistoryWnd = 0; - win->hBrush = oldwin->hBrush; + oldwin->hMainWnd = oldwin->hButtonBoxWnd = oldwin->hTextWnd = oldwin->hHistoryWnd = 0; + win->hBrush = CreateSolidBrush(win->info->sr_color); SetWindowLong(win->hMainWnd, 0, (LONG)win); SetWindowLong(win->hButtonBoxWnd, 0, (LONG)win); @@ -1253,7 +1253,6 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, if (hWnd == Globals.hPopupWnd) Globals.hPopupWnd = 0; bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main")); - DeleteObject(win->hBrush); WINHELP_DeleteWindow(win); @@ -1834,6 +1833,8 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) if (win->hShadowWnd) DestroyWindow(win->hShadowWnd); if (win->hHistoryWnd) DestroyWindow(win->hHistoryWnd); + DeleteObject(win->hBrush); + for (i = 0; i < win->histIndex; i++) { HLPFILE_FreeHlpFile(win->history[i]->file);

1 0

Alexandre Julliard : server: Don' t count system processes as users of a desktop.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: ffbeae78f76f4b6c1ce2d51093473044b9f49522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbeae78f76f4b6c1ce2d5109… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 16:43:14 2007 +0100 server: Don't count system processes as users of a desktop. --- server/process.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/process.c b/server/process.c index 26b1863..23a4ec0 100644 --- a/server/process.c +++ b/server/process.c @@ -601,7 +601,7 @@ static void process_killed( struct process *process ) assert( list_empty( &process->thread_list )); process->end_time = current_time; - close_process_desktop( process ); + if (!process->is_system) close_process_desktop( process ); handles = process->handles; process->handles = NULL; if (handles) release_object( handles ); @@ -1191,6 +1191,7 @@ DECL_HANDLER(make_process_system) if (!process->is_system) { process->is_system = 1; + close_process_desktop( process ); if (!--user_processes) set_event( user_process_event ); } }

1 0

Alexandre Julliard : server: Don' t give out full access to the system process event.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 11750af32961f69da96cc04712f71cb4fc285383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11750af32961f69da96cc0471… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 16:43:31 2007 +0100 server: Don't give out full access to the system process event. --- server/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/process.c b/server/process.c index 23a4ec0..a78eac4 100644 --- a/server/process.c +++ b/server/process.c @@ -1185,7 +1185,7 @@ DECL_HANDLER(make_process_system) make_object_static( (struct object *)user_process_event ); } - if (!(reply->event = alloc_handle( current->process, user_process_event, EVENT_ALL_ACCESS, 0 ))) + if (!(reply->event = alloc_handle( current->process, user_process_event, SYNCHRONIZE, 0 ))) return; if (!process->is_system)

1 0

Alexandre Julliard : explorer: It no longer needs to be made a system process.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: a32873bfcc3f0e96cb7853797d3930668720a93a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32873bfcc3f0e96cb7853797… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 16:43:47 2007 +0100 explorer: It no longer needs to be made a system process. --- programs/explorer/desktop.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 743da35..8d03094 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -31,8 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769)) #define DESKTOP_ALL_ACCESS 0x01ff -extern HANDLE __wine_make_process_system(void); - static BOOL using_root; /* window procedure for the desktop window */ @@ -231,10 +229,6 @@ void manage_desktop( char *arg ) /* run the desktop message loop */ if (hwnd) { - /* we don't use the system process event, the server - * posts a WM_CLOSE when the last desktop user is gone */ - CloseHandle( __wine_make_process_system() ); - WINE_TRACE( "desktop message loop starting on hwnd %p\n", hwnd ); while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg ); WINE_TRACE( "desktop message loop exiting for hwnd %p\n", hwnd );

1 0

Alexandre Julliard : advapi32: Start non-interactive services in a separate window station.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 7593fac6327bc8e95848801c83ae00cfee547c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7593fac6327bc8e95848801c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 16:44:36 2007 +0100 advapi32: Start non-interactive services in a separate window station. --- dlls/advapi32/service.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f55077a..8a775ad 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1578,6 +1578,12 @@ static DWORD service_start_process(struct sc_service *hsvc, LPDWORD ppid) handles[0] = service_get_event_handle( hsvc->name ); ZeroMemory(&si, sizeof(STARTUPINFOW)); si.cb = sizeof(STARTUPINFOW); + if (!(svc_type & SERVICE_INTERACTIVE_PROCESS)) + { + static WCHAR desktopW[] = {'_','_','w','i','n','e','s','e','r','v','i','c','e','_','w','i','n','s','t','a','t','i','o','n','\\','D','e','f','a','u','l','t',0}; + si.lpDesktop = desktopW; + } + r = CreateProcessW(NULL, path, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); if (r) {

1 0

Alexandre Julliard : ntdll: Increase the buffer size dynamically for relay debug lists.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 2835dc9fc9519799d931b88da76aeca0866dde0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2835dc9fc9519799d931b88da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 16:59:07 2007 +0100 ntdll: Increase the buffer size dynamically for relay debug lists. --- dlls/ntdll/relay.c | 100 +++++++++++++++++++++------------------------------ 1 files changed, 41 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index a50ec34..2f819c4 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -27,6 +27,8 @@ #include <stdarg.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" #include "wine/exception.h" @@ -133,6 +135,37 @@ static const WCHAR **build_list( const WCHAR *buffer ) return ret; } +/*********************************************************************** + * load_list_value + * + * Load a function list from a registry value. + */ +static const WCHAR **load_list( HKEY hkey, const WCHAR *value ) +{ + char initial_buffer[4096]; + char *buffer = initial_buffer; + DWORD count; + NTSTATUS status; + UNICODE_STRING name; + const WCHAR **list = NULL; + + RtlInitUnicodeString( &name, value ); + status = NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count ); + if (status == STATUS_BUFFER_OVERFLOW) + { + buffer = RtlAllocateHeap( GetProcessHeap(), 0, count ); + status = NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, count, &count ); + } + if (status == STATUS_SUCCESS) + { + WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data; + list = build_list( str ); + if (list) TRACE( "%s = %s\n", debugstr_w(value), debugstr_w(str) ); + } + + if (buffer != initial_buffer) RtlFreeHeap( GetProcessHeap(), 0, buffer ); + return list; +} /*********************************************************************** * init_debug_lists @@ -143,10 +176,7 @@ static void init_debug_lists(void) { OBJECT_ATTRIBUTES attr; UNICODE_STRING name; - char buffer[1024]; HANDLE root, hkey; - DWORD count; - WCHAR *str; static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\', 'D','e','b','u','g',0}; @@ -176,62 +206,14 @@ static void init_debug_lists(void) NtClose( root ); if (!hkey) return; - str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data; - RtlInitUnicodeString( &name, RelayIncludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) - { - TRACE("RelayInclude = %s\n", debugstr_w(str) ); - debug_relay_includelist = build_list( str ); - } - - RtlInitUnicodeString( &name, RelayExcludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) - { - TRACE( "RelayExclude = %s\n", debugstr_w(str) ); - debug_relay_excludelist = build_list( str ); - } - - RtlInitUnicodeString( &name, SnoopIncludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) - { - TRACE_(snoop)( "SnoopInclude = %s\n", debugstr_w(str) ); - debug_snoop_includelist = build_list( str ); - } - - RtlInitUnicodeString( &name, SnoopExcludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) - { - TRACE_(snoop)( "SnoopExclude = %s\n", debugstr_w(str) ); - debug_snoop_excludelist = build_list( str ); - } - - RtlInitUnicodeString( &name, RelayFromIncludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) - { - TRACE("RelayFromInclude = %s\n", debugstr_w(str) ); - debug_from_relay_includelist = build_list( str ); - } - - RtlInitUnicodeString( &name, RelayFromExcludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) - { - TRACE( "RelayFromExclude = %s\n", debugstr_w(str) ); - debug_from_relay_excludelist = build_list( str ); - } - - RtlInitUnicodeString( &name, SnoopFromIncludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) - { - TRACE_(snoop)("SnoopFromInclude = %s\n", debugstr_w(str) ); - debug_from_snoop_includelist = build_list( str ); - } - - RtlInitUnicodeString( &name, SnoopFromExcludeW ); - if (!NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count )) - { - TRACE_(snoop)( "SnoopFromExclude = %s\n", debugstr_w(str) ); - debug_from_snoop_excludelist = build_list( str ); - } + debug_relay_includelist = load_list( hkey, RelayIncludeW ); + debug_relay_excludelist = load_list( hkey, RelayExcludeW ); + debug_snoop_includelist = load_list( hkey, SnoopIncludeW ); + debug_snoop_excludelist = load_list( hkey, SnoopExcludeW ); + debug_from_relay_includelist = load_list( hkey, RelayFromIncludeW ); + debug_from_relay_excludelist = load_list( hkey, RelayFromExcludeW ); + debug_from_snoop_includelist = load_list( hkey, SnoopFromIncludeW ); + debug_from_snoop_excludelist = load_list( hkey, SnoopFromExcludeW ); NtClose( hkey ); }

1 0

Ivan Sinitsin : winefile: Save font settings in registry.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 7a465ce9043336545d0b16c5c114be3b52580451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a465ce9043336545d0b16c5c… Author: Ivan Sinitsin <ivan(a)etersoft.ru> Date: Thu Dec 20 16:15:16 2007 +0300 winefile: Save font settings in registry. --- programs/winefile/winefile.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 0574c37..4805a6b 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -66,6 +66,7 @@ static const WCHAR reg_start_x[] = { 's','t','a','r','t','X','\0'}; static const WCHAR reg_start_y[] = { 's','t','a','r','t','Y','\0'}; static const WCHAR reg_width[] = { 'w','i','d','t','h','\0'}; static const WCHAR reg_height[] = { 'h','e','i','g','h','t','\0'}; +static const WCHAR reg_logfont[] = { 'l','o','g','f','o','n','t','\0'}; enum ENTRY_TYPE { ET_WINDOWS, @@ -1645,6 +1646,7 @@ static windowOptions load_registry_settings(void) DWORD type; HKEY hKey; windowOptions opts; + LOGFONT logfont; RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hKey ); @@ -1666,9 +1668,14 @@ static windowOptions load_registry_settings(void) if( RegQueryValueExW( hKey, reg_height, NULL, &type, (LPBYTE) &opts.height, &size ) != ERROR_SUCCESS ) opts.height = CW_USEDEFAULT; + size=sizeof(logfont); + if( RegQueryValueExW( hKey, reg_logfont, NULL, &type, + (LPBYTE) &logfont, &size ) != ERROR_SUCCESS ) + GetObject(GetStockObject(DEFAULT_GUI_FONT),sizeof(logfont),&logfont); RegCloseKey( hKey ); + Globals.hfont = CreateFontIndirect(&logfont); return opts; } @@ -1677,6 +1684,7 @@ static void save_registry_settings(void) WINDOWINFO wi; HKEY hKey; INT width, height; + LOGFONT logfont; wi.cbSize = sizeof( WINDOWINFO ); GetWindowInfo(Globals.hMainWnd, &wi); @@ -1704,6 +1712,9 @@ static void save_registry_settings(void) (LPBYTE) &width, sizeof(DWORD) ); RegSetValueExW( hKey, reg_height, 0, REG_DWORD, (LPBYTE) &height, sizeof(DWORD) ); + GetObject(Globals.hfont, sizeof(logfont), &logfont); + RegSetValueExW( hKey, reg_logfont, 0, REG_BINARY, + (LPBYTE) &logfont, sizeof(LOGFONT) ); /* TODO: Save more settings here (List vs. Detailed View, etc.) */ RegCloseKey( hKey );

1 0

Huw Davies : inetcomm: Implement IMimeBody_GetOffsets.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 3fa10f79f472fb9ded091e1f7e09b00b05ba77ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa10f79f472fb9ded091e1f7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 20 15:14:35 2007 +0000 inetcomm: Implement IMimeBody_GetOffsets. --- dlls/inetcomm/mimeole.c | 24 ++++++++++++++++++++++-- dlls/inetcomm/tests/mimeole.c | 9 +++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6b5c75d..a353e5c 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -107,6 +107,7 @@ typedef struct MimeBody ENCODINGTYPE encoding; void *data; IID data_iid; + BODYOFFSETS body_offsets; } MimeBody; static inline MimeBody *impl_from_IMimeBody( IMimeBody *iface ) @@ -857,8 +858,13 @@ static HRESULT WINAPI MimeBody_GetOffsets( IMimeBody* iface, LPBODYOFFSETS pOffsets) { - FIXME("stub\n"); - return E_NOTIMPL; + MimeBody *This = impl_from_IMimeBody(iface); + TRACE("(%p)->(%p)\n", This, pOffsets); + + *pOffsets = This->body_offsets; + + if(This->body_offsets.cbBodyEnd == 0) return MIME_E_NO_DATA; + return S_OK; } static HRESULT WINAPI MimeBody_GetCurrentEncoding( @@ -1037,11 +1043,21 @@ static IMimeBodyVtbl body_vtbl = MimeBody_GetHandle }; +static HRESULT MimeBody_set_offsets(MimeBody *body, const BODYOFFSETS *offsets) +{ + TRACE("setting offsets to %d, %d, %d, %d\n", offsets->cbBoundaryStart, + offsets->cbHeaderStart, offsets->cbBodyStart, offsets->cbBodyEnd); + + body->body_offsets = *offsets; + return S_OK; +} + #define FIRST_CUSTOM_PROP_ID 0x100 HRESULT MimeBody_create(IUnknown *outer, void **obj) { MimeBody *This; + BODYOFFSETS body_offsets; *obj = NULL; @@ -1062,6 +1078,10 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) This->data = NULL; This->data_iid = IID_NULL; + body_offsets.cbBoundaryStart = body_offsets.cbHeaderStart = 0; + body_offsets.cbBodyStart = body_offsets.cbBodyEnd = 0; + MimeBody_set_offsets(This, &body_offsets); + *obj = (IMimeBody *)&This->lpVtbl; return S_OK; } diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index f5cd619..30451f3 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -94,6 +94,7 @@ static void test_CreateBody(void) ULONG count, found_param, i; MIMEPARAMINFO *param_info; IMimeAllocator *alloc; + BODYOFFSETS offsets; hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); @@ -138,6 +139,14 @@ static void test_CreateBody(void) ok(hr == S_OK, "ret %08x\n", hr); ok(enc == IET_8BIT, "encoding %d\n", enc); + memset(&offsets, 0xcc, sizeof(offsets)); + hr = IMimeBody_GetOffsets(body, &offsets); + ok(hr == MIME_E_NO_DATA, "ret %08x\n", hr); + ok(offsets.cbBoundaryStart == 0, "got %d\n", offsets.cbBoundaryStart); + ok(offsets.cbHeaderStart == 0, "got %d\n", offsets.cbHeaderStart); + ok(offsets.cbBodyStart == 0, "got %d\n", offsets.cbBodyStart); + ok(offsets.cbBodyEnd == 0, "got %d\n", offsets.cbBodyEnd); + hr = MimeOleGetAllocator(&alloc); ok(hr == S_OK, "ret %08x\n", hr);

1 0

Alexandre Julliard : wineboot: Convert the rest of the code to Unicode.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 4a58b2847c50a3695e8a9fd4df70fbad7872b9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a58b2847c50a3695e8a9fd4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 16:16:17 2007 +0100 wineboot: Convert the rest of the code to Unicode. Fix Windows File Protection handling to use the correct system directory. --- programs/wineboot/wineboot.c | 105 +++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 61 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 6e21b17..99ba1b4 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -77,6 +77,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); extern BOOL shutdown_close_windows( BOOL force ); extern void kill_processes( BOOL kill_desktop ); +static WCHAR windowsdir[MAX_PATH]; /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. @@ -483,79 +484,81 @@ end: * known good versions. The only programs that should install into this dll * cache are Windows Updates and IE (which is treated like a Windows Update) * - * Implementing this allows installing ie in win2k mode to actaully install the + * Implementing this allows installing ie in win2k mode to actually install the * system dlls that we expect and need */ static int ProcessWindowsFileProtection(void) { - WIN32_FIND_DATA finddata; - LPSTR custom_dllcache = NULL; - static CHAR default_dllcache[] = "C:\\Windows\\System32\\dllcache"; + static const WCHAR winlogonW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'W','i','n','l','o','g','o','n',0}; + static const WCHAR cachedirW[] = {'S','F','C','D','l','l','C','a','c','h','e','D','i','r',0}; + static const WCHAR dllcacheW[] = {'\\','d','l','l','c','a','c','h','e','\\','*',0}; + static const WCHAR wildcardW[] = {'\\','*',0}; + WIN32_FIND_DATAW finddata; HANDLE find_handle; BOOL find_rc; DWORD rc; HKEY hkey; - LPSTR dllcache; - CHAR find_string[MAX_PATH]; - CHAR windowsdir[MAX_PATH]; + LPWSTR dllcache = NULL; - rc = RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", &hkey ); - if (rc == ERROR_SUCCESS) + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, winlogonW, &hkey )) { DWORD sz = 0; - rc = RegQueryValueEx( hkey, "SFCDllCacheDir", 0, NULL, NULL, &sz); - if (rc == ERROR_MORE_DATA) + if (!RegQueryValueExW( hkey, cachedirW, 0, NULL, NULL, &sz)) { - sz++; - custom_dllcache = HeapAlloc(GetProcessHeap(),0,sz); - RegQueryValueEx( hkey, "SFCDllCacheDir", 0, NULL, (LPBYTE)custom_dllcache, &sz); + sz += sizeof(WCHAR); + dllcache = HeapAlloc(GetProcessHeap(),0,sz + sizeof(wildcardW)); + RegQueryValueExW( hkey, cachedirW, 0, NULL, (LPBYTE)dllcache, &sz); + strcatW( dllcache, wildcardW ); } } RegCloseKey(hkey); - if (custom_dllcache) - dllcache = custom_dllcache; - else - dllcache = default_dllcache; - - strcpy(find_string,dllcache); - strcat(find_string,"\\*.*"); - - GetWindowsDirectory(windowsdir,MAX_PATH); + if (!dllcache) + { + DWORD sz = GetSystemDirectoryW( NULL, 0 ); + dllcache = HeapAlloc( GetProcessHeap(), 0, sz * sizeof(WCHAR) + sizeof(dllcacheW)); + GetSystemDirectoryW( dllcache, sz ); + strcatW( dllcache, dllcacheW ); + } - find_handle = FindFirstFile(find_string,&finddata); + find_handle = FindFirstFileW(dllcache,&finddata); find_rc = find_handle != INVALID_HANDLE_VALUE; while (find_rc) { - CHAR targetpath[MAX_PATH]; - CHAR currentpath[MAX_PATH]; + static const WCHAR dotW[] = {'.',0}; + static const WCHAR dotdotW[] = {'.','.',0}; + WCHAR targetpath[MAX_PATH]; + WCHAR currentpath[MAX_PATH]; UINT sz; UINT sz2; - CHAR tempfile[MAX_PATH]; + WCHAR tempfile[MAX_PATH]; - if (strcmp(finddata.cFileName,".") == 0 || - strcmp(finddata.cFileName,"..") == 0) + if (strcmpW(finddata.cFileName,dotW) == 0 || strcmpW(finddata.cFileName,dotdotW) == 0) { - find_rc = FindNextFile(find_handle,&finddata); + find_rc = FindNextFileW(find_handle,&finddata); continue; } sz = MAX_PATH; sz2 = MAX_PATH; - VerFindFile(VFFF_ISSHAREDFILE, finddata.cFileName, windowsdir, - windowsdir, currentpath, &sz, targetpath,&sz2); + VerFindFileW(VFFF_ISSHAREDFILE, finddata.cFileName, windowsdir, + windowsdir, currentpath, &sz, targetpath, &sz2); sz = MAX_PATH; - rc = VerInstallFile(0, finddata.cFileName, finddata.cFileName, - dllcache, targetpath, currentpath, tempfile,&sz); + rc = VerInstallFileW(0, finddata.cFileName, finddata.cFileName, + dllcache, targetpath, currentpath, tempfile, &sz); if (rc != ERROR_SUCCESS) { - WINE_ERR("WFP: %s error 0x%x\n",finddata.cFileName,rc); - DeleteFile(tempfile); + WINE_ERR("WFP: %s error 0x%x\n",wine_dbgstr_w(finddata.cFileName),rc); + DeleteFileW(tempfile); } - find_rc = FindNextFile(find_handle,&finddata); + find_rc = FindNextFileW(find_handle,&finddata); } FindClose(find_handle); - HeapFree(GetProcessHeap(),0,custom_dllcache); + HeapFree(GetProcessHeap(),0,dllcache); return 1; } @@ -714,36 +717,16 @@ static const struct option long_options[] = int main( int argc, char *argv[] ) { /* First, set the current directory to SystemRoot */ - TCHAR gen_path[MAX_PATH]; - DWORD res; int optc; int end_session = 0, force = 0, kill = 0, restart = 0, shutdown = 0; - res=GetWindowsDirectory( gen_path, sizeof(gen_path) ); - - if( res==0 ) + GetWindowsDirectoryW( windowsdir, MAX_PATH ); + if( !SetCurrentDirectoryW( windowsdir ) ) { - WINE_ERR("Couldn't get the windows directory - error %d\n", - GetLastError() ); - - return 100; - } - - if( res>=sizeof(gen_path) ) - { - WINE_ERR("Windows path too long (%d)\n", res ); - - return 100; - } - - if( !SetCurrentDirectory( gen_path ) ) - { - WINE_ERR("Cannot set the dir to %s (%d)\n", gen_path, GetLastError() ); - + WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); return 100; } - while ((optc = getopt_long(argc, argv, short_options, long_options, NULL )) != -1) { switch(optc)

1 0