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

Michael Kaufmann : user/tests: Update LoadImage test.
by Alexandre Julliard 08 Jun '06

08 Jun '06

Module: wine Branch: refs/heads/master Commit: ea5d55bf4c7718a6645dcd6aa2ed5a067f227025 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea5d55bf4c7718a6645dcd6… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Wed Jun 7 14:03:22 2006 +0200 user/tests: Update LoadImage test. Include a bitmap in the resources and don't depend on Windows' OBM_CHECK bitmap anymore. --- dlls/user/tests/.gitignore | 1 + dlls/user/tests/Makefile.in | 4 ++++ dlls/user/tests/resource.c | 21 +++++++++++++-------- dlls/user/tests/resource.rc | 10 ++++++++++ 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/user/tests/.gitignore b/dlls/user/tests/.gitignore index 33984ec..ca09a9d 100644 --- a/dlls/user/tests/.gitignore +++ b/dlls/user/tests/.gitignore @@ -14,6 +14,7 @@ msg.ok resource.ok resource.res sysparams.ok +test_mono.bmp testlist.c text.ok win.ok diff --git a/dlls/user/tests/Makefile.in b/dlls/user/tests/Makefile.in index 75e4d0f..02313e0 100644 --- a/dlls/user/tests/Makefile.in +++ b/dlls/user/tests/Makefile.in @@ -27,6 +27,10 @@ CTESTS = \ RC_SRCS = resource.rc +RC_BINSRC = resource.rc +RC_BINARIES = \ + test_mono.bmp + @MAKE_TEST_RULES@ ### Dependencies: diff --git a/dlls/user/tests/resource.c b/dlls/user/tests/resource.c index d46d6e6..dc87931 100644 --- a/dlls/user/tests/resource.c +++ b/dlls/user/tests/resource.c @@ -283,17 +283,22 @@ static void test_PrivateExtractIcons(voi ok(cIcons == 4, "Three icons requested, four expected, got cIcons=%d\n", cIcons); } -static void test_LoadImage(void) { +static void test_LoadImage(void) +{ HBITMAP bmp; - - bmp = LoadBitmapA(NULL, MAKEINTRESOURCE(OBM_CHECK)); - ok(bmp != NULL, "Could not load the OBM_CHECK bitmap\n"); + HRSRC hres; + + bmp = LoadBitmapA(GetModuleHandle(NULL), MAKEINTRESOURCE(100)); + ok(bmp != NULL, "Could not load a bitmap resource\n"); if (bmp) DeleteObject(bmp); - - bmp = LoadBitmapA(NULL, "#32760"); /* Value of OBM_CHECK */ - ok(bmp != NULL, "Could not load the OBM_CHECK bitmap\n"); + + hres = FindResource(GetModuleHandle(NULL), "#100", RT_BITMAP); + ok(hres != NULL, "Could not find a bitmap resource with a numeric string\n"); + + bmp = LoadBitmapA(GetModuleHandle(NULL), "#100"); + ok(bmp != NULL, "Could not load a bitmap resource with a numeric string\n"); if (bmp) DeleteObject(bmp); -} +} START_TEST(resource) { diff --git a/dlls/user/tests/resource.rc b/dlls/user/tests/resource.rc index 435f937..305b06a 100644 --- a/dlls/user/tests/resource.rc +++ b/dlls/user/tests/resource.rc @@ -77,3 +77,13 @@ FONT 8, "MS Shell Dlg" { EDITTEXT 200,4,4,50,14 } + +/* BINRES test_mono.bmp */ +100 BITMAP test_mono.bmp +/* { + '42 4D 42 00 00 00 00 00 00 00 3E 00 00 00 28 00' + '00 00 02 00 00 00 01 00 00 00 01 00 01 00 00 00' + '00 00 04 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 40 00' + '00 00' +} */

1 0

Robert Shearman : oleaut32: Handle BSTRs in VARIANT_CopyData.
by Alexandre Julliard 08 Jun '06

08 Jun '06

Module: wine Branch: refs/heads/master Commit: e452b7a0b4b0f41e7278dfc16ba2afe016447946 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e452b7a0b4b0f41e7278dfc… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jun 6 20:05:10 2006 +0100 oleaut32: Handle BSTRs in VARIANT_CopyData. --- dlls/oleaut32/vartype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 341325b..df70e90 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -64,6 +64,7 @@ static inline void VARIANT_CopyData(cons case VT_UI8: memcpy(pOut, &V_UI8(srcVar), sizeof (LONG64)); break; case VT_INT_PTR: memcpy(pOut, &V_INT_PTR(srcVar), sizeof (INT_PTR)); break; case VT_DECIMAL: memcpy(pOut, &V_DECIMAL(srcVar), sizeof (DECIMAL)); break; + case VT_BSTR: memcpy(pOut, &V_BSTR(srcVar), sizeof(BSTR)); break; default: FIXME("VT_ type %d unhandled, please report!\n", vt); }

1 0

Robert Shearman : oleaut32: Uncomment a line to implement conversion from VT_DISPATCH to VT_BSTR.
by Alexandre Julliard 08 Jun '06

08 Jun '06

Module: wine Branch: refs/heads/master Commit: b5bff92a0ca13c4cd5085f675af22c148a0acc8d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b5bff92a0ca13c4cd5085f6… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jun 6 20:05:27 2006 +0100 oleaut32: Uncomment a line to implement conversion from VT_DISPATCH to VT_BSTR. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 6653278..ddeeabb 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -431,7 +431,7 @@ static inline HRESULT VARIANT_Coerce(VAR case VT_DATE: return VarBstrFromDate(V_DATE(ps), lcid, dwFlags, &V_BSTR(pd)); case VT_CY: return VarBstrFromCy(V_CY(ps), lcid, dwFlags, &V_BSTR(pd)); case VT_DECIMAL: return VarBstrFromDec(&V_DECIMAL(ps), lcid, dwFlags, &V_BSTR(pd)); -/* case VT_DISPATCH: return VarBstrFromDisp(V_DISPATCH(ps), lcid, dwFlags, &V_BSTR(pd)); */ + case VT_DISPATCH: return VarBstrFromDisp(V_DISPATCH(ps), lcid, dwFlags, &V_BSTR(pd)); } break;

1 0

Mike McCormack : server: Make wparam and lparam values unsigned long for win64 compatability.
by Alexandre Julliard 08 Jun '06

08 Jun '06

Module: wine Branch: refs/heads/master Commit: db9b557b5466e3aa084e54ef1ad47a1974f29c49 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db9b557b5466e3aa084e54e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jun 8 17:01:54 2006 +0900 server: Make wparam and lparam values unsigned long for win64 compatability. --- server/queue.c | 8 ++++---- server/sock.c | 2 +- server/user.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/queue.c b/server/queue.c index 307bda6..769895a 100644 --- a/server/queue.c +++ b/server/queue.c @@ -70,8 +70,8 @@ struct message enum message_type type; /* message type */ user_handle_t win; /* window handle */ unsigned int msg; /* message code */ - unsigned int wparam; /* parameters */ - unsigned int lparam; /* parameters */ + unsigned long wparam; /* parameters */ + unsigned long lparam; /* parameters */ int x; /* x position */ int y; /* y position */ unsigned int time; /* message time */ @@ -544,7 +544,7 @@ static struct message_result *alloc_mess callback_msg->type = MSG_CALLBACK_RESULT; callback_msg->win = msg->win; callback_msg->msg = msg->msg; - callback_msg->wparam = (unsigned int)callback; + callback_msg->wparam = (unsigned long)callback; callback_msg->lparam = 0; callback_msg->time = get_tick_count(); callback_msg->x = 0; @@ -1446,7 +1446,7 @@ void queue_cleanup_window( struct thread /* post a message to a window; used by socket handling */ void post_message( user_handle_t win, unsigned int message, - unsigned int wparam, unsigned int lparam ) + unsigned long wparam, unsigned long lparam ) { struct message *msg; struct thread *thread = get_window_thread( win ); diff --git a/server/sock.c b/server/sock.c index 109e3bc..ce63932 100644 --- a/server/sock.c +++ b/server/sock.c @@ -276,7 +276,7 @@ static void sock_wake_up( struct sock *s if (sock->pmask & (1 << event)) { unsigned int lparam = (1 << event) | (sock->errors[event] << 16); - post_message( sock->window, sock->message, (unsigned int)sock->wparam, lparam ); + post_message( sock->window, sock->message, (unsigned long)sock->wparam, lparam ); } } sock->pmask = 0; diff --git a/server/user.h b/server/user.h index da169c1..662b796 100644 --- a/server/user.h +++ b/server/user.h @@ -91,7 +91,7 @@ extern int init_thread_queue( struct thr extern int attach_thread_input( struct thread *thread_from, struct thread *thread_to ); extern void detach_thread_input( struct thread *thread_from ); extern void post_message( user_handle_t win, unsigned int message, - unsigned int wparam, unsigned int lparam ); + unsigned long wparam, unsigned long lparam ); extern void post_win_event( struct thread *thread, unsigned int event, user_handle_t win, unsigned int object_id, unsigned int child_id, void *proc,

1 0

Mike McCormack : server: Fix a possible memory leak.
by Alexandre Julliard 08 Jun '06

08 Jun '06

Module: wine Branch: refs/heads/master Commit: 0a8b344f7b77a550a7152ca654ac58f130be4046 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a8b344f7b77a550a7152ca… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jun 8 17:02:04 2006 +0900 server: Fix a possible memory leak. --- server/registry.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/registry.c b/server/registry.c index fc29a8f..34c962b 100644 --- a/server/registry.c +++ b/server/registry.c @@ -656,6 +656,7 @@ static struct key *create_key( struct ke if (class && class->len) { key->classlen = class->len; + if (key->class) free(key->class); if (!(key->class = memdup( class->str, key->classlen ))) key->classlen = 0; } grab_object( key );

1 0

Robert Shearman : server: Don' t attach the thread input when changing parents if the new
by Alexandre Julliard 08 Jun '06

08 Jun '06

Module: wine Branch: refs/heads/master Commit: 38e74b31117dea10211ee77668618974ab9c4d45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38e74b31117dea10211ee77… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 7 20:12:16 2006 +0100 server: Don't attach the thread input when changing parents if the new parent is the desktop (i.e. it is becoming a top-level window). --- server/window.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/server/window.c b/server/window.c index a83ce09..f2017ec 100644 --- a/server/window.c +++ b/server/window.c @@ -114,6 +114,12 @@ inline static struct window *get_window( return ret; } +/* check if window is the desktop */ +static inline int is_desktop_window( const struct window *win ) +{ + return !win->parent; /* only desktop windows have no parent */ +} + /* change the parent of a window (or unlink the window if the new parent is NULL) */ static int set_parent_window( struct window *win, struct window *parent ) { @@ -136,8 +142,9 @@ static int set_parent_window( struct win win->parent = parent; list_add_head( &parent->children, &win->entry ); - /* if parent belongs to a different thread, attach the two threads */ - if (parent->thread && parent->thread != win->thread) + /* if parent belongs to a different thread and the window isn't */ + /* top-level, attach the two threads */ + if (parent->thread && parent->thread != win->thread && !is_desktop_window(parent)) attach_thread_input( win->thread, parent->thread ); } else /* move it to parent unlinked list */ @@ -177,12 +184,6 @@ static inline struct window *get_last_ch return ptr ? LIST_ENTRY( ptr, struct window, entry ) : NULL; } -/* check if window is the desktop */ -static inline int is_desktop_window( const struct window *win ) -{ - return !win->parent; /* only desktop windows have no parent */ -} - /* append a user handle to a handle array */ static int add_handle_to_array( struct user_handle_array *array, user_handle_t handle ) { @@ -425,7 +426,8 @@ static struct window *create_window( str goto failed; } - /* if parent belongs to a different thread, attach the two threads */ + /* if parent belongs to a different thread and the window isn't */ + /* top-level, attach the two threads */ if (parent && parent->thread && parent->thread != current && !is_desktop_window(parent)) { if (!attach_thread_input( current, parent->thread )) goto failed;

1 0

Alexandre Julliard : server: Don' t report a fatal protocol error for things that we can recover from.
by Alexandre Julliard 08 Jun '06

08 Jun '06

Module: wine Branch: refs/heads/master Commit: 5558652ea3607f282c280000e3fef47f6be4319d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5558652ea3607f282c28000… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 10:26:02 2006 +0200 server: Don't report a fatal protocol error for things that we can recover from. --- server/event.c | 3 ++- server/process.c | 4 ++-- server/request.c | 6 +++++- server/thread.c | 26 +++++++++++--------------- server/trace.c | 1 + 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/server/event.c b/server/event.c index 71c8a81..47dde24 100644 --- a/server/event.c +++ b/server/event.c @@ -215,7 +215,8 @@ DECL_HANDLER(event_op) reset_event( event ); break; default: - fatal_protocol_error( current, "event_op: invalid operation %d\n", req->op ); + set_error( STATUS_INVALID_PARAMETER ); + break; } release_object( event ); } diff --git a/server/process.c b/server/process.c index 3d53115..0c71540 100644 --- a/server/process.c +++ b/server/process.c @@ -335,7 +335,7 @@ size_t init_process( struct thread *thre if (!process->handles) process->handles = alloc_handle_table( process, 0 ); if (!process->handles) { - fatal_protocol_error( thread, "Failed to allocate handle table\n" ); + set_error( STATUS_NO_MEMORY ); return 0; } @@ -895,7 +895,7 @@ DECL_HANDLER(init_process_done) if (is_process_init_done(process)) { - fatal_protocol_error( current, "init_process_done: called twice\n" ); + set_error( STATUS_INVALID_PARAMETER ); return; } if (!(dll = find_process_dll( process, req->module ))) diff --git a/server/request.c b/server/request.c index 9ae5fa4..a78916e 100644 --- a/server/request.c +++ b/server/request.c @@ -293,7 +293,11 @@ static void call_req_handler( struct thr if (debug_level) trace_reply( req, &reply ); send_reply( &reply ); } - else fatal_protocol_error( current, "no reply fd for request %d\n", req ); + else + { + current->exit_code = 1; + kill_thread( current, 1 ); /* no way to continue without reply fd */ + } } current = NULL; } diff --git a/server/thread.c b/server/thread.c index bc8b4f4..40b9615 100644 --- a/server/thread.c +++ b/server/thread.c @@ -842,26 +842,22 @@ DECL_HANDLER(init_thread) int reply_fd = thread_get_inflight_fd( current, req->reply_fd ); int wait_fd = thread_get_inflight_fd( current, req->wait_fd ); - if (current->unix_pid != -1) + if (current->reply_fd) /* already initialised */ { - fatal_protocol_error( current, "init_thread: already running\n" ); - goto error; - } - if (reply_fd == -1 || fcntl( reply_fd, F_SETFL, O_NONBLOCK ) == -1) - { - fatal_protocol_error( current, "bad reply fd\n" ); + set_error( STATUS_INVALID_PARAMETER ); goto error; } + + if (reply_fd == -1 || fcntl( reply_fd, F_SETFL, O_NONBLOCK ) == -1) goto error; + + current->reply_fd = create_anonymous_fd( &thread_fd_ops, reply_fd, &current->obj ); + reply_fd = -1; + if (!current->reply_fd) goto error; + if (wait_fd == -1) { - fatal_protocol_error( current, "bad wait fd\n" ); - goto error; - } - if (!(current->reply_fd = create_anonymous_fd( &thread_fd_ops, reply_fd, &current->obj ))) - { - reply_fd = -1; - fatal_protocol_error( current, "could not allocate reply fd\n" ); - goto error; + set_error( STATUS_TOO_MANY_OPENED_FILES ); /* most likely reason */ + return; } if (!(current->wait_fd = create_anonymous_fd( &thread_fd_ops, wait_fd, &current->obj ))) return; diff --git a/server/trace.c b/server/trace.c index 5d2c525..9b5cc39 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3980,6 +3980,7 @@ static const struct { "SHARING_VIOLATION", STATUS_SHARING_VIOLATION }, { "SUSPEND_COUNT_EXCEEDED", STATUS_SUSPEND_COUNT_EXCEEDED }, { "TIMEOUT", STATUS_TIMEOUT }, + { "TOO_MANY_OPENED_FILES", STATUS_TOO_MANY_OPENED_FILES }, { "UNSUCCESSFUL", STATUS_UNSUCCESSFUL }, { "VOLUME_DISMOUNTED", STATUS_VOLUME_DISMOUNTED }, { "WAS_LOCKED", STATUS_WAS_LOCKED },

1 0

Robert Shearman : server: Don't set the client' s server field before the server has
by Alexandre Julliard 08 Jun '06

08 Jun '06

Module: wine Branch: refs/heads/master Commit: 43890d88f7491ec886c629b0452ffa5b5f790068 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43890d88f7491ec886c629b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 7 20:11:59 2006 +0100 server: Don't set the client's server field before the server has changed into a connected state, otherwise we could assert in pipe_client_destroy. --- server/named_pipe.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 2eda03e..5c4da77 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -637,7 +637,7 @@ static struct pipe_server *create_pipe_s return server; } -static struct pipe_client *create_pipe_client( struct pipe_server *server, unsigned int flags ) +static struct pipe_client *create_pipe_client( unsigned int flags ) { struct pipe_client *client; @@ -646,7 +646,7 @@ static struct pipe_client *create_pipe_c return NULL; client->fd = NULL; - client->server = server; + client->server = NULL; client->flags = flags; return client; @@ -762,7 +762,7 @@ DECL_HANDLER(open_named_pipe) return; } - client = create_pipe_client( server, req->flags ); + client = create_pipe_client( req->flags ); if (client) { if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds ))

1 0

Phil Lodwick : wininet: ftp: 125 is an acceptable response code for the STORE command.
by Alexandre Julliard 08 Jun '06

08 Jun '06

Module: wine Branch: refs/heads/master Commit: 5ea41cc5fbd3f182a6b1903a24ccc6ecb6ecfc52 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ea41cc5fbd3f182a6b1903… Author: Phil Lodwick <Phil.Lodwick(a)EFI.COM> Date: Wed Jun 7 14:43:50 2006 -0500 wininet: ftp: 125 is an acceptable response code for the STORE command. --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 3875898..828f1e5 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2098,7 +2098,7 @@ static BOOL FTP_SendStore(LPWININETFTPSE nResCode = FTP_ReceiveResponse(lpwfs, lpwfs->hdr.dwContext); if (nResCode) { - if (nResCode == 150) + if (nResCode == 150 || nResCode == 125) bSuccess = TRUE; else FTP_SetResponseError(nResCode);

1 0

Phil Lodwick : wininet: ftp: Fix crash if input buffer is larger than MAX_PATH.
by Alexandre Julliard 08 Jun '06

08 Jun '06

Module: wine Branch: refs/heads/master Commit: 3575918411599be393cf0872c192cd8e8ea5cc57 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3575918411599be393cf087… Author: Phil Lodwick <Phil.Lodwick(a)EFI.COM> Date: Wed Jun 7 14:35:16 2006 -0500 wininet: ftp: Fix crash if input buffer is larger than MAX_PATH. --- dlls/wininet/ftp.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 828f1e5..0970c95 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -746,16 +746,29 @@ lend: BOOL WINAPI FtpGetCurrentDirectoryA(HINTERNET hFtpSession, LPSTR lpszCurrentDirectory, LPDWORD lpdwCurrentDirectory) { - WCHAR dir[MAX_PATH]; + WCHAR *dir = NULL; DWORD len; BOOL ret; - if(lpdwCurrentDirectory) len = *lpdwCurrentDirectory; + if(lpdwCurrentDirectory) { + len = *lpdwCurrentDirectory; + if(lpszCurrentDirectory) + { + dir = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (NULL == dir) + { + INTERNET_SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + } + } ret = FtpGetCurrentDirectoryW(hFtpSession, lpszCurrentDirectory?dir:NULL, lpdwCurrentDirectory?&len:NULL); if(lpdwCurrentDirectory) { *lpdwCurrentDirectory = len; - if(lpszCurrentDirectory) + if(lpszCurrentDirectory) { WideCharToMultiByte(CP_ACP, 0, dir, len, lpszCurrentDirectory, *lpdwCurrentDirectory, NULL, NULL); + HeapFree(GetProcessHeap(), 0, dir); + } } return ret; }

1 0