December 2007 - Wine-Commits

Andrew Talbot : mapi32: Remove unneeded casts.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: d05a511d0b7bdd611ba711752de1603ac0375217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05a511d0b7bdd611ba711752… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 20 12:17:37 2007 +0000 mapi32: Remove unneeded casts. --- dlls/mapi32/imalloc.c | 8 ++++---- dlls/mapi32/prop.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index 1562b7b..c5b4570 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -127,9 +127,9 @@ static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) return LocalAlloc(LMEM_FIXED, cb); if (cb) - return LocalReAlloc((HANDLE) pv, cb, LMEM_MOVEABLE); + return LocalReAlloc(pv, cb, LMEM_MOVEABLE); - LocalFree((HANDLE) pv); + LocalFree(pv); return NULL; } @@ -139,7 +139,7 @@ static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv) { TRACE("(%p)->(%p)\n", iface, pv); - LocalFree((HANDLE) pv); + LocalFree(pv); } /************************************************************************** @@ -148,7 +148,7 @@ static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv) static DWORD WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) { TRACE("(%p)->(%p)\n", iface, pv); - return LocalSize((HANDLE) pv); + return LocalSize(pv); } /************************************************************************** diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 484e64a..e58df4d 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -928,7 +928,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, LPVOID lpNew, ULONG *lpCount) { static const BOOL bBadPtr = TRUE; /* Windows bug - Assumes source is bad */ - LPSPropValue lpDest = (LPSPropValue)lpProps; + LPSPropValue lpDest = lpProps; ULONG ulCount = cValues * sizeof(SPropValue); ULONG ulLen, i; int iter; @@ -964,7 +964,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, break; case PT_STRING8: ulLen = bBadPtr ? 0 : lstrlenA(lpDest->Value.lpszA) + 1u; - lpDest->Value.lpszA = (LPSTR)RELOC_PTR(lpDest->Value.lpszA); + lpDest->Value.lpszA = RELOC_PTR(lpDest->Value.lpszA); if (bBadPtr) ulLen = lstrlenA(lpDest->Value.lpszA) + 1u; ulCount += ulLen; @@ -999,7 +999,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, { ULONG ulStrLen = bBadPtr ? 0 : lstrlenA(lpDest->Value.MVszA.lppszA[i]) + 1u; - lpDest->Value.MVszA.lppszA[i] = (LPSTR)RELOC_PTR(lpDest->Value.MVszA.lppszA[i]); + lpDest->Value.MVszA.lppszA[i] = RELOC_PTR(lpDest->Value.MVszA.lppszA[i]); if (bBadPtr) ulStrLen = lstrlenA(lpDest->Value.MVszA.lppszA[i]) + 1u; ulCount += ulStrLen;

1 0

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

Dec. 21, 2007

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

Huw Davies : inetcomm: Implement IMimeBody_GetOffsets.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

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

Ivan Sinitsin : winefile: Save font settings in registry.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

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

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

Dec. 21, 2007

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 : ntdll: Increase the buffer size dynamically for relay debug lists.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

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

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

Dec. 21, 2007

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 : server: Don' t give out full access to the system process event.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

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 : advapi32: Start non-interactive services in a separate window station.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

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 : include: Added the mountmgr.h header.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: d1b356745b1fae791e9977154eaff06b5c639b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b356745b1fae791e9977154… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 16:41:35 2007 +0100 include: Added the mountmgr.h header. --- include/Makefile.in | 1 + include/ddk/mountmgr.h | 125 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 4300329..733f9bd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -130,6 +130,7 @@ SRCDIR_INCLUDES = \ ddk/compstui.h \ ddk/hidsdi.h \ ddk/imm.h \ + ddk/mountmgr.h \ ddk/ntddcdvd.h \ ddk/ntddser.h \ ddk/ntddtape.h \ diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h new file mode 100644 index 0000000..db0f21c --- /dev/null +++ b/include/ddk/mountmgr.h @@ -0,0 +1,125 @@ +/* + * Mount point manager definitions + * + * Copyright 2007 Alexandre Julliard + * + * 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 _MOUNTMGR_ +#define _MOUNTMGR_ + +#define MOUNTMGRCONTROLTYPE ((ULONG)'m') +#define MOUNTDEVCONTROLTYPE ((ULONG)'M') + +#if defined(__GNUC__) +#define MOUNTMGR_DEVICE_NAME (const WCHAR []){'\\','D','e','v','i','c','e','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0} +#define MOUNTMGR_DOS_DEVICE_NAME (const WCHAR []){'\\','\\','.','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0} +#elif defined(_MSC_VER) +#define MOUNTMGR_DEVICE_NAME L"\\Device\\MountPointManager" +#define MOUNTMGR_DOS_DEVICE_NAME L"\\\\.\\MountPointManager" +#else +static const WCHAR MOUNTMGR_DEVICE_NAME[] = {'\\','D','e','v','i','c','e','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}; +static const WCHAR MOUNTMGR_DOS_DEVICE_NAME[] = {'\\','\\','.','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}; +#endif + + +#define IOCTL_MOUNTMGR_CREATE_POINT CTL_CODE(MOUNTMGRCONTROLTYPE, 0, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_DELETE_POINTS CTL_CODE(MOUNTMGRCONTROLTYPE, 1, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_QUERY_POINTS CTL_CODE(MOUNTMGRCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY CTL_CODE(MOUNTMGRCONTROLTYPE, 3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER CTL_CODE(MOUNTMGRCONTROLTYPE, 4, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_AUTO_DL_ASSIGNMENTS CTL_CODE(MOUNTMGRCONTROLTYPE, 5, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED CTL_CODE(MOUNTMGRCONTROLTYPE, 6, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED CTL_CODE(MOUNTMGRCONTROLTYPE, 7, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_CHANGE_NOTIFY CTL_CODE(MOUNTMGRCONTROLTYPE, 8, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MOUNTMGR_KEEP_LINKS_WHEN_OFFLINE CTL_CODE(MOUNTMGRCONTROLTYPE, 9, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_CHECK_UNPROCESSED_VOLUMES CTL_CODE(MOUNTMGRCONTROLTYPE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION CTL_CODE(MOUNTMGRCONTROLTYPE, 11, METHOD_BUFFERED, FILE_READ_ACCESS) + +typedef struct _MOUNTMGR_CREATE_POINT_INPUT +{ + USHORT SymbolicLinkNameOffset; + USHORT SymbolicLinkNameLength; + USHORT DeviceNameOffset; + USHORT DeviceNameLength; +} MOUNTMGR_CREATE_POINT_INPUT, *PMOUNTMGR_CREATE_POINT_INPUT; + +typedef struct _MOUNTMGR_MOUNT_POINT +{ + ULONG SymbolicLinkNameOffset; + USHORT SymbolicLinkNameLength; + ULONG UniqueIdOffset; + USHORT UniqueIdLength; + ULONG DeviceNameOffset; + USHORT DeviceNameLength; +} MOUNTMGR_MOUNT_POINT, *PMOUNTMGR_MOUNT_POINT; + +typedef struct _MOUNTMGR_MOUNT_POINTS +{ + ULONG Size; + ULONG NumberOfMountPoints; + MOUNTMGR_MOUNT_POINT MountPoints[1]; +} MOUNTMGR_MOUNT_POINTS, *PMOUNTMGR_MOUNT_POINTS; + +typedef struct _MOUNTMGR_DRIVE_LETTER_TARGET +{ + USHORT DeviceNameLength; + WCHAR DeviceName[1]; +} MOUNTMGR_DRIVE_LETTER_TARGET, *PMOUNTMGR_DRIVE_LETTER_TARGET; + +typedef struct _MOUNTMGR_DRIVE_LETTER_INFORMATION +{ + BOOLEAN DriveLetterWasAssigned; + UCHAR CurrentDriveLetter; +} MOUNTMGR_DRIVE_LETTER_INFORMATION, *PMOUNTMGR_DRIVE_LETTER_INFORMATION; + +typedef struct _MOUNTMGR_VOLUME_MOUNT_POINT +{ + USHORT SourceVolumeNameOffset; + USHORT SourceVolumeNameLength; + USHORT TargetVolumeNameOffset; + USHORT TargetVolumeNameLength; +} MOUNTMGR_VOLUME_MOUNT_POINT, *PMOUNTMGR_VOLUME_MOUNT_POINT; + +typedef struct _MOUNTMGR_CHANGE_NOTIFY_INFO +{ + ULONG EpicNumber; +} MOUNTMGR_CHANGE_NOTIFY_INFO, *PMOUNTMGR_CHANGE_NOTIFY_INFO; + +typedef struct _MOUNTMGR_TARGET_NAME +{ + USHORT DeviceNameLength; + WCHAR DeviceName[1]; +} MOUNTMGR_TARGET_NAME, *PMOUNTMGR_TARGET_NAME; + +#define MOUNTMGR_IS_DRIVE_LETTER(s) \ + ((s)->Length == 28 && \ + (s)->Buffer[0] == '\\' && (s)->Buffer[1] == 'D' && (s)->Buffer[2] == 'o' && \ + (s)->Buffer[3] == 's' && (s)->Buffer[4] == 'D' && (s)->Buffer[5] == 'e' && \ + (s)->Buffer[6] == 'v' && (s)->Buffer[7] == 'i' && (s)->Buffer[8] == 'c' && \ + (s)->Buffer[9] == 'e' && (s)->Buffer[10] == 's' && (s)->Buffer[11] == '\\' && \ + (s)->Buffer[12] >= 'A' && (s)->Buffer[12] <= 'Z' && (s)->Buffer[13] == ':') + +#define MOUNTMGR_IS_VOLUME_NAME(s) \ + (((s)->Length == 96 || ((s)->Length == 98 && (s)->Buffer[48] == '\\')) && \ + (s)->Buffer[0] == '\\' && ((s)->Buffer[1] == '?' || (s)->Buffer[1] == '\\') && \ + (s)->Buffer[2] == '?' && (s)->Buffer[3] == '\\' && (s)->Buffer[4] == 'V' && \ + (s)->Buffer[5] == 'o' && (s)->Buffer[6] == 'l' && (s)->Buffer[7] == 'u' && \ + (s)->Buffer[8] == 'm' && (s)->Buffer[9] == 'e' && (s)->Buffer[10] == '{' && \ + (s)->Buffer[19] == '-' && (s)->Buffer[24] == '-' && (s)->Buffer[29] == '-' && \ + (s)->Buffer[34] == '-' && (s)->Buffer[47] == '}') + +#endif /* _MOUNTMGR_ */

1 0