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

Robert Shearman : rpcrt4: Fill out more of the function tables with functions that already exist.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: b52ae402ad03bd12145553d78d51b996184cb984 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b52ae402ad03bd12145553d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 17 14:45:40 2006 +0100 rpcrt4: Fill out more of the function tables with functions that already exist. --- dlls/rpcrt4/ndr_marshall.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 67e7ab0..3207719 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -139,7 +139,7 @@ const NDR_MARSHALL NdrMarshaller[NDR_TAB /* 0x2a */ NdrEncapsulatedUnionMarshall, NdrNonEncapsulatedUnionMarshall, - 0, + NdrByteCountPointerMarshall, NdrXmitOrRepAsMarshall, NdrXmitOrRepAsMarshall, /* 0x2f */ NdrInterfacePointerMarshall, @@ -176,7 +176,7 @@ const NDR_UNMARSHALL NdrUnmarshaller[NDR /* 0x2a */ NdrEncapsulatedUnionUnmarshall, NdrNonEncapsulatedUnionUnmarshall, - 0, + NdrByteCountPointerUnmarshall, NdrXmitOrRepAsUnmarshall, NdrXmitOrRepAsUnmarshall, /* 0x2f */ NdrInterfacePointerUnmarshall, @@ -213,7 +213,7 @@ const NDR_BUFFERSIZE NdrBufferSizer[NDR_ /* 0x2a */ NdrEncapsulatedUnionBufferSize, NdrNonEncapsulatedUnionBufferSize, - 0, + NdrByteCountPointerBufferSize, NdrXmitOrRepAsBufferSize, NdrXmitOrRepAsBufferSize, /* 0x2f */ NdrInterfacePointerBufferSize, @@ -234,17 +234,24 @@ const NDR_MEMORYSIZE NdrMemorySizer[NDR_ NdrPointerMemorySize, NdrPointerMemorySize, /* 0x15 */ NdrSimpleStructMemorySize, NdrSimpleStructMemorySize, - 0, 0, 0, + NdrConformantStructMemorySize, NdrConformantStructMemorySize, + NdrConformantVaryingStructMemorySize, NdrComplexStructMemorySize, /* 0x1b */ - NdrConformantArrayMemorySize, 0, 0, 0, 0, 0, + NdrConformantArrayMemorySize, + NdrConformantVaryingArrayMemorySize, + NdrFixedArrayMemorySize, NdrFixedArrayMemorySize, + NdrVaryingArrayMemorySize, NdrVaryingArrayMemorySize, NdrComplexArrayMemorySize, /* 0x22 */ NdrConformantStringMemorySize, 0, 0, NdrConformantStringMemorySize, NdrNonConformantStringMemorySize, 0, 0, 0, /* 0x2a */ - 0, 0, 0, 0, 0, + NdrEncapsulatedUnionMemorySize, + NdrNonEncapsulatedUnionMemorySize, + NdrByteCountPointerMemorySize, + NdrXmitOrRepAsMemorySize, NdrXmitOrRepAsMemorySize, /* 0x2f */ NdrInterfacePointerMemorySize, /* 0xb0 */

1 0

Robert Shearman : rpcrt4: Raise an exception if there is no default handler for a union.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: ecd3780cc02f15e9fc3f5d4b28505fc9b2caee9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecd3780cc02f15e9fc3f5d4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 17 14:45:55 2006 +0100 rpcrt4: Raise an exception if there is no default handler for a union. --- dlls/rpcrt4/ndr_marshall.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 312af8f..67e7ab0 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3526,12 +3526,13 @@ static PFORMAT_STRING get_arm_offset_fro { if(type == 0xffff) { - FIXME("should raise an exception here\n"); + ERR("no arm for 0x%lx and no default case\n", discriminant); + RpcRaiseException(RPC_S_INVALID_TAG); return NULL; } if(type == 0) { - /* Don't marshall any type. FIXME is this correct? */ + TRACE("falling back to empty default case for 0x%lx\n", discriminant); return NULL; } }

1 0

Alexandre Julliard : user: The result for dialog procedures is stored in DWLP_MSGRESULT.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: c1c5f14839f5b87c25bfe10cb7ebcc4ffcbe3ecf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1c5f14839f5b87c25bfe10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 20:53:51 2006 +0200 user: The result for dialog procedures is stored in DWLP_MSGRESULT. So we have to access it using Get/SetWindowLong when unmapping the message results (based on a patch by Troy Rollo). --- dlls/user/winproc.c | 161 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 108 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c1c5f14839f5b87c25b…

1 0

Alexandre Julliard : user: Remove unreachable code in DEFDLG_Proc.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: cb3f3afca4d9dbbd838fc86d3542dee557cb5472 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb3f3afca4d9dbbd838fc86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 19:30:59 2006 +0200 user: Remove unreachable code in DEFDLG_Proc. --- dlls/user/defdlg.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user/defdlg.c b/dlls/user/defdlg.c index 28780ab..daf6631 100644 --- a/dlls/user/defdlg.c +++ b/dlls/user/defdlg.c @@ -313,9 +313,6 @@ static LRESULT DEFDLG_Proc( HWND hwnd, U PostMessageA( hwnd, WM_COMMAND, MAKEWPARAM(IDCANCEL, BN_CLICKED), (LPARAM)GetDlgItem( hwnd, IDCANCEL ) ); return 0; - - case WM_NOTIFYFORMAT: - return DefWindowProcA( hwnd, msg, wParam, lParam ); } return 0; }

1 0

Alexandre Julliard : user: Support storing multiple winprocs in a single winproc handle.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 0667292eb594cf41dd0e929bcb3a077956eb10ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0667292eb594cf41dd0e929… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 13:55:36 2006 +0200 user: Support storing multiple winprocs in a single winproc handle. Allows to remove special cases for window classes being Ascii and Unicode at the same time. --- dlls/user/class.c | 79 +++---------------- dlls/user/message.c | 4 - dlls/user/win.c | 6 + dlls/user/winproc.c | 213 +++++++++++++++++---------------------------------- dlls/user/winproc.h | 2 5 files changed, 89 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0667292eb594cf41dd0…

1 0

Alexandre Julliard : user: Allocate 16-bit thunks separately from the window proc structure.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 2a809c195dc118f839a43b4e6fcf09d1d3ae31d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a809c195dc118f839a43b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 13:51:37 2006 +0200 user: Allocate 16-bit thunks separately from the window proc structure. Also make sure the thunk memory block has execute permissions. --- dlls/user/winproc.c | 188 +++++++++++++++++++++++++++------------------------ 1 files changed, 101 insertions(+), 87 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index d01f137..5a40111 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -45,36 +45,8 @@ WINE_DECLARE_DEBUG_CHANNEL(msg); WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DEFAULT_DEBUG_CHANNEL(win); -#ifdef __i386__ - -#include "pshpack1.h" - -/* Window procedure 16-to-32-bit thunk */ -typedef struct -{ - BYTE popl_eax; /* popl %eax (return address) */ - BYTE pushl_func; /* pushl $proc */ - struct tagWINDOWPROC *proc; - BYTE pushl_eax; /* pushl %eax */ - BYTE ljmp; /* ljmp relay*/ - DWORD relay_offset; /* __wine_call_wndproc */ - WORD relay_sel; -} WINPROC_THUNK; - -#include "poppack.h" - -#else /* __i386__ */ - -typedef struct -{ - WNDPROC proc; -} WINPROC_THUNK; - -#endif /* __i386__ */ - typedef struct tagWINDOWPROC { - WINPROC_THUNK thunk; /* Thunk */ BYTE type; /* Function type */ union { @@ -106,15 +78,6 @@ static CRITICAL_SECTION_DEBUG critsect_d }; static CRITICAL_SECTION winproc_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static BOOL is_valid_winproc( WINDOWPROC *proc ) -{ - /* check alignment */ - if (((BYTE *)proc - (BYTE *)winproc_array) % sizeof(*proc)) return FALSE; - /* check array limits */ - if (proc < winproc_array || proc >= winproc_array + winproc_used) return FALSE; - return (proc->type != WIN_PROC_INVALID); -} - /* find an existing winproc for a given 16-bit function and type */ /* FIXME: probably should do something more clever than a linear search */ static inline WINDOWPROC *find_winproc16( WNDPROC16 func ) @@ -151,43 +114,9 @@ static inline WINDOWPROC *init_winproc(v if (winproc_used >= MAX_WINPROCS) return NULL; proc = &winproc_array[winproc_used++]; -#ifdef __i386__ - { - static FARPROC16 relay; - - if (!relay) relay = GetProcAddress16( GetModuleHandle16("user"), "__wine_call_wndproc" ); - - proc->thunk.popl_eax = 0x58; /* popl %eax */ - proc->thunk.pushl_func = 0x68; /* pushl $proc */ - proc->thunk.proc = proc; - proc->thunk.pushl_eax = 0x50; /* pushl %eax */ - proc->thunk.ljmp = 0xea; /* ljmp relay*/ - proc->thunk.relay_offset = OFFSETOF(relay); - proc->thunk.relay_sel = SELECTOROF(relay); - } -#endif /* __i386__ */ return proc; } -static WORD get_winproc_selector(void) -{ - static LONG winproc_selector; - WORD ret; - - if (!(ret = winproc_selector)) - { - LDT_ENTRY entry; - WORD sel = wine_ldt_alloc_entries(1); - wine_ldt_set_base( &entry, winproc_array ); - wine_ldt_set_limit( &entry, sizeof(winproc_array) - 1 ); - wine_ldt_set_flags( &entry, WINE_LDT_FLAGS_CODE | WINE_LDT_FLAGS_32BIT ); - wine_ldt_set_entry( sel, &entry ); - if (!(ret = InterlockedCompareExchange( &winproc_selector, sel, 0 ))) ret = sel; - else wine_ldt_free_entries( sel, 1 ); /* somebody beat us to it */ - } - return ret; -} - /* return the window proc for a given handle, or NULL for an invalid handle */ static inline WINDOWPROC *handle_to_proc( WNDPROC handle ) { @@ -197,20 +126,6 @@ static inline WINDOWPROC *handle_to_proc return &winproc_array[index]; } -/* return the window proc for a given handle, or NULL for an invalid handle */ -static inline WINDOWPROC *handle16_to_proc( WNDPROC16 handle ) -{ - if (HIWORD(handle) == get_winproc_selector()) - { - BYTE *ptr = (BYTE *)winproc_array + LOWORD(handle); - /* It must be the thunk address */ - WINDOWPROC *proc = (WINDOWPROC *)(ptr - FIELD_OFFSET(WINDOWPROC,thunk)); - if (is_valid_winproc(proc)) return proc; - return NULL; - } - return handle_to_proc( (WNDPROC)handle ); -} - /* create a handle for a given window proc */ static inline WNDPROC proc_to_handle( WINDOWPROC *proc ) { @@ -249,6 +164,106 @@ static inline WINDOWPROC *alloc_winproc( #ifdef __i386__ + +#include "pshpack1.h" + +/* Window procedure 16-to-32-bit thunk */ +typedef struct +{ + BYTE popl_eax; /* popl %eax (return address) */ + BYTE pushl_func; /* pushl $proc */ + WINDOWPROC *proc; + BYTE pushl_eax; /* pushl %eax */ + BYTE ljmp; /* ljmp relay*/ + DWORD relay_offset; /* __wine_call_wndproc */ + WORD relay_sel; +} WINPROC_THUNK; + +#include "poppack.h" + +#define MAX_THUNKS (0x10000 / sizeof(WINPROC_THUNK)) + +static WINPROC_THUNK *thunk_array; +static UINT thunk_selector; +static UINT thunk_used; + +/* return the window proc for a given handle, or NULL for an invalid handle */ +static inline WINDOWPROC *handle16_to_proc( WNDPROC16 handle ) +{ + if (HIWORD(handle) == thunk_selector) + { + UINT index = LOWORD(handle) / sizeof(WINPROC_THUNK); + /* check alignment */ + if (index * sizeof(WINPROC_THUNK) != LOWORD(handle)) return NULL; + /* check array limits */ + if (index >= thunk_used) return NULL; + return thunk_array[index].proc; + } + return handle_to_proc( (WNDPROC)handle ); +} + +/* allocate a 16-bit thunk for an existing window proc */ +static WNDPROC16 alloc_win16_thunk( WINDOWPROC *proc ) +{ + static FARPROC16 relay; + WNDPROC16 ret = 0; + UINT i; + + EnterCriticalSection( &winproc_cs ); + + if (!thunk_array) /* allocate the array and its selector */ + { + LDT_ENTRY entry; + + if (!(thunk_selector = wine_ldt_alloc_entries(1))) goto done; + if (!(thunk_array = VirtualAlloc( NULL, MAX_THUNKS * sizeof(WINPROC_THUNK), MEM_COMMIT, + PAGE_EXECUTE_READWRITE ))) goto done; + wine_ldt_set_base( &entry, thunk_array ); + wine_ldt_set_limit( &entry, MAX_THUNKS * sizeof(WINPROC_THUNK) - 1 ); + wine_ldt_set_flags( &entry, WINE_LDT_FLAGS_CODE | WINE_LDT_FLAGS_32BIT ); + wine_ldt_set_entry( thunk_selector, &entry ); + relay = GetProcAddress16( GetModuleHandle16("user"), "__wine_call_wndproc" ); + } + + /* check if it already exists */ + for (i = 0; i < thunk_used; i++) if (thunk_array[i].proc == proc) break; + + if (i == thunk_used) /* create a new one */ + { + WINPROC_THUNK *thunk; + + if (thunk_used >= MAX_THUNKS) goto done; + thunk = &thunk_array[thunk_used++]; + thunk->popl_eax = 0x58; /* popl %eax */ + thunk->pushl_func = 0x68; /* pushl $proc */ + thunk->proc = proc; + thunk->pushl_eax = 0x50; /* pushl %eax */ + thunk->ljmp = 0xea; /* ljmp relay*/ + thunk->relay_offset = OFFSETOF(relay); + thunk->relay_sel = SELECTOROF(relay); + } + ret = (WNDPROC16)MAKESEGPTR( thunk_selector, i * sizeof(WINPROC_THUNK) ); +done: + LeaveCriticalSection( &winproc_cs ); + return ret; +} + +#else /* __i386__ */ + +static inline WINDOWPROC *handle16_to_proc( WNDPROC16 handle ) +{ + return handle_to_proc( (WNDPROC)handle ); +} + +static inline WNDPROC16 alloc_win16_thunk( WINDOWPROC *proc ) +{ + return 0; +} + +#endif /* __i386__ */ + + +#ifdef __i386__ /* Some window procedures modify register they shouldn't, or are not * properly declared stdcall; so we need a small assembly wrapper to * call them. */ @@ -495,8 +510,7 @@ WNDPROC16 WINPROC_GetProc16( WNDPROC pro if (ptr->type == WIN_PROC_16) return ptr->u.proc16; else - return (WNDPROC16)MAKESEGPTR( get_winproc_selector(), - (char *)&ptr->thunk - (char *)winproc_array ); + return alloc_win16_thunk( ptr ); }

1 0

Alexandre Julliard : x11drv: Fixed typo in the clipboard XA_STRING handling .
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 354edc476fb6881ccdb9e9f391be8feb904eb2a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=354edc476fb6881ccdb9e9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 12:55:02 2006 +0200 x11drv: Fixed typo in the clipboard XA_STRING handling. --- dlls/x11drv/clipboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/clipboard.c b/dlls/x11drv/clipboard.c index 49a7ccc..4ea41a8 100644 --- a/dlls/x11drv/clipboard.c +++ b/dlls/x11drv/clipboard.c @@ -1865,7 +1865,7 @@ static int X11DRV_CLIPBOARD_QueryAvailab selectionCacheSrc = x11drv_atom(CLIPBOARD); else { - Atom xstr = XA_PRIMARY; + Atom xstr = XA_STRING; /* Selection Owner doesn't understand TARGETS, try retrieving XA_STRING */ if (X11DRV_CLIPBOARD_QueryTargets(display, w, XA_PRIMARY, XA_STRING, &xe))

1 0

lostwages/ templates/en/download.template imag ...
by Jeremy Newman May 17, 2006

May 17, 2006

ChangeSet ID: 24907 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/05/17 09:46:15 Modified files: templates/en : download.template Added files: images/distro : mandriva.png Removed files: images/distro : mandrake.png Log message: change the Mandrake logo to the Mandriva logo Patch: http://cvs.winehq.org/patch.py?id=24907 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/images/distro/mandriva.png 1.1 Removed +0 -0 lostwages/images/distro/mandrake.png 1.80 1.81 +1 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.80 lostwages/templates/en/download.template:1.81 --- lostwages/templates/en/download.template:1.80 17 May 2006 14:46:15 -0000 +++ lostwages/templates/en/download.template 17 May 2006 14:46:15 -0000 @@ -40,7 +40,7 @@ for post-installation instructions.< <tr bgcolor="#ffffff"> <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> - <img src="{$root}/images/distro/mandrake.png" width="50" height="50" alt="LinuxMandrake" border="0"></a> + <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandriva</a> binary .rpms for Mandrakelinux 10.0, 10.1, and Mandriva Linux 2005 Limited Edition</td>

1 0

lostwages/ templates/en/download.template imag ...
by Jeremy Newman May 17, 2006

May 17, 2006

ChangeSet ID: 24906 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/05/17 09:34:04 Modified files: templates/en : download.template Added files: images/distro : pcbsd.png Log message: added download link and maintainer for PC-BSD OS Patch: http://cvs.winehq.org/patch.py?id=24906 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/images/distro/pcbsd.png 1.79 1.80 +9 -0 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.79 lostwages/templates/en/download.template:1.80 --- lostwages/templates/en/download.template:1.79 17 May 2006 14:34: 4 -0000 +++ lostwages/templates/en/download.template 17 May 2006 14:34: 4 -0000 @@ -84,6 +84,15 @@ for post-installation instructions.< </tr> <tr bgcolor="#ffffff"> + <td align=center><a href="http://www.pbidir.com/search.php?str=wine"> + <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a> + </td> + <td> <a href="http://www.pbidir.com/search.php?str=wine">PC-BSD</a> + binary packages .pbi for PC-BSD (FreeBSD based OS)</td> + <td><a href="mailto:kris(a)pcbsd.com">Kris Moore</a></td> + </tr> + + <tr bgcolor="#ffffff"> <td align=center><a href="http://www.blastwave.org/wine/"> <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a> </td>

1 0

lostwages/templates/en getting_help.template
by Jeremy Newman May 17, 2006

May 17, 2006

ChangeSet ID: 24905 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/05/17 09:17:59 Modified files: templates/en : getting_help.template Log message: add a quick link for contacting the web-admin email Patch: http://cvs.winehq.org/patch.py?id=24905 Old revision New revision Changes Path 1.2 1.3 +2 -0 lostwages/templates/en/getting_help.template Index: lostwages/templates/en/getting_help.template diff -u -p lostwages/templates/en/getting_help.template:1.2 lostwages/templates/en/getting_help.template:1.3 --- lostwages/templates/en/getting_help.template:1.2 17 May 2006 14:17:59 -0000 +++ lostwages/templates/en/getting_help.template 17 May 2006 14:17:59 -0000 @@ -98,4 +98,6 @@ </table> +Problems with our website or notice a typo? Contact our <a href="mailto:web-admin(a)winehq.org">Web Team</a>. +

1 0