May 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : user: Remove some redundant NULL pointer checks.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 9d4bf4914fd7580d4a6d3b962e7bacb7c4da8e46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d4bf4914fd7580d4a6d3b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 15:16:47 2006 +0200 user: Remove some redundant NULL pointer checks. --- dlls/user/winproc.c | 32 ++++++++------------------------ 1 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 4e12c7c..e885784 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -3248,14 +3248,10 @@ LRESULT WINAPI CallWindowProc16( WNDPROC switch(proc->type) { case WIN_PROC_16: - if (!proc->thunk.t_from32.proc) return 0; - return WINPROC_CallWndProc16( proc->thunk.t_from32.proc, - hwnd, msg, wParam, lParam ); + return WINPROC_CallWndProc16( proc->thunk.t_from32.proc, hwnd, msg, wParam, lParam ); case WIN_PROC_32A: - if (!proc->thunk.t_from16.proc) return 0; return __wine_call_wndproc_32A( hwnd, msg, wParam, lParam, proc->thunk.t_from16.proc ); case WIN_PROC_32W: - if (!proc->thunk.t_from16.proc) return 0; return __wine_call_wndproc_32W( hwnd, msg, wParam, lParam, proc->thunk.t_from16.proc ); default: WARN_(relay)("Invalid proc %p\n", proc ); @@ -3305,17 +3301,11 @@ LRESULT WINAPI CallWindowProcA( switch(proc->type) { case WIN_PROC_16: - if (!proc->thunk.t_from32.proc) return 0; - return WINPROC_CallProc32ATo16( proc->thunk.t_from32.proc, - hwnd, msg, wParam, lParam ); + return WINPROC_CallProc32ATo16( proc->thunk.t_from32.proc, hwnd, msg, wParam, lParam ); case WIN_PROC_32A: - if (!proc->thunk.t_from16.proc) return 0; - return WINPROC_CallWndProc( proc->thunk.t_from16.proc, - hwnd, msg, wParam, lParam ); + return WINPROC_CallWndProc( proc->thunk.t_from16.proc, hwnd, msg, wParam, lParam ); case WIN_PROC_32W: - if (!proc->thunk.t_from16.proc) return 0; - return WINPROC_CallProc32ATo32W( proc->thunk.t_from16.proc, - hwnd, msg, wParam, lParam ); + return WINPROC_CallProc32ATo32W( proc->thunk.t_from16.proc, hwnd, msg, wParam, lParam ); default: WARN_(relay)("Invalid proc %p\n", proc ); return 0; @@ -3335,23 +3325,17 @@ LRESULT WINAPI CallWindowProcW( WNDPROC if (!func) return 0; - if (!(proc = WINPROC_GetPtr( (WNDPROC)func ))) + if (!(proc = WINPROC_GetPtr( func ))) return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); switch(proc->type) { case WIN_PROC_16: - if (!proc->thunk.t_from32.proc) return 0; - return WINPROC_CallProc32WTo16( proc->thunk.t_from32.proc, - hwnd, msg, wParam, lParam ); + return WINPROC_CallProc32WTo16( proc->thunk.t_from32.proc, hwnd, msg, wParam, lParam ); case WIN_PROC_32A: - if (!proc->thunk.t_from16.proc) return 0; - return WINPROC_CallProc32WTo32A( proc->thunk.t_from16.proc, - hwnd, msg, wParam, lParam ); + return WINPROC_CallProc32WTo32A( proc->thunk.t_from16.proc, hwnd, msg, wParam, lParam ); case WIN_PROC_32W: - if (!proc->thunk.t_from16.proc) return 0; - return WINPROC_CallWndProc( proc->thunk.t_from16.proc, - hwnd, msg, wParam, lParam ); + return WINPROC_CallWndProc( proc->thunk.t_from16.proc, hwnd, msg, wParam, lParam ); default: WARN_(relay)("Invalid proc %p\n", proc ); return 0;

1 0

Alexandre Julliard : user: Fixed offset check for the DWLP_DLGPROC case in SetWindowLong.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 5326e304d017669d2512ad69ab8a4057eb0ed118 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5326e304d017669d2512ad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 13:50:53 2006 +0200 user: Fixed offset check for the DWLP_DLGPROC case in SetWindowLong. --- dlls/user/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/win.c b/dlls/user/win.c index 9fef05b..2cacdb8 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -2006,7 +2006,7 @@ static LONG_PTR WIN_SetWindowLong( HWND case GWLP_USERDATA: break; case DWLP_DLGPROC: - if ((wndPtr->cbWndExtra + sizeof(LONG_PTR) >= DWLP_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG)) + if ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG)) { WNDPROC *ptr = (WNDPROC *)((char *)wndPtr->wExtra + DWLP_DLGPROC); retval = (ULONG_PTR)WINPROC_GetProc( *ptr, type );

1 0

Alexandre Julliard : user: Separate the 16 and 32-bit versions of WINPROC_GetProc.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 4c40190620110abe882501f893deda6d98a4026f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c40190620110abe882501f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 18:40:46 2006 +0200 user: Separate the 16 and 32-bit versions of WINPROC_GetProc. --- dlls/user/class.c | 33 +++++++++++++++++++------- dlls/user/win.c | 4 ++- dlls/user/winproc.c | 64 +++++++++++++++++++++++---------------------------- dlls/user/winproc.h | 3 ++ dlls/user/wnd16.c | 2 +- 5 files changed, 58 insertions(+), 48 deletions(-) diff --git a/dlls/user/class.c b/dlls/user/class.c index 0e9d4ff..c851066 100644 --- a/dlls/user/class.c +++ b/dlls/user/class.c @@ -149,7 +149,20 @@ static BOOL set_server_info( HWND hwnd, * * Get the class winproc for a given proc type */ -static WNDPROC16 CLASS_GetProc( CLASS *classPtr, WINDOWPROCTYPE type ) +static WNDPROC16 CLASS_GetProc16( CLASS *classPtr ) +{ + WNDPROC proc = classPtr->winprocA; + if (!proc) proc = classPtr->winprocW; + return WINPROC_GetProc16( proc ); +} + + +/*********************************************************************** + * CLASS_GetProc + * + * Get the class winproc for a given proc type + */ +static WNDPROC CLASS_GetProc( CLASS *classPtr, WINDOWPROCTYPE type ) { WNDPROC proc = classPtr->winprocA; @@ -170,10 +183,9 @@ static WNDPROC16 CLASS_GetProc( CLASS *c * Set the class winproc for a given proc type. * Returns the previous window proc. */ -static WNDPROC16 CLASS_SetProc( CLASS *classPtr, WNDPROC newproc, WINDOWPROCTYPE type ) +static void CLASS_SetProc( CLASS *classPtr, WNDPROC newproc, WINDOWPROCTYPE type ) { WNDPROC *proc = &classPtr->winprocA; - WNDPROC16 ret; if (classPtr->winprocW) { @@ -182,7 +194,6 @@ static WNDPROC16 CLASS_SetProc( CLASS *c */ if (!*proc || type == WIN_PROC_32W) proc = &classPtr->winprocW; } - ret = WINPROC_GetProc( *proc, type ); *proc = WINPROC_AllocProc( newproc, type ); /* now clear the one that we didn't set */ if (classPtr->winprocA && classPtr->winprocW) @@ -192,7 +203,6 @@ static WNDPROC16 CLASS_SetProc( CLASS *c else classPtr->winprocA = 0; } - return ret; } @@ -730,7 +740,7 @@ LONG WINAPI GetClassLong16( HWND16 hwnd1 case GCLP_WNDPROC: if (!(class = get_class_ptr( hwnd, FALSE ))) return 0; if (class == CLASS_OTHER_PROCESS) break; - ret = (LONG)CLASS_GetProc( class, WIN_PROC_16 ); + ret = (LONG)CLASS_GetProc16( class ); release_class_ptr( class ); return ret; case GCLP_MENUNAME: @@ -942,7 +952,8 @@ LONG WINAPI SetClassLong16( HWND16 hwnd1 { case GCLP_WNDPROC: if (!(class = get_class_ptr( hwnd, TRUE ))) return 0; - retval = (LONG)CLASS_SetProc( class, (WNDPROC)newval, WIN_PROC_16 ); + retval = (LONG)CLASS_GetProc16( class ); + CLASS_SetProc( class, (WNDPROC)newval, WIN_PROC_16 ); release_class_ptr( class ); return retval; case GCLP_MENUNAME: @@ -982,7 +993,8 @@ DWORD WINAPI SetClassLongW( HWND hwnd, I retval = 0; /* Old value is now meaningless anyway */ break; case GCLP_WNDPROC: - retval = (DWORD)CLASS_SetProc( class, (WNDPROC)newval, WIN_PROC_32W ); + retval = (DWORD)CLASS_GetProc( class, WIN_PROC_32W ); + CLASS_SetProc( class, (WNDPROC)newval, WIN_PROC_32W ); break; case GCLP_HBRBACKGROUND: retval = (DWORD)class->hbrBackground; @@ -1048,7 +1060,10 @@ DWORD WINAPI SetClassLongA( HWND hwnd, I if (!(class = get_class_ptr( hwnd, TRUE ))) return 0; if (offset == GCLP_WNDPROC) - retval = (DWORD)CLASS_SetProc( class, (WNDPROC)newval, WIN_PROC_32A ); + { + retval = (DWORD)CLASS_GetProc( class, WIN_PROC_32A ); + CLASS_SetProc( class, (WNDPROC)newval, WIN_PROC_32A ); + } else /* GCL_MENUNAME */ { CLASS_SetMenuNameA( class, (LPCSTR)newval ); diff --git a/dlls/user/win.c b/dlls/user/win.c index 2cacdb8..df0ffd8 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -2165,7 +2165,7 @@ LONG WINAPI GetWindowLong16( HWND16 hwnd } } retvalue = GetWindowLongA( WIN_Handle32(hwnd), offset ); - if (is_winproc) retvalue = (LONG_PTR)WINPROC_GetProc( (WNDPROC)retvalue, WIN_PROC_16 ); + if (is_winproc) retvalue = (LONG_PTR)WINPROC_GetProc16( (WNDPROC)retvalue ); return retvalue; } @@ -2215,7 +2215,7 @@ LONG WINAPI SetWindowLong16( HWND16 hwnd { WNDPROC new_proc = WINPROC_AllocProc( (WNDPROC)newval, WIN_PROC_16 ); WNDPROC old_proc = (WNDPROC)SetWindowLongA( WIN_Handle32(hwnd), offset, (LONG_PTR)new_proc ); - return (LONG)WINPROC_GetProc( (WNDPROC)old_proc, WIN_PROC_16 ); + return (LONG)WINPROC_GetProc16( (WNDPROC)old_proc ); } else return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); } diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 51f0ab8..571a23f 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -529,34 +529,43 @@ static WINDOWPROC *WINPROC_GetPtr( WNDPR /********************************************************************** + * WINPROC_GetProc16 + * + * Get a window procedure pointer that can be passed to the Windows program. + */ +WNDPROC16 WINPROC_GetProc16( WNDPROC proc ) +{ + WINDOWPROC *ptr = (WINDOWPROC *)proc; + + if (!proc) return 0; + + if (ptr->type == WIN_PROC_16) + return ptr->thunk.t_from32.proc; + else + return (WNDPROC16)MAKESEGPTR( get_winproc_selector(), + (char *)&ptr->thunk - (char *)winproc_array ); +} + + +/********************************************************************** * WINPROC_GetProc * * Get a window procedure pointer that can be passed to the Windows program. */ -WNDPROC16 WINPROC_GetProc( WNDPROC proc, WINDOWPROCTYPE type ) +WNDPROC WINPROC_GetProc( WNDPROC proc, WINDOWPROCTYPE type ) { WINDOWPROC *ptr = (WINDOWPROC *)proc; if (!proc) return NULL; - if (type == WIN_PROC_16) /* We want a 16:16 address */ - { - if (ptr->type == WIN_PROC_16) - return ptr->thunk.t_from32.proc; - else - return (WNDPROC16)MAKESEGPTR( get_winproc_selector(), - (char *)&ptr->thunk - (char *)winproc_array ); - } - else /* We want a 32-bit address */ - { - if (ptr->type == WIN_PROC_16) - return (WNDPROC16)&ptr->thunk; - else if (type != ptr->type) - /* Have to return the jmp address if types don't match */ - return (WNDPROC16)&ptr->jmp; - else - /* Some Win16 programs want to get back the proc they set */ - return (WNDPROC16)ptr->thunk.t_from16.proc; - } + + if (ptr->type == WIN_PROC_16) + return (WNDPROC)&ptr->thunk; + else if (type != ptr->type) + /* Have to return the jmp address if types don't match */ + return (WNDPROC)&ptr->jmp; + else + /* Some Win16 programs want to get back the proc they set */ + return (WNDPROC)ptr->thunk.t_from16.proc; } @@ -3205,11 +3214,6 @@ LRESULT WINAPI CallWindowProc16( WNDPROC if (!(proc = WINPROC_GetPtr( (WNDPROC)func ))) return WINPROC_CallWndProc16( func, hwnd, msg, wParam, lParam ); -#if testing - func = WINPROC_GetProc( (WNDPROC)proc, WIN_PROC_16 ); - return WINPROC_CallWndProc16( func, hwnd, msg, wParam, lParam ); -#endif - switch(proc->type) { case WIN_PROC_16: @@ -3267,11 +3271,6 @@ LRESULT WINAPI CallWindowProcA( if (!(proc = WINPROC_GetPtr( func ))) return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); -#if testing - func = WINPROC_GetProc( (WNDPROC)proc, WIN_PROC_32A ); - return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); -#endif - switch(proc->type) { case WIN_PROC_16: @@ -3308,11 +3307,6 @@ LRESULT WINAPI CallWindowProcW( WNDPROC if (!(proc = WINPROC_GetPtr( (WNDPROC)func ))) return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); -#if testing - func = WINPROC_GetProc( (WNDPROC)proc, WIN_PROC_32W ); - return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); -#endif - switch(proc->type) { case WIN_PROC_16: diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h index f1fbe8e..f0204ae 100644 --- a/dlls/user/winproc.h +++ b/dlls/user/winproc.h @@ -52,7 +52,8 @@ typedef struct struct tagWINDOWPROC; -extern WNDPROC16 WINPROC_GetProc( WNDPROC proc, WINDOWPROCTYPE type ); +extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc ); +extern WNDPROC WINPROC_GetProc( WNDPROC proc, WINDOWPROCTYPE type ); extern WNDPROC WINPROC_AllocProc( WNDPROC func, WINDOWPROCTYPE type ); extern WINDOWPROCTYPE WINPROC_GetProcType( WNDPROC proc ); diff --git a/dlls/user/wnd16.c b/dlls/user/wnd16.c index 20a0902..b923c83 100644 --- a/dlls/user/wnd16.c +++ b/dlls/user/wnd16.c @@ -1358,7 +1358,7 @@ BOOL16 WINAPI GetClassInfoEx16( HINSTANC if (ret) { WNDPROC proc = WINPROC_AllocProc( wc32.lpfnWndProc, WIN_PROC_32A ); - wc->lpfnWndProc = WINPROC_GetProc( proc, WIN_PROC_16 ); + wc->lpfnWndProc = WINPROC_GetProc16( proc ); wc->style = wc32.style; wc->cbClsExtra = wc32.cbClsExtra; wc->cbWndExtra = wc32.cbWndExtra;

1 0

Alexandre Julliard : kernel: Added work-around in UnhandledExceptionFilter for no exec protections.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: feb7276c7366c93da3731a50032ee7526bdacc03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=feb7276c7366c93da3731a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 12:58:46 2006 +0200 kernel: Added work-around in UnhandledExceptionFilter for no exec protections. --- dlls/kernel/except.c | 54 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/kernel/except.c b/dlls/kernel/except.c index 95c5ce9..779146e 100644 --- a/dlls/kernel/except.c +++ b/dlls/kernel/except.c @@ -392,16 +392,12 @@ static int start_debugger_atomic(PEXCEPT * If yes, we unprotect the resources to let broken apps continue * (Windows does this too). */ -inline static BOOL check_resource_write( const EXCEPTION_RECORD *rec ) +inline static BOOL check_resource_write( void *addr ) { - void *addr, *rsrc; + void *rsrc; DWORD size; MEMORY_BASIC_INFORMATION info; - if (rec->ExceptionCode != EXCEPTION_ACCESS_VIOLATION) return FALSE; - if (rec->NumberParameters < 2) return FALSE; - if (!rec->ExceptionInformation[0]) return FALSE; /* not a write access */ - addr = (void *)rec->ExceptionInformation[1]; if (!VirtualQuery( addr, &info, sizeof(info) )) return FALSE; if (info.State == MEM_FREE || !(info.Type & MEM_IMAGE)) return FALSE; if (!(rsrc = RtlImageDirectoryEntryToData( (HMODULE)info.AllocationBase, TRUE, @@ -415,15 +411,57 @@ inline static BOOL check_resource_write( /******************************************************************* + * check_no_exec + * + * Check for executing a protected area. + */ +inline static BOOL check_no_exec( void *addr ) +{ + MEMORY_BASIC_INFORMATION info; + + if (!VirtualQuery( addr, &info, sizeof(info) )) return FALSE; + if (info.State == MEM_FREE) return FALSE; + + /* prot |= PAGE_EXECUTE would be a lot easier, but MS developers + * apparently don't grasp the notion of protection bits */ + switch(info.Protect) + { + case PAGE_READONLY: info.Protect = PAGE_EXECUTE_READ; break; + case PAGE_READWRITE: info.Protect = PAGE_EXECUTE_READWRITE; break; + case PAGE_WRITECOPY: info.Protect = PAGE_EXECUTE_WRITECOPY; break; + default: return FALSE; + } + /* FIXME: we should probably have a per-app option, and maybe a message box */ + FIXME( "No-exec fault triggered at %p, enabling work-around\n", addr ); + return VirtualProtect( addr, 1, info.Protect, NULL ); +} + + +/******************************************************************* * UnhandledExceptionFilter (KERNEL32.@) */ DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers) { - if (check_resource_write( epointers->ExceptionRecord )) return EXCEPTION_CONTINUE_EXECUTION; + const EXCEPTION_RECORD *rec = epointers->ExceptionRecord; + + if (rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && rec->NumberParameters >= 2) + { + switch(rec->ExceptionInformation[0]) + { + case 1: /* write access */ + if (check_resource_write( (void *)rec->ExceptionInformation[1] )) + return EXCEPTION_CONTINUE_EXECUTION; + break; + case 8: /* execute access */ + if (check_no_exec( (void *)rec->ExceptionInformation[1] )) + return EXCEPTION_CONTINUE_EXECUTION; + break; + } + } if (!NtCurrentTeb()->Peb->BeingDebugged) { - if (epointers->ExceptionRecord->ExceptionCode == CONTROL_C_EXIT) + if (rec->ExceptionCode == CONTROL_C_EXIT) { /* do not launch the debugger on ^C, simply terminate the process */ TerminateProcess( GetCurrentProcess(), 1 );

1 0

Alexandre Julliard : user: Separate Get/ SetWindowLong16 implementation from the 32-bit one.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: a95c58b871e27ab2a4051b266f00ebbf41fa7e4d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a95c58b871e27ab2a4051b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 13:49:37 2006 +0200 user: Separate Get/SetWindowLong16 implementation from the 32-bit one. --- dlls/user/win.c | 86 ++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 66 insertions(+), 20 deletions(-) diff --git a/dlls/user/win.c b/dlls/user/win.c index 10a1a4f..9fef05b 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -1888,24 +1888,6 @@ static LONG_PTR WIN_GetWindowLong( HWND { if (offset > (int)(wndPtr->cbWndExtra - sizeof(LONG))) { - /* - * Some programs try to access last element from 16 bit - * code using illegal offset value. Hopefully this is - * what those programs really expect. - */ - if (type == WIN_PROC_16 && - wndPtr->cbWndExtra >= 4 && - offset == wndPtr->cbWndExtra - sizeof(WORD)) - { - INT offset2 = wndPtr->cbWndExtra - sizeof(LONG); - - ERR( "- replaced invalid offset %d with %d\n", - offset, offset2 ); - - retvalue = *(LONG_PTR *)(((char *)wndPtr->wExtra) + offset2); - WIN_ReleasePtr( wndPtr ); - return retvalue; - } WARN("Invalid offset %d\n", offset ); WIN_ReleasePtr( wndPtr ); SetLastError( ERROR_INVALID_INDEX ); @@ -2144,7 +2126,47 @@ static LONG_PTR WIN_SetWindowLong( HWND */ LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) { - return WIN_GetWindowLong( WIN_Handle32(hwnd), offset, WIN_PROC_16 ); + WND *wndPtr; + LONG_PTR retvalue; + BOOL is_winproc = (offset == GWLP_WNDPROC); + + if (offset >= 0) + { + if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) + { + if (offset > (int)(wndPtr->cbWndExtra - sizeof(LONG))) + { + /* + * Some programs try to access last element from 16 bit + * code using illegal offset value. Hopefully this is + * what those programs really expect. + */ + if (wndPtr->cbWndExtra >= 4 && offset == wndPtr->cbWndExtra - sizeof(WORD)) + { + INT offset2 = wndPtr->cbWndExtra - sizeof(LONG); + ERR( "- replaced invalid offset %d with %d\n", offset, offset2 ); + offset = offset2; + } + else + { + WARN("Invalid offset %d\n", offset ); + WIN_ReleasePtr( wndPtr ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; + } + } + is_winproc = ((offset == DWLP_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG)); + WIN_ReleasePtr( wndPtr ); + } + } + retvalue = GetWindowLongA( WIN_Handle32(hwnd), offset ); + if (is_winproc) retvalue = (LONG_PTR)WINPROC_GetProc( (WNDPROC)retvalue, WIN_PROC_16 ); + return retvalue; } @@ -2171,7 +2193,31 @@ LONG WINAPI GetWindowLongW( HWND hwnd, I */ LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval ) { - return WIN_SetWindowLong( WIN_Handle32(hwnd), offset, newval, WIN_PROC_16 ); + WND *wndPtr; + BOOL is_winproc = (offset == GWLP_WNDPROC); + + if (offset == DWLP_DLGPROC) + { + if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) + { + is_winproc = ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && + (wndPtr->flags & WIN_ISDIALOG)); + WIN_ReleasePtr( wndPtr ); + } + } + + if (is_winproc) + { + WNDPROC new_proc = WINPROC_AllocProc( (WNDPROC)newval, WIN_PROC_16 ); + WNDPROC old_proc = (WNDPROC)SetWindowLongA( WIN_Handle32(hwnd), offset, (LONG_PTR)new_proc ); + return (LONG)WINPROC_GetProc( (WNDPROC)old_proc, WIN_PROC_16 ); + } + else return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); }

1 0

Marcus Meissner : ntdll: Make the section with AddressOfEntryPoint in it executable.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 08c2555dd86969c157037b7850667175aa102f16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08c2555dd86969c157037b7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 6 15:16:39 2006 +0200 ntdll: Make the section with AddressOfEntryPoint in it executable. --- dlls/ntdll/virtual.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1723070..fcdb96b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1072,6 +1072,12 @@ static NTSTATUS map_image( HANDLE hmappi if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ|VPROT_WRITECOPY; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; + + /* Dumb game crack lets the AOEP point into a data section. Adjust. */ + if ((nt->OptionalHeader.AddressOfEntryPoint >= sec->VirtualAddress) && + (nt->OptionalHeader.AddressOfEntryPoint < sec->VirtualAddress + size)) + vprot |= VPROT_EXEC; + VIRTUAL_SetProt( view, ptr + sec->VirtualAddress, size, vprot ); }

1 0

Louis. Lenders : gdi32: Add defines for GLYPHSET and WCRANGE.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 1ca6fc12a8ec0c05190e5c5b7dba7e0acb19442a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ca6fc12a8ec0c05190e5c5… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun May 7 00:29:54 2006 +0100 gdi32: Add defines for GLYPHSET and WCRANGE. --- include/wingdi.h | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index 9375ff9..f2fcd21 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3244,6 +3244,19 @@ typedef struct _DRAWPATRECT WORD wPattern; } DRAWPATRECT, *PDRAWPATRECT; +typedef struct tagWCRANGE { + WCHAR wcLow; + USHORT cGlyphs; +} WCRANGE, *PWCRANGE, *LPWCRANGE; + +typedef struct tagGLYPHSET { + DWORD cbThis; + DWORD flAccel; + DWORD cGlyphsSupported; + DWORD cRanges; + WCRANGE ranges[1]; +} GLYPHSET, *PGLYPHSET, *LPGLYPHSET; + INT WINAPI AbortDoc(HDC); BOOL WINAPI AbortPath(HDC); INT WINAPI AddFontResourceA(LPCSTR);

1 0

Louis. Lenders : gdi32: Add stub for GetCharWidthI and GetFontUnicodeRanges .
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: ad2b0a0fd7fa414a7f20b85828d3361d6d8a9278 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad2b0a0fd7fa414a7f20b85… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun May 7 00:33:32 2006 +0100 gdi32: Add stub for GetCharWidthI and GetFontUnicodeRanges. --- dlls/gdi/font.c | 18 ++++++++++++++++++ dlls/gdi/gdi32.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index b0d8a98..ada4966 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -3068,3 +3068,21 @@ BOOL WINAPI EnableEUDC(BOOL fEnableEUDC) FIXME("(%d): stub\n", fEnableEUDC); return FALSE; } + +/*********************************************************************** + * GetCharWidthI (GDI32.@) + */ +BOOL WINAPI GetCharWidthI(HDC hdc, UINT giFirst, UINT cgi, LPWORD pgi, LPINT lpBuffer) +{ + FIXME("(%p, %d, %d, %p, %p): stub\n", hdc, giFirst, cgi, pgi, lpBuffer); + return FALSE; +} + +/*********************************************************************** + * GetFontUnicodeRanges (GDI32.@) + */ +DWORD WINAPI GetFontUnicodeRanges(HDC hdc, LPGLYPHSET lpgs) +{ + FIXME("(%p, %p): stub\n", hdc, lpgs); + return 0; +} diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index 59c748d..1c245d8 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -244,7 +244,7 @@ # @ stub GetBrushAttributes @ stdcall GetCharWidthA(long long long long) GetCharWidth32A @ stdcall GetCharWidthFloatA(long long long ptr) @ stdcall GetCharWidthFloatW(long long long ptr) -# @ stub GetCharWidthI +@ stdcall GetCharWidthI(ptr long long ptr ptr) # @ stub GetCharWidthInfo @ stdcall GetCharWidthW(long long long long) GetCharWidth32W @ stub GetCharWidthWOW @@ -279,7 +279,7 @@ # @ stub GetFontAssocStatus @ stdcall GetFontLanguageInfo(long) @ stub GetFontResourceInfo @ stub GetFontResourceInfoW -# @ stub GetFontUnicodeRanges +@ stdcall GetFontUnicodeRanges(ptr ptr) @ stdcall GetGlyphIndicesA(long ptr long ptr long) @ stdcall GetGlyphIndicesW(long ptr long ptr long) @ stub GetGlyphOutline

1 0

Tomas Carnecky : opengl: Properly use glXQueryDrawable() to get the Visual ID.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 3a3a0b301367fa882868c952c181bd2d8f1a7e51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a3a0b301367fa882868c95… Author: Tomas Carnecky <tom(a)dbservice.com> Date: Tue May 9 00:38:00 2006 +0200 opengl: Properly use glXQueryDrawable() to get the Visual ID. --- dlls/opengl32/wgl.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index c7d3147..a9d0b27 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -509,22 +509,35 @@ static int describeContext(Wine_GLContex static int describeDrawable(Wine_GLContext* ctx, Drawable drawable) { int tmp; - int draw_vis_id; + int nElements; + int attribList[3] = { GLX_FBCONFIG_ID, 0, None }; + GLXFBConfig *fbCfgs; + if (3 > wine_glx.version || NULL == wine_glx.p_glXQueryDrawable) { /** glXQueryDrawable not available so returns not supported */ return -1; } + TRACE(" Drawable %p have :\n", (void*) drawable); - wine_glx.p_glXQueryDrawable(ctx->display, drawable, GLX_FBCONFIG_ID, (unsigned int*) &tmp); - TRACE(" - FBCONFIG_ID as 0x%x\n", tmp); - wine_glx.p_glXQueryDrawable(ctx->display, drawable, GLX_VISUAL_ID, (unsigned int*) &tmp); - TRACE(" - VISUAL_ID as 0x%x\n", tmp); - draw_vis_id = tmp; wine_glx.p_glXQueryDrawable(ctx->display, drawable, GLX_WIDTH, (unsigned int*) &tmp); TRACE(" - WIDTH as %d\n", tmp); wine_glx.p_glXQueryDrawable(ctx->display, drawable, GLX_HEIGHT, (unsigned int*) &tmp); TRACE(" - HEIGHT as %d\n", tmp); - return draw_vis_id; + wine_glx.p_glXQueryDrawable(ctx->display, drawable, GLX_FBCONFIG_ID, (unsigned int*) &tmp); + TRACE(" - FBCONFIG_ID as 0x%x\n", tmp); + + attribList[1] = tmp; + fbCfgs = wine_glx.p_glXChooseFBConfig(ctx->display, DefaultScreen(ctx->display), attribList, &nElements); + if (fbCfgs == NULL) { + return -1; + } + + wine_glx.p_glXGetFBConfigAttrib(ctx->display, fbCfgs[0], GLX_VISUAL_ID, &tmp); + TRACE(" - VISUAL_ID as 0x%x\n", tmp); + + XFree(fbCfgs); + + return tmp; } /***********************************************************************

1 0

Mike McCormack : x11drv: Fix a warning when opengl headers are missing.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: a0882e9bf7ef2bd872528b223f90385e0f850f45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a0882e9bf7ef2bd872528b2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue May 9 17:37:37 2006 +0900 x11drv: Fix a warning when opengl headers are missing. --- dlls/x11drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index ba125b9..d0a3053 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -660,7 +660,7 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVIC * SwapBuffers (X11DRV.@) */ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) { - ERR("No OpenGL support compiled in.\n"); + ERR_(opengl)("No OpenGL support compiled in.\n"); return FALSE; }

1 0