March 2010 - Wine-commits - list.winehq.org

Christian Costa : d3dxof: Increase MAX_SUBOBJECTS and do the corresponding checks at the right place .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: f2fe2f7e840d0867672e797b56d29669276716c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fe2f7e840d0867672e797b5… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Mar 23 08:32:20 2010 +0100 d3dxof: Increase MAX_SUBOBJECTS and do the corresponding checks at the right place. --- dlls/d3dxof/d3dxof.c | 7 ------- dlls/d3dxof/d3dxof_private.h | 2 +- dlls/d3dxof/parsing.c | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index b8c85e0..507664f 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1104,13 +1104,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE goto error; } - if (This->buf.pxo->nb_subobjects > MAX_SUBOBJECTS) - { - FIXME("Too many subobjects %d\n", This->buf.pxo->nb_subobjects); - hr = DXFILEERR_BADALLOC; - goto error; - } - object->pstrings = pstrings; object->pobj = This->buf.pxo; object->cur_enum_object = 0; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 8f3b53e..a8534ac 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -39,7 +39,7 @@ #define MAX_CHILDS 100 #define MAX_TEMPLATES 200 #define MAX_OBJECTS 500 -#define MAX_SUBOBJECTS 500 +#define MAX_SUBOBJECTS 2000 #define MAX_STRINGS_BUFFER 10000 typedef struct { diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index c2ffdff..c45fcd0 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1212,6 +1212,13 @@ _exit: ERR("Reference to unknown object %s\n", (char*)buf->value); return FALSE; } + + if (buf->pxo->root->nb_subobjects >= MAX_SUBOBJECTS) + { + FIXME("Too many sub-objects\n"); + return FALSE; + } + buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &(buf->pxo_globals[i])[j]; buf->pxo->nb_childs++; @@ -1219,6 +1226,13 @@ _exit: else if (check_TOKEN(buf) == TOKEN_NAME) { xobject* pxo = buf->pxo; + + if (buf->pxo->root->nb_subobjects >= MAX_SUBOBJECTS) + { + FIXME("Too many sub-objects\n"); + return FALSE; + } + buf->pxo = buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; TRACE("Enter optional %s\n", (char*)buf->value);

1 0

Stefan Dösinger : wined3d: Add a function for deleting the GL buffer.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 5d94fe2095e8f07cad3021e567d67a3d72c3ec8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d94fe2095e8f07cad3021e56… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 18 12:05:02 2010 +0100 wined3d: Add a function for deleting the GL buffer. --- dlls/wined3d/buffer.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 46798dd..aedade9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -97,6 +97,18 @@ static inline BOOL buffer_is_fully_dirty(struct wined3d_buffer *This) return FALSE; } +/* Context activation is done by the caller */ +static void delete_gl_buffer(struct wined3d_buffer *This) +{ + if(!This->buffer_object) return; + + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); + checkGLcall("glDeleteBuffersARB"); + LEAVE_GL(); + This->buffer_object = 0; +} + /* Context activation is done by the caller. */ static void buffer_create_buffer_object(struct wined3d_buffer *This) { @@ -203,13 +215,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) fail: /* Clean up all vbo init, but continue because we can work without a vbo :-) */ ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur\n"); - if (This->buffer_object) - { - ENTER_GL(); - GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); - LEAVE_GL(); - } - This->buffer_object = 0; + delete_gl_buffer(This); buffer_clear_dirty_areas(This); } @@ -691,11 +697,7 @@ static void STDMETHODCALLTYPE buffer_UnLoad(IWineD3DBuffer *iface) This->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; } - ENTER_GL(); - GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); - checkGLcall("glDeleteBuffersARB"); - LEAVE_GL(); - This->buffer_object = 0; + delete_gl_buffer(This); This->flags |= WINED3D_BUFFER_CREATEBO; /* Recreate the buffer object next load */ buffer_clear_dirty_areas(This);

1 0

Stefan Dösinger : wined3d: Partially implement unserialized buffers with the apple extension.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: fd13a6ae232c5504ae925468e173e2ac89c593cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd13a6ae232c5504ae925468e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 18 12:11:35 2010 +0100 wined3d: Partially implement unserialized buffers with the apple extension. --- dlls/wined3d/buffer.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index aedade9..1b1c4c2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -107,6 +107,8 @@ static void delete_gl_buffer(struct wined3d_buffer *This) checkGLcall("glDeleteBuffersARB"); LEAVE_GL(); This->buffer_object = 0; + + This->flags &= ~WINED3D_BUFFER_APPLESYNC; } /* Context activation is done by the caller. */ @@ -169,6 +171,10 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)"); This->flags |= WINED3D_BUFFER_FLUSH; + + GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)"); + This->flags |= WINED3D_BUFFER_APPLESYNC; } /* No setup is needed here for GL_ARB_map_buffer_range */ } @@ -768,6 +774,26 @@ static DWORD STDMETHODCALLTYPE buffer_GetPriority(IWineD3DBuffer *iface) return resource_get_priority((IWineD3DResource *)iface); } +/* The caller provides a context and GL locking and binds the buffer */ +static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags) +{ + /* No fencing needs to be done if the app promises not to overwrite + * existing data */ + if(flags & WINED3DLOCK_NOOVERWRITE) return; + if(flags & WINED3DLOCK_DISCARD) + { + GL_EXTCALL(glBufferDataARB(This->buffer_type_hint, This->resource.size, NULL, This->buffer_object_usage)); + checkGLcall("glBufferDataARB\n"); + return; + } + + /* Drop the unserialized updates for now */ + FIXME("Implement fences for unserialized buffers\n"); + GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); + checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); + This->flags &= ~WINED3D_BUFFER_APPLESYNC; +} + /* The caller provides a GL context */ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info, DWORD flags) { @@ -795,6 +821,13 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined } else { + if (This->flags & WINED3D_BUFFER_APPLESYNC) + { + DWORD syncflags = 0; + if (flags & WINED3D_BUFFER_DISCARD) syncflags |= WINED3DLOCK_DISCARD; + if (flags & WINED3D_BUFFER_NOSYNC) syncflags |= WINED3DLOCK_NOOVERWRITE; + buffer_sync_apple(This, syncflags); + } map = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_WRITE_ONLY_ARB)); checkGLcall("glMapBufferARB"); } @@ -1183,6 +1216,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, } else { + if(This->flags & WINED3D_BUFFER_APPLESYNC) buffer_sync_apple(This, flags); This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); checkGLcall("glMapBufferARB"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db063dc..317fb80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2476,6 +2476,7 @@ struct wined3d_map_range #define WINED3D_BUFFER_FLUSH 0x10 /* Manual unmap flushing */ #define WINED3D_BUFFER_DISCARD 0x20 /* A DISCARD lock has occurred since the last PreLoad */ #define WINED3D_BUFFER_NOSYNC 0x40 /* All locks since the last PreLoad had NOOVERWRITE set */ +#define WINED3D_BUFFER_APPLESYNC 0x80 /* Using sync as in GL_APPLE_flush_buffer_range */ struct wined3d_buffer {

1 0

Stefan Dösinger : wined3d: Implement manual buffer fencing.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 1181762f99be1d32cd0bc9e2e6a9f2779aebe531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1181762f99be1d32cd0bc9e2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 21 13:26:36 2010 +0100 wined3d: Implement manual buffer fencing. --- dlls/wined3d/buffer.c | 69 +++++++++++++++++++++++++++++++++--- dlls/wined3d/device.c | 8 ++++ dlls/wined3d/drawprim.c | 5 +++ dlls/wined3d/query.c | 76 +++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 9 +++++ 5 files changed, 157 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1181762f99be1d32cd0bc…

1 0

Alexandre Julliard : server: Add a helper function to change a queue thread input.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 5efe996c6af9b7812cde0fdceb127dc0bf6b9676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5efe996c6af9b7812cde0fdce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 17:48:22 2010 +0100 server: Add a helper function to change a queue thread input. --- server/queue.c | 54 +++++++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/server/queue.c b/server/queue.c index b2bc603..becdbda 100644 --- a/server/queue.c +++ b/server/queue.c @@ -241,23 +241,19 @@ static struct thread_input *create_thread_input( struct thread *thread ) return input; } -/* release the thread input data of a given thread */ -static inline void release_thread_input( struct thread *thread ) -{ - struct thread_input *input = thread->queue->input; - - if (!input) return; - release_object( input ); - thread->queue->input = NULL; -} - /* create a message queue object */ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_input *input ) { + struct thread_input *new_input = NULL; struct msg_queue *queue; int i; - if (!input && !(input = create_thread_input( thread ))) return NULL; + if (!input) + { + if (!(new_input = create_thread_input( thread ))) return NULL; + input = new_input; + } + if ((queue = alloc_object( &msg_queue_ops ))) { queue->fd = NULL; @@ -281,7 +277,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ thread->queue = queue; } - release_object( input ); + if (new_input) release_object( new_input ); return queue; } @@ -294,6 +290,20 @@ void free_msg_queue( struct thread *thread ) thread->queue = NULL; } +/* change the thread input data of a given thread */ +static int assign_thread_input( struct thread *thread, struct thread_input *new_input ) +{ + if (!thread->queue) + { + thread->queue = create_msg_queue( thread, new_input ); + return thread->queue != NULL; + } + + if (thread->queue->input) release_object( thread->queue->input ); + thread->queue->input = (struct thread_input *)grab_object( new_input ); + return 1; +} + /* get the hook table for a given thread */ struct hook_table *get_queue_hooks( struct thread *thread ) { @@ -917,6 +927,7 @@ int attach_thread_input( struct thread *thread_from, struct thread *thread_to ) { struct desktop *desktop; struct thread_input *input; + int ret; if (!thread_to->queue && !(thread_to->queue = create_msg_queue( thread_to, NULL ))) return 0; if (!(desktop = get_thread_desktop( thread_from, 0 ))) return 0; @@ -930,17 +941,10 @@ int attach_thread_input( struct thread *thread_from, struct thread *thread_to ) } release_object( desktop ); - if (thread_from->queue) - { - release_thread_input( thread_from ); - thread_from->queue->input = input; - } - else - { - if (!(thread_from->queue = create_msg_queue( thread_from, input ))) return 0; - } - memset( input->keystate, 0, sizeof(input->keystate) ); - return 1; + ret = assign_thread_input( thread_from, input ); + if (ret) memset( input->keystate, 0, sizeof(input->keystate) ); + release_object( input ); + return ret; } /* detach two thread input data structures */ @@ -950,8 +954,8 @@ void detach_thread_input( struct thread *thread_from ) if ((input = create_thread_input( thread_from ))) { - release_thread_input( thread_from ); - thread_from->queue->input = input; + assign_thread_input( thread_from, input ); + release_object( input ); } }

1 0

Alexandre Julliard : server: Add support for storing the cursor and show count in the thread input structure .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 8159d4eb99819858b6791436a4b355881d2d965e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8159d4eb99819858b6791436a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 17:52:23 2010 +0100 server: Add support for storing the cursor and show count in the thread input structure. --- include/wine/server_protocol.h | 23 +++++++++++++- server/protocol.def | 13 ++++++++ server/queue.c | 65 +++++++++++++++++++++++++++++++++------ server/request.h | 8 +++++ server/trace.c | 17 ++++++++++ 5 files changed, 115 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8159d4eb99819858b6791…

1 0

Alexandre Julliard : user32: Store the current cursor and show count in the server.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 49de5ca39f6474ed15dc22e4b8ffa53bedb4acf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49de5ca39f6474ed15dc22e4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 17:54:21 2010 +0100 user32: Store the current cursor and show count in the server. --- dlls/user32/cursoricon.c | 71 ++++++++++++++++++++++++++++----------- dlls/user32/tests/cursoricon.c | 12 +++--- dlls/user32/user_private.h | 4 +-- 3 files changed, 58 insertions(+), 29 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0a9a895..6f2359d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -54,9 +54,10 @@ #include "wine/winbase16.h" #include "wine/winuser16.h" #include "wine/exception.h" -#include "wine/debug.h" +#include "wine/server.h" #include "controls.h" #include "user_private.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); WINE_DECLARE_DEBUG_CHANNEL(icon); @@ -1587,7 +1588,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) */ BOOL WINAPI DestroyCursor( HCURSOR hCursor ) { - if (get_user_thread_info()->cursor == hCursor) + if (GetCursor() == hCursor) { WARN_(cursor)("Destroying active cursor!\n" ); return FALSE; @@ -1762,15 +1763,28 @@ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon ) */ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) { - struct user_thread_info *thread_info = get_user_thread_info(); HCURSOR hOldCursor; + int show_count; + BOOL ret; - if (hCursor == thread_info->cursor) return hCursor; /* No change */ TRACE("%p\n", hCursor); - hOldCursor = thread_info->cursor; - thread_info->cursor = hCursor; + + SERVER_START_REQ( set_cursor ) + { + req->flags = SET_CURSOR_HANDLE; + req->handle = wine_server_user_handle( hCursor ); + if ((ret = !wine_server_call_err( req ))) + { + hOldCursor = wine_server_ptr_handle( reply->prev_handle ); + show_count = reply->prev_count; + } + } + SERVER_END_REQ; + + if (!ret) return 0; + /* Change the cursor shape only if it is visible */ - if (thread_info->cursor_count >= 0) + if (show_count >= 0) { CURSORICONINFO *info = get_icon_ptr( hCursor ); /* release before calling driver (FIXME) */ @@ -1785,26 +1799,34 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu */ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) { - struct user_thread_info *thread_info = get_user_thread_info(); + HCURSOR cursor; + int increment = bShow ? 1 : -1; + int prev_count; - TRACE("%d, count=%d\n", bShow, thread_info->cursor_count ); + SERVER_START_REQ( set_cursor ) + { + req->flags = SET_CURSOR_COUNT; + req->show_count = increment; + wine_server_call( req ); + cursor = wine_server_ptr_handle( reply->prev_handle ); + prev_count = reply->prev_count; + } + SERVER_END_REQ; + + TRACE("%d, count=%d\n", bShow, prev_count + increment ); - if (bShow) + if (!prev_count) { - if (++thread_info->cursor_count == 0) /* Show it */ + if (bShow) { - CURSORICONINFO *info = get_icon_ptr( thread_info->cursor ); + CURSORICONINFO *info = get_icon_ptr( cursor ); /* release before calling driver (FIXME) */ - if (info) release_icon_ptr( thread_info->cursor, info ); + if (info) release_icon_ptr( cursor, info ); USER_Driver->pSetCursor( info ); } + else USER_Driver->pSetCursor( NULL ); } - else - { - if (--thread_info->cursor_count == -1) /* Hide it */ - USER_Driver->pSetCursor( NULL ); - } - return thread_info->cursor_count; + return prev_count + increment; } /*********************************************************************** @@ -1812,7 +1834,16 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) */ HCURSOR WINAPI GetCursor(void) { - return get_user_thread_info()->cursor; + HCURSOR ret; + + SERVER_START_REQ( set_cursor ) + { + req->flags = 0; + wine_server_call( req ); + ret = wine_server_ptr_handle( reply->prev_handle ); + } + SERVER_END_REQ; + return ret; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 650e5fc..11d11cf 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1445,7 +1445,7 @@ static void test_SetCursor(void) WaitForSingleObject( thread, 1000 ); GetExitCodeThread( thread, &result ); ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); - todo_wine ok( GetCursor() == cursor, "wrong cursor %p/0\n", cursor ); + ok( GetCursor() == cursor, "wrong cursor %p/0\n", cursor ); if (pGetCursorInfo) { @@ -1461,7 +1461,7 @@ static void test_SetCursor(void) cursor = SetCursor( (HCURSOR)0xbadbad ); error = GetLastError(); ok( cursor == 0, "wrong cursor %p/0\n", cursor ); - todo_wine ok( error == ERROR_INVALID_CURSOR_HANDLE || broken( error == 0xdeadbeef ), /* win9x */ + ok( error == ERROR_INVALID_CURSOR_HANDLE || broken( error == 0xdeadbeef ), /* win9x */ "wrong error %u\n", error ); if (pGetCursorInfo) @@ -1559,22 +1559,22 @@ static void test_ShowCursor(void) thread = CreateThread( NULL, 0, show_cursor_thread, NULL, 0, &id ); WaitForSingleObject( event_start, 1000 ); count = ShowCursor( TRUE ); - todo_wine ok( count == -2, "wrong count %d\n", count ); + ok( count == -2, "wrong count %d\n", count ); SetEvent( event_next ); WaitForSingleObject( thread, 1000 ); GetExitCodeThread( thread, &result ); - todo_wine ok( result == -3, "wrong thread count %d\n", result ); + ok( result == -3, "wrong thread count %d\n", result ); count = ShowCursor( FALSE ); ok( count == -2, "wrong count %d\n", count ); thread = CreateThread( NULL, 0, show_cursor_thread, (void *)3, 0, &id ); WaitForSingleObject( event_start, 1000 ); count = ShowCursor( TRUE ); - todo_wine ok( count == 2, "wrong count %d\n", count ); + ok( count == 2, "wrong count %d\n", count ); SetEvent( event_next ); WaitForSingleObject( thread, 1000 ); GetExitCodeThread( thread, &result ); - todo_wine ok( result == 1, "wrong thread count %d\n", result ); + ok( result == 1, "wrong thread count %d\n", result ); count = ShowCursor( FALSE ); ok( count == -2, "wrong count %d\n", count ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 893d4b5..eb6bdc9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -175,13 +175,11 @@ struct user_thread_info DWORD GetMessageTimeVal; /* Value for GetMessageTime */ DWORD GetMessagePosVal; /* Value for GetMessagePos */ ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ - HCURSOR cursor; /* Current cursor */ - INT cursor_count; /* Cursor show count */ UINT active_hooks; /* Bitmap of active hooks */ HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ - ULONG pad[9]; /* Available for more data */ + ULONG pad[11]; /* Available for more data */ }; struct hook_extra_info

1 0

Alexandre Julliard : configure: Makefile should be generated last.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 92b57312b54277cb67fba60aba5ead2e74ab2375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b57312b54277cb67fba60ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 20:25:30 2010 +0100 configure: Makefile should be generated last. --- configure | 7 ++++--- configure.ac | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 8cdd421..5b48965 100755 --- a/configure +++ b/configure @@ -13853,8 +13853,6 @@ esac ac_config_commands="$ac_config_commands include/stamp-h" -ac_config_files="$ac_config_files Makefile" - ALL_MAKEFILE_DEPENDS="# Makefile dependencies Makefile: Makefile.in Make.rules config.status" @@ -14660,6 +14658,9 @@ wine_fn_config_tool tools/winegcc wine_fn_config_tool tools/wmc wine_fn_config_tool tools/wrc +ac_config_files="$ac_config_files Makefile" + + test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" cat >confcache <<\_ACEOF @@ -15356,7 +15357,6 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "dlls/wineps.drv/generic.ppd") CONFIG_LINKS="$CONFIG_LINKS dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; @@ -15374,6 +15374,7 @@ do "dlls/Makedll.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makedll.rules" ;; "dlls/Makeimplib.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makeimplib.rules" ;; "programs/Makeprog.rules") CONFIG_FILES="$CONFIG_FILES programs/Makeprog.rules" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index bf66934..31c7170 100644 --- a/configure.ac +++ b/configure.ac @@ -2132,7 +2132,6 @@ dnl **** Generate output files **** AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) -AC_CONFIG_FILES([Makefile]) WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) WINE_CONFIG_SYMLINK(fonts/marlett.ttf) @@ -2703,6 +2702,8 @@ WINE_CONFIG_TOOL(tools/wmc) WINE_CONFIG_TOOL(tools/wrc) dnl End of auto-generated output commands +AC_CONFIG_FILES([Makefile]) + dnl Don't install in bin dir for Windows build test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""

1 0

André Hentschel : msxml3: Fix a typo in a comment.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: acdce245ae5c75bbbdf4f8eee89487c3ec9dc628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdce245ae5c75bbbdf4f8eee… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 22 19:48:29 2010 +0100 msxml3: Fix a typo in a comment. --- dlls/msxml3/node.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ac97681..b05f06e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1371,7 +1371,7 @@ static BSTR EnsureNoEncoding(BSTR sInput) /* * We are trying to replicate the same behaviour as msxml by converting - * line endings to \r\n and using idents as \t. The problem is that msxml + * line endings to \r\n and using indents as \t. The problem is that msxml * only formats nodes that have a line ending. Using libxml we cannot * reproduce behaviour exactly. *

1 0

Nikolay Sivov : shell32: IShellView::ContextSensitiveHelp not implemented.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 1f6c759e0c183d7952f83e7a31f94e96a294ec1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6c759e0c183d7952f83e7a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 02:19:34 2010 +0300 shell32: IShellView::ContextSensitiveHelp not implemented. --- dlls/shell32/shlview.c | 12 +++++------- dlls/shell32/tests/shlview.c | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 8e9323a..13b7c92 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1807,13 +1807,11 @@ static HRESULT WINAPI IShellView_fnGetWindow(IShellView2 * iface,HWND * phWnd) return S_OK; } -static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView2 * iface,BOOL fEnterMode) +static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView2 *iface, BOOL mode) { - IShellViewImpl *This = (IShellViewImpl *)iface; - - FIXME("(%p) stub\n",This); - - return E_NOTIMPL; + IShellViewImpl *This = (IShellViewImpl *)iface; + TRACE("(%p)->(%d)\n", This, mode); + return E_NOTIMPL; } /********************************************************** @@ -3074,7 +3072,7 @@ static HRESULT WINAPI IShellFolderView_fnGetSelectedObjects( *pidl = LocalAlloc(0, *items*sizeof(LPITEMIDLIST)); if (!*pidl) return E_OUTOFMEMORY; - /* it's documented that caller shouldn't PIDLs, only array itself */ + /* it's documented that caller shouldn't free PIDLs, only array itself */ memcpy((PITEMID_CHILD*)*pidl, This->apidl, *items*sizeof(LPITEMIDLIST)); } diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 82e198b..f3d3809 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -587,6 +587,28 @@ static void test_IShellFolderView(void) IShellFolder_Release(desktop); } +static void test_IOleWindow(void) +{ + IShellFolder *desktop; + IShellView *view; + HRESULT hr; + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + /* IShellView::ContextSensitiveHelp */ + hr = IShellView_ContextSensitiveHelp(view, TRUE); + ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + hr = IShellView_ContextSensitiveHelp(view, FALSE); + ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + + IShellView_Release(view); + IShellFolder_Release(desktop); +} + START_TEST(shlview) { OleInitialize(NULL); @@ -597,6 +619,7 @@ START_TEST(shlview) test_IFolderView(); test_GetItemObject(); test_IShellFolderView(); + test_IOleWindow(); OleUninitialize(); }

1 0