February 2006 - Wine-Commits

Hans Leidekker : mapi32: Prevent freeing non-allocated memory.
by Alexandre Julliard Feb. 9, 2006

Feb. 9, 2006

Module: wine Branch: refs/heads/master Commit: 32affb8ac566503f51f335c923a10cac78bd3772 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32affb8ac566503f51f335c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Feb 9 12:07:18 2006 +0100 mapi32: Prevent freeing non-allocated memory. --- dlls/mapi32/sendmail.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 265ec8a..3d9c545 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -63,7 +63,7 @@ ULONG WINAPI MAPISendMail( LHANDLE sessi unsigned int i, to_count = 0, cc_count = 0, bcc_count = 0; unsigned int to_size = 0, cc_size = 0, bcc_size = 0, subj_size, body_size; - char *address = "", *to = "", *cc = "", *bcc = "", *subject, *body; + char *address = "", *to = NULL, *cc = NULL, *bcc = NULL, *subject, *body; static const char format[] = "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; char *mailto = NULL, *escape = NULL; @@ -173,7 +173,7 @@ ULONG WINAPI MAPISendMail( LHANDLE sessi mailto = HeapAlloc( GetProcessHeap(), 0, size ); if (!mailto) goto exit; - sprintf( mailto, format, to, subject, cc, bcc, body ); + sprintf( mailto, format, to ? to : "", subject, cc ? cc : "", bcc ? bcc : "", body ); size = 0; res = UrlEscapeA( mailto, NULL, &size, URL_ESCAPE_SPACES_ONLY );

1 0

Francois Gouget : winuser.h: Add missing *LayeredWindow*() prototypes.
by Alexandre Julliard Feb. 8, 2006

Feb. 8, 2006

Module: wine Branch: refs/heads/master Commit: 5e3c00fae6b707573188a5427951000b3e77f98d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e3c00fae6b707573188a54… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 15:27:49 2006 +0100 winuser.h: Add missing *LayeredWindow*() prototypes. --- include/winuser.h | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index aaed2de..313679c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2943,6 +2943,21 @@ typedef struct tagICONMETRICSW { DECL_WINELIB_TYPE_AW(ICONMETRICS) DECL_WINELIB_TYPE_AW(PICONMETRICS) DECL_WINELIB_TYPE_AW(LPICONMETRICS) + +typedef struct tagUPDATELAYEREDWINDOWINFO +{ + DWORD cbSize; + HDC hdcDst; + POINT CONST* pptDst; + SIZE CONST* psize; + HDC hdcSrc; + POINT CONST* pptSrc; + COLORREF crKey; + BLENDFUNCTION CONST* pblend; + DWORD dwFlags; + RECT CONST* prcDirty; +} UPDATELAYEREDWINDOWINFO, *PUPDATELAYEREDWINDOWINFO; + #endif /* defined(_WINGDI_) && !defined(NOGDI) */ #define ARW_BOTTOMLEFT 0x0000L @@ -3943,6 +3958,8 @@ BOOL WINAPI EnumDisplaySettingsW( BOOL WINAPI EnumDisplaySettingsExA(LPCSTR,DWORD,LPDEVMODEA,DWORD); BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR,DWORD,LPDEVMODEW,DWORD); #define EnumDisplaySettingsEx WINELIB_NAME_AW(EnumDisplaySettingsEx) +BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); +BOOL WINAPI UpdateLayeredWindowIndirect(HWND,UPDATELAYEREDWINDOWINFO CONST*); #endif /* defined(_WINGDI_) && !defined(NOGDI) */ HKL WINAPI ActivateKeyboardLayout(HKL,UINT); @@ -4355,6 +4372,7 @@ BOOL WINAPI GetKeyboardLayoutName SHORT WINAPI GetKeyState(INT); HWND WINAPI GetLastActivePopup(HWND); BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO); +BOOL WINAPI GetLayeredWindowAttributes(HWND,COLORREF*,BYTE*,DWORD*); HMENU WINAPI GetMenu(HWND); INT WINAPI GetMenuItemCount(HMENU); UINT WINAPI GetMenuItemID(HMENU,INT);

1 0

Alexandre Julliard : server: Remove the no longer needed exe_file parameter in the
by Alexandre Julliard Feb. 8, 2006

Feb. 8, 2006

Module: wine Branch: refs/heads/master Commit: e0330145d8386cb0d93d58576271af2cc04c4adb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0330145d8386cb0d93d585… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 15:25:12 2006 +0100 server: Remove the no longer needed exe_file parameter in the init_process_done request. --- include/wine/server_protocol.h | 3 +-- server/process.c | 9 --------- server/protocol.def | 1 - server/trace.c | 1 - 4 files changed, 1 insertions(+), 13 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9f9150c..cace35c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -264,7 +264,6 @@ struct init_process_done_request size_t module_size; void* entry; void* name; - obj_handle_t exe_file; int gui; /* VARARG(filename,unicode_str); */ }; @@ -4364,6 +4363,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 225 +#define SERVER_PROTOCOL_VERSION 226 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 65b9cb0..e738bb2 100644 --- a/server/process.c +++ b/server/process.c @@ -351,9 +351,6 @@ size_t init_process( struct thread *thre if (!info) return 0; - /* retrieve the main exe file */ - if (info->exe_file) process->exe.file = (struct file *)grab_object( info->exe_file ); - /* thread will be actually suspended in init_done */ if (info->create_flags & CREATE_SUSPENDED) thread->suspend++; @@ -994,8 +991,6 @@ DECL_HANDLER(init_process_done) return; } - if (process->exe.file) release_object( process->exe.file ); - /* check if main exe has been registered as a dll already */ if ((dll = find_process_dll( process, req->module ))) { @@ -1006,13 +1001,9 @@ DECL_HANDLER(init_process_done) } else { - struct file *file = NULL; - - if (req->exe_file) file = get_file_obj( process, req->exe_file, FILE_READ_DATA ); process->exe.base = req->module; process->exe.size = req->module_size; process->exe.name = req->name; - process->exe.file = file; if ((process->exe.namelen = get_req_data_size())) process->exe.filename = memdup( get_req_data(), process->exe.namelen ); } diff --git a/server/protocol.def b/server/protocol.def index 986a595..27630d1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -258,7 +258,6 @@ struct security_descriptor size_t module_size; /* main module size */ void* entry; /* process entry point */ void* name; /* ptr to ptr to name (in process addr space) */ - obj_handle_t exe_file; /* file handle for main exe */ int gui; /* is it a GUI process? */ VARARG(filename,unicode_str); /* file name of main exe */ @END diff --git a/server/trace.c b/server/trace.c index 05f4bb6..992063f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -641,7 +641,6 @@ static void dump_init_process_done_reque fprintf( stderr, " module_size=%lu,", (unsigned long)req->module_size ); fprintf( stderr, " entry=%p,", req->entry ); fprintf( stderr, " name=%p,", req->name ); - fprintf( stderr, " exe_file=%p,", req->exe_file ); fprintf( stderr, " gui=%d,", req->gui ); fprintf( stderr, " filename=" ); dump_varargs_unicode_str( cur_size );

1 0

Alexandre Julliard : ntdll: Get rid of the main_file argument in LdrInitializeThunk.
by Alexandre Julliard Feb. 8, 2006

Feb. 8, 2006

Module: wine Branch: refs/heads/master Commit: 9669ff8de4b27c0c55736ad246bb9c04f4cf09fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9669ff8de4b27c0c55736ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 15:22:24 2006 +0100 ntdll: Get rid of the main_file argument in LdrInitializeThunk. --- dlls/kernel/process.c | 14 +++++--------- dlls/ntdll/loader.c | 6 +----- include/winternl.h | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 1a890c3..417e658 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -951,7 +951,7 @@ static void start_process( void *arg ) IMAGE_NT_HEADERS *nt; LPTHREAD_START_ROUTINE entry; - LdrInitializeThunk( main_exe_file, 0, 0, 0 ); + LdrInitializeThunk( 0, 0, 0, 0 ); nt = RtlImageNtHeader( peb->ImageBaseAddress ); entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + @@ -1039,10 +1039,8 @@ void __wine_kernel_init(void) { case BINARY_PE_EXE: TRACE( "starting Win32 binary %s\n", debugstr_w(main_exe_name) ); - peb->ImageBaseAddress = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES ); - CloseHandle( main_exe_file ); - main_exe_file = 0; - if (peb->ImageBaseAddress) goto found; + if ((peb->ImageBaseAddress = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES ))) + goto found; MESSAGE( "wine: could not load %s as Win32 binary\n", debugstr_w(main_exe_name) ); ExitProcess(1); case BINARY_PE_DLL: @@ -1061,8 +1059,6 @@ void __wine_kernel_init(void) case BINARY_WIN16: case BINARY_DOS: TRACE( "starting Win16/DOS binary %s\n", debugstr_w(main_exe_name) ); - CloseHandle( main_exe_file ); - main_exe_file = 0; __wine_main_argv--; __wine_main_argc++; __wine_main_argv[0] = "winevdm.exe"; @@ -1079,8 +1075,6 @@ void __wine_kernel_init(void) char *unix_name; TRACE( "starting Winelib app %s\n", debugstr_w(main_exe_name) ); - CloseHandle( main_exe_file ); - main_exe_file = 0; if ((unix_name = wine_get_unix_file_name( main_exe_name )) && wine_dlopen( unix_name, RTLD_NOW, error, sizeof(error) )) { @@ -1100,6 +1094,8 @@ void __wine_kernel_init(void) } found: + CloseHandle( main_exe_file ); + /* build command line */ set_library_wargv( __wine_main_argv ); if (!build_command_line( __wine_main_wargv )) goto error; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 72022ba..d4e946a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2015,9 +2015,8 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeade /****************************************************************** * LdrInitializeThunk (NTDLL.@) * - * FIXME: the arguments are not correct, main_file is a Wine invention. */ -void WINAPI LdrInitializeThunk( HANDLE main_file, ULONG unknown2, ULONG unknown3, ULONG unknown4 ) +void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, ULONG unknown4 ) { NTSTATUS status; WINE_MODREF *wm; @@ -2058,15 +2057,12 @@ void WINAPI LdrInitializeThunk( HANDLE m req->entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; /* API requires a double indirection */ req->name = &wm->ldr.FullDllName.Buffer; - req->exe_file = main_file; req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); wine_server_add_data( req, wm->ldr.FullDllName.Buffer, wm->ldr.FullDllName.Length ); wine_server_call( req ); } SERVER_END_REQ; - if (main_file) NtClose( main_file ); /* we no longer need it */ - RtlEnterCriticalSection( &loader_section ); load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; diff --git a/include/winternl.h b/include/winternl.h index abe1745..6666294 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1700,7 +1700,7 @@ NTSTATUS WINAPI LdrFindResourceDirector NTSTATUS WINAPI LdrFindResource_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DATA_ENTRY**); NTSTATUS WINAPI LdrGetDllHandle(ULONG, ULONG, const UNICODE_STRING*, HMODULE*); NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); -void WINAPI LdrInitializeThunk(HANDLE,ULONG,ULONG,ULONG); +void WINAPI LdrInitializeThunk(ULONG,ULONG,ULONG,ULONG); NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); void WINAPI LdrShutdownProcess(void); void WINAPI LdrShutdownThread(void);

1 0

Alexandre Julliard : kernel: Use a standard LoadLibrary call to load the main exe.
by Alexandre Julliard Feb. 8, 2006

Feb. 8, 2006

Module: wine Branch: refs/heads/master Commit: e65b8d925a203f5fe7c616593483d0d2782438fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e65b8d925a203f5fe7c6165… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 15:11:19 2006 +0100 kernel: Use a standard LoadLibrary call to load the main exe. --- dlls/kernel/process.c | 65 +++---------------------------------------------- 1 files changed, 4 insertions(+), 61 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index cba0bc1..1a890c3 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -297,65 +297,6 @@ static BOOL find_exe_file( const WCHAR * } -/********************************************************************** - * load_pe_exe - * - * Load a PE format EXE file. - */ -static HMODULE load_pe_exe( const WCHAR *name, HANDLE file ) -{ - IO_STATUS_BLOCK io; - FILE_FS_DEVICE_INFORMATION device_info; - IMAGE_NT_HEADERS *nt; - HANDLE mapping; - void *module; - OBJECT_ATTRIBUTES attr; - LARGE_INTEGER size; - SIZE_T len = 0; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - size.QuadPart = 0; - - if (NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, - &attr, &size, 0, SEC_IMAGE, file ) != STATUS_SUCCESS) - return NULL; - - module = NULL; - if (NtMapViewOfSection( mapping, GetCurrentProcess(), &module, 0, 0, &size, &len, - ViewShare, 0, PAGE_READONLY ) != STATUS_SUCCESS) - return NULL; - - NtClose( mapping ); - - /* virus check */ - nt = RtlImageNtHeader( module ); - if (nt->OptionalHeader.AddressOfEntryPoint) - { - if (!RtlImageRvaToSection( nt, module, nt->OptionalHeader.AddressOfEntryPoint )) - MESSAGE("VIRUS WARNING: PE module %s has an invalid entrypoint (0x%08lx) " - "outside all sections (possibly infected by Tchernobyl/SpaceFiller virus)!\n", - debugstr_w(name), nt->OptionalHeader.AddressOfEntryPoint ); - } - - if (NtQueryVolumeInformationFile( file, &io, &device_info, sizeof(device_info), - FileFsDeviceInformation ) == STATUS_SUCCESS) - { - /* don't keep the file handle open on removable media */ - if (device_info.Characteristics & FILE_REMOVABLE_MEDIA) - { - CloseHandle( main_exe_file ); - main_exe_file = 0; - } - } - - return module; -} - /*********************************************************************** * build_initial_environment * @@ -1098,8 +1039,10 @@ void __wine_kernel_init(void) { case BINARY_PE_EXE: TRACE( "starting Win32 binary %s\n", debugstr_w(main_exe_name) ); - if ((peb->ImageBaseAddress = load_pe_exe( main_exe_name, main_exe_file ))) - goto found; + peb->ImageBaseAddress = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES ); + CloseHandle( main_exe_file ); + main_exe_file = 0; + if (peb->ImageBaseAddress) goto found; MESSAGE( "wine: could not load %s as Win32 binary\n", debugstr_w(main_exe_name) ); ExitProcess(1); case BINARY_PE_DLL:

1 0

Alexandre Julliard : ntdll: Check for existing modref for the main exe before creating it
by Alexandre Julliard Feb. 8, 2006

Feb. 8, 2006

Module: wine Branch: refs/heads/master Commit: 1d23e7fee2534c725c2f178963085918c74bde5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d23e7fee2534c725c2f178… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 15:10:56 2006 +0100 ntdll: Check for existing modref for the main exe before creating it in LdrInitializeThunk. --- dlls/ntdll/loader.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c72646a..72022ba 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2023,18 +2023,20 @@ void WINAPI LdrInitializeThunk( HANDLE m WINE_MODREF *wm; LPCWSTR load_path; PEB *peb = NtCurrentTeb()->Peb; - UNICODE_STRING *main_exe_name = &peb->ProcessParameters->ImagePathName; IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); - version_init( main_exe_name->Buffer ); - - /* allocate the modref for the main exe */ - if (!(wm = alloc_module( peb->ImageBaseAddress, main_exe_name->Buffer ))) + /* allocate the modref for the main exe (if not already done) */ + if (!(wm = get_modref( peb->ImageBaseAddress )) && + !(wm = alloc_module( peb->ImageBaseAddress, peb->ProcessParameters->ImagePathName.Buffer ))) { status = STATUS_NO_MEMORY; goto error; } wm->ldr.LoadCount = -1; /* can't unload main exe */ + wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + + peb->ProcessParameters->ImagePathName = wm->ldr.FullDllName; + version_init( wm->ldr.FullDllName.Buffer ); /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); @@ -2055,10 +2057,10 @@ void WINAPI LdrInitializeThunk( HANDLE m req->module_size = wm->ldr.SizeOfImage; req->entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; /* API requires a double indirection */ - req->name = &main_exe_name->Buffer; + req->name = &wm->ldr.FullDllName.Buffer; req->exe_file = main_file; req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); - wine_server_add_data( req, main_exe_name->Buffer, main_exe_name->Length ); + wine_server_add_data( req, wm->ldr.FullDllName.Buffer, wm->ldr.FullDllName.Length ); wine_server_call( req ); } SERVER_END_REQ; @@ -2085,7 +2087,8 @@ void WINAPI LdrInitializeThunk( HANDLE m return; error: - ERR( "Main exe initialization for %s failed, status %lx\n", debugstr_w(main_exe_name->Buffer), status ); + ERR( "Main exe initialization for %s failed, status %lx\n", + debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), status ); exit(1); }

1 0

Alexandre Julliard : server: Allow the main exe to be registered as a normal dll before
by Alexandre Julliard Feb. 8, 2006

Feb. 8, 2006

Module: wine Branch: refs/heads/master Commit: 2b0033d5ad3bf651cf259d49895d50671322ee46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b0033d5ad3bf651cf259d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 15:07:16 2006 +0100 server: Allow the main exe to be registered as a normal dll before init_process_done is called. --- server/process.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/server/process.c b/server/process.c index 7771c59..65b9cb0 100644 --- a/server/process.c +++ b/server/process.c @@ -980,7 +980,7 @@ DECL_HANDLER(get_startup_info) /* signal the end of the process initialization */ DECL_HANDLER(init_process_done) { - struct file *file = NULL; + struct process_dll *dll; struct process *process = current->process; if (is_process_init_done(process)) @@ -993,16 +993,29 @@ DECL_HANDLER(init_process_done) fatal_protocol_error( current, "init_process_done: module base address cannot be 0\n" ); return; } - process->exe.base = req->module; - process->exe.size = req->module_size; - process->exe.name = req->name; - if (req->exe_file) file = get_file_obj( process, req->exe_file, FILE_READ_DATA ); if (process->exe.file) release_object( process->exe.file ); - process->exe.file = file; - if ((process->exe.namelen = get_req_data_size())) - process->exe.filename = memdup( get_req_data(), process->exe.namelen ); + /* check if main exe has been registered as a dll already */ + if ((dll = find_process_dll( process, req->module ))) + { + list_remove( &dll->entry ); + memcpy( &process->exe, dll, sizeof(*dll) ); + list_init( &process->exe.entry ); + free( dll ); + } + else + { + struct file *file = NULL; + + if (req->exe_file) file = get_file_obj( process, req->exe_file, FILE_READ_DATA ); + process->exe.base = req->module; + process->exe.size = req->module_size; + process->exe.name = req->name; + process->exe.file = file; + if ((process->exe.namelen = get_req_data_size())) + process->exe.filename = memdup( get_req_data(), process->exe.namelen ); + } generate_startup_debug_events( process, req->entry ); set_process_startup_state( process, STARTUP_DONE );

1 0

Alexandre Julliard : server: Fixed handling of inotify record length.
by Alexandre Julliard Feb. 8, 2006

Feb. 8, 2006

Module: wine Branch: refs/heads/master Commit: e979832dda71deeea092c31046f543fbeec13c5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e979832dda71deeea092c31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 15:06:42 2006 +0100 server: Fixed handling of inotify record length. --- server/change.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/change.c b/server/change.c index c35a82c..e32997e 100644 --- a/server/change.c +++ b/server/change.c @@ -416,7 +416,8 @@ static void inotify_do_change_notify( st if (dir->want_data) { - record = malloc( sizeof (*record) + ie->len - 1 ) ; + size_t len = strlen(ie->name); + record = malloc( offsetof(struct change_record, name[len]) ); if (!record) return; @@ -426,8 +427,8 @@ static void inotify_do_change_notify( st record->action = FILE_ACTION_REMOVED; else record->action = FILE_ACTION_MODIFIED; - memcpy( record->name, ie->name, ie->len ); - record->len = strlen( ie->name ); + memcpy( record->name, ie->name, len ); + record->len = len; list_add_tail( &dir->change_records, &record->entry ); } @@ -456,13 +457,14 @@ static void inotify_poll_event( struct f return; } - for( ofs = 0; ofs < r; ) + for( ofs = 0; ofs < r - offsetof(struct inotify_event, name); ) { ie = (struct inotify_event*) &buffer[ofs]; if (!ie->len) break; + ofs += offsetof( struct inotify_event, name[ie->len] ); + if (ofs > r) break; inotify_do_change_notify( dir, ie ); - ofs += (sizeof (*ie) + ie->len - 1); } }

1 0

Michael Stefaniuc : msvcrt: __unDNameEx is not a stub.
by Alexandre Julliard Feb. 8, 2006

Feb. 8, 2006

Module: wine Branch: refs/heads/master Commit: d815b507561c86af31d3ea8d94e37423319de675 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d815b507561c86af31d3ea8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 8 12:42:33 2006 +0100 msvcrt: __unDNameEx is not a stub. --- dlls/msvcrt/undname.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 5c2f47f..16e21d8 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1160,7 +1160,7 @@ char* __unDNameEx(char* buffer, const ch struct parsed_symbol sym; const char* result; - TRACE("(%p,%s,%d,%p,%p,%p,%x) stub!\n", + TRACE("(%p,%s,%d,%p,%p,%p,%x)\n", buffer, mangled, buflen, memget, memfree, unknown, flags); /* The flags details is not documented by MS. However, it looks exactly

1 0

Jacek Caban : shdocvw: Added IHlinkFrame stub implementation.
by Alexandre Julliard Feb. 8, 2006

Feb. 8, 2006

Module: wine Branch: refs/heads/master Commit: 461a0102c53e0d5704d5a0d949a90f70841cc1fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=461a0102c53e0d5704d5a0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 8 12:42:23 2006 +0100 shdocvw: Added IHlinkFrame stub implementation. --- dlls/shdocvw/Makefile.in | 1 dlls/shdocvw/navigate.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.h | 4 ++ dlls/shdocvw/webbrowser.c | 4 ++ 4 files changed, 113 insertions(+), 0 deletions(-) create mode 100644 dlls/shdocvw/navigate.c diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 40c50a6..74a671e 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ events.c \ factory.c \ frame.c \ + navigate.c \ oleobject.c \ persist.c \ regsvr.c \ diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c new file mode 100644 index 0000000..32e59fa --- /dev/null +++ b/dlls/shdocvw/navigate.c @@ -0,0 +1,104 @@ +/* + * Copyright 2005 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "wine/debug.h" +#include "wine/unicode.h" + +#include "shdocvw.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +#define HLINKFRAME_THIS(iface) DEFINE_THIS(WebBrowser, HlinkFrame, iface) + +static HRESULT WINAPI HlinkFrame_QueryInterface(IHlinkFrame *iface, REFIID riid, void **ppv) +{ + WebBrowser *This = HLINKFRAME_THIS(iface); + return IWebBrowser2_QueryInterface(WEBBROWSER2(This), riid, ppv); +} + +static ULONG WINAPI HlinkFrame_AddRef(IHlinkFrame *iface) +{ + WebBrowser *This = HLINKFRAME_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER2(This)); +} + +static ULONG WINAPI HlinkFrame_Release(IHlinkFrame *iface) +{ + WebBrowser *This = HLINKFRAME_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER2(This)); +} + +static HRESULT WINAPI HlinkFrame_SetBrowseContext(IHlinkFrame *iface, + IHlinkBrowseContext *pihlbc) +{ + WebBrowser *This = HLINKFRAME_THIS(iface); + FIXME("(%p)->(%p)\n", This, pihlbc); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkFrame_GetBrowseContext(IHlinkFrame *iface, + IHlinkBrowseContext **ppihlbc) +{ + WebBrowser *This = HLINKFRAME_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppihlbc); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPBC pbc, + IBindStatusCallback *pibsc, IHlink *pihlNavigate) +{ + WebBrowser *This = HLINKFRAME_THIS(iface); + FIXME("(%p)->(%08lx %p %p %p)\n", This, grfHLNF, pbc, pibsc, pihlNavigate); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkFrame_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF, + IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, DWORD dwreserved) +{ + WebBrowser *This = HLINKFRAME_THIS(iface); + FIXME("(%p)->(%08lx %p %s %s %ld)\n", This, grfHLNF, pimkTarget, debugstr_w(pwzLocation), + debugstr_w(pwzFriendlyName), dwreserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkFrame_UpdateHlink(IHlinkFrame *iface, ULONG uHLID, + IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) +{ + WebBrowser *This = HLINKFRAME_THIS(iface); + FIXME("(%p)->(%lu %p %s %s)\n", This, uHLID, pimkTarget, debugstr_w(pwzLocation), + debugstr_w(pwzFriendlyName)); + return E_NOTIMPL; +} + +#undef HLINKFRAME_THIS + +static const IHlinkFrameVtbl HlinkFrameVtbl = { + HlinkFrame_QueryInterface, + HlinkFrame_AddRef, + HlinkFrame_Release, + HlinkFrame_SetBrowseContext, + HlinkFrame_GetBrowseContext, + HlinkFrame_Navigate, + HlinkFrame_OnNavigate, + HlinkFrame_UpdateHlink +}; + +void WebBrowser_HlinkFrame_Init(WebBrowser *This) +{ + This->lpHlinkFrameVtbl = &HlinkFrameVtbl; +} diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index a103615..ace8fff 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -37,6 +37,7 @@ #include "shlobj.h" #include "exdisp.h" #include "mshtmhst.h" +#include "hlink.h" /********************************************************************** * IClassFactory declaration for SHDOCVW.DLL @@ -76,6 +77,7 @@ typedef struct { const IViewObject2Vtbl *lpViewObjectVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; const IOleCommandTargetVtbl *lpWBOleCommandTargetVtbl; + const IHlinkFrameVtbl *lpHlinkFrameVtbl; /* Interfaces available for embeded document */ @@ -134,6 +136,7 @@ typedef struct { #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); #define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) #define WBOLECMD(x) ((IOleCommandTarget*) &(x)->lpWBOleCommandTargetVtbl) +#define HLINKFRAME(x) ((IHlinkFrame*) &(x)->lpHlinkFrameVtbl) #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) #define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) @@ -150,6 +153,7 @@ void WebBrowser_ViewObject_Init(WebBrows void WebBrowser_Persist_Init(WebBrowser*); void WebBrowser_ClassInfo_Init(WebBrowser*); void WebBrowser_Events_Init(WebBrowser*); +void WebBrowser_HlinkFrame_Init(WebBrowser*); void WebBrowser_ClientSite_Init(WebBrowser*); void WebBrowser_DocHost_Init(WebBrowser*); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 836a164..081fae1 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -97,6 +97,9 @@ static HRESULT WINAPI WebBrowser_QueryIn }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { TRACE("(%p)->(IID_IOleCommandTarget %p)\n", This, ppv); *ppv = WBOLECMD(This); + }else if(IsEqualGUID(&IID_IHlinkFrame, riid)) { + TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); + *ppv = HLINKFRAME(This); } if(*ppv) { @@ -807,6 +810,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut WebBrowser_ClientSite_Init(ret); WebBrowser_DocHost_Init(ret); WebBrowser_Frame_Init(ret); + WebBrowser_HlinkFrame_Init(ret); hres = IWebBrowser_QueryInterface(WEBBROWSER(ret), riid, ppv); if(SUCCEEDED(hres)) {

1 0