wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Alexandre Julliard : winex11: Fetch the key state from the server when adjusting state on KeymapNotify and key events .
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 731f5b0b7b608b9b70683721ad297fdb60432701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731f5b0b7b608b9b70683721a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 12:24:25 2011 +0100 winex11: Fetch the key state from the server when adjusting state on KeymapNotify and key events. --- dlls/winex11.drv/keyboard.c | 115 +++++++++++++++++++++++-------------------- 1 files changed, 62 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 190436b..04d7371 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1270,28 +1270,21 @@ void X11DRV_send_keyboard_input( HWND hwnd, WORD wVk, WORD wScan, DWORD event_fl /*********************************************************************** - * KEYBOARD_UpdateOneState - * - * Updates internal state for <vkey>, depending on key <state> under X - * + * get_async_key_state */ -static inline void KEYBOARD_UpdateOneState ( HWND hwnd, WORD vkey, WORD scan, int state, DWORD time ) +static BOOL get_async_key_state( BYTE state[256] ) { - /* Do something if internal table state != X state for keycode */ - if (((key_state_table[vkey & 0xff] & 0x80)!=0) != state) - { - DWORD flags = vkey & 0x100 ? KEYEVENTF_EXTENDEDKEY : 0; - - if (!state) flags |= KEYEVENTF_KEYUP; - - TRACE("Adjusting state for vkey %#.2x. State before %#.2x\n", - vkey, key_state_table[vkey & 0xff]); - - /* Fake key being pressed inside wine */ - X11DRV_send_keyboard_input( hwnd, vkey & 0xff, scan & 0xff, flags, time, 0, 0 ); + BOOL ret; - TRACE("State after %#.2x\n", key_state_table[vkey & 0xff]); + SERVER_START_REQ( get_key_state ) + { + req->tid = 0; + req->key = -1; + wine_server_set_reply( req, state, 256 ); + ret = !wine_server_call( req ); } + SERVER_END_REQ; + return ret; } /*********************************************************************** @@ -1307,6 +1300,9 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) { int i, j; DWORD time = GetCurrentTime(); + BYTE keystate[256]; + + if (!get_async_key_state( keystate )) return; /* the minimum keycode is always greater or equal to 8, so we can * skip the first 8 values, hence start at 1 @@ -1316,8 +1312,6 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) for (j = 0; j < 8; j++) { WORD vkey = keyc2vkey[(i * 8) + j]; - WORD scan = keyc2scan[(i * 8) + j]; - int state = (event->xkeymap.key_vector[i] & (1<<j)) != 0; switch(vkey & 0xff) { @@ -1327,21 +1321,62 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) case VK_RCONTROL: case VK_LSHIFT: case VK_RSHIFT: - KEYBOARD_UpdateOneState( hwnd, vkey, scan, state, time ); + if (!(keystate[vkey & 0xff] & 0x80) != !(event->xkeymap.key_vector[i] & (1<<j))) + { + WORD scan = keyc2scan[(i * 8) + j]; + DWORD flags = vkey & 0x100 ? KEYEVENTF_EXTENDEDKEY : 0; + if (!(event->xkeymap.key_vector[i] & (1<<j))) flags |= KEYEVENTF_KEYUP; + + TRACE( "Adjusting state for vkey %#.2x. State before %#.2x\n", + vkey, keystate[vkey & 0xff]); + + /* Fake key being pressed inside wine */ + X11DRV_send_keyboard_input( hwnd, vkey & 0xff, scan & 0xff, flags, time, 0, 0 ); + } break; } } } } -static void update_lock_state(HWND hwnd, BYTE vkey, WORD scan, DWORD time) +static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) { - DWORD flags = vkey == VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0; + BYTE keystate[256]; + + /* Note: X sets the below states on key down and clears them on key up. + Windows triggers them on key down. */ - if (key_state_table[vkey] & 0x80) flags ^= KEYEVENTF_KEYUP; + if (!get_async_key_state( keystate )) return; - X11DRV_send_keyboard_input( hwnd, vkey, scan, flags, time, 0, 0 ); - X11DRV_send_keyboard_input( hwnd, vkey, scan, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); + /* Adjust the CAPSLOCK state if it has been changed outside wine */ + if (!(keystate[VK_CAPITAL] & 0x01) != !(state & LockMask) && vkey != VK_CAPITAL) + { + DWORD flags = 0; + if (keystate[VK_CAPITAL] & 0x80) flags ^= KEYEVENTF_KEYUP; + TRACE("Adjusting CapsLock state (%#.2x)\n", keystate[VK_CAPITAL]); + X11DRV_send_keyboard_input( hwnd, VK_CAPITAL, 0x3a, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, VK_CAPITAL, 0x3a, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); + } + + /* Adjust the NUMLOCK state if it has been changed outside wine */ + if (!(keystate[VK_NUMLOCK] & 0x01) != !(state & NumLockMask) && (vkey & 0xff) != VK_NUMLOCK) + { + DWORD flags = KEYEVENTF_EXTENDEDKEY; + if (keystate[VK_NUMLOCK] & 0x80) flags ^= KEYEVENTF_KEYUP; + TRACE("Adjusting NumLock state (%#.2x)\n", keystate[VK_NUMLOCK]); + X11DRV_send_keyboard_input( hwnd, VK_NUMLOCK, 0x45, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, VK_NUMLOCK, 0x45, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); + } + + /* Adjust the SCROLLLOCK state if it has been changed outside wine */ + if (!(keystate[VK_SCROLL] & 0x01) != !(state & ScrollLockMask) && vkey != VK_SCROLL) + { + DWORD flags = 0; + if (keystate[VK_SCROLL] & 0x80) flags ^= KEYEVENTF_KEYUP; + TRACE("Adjusting ScrLock state (%#.2x)\n", keystate[VK_SCROLL]); + X11DRV_send_keyboard_input( hwnd, VK_SCROLL, 0x46, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, VK_SCROLL, 0x46, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); + } } /*********************************************************************** @@ -1441,33 +1476,7 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; - - /* Note: X sets the below states on key down and clears them on key up. - Windows triggers them on key down. */ - - /* Adjust the CAPSLOCK state if it has been changed outside wine */ - if (!(key_state_table[VK_CAPITAL] & 0x01) != !(event->state & LockMask) && - vkey != VK_CAPITAL) - { - TRACE("Adjusting CapsLock state (%#.2x)\n", key_state_table[VK_CAPITAL]); - update_lock_state( hwnd, VK_CAPITAL, 0x3A, event_time ); - } - - /* Adjust the NUMLOCK state if it has been changed outside wine */ - if (!(key_state_table[VK_NUMLOCK] & 0x01) != !(event->state & NumLockMask) && - (vkey & 0xff) != VK_NUMLOCK) - { - TRACE("Adjusting NumLock state (%#.2x)\n", key_state_table[VK_NUMLOCK]); - update_lock_state( hwnd, VK_NUMLOCK, 0x45, event_time ); - } - - /* Adjust the SCROLLLOCK state if it has been changed outside wine */ - if (!(key_state_table[VK_SCROLL] & 0x01) != !(event->state & ScrollLockMask) && - vkey != VK_SCROLL) - { - TRACE("Adjusting ScrLock state (%#.2x)\n", key_state_table[VK_SCROLL]); - update_lock_state( hwnd, VK_SCROLL, 0x46, event_time ); - } + update_lock_state( hwnd, vkey, event->state, event_time ); bScan = keyc2scan[event->keycode] & 0xFF; TRACE_(key)("bScan = 0x%02x.\n", bScan);

1 0

Alexandre Julliard : server: Set the message code for mouse input on the server side.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 0f18d2bb09ff6b391a251596eebd4a26ecfcf6a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f18d2bb09ff6b391a251596e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 11:59:38 2011 +0100 server: Set the message code for mouse input on the server side. --- dlls/winex11.drv/mouse.c | 117 +++++++++++++++++++++++---------------------- server/queue.c | 95 ++++++++++++++++++++++++++++--------- 2 files changed, 132 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f18d2bb09ff6b391a251…

1 0

Alexandre Julliard : server: Set the message code for keyboard input on the server side.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 9731d44921b71923f5eacee6be3b9308d12c3c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9731d44921b71923f5eacee6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 11:34:59 2011 +0100 server: Set the message code for keyboard input on the server side. --- server/queue.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index 1353b00..19532e2 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1361,8 +1361,7 @@ static void queue_mouse_message( struct desktop *desktop, user_handle_t win, uns } /* queue a hardware message for a keyboard event */ -static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, unsigned int message, - const hw_input_t *input ) +static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input ) { struct hardware_msg_data *msg_data; struct message *msg; @@ -1378,7 +1377,6 @@ static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( win ); - msg->msg = message; msg->lparam = (input->kbd.scan << 16) | 1; /* repeat count */ msg->time = input->kbd.time; msg->result = NULL; @@ -1419,6 +1417,49 @@ static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, msg->wparam = vkey; } + msg->msg = (input->kbd.flags & KEYEVENTF_KEYUP) ? WM_KEYUP : WM_KEYDOWN; + + switch (vkey) + { + case VK_LMENU: + case VK_RMENU: + if (input->kbd.flags & KEYEVENTF_KEYUP) + { + /* send WM_SYSKEYUP if Alt still pressed and no other key in between */ + /* we use 0x02 as a flag to track if some other SYSKEYUP was sent already */ + if ((desktop->keystate[VK_MENU] & 0x82) != 0x82) break; + msg->msg = WM_SYSKEYUP; + desktop->keystate[VK_MENU] &= ~0x02; + } + else + { + /* send WM_SYSKEYDOWN for Alt except with Ctrl */ + if (desktop->keystate[VK_CONTROL] & 0x80) break; + msg->msg = WM_SYSKEYDOWN; + desktop->keystate[VK_MENU] |= 0x02; + } + break; + + case VK_LCONTROL: + case VK_RCONTROL: + /* send WM_SYSKEYUP on release if Alt still pressed */ + if (!(input->kbd.flags & KEYEVENTF_KEYUP)) break; + if (!(desktop->keystate[VK_MENU] & 0x80)) break; + msg->msg = WM_SYSKEYUP; + desktop->keystate[VK_MENU] &= ~0x02; + break; + + default: + /* send WM_SYSKEY for Alt-anykey and for F10 */ + if (desktop->keystate[VK_CONTROL] & 0x80) break; + if (!(desktop->keystate[VK_MENU] & 0x80)) break; + /* fall through */ + case VK_F10: + msg->msg = (input->kbd.flags & KEYEVENTF_KEYUP) ? WM_SYSKEYUP : WM_SYSKEYDOWN; + desktop->keystate[VK_MENU] &= ~0x02; + break; + } + queue_hardware_message( desktop, msg ); } @@ -1879,7 +1920,7 @@ DECL_HANDLER(send_hardware_message) queue_mouse_message( desktop, req->win, req->msg, &req->input ); break; case INPUT_KEYBOARD: - queue_keyboard_message( desktop, req->win, req->msg, &req->input ); + queue_keyboard_message( desktop, req->win, &req->input ); break; case INPUT_HARDWARE: queue_custom_hardware_message( desktop, req->win, &req->input );

1 0

Alexandre Julliard : server: Pass the original hardware input data to the server and set the message parameters on the server side .
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 02e30f5f77e0aea121137be19c8e5d5a36cd5bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e30f5f77e0aea121137be19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 20:33:15 2011 +0100 server: Pass the original hardware input data to the server and set the message parameters on the server side. --- dlls/winex11.drv/keyboard.c | 36 +++------ dlls/winex11.drv/mouse.c | 18 +++-- include/wine/server_protocol.h | 41 ++++++++-- server/protocol.def | 39 ++++++++-- server/queue.c | 165 ++++++++++++++++++++++++++++++++++------ server/request.h | 11 +-- server/trace.c | 37 ++++++++-- tools/make_requests | 1 + 8 files changed, 267 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02e30f5f77e0aea121137…

1 0

Hans Leidekker : netapi32: Try running the smbpasswd tool in NetUserChangePassword.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: e572dca4cc219cdf61ced42998f7e100aa9cfefc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e572dca4cc219cdf61ced4299… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 1 13:08:27 2011 +0100 netapi32: Try running the smbpasswd tool in NetUserChangePassword. --- dlls/netapi32/access.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 91f98b1..255e51b 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -18,7 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdarg.h> +#include <fcntl.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -864,6 +869,105 @@ NET_API_STATUS WINAPI NetUserModalsGet( return NERR_Success; } +static int fork_smbpasswd( char * const argv[] ) +{ +#ifdef HAVE_FORK + int pipe_out[2]; + + if (pipe( pipe_out ) == -1) return -1; + fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); + + switch (fork()) + { + case -1: + close( pipe_out[0] ); + close( pipe_out[1] ); + return -1; + case 0: + dup2( pipe_out[0], 0 ); + close( pipe_out[0] ); + close( pipe_out[1] ); + execvp( "smbpasswd", argv ); + ERR( "can't execute smbpasswd, is it installed?\n" ); + return -1; + default: + close( pipe_out[0] ); + break; + } + return pipe_out[1]; +#else + ERR( "no fork support on this platform\n" ); + return -1; +#endif +} + +static char *strdup_unixcp( const WCHAR *str ) +{ + char *ret; + int len = WideCharToMultiByte( CP_UNIXCP, 0, str, -1, NULL, 0, NULL, NULL ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_UNIXCP, 0, str, -1, ret, len, NULL, NULL ); + return ret; +} + +static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, + LPCWSTR oldpassword, LPCWSTR newpassword ) +{ + static char option_silent[] = "-s"; + static char option_user[] = "-U"; + static char option_remote[] = "-r"; + static char smbpasswd[] = "smbpasswd"; + int pipe_out; + char *server = NULL, *user, *argv[7], *old, *new; + + if (domainname && !(server = strdup_unixcp( domainname ))) return ERROR_OUTOFMEMORY; + if (!(user = strdup_unixcp( username ))) + { + HeapFree( GetProcessHeap(), 0, server ); + return ERROR_OUTOFMEMORY; + } + argv[0] = smbpasswd; + argv[1] = option_silent; + argv[2] = option_user; + argv[3] = user; + if (server) + { + argv[4] = option_remote; + argv[5] = server; + argv[6] = NULL; + } + else argv[4] = NULL; + + pipe_out = fork_smbpasswd( argv ); + HeapFree( GetProcessHeap(), 0, server ); + HeapFree( GetProcessHeap(), 0, user ); + if (pipe_out == -1) return NERR_InternalError; + + if (!(old = strdup_unixcp( oldpassword ))) + { + close( pipe_out ); + return ERROR_OUTOFMEMORY; + } + if (!(new = strdup_unixcp( newpassword ))) + { + close( pipe_out ); + HeapFree( GetProcessHeap(), 0, old ); + return ERROR_OUTOFMEMORY; + } + write( pipe_out, old, strlen( old ) ); + write( pipe_out, "\n", 1 ); + write( pipe_out, new, strlen( new ) ); + write( pipe_out, "\n", 1 ); + write( pipe_out, new, strlen( new ) ); + write( pipe_out, "\n", 1 ); + + close( pipe_out ); + HeapFree( GetProcessHeap(), 0, old ); + HeapFree( GetProcessHeap(), 0, new ); + return NERR_Success; +} + /****************************************************************************** * NetUserChangePassword (NETAPI32.@) * PARAMS @@ -886,6 +990,9 @@ NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR domainname, LPCWSTR username TRACE("(%s, %s, ..., ...)\n", debugstr_w(domainname), debugstr_w(username)); + if (!change_password_smb( domainname, username, oldpassword, newpassword )) + return NERR_Success; + if(domainname) FIXME("Ignoring domainname %s.\n", debugstr_w(domainname));

1 0

Jacek Caban : mshtml: Added IHTMLFormElement::get_elements implementation.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 78d743b98680dbef191454b33104d3d4ace199af URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d743b98680dbef191454b33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 1 11:33:03 2011 +0100 mshtml: Added IHTMLFormElement::get_elements implementation. --- dlls/mshtml/htmlform.c | 8 ++++++-- dlls/mshtml/tests/dom.c | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index e53dbc0..d9c2bce 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -274,8 +274,12 @@ static HRESULT WINAPI HTMLFormElement_get_method(IHTMLFormElement *iface, BSTR * static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDispatch **p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = (IDispatch*)&This->IHTMLFormElement_iface; + IDispatch_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLFormElement_put_target(IHTMLFormElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b8e9f76..432a3b8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2809,6 +2809,23 @@ static void _test_form_put_encoding(unsigned line, IUnknown *unk, HRESULT exp_hr _test_form_encoding(line, unk, encoding); } +#define test_form_elements(a) _test_form_elements(__LINE__,a) +static void _test_form_elements(unsigned line, IUnknown *unk) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + IDispatch *disp; + HRESULT hres; + + disp = NULL; + hres = IHTMLFormElement_get_elements(form, &disp); + ok_(__FILE__,line)(hres == S_OK, "get_elements failed: %08x\n", hres); + ok_(__FILE__,line)(disp != NULL, "disp = NULL\n"); + ok_(__FILE__,line)(iface_cmp((IUnknown*)form, (IUnknown*)disp), "disp != form\n"); + + IDispatch_Release(disp); + IHTMLFormElement_Release(form); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -6652,6 +6669,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem != NULL, "elem == NULL\n"); if(elem) { test_form_length((IUnknown*)elem, 0); + test_form_elements((IUnknown*)elem); IHTMLElement_Release(elem); } @@ -6802,7 +6820,7 @@ static void test_elems2(IHTMLDocument2 *doc) } test_elem_set_innerhtml((IUnknown*)div, - "<form id=\"form\"><input type=\"button\"></input><input type=\"text\"></input></textarea>"); + "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" /></div></textarea>"); elem = get_elem_by_id(doc, "form", TRUE); if(elem) { test_form_length((IUnknown*)elem, 2); @@ -6820,6 +6838,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_form_put_encoding((IUnknown*)elem, S_OK, "multipart/form-data"); test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); test_form_encoding((IUnknown*)elem, "multipart/form-data"); + test_form_elements((IUnknown*)elem); IHTMLElement_Release(elem); }

1 0

Alexandre Julliard : ntdll: Don' t print an error when architecture is set to win64 and the app is 64-bit.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 29f57999960c989c13c1dffdaf925e1e070e72bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f57999960c989c13c1dffda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 14:10:16 2011 +0100 ntdll: Don't print an error when architecture is set to win64 and the app is 64-bit. --- dlls/ntdll/server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 270ccd0..2d88f10 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1122,7 +1122,7 @@ size_t server_init_thread( void *entry_point ) if (!strcmp( arch, "win32" ) && (is_win64 || is_wow64)) fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", wine_get_config_dir() ); - if (!strcmp( arch, "win64" ) && !is_wow64) + if (!strcmp( arch, "win64" ) && !is_win64 && !is_wow64) fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", wine_get_config_dir() ); }

1 0

Henri Verbeet : wined3d: Recognize some Nouveau renderer strings.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: ff8c79e45befad8318a425929c6005c2beb5d31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8c79e45befad8318a425929… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 09:47:58 2011 +0100 wined3d: Recognize some Nouveau renderer strings. --- dlls/wined3d/directx.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 64076dc..8d77321 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1852,7 +1852,79 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { - FIXME_(d3d_caps)("Card selection not handled for Mesa Nouveau driver\n"); + if (strstr(gl_renderer, "Gallium")) + { + unsigned int i; + + static const struct + { + const char *renderer; + enum wined3d_pci_device id; + } + cards[] = + { + {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, + {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, + {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, + {"NVAC", CARD_NVIDIA_GEFORCE_8200}, + {"NVAA", CARD_NVIDIA_GEFORCE_8200}, + {"NVA8", CARD_NVIDIA_GEFORCE_210}, + {"NVA5", CARD_NVIDIA_GEFORCE_GT220}, + {"NVA3", CARD_NVIDIA_GEFORCE_GT240}, + {"NVA0", CARD_NVIDIA_GEFORCE_GTX280}, + {"NV98", CARD_NVIDIA_GEFORCE_9200}, + {"NV96", CARD_NVIDIA_GEFORCE_9400GT}, + {"NV94", CARD_NVIDIA_GEFORCE_9600GT}, + {"NV92", CARD_NVIDIA_GEFORCE_9800GT}, + {"NV86", CARD_NVIDIA_GEFORCE_8500GT}, + {"NV84", CARD_NVIDIA_GEFORCE_8600GT}, + {"NV68", CARD_NVIDIA_GEFORCE_6200}, /* 7050 */ + {"NV67", CARD_NVIDIA_GEFORCE_6200}, /* 7000M */ + {"NV63", CARD_NVIDIA_GEFORCE_6200}, /* 7100 */ + {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, + {"NV4E", CARD_NVIDIA_GEFORCE_6200}, /* 6100 Go / 6150 Go */ + {"NV4C", CARD_NVIDIA_GEFORCE_6200}, /* 6150SE */ + {"NV4B", CARD_NVIDIA_GEFORCE_7600}, + {"NV4A", CARD_NVIDIA_GEFORCE_6200}, + {"NV49", CARD_NVIDIA_GEFORCE_7800GT}, /* 7900 */ + {"NV47", CARD_NVIDIA_GEFORCE_7800GT}, + {"NV46", CARD_NVIDIA_GEFORCE_7400}, + {"NV45", CARD_NVIDIA_GEFORCE_6800}, + {"NV44", CARD_NVIDIA_GEFORCE_6200}, + {"NV43", CARD_NVIDIA_GEFORCE_6600GT}, + {"NV42", CARD_NVIDIA_GEFORCE_6800}, + {"NV41", CARD_NVIDIA_GEFORCE_6800}, + {"NV40", CARD_NVIDIA_GEFORCE_6800}, + {"NV38", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5950 Ultra */ + {"NV36", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5700/5750 */ + {"NV35", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5900 */ + {"NV34", CARD_NVIDIA_GEFORCEFX_5200}, + {"NV31", CARD_NVIDIA_GEFORCEFX_5600}, + {"NV30", CARD_NVIDIA_GEFORCEFX_5800}, + {"NV28", CARD_NVIDIA_GEFORCE4_TI4200}, + {"NV25", CARD_NVIDIA_GEFORCE4_TI4200}, + {"NV20", CARD_NVIDIA_GEFORCE3}, + {"NV1F", CARD_NVIDIA_GEFORCE4_MX}, /* GF4 MX IGP */ + {"NV1A", CARD_NVIDIA_GEFORCE2}, /* GF2 IGP */ + {"NV18", CARD_NVIDIA_GEFORCE4_MX}, + {"NV17", CARD_NVIDIA_GEFORCE4_MX}, + {"NV16", CARD_NVIDIA_GEFORCE2}, + {"NV15", CARD_NVIDIA_GEFORCE2}, + {"NV11", CARD_NVIDIA_GEFORCE2_MX}, + {"NV10", CARD_NVIDIA_GEFORCE}, + {"NV05", CARD_NVIDIA_RIVA_TNT2}, + {"NV04", CARD_NVIDIA_RIVA_TNT}, + {"NV03", CARD_NVIDIA_RIVA_128}, + }; + + for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) + { + if (strstr(gl_renderer, cards[i].renderer)) + return cards[i].id; + } + } + + FIXME_(d3d_caps)("Unknown renderer %s.\n", debugstr_a(gl_renderer)); if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600; if (WINE_D3D8_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE3; if (WINE_D3D7_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE;

1 0

Henri Verbeet : wined3d: Rename ATI to AMD.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 02fa8bf0137f001320b2d9a3e9b54e65e3176eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02fa8bf0137f001320b2d9a3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 09:47:57 2011 +0100 wined3d: Rename ATI to AMD. --- dlls/wined3d/directx.c | 328 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 82 +++++----- 2 files changed, 205 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02fa8bf0137f001320b2d…

1 0

Henri Verbeet : wined3d: Make IWineD3DResourceImpl an independent structure .
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 1de6adfbae7ac36c6649aab209d1a62a64e80465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de6adfbae7ac36c6649aab20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 09:47:56 2011 +0100 wined3d: Make IWineD3DResourceImpl an independent structure. --- dlls/d3d10core/view.c | 13 ++-- dlls/d3d9/device.c | 16 ++-- dlls/wined3d/basetexture.c | 10 +- dlls/wined3d/buffer.c | 76 +++++++++-------- dlls/wined3d/context.c | 8 +- dlls/wined3d/cubetexture.c | 64 +++++++------- dlls/wined3d/device.c | 183 +++++++++++++++++++++------------------- dlls/wined3d/palette.c | 8 +- dlls/wined3d/resource.c | 102 ++++++++++++----------- dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 21 +++-- dlls/wined3d/surface_base.c | 19 +++-- dlls/wined3d/surface_gdi.c | 3 +- dlls/wined3d/texture.c | 63 +++++++------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/view.c | 9 +-- dlls/wined3d/volume.c | 18 ++-- dlls/wined3d/volumetexture.c | 61 +++++++------- dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_private.h | 91 +++++++++++--------- include/wine/wined3d.idl | 14 ++- 21 files changed, 417 insertions(+), 370 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1de6adfbae7ac36c6649a…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011