September 2012 - Wine-commits

Jason Edmeades : cmd: A successful set should reset the errorlevel.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: f9b4c78a8981df2b8aa81b0a2d32bc8e828c9ca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b4c78a8981df2b8aa81b0a2… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Wed Sep 5 23:41:48 2012 +0100 cmd: A successful set should reset the errorlevel. --- programs/cmd/builtins.c | 1 + programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b2f9aeb..a9e7473 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2366,6 +2366,7 @@ void WCMD_setshow_env (WCHAR *s) { if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { errorlevel = 1; } else if ((!status)) WCMD_print_error(); + else errorlevel = 0; } } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index fe4c30c..6a19d2c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -201,13 +201,13 @@ baz(a)space@ @todo_wine(a)0 ------------ Testing 'set' ------------ 1 -(a)todo_wine@0 +0 FOOBAR not defined @todo_wine@ baz FOOBAR = baz -(a)todo_wine@0 +0 @todo_wine@ baz2 -(a)todo_wine@0 +0 bar @todo_wine(a)FOOBAR= bar @todo_wine(a)FOOBAR = baz2

1 0

Jason Edmeades : cmd: Space does not delimit environment variable names.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: ebd18109189b78bb548637427b564905faa31454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd18109189b78bb548637427… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Sep 6 00:09:23 2012 +0100 cmd: Space does not delimit environment variable names. --- programs/cmd/builtins.c | 2 ++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a9e7473..94c7171 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2361,6 +2361,8 @@ void WCMD_setshow_env (WCHAR *s) { *p++ = '\0'; if (strlenW(p) == 0) p = NULL; + WINE_TRACE("set: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), + wine_dbgstr_w(p)); status = SetEnvironmentVariableW(s, p); gle = GetLastError(); if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 6a19d2c..d0a4e1f 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -203,10 +203,10 @@ baz(a)space@ 1 0 FOOBAR not defined -(a)todo_wine@ baz + baz FOOBAR = baz 0 -(a)todo_wine@ baz2 + baz2 0 bar @todo_wine(a)FOOBAR= bar diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 93a2bb8..f762b70 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -557,7 +557,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, static const WCHAR Time[] = {'T','I','M','E','\0'}; static const WCHAR Cd[] = {'C','D','\0'}; static const WCHAR Random[] = {'R','A','N','D','O','M','\0'}; - static const WCHAR Delims[] = {'%',' ',':','\0'}; + static const WCHAR Delims[] = {'%',':','\0'}; WINE_TRACE("Expanding: %s (%s,%s)\n", wine_dbgstr_w(start), wine_dbgstr_w(forVal), wine_dbgstr_w(forVar));

1 0

Akihiro Sagawa : user32: Add support for legacy access keys.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 70937bd8ddd7a4f40b844abf0dcb36c937d7ab45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70937bd8ddd7a4f40b844abf0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 5 20:31:17 2012 +0900 user32: Add support for legacy access keys. --- dlls/user32/menu.c | 7 +++++-- dlls/user32/text.c | 27 ++++++++++++++++++++------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f1beb94..b325372 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -773,15 +773,18 @@ static UINT MENU_FindItemByKey( HWND hwndOwner, HMENU hmenu, if( !forceMenuChar ) { UINT i; + BOOL cjk = GetSystemMetrics( SM_DBCSENABLED ); for (i = 0; i < menu->nItems; i++, item++) { if( item->text) { - WCHAR *p = item->text - 2; + const WCHAR *p = item->text - 2; do { - p = strchrW (p + 2, '&'); + const WCHAR *q = p + 2; + p = strchrW (q, '&'); + if (!p && cjk) p = strchrW (q, '\036'); /* Japanese Win16 */ } while (p != NULL && p [1] == '&'); if (p && (toupperW(p[1]) == toupperW(key))) return i; diff --git a/dlls/user32/text.c b/dlls/user32/text.c index d7188c8..8539bdf 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -87,6 +87,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(text); #define CR 13 #define SPACE 32 #define PREFIX 38 +#define ALPHA_PREFIX 30 /* Win16: Alphabet prefix */ +#define KANA_PREFIX 31 /* Win16: Katakana prefix */ #define FORWARD_SLASH '/' #define BACK_SLASH '\\' @@ -472,8 +474,9 @@ static void TEXT_SkipChars (int *new_count, const WCHAR **new_str, max -= n; while (n--) { - if (*start_str++ == PREFIX && max--) + if ((*start_str == PREFIX || *start_str == ALPHA_PREFIX) && max--) start_str++; + start_str++; } start_count -= (start_str - str_on_entry); } @@ -507,10 +510,10 @@ static int TEXT_Reprefix (const WCHAR *str, unsigned int ns, const ellipsis_data *pe) { int result = -1; - unsigned int i = 0; + unsigned int i; unsigned int n = pe->before + pe->under + pe->after; assert (n <= ns); - while (i < n) + for (i = 0; i < n; i++, str++) { if (i == pe->before) { @@ -523,16 +526,15 @@ static int TEXT_Reprefix (const WCHAR *str, unsigned int ns, } if (!ns) break; ns--; - if (*str++ == PREFIX) + if (*str == PREFIX || *str == ALPHA_PREFIX) { + str++; if (!ns) break; if (*str != PREFIX) result = (i < pe->before || pe->under == 0) ? i : i - pe->under + pe->len; /* pe->len may be non-zero while pe_under is zero */ - str++; ns--; } - i++; } return result; } @@ -631,8 +633,13 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, (str[i] != TAB || !(format & DT_EXPANDTABS)) && ((str[i] != CR && str[i] != LF) || (format & DT_SINGLELINE))) { - if (str[i] == PREFIX && !(format & DT_NOPREFIX) && *count > 1) + if ((format & DT_NOPREFIX) || *count <= 1) { + (*count)--; if (j < maxl) dest[j++] = str[i++]; else i++; + continue; + } + + if (str[i] == PREFIX || str[i] == ALPHA_PREFIX) { (*count)--, i++; /* Throw away the prefix itself */ if (str[i] == PREFIX) { @@ -648,6 +655,12 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, * one. */ } + else if (str[i] == KANA_PREFIX) + { + /* Throw away katakana access keys */ + (*count)--, i++; /* skip the prefix */ + (*count)--, i++; /* skip the letter */ + } else { (*count)--; if (j < maxl) dest[j++] = str[i++]; else i++;

1 0

Alexandre Julliard : user32: Add support for managing a DIB surface for a window.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: a5ef549c6e4266d9a7e129b42ff49b109c6cadb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ef549c6e4266d9a7e129b42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:32:52 2012 +0200 user32: Add support for managing a DIB surface for a window. --- dlls/user32/driver.c | 14 +++++---- dlls/user32/painting.c | 58 +++++++++++++++++++++++++++++++++++- dlls/user32/user_private.h | 10 +++++- dlls/user32/win.c | 9 ++++++ dlls/user32/win.h | 2 + dlls/user32/winpos.c | 38 ++++++++++++++++++++---- dlls/winex11.drv/window.c | 6 ++- dlls/winex11.drv/winex11.drv.spec | 4 +- 8 files changed, 121 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5ef549c6e4266d9a7e12…

1 0

Alexandre Julliard : user32: Maintain a list of active window surfaces and flush them periodically.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 7304445a7efa9f30e4541b075a2022319f291e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7304445a7efa9f30e4541b075… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:38:13 2012 +0200 user32: Maintain a list of active window surfaces and flush them periodically. --- dlls/user32/painting.c | 16 ++---------- dlls/user32/win.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/win.h | 2 + dlls/user32/winpos.c | 1 + dlls/user32/winproc.c | 5 +++- 5 files changed, 70 insertions(+), 16 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 3869b48..4def070 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -801,23 +801,11 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, * update_now * * Implementation of RDW_UPDATENOW behavior. - * - * FIXME: Windows uses WM_SYNCPAINT to cut down the number of intertask - * SendMessage() calls. This is a comment inside DefWindowProc() source - * from 16-bit SDK: - * - * This message avoids lots of inter-app message traffic - * by switching to the other task and continuing the - * recursion there. - * - * wParam = flags - * LOWORD(lParam) = hrgnClip - * HIWORD(lParam) = hwndSkip (not used; always NULL) - * */ static void update_now( HWND hwnd, UINT rdw_flags ) { HWND child = 0; + int count = 0; /* desktop window never gets WM_PAINT, only WM_ERASEBKGND */ if (hwnd == GetDesktopWindow()) erase_now( hwnd, rdw_flags | RDW_NOCHILDREN ); @@ -834,8 +822,10 @@ static void update_now( HWND hwnd, UINT rdw_flags ) if (!flags) break; /* nothing more to do */ SendMessageW( child, WM_PAINT, 0, 0 ); + count++; if (rdw_flags & RDW_NOCHILDREN) break; } + if (count) flush_window_surfaces( FALSE ); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c03ff42..2a0848e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -44,6 +44,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); static DWORD process_layout = ~0u; +static struct list window_surfaces = LIST_INIT( window_surfaces ); + +static CRITICAL_SECTION surfaces_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &surfaces_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": surfaces_section") } +}; +static CRITICAL_SECTION surfaces_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + /**********************************************************************/ /* helper for Get/SetWindowLong */ @@ -475,6 +486,45 @@ BOOL is_desktop_window( HWND hwnd ) } +/******************************************************************* + * register_window_surface + * + * Register a window surface in the global list, possibly replacing another one. + */ +void register_window_surface( struct window_surface *old, struct window_surface *new ) +{ + if (old == new) return; + EnterCriticalSection( &surfaces_section ); + if (old) list_remove( &old->entry ); + if (new) list_add_tail( &window_surfaces, &new->entry ); + LeaveCriticalSection( &surfaces_section ); +} + + +/******************************************************************* + * flush_window_surfaces + * + * Flush pending output from all window surfaces. + */ +void flush_window_surfaces( BOOL idle ) +{ + static DWORD last_idle; + DWORD now; + struct window_surface *surface; + + EnterCriticalSection( &surfaces_section ); + now = GetTickCount(); + if (idle) last_idle = now; + /* if not idle, we only flush if there's evidence that the app never goes idle */ + else if ((int)(now - last_idle) < 1000) goto done; + + LIST_FOR_EACH_ENTRY( surface, &window_surfaces, struct window_surface, entry ) + surface->funcs->flush( surface ); +done: + LeaveCriticalSection( &surfaces_section ); +} + + /*********************************************************************** * WIN_GetPtr * @@ -863,7 +913,11 @@ LRESULT WIN_DestroyWindow( HWND hwnd ) if (icon_title) DestroyWindow( icon_title ); if (menu) DestroyMenu( menu ); if (sys_menu) DestroyMenu( sys_menu ); - if (surface) window_surface_release( surface ); + if (surface) + { + register_window_surface( surface, NULL ); + window_surface_release( surface ); + } USER_Driver->pDestroyWindow( hwnd ); @@ -917,7 +971,11 @@ static void destroy_thread_window( HWND hwnd ) HeapFree( GetProcessHeap(), 0, wndPtr ); if (menu) DestroyMenu( menu ); if (sys_menu) DestroyMenu( sys_menu ); - if (surface) window_surface_release( surface ); + if (surface) + { + register_window_surface( surface, NULL ); + window_surface_release( surface ); + } } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 81e81b2..4bbe7ae 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -80,6 +80,8 @@ typedef struct tagWND /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern void register_window_surface( struct window_surface *old, struct window_surface *new ) DECLSPEC_HIDDEN; +extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 60a539b..fa74567 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2020,6 +2020,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { TRACE( "win %p surface %p -> %p\n", hwnd, old_surface, new_surface ); + register_window_surface( old_surface, new_surface ); if (old_surface) { if (!IsRectEmpty( valid_rects )) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index b06e93d..de7de6f 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1123,7 +1123,10 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { - DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); + DWORD ret; + + flush_window_surfaces( TRUE ); + ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); return ret; }

1 0

Alexandre Julliard : winex11: Use window surfaces for rendering top-level windows.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 33ac850c80634c891b0c157bbffa612f70954a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ac850c80634c891b0c157bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:39:34 2012 +0200 winex11: Use window surfaces for rendering top-level windows. It can be disabled by setting "ClientSideGraphics"="n". --- dlls/winex11.drv/bitblt.c | 192 ++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 49 ++++++++++ dlls/winex11.drv/x11drv.h | 3 + dlls/winex11.drv/x11drv_main.c | 4 + 4 files changed, 248 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33ac850c80634c891b0c1…

1 0

Alexandre Julliard : winex11: Handle Expose events by refreshing from the window surface.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 2eebedf38e4d5fd49075f8f89e63f869ca85cceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eebedf38e4d5fd49075f8f89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 30 15:09:03 2012 +0200 winex11: Handle Expose events by refreshing from the window surface. --- dlls/winex11.drv/event.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7da0947..dc7d1e3 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -791,7 +791,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) XExposeEvent *event = &xev->xexpose; RECT rect; struct x11drv_win_data *data; - int flags = RDW_INVALIDATE | RDW_ERASE; + int flags = RDW_INVALIDATE | RDW_ERASE | RDW_FRAME; TRACE( "win %p (%lx) %d,%d %dx%d\n", hwnd, event->window, event->x, event->y, event->width, event->height ); @@ -802,15 +802,19 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) rect.top = event->y; rect.right = event->x + event->width; rect.bottom = event->y + event->height; - if (event->window == data->whole_window) + + if (data->surface) { - OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, - data->whole_rect.top - data->client_rect.top ); - flags |= RDW_FRAME; + data->surface->funcs->lock( data->surface ); + add_bounds_rect( data->surface->funcs->get_bounds( data->surface ), &rect ); + data->surface->funcs->unlock( data->surface ); } if (event->window != root_window) { + OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); + if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) mirror_rect( &data->client_rect, &rect ); @@ -829,7 +833,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) } else OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - RedrawWindow( hwnd, &rect, 0, flags ); + if (!data->surface) RedrawWindow( hwnd, &rect, 0, flags ); }

1 0

Alexandre Julliard : winex11: Check for changes in min/ maximize state even when the window rectangle didn't change.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 6f1d43b16ecd8018f61f8fc947e78b9f5255cd63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1d43b16ecd8018f61f8fc94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 14:09:06 2012 +0200 winex11: Check for changes in min/maximize state even when the window rectangle didn't change. --- dlls/winex11.drv/event.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dc7d1e3..ba80439 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1019,14 +1019,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if ((data->window_rect.right - data->window_rect.left == cx && data->window_rect.bottom - data->window_rect.top == cy) || (IsRectEmpty( &data->window_rect ) && event->width == 1 && event->height == 1)) - { - if (flags & SWP_NOMOVE) /* if nothing changed, don't do anything */ - { - TRACE( "Nothing has changed, ignoring event\n" ); - return; - } flags |= SWP_NOSIZE; - } else TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, @@ -1051,7 +1044,8 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) } } - SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + if ((flags & (SWP_NOSIZE | SWP_NOMOVE)) != (SWP_NOSIZE | SWP_NOMOVE)) + SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); }

1 0

Vincent Povirk : mscoree: Preserve %ecx when calling ReallyFixupVTable.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: b5c663ee1e4fd092e51735de219007bdb47d46d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c663ee1e4fd092e51735de2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 5 15:25:59 2012 -0500 mscoree: Preserve %ecx when calling ReallyFixupVTable. --- dlls/mscoree/corruntimehost.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ecefe75..da46d61 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -827,6 +827,8 @@ static void get_utf8_args(int *argc, char ***argv) struct vtable_fixup_thunk { + /* push %ecx */ + BYTE i7; /* sub $0x4,%esp */ BYTE i1[3]; /* mov fixup,(%esp) */ @@ -839,12 +841,15 @@ struct vtable_fixup_thunk BYTE i4[2]; /* pop %eax */ BYTE i5; + /* pop %ecx */ + BYTE i8; /* jmp *vtable_entry */ BYTE i6[2]; void *vtable_entry; }; static const struct vtable_fixup_thunk thunk_template = { + 0x51, {0x83,0xec,0x04}, {0xc7,0x04,0x24}, NULL, @@ -852,6 +857,7 @@ static const struct vtable_fixup_thunk thunk_template = { NULL, {0xff,0xd0}, 0x58, + 0x59, {0xff,0x25}, NULL };

1 0

Rico Schüller : d3dx9: Move D3DXPARAMETER_TYPE conversion helpers to util.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 65c651e37661f8498011f57b6b36ff9606610b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c651e37661f8498011f57b6… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 5 22:51:22 2012 +0200 d3dx9: Move D3DXPARAMETER_TYPE conversion helpers to util. --- dlls/d3dx9_36/d3dx9_36_private.h | 6 +++ dlls/d3dx9_36/effect.c | 84 ------------------------------------- dlls/d3dx9_36/util.c | 85 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 84 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index f6f797e..c4cc69c 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -93,4 +93,10 @@ const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; +/* parameter type conversion helpers */ +INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) DECLSPEC_HIDDEN; +FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) DECLSPEC_HIDDEN; +BOOL get_bool(LPCVOID data) DECLSPEC_HIDDEN; +void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; + #endif /* __WINE_D3DX9_36_PRIVATE_H */ diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 162cbf8..f3a5549 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -847,90 +847,6 @@ static void free_effect_compiler(struct ID3DXEffectCompilerImpl *compiler) } } -static INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) -{ - INT i; - - switch (type) - { - case D3DXPT_FLOAT: - i = *(FLOAT *)data; - break; - - case D3DXPT_INT: - i = *(INT *)data; - break; - - case D3DXPT_BOOL: - i = *(BOOL *)data; - break; - - default: - i = 0; - FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); - break; - } - - return i; -} - -inline static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) -{ - FLOAT f; - - switch (type) - { - case D3DXPT_FLOAT: - f = *(FLOAT *)data; - break; - - case D3DXPT_INT: - f = *(INT *)data; - break; - - case D3DXPT_BOOL: - f = *(BOOL *)data; - break; - - default: - f = 0.0f; - FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); - break; - } - - return f; -} - -static inline BOOL get_bool(LPCVOID data) -{ - return (*(DWORD *)data) != 0; -} - -static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) -{ - TRACE("Changing from type %s to type %s\n", debug_d3dxparameter_type(intype), debug_d3dxparameter_type(outtype)); - - switch (outtype) - { - case D3DXPT_FLOAT: - *(FLOAT *)outdata = get_float(intype, indata); - break; - - case D3DXPT_BOOL: - *(BOOL *)outdata = get_bool(indata); - break; - - case D3DXPT_INT: - *(INT *)outdata = get_int(intype, indata); - break; - - default: - FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(outtype)); - *(INT *)outdata = 0; - break; - } -} - static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) { UINT i; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 7615846..6daddd7 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -269,3 +269,88 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) } #undef WINE_D3DX_TO_STR + +/* parameter type conversion helpers */ +INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) +{ + INT i; + + switch (type) + { + case D3DXPT_FLOAT: + i = *(FLOAT *)data; + break; + + case D3DXPT_INT: + i = *(INT *)data; + break; + + case D3DXPT_BOOL: + i = *(BOOL *)data; + break; + + default: + i = 0; + FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); + break; + } + + return i; +} + +FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) +{ + FLOAT f; + + switch (type) + { + case D3DXPT_FLOAT: + f = *(FLOAT *)data; + break; + + case D3DXPT_INT: + f = *(INT *)data; + break; + + case D3DXPT_BOOL: + f = *(BOOL *)data; + break; + + default: + f = 0.0f; + FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); + break; + } + + return f; +} + +BOOL get_bool(LPCVOID data) +{ + return (*(DWORD *)data) != 0; +} + +void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) +{ + TRACE("Changing from type %s to type %s\n", debug_d3dxparameter_type(intype), debug_d3dxparameter_type(outtype)); + + switch (outtype) + { + case D3DXPT_FLOAT: + *(FLOAT *)outdata = get_float(intype, indata); + break; + + case D3DXPT_BOOL: + *(BOOL *)outdata = get_bool(indata); + break; + + case D3DXPT_INT: + *(INT *)outdata = get_int(intype, indata); + break; + + default: + FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(outtype)); + *(INT *)outdata = 0; + break; + } +}

1 0