wine-commits January 2007

wine-commits@winehq.org

4 participants
893 discussions

Dmitry Timoshkov : user32: Fix some failures of the ShowWindow test under Windows 2003.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 688d9af61d9bc7e0fe099b8919143787c8ed0462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=688d9af61d9bc7e0fe099b891… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 4 22:09:20 2007 +0800 user32: Fix some failures of the ShowWindow test under Windows 2003. --- dlls/user32/tests/msg.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8179517..a1435da 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8330,7 +8330,7 @@ static const struct message WmShowNormal { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2003 doesn't send it */ { HCBT_SETFOCUS, hook }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } @@ -8359,9 +8359,9 @@ static const struct message WmShowNoActi { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, { HCBT_SETFOCUS, hook }, - { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook|optional }, /* win2003 doesn't send it */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2003 doesn't send it */ + { HCBT_SETFOCUS, hook|optional }, /* win2003 doesn't send it */ { 0 } }; static const struct message WmShowNA_1[] = { @@ -8397,12 +8397,13 @@ static const struct message WmRestore_3[ { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, - { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook|optional }, /* win2003 doesn't send it */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2003 doesn't send it */ + { HCBT_SETFOCUS, hook|optional }, /* win2003 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, + { HCBT_SETFOCUS, hook|optional }, /* win2003 sends it */ { 0 } }; static const struct message WmRestore_4[] = { @@ -8508,6 +8509,7 @@ static const struct message WmShowMaximi { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|0x8000 }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, + { HCBT_SETFOCUS, hook|optional }, /* win2003 sends it */ { 0 } }; static const struct message WmShowMaximized_2[] = { @@ -8546,7 +8548,7 @@ static void test_ShowWindow(void) BOOL todo_msg; /* message sequence doesn't match what Wine does */ } sw[] = { -/* 1 */ { SW_SHOWNORMAL, FALSE, WS_VISIBLE, WmShowNormal, TRUE }, +/* 1 */ { SW_SHOWNORMAL, FALSE, WS_VISIBLE, WmShowNormal, FALSE }, /* 2 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 3 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 4 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, @@ -8591,7 +8593,7 @@ static void test_ShowWindow(void) /* 43 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax_2, FALSE }, /* 44 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, /* 45 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, -/* 46 */ { SW_RESTORE, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmRestore_3, TRUE }, +/* 46 */ { SW_RESTORE, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmRestore_3, FALSE }, /* 47 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmRestore_4, FALSE }, /* 48 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_3, FALSE }, /* 49 */ { SW_SHOW, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmEmptySeq, FALSE },

1 0

Kai Blin : shlwapi: Remove redundant check in assignment (Coverity).
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: f21bd7ba1d60a56e23c6477ff44571e9d9d8e29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21bd7ba1d60a56e23c6477ff… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Jan 4 12:27:45 2007 +0100 shlwapi: Remove redundant check in assignment (Coverity). --- dlls/shlwapi/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index e1182ff..3ad4ebc 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1398,7 +1398,7 @@ DWORD WINAPI SHQueryValueExA( HKEY hKey, if ((!pvData) || (dwRet == ERROR_MORE_DATA) ) { char cNull = '\0'; - nBytesToAlloc = (!pvData || (dwRet == ERROR_MORE_DATA)) ? dwUnExpDataLen : *pcbData; + nBytesToAlloc = dwUnExpDataLen; szData = (LPSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); RegQueryValueExA (hKey, lpszValue, lpReserved, NULL, (LPBYTE)szData, &nBytesToAlloc);

1 0

Michael Gardiner : ole32: Stop StgOpenStorage from creating a file when it does not already exist.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: f9d8449db26ffc94c67074532e213f3ac8c4de87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d8449db26ffc94c67074532… Author: Michael Gardiner <mikegardiner(a)bigpond.com> Date: Mon Jan 1 15:09:51 2007 +1100 ole32: Stop StgOpenStorage from creating a file when it does not already exist. --- dlls/ole32/storage32.c | 32 ++++++++++---------------------- dlls/ole32/tests/storage32.c | 6 +++--- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 733f659..ac8264d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5945,7 +5945,6 @@ HRESULT WINAPI StgOpenStorage( DWORD shareMode; DWORD accessMode; WCHAR fullname[MAX_PATH]; - BOOL newFile; TRACE("(%s, %p, %x, %p, %d, %p)\n", debugstr_w(pwcsName), pstgPriority, grfMode, @@ -6035,24 +6034,13 @@ HRESULT WINAPI StgOpenStorage( */ *ppstgOpen = 0; - if ((accessMode & GENERIC_WRITE) && /* try to create a file if no yet exists */ - ((hFile = CreateFileW( pwcsName, accessMode, shareMode, NULL, CREATE_NEW, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, 0)) - != INVALID_HANDLE_VALUE)) - { - newFile = TRUE; - } - else - { - newFile = FALSE; - hFile = CreateFileW( pwcsName, - accessMode, - shareMode, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, - 0); - } + hFile = CreateFileW( pwcsName, + accessMode, + shareMode, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, + 0); if (hFile==INVALID_HANDLE_VALUE) { @@ -6090,7 +6078,7 @@ HRESULT WINAPI StgOpenStorage( * Refuse to open the file if it's too small to be a structured storage file * FIXME: verify the file when reading instead of here */ - if (!newFile && GetFileSize(hFile, NULL) < 0x100) + if (GetFileSize(hFile, NULL) < 0x100) { CloseHandle(hFile); hr = STG_E_FILEALREADYEXISTS; @@ -6108,7 +6096,7 @@ HRESULT WINAPI StgOpenStorage( goto end; } - /* if we created new file, initialize the storage */ + /* Initialize the storage */ hr = StorageImpl_Construct( newStorage, hFile, @@ -6116,7 +6104,7 @@ HRESULT WINAPI StgOpenStorage( NULL, grfMode, TRUE, - newFile ); + FALSE ); if (FAILED(hr)) { diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 6b3b15b..80b6cb0 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -388,12 +388,12 @@ static void test_open_storage(void) DeleteFileW(filename); - /* try opening a nonexistent file - it should create it */ + /* try opening a nonexistent file - it should not create it */ stgm = STGM_DIRECT | STGM_SHARE_EXCLUSIVE | STGM_READWRITE; r = StgOpenStorage( filename, NULL, stgm, NULL, 0, &stg); - ok(r==S_OK, "StgOpenStorage failed: 0x%08x\n", r); + ok(r!=S_OK, "StgOpenStorage failed: 0x%08x\n", r); if (r==S_OK) IStorage_Release(stg); - ok(is_existing_file(filename), "StgOpenStorage didn't create a file\n"); + ok(!is_existing_file(filename), "StgOpenStorage should not create a file\n"); DeleteFileW(filename); /* create the file */

1 0

Mike McCormack : comctl32: Check subitem is valid before calling LISTVIEW_InvalidateSubItem().
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: d6ea1bf120c3876b58edfa61b4ebd3bdb1ffc562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ea1bf120c3876b58edfa61b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 4 19:37:59 2007 +0900 comctl32: Check subitem is valid before calling LISTVIEW_InvalidateSubItem(). --- dlls/comctl32/listview.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ad3127e..6340c87 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3573,7 +3573,7 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_I HWND hwndSelf = infoPtr->hwndSelf; LPWSTR pszText = NULL; BOOL bResult, bChanged = FALSE; - + TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iItem >= infoPtr->nItemCount) @@ -3585,10 +3585,10 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_I pszText = lpLVItem->pszText; ((LVITEMW *)lpLVItem)->pszText = textdupTtoW(lpLVItem->pszText, isW); } - + /* actually set the fields */ if (!is_assignable_item(lpLVItem, infoPtr->dwStyle)) return FALSE; - + if (lpLVItem->iSubItem) bResult = set_sub_item(infoPtr, lpLVItem, TRUE, &bChanged); else @@ -3601,7 +3601,8 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_I { /* this little optimization eliminates some nasty flicker */ if ( uView == LVS_REPORT && !(infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && - (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) || lpLVItem->iSubItem) ) + !(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && + lpLVItem->iSubItem > 0 && lpLVItem->iSubItem <= DPA_GetPtrCount(infoPtr->hdpaColumns) ) LISTVIEW_InvalidateSubItem(infoPtr, lpLVItem->iItem, lpLVItem->iSubItem); else LISTVIEW_InvalidateItem(infoPtr, lpLVItem->iItem);

1 0

Mike McCormack : comctl32: Remove unnecessary casts.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 2d097f7024779f19ce79f175e0361b02e41bfae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d097f7024779f19ce79f175e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 4 19:37:25 2007 +0900 comctl32: Remove unnecessary casts. --- dlls/comctl32/listview.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a513eb6..ad3127e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2578,7 +2578,7 @@ static void ranges_assert(RANGES ranges, static RANGES ranges_create(int count) { - RANGES ranges = (RANGES)Alloc(sizeof(struct tagRANGES)); + RANGES ranges = Alloc(sizeof(struct tagRANGES)); if (!ranges) return NULL; ranges->hdpa = DPA_Create(count); if (ranges->hdpa) return ranges; @@ -2613,7 +2613,7 @@ static RANGES ranges_clone(RANGES ranges for (i = 0; i < DPA_GetPtrCount(ranges->hdpa); i++) { - RANGE *newrng = (RANGE *)Alloc(sizeof(RANGE)); + RANGE *newrng = Alloc(sizeof(RANGE)); if (!newrng) goto fail; *newrng = *((RANGE*)DPA_GetPtr(ranges->hdpa, i)); DPA_SetPtr(clone->hdpa, i, newrng); @@ -2705,7 +2705,7 @@ static BOOL ranges_add(RANGES ranges, RA TRACE("Adding new range\n"); /* create the brand new range to insert */ - newrgn = (RANGE *)Alloc(sizeof(RANGE)); + newrgn = Alloc(sizeof(RANGE)); if(!newrgn) goto fail; *newrgn = range; @@ -2816,7 +2816,7 @@ static BOOL ranges_del(RANGES ranges, RA { RANGE tmprgn = *chkrgn, *newrgn; - if (!(newrgn = (RANGE *)Alloc(sizeof(RANGE)))) goto fail; + if (!(newrgn = Alloc(sizeof(RANGE)))) goto fail; newrgn->lower = chkrgn->lower; newrgn->upper = range.lower; chkrgn->lower = range.upper; @@ -3519,7 +3519,7 @@ static BOOL set_sub_item(LISTVIEW_INFO * SUBITEM_INFO *tmpSubItem; INT i; - lpSubItem = (SUBITEM_INFO *)Alloc(sizeof(SUBITEM_INFO)); + lpSubItem = Alloc(sizeof(SUBITEM_INFO)); if (!lpSubItem) return FALSE; /* we could binary search here, if need be...*/ for (i = 1; i < DPA_GetPtrCount(hdpaSubItems); i++) @@ -6247,7 +6247,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW if (!is_assignable_item(lpLVItem, infoPtr->dwStyle)) return -1; - if (!(lpItem = (ITEM_INFO *)Alloc(sizeof(ITEM_INFO)))) return -1; + if (!(lpItem = Alloc(sizeof(ITEM_INFO)))) return -1; /* insert item in listview control data structure */ if ( !(hdpaSubItems = DPA_Create(8)) ) goto fail; @@ -7669,7 +7669,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd TRACE("(lpcs=%p)\n", lpcs); /* initialize info pointer */ - infoPtr = (LISTVIEW_INFO *)Alloc(sizeof(LISTVIEW_INFO)); + infoPtr = Alloc(sizeof(LISTVIEW_INFO)); if (!infoPtr) return -1; SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr);

1 0

Alexandre Julliard : make_requests: Grab status names from async_terminate calls too.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 60d6518c82770c9fe6262ce73d037fd7f33e90ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d6518c82770c9fe6262ce73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 4 13:51:12 2007 +0100 make_requests: Grab status names from async_terminate calls too. --- server/trace.c | 3 +++ tools/make_requests | 6 +++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/server/trace.c b/server/trace.c index fcd24e6..70284ce 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3945,10 +3945,12 @@ static const struct { { "ACCESS_DENIED", STATUS_ACCESS_DENIED }, { "ACCESS_VIOLATION", STATUS_ACCESS_VIOLATION }, + { "ALERTED", STATUS_ALERTED }, { "ALIAS_EXISTS", STATUS_ALIAS_EXISTS }, { "BAD_DEVICE_TYPE", STATUS_BAD_DEVICE_TYPE }, { "BUFFER_OVERFLOW", STATUS_BUFFER_OVERFLOW }, { "BUFFER_TOO_SMALL", STATUS_BUFFER_TOO_SMALL }, + { "CANCELLED", STATUS_CANCELLED }, { "CHILD_MUST_BE_VOLATILE", STATUS_CHILD_MUST_BE_VOLATILE }, { "DEVICE_BUSY", STATUS_DEVICE_BUSY }, { "DIRECTORY_NOT_EMPTY", STATUS_DIRECTORY_NOT_EMPTY }, @@ -3963,6 +3965,7 @@ static const struct { "ERROR_SEEK", 0xc0010000 | ERROR_SEEK }, { "FILE_IS_A_DIRECTORY", STATUS_FILE_IS_A_DIRECTORY }, { "FILE_LOCK_CONFLICT", STATUS_FILE_LOCK_CONFLICT }, + { "HANDLES_CLOSED", STATUS_HANDLES_CLOSED }, { "HANDLE_NOT_CLOSABLE", STATUS_HANDLE_NOT_CLOSABLE }, { "INSTANCE_NOT_AVAILABLE", STATUS_INSTANCE_NOT_AVAILABLE }, { "INVALID_CID", STATUS_INVALID_CID }, diff --git a/tools/make_requests b/tools/make_requests index 58f6947..7e922be 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -241,7 +241,11 @@ sub GET_ERROR_NAMES() { if (/set_error\s*$\s*STATUS_(\w+)\s*$/) { - $errors{$1} = "STATUS_$1"; + $errors{$1} = "STATUS_$1" unless $1 eq "SUCCESS"; + } + elsif (/async_terminate_\w+\s*$.*,\s*STATUS_(\w+)\s*$/) + { + $errors{$1} = "STATUS_$1" unless $1 eq "SUCCESS"; } elsif (/set_win32_error\s*$\s*(\w+)\s*$/) {

1 0

Alexandre Julliard : server: Add a generic apc_call structure to make it easier to extend, and more type-safe.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 5c8421d3e73597923fda2b2df48b07f6c18745a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8421d3e73597923fda2b2df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 4 13:40:09 2007 +0100 server: Add a generic apc_call structure to make it easier to extend, and more type-safe. --- dlls/ntdll/sync.c | 28 +++++++--------- dlls/ntdll/thread.c | 14 +++++--- include/wine/server_protocol.h | 43 ++++++++++++++++++------- server/fd.c | 11 +++++- server/named_pipe.c | 11 +++++- server/protocol.def | 41 +++++++++++++++++------ server/thread.c | 69 ++++++++++++++++++++++------------------ server/thread.h | 5 +-- server/timer.c | 18 +++++++++-- server/trace.c | 44 +++++++++++++++++++------ tools/make_requests | 1 + 11 files changed, 190 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c8421d3e73597923fda2…

1 0

Alexandre Julliard : server: Notify the server that an APC has completed in the next get_apc call.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 49b49c30fcfcd72d7b388125d7ccf481f8b1f294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b49c30fcfcd72d7b388125d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 4 13:17:53 2007 +0100 server: Notify the server that an APC has completed in the next get_apc call. --- dlls/ntdll/sync.c | 21 ++++++++++++++------- include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/thread.c | 32 ++++++++++++++++++++++++-------- server/trace.c | 4 +++- 5 files changed, 46 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 852bfde..5857c46 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -659,6 +659,8 @@ static int wait_reply( void *cookie ) */ static void call_apcs( BOOL alertable ) { + NTSTATUS ret; + HANDLE handle = 0; FARPROC proc; LARGE_INTEGER time; void *arg1, *arg2, *arg3; @@ -669,18 +671,23 @@ static void call_apcs( BOOL alertable ) SERVER_START_REQ( get_apc ) { req->alertable = alertable; - if (!wine_server_call( req )) type = reply->type; - proc = reply->func; - arg1 = reply->arg1; - arg2 = reply->arg2; - arg3 = reply->arg3; + req->prev = handle; + if (!(ret = wine_server_call( req ))) + { + handle = reply->handle; + type = reply->type; + proc = reply->func; + arg1 = reply->arg1; + arg2 = reply->arg2; + arg3 = reply->arg3; + } } SERVER_END_REQ; + if (ret) return; /* no more APCs */ + switch (type) { - case APC_NONE: - return; /* no more APCs */ case APC_USER: proc( arg1, arg2, arg3 ); break; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 040afcf..6858985 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -529,10 +529,12 @@ struct get_apc_request { struct request_header __header; int alertable; + obj_handle_t prev; }; struct get_apc_reply { struct reply_header __header; + obj_handle_t handle; void* func; int type; void* arg1; @@ -4415,6 +4417,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 261 +#define SERVER_PROTOCOL_VERSION 262 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 80821ab..7cde312 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -447,7 +447,9 @@ struct token_groups /* Get next APC to call */ @REQ(get_apc) int alertable; /* is thread alertable? */ + obj_handle_t prev; /* handle to previous APC */ @REPLY + obj_handle_t handle; /* handle to APC */ void* func; /* function to call */ int type; /* function type */ void* arg1; /* function arguments */ diff --git a/server/thread.c b/server/thread.c index 2d05ffa..630447a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -71,6 +71,7 @@ struct thread_apc struct object obj; /* object header */ struct list entry; /* queue linked list */ struct object *owner; /* object that queued this apc */ + int executed; /* has it been executed by the client? */ void *func; /* function to call in client */ enum apc_type type; /* type of apc function */ void *arg1; /* function arguments */ @@ -310,7 +311,8 @@ static void dump_thread_apc( struct obje static int thread_apc_signaled( struct object *obj, struct thread *thread ) { - return 0; + struct thread_apc *apc = (struct thread_apc *)obj; + return apc->executed; } /* get a thread pointer from a thread id (and increment the refcount) */ @@ -679,6 +681,7 @@ int thread_queue_apc( struct thread *thr apc->arg1 = arg1; apc->arg2 = arg2; apc->arg3 = arg3; + apc->executed = 0; list_add_tail( queue, &apc->entry ); if (!list_prev( queue, &apc->entry )) /* first one */ wake_thread( thread ); @@ -1061,13 +1064,22 @@ DECL_HANDLER(get_apc) { struct thread_apc *apc; + if (req->prev) + { + if (!(apc = (struct thread_apc *)get_handle_obj( current->process, req->prev, + 0, &thread_apc_ops ))) return; + apc->executed = 1; + wake_up( &apc->obj, 0 ); + close_handle( current->process, req->prev ); + release_object( apc ); + } + for (;;) { if (!(apc = thread_dequeue_apc( current, !req->alertable ))) { /* no more APCs */ - reply->func = NULL; - reply->type = APC_NONE; + set_error( STATUS_PENDING ); return; } /* Optimization: ignore APCs that have a NULL func; they are only used @@ -1077,11 +1089,15 @@ DECL_HANDLER(get_apc) if (apc->func || apc->type == APC_ASYNC_IO) break; release_object( apc ); } - reply->func = apc->func; - reply->type = apc->type; - reply->arg1 = apc->arg1; - reply->arg2 = apc->arg2; - reply->arg3 = apc->arg3; + + if ((reply->handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) + { + reply->func = apc->func; + reply->type = apc->type; + reply->arg1 = apc->arg1; + reply->arg2 = apc->arg2; + reply->arg3 = apc->arg3; + } release_object( apc ); } diff --git a/server/trace.c b/server/trace.c index b128ad5..5018423 100644 --- a/server/trace.c +++ b/server/trace.c @@ -854,11 +854,13 @@ static void dump_queue_apc_request( cons static void dump_get_apc_request( const struct get_apc_request *req ) { - fprintf( stderr, " alertable=%d", req->alertable ); + fprintf( stderr, " alertable=%d,", req->alertable ); + fprintf( stderr, " prev=%p", req->prev ); } static void dump_get_apc_reply( const struct get_apc_reply *req ) { + fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " func=%p,", req->func ); fprintf( stderr, " type=%d,", req->type ); fprintf( stderr, " arg1=%p,", req->arg1 );

1 0

Alexandre Julliard : server: Make thread_apc into a real object.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 2606ad538b76436d12d632cb9c660b633e1ac5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2606ad538b76436d12d632cb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 4 12:36:33 2007 +0100 server: Make thread_apc into a real object. --- server/thread.c | 43 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 38 insertions(+), 5 deletions(-) diff --git a/server/thread.c b/server/thread.c index 47367d3..2d05ffa 100644 --- a/server/thread.c +++ b/server/thread.c @@ -68,6 +68,7 @@ struct thread_wait struct thread_apc { + struct object obj; /* object header */ struct list entry; /* queue linked list */ struct object *owner; /* object that queued this apc */ void *func; /* function to call in client */ @@ -77,6 +78,25 @@ struct thread_apc void *arg3; }; +static void dump_thread_apc( struct object *obj, int verbose ); +static int thread_apc_signaled( struct object *obj, struct thread *thread ); + +static const struct object_ops thread_apc_ops = +{ + sizeof(struct thread_apc), /* size */ + dump_thread_apc, /* dump */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + thread_apc_signaled, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + no_lookup_name, /* lookup_name */ + no_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + /* thread operations */ @@ -212,7 +232,7 @@ static void cleanup_thread( struct threa int i; struct thread_apc *apc; - while ((apc = thread_dequeue_apc( thread, 0 ))) free( apc ); + while ((apc = thread_dequeue_apc( thread, 0 ))) release_object( apc ); free( thread->req_data ); free( thread->reply_data ); if (thread->request_fd) release_object( thread->request_fd ); @@ -280,6 +300,19 @@ static unsigned int thread_map_access( s return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } +static void dump_thread_apc( struct object *obj, int verbose ) +{ + struct thread_apc *apc = (struct thread_apc *)obj; + assert( obj->ops == &thread_apc_ops ); + + fprintf( stderr, "APC owner=%p type=%u\n", apc->owner, apc->type ); +} + +static int thread_apc_signaled( struct object *obj, struct thread *thread ) +{ + return 0; +} + /* get a thread pointer from a thread id (and increment the refcount) */ struct thread *get_thread_from_id( thread_id_t id ) { @@ -639,7 +672,7 @@ int thread_queue_apc( struct thread *thr if (owner) thread_cancel_apc( thread, owner, system ); if (thread->state == TERMINATED) return 0; - if (!(apc = mem_alloc( sizeof(*apc) ))) return 0; + if (!(apc = alloc_object( &thread_apc_ops ))) return 0; apc->owner = owner; apc->func = func; apc->type = type; @@ -662,7 +695,7 @@ void thread_cancel_apc( struct thread *t { if (apc->owner != owner) continue; list_remove( &apc->entry ); - free( apc ); + release_object( apc ); return; } } @@ -1042,14 +1075,14 @@ DECL_HANDLER(get_apc) * Exception: for APC_ASYNC_IO, func == NULL is legal. */ if (apc->func || apc->type == APC_ASYNC_IO) break; - free( apc ); + release_object( apc ); } reply->func = apc->func; reply->type = apc->type; reply->arg1 = apc->arg1; reply->arg2 = apc->arg2; reply->arg3 = apc->arg3; - free( apc ); + release_object( apc ); } /* retrieve the current context of a thread */

1 0

Louis Lenders : regedit: Update Dutch resources.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 46c463398cc29d75ec909a53b2d772c5bf41c998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46c463398cc29d75ec909a53b… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jan 4 09:43:33 2007 +0000 regedit: Update Dutch resources. --- programs/regedit/Nl.rc | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Nl.rc b/programs/regedit/Nl.rc index cc2a92e..91d6f11 100644 --- a/programs/regedit/Nl.rc +++ b/programs/regedit/Nl.rc @@ -139,6 +139,17 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP END +IDD_EXPORT_TEMPLATE DIALOG DISCARDABLE 50, 50, 278, 54 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Registerbestand &exporteren", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP + AUTORADIOBUTTON "&Alles", IDC_EXPORT_ALL, 12, 15, 244, 12 + AUTORADIOBUTTON "&Gekozen subsleutel:", IDC_EXPORT_SELECTED, 12, 30, 90, 12 + EDITTEXT IDC_EXPORT_PATH, 102, 30, 164, 12 +END + IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Zoeken" @@ -295,6 +306,22 @@ BEGIN IDS_NOTFOUND "Tekenreeks '%s' niet gevonden" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_FILEDIALOG_IMPORT_TITLE "Registerbestand importeren" + IDS_FILEDIALOG_EXPORT_TITLE "Registerbestand exporteren" + IDS_FILEDIALOG_FILTER "Register Bestanden\0*.reg\0Win9x/NT4 Register Bestanden (REGEDIT4)\0*.reg\0Alle Bestanden (*.*)\0*.*\0\0" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_REGISTRY_ROOT_NAME "Deze Computer" + IDS_REGISTRY_DEFAULT_VALUE "(Standaard)" + IDS_REGISTRY_VALUE_NOT_SET "(Geen waarde ingesteld)" + IDS_REGISTRY_VALUE_CANT_DISPLAY "(kan waarde niet weergeven)" + IDS_REGISTRY_UNKNOWN_TYPE "(onbekend %d)" +END + /*****************************************************************/ /*

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
90
Older →

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 January 2007