February 2006 - Wine-Commits

Alexandre Julliard : ntdll: Moved LDR_DONT_RESOLVE_REFS handling into fixup_imports.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: fa5b5102d72ec610c2f401ee529655fccdc8741b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa5b5102d72ec610c2f401e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 19:32:26 2006 +0100 ntdll: Moved LDR_DONT_RESOLVE_REFS handling into fixup_imports. This ensures that we never fixup imports twice on the same dll. --- dlls/ntdll/loader.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9087ec0..b0e1f1f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -584,6 +584,9 @@ static NTSTATUS fixup_imports( WINE_MODR DWORD size; NTSTATUS status; + if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ + wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + if (!(imports = RtlImageDirectoryEntryToData( wm->ldr.BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) return STATUS_SUCCESS; @@ -634,7 +637,7 @@ static WINE_MODREF *alloc_module( HMODUL wm->ldr.BaseAddress = hModule; wm->ldr.EntryPoint = NULL; wm->ldr.SizeOfImage = nt->OptionalHeader.SizeOfImage; - wm->ldr.Flags = 0; + wm->ldr.Flags = LDR_DONT_RESOLVE_REFS; wm->ldr.LoadCount = 0; wm->ldr.TlsIndex = -1; wm->ldr.SectionHandle = NULL; @@ -1393,7 +1396,6 @@ static NTSTATUS load_native_dll( LPCWSTR return status; } } - else wm->ldr.Flags |= LDR_DONT_RESOLVE_REFS; /* send DLL load event */ @@ -1682,12 +1684,8 @@ static NTSTATUS load_dll( LPCWSTR load_p { if ((*pwm)->ldr.LoadCount != -1) (*pwm)->ldr.LoadCount++; - if (((*pwm)->ldr.Flags & LDR_DONT_RESOLVE_REFS) && - !(flags & DONT_RESOLVE_DLL_REFERENCES)) - { - (*pwm)->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; - fixup_imports( *pwm, load_path ); - } + if (!(flags & DONT_RESOLVE_DLL_REFERENCES)) fixup_imports( *pwm, load_path ); + TRACE("Found loaded module %s for %s at %p, count=%d\n", debugstr_w((*pwm)->ldr.FullDllName.Buffer), debugstr_w(libname), (*pwm)->ldr.BaseAddress, (*pwm)->ldr.LoadCount); @@ -2044,7 +2042,6 @@ void WINAPI LdrInitializeThunk( ULONG un 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 );

1 0

Alexandre Julliard : shell32: Use more reasonable timeouts in shlexec test.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: 39a1a9422149a0d3d081f02d540423eac131bfaa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39a1a9422149a0d3d081f02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 19:30:29 2006 +0100 shell32: Use more reasonable timeouts in shlexec test. --- dlls/shell32/tests/shlexec.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index b2652f2..98a3819 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -112,7 +112,7 @@ static int shell_execute(LPCSTR operatio if (rc>=32) { int wait_rc; - wait_rc=WaitForSingleObject(hEvent, 60000); + wait_rc=WaitForSingleObject(hEvent, 5000); ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); } /* The child process may have changed the result file, so let profile @@ -172,10 +172,10 @@ static int shell_execute_ex(DWORD mask, int wait_rc; if (sei.hProcess!=NULL) { - wait_rc=WaitForSingleObject(sei.hProcess, 60000); + wait_rc=WaitForSingleObject(sei.hProcess, 5000); ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject(hProcess) returned %d\n", wait_rc); } - wait_rc=WaitForSingleObject(hEvent, 60000); + wait_rc=WaitForSingleObject(hEvent, 5000); ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); } /* The child process may have changed the result file, so let profile

1 0

Alexandre Julliard : server: Avoid hang on process startup.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: 492661079c01313ad46797c984a09a2010d3ebe5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=492661079c01313ad46797c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 19:30:17 2006 +0100 server: Avoid hang on process startup. Fixed the startup_info signaled state to avoid blocking the parent process when the child crashes on startup. --- server/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/process.c b/server/process.c index a593ad2..8c71334 100644 --- a/server/process.c +++ b/server/process.c @@ -448,7 +448,7 @@ static void startup_info_dump( struct ob static int startup_info_signaled( struct object *obj, struct thread *thread ) { struct startup_info *info = (struct startup_info *)obj; - return info->process && is_process_init_done(info->process); + return info->process && info->process->startup_state != STARTUP_IN_PROGRESS; } /* get a process from an id (and increment the refcount) */

1 0

Alexandre Julliard : ntdll: Support loading builtin dlls with an explicit path name also
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: 68ea200f32124e1f3ee51e535a2b0cf9d806aca6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68ea200f32124e1f3ee51e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 21 11:56:16 2006 +0100 ntdll: Support loading builtin dlls with an explicit path name also when loadorder is set to builtin only. --- dlls/ntdll/loader.c | 69 ++++++++++++++++++++++++++------------------------- 1 files changed, 35 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e5a9236..9087ec0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1349,7 +1349,7 @@ static NTSTATUS load_native_dll( LPCWSTR WINE_MODREF *wm; NTSTATUS status; - TRACE( "loading %s\n", debugstr_w(name) ); + TRACE("Trying native dll %s\n", debugstr_w(name)); attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -1456,6 +1456,8 @@ static NTSTATUS load_builtin_dll( LPCWST UNICODE_STRING nt_name; ANSI_STRING unix_name; + TRACE("Trying built-in %s\n", debugstr_w(path)); + if (!RtlDosPathNameToNtPathName_U( path, &nt_name, NULL, NULL )) return STATUS_DLL_NOT_FOUND; @@ -1481,6 +1483,8 @@ static NTSTATUS load_builtin_dll( LPCWST { int file_exists; + TRACE("Trying built-in %s\n", debugstr_w(name)); + /* we don't want to depend on the current codepage here */ len = strlenW( name ) + 1; if (len >= sizeof(dllname)) return STATUS_NAME_TOO_LONG; @@ -1652,7 +1656,6 @@ overflow: */ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ) { - int i; enum loadorder_type loadorder[LOADORDER_NTYPES]; WCHAR buffer[32]; WCHAR *filename; @@ -1696,45 +1699,43 @@ static NTSTATUS load_dll( LPCWSTR load_p MODULE_GetLoadOrderW( loadorder, main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); nts = STATUS_DLL_NOT_FOUND; - for (i = 0; i < LOADORDER_NTYPES; i++) + switch(loadorder[0]) { - if (loadorder[i] == LOADORDER_INVALID) break; - - switch (loadorder[i]) + case LOADORDER_DLL: + if (handle) { - case LOADORDER_DLL: - TRACE("Trying native dll %s\n", debugstr_w(filename)); - if (!handle) continue; /* it cannot possibly be loaded */ nts = load_native_dll( load_path, filename, handle, flags, pwm ); if (nts == STATUS_INVALID_FILE_FOR_SECTION) - { /* not in PE format, maybe it's a builtin */ nts = load_builtin_dll( load_path, filename, handle, flags, pwm ); - } - break; - case LOADORDER_BI: - TRACE("Trying built-in %s\n", debugstr_w(filename)); - nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); - break; - default: - nts = STATUS_INTERNAL_ERROR; - break; - } - - if (nts == STATUS_SUCCESS) - { - /* Initialize DLL just loaded */ - TRACE("Loaded module %s (%s) at %p\n", debugstr_w(filename), - ((*pwm)->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native", - (*pwm)->ldr.BaseAddress); - /* Set the ldr.LoadCount here so that an attach failure will */ - /* decrement the dependencies through the MODULE_FreeLibrary call. */ - (*pwm)->ldr.LoadCount = 1; - if (handle) NtClose( handle ); - if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); - return nts; } - if (nts != STATUS_DLL_NOT_FOUND) break; + if (nts == STATUS_DLL_NOT_FOUND && loadorder[1] == LOADORDER_BI) + nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); + break; + case LOADORDER_BI: + nts = load_builtin_dll( load_path, filename, handle, flags, pwm ); + if (!handle) break; /* nothing else we can try */ + /* file is not a builtin library, try without using the specified file */ + nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); + if (nts == STATUS_DLL_NOT_FOUND && loadorder[1] == LOADORDER_DLL) + nts = load_native_dll( load_path, filename, handle, flags, pwm ); + break; + default: + break; + } + + if (nts == STATUS_SUCCESS) + { + /* Initialize DLL just loaded */ + TRACE("Loaded module %s (%s) at %p\n", debugstr_w(filename), + ((*pwm)->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native", + (*pwm)->ldr.BaseAddress); + /* Set the ldr.LoadCount here so that an attach failure will */ + /* decrement the dependencies through the MODULE_FreeLibrary call. */ + (*pwm)->ldr.LoadCount = 1; + if (handle) NtClose( handle ); + if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); + return nts; } WARN("Failed to load module %s; status=%lx\n", debugstr_w(libname), nts);

1 0

Uwe Bonnes : ntdll: Remove spaces at end of name in import_dll.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: 19e29d6035570ef98f34dadcc8073a7e1e849f7f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19e29d6035570ef98f34dad… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Mon Feb 20 14:08:26 2006 +0100 ntdll: Remove spaces at end of name in import_dll. --- dlls/ntdll/loader.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 00817ff..e5a9236 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -449,7 +449,7 @@ static WINE_MODREF *import_dll( HMODULE IMAGE_THUNK_DATA *thunk_list; WCHAR buffer[32]; const char *name = get_rva( module, descr->Name ); - DWORD len = strlen(name) + 1; + DWORD len = strlen(name); PVOID protect_base; SIZE_T protect_size = 0; DWORD protect_old; @@ -460,16 +460,20 @@ static WINE_MODREF *import_dll( HMODULE else import_list = thunk_list; - if (len * sizeof(WCHAR) <= sizeof(buffer)) + while (len && name[len-1] == ' ') len--; /* remove trailing spaces */ + + if (len * sizeof(WCHAR) < sizeof(buffer)) { ascii_to_unicode( buffer, name, len ); + buffer[len] = 0; status = load_dll( load_path, buffer, 0, &wmImp ); } else /* need to allocate a larger buffer */ { - WCHAR *ptr = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + WCHAR *ptr = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); if (!ptr) return NULL; ascii_to_unicode( ptr, name, len ); + ptr[len] = 0; status = load_dll( load_path, ptr, 0, &wmImp ); RtlFreeHeap( GetProcessHeap(), 0, ptr ); }

1 0

Jason Green : winefile: Add the ability to save window position to the registry.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: 42d6fe6bd502a779b1521918c2bedae607d7e0fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42d6fe6bd502a779b152191… Author: Jason Green <jave27(a)gmail.com> Date: Mon Feb 20 12:57:01 2006 -0500 winefile: Add the ability to save window position to the registry. --- programs/winefile/En.rc | 2 - programs/winefile/resource.h | 1 programs/winefile/winefile.c | 102 ++++++++++++++++++++++++++++++++++++++---- programs/winefile/winefile.h | 10 ++++ 4 files changed, 104 insertions(+), 11 deletions(-) diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc index 7a305d8..8220a26 100644 --- a/programs/winefile/En.rc +++ b/programs/winefile/En.rc @@ -113,7 +113,7 @@ IDM_WINEFILE MENU FIXED IMPURE #endif MENUITEM SEPARATOR MENUITEM "&Minimize on run", 504 - MENUITEM "&Save settings on exit", 511 + MENUITEM "&Save settings on exit", ID_VIEW_SAVESETTINGS } diff --git a/programs/winefile/resource.h b/programs/winefile/resource.h index d4d0adc..9044970 100644 --- a/programs/winefile/resource.h +++ b/programs/winefile/resource.h @@ -63,6 +63,7 @@ #define ID_VIEW_TOOL_BAR 508 #define ID_VIEW_DRIVE_BAR 507 #define ID_VIEW_STATUSBAR 503 +#define ID_VIEW_SAVESETTINGS 511 #define ID_ABOUT 1803 #define ID_REFRESH 1704 diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 387711d..afaba10 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2,6 +2,7 @@ * Winefile * * Copyright 2000, 2003, 2004, 2005 Martin Fuchs + * Copyright 2006 Jason Green * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -58,6 +59,13 @@ #define DEFAULT_SPLIT_POS 200 #endif +static const WCHAR registry_key[] = { 'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\', + 'W','i','n','e','F','i','l','e','\0'}; +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'}; enum ENTRY_TYPE { ET_WINDOWS, @@ -1569,6 +1577,75 @@ static void get_path(Entry* dir, PTSTR p } } +static windowOptions load_registry_settings(void) +{ + DWORD size; + DWORD type; + HKEY hKey; + windowOptions opts; + + RegOpenKeyEx( HKEY_CURRENT_USER, registry_key, + 0, KEY_QUERY_VALUE, &hKey ); + + size = sizeof(DWORD); + + if( RegQueryValueEx( hKey, reg_start_x, NULL, &type, + (LPBYTE) &opts.start_x, &size ) != ERROR_SUCCESS ) + opts.start_x = CW_USEDEFAULT; + + if( RegQueryValueEx( hKey, reg_start_y, NULL, &type, + (LPBYTE) &opts.start_y, &size ) != ERROR_SUCCESS ) + opts.start_y = CW_USEDEFAULT; + + if( RegQueryValueEx( hKey, reg_width, NULL, &type, + (LPBYTE) &opts.width, &size ) != ERROR_SUCCESS ) + opts.width = CW_USEDEFAULT; + + if( RegQueryValueEx( hKey, reg_height, NULL, &type, + (LPBYTE) &opts.height, &size ) != ERROR_SUCCESS ) + opts.height = CW_USEDEFAULT; + + RegCloseKey( hKey ); + + return opts; +} + +static void save_registry_settings(void) +{ + WINDOWINFO wi; + HKEY hKey; + INT width, height; + + wi.cbSize = sizeof( WINDOWINFO ); + GetWindowInfo(Globals.hMainWnd, &wi); + width = wi.rcWindow.right - wi.rcWindow.left; + height = wi.rcWindow.bottom - wi.rcWindow.top; + + if ( RegOpenKeyEx( HKEY_CURRENT_USER, registry_key, + 0, KEY_SET_VALUE, &hKey ) != ERROR_SUCCESS ) + { + /* Unable to save registry settings - try to create key */ + if ( RegCreateKeyEx( HKEY_CURRENT_USER, registry_key, + 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, NULL, &hKey, NULL ) != ERROR_SUCCESS ) + { + /* FIXME: Cannot create key */ + return; + } + } + /* Save all of the settings */ + RegSetValueEx( hKey, reg_start_x, 0, REG_DWORD, + (LPBYTE) &wi.rcWindow.left, sizeof(DWORD) ); + RegSetValueEx( hKey, reg_start_y, 0, REG_DWORD, + (LPBYTE) &wi.rcWindow.top, sizeof(DWORD) ); + RegSetValueEx( hKey, reg_width, 0, REG_DWORD, + (LPBYTE) &width, sizeof(DWORD) ); + RegSetValueEx( hKey, reg_height, 0, REG_DWORD, + (LPBYTE) &height, sizeof(DWORD) ); + + /* TODO: Save more settings here (List vs. Detailed View, etc.) */ + RegCloseKey( hKey ); +} static void resize_frame_rect(HWND hwnd, PRECT prect) { @@ -2150,6 +2227,9 @@ static LRESULT CALLBACK FrameWndProc(HWN switch(nmsg) { case WM_CLOSE: + if (Globals.saveSettings == TRUE) + save_registry_settings(); + DestroyWindow(hwnd); /* clear handle variables */ @@ -2305,6 +2385,12 @@ static LRESULT CALLBACK FrameWndProc(HWN toggle_child(hwnd, cmd, Globals.hstatusbar); break; + case ID_VIEW_SAVESETTINGS: + Globals.saveSettings = !Globals.saveSettings; + CheckMenuItem(Globals.hMenuOptions, ID_VIEW_SAVESETTINGS, + Globals.saveSettings == TRUE ? MF_CHECKED : MF_UNCHECKED ); + break; + case ID_EXECUTE: { struct ExecuteDialog dlg; @@ -4678,12 +4764,14 @@ static void show_frame(HWND hwndParent, TCHAR buffer[MAX_PATH], b1[BUFFER_LEN]; ChildWnd* child; HMENU hMenuFrame, hMenuWindow; + windowOptions opts; CLIENTCREATESTRUCT ccs; if (Globals.hMainWnd) return; + opts = load_registry_settings(); hMenuFrame = LoadMenu(Globals.hInstance, MAKEINTRESOURCE(IDM_WINEFILE)); hMenuWindow = GetSubMenu(hMenuFrame, GetMenuItemCount(hMenuFrame)-2); @@ -4697,7 +4785,7 @@ static void show_frame(HWND hwndParent, /* create main window */ Globals.hMainWnd = CreateWindowEx(0, (LPCTSTR)(int)Globals.hframeClass, RS(b1,IDS_WINE_FILE), WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + opts.start_x, opts.start_y, opts.width, opts.height, hwndParent, Globals.hMenuFrame, Globals.hInstance, 0/*lpParam*/); @@ -4705,9 +4793,9 @@ static void show_frame(HWND hwndParent, WS_CHILD|WS_CLIPCHILDREN|WS_VSCROLL|WS_HSCROLL|WS_VISIBLE|WS_BORDER, 0, 0, 0, 0, Globals.hMainWnd, 0, Globals.hInstance, &ccs); - - + CheckMenuItem(Globals.hMenuOptions, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED); + CheckMenuItem(Globals.hMenuOptions, ID_VIEW_SAVESETTINGS, MF_BYCOMMAND); create_drive_bar(); @@ -4737,7 +4825,7 @@ static void show_frame(HWND hwndParent, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_BORDER|CCS_NODIVIDER, 0,0,0,0, Globals.hMainWnd, (HMENU)IDW_STATUSBAR, hinstance, 0);*/ - /*TODO: read paths and window placements from registry */ + /*TODO: read paths from registry */ if (!path || !*path) { GetCurrentDirectory(MAX_PATH, buffer); @@ -4849,13 +4937,9 @@ static int find_window_class(LPCTSTR cla static int winefile_main(HINSTANCE hinstance, int cmdshow, LPCTSTR path) { MSG msg; - + InitInstance(hinstance); - if (cmdshow == SW_SHOWNORMAL) - /*TODO: read window placement from registry */ - cmdshow = SW_MAXIMIZE; - show_frame(0, cmdshow, path); while(GetMessage(&msg, 0, 0, 0)) { diff --git a/programs/winefile/winefile.h b/programs/winefile/winefile.h index 45d800d..0057289 100644 --- a/programs/winefile/winefile.h +++ b/programs/winefile/winefile.h @@ -107,6 +107,13 @@ enum IMAGE { #define FRM_CALC_CLIENT 0xBF83 #define Frame_CalcFrameClient(hwnd, prt) ((BOOL)SNDMSG(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt)) +typedef struct +{ + int start_x; + int start_y; + int width; + int height; +} windowOptions; typedef struct { @@ -132,7 +139,8 @@ typedef struct TCHAR drives[BUFFER_LEN]; BOOL prescan_node; /*TODO*/ - + BOOL saveSettings; + #ifdef _SHELL_FOLDERS IShellFolder* iDesktop; IMalloc* iMalloc;

1 0

Jeff Latimer : usp10: Add stub for ScriptTextOut.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: 044a6f81b3977dbf6d82aa1f7de494ad7b65e75a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=044a6f81b3977dbf6d82aa1… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Feb 21 20:47:39 2006 +1100 usp10: Add stub for ScriptTextOut. --- dlls/usp10/usp10.c | 16 ++++++++++++++++ dlls/usp10/usp10.spec | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 374b387..75710d9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -439,3 +439,19 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SC FIXME("(%p,%p,%s,%d,0x%lx,%p): stub\n", hdc, psc, debugstr_w(pwcInChars), cChars, dwFlags, pwOutGlyphs); return E_NOTIMPL; } + +/*********************************************************************** + * ScriptTextOut (USP10.@) + * + */ +HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UINT fuOptions, + const RECT *lprc, const SCRIPT_ANALYSIS *psa, const WCHAR *pwcReserved, + int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, + const int *piJustify, const GOFFSET *pGoffset) +{ + FIXME("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p): stub\n", + hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, + piAdvance, piJustify, pGoffset); + return E_NOTIMPL; +} + diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index ffc2e95..ea7a50d 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -28,7 +28,7 @@ @ stub ScriptString_pLogAttr @ stub ScriptString_pSize @ stub ScriptString_pcOutChars -@ stub ScriptTextOut +@ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) @ stub ScriptXtoCP @ stub UspAllocCache @ stub UspAllocTemp

1 0

Jeff Latimer : usp10: Add ScriptPlace funtionality.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: a05e712cb82cb6c4bdb73205f86bfb06608b1a32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a05e712cb82cb6c4bdb7320… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Feb 21 20:24:24 2006 +1100 usp10: Add ScriptPlace funtionality. The key function is to calculate the total of the ABC widths of the characters converted to gylphs by ScriptShape. --- dlls/usp10/tests/usp10.c | 4 ++- dlls/usp10/usp10.c | 57 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5a0cc7d..a81af2e 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -148,7 +148,7 @@ START_TEST(usp10) if (hr ==0) { hr = ScriptPlace(NULL, &psc, pwOutGlyphs, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); - todo_wine ok (hr == 0, "Should return 0 not (%08x)\n", (unsigned int) hr); + ok (hr == 0, "Should return 0 not (%08x)\n", (unsigned int) hr); } /* This test will check to make sure that SCRIPT_CACHE is reused and that not translation * @@ -182,7 +182,7 @@ START_TEST(usp10) if (hr ==0) { hr = ScriptPlace(NULL, &psc, pwOutGlyphs, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); - todo_wine ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr); + ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr); } } hr = ScriptFreeCache( &psc); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index dd7832d..374b387 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -368,12 +368,65 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI int cGlyphs, const SCRIPT_VISATTR *psva, SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) { - FIXME("(%p,%p,%p,%s,%d, %p, %p, %p): stub\n", hdc, psc, pwGlyphs, + HDC phdc; + int wcnt; + LPABC lpABC; + Scriptcache *pScriptcache; + FIXME("(%p, %p, %p, %s, %d, %p, %p, %p): semi-stub\n", hdc, psc, pwGlyphs, debugstr_w(pwGlyphs), cGlyphs, psva, psa, piAdvance); - return E_NOTIMPL; + /* We need a valid hdc to do any of the font calls. The spec says that hdc is optional and + * psc will be used first. If psc and hdc are not specified E_PENDING is returned to get + * the caller to return the hdc. For convience, the hdc is cached in SCRIPT_CACHE. */ + + if (!hdc && !*psc) { + TRACE("No Script_Cache (psc) and no hdc. Ask for one. Hdc=%p, psc=%p\n", hdc, *psc); + return E_PENDING; + } else + if (hdc && !*psc) { + pScriptcache = HeapAlloc( GetProcessHeap(), 0, sizeof(Scriptcache) ); + pScriptcache->hdc = hdc; + phdc = hdc; + *psc = pScriptcache; + } else + if (*psc) { + pScriptcache = *psc; + phdc = pScriptcache->hdc; + } + + /* Here we need to calculate the width of the run unit. At this point the input string + * has been converted to glyphs and we till need to translate back to the original chars + * to get the correct ABC widths. To make life easier the ABC widths are saved in the + * SCRIPT_CACHE. This is ok as the cache must be invalidated if the font or font size + * changes. */ + + lpABC = pScriptcache->CharWidths; + pABC->abcA = 0; + pABC->abcB = 0; + pABC->abcC = 0; + if (!pScriptcache->HaveWidths) { + if (GetCharABCWidthsW(phdc, 0, 255, lpABC )) + pScriptcache->HaveWidths = 1; + else { + WARN("Could not get ABC values\n"); + } + } + + for (wcnt = 0; wcnt < cGlyphs ; wcnt++) { /* add up the char lengths */ + TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d wcnt=%d\n", + pwGlyphs[wcnt], + lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcA, + lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcB, + lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcC, wcnt); + pABC->abcA += lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcA; + pABC->abcB += lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcB; + pABC->abcC += lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcC; + } + TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); + + return 0; } /***********************************************************************

1 0

Jacek Caban : shdocvw: Added correct implementation of IProvideClassInfo:: GetGUID.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: 0c12e2663b6964d1cfc44b5546800e42452aba3b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c12e2663b6964d1cfc44b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 10:05:00 2006 +0100 shdocvw: Added correct implementation of IProvideClassInfo::GetGUID. --- dlls/shdocvw/classinfo.c | 29 +++++++++-------------------- 1 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/shdocvw/classinfo.c b/dlls/shdocvw/classinfo.c index d6290af..455ec0b 100644 --- a/dlls/shdocvw/classinfo.c +++ b/dlls/shdocvw/classinfo.c @@ -60,34 +60,23 @@ static HRESULT WINAPI ProvideClassInfo_G return E_NOTIMPL; } -/* Get the IID for generic default event callbacks. This IID will - * in theory be used to later query for an IConnectionPoint to connect - * an event sink (callback implementation in the OLE control site) - * to this control. -*/ static HRESULT WINAPI ProvideClassInfo_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) { WebBrowser *This = CLASSINFO_THIS(iface); - FIXME("(%p)->(%ld %p)\n", This, dwGuidKind, pGUID); + TRACE("(%p)->(%ld %p)\n", This, dwGuidKind, pGUID); - if (dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) - { - FIXME ("Requested unsupported GUID type: %ld\n", dwGuidKind); - return E_FAIL; /* Is there a better return type here? */ - } + if(!pGUID) + return E_POINTER; - /* FIXME: Returning IPropertyNotifySink interface, but should really - * return a more generic event set (???) dispinterface. - * However, this hack, allows a control site to return with success - * (MFC's COleControlSite falls back to older IProvideClassInfo interface - * if GetGUID() fails to return a non-NULL GUID). - */ - memcpy(pGUID, &IID_IPropertyNotifySink, sizeof(GUID)); - FIXME("Wrongly returning IPropertyNotifySink interface %s\n", - debugstr_guid(pGUID)); + if (dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) { + WARN("Wrong GUID type: %ld\n", dwGuidKind); + memcpy(pGUID, &IID_NULL, sizeof(GUID)); + return E_FAIL; + } + memcpy(pGUID, &DIID_DWebBrowserEvents2, sizeof(GUID)); return S_OK; }

1 0

Roderick Colenbrander : d3d8: Move the capability detection code over to WineD3D.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: b24e69dc38217cc2fe1c79a080e8d523597407c4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b24e69dc38217cc2fe1c79a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Feb 20 23:01:08 2006 +0100 d3d8: Move the capability detection code over to WineD3D. Let the few existing parts which need the capabiliteis use the WineD3D capability structure (gl_info). This info structure contains next to 'flags' inidicating certain features also all GL/GLX functions pointers. Because D3D8 moves over to the wined3d gl_info structure all the gl prototypes in d3dcore_gl.h were unneeded and removed. --- dlls/d3d8/d3d8_private.h | 238 +++++++++++++ dlls/d3d8/d3dcore_gl.h | 838 ---------------------------------------------- dlls/d3d8/directx.c | 361 -------------------- dlls/d3d8/shader.c | 3 dlls/wined3d/device.c | 7 dlls/wined3d/directx.c | 10 + 6 files changed, 242 insertions(+), 1215 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b24e69dc38217cc2fe1…

1 0