November 2006 - Wine-Commits

Jacek Caban : mshtml: Fix no longer valid ERR.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: f9db47d66beb10d223de8171f6758248d76b265d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9db47d66beb10d223de8171f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:28:20 2006 +0100 mshtml: Fix no longer valid ERR. --- dlls/mshtml/persist.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index aba2d51..a52f015 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -240,9 +240,6 @@ static HRESULT WINAPI PersistMoniker_Loa if(post_data_stream) nsIInputStream_Release(post_data_stream); - if(!bscallback->nschannel) - ERR("bscallback->nschannel == NULL\n"); - if(NS_SUCCEEDED(nsres)) { /* FIXME: don't return here (URL Moniker needs to be good enough) */

1 0

Jacek Caban : mshtml: Added heuristic hack that decides if run the page from moniker or gecko channel .
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: 2a16169791c8d4a587ffc7ecfe2fce6a2d7f6780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a16169791c8d4a587ffc7ecf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:26:38 2006 +0100 mshtml: Added heuristic hack that decides if run the page from moniker or gecko channel. --- dlls/mshtml/nsio.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 46acb67..568434d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -568,6 +568,29 @@ static nsresult NSAPI nsChannel_Open(nsI return NS_ERROR_NOT_IMPLEMENTED; } +static BOOL do_load_from_moniker_hack(nsChannel *This) +{ + PRBool b = FALSE; + + /* + * We should always load the page from IMoniker, but Wine is not yet + * ready for this. This function is a heuristic, that decides which + * way of loading is better (Gecko implementation or IMoniker). The + * aim is to always return TRUE. + */ + + /* Load from moniker if there is no Gecko channel available */ + if(!This->channel) + return TRUE; + + /* Load about protocol from moniker */ + nsIWineURI_SchemeIs(This->uri, "about", &b); + if(b) + return TRUE; + + return FALSE; +} + static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListener *aListener, nsISupports *aContext) { @@ -602,7 +625,7 @@ static nsresult NSAPI nsChannel_AsyncOpe nsIWebBrowserChrome_Release(NSWBCHROME(container)); - if(!This->channel) { + if(do_load_from_moniker_hack(This)) { if(This->load_group) { nsres = nsILoadGroup_AddRequest(This->load_group, (nsIRequest*)NSCHANNEL(This), NULL);

1 0

Jacek Caban : wininet: Revert commit 760043c2455a90cd74178d98b7c81bfbfc81793f.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: 1031c5f9c6ef9504be25e22f179013b5d7f0b677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1031c5f9c6ef9504be25e22f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:27:06 2006 +0100 wininet: Revert commit 760043c2455a90cd74178d98b7c81bfbfc81793f. After more testing I've checked that current code is bad, but my patch was also wrong and causes regression in WoW. --- dlls/wininet/ftp.c | 12 ------------ dlls/wininet/http.c | 8 -------- dlls/wininet/internet.c | 10 ++++++---- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 32e1655..961a915 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2679,10 +2679,6 @@ static void FTP_CloseSessionHandle(LPWIN TRACE("\n"); - INTERNET_SendCallback(hdr, hdr->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, - sizeof(HINTERNET)); - WININET_Release(&lpwfs->lpAppInfo->hdr); if (lpwfs->download_in_progress != NULL) @@ -2773,10 +2769,6 @@ static void FTP_CloseFindNextHandle(LPWI TRACE("\n"); - INTERNET_SendCallback(hdr, hdr->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, - sizeof(HINTERNET)); - WININET_Release(&lpwfn->lpFtpSession->hdr); for (i = 0; i < lpwfn->size; i++) @@ -2803,10 +2795,6 @@ static void FTP_CloseFileTransferHandle( TRACE("\n"); - INTERNET_SendCallback(hdr, hdr->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, - sizeof(HINTERNET)); - WININET_Release(&lpwh->lpFtpSession->hdr); if (!lpwh->session_deleted) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c9a5698..36c85da 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2940,10 +2940,6 @@ static void HTTP_CloseHTTPRequestHandle( TRACE("\n"); - INTERNET_SendCallback(hdr, hdr->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, - sizeof(HINTERNET)); - WININET_Release(&lpwhr->hdr); if (NETCON_connected(&lpwhr->netConnection)) @@ -2978,10 +2974,6 @@ static void HTTP_CloseHTTPSessionHandle( TRACE("%p\n", lpwhs); - INTERNET_SendCallback(hdr, hdr->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, - sizeof(HINTERNET)); - WININET_Release(&lpwhs->lpAppInfo->hdr); HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1308e40..27a3382 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -969,10 +969,6 @@ static VOID INTERNET_CloseHandle(LPWININ TRACE("%p\n",lpwai); - INTERNET_SendCallback(hdr, hdr->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &hdr->hInternet, - sizeof(HINTERNET)); - HeapFree(GetProcessHeap(), 0, lpwai->lpszAgent); HeapFree(GetProcessHeap(), 0, lpwai->lpszProxy); HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyBypass); @@ -1005,6 +1001,12 @@ BOOL WINAPI InternetCloseHandle(HINTERNE return FALSE; } + /* FIXME: native appears to send this from the equivalent of + * WININET_Release */ + INTERNET_SendCallback(lpwh, lpwh->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &hInternet, + sizeof(HINTERNET)); + WININET_FreeHandle( hInternet ); WININET_Release( lpwh );

1 0

Huw Davies : comctl32: Implement PSM_GETRESULT.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: c18af414e5a29abac3bfaebd73f5ac6032a7d79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18af414e5a29abac3bfaebd7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 2 12:26:22 2006 +0000 comctl32: Implement PSM_GETRESULT. --- dlls/comctl32/propsheet.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4c81ec7..0487220 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -32,7 +32,6 @@ * - Wizard 97 header resizing * - Enforcing of minimal wizard size * - Messages: - * o PSM_GETRESULT * o PSM_INSERTPAGE * o PSM_RECALCPAGESIZES * o PSM_SETHEADERSUBTITLE @@ -2641,8 +2640,9 @@ static LRESULT PROPSHEET_IndexToId(HWND */ static LRESULT PROPSHEET_GetResult(HWND hwndDlg) { - FIXME("(%p): stub\n", hwndDlg); - return -1; + PropSheetInfo * psInfo = (PropSheetInfo*) GetPropW(hwndDlg, + PropSheetInfoStr); + return psInfo->result; } /******************************************************************************

1 0

Huw Davies : comctl32: Fix return value of PropertySheet() for modal propsheets.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: 6d0b86a92b925192346df871210694dedeaae29c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0b86a92b925192346df8712… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 2 12:21:53 2006 +0000 comctl32: Fix return value of PropertySheet() for modal propsheets. --- dlls/comctl32/propsheet.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 1fd5caf..4c81ec7 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -122,8 +122,6 @@ typedef struct tagPropSheetInfo BOOL hasApply; BOOL hasFinish; BOOL useCallback; - BOOL restartWindows; - BOOL rebootSystem; BOOL activeValid; PropPageInfo* proppage; HFONT hFont; @@ -132,6 +130,7 @@ typedef struct tagPropSheetInfo int height; HIMAGELIST hImageList; BOOL ended; + INT result; } PropSheetInfo; typedef struct @@ -333,8 +332,7 @@ static BOOL PROPSHEET_CollectSheetInfoA( if (psInfo->active_page < 0 || psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; - psInfo->restartWindows = FALSE; - psInfo->rebootSystem = FALSE; + psInfo->result = 0; psInfo->hImageList = 0; psInfo->activeValid = FALSE; @@ -388,8 +386,7 @@ static BOOL PROPSHEET_CollectSheetInfoW( if (psInfo->active_page < 0 || psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; - psInfo->restartWindows = FALSE; - psInfo->rebootSystem = FALSE; + psInfo->result = 0; psInfo->hImageList = 0; psInfo->activeValid = FALSE; @@ -2763,6 +2760,9 @@ static INT do_loop(PropSheetInfo *psInfo ret = -1; } + if(ret != -1) + ret = psInfo->result; + DestroyWindow(hwnd); return ret; } @@ -3147,14 +3147,10 @@ static BOOL PROPSHEET_DoCommand(HWND hwn { PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwnd, PropSheetInfoStr); - int result = TRUE; - - if (psInfo->restartWindows) - result = ID_PSRESTARTWINDOWS; - /* reboot system takes precedence over restart windows */ - if (psInfo->rebootSystem) - result = ID_PSREBOOTSYSTEM; + /* don't overwrite ID_PSRESTARTWINDOWS or ID_PSREBOOTSYSTEM */ + if (psInfo->result == 0) + psInfo->result = IDOK; if (psInfo->isModeless) psInfo->activeValid = FALSE; @@ -3630,7 +3626,10 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMs if (!psInfo) return FALSE; - psInfo->restartWindows = TRUE; + /* reboot system takes precedence over restart windows */ + if (psInfo->result != ID_PSREBOOTSYSTEM) + psInfo->result = ID_PSRESTARTWINDOWS; + return TRUE; } @@ -3642,7 +3641,8 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMs if (!psInfo) return FALSE; - psInfo->rebootSystem = TRUE; + psInfo->result = ID_PSREBOOTSYSTEM; + return TRUE; }

1 0

Dmitry Timoshkov : user32/tests: Move the system menu test into its own test.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: 1ebf1471c0e2036f818d7606bc25296accad2c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebf1471c0e2036f818d7606b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 2 19:18:32 2006 +0800 user32/tests: Move the system menu test into its own test. --- dlls/user/tests/msg.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 6149170..175c5bb 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -3494,11 +3494,18 @@ static void test_showwindow(void) flush_sequence(); } -static void test_sys_menu(HWND hwnd) +static void test_sys_menu(void) { + HWND hwnd; HMENU hmenu; UINT state; + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + + flush_sequence(); + /* test existing window without CS_NOCLOSE style */ hmenu = GetSystemMenu(hwnd, FALSE); ok(hmenu != 0, "GetSystemMenu error %d\n", GetLastError()); @@ -3521,6 +3528,15 @@ static void test_sys_menu(HWND hwnd) ok(state != 0xffffffff, "wrong SC_CLOSE state %x\n", state); ok(!(state & (MF_DISABLED | MF_GRAYED)), "wrong SC_CLOSE state %x\n", state); + /* test whether removing WS_SYSMENU destroys a system menu */ + SetWindowLongW(hwnd, GWL_STYLE, WS_POPUP); + SetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_FRAMECHANGED); + flush_sequence(); + hmenu = GetSystemMenu(hwnd, FALSE); + ok(hmenu != 0, "GetSystemMenu error %d\n", GetLastError()); + + DestroyWindow(hwnd); + /* test new window with CS_NOCLOSE style */ hwnd = CreateWindowExA(0, "NoCloseWindowClass", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); @@ -3610,9 +3626,6 @@ static void test_messages(void) SetWindowPos( hwnd, 0, 0, 0, 200, 200, SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE ); ok_sequence(WmSWP_ResizePopupSeq, "SetWindowPos:ResizePopup", FALSE ); - test_sys_menu(hwnd); - - flush_sequence(); DestroyWindow(hwnd); ok_sequence(WmDestroyOverlappedSeq, "DestroyWindow:overlapped", FALSE); @@ -8128,6 +8141,7 @@ #endif test_quit_message(); test_TrackMouseEvent(); test_SetWindowRgn(); + test_sys_menu(); UnhookWindowsHookEx(hCBT_hook); if (pUnhookWinEvent)

1 0

Dmitry Timoshkov : user32: Check only for -1 and -2 as special values returned by MENU_ExecFocusedItem .
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: ab8c870ae165b45dbfb6ce8b87402fe94fd826e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8c870ae165b45dbfb6ce8b8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 2 19:19:39 2006 +0800 user32: Check only for -1 and -2 as special values returned by MENU_ExecFocusedItem. --- dlls/user/menu.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 43bb11e..59c8386 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -2444,7 +2444,7 @@ static INT MENU_ExecFocusedItem( MTRACKE item = &menu->items[menu->FocusedItem]; - TRACE("%p %08x %p\n", hMenu, item->wID, item->hSubMenu); + TRACE("hMenu %p wID %08x hSubMenu %p fType %04x\n", hMenu, item->wID, item->hSubMenu, item->fType); if (!(item->fType & MF_POPUP)) { @@ -2566,10 +2566,13 @@ static INT MENU_ButtonUp( MTRACKER* pmt, if( item && (ptmenu->FocusedItem == id )) { + debug_print_menuitem ("FocusedItem: ", item, ""); + if( !(item->fType & MF_POPUP) ) { INT executedMenuId = MENU_ExecFocusedItem( pmt, hPtMenu, wFlags); - return (executedMenuId < 0) ? -1 : executedMenuId; + if (executedMenuId == -1 || executedMenuId == -2) return -1; + return executedMenuId; } /* If we are dealing with the top-level menu */ @@ -3050,6 +3053,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, if (hmenu) { executedMenuId = MENU_ButtonUp( &mt, hmenu, wFlags); + TRACE("executedMenuId %d\n", executedMenuId); /* End the loop if executedMenuId is an item ID */ /* or if the job was done (executedMenuId = 0). */ @@ -3214,7 +3218,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, /* The return value is only used by TrackPopupMenu */ if (!(wFlags & TPM_RETURNCMD)) return TRUE; - if (executedMenuId < 0) executedMenuId = 0; + if (executedMenuId == -1) executedMenuId = 0; return executedMenuId; } @@ -3364,6 +3368,9 @@ BOOL WINAPI TrackPopupMenu( HMENU hMenu, { BOOL ret = FALSE; + TRACE("hmenu %p flags %04x (%d,%d) reserved %d hwnd %p rect %s\n", + hMenu, wFlags, x, y, nReserved, hWnd, wine_dbgstr_rect(lpRect)); + MENU_InitTracking(hWnd, hMenu, TRUE, wFlags); /* Send WM_INITMENUPOPUP message only if TPM_NONOTIFY flag is not specified */

1 0

Paul Chitescu : msxml3: Check parameters of IXMLDOMNode::insertBefore().
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: c75d739d32aa3ca276a1b6991ec726517f7ade8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75d739d32aa3ca276a1b6991… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Thu Nov 2 11:42:05 2006 +0200 msxml3: Check parameters of IXMLDOMNode::insertBefore(). --- dlls/msxml3/node.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 094af5b..512e4e9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -386,6 +386,9 @@ static HRESULT WINAPI xmlnode_insertBefo TRACE("(%p)->(%p,var,%p)\n",This,newChild,outNewChild); + if (!(newChild && outNewChild)) + return E_INVALIDARG; + switch(V_VT(&refChild)) { case VT_EMPTY:

1 0

Alexandre Julliard : server: Refuse to close handles in other processes if they have an associated fd.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: 715d78e006461fccb893d1a6aed8018456598aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=715d78e006461fccb893d1a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 20:52:22 2006 +0100 server: Refuse to close handles in other processes if they have an associated fd. --- server/change.c | 2 +- server/fd.c | 6 ++++++ server/file.c | 2 +- server/file.h | 1 + server/mailslot.c | 6 +++--- server/mapping.c | 2 +- server/named_pipe.c | 6 +++--- server/serial.c | 2 +- server/sock.c | 2 +- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/server/change.c b/server/change.c index e046181..5468e85 100644 --- a/server/change.c +++ b/server/change.c @@ -177,7 +177,7 @@ static const struct object_ops dir_ops = dir_get_fd, /* get_fd */ dir_map_access, /* map_access */ no_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ dir_destroy /* destroy */ }; diff --git a/server/fd.c b/server/fd.c index 25b9a7c..4fbecbe 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1658,6 +1658,12 @@ int is_same_file_fd( struct fd *fd1, str return fd1->inode == fd2->inode; } +/* handler for close_handle that refuses to close fd-associated handles in other processes */ +int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) +{ + return (!current || current->process == process); +} + /* callback for event happening in the main poll() loop */ void fd_poll_event( struct fd *fd, int event ) { diff --git a/server/file.c b/server/file.c index 0f90019..ec34295 100644 --- a/server/file.c +++ b/server/file.c @@ -84,7 +84,7 @@ static const struct object_ops file_ops file_get_fd, /* get_fd */ file_map_access, /* map_access */ no_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ file_destroy /* destroy */ }; diff --git a/server/file.h b/server/file.h index 16d4399..fc8b904 100644 --- a/server/file.h +++ b/server/file.h @@ -55,6 +55,7 @@ extern void *get_fd_user( struct fd *fd extern void set_fd_user( struct fd *fd, const struct fd_ops *ops, struct object *user ); extern int get_unix_fd( struct fd *fd ); extern int is_same_file_fd( struct fd *fd1, struct fd *fd2 ); +extern int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); extern void fd_poll_event( struct fd *fd, int event ); extern int check_fd_events( struct fd *fd, int events ); extern void set_fd_events( struct fd *fd, int events ); diff --git a/server/mailslot.c b/server/mailslot.c index 6c4fc1c..7015f41 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -80,7 +80,7 @@ static const struct object_ops mailslot_ mailslot_get_fd, /* get_fd */ mailslot_map_access, /* map_access */ no_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ mailslot_destroy /* destroy */ }; @@ -124,7 +124,7 @@ static const struct object_ops mail_writ mail_writer_get_fd, /* get_fd */ mail_writer_map_access, /* map_access */ no_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ mail_writer_destroy /* destroy */ }; @@ -167,7 +167,7 @@ static const struct object_ops mailslot_ mailslot_device_get_fd, /* get_fd */ no_map_access, /* map_access */ mailslot_device_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ mailslot_device_destroy /* destroy */ }; diff --git a/server/mapping.c b/server/mapping.c index 212af1b..d526e75 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -68,7 +68,7 @@ static const struct object_ops mapping_o mapping_get_fd, /* get_fd */ mapping_map_access, /* map_access */ no_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ mapping_destroy /* destroy */ }; diff --git a/server/named_pipe.c b/server/named_pipe.c index bb0e741..e58f5b0 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -148,7 +148,7 @@ static const struct object_ops pipe_serv pipe_server_get_fd, /* get_fd */ pipe_map_access, /* map_access */ no_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ pipe_server_destroy /* destroy */ }; @@ -181,7 +181,7 @@ static const struct object_ops pipe_clie pipe_client_get_fd, /* get_fd */ pipe_map_access, /* map_access */ no_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ pipe_client_destroy /* destroy */ }; @@ -214,7 +214,7 @@ static const struct object_ops named_pip named_pipe_device_get_fd, /* get_fd */ pipe_map_access, /* map_access */ named_pipe_device_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ named_pipe_device_destroy /* destroy */ }; diff --git a/server/serial.c b/server/serial.c index 49d3f79..a772256 100644 --- a/server/serial.c +++ b/server/serial.c @@ -104,7 +104,7 @@ static const struct object_ops serial_op serial_get_fd, /* get_fd */ serial_map_access, /* map_access */ no_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ serial_destroy /* destroy */ }; diff --git a/server/sock.c b/server/sock.c index c1a7a8d..9637469 100644 --- a/server/sock.c +++ b/server/sock.c @@ -114,7 +114,7 @@ static const struct object_ops sock_ops sock_get_fd, /* get_fd */ sock_map_access, /* map_access */ no_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ + fd_close_handle, /* close_handle */ sock_destroy /* destroy */ };

1 0

Alexandre Julliard : server: Get rid of the server-side file descriptor cache management.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: 8700c4341b2e23362526b5d28222020c601dd66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8700c4341b2e23362526b5d28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 20:52:05 2006 +0100 server: Get rid of the server-side file descriptor cache management. --- include/wine/server_protocol.h | 21 +--------------- server/console.c | 2 +- server/debugger.c | 18 +++++++------- server/fd.c | 17 ------------- server/handle.c | 52 ++------------------------------------- server/handle.h | 5 +--- server/named_pipe.c | 3 -- server/protocol.def | 13 ---------- server/request.h | 2 - server/trace.c | 28 +-------------------- server/winstation.c | 6 ++-- 11 files changed, 20 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8700c4341b2e23362526b…

1 0