Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 42189: Do not fail with 'l' type modifier. Bug #4438.
by dgorbachev＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: dgorbachev Date: Sat Jul 25 09:40:35 2009 New Revision: 42189 URL: http://svn.reactos.org/svn/reactos?rev=42189&view=rev Log: Do not fail with 'l' type modifier. Bug #4438. Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Sat Jul 25 09:40:35 2009 @@ -41,25 +41,11 @@ { switch (c = *(format++)) { - case 'd': case 'u': case 'x': - if (c == 'x') - _itoa(va_arg(ap, unsigned long), str, 16); - else - _itoa(va_arg(ap, unsigned long), str, 10); - - ptr = str; - - while (*ptr) - { - MachConsPutChar(*(ptr++)); - } + case 'c': + MachConsPutChar((va_arg(ap, int)) & 0xff); break; - - case 'c': MachConsPutChar((va_arg(ap,int))&0xff); break; - case 's': - ptr = va_arg(ap,char *); - + ptr = va_arg(ap, char *); while ((c = *(ptr++))) { MachConsPutChar(c); @@ -68,6 +54,20 @@ case '%': MachConsPutChar(c); break; + case 'l': + c = *(format++); + /* Fall through. */ + case 'd': case 'u': case 'x': + if (c == 'x') + _itoa(va_arg(ap, unsigned long), str, 16); + else + _itoa(va_arg(ap, unsigned long), str, 10); + ptr = str; + while (*ptr) + { + MachConsPutChar(*(ptr++)); + } + break; default: printf("\nprintf() invalid format specifier - %%%c\n", c); break; @@ -76,7 +76,6 @@ } va_end(ap); - return 0; }

1 0

[cgutman] 42188: ws2_32_new compatibility fixes - Fix the rest of the code which was using errno instead of WSAGetLastError() - Remove some dead code
by cgutman＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: cgutman Date: Sat Jul 25 04:28:11 2009 New Revision: 42188 URL: http://svn.reactos.org/svn/reactos?rev=42188&view=rev Log: ws2_32_new compatibility fixes - Fix the rest of the code which was using errno instead of WSAGetLastError() - Remove some dead code Modified: trunk/reactos/base/services/dhcp/dhclient.c trunk/reactos/base/services/dhcp/dispatch.c trunk/reactos/base/services/dhcp/include/dhcpd.h trunk/reactos/base/services/dhcp/privsep.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Sat Jul 25 04:28:11 2009 @@ -1540,7 +1540,7 @@ if (!leaseFile) { leaseFile = fopen(path_dhclient_db, "w"); if (!leaseFile) - error("can't create %s: %s", path_dhclient_db, strerror(errno)); + error("can't create %s", path_dhclient_db); } else { fflush(leaseFile); rewind(leaseFile); @@ -1577,7 +1577,7 @@ if (!leaseFile) { /* XXX */ leaseFile = fopen(path_dhclient_db, "w"); if (!leaseFile) - error("can't create %s: %s", path_dhclient_db, strerror(errno)); + error("can't create %s", path_dhclient_db); } fprintf(leaseFile, "lease {\n"); @@ -1632,7 +1632,7 @@ sizeof(size_t) + strlen(reason); if ((buf = buf_open(hdr.len)) == NULL) - error("buf_open: %s", strerror(errno)); + return; errs = 0; errs += buf_add(buf, &hdr, sizeof(hdr)); @@ -1644,10 +1644,10 @@ errs += buf_add(buf, reason, len); if (errs) - error("buf_add: %s", strerror(errno)); + error("buf_add: %d", WSAGetLastError()); if (buf_close(privfd, buf) == -1) - error("buf_close: %s", strerror(errno)); + error("buf_close: %d", WSAGetLastError()); } void @@ -1822,7 +1822,7 @@ scripttime = time(NULL); if ((buf = buf_open(hdr.len)) == NULL) - error("buf_open: %s", strerror(errno)); + return; errs = 0; errs += buf_add(buf, &hdr, sizeof(hdr)); @@ -1842,10 +1842,10 @@ } if (errs) - error("buf_add: %s", strerror(errno)); + error("buf_add: %d", WSAGetLastError()); if (buf_close(privfd, buf) == -1) - error("buf_close: %s", strerror(errno)); + error("buf_close: %d", WSAGetLastError()); } int @@ -2075,41 +2075,3 @@ return "<error>"; } -#if 0 -int -fork_privchld(int fd, int fd2) -{ - struct pollfd pfd[1]; - int nfds; - - switch (fork()) { - case -1: - error("cannot fork"); - case 0: - break; - default: - return (0); - } - - setproctitle("%s [priv]", ifi->name); - - dup2(nullfd, STDIN_FILENO); - dup2(nullfd, STDOUT_FILENO); - dup2(nullfd, STDERR_FILENO); - close(nullfd); - close(fd2); - - for (;;) { - pfd[0].fd = fd; - pfd[0].events = POLLIN; - if ((nfds = poll(pfd, 1, INFTIM)) == -1) - if (errno != EINTR) - error("poll error"); - - if (nfds == 0 || !(pfd[0].revents & POLLIN)) - continue; - - dispatch_imsg(fd); - } -} -#endif Modified: trunk/reactos/base/services/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dispatc… ============================================================================== --- trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] Sat Jul 25 04:28:11 2009 @@ -198,8 +198,8 @@ if ((result = receive_packet(ip, u.packbuf, sizeof(u), &from, &hfrom)) == -1) { - warning("receive_packet failed on %s: %s", ip->name, - strerror(errno)); + warning("receive_packet failed on %s: %d", ip->name, + WSAGetLastError()); ip->errors++; if (ip->errors > 20) { /* our interface has gone away. */ @@ -374,33 +374,5 @@ int interface_link_status(char *ifname) { -#if 0 - struct ifmediareq ifmr; - int sock; - - if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - error("Can't create socket"); - - memset(&ifmr, 0, sizeof(ifmr)); - strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name)); - if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmr) == -1) { - /* EINVAL -> link state unknown. treat as active */ - if (errno != EINVAL) - syslog(LOG_DEBUG, "ioctl(SIOCGIFMEDIA) on %s: %m", - ifname); - close(sock); - return (1); - } - close(sock); - - if (ifmr.ifm_status & IFM_AVALID) { - if ((ifmr.ifm_active & IFM_NMASK) == IFM_ETHER) { - if (ifmr.ifm_status & IFM_ACTIVE) - return (1); - else - return (0); - } - } -#endif return (1); } Modified: trunk/reactos/base/services/dhcp/include/dhcpd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/dhcpd.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/dhcpd.h [iso-8859-1] Sat Jul 25 04:28:11 2009 @@ -98,7 +98,6 @@ #include <sys/stat.h> //#include <sys/time.h> #include <ctype.h> -#include <errno.h> #include <fcntl.h> #include <limits.h> //#include <unistd.h> Modified: trunk/reactos/base/services/dhcp/privsep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/privsep… ============================================================================== --- trunk/reactos/base/services/dhcp/privsep.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/privsep.c [iso-8859-1] Sat Jul 25 04:28:11 2009 @@ -52,19 +52,16 @@ { ssize_t n; - do { - n = write(sock, buf->buf + buf->rpos, buf->size - buf->rpos); - if (n != -1) - buf->rpos += n; - if (n == 0) { /* connection closed */ - errno = 0; - return (-1); - } - } while (n == -1 && (errno == EAGAIN || errno == EINTR)); + n = write(sock, buf->buf + buf->rpos, buf->size - buf->rpos); + if (n != -1) + buf->rpos += n; + if (n == 0) { /* connection closed */ + return (-1); + } if (buf->rpos < buf->size) - error("short %s write: wanted %lu got %ld bytes", - strerror(errno), (unsigned long)buf->size, (long)buf->rpos); + error("short write: wanted %lu got %ld bytes", + (unsigned long)buf->size, (long)buf->rpos); free(buf->buf); free(buf); @@ -77,19 +74,17 @@ ssize_t n, r = 0; char *p = buf; - do { - n = read(sock, p, nbytes); - if (n == 0) - error("connection closed"); - if (n != -1) { - r += n; - p += n; - nbytes -= n; - } - } while (n == -1 && (errno == EINTR || errno == EAGAIN)); + n = read(sock, p, nbytes); + if (n == 0) + error("connection closed"); + if (n != -1) { + r += n; + p += n; + nbytes -= n; + } if (n == -1) - error("buf_read: %s", strerror(errno)); + error("buf_read: %d", WSAGetLastError()); if (r < nbytes) error("short read: wanted %lu got %ld bytes", @@ -121,9 +116,8 @@ + sizeof(size_t) || medium_len == SIZE_T_MAX) error("corrupted message received"); if (medium_len > 0) { - if ((medium = calloc(1, medium_len + 1)) == NULL) - error("%s", strerror(errno)); - buf_read(fd, medium, medium_len); + if ((medium = calloc(1, medium_len + 1)) != NULL) + buf_read(fd, medium, medium_len); } else medium = NULL; @@ -132,9 +126,8 @@ reason_len == SIZE_T_MAX) error("corrupted message received"); if (reason_len > 0) { - if ((reason = calloc(1, reason_len + 1)) == NULL) - error("%s", strerror(errno)); - buf_read(fd, reason, reason_len); + if ((reason = calloc(1, reason_len + 1)) != NULL) + buf_read(fd, reason, reason_len); } else reason = NULL; @@ -155,9 +148,8 @@ if (hdr.len < totlen || filename_len == SIZE_T_MAX) error("corrupted message received"); if (filename_len > 0) { - if ((filename = calloc(1, filename_len + 1)) == NULL) - error("%s", strerror(errno)); - buf_read(fd, filename, filename_len); + if ((filename = calloc(1, filename_len + 1)) != NULL) + buf_read(fd, filename, filename_len); } else filename = NULL; @@ -167,9 +159,8 @@ error("corrupted message received"); if (servername_len > 0) { if ((servername = - calloc(1, servername_len + 1)) == NULL) - error("%s", strerror(errno)); - buf_read(fd, servername, servername_len); + calloc(1, servername_len + 1)) != NULL) + buf_read(fd, servername, servername_len); } else servername = NULL; @@ -178,9 +169,8 @@ if (hdr.len < totlen || prefix_len == SIZE_T_MAX) error("corrupted message received"); if (prefix_len > 0) { - if ((prefix = calloc(1, prefix_len + 1)) == NULL) - error("%s", strerror(errno)); - buf_read(fd, prefix, prefix_len); + if ((prefix = calloc(1, prefix_len + 1)) != NULL) + buf_read(fd, prefix, prefix_len); } else prefix = NULL; @@ -197,9 +187,8 @@ error("corrupted message received"); lease.options[i].data = calloc(1, optlen + 1); - if (lease.options[i].data == NULL) - error("%s", strerror(errno)); - buf_read(fd, lease.options[i].data, optlen); + if (lease.options[i].data != NULL) + buf_read(fd, lease.options[i].data, optlen); } } lease.server_name = servername; @@ -222,14 +211,13 @@ hdr.code = IMSG_SCRIPT_GO_RET; hdr.len = sizeof(struct imsg_hdr) + sizeof(int); - if ((buf = buf_open(hdr.len)) == NULL) - error("buf_open: %s", strerror(errno)); - if (buf_add(buf, &hdr, sizeof(hdr))) - error("buf_add: %s", strerror(errno)); - if (buf_add(buf, &ret, sizeof(ret))) - error("buf_add: %s", strerror(errno)); - if (buf_close(fd, buf) == -1) - error("buf_close: %s", strerror(errno)); + buf = buf_open(hdr.len); + + if (buf != NULL) { + buf_add(buf, &hdr, sizeof(hdr)); + buf_add(buf, &ret, sizeof(ret)); + buf_close(fd, buf); + } break; default: error("received unknown message, code %d", hdr.code);

1 0

[cgutman] 42187: ws2_32_new compatibility fixes - Use Sleep() to wait when we have no interfaces because select() will fail and return without waiting - Use WSAGetLastError() instead of errno
by cgutman＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: cgutman Date: Sat Jul 25 04:01:13 2009 New Revision: 42187 URL: http://svn.reactos.org/svn/reactos?rev=42187&view=rev Log: ws2_32_new compatibility fixes - Use Sleep() to wait when we have no interfaces because select() will fail and return without waiting - Use WSAGetLastError() instead of errno Modified: trunk/reactos/base/services/dhcp/dispatch.c Modified: trunk/reactos/base/services/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dispatc… ============================================================================== --- trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] Sat Jul 25 04:01:13 2009 @@ -63,7 +63,7 @@ void dispatch(void) { - int count, i, to_msec, nfds; + int count, i, to_msec, nfds, err; struct protocol *l; fd_set fds; time_t howlong, cur_time; @@ -122,10 +122,9 @@ } if (i == 0) { - /* No interfaces for now, set the select timeout reasonably so - * we can recover from that condition later. */ - timeval.tv_sec = 5; - timeval.tv_usec = 0; + /* Wait for 5 seconds before looking for more interfaces */ + Sleep(5000); + continue; } else { /* Wait for a packet or a timeout... XXX */ timeval.tv_sec = to_msec / 1000; @@ -156,12 +155,9 @@ /* Not likely to be transitory... */ if (count == SOCKET_ERROR) { - if (errno == EAGAIN || errno == EINTR) { - continue; - } else { - error("poll: %s", strerror(errno)); - break; - } + err = WSAGetLastError(); + error("poll: %d", err); + break; } i = 0;

1 0

[jimtabor] 42186: - Removed unused ppi pointer.
by jimtabor＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: jimtabor Date: Sat Jul 25 03:42:04 2009 New Revision: 42186 URL: http://svn.reactos.org/svn/reactos?rev=42186&view=rev Log: - Removed unused ppi pointer. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Jul 25 03:42:04 2009 @@ -263,7 +263,6 @@ eventually replace WINDOW_OBJECT. Right now WINDOW_OBJECT keeps a reference to this structure until all the information is moved to this structure */ - struct _PROCESSINFO *pi; // head.pti->ppi struct _W32THREADINFO *pti; // head.pti struct _DESKTOP *rpdesk; // head.rpdesk @@ -380,8 +379,7 @@ WNDPROC_EX pfnCtfHookProc; } PFNCLIENTWORKER, *PPFNCLIENTWORKER; -struct _WND; -typedef LONG_PTR (NTAPI *PFN_FNID)(struct _WND*, UINT, WPARAM, LPARAM, ULONG_PTR); +typedef LONG_PTR (NTAPI *PFN_FNID)(PWND, UINT, WPARAM, LPARAM, ULONG_PTR); // FNID's for NtUserSetWindowFNID, NtUserMessageCall #define FNID_FIRST 0x029A Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Jul 25 03:42:04 2009 @@ -1673,7 +1673,6 @@ Wnd = Window->Wnd; Wnd->pti = ti; - Wnd->pi = ti->ppi; Wnd->rpdesk = pti->Desktop; Wnd->hWndLastActive = hWnd; }

1 0

[jimtabor] 42185: - [Win32k] More work on classes. ReactOS seems to return the opposite WinProc and sometimes it is a CallProcData handle. This is confusing the class wine tests. The last thing it should do is return CallProcData handle after attempting to find the right proc. Fixed message class bits. Moved CallProc to CallProcData and updated related code. Started alternate function to replace NtUserGetClassLong and NtUserGetWindowLong. - Tested wine, Firefox 1.15.xx and AbiWord 2.6.8.
by jimtabor＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: jimtabor Date: Sat Jul 25 02:41:22 2009 New Revision: 42185 URL: http://svn.reactos.org/svn/reactos?rev=42185&view=rev Log: - [Win32k] More work on classes. ReactOS seems to return the opposite WinProc and sometimes it is a CallProcData handle. This is confusing the class wine tests. The last thing it should do is return CallProcData handle after attempting to find the right proc. Fixed message class bits. Moved CallProc to CallProcData and updated related code. Started alternate function to replace NtUserGetClassLong and NtUserGetWindowLong. - Tested wine, Firefox 1.15.xx and AbiWord 2.6.8. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -108,7 +108,7 @@ return di; } -PCALLPROC FASTCALL ValidateCallProc(HANDLE hCallProc); +PCALLPROCDATA FASTCALL ValidateCallProc(HANDLE hCallProc); PWND FASTCALL ValidateHwnd(HWND hwnd); PWND FASTCALL ValidateHwndOrDesk(HWND hwnd); PWND FASTCALL GetThreadDesktopWnd(VOID); Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -270,7 +270,7 @@ FASTCALL TestWindowProcess(PWND Wnd) { - if (Wnd->ti == (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) + if (Wnd->pti == (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) return TRUE; else return (NtUserQueryWindow(Wnd->hdr.Handle, QUERY_WINDOW_UNIQUE_PROCESS_ID) == @@ -426,15 +426,20 @@ // // Validate a callproc handle and return the pointer to the object. // -PCALLPROC +PCALLPROCDATA FASTCALL ValidateCallProc(HANDLE hCallProc) { - PCALLPROC CallProc = ValidateHandle(hCallProc, VALIDATE_TYPE_CALLPROC); - if (CallProc != NULL && CallProc->pi == g_ppi) - return CallProc; - - return NULL; + PUSER_HANDLE_ENTRY pEntry; + + PCALLPROCDATA CallProc = ValidateHandle(hCallProc, VALIDATE_TYPE_CALLPROC); + + pEntry = GetUser32Handle(hCallProc); + + if (CallProc != NULL && pEntry->ppi == g_ppi) + return CallProc; + + return NULL; } // Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -1238,7 +1238,7 @@ WPARAM wParam, LPARAM lParam) { - PCALLPROC CallProc; + PCALLPROCDATA CallProc; if (lpPrevWndFunc == NULL) { @@ -1253,7 +1253,7 @@ CallProc = ValidateCallProc((HANDLE)lpPrevWndFunc); if (CallProc != NULL) { - return IntCallWindowProcA(!CallProc->Unicode, CallProc->WndProc, + return IntCallWindowProcA(!CallProc->Unicode, CallProc->pfnClientPrevious, hWnd, Msg, wParam, lParam); } else @@ -1275,7 +1275,7 @@ WPARAM wParam, LPARAM lParam) { - PCALLPROC CallProc; + PCALLPROCDATA CallProc; /* FIXME - can the first parameter be NULL? */ if (lpPrevWndFunc == NULL) @@ -1291,7 +1291,7 @@ CallProc = ValidateCallProc((HANDLE)lpPrevWndFunc); if (CallProc != NULL) { - return IntCallWindowProcW(!CallProc->Unicode, CallProc->WndProc, + return IntCallWindowProcW(!CallProc->Unicode, CallProc->pfnClientPrevious, hWnd, Msg, wParam, lParam); } else @@ -1340,7 +1340,7 @@ if (lpmsg->hwnd != NULL) { Wnd = ValidateHwnd(lpmsg->hwnd); - if (!Wnd || SharedPtrToUser(Wnd->ti) != GetW32ThreadInfo()) + if (!Wnd || SharedPtrToUser(Wnd->pti) != GetW32ThreadInfo()) return 0; } else @@ -1401,7 +1401,7 @@ if (lpmsg->hwnd != NULL) { Wnd = ValidateHwnd(lpmsg->hwnd); - if (!Wnd || SharedPtrToUser(Wnd->ti) != GetW32ThreadInfo()) + if (!Wnd || SharedPtrToUser(Wnd->pti) != GetW32ThreadInfo()) return 0; } else @@ -1801,7 +1801,7 @@ PW32THREADINFO ti = GetW32ThreadInfo(); Window = ValidateHwnd(Wnd); - if (Window != NULL && SharedPtrToUser(Window->ti) == ti && !IsThreadHooked(GetWin32ClientInfo())) + if (Window != NULL && SharedPtrToUser(Window->pti) == ti && !IsThreadHooked(GetWin32ClientInfo())) { /* NOTE: We can directly send messages to the window procedure if *all* the following conditions are met: @@ -1865,7 +1865,7 @@ PW32THREADINFO ti = GetW32ThreadInfo(); Window = ValidateHwnd(Wnd); - if (Window != NULL && SharedPtrToUser(Window->ti) == ti && !IsThreadHooked(GetWin32ClientInfo())) + if (Window != NULL && SharedPtrToUser(Window->pti) == ti && !IsThreadHooked(GetWin32ClientInfo())) { /* NOTE: We can directly send messages to the window procedure if *all* the following conditions are met: Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -1268,7 +1268,7 @@ if (!pWnd) return Ret; - ti = SharedPtrToUser(pWnd->ti); + ti = SharedPtrToUser(pWnd->pti); if (ti) { Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -3,6 +3,7 @@ typedef struct _PROCESSINFO *PPROCESSINFO; struct _W32THREADINFO; +struct _DESKTOP; struct _WND; typedef struct _LARGE_UNICODE_STRING @@ -89,14 +90,29 @@ WCHAR szDesktopName[1]; } DESKTOPINFO, *PDESKTOPINFO; -typedef struct _CALLPROC -{ +typedef enum _GETCPD +{ + UserGetCPDU2A = 0x01, + UserGetCPDA2U = 0X02, + UserGetCPDClass = 0X10, + UserGetCPDWindow = 0X20, + UserGetCPDDialog = 0X40, + UserGetCPDWndtoCls = 0X80 +} GETCPD, *PGETCPD; + +typedef struct _CALLPROCDATA +{ +// PROCDESKHEAD head; // Use this once new handle manager is implemented!!! USER_OBJHDR hdr; /* FIXME: Move out of the structure once new handle manager is implemented */ - struct _PROCESSINFO *pi; - WNDPROC WndProc; - struct _CALLPROC *Next; - UINT Unicode : 1; -} CALLPROC, *PCALLPROC; +// + struct _CALLPROCDATA *spcpdNext; + WNDPROC pfnClientPrevious; + union + { + GETCPD wType; + UINT Unicode : 1; + }; +} CALLPROCDATA, *PCALLPROCDATA; #define CSF_SERVERSIDEPROC 0x0001 #define CSF_ANSIPROC 0x0002 @@ -118,7 +134,7 @@ DWORD CSF_flags; PSTR lpszClientAnsiMenuName; // For client use PWSTR lpszClientUnicodeMenuName; // " " " - PCALLPROC spcpdFirst; + PCALLPROCDATA spcpdFirst; struct _CLS *pclsBase; struct _CLS *pclsClone; ULONG cWndReferenceCount; @@ -127,7 +143,7 @@ union { WNDPROC WndProcExtra; - PCALLPROC CallProc; + PCALLPROCDATA CallProc; }; INT cbclsExtra; INT cbwndExtra; @@ -241,14 +257,15 @@ typedef struct _WND { + //THRDESKHEAD head; // head.h == handle USER_OBJHDR hdr; /* FIXME: Move out of the structure once new handle manager is implemented */ /* NOTE: This structure is located in the desktop heap and will eventually replace WINDOW_OBJECT. Right now WINDOW_OBJECT keeps a reference to this structure until all the information is moved to this structure */ - struct _PROCESSINFO *pi; /* FIXME: Move to object header some day */ - struct _W32THREADINFO *ti; - struct _DESKTOP *pdesktop; + struct _PROCESSINFO *pi; // head.pti->ppi + struct _W32THREADINFO *pti; // head.pti + struct _DESKTOP *rpdesk; // head.rpdesk DWORD state; DWORD state2; @@ -270,7 +287,7 @@ union { /* Pointer to a call procedure handle */ - PCALLPROC CallProc; + PCALLPROCDATA CallProc; /* Extra Wnd proc (windows of system classes) */ WNDPROC WndProcExtra; }; @@ -545,7 +562,7 @@ WORD fsWakeBits; WORD fsWakeBitsJournal; WORD fsWakeMask; - LONG timeLastRead; + ULONG tickLastMsgChecked; DWORD dwcPumpHook; } CLIENTTHREADINFO, *PCLIENTTHREADINFO; @@ -1379,14 +1396,16 @@ OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev); HDWP NTAPI -NtUserDeferWindowPos(HDWP WinPosInfo, - HWND Wnd, - HWND WndInsertAfter, - int x, - int y, - int cx, - int cy, - UINT Flags); +NtUserDeferWindowPos( + HDWP WinPosInfo, + HWND Wnd, + HWND WndInsertAfter, + int x, + int y, + int cx, + int cy, + UINT Flags); + BOOL NTAPI NtUserDefSetText(HWND WindowHandle, PLARGE_STRING WindowText); @@ -1680,12 +1699,12 @@ HDC hdc, UINT CtlMsg); -DWORD +ULONG_PTR NTAPI NtUserGetCPD( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + HWND hWnd, + GETCPD Flags, + ULONG_PTR Proc); DWORD NTAPI @@ -3025,7 +3044,7 @@ BOOL Indirect); -/* Should be done in usermode */ +/* Should be done in usermode and use NtUserGetCPD. */ ULONG_PTR NTAPI NtUserGetClassLong(HWND hWnd, INT Offset, BOOL Ansi); @@ -3067,7 +3086,7 @@ NTAPI NtUserGetWindow(HWND hWnd, UINT Relationship); -/* Should be done in usermode */ +/* Should be done in usermode and use NtUserGetCPD. */ LONG NTAPI NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -21,17 +21,17 @@ } WNDPROC -GetCallProcHandle(IN PCALLPROC CallProc); +GetCallProcHandle(IN PCALLPROCDATA CallProc); VOID DestroyCallProc(IN PDESKTOPINFO Desktop, - IN OUT PCALLPROC CallProc); + IN OUT PCALLPROCDATA CallProc); -PCALLPROC +PCALLPROCDATA CloneCallProc(IN PDESKTOPINFO Desktop, - IN PCALLPROC CallProc); + IN PCALLPROCDATA CallProc); -PCALLPROC +PCALLPROCDATA CreateCallProc(IN PDESKTOPINFO Desktop, IN WNDPROC WndProc, IN BOOL Unicode, @@ -87,7 +87,7 @@ IN PDESKTOP Desktop, IN PPROCESSINFO pi); -PCALLPROC +PCALLPROCDATA UserFindCallProc(IN PCLS Class, IN WNDPROC WndProc, IN BOOL bUnicode); @@ -98,7 +98,7 @@ VOID UserAddCallProcToClass(IN OUT PCLS Class, - IN PCALLPROC CallProc); + IN PCALLPROCDATA CallProc); BOOL IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -1,27 +1,8 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998 - 2006 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id: class.c 21596 2006-04-15 10:41:58Z greatlrd $ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window classes - * FILE: subsys/win32k/ntuser/class.c + * FILE: subsystems/win32/win32k/ntuser/class.c * PROGRAMER: Thomas Weidenmueller <w3seek(a)reactos.com> * REVISION HISTORY: * 06-06-2001 CSH Created @@ -36,7 +17,7 @@ /* CALLPROC ******************************************************************/ WNDPROC -GetCallProcHandle(IN PCALLPROC CallProc) +GetCallProcHandle(IN PCALLPROCDATA CallProc) { /* FIXME - check for 64 bit architectures... */ return (WNDPROC)((ULONG_PTR)UserObjectToHandle(CallProc) | 0xFFFF0000); @@ -44,7 +25,7 @@ VOID DestroyCallProc(IN PDESKTOPINFO Desktop, - IN OUT PCALLPROC CallProc) + IN OUT PCALLPROCDATA CallProc) { /* FIXME - use new object manager! */ HANDLE Handle = UserObjectToHandle(CallProc); @@ -53,51 +34,49 @@ otCallProc); } -PCALLPROC +PCALLPROCDATA CloneCallProc(IN PDESKTOPINFO Desktop, - IN PCALLPROC CallProc) + IN PCALLPROCDATA CallProc) { - PCALLPROC NewCallProc; + PCALLPROCDATA NewCallProc; HANDLE Handle; /* FIXME - use new object manager! */ - NewCallProc = (PCALLPROC)UserCreateObject(gHandleTable, + NewCallProc = (PCALLPROCDATA)UserCreateObject(gHandleTable, &Handle, otCallProc, - sizeof(CALLPROC)); + sizeof(CALLPROCDATA)); if (NewCallProc != NULL) { NewCallProc->hdr.Handle = Handle; /* FIXME: Remove hack */ - NewCallProc->pi = CallProc->pi; - NewCallProc->WndProc = CallProc->WndProc; + NewCallProc->pfnClientPrevious = CallProc->pfnClientPrevious; NewCallProc->Unicode = CallProc->Unicode; - NewCallProc->Next = NULL; + NewCallProc->spcpdNext = NULL; } return NewCallProc; } -PCALLPROC +PCALLPROCDATA CreateCallProc(IN PDESKTOPINFO Desktop, IN WNDPROC WndProc, IN BOOL Unicode, IN PPROCESSINFO pi) { - PCALLPROC NewCallProc; + PCALLPROCDATA NewCallProc; HANDLE Handle; /* FIXME - use new object manager! */ - NewCallProc = (PCALLPROC)UserCreateObject(gHandleTable, + NewCallProc = (PCALLPROCDATA)UserCreateObject(gHandleTable, &Handle, otCallProc, - sizeof(CALLPROC)); + sizeof(CALLPROCDATA)); if (NewCallProc != NULL) { NewCallProc->hdr.Handle = Handle; /* FIXME: Remove hack */ - NewCallProc->pi = pi; - NewCallProc->WndProc = WndProc; + NewCallProc->pfnClientPrevious = WndProc; NewCallProc->Unicode = Unicode; - NewCallProc->Next = NULL; + NewCallProc->spcpdNext = NULL; } return NewCallProc; @@ -107,7 +86,7 @@ UserGetCallProcInfo(IN HANDLE hCallProc, OUT PWNDPROC_INFO wpInfo) { - PCALLPROC CallProc; + PCALLPROCDATA CallProc; /* NOTE: Accessing the WNDPROC_INFO structure may raise an exception! */ @@ -120,13 +99,70 @@ return FALSE; } +/* Use Handle pEntry->ppi! if (CallProc->pi != GetW32ProcessInfo()) { return FALSE; - } + }*/ - wpInfo->WindowProc = CallProc->WndProc; + wpInfo->WindowProc = CallProc->pfnClientPrevious; wpInfo->IsUnicode = CallProc->Unicode; return TRUE; } + +/* SYSCALLS *****************************************************************/ + +/* + Retrieve the WinProcA/W or CallProcData handle for Class, Dialog or Window. + This Function called from user space uses Window handle for class, window + and dialog procs only. + + Note: + ProcIn is the default proc from pCls/pDlg/pWnd->lpfnXxyz, caller is + looking for another type of proc if the original lpfnXxyz proc is preset + to Ansi or Unicode. + + Example: + If pWnd is created from Ansi and lpfnXxyz is assumed to be Ansi, caller + will ask for Unicode Proc return Proc or CallProcData handle. + + This function should replaced NtUserGetClassLong and NtUserGetWindowLong. + */ +ULONG_PTR +APIENTRY +NtUserGetCPD( + HWND hWnd, + GETCPD Flags, + ULONG_PTR ProcIn) +{ + PWINDOW_OBJECT Window; + PWND Wnd; + PCLS Class; + ULONG_PTR Result = 0; + BOOL Ansi; + + UserEnterExclusive(); + if (!(Window = UserGetWindowObject(hWnd)) || !Window->Wnd) + { + goto Cleanup; + } + Wnd = Window->Wnd; + Class = Wnd->pcls; + /* Ex: Retrieve the Unicode Proc since the default is Ansi. */ + Ansi = (Flags & UserGetCPDA2U); // Ansi to Unicode request from user. + + if ( Flags & (UserGetCPDWindow|UserGetCPDDialog)) + { + Result = UserGetWindowLong( hWnd, GWL_WNDPROC, Ansi); + } + else if (Flags & (UserGetCPDClass|UserGetCPDWndtoCls)) + { + Result = UserGetClassLongPtr( Class, GCLP_WNDPROC, Ansi); + } + +Cleanup: + UserLeave(); + return Result; +} + Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -80,15 +80,15 @@ if (Class->pclsBase == Class) { - PCALLPROC CallProc, NextCallProc; + PCALLPROCDATA CallProc, NextCallProc; /* Destroy allocated callproc handles */ CallProc = Class->spcpdFirst; while (CallProc != NULL) { - NextCallProc = CallProc->Next; - - CallProc->Next = NULL; + NextCallProc = CallProc->spcpdNext; + + CallProc->spcpdNext = NULL; DestroyCallProc(NULL, CallProc); @@ -211,23 +211,23 @@ Atom); } -PCALLPROC +PCALLPROCDATA UserFindCallProc(IN PCLS Class, IN WNDPROC WndProc, IN BOOL bUnicode) { - PCALLPROC CallProc; + PCALLPROCDATA CallProc; CallProc = Class->spcpdFirst; while (CallProc != NULL) { - if (CallProc->WndProc == WndProc && + if (CallProc->pfnClientPrevious == WndProc && CallProc->Unicode == (UINT)bUnicode) { return CallProc; } - CallProc = CallProc->Next; + CallProc = CallProc->spcpdNext; } return NULL; @@ -235,15 +235,15 @@ VOID UserAddCallProcToClass(IN OUT PCLS Class, - IN PCALLPROC CallProc) + IN PCALLPROCDATA CallProc) { PCLS BaseClass; - ASSERT(CallProc->Next == NULL); + ASSERT(CallProc->spcpdNext == NULL); BaseClass = Class->pclsBase; - ASSERT(CallProc->Next == NULL); - CallProc->Next = BaseClass->spcpdFirst; + ASSERT(CallProc->spcpdNext == NULL); + CallProc->spcpdNext = BaseClass->spcpdFirst; BaseClass->spcpdFirst = CallProc; /* Update all clones */ @@ -289,21 +289,22 @@ static WNDPROC IntGetClassWndProc(IN PCLS Class, IN PPROCESSINFO pi, - IN BOOL Ansi) + IN BOOL Ansi) // This is what we are looking for?!? { ASSERT(UserIsEnteredExclusive() == TRUE); - + /* System Classes */ if (Class->System) { + // FIXME! System class have gpsi->apfnClientA/W to pick from. return (Ansi ? Class->WndProcExtra : Class->lpfnWndProc); } - else - { + else + { /* Unicode Proc */ if (!Ansi == Class->Unicode) { return Class->lpfnWndProc; } - else + else // Ansi? { PCLS BaseClass; @@ -318,7 +319,7 @@ } else { - PCALLPROC NewCallProc; + PCALLPROCDATA NewCallProc; if (pi == NULL) return NULL; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -1118,8 +1118,8 @@ RtlZeroMemory(&WindowName, sizeof(WindowName)); wc.cbSize = sizeof(wc); - wc.style = CS_DBLCLKS|CS_PARENTDC; - wc.lpfnWndProc = gpsi->apfnClientW.pfnDesktopWndProc; // Use User32 Desktop Proc. + wc.style = 0; + wc.lpfnWndProc = gpsi->apfnClientW.pfnDesktopWndProc; // Use pfnMessageWindowProc wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hModClient; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -264,18 +264,6 @@ HWND hwnd, HDC hdc, UINT CtlMsg) // Wine PaintRect: WM_CTLCOLORMSGBOX + hbrush -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -APIENTRY -NtUserGetCPD( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) { UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -27,7 +27,7 @@ #define NDEBUG #include <debug.h> -int usedHandles=0; +//int usedHandles=0; PUSER_HANDLE_TABLE gHandleTable = NULL; @@ -55,14 +55,14 @@ { PUSER_HANDLE_ENTRY entry; - DPRINT("handles used %i\n",usedHandles); + DPRINT("handles used %i\n",gpsi->cHandleEntries); if (ht->freelist) { entry = ht->freelist; ht->freelist = entry->ptr; - usedHandles++; + gpsi->cHandleEntries++; return entry; } @@ -72,7 +72,7 @@ int i, iFree = 0, iWindow = 0, iMenu = 0, iCursorIcon = 0, iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0, iTimer = 0; /**/ - DPRINT1("Out of user handles! Used -> %i, NM_Handle -> %d\n", usedHandles, ht->nb_handles); + DPRINT1("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); //#if 0 for(i = 0; i < ht->nb_handles; i++) { @@ -131,7 +131,7 @@ entry->generation = 1; - usedHandles++; + gpsi->cHandleEntries++; return entry; } @@ -154,7 +154,7 @@ entry->pi = NULL; ht->freelist = entry; - usedHandles--; + gpsi->cHandleEntries--; return ret; } @@ -387,7 +387,7 @@ if (hdr->RefCount == 0 && hdr->destroyed) { -// DPRINT1("info: something destroyed bcaise of deref, in use=%i\n",usedHandles); +// DPRINT1("info: something destroyed bcaise of deref, in use=%i\n",gpsi->cHandleEntries); memset(hdr, 0x55, sizeof(USER_OBJECT_HEADER)); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -418,7 +418,7 @@ // Window nz, check to see if we still own this or it is just cheap wine tonight. if (!(Flags & DCX_CACHE)) { - if ( Wnd->ti != GetW32ThreadInfo()) + if ( Wnd->pti != GetW32ThreadInfo()) Flags |= DCX_CACHE; // Ah~ Not Powned! Forced to be cheap~ } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Jul 25 02:41:22 2009 @@ -329,12 +329,12 @@ { Wnd->strName.Length = 0; Wnd->strName.MaximumLength = 0; - DesktopHeapFree(Wnd->pdesktop, + DesktopHeapFree(Wnd->rpdesk, Wnd->strName.Buffer); Wnd->strName.Buffer = NULL; } - DesktopHeapFree(Wnd->pdesktop, Wnd); + DesktopHeapFree(Wnd->rpdesk, Wnd); WindowObject->Wnd = NULL; } @@ -562,17 +562,17 @@ on a function that I thought is only suppose to return the current Windows Proc? */ else { - PCALLPROC NewCallProc, CallProc; + PCALLPROCDATA NewCallProc, CallProc; NewCallProc = UserFindCallProc(Wnd->pcls, Wnd->lpfnWndProc, Wnd->Unicode); if (NewCallProc == NULL) { - NewCallProc = CreateCallProc(Wnd->ti->pDeskInfo, + NewCallProc = CreateCallProc(Wnd->pti->pDeskInfo, Wnd->lpfnWndProc, Wnd->Unicode, - Wnd->ti->ppi); + Wnd->pti->ppi); if (NewCallProc == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -1672,9 +1672,9 @@ Window->Wnd->hdr.Handle = hWnd; /* FIXME: Remove hack , are you sure?*/ Wnd = Window->Wnd; - Wnd->ti = ti; + Wnd->pti = ti; Wnd->pi = ti->ppi; - Wnd->pdesktop = pti->Desktop; + Wnd->rpdesk = pti->Desktop; Wnd->hWndLastActive = hWnd; } @@ -1770,7 +1770,7 @@ if ( NULL != WindowName->Buffer && WindowName->Length > 0 ) { - Wnd->strName.Buffer = DesktopHeapAlloc(Wnd->pdesktop, + Wnd->strName.Buffer = DesktopHeapAlloc(Wnd->rpdesk, WindowName->Length + sizeof(UNICODE_NULL)); if (Wnd->strName.Buffer == NULL) { @@ -2239,9 +2239,9 @@ Dont understand why it does this. */ if (ClassAtom == gpsi->atomSysClass[ICLS_EDIT]) { - PCALLPROC CallProc; + PCALLPROCDATA CallProc; //CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, bUnicodeWindow, Wnd->ti->ppi); - CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, Wnd->Unicode , Wnd->ti->ppi); + CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, Wnd->Unicode , Wnd->pti->ppi); if (!CallProc) { @@ -3693,7 +3693,7 @@ BOOL Ansi) { WNDPROC Ret; - PCALLPROC CallProc; + PCALLPROCDATA CallProc; PWND Wnd = Window->Wnd; /* resolve any callproc handle if possible */ @@ -3730,7 +3730,7 @@ CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, Wnd->Unicode, - Wnd->ti->ppi); + Wnd->pti->ppi); if (CallProc == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -4820,10 +4820,10 @@ Wnd->strName.Buffer = NULL; if (buf != NULL) { - DesktopHeapFree(Wnd->pdesktop, buf); + DesktopHeapFree(Wnd->rpdesk, buf); } - Wnd->strName.Buffer = DesktopHeapAlloc(Wnd->pdesktop, + Wnd->strName.Buffer = DesktopHeapAlloc(Wnd->rpdesk, UnicodeString.Length + sizeof(UNICODE_NULL)); if (Wnd->strName.Buffer != NULL) {

1 0

[fireball] 42184: - Implement shrink_handle_table though this code (along with the object.c) will be deprecated in future.
by fireball＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: fireball Date: Fri Jul 24 23:33:28 2009 New Revision: 42184 URL: http://svn.reactos.org/svn/reactos?rev=42184&view=rev Log: - Implement shrink_handle_table though this code (along with the object.c) will be deprecated in future. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c [iso-8859-1] Fri Jul 24 23:33:28 2009 @@ -300,10 +300,10 @@ /* attempt to shrink a table */ static void shrink_handle_table( struct handle_table *table ) { -#if 0 struct handle_entry *entry = table->entries + table->last; struct handle_entry *new_entries; int count = table->count; + int count_old = table->count; while (table->last >= 0) { @@ -314,12 +314,10 @@ if (table->last >= count / 4) return; /* no need to shrink */ if (count < MIN_HANDLE_ENTRIES * 2) return; /* too small to shrink */ count /= 2; - if (!(new_entries = realloc( table->entries, count * sizeof(*new_entries) ))) return; + if (!(new_entries = + ExReallocPool( table->entries, count * sizeof(*new_entries), count_old * sizeof(*new_entries) ))) return; table->count = count; table->entries = new_entries; -#else - UNIMPLEMENTED; -#endif } /* copy the handle table of the parent process */

1 0

[fireball] 42183: - PsLookupProcess/Thread already references the object, so don't reference it yet again! Thaaaaank you Stefan Ginsberg. Fixes a rather big reference leak. See arwinss issue Nr 2.
by fireball＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: fireball Date: Fri Jul 24 23:19:50 2009 New Revision: 42183 URL: http://svn.reactos.org/svn/reactos?rev=42183&view=rev Log: - PsLookupProcess/Thread already references the object, so don't reference it yet again! Thaaaaank you Stefan Ginsberg. Fixes a rather big reference leak. See arwinss issue Nr 2. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] Fri Jul 24 23:19:50 2009 @@ -390,21 +390,17 @@ if (!(desktop = get_thread_desktop( current, DESKTOP_HOOKCONTROL ))) return; - //if (req->pid && !(process = get_process_from_id( req->pid ))) goto done; if (req->pid) { status = PsLookupProcessByProcessId((HANDLE)req->pid, &eprocess); if (!NT_SUCCESS(status)) goto done; - ObReferenceObjectByPointer(eprocess, 0, NULL, KernelMode); process = (PPROCESSINFO)PsGetProcessWin32Process(eprocess); } if (req->tid) { - //if (!(thread = get_thread_from_id( req->tid ))) goto done; status = PsLookupThreadByThreadId((HANDLE)req->tid, &ethread); if (!NT_SUCCESS(status)) goto done; - ObReferenceObjectByPointer(ethread, 0, NULL, KernelMode); thread = (PTHREADINFO)PsGetThreadWin32Thread(ethread); if (process && process != thread->process) Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Fri Jul 24 23:19:50 2009 @@ -1722,9 +1722,11 @@ status = PsLookupThreadByThreadId((HANDLE)req->id, &ethread); if (!NT_SUCCESS(status)) return; - if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) return; - - ObReferenceObjectByPointer(ethread, 0, NULL, KernelMode); + if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) + { + ObDereferenceObject(ethread); + return; + } if (!(recv_queue = thread->queue)) { @@ -1804,8 +1806,11 @@ status = PsLookupThreadByThreadId((HANDLE)req->id, &ethread); if (!NT_SUCCESS(status)) return; - if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) return; - ObReferenceObjectByPointer(ethread, 0, NULL, KernelMode); + if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) + { + ObDereferenceObject(ethread); + return; + } } if (thread && !(recv_queue = thread->queue)) @@ -2113,10 +2118,11 @@ if (!NT_SUCCESS(status)) return; status = PsLookupThreadByThreadId((HANDLE)req->tid_to, &ethread_to); - if (!NT_SUCCESS(status)) return; - - ObReferenceObjectByPointer(ethread_from, 0, NULL, KernelMode); - ObReferenceObjectByPointer(ethread_to, 0, NULL, KernelMode); + if (!NT_SUCCESS(status)) + { + ObDereferenceObject(ethread_from); + return; + } thread_from = (PTHREADINFO)ethread_from->Tcb.Win32Thread; thread_to = (PTHREADINFO)ethread_to->Tcb.Win32Thread; @@ -2157,9 +2163,11 @@ { status = PsLookupThreadByThreadId((HANDLE)req->tid, &ethread); if (!NT_SUCCESS(status)) return; - if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) return; - ObReferenceObjectByPointer(ethread, 0, NULL, KernelMode); - + if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) + { + ObDereferenceObject(ethread); + return; + } input = thread->queue ? thread->queue->input : NULL; } else input = foreground_input; /* get the foreground thread info */ @@ -2200,8 +2208,11 @@ status = PsLookupThreadByThreadId((HANDLE)req->tid, &ethread); if (!NT_SUCCESS(status)) return; - if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) return; - ObReferenceObjectByPointer(ethread, 0, NULL, KernelMode); + if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) + { + ObDereferenceObject(ethread); + return; + } input = thread->queue ? thread->queue->input : NULL; if (input) @@ -2223,8 +2234,11 @@ status = PsLookupThreadByThreadId((HANDLE)req->tid, &ethread); if (!NT_SUCCESS(status)) return; - if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) return; - ObReferenceObjectByPointer(ethread, 0, NULL, KernelMode); + if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) + { + ObDereferenceObject(ethread); + return; + } input = thread->queue ? thread->queue->input : NULL; if (input) Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] Fri Jul 24 23:19:50 2009 @@ -615,8 +615,11 @@ status = PsLookupThreadByThreadId((HANDLE)req->tid, &ethread); if (!NT_SUCCESS(status)) return; - if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) return; - ObReferenceObjectByPointer(ethread, 0, NULL, KernelMode); + if (!(thread = (PTHREADINFO)ethread->Tcb.Win32Thread)) + { + ObDereferenceObject(ethread); + return; + } reply->handle = thread->desktop;

1 0

[cgutman] 42182: - Add support for adapters added after DHCP is started - Automatically request an IP address after an interface becomes ready (needed for DHCP support on WLAN adapters)
by cgutman＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: cgutman Date: Fri Jul 24 23:06:20 2009 New Revision: 42182 URL: http://svn.reactos.org/svn/reactos?rev=42182&view=rev Log: - Add support for adapters added after DHCP is started - Automatically request an IP address after an interface becomes ready (needed for DHCP support on WLAN adapters) Modified: trunk/reactos/base/services/dhcp/adapter.c trunk/reactos/base/services/dhcp/dhclient.c trunk/reactos/base/services/dhcp/dispatch.c trunk/reactos/base/services/dhcp/include/rosdhcp.h Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Fri Jul 24 23:06:20 2009 @@ -198,28 +198,43 @@ (MID_TRACE,("Adapter Name: [%s] (Bind Status %x) (dynamic)\n", Adapter->DhclientInfo.name, Adapter->BindStatus)); + + add_protocol(Adapter->DhclientInfo.name, Adapter->DhclientInfo.rfdesc, got_one, &Adapter->DhclientInfo); + Adapter->DhclientInfo.client->state = S_INIT; + state_reboot(&Adapter->DhclientInfo); } if( IPAddress ) free( IPAddress ); return TRUE; +} + +void AdapterInit() { + WSAStartup(0x0101,&wsd); + + InitializeListHead( &AdapterList ); +} + +int +InterfaceConnected(MIB_IFROW IfEntry) +{ + if (IfEntry.dwOperStatus == IF_OPER_STATUS_CONNECTED || + IfEntry.dwOperStatus == IF_OPER_STATUS_OPERATIONAL) + return 1; + + return 0; } /* * XXX Figure out the way to bind a specific adapter to a socket. */ - -void AdapterInit() { +void AdapterDiscover() { PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE)); DWORD Error, Size = sizeof(MIB_IFTABLE); PDHCP_ADAPTER Adapter = NULL; struct interface_info *ifi = NULL; int i; - WSAStartup(0x0101,&wsd); - - InitializeListHead( &AdapterList ); - DH_DbgPrint(MID_TRACE,("Getting Adapter List...\n")); while( (Error = GetIfTable(Table, &Size, 0 )) == @@ -236,9 +251,25 @@ for( i = Table->dwNumEntries - 1; i >= 0; i-- ) { DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n", Table->table[i].dwIndex)); + + if (AdapterFindByHardwareAddress(Table->table[i].bPhysAddr, Table->table[i].dwPhysAddrLen)) + { + /* This is an existing adapter */ + if (InterfaceConnected(Table->table[i])) { + /* We're still active so we stay in the list */ + ifi = &Adapter->DhclientInfo; + } else { + /* We've lost our link so out we go */ + RemoveEntryList(&Adapter->ListEntry); + free(Adapter); + } + + continue; + } + Adapter = (DHCP_ADAPTER*) calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 ); - if( Adapter && Table->table[i].dwType == MIB_IF_TYPE_ETHERNET ) { + if( Adapter && Table->table[i].dwType == MIB_IF_TYPE_ETHERNET && InterfaceConnected(Table->table[i])) { memcpy( &Adapter->IfMib, &Table->table[i], sizeof(Adapter->IfMib) ); Adapter->DhclientInfo.client = &Adapter->DhclientState; @@ -287,6 +318,9 @@ if( PrepareAdapterForService( Adapter ) ) { Adapter->DhclientInfo.next = ifi; ifi = &Adapter->DhclientInfo; + + read_client_conf(&Adapter->DhclientInfo); + InsertTailList( &AdapterList, &Adapter->ListEntry ); } else { free( Adapter ); Adapter = 0; } } else { free( Adapter ); Adapter = 0; } Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Fri Jul 24 23:06:20 2009 @@ -129,8 +129,6 @@ int main(int argc, char *argv[]) { - int i = 0; - PDHCP_ADAPTER Adapter; ApiInit(); AdapterInit(); PipeInit(); @@ -144,31 +142,6 @@ inaddr_any.s_addr = INADDR_ANY; DH_DbgPrint(MID_TRACE,("DHCP Service Started\n")); - - for (Adapter = AdapterGetFirst(); - Adapter != NULL; - Adapter = AdapterGetNext(Adapter)) - { - read_client_conf(&Adapter->DhclientInfo); - - if (!interface_link_status(Adapter->DhclientInfo.name)) { - DH_DbgPrint(MID_TRACE,("%s: no link ", Adapter->DhclientInfo.name)); - Sleep(1000); - while (!interface_link_status(Adapter->DhclientInfo.name)) { - DH_DbgPrint(MID_TRACE,(".")); - if (++i > 10) { - DH_DbgPrint(MID_TRACE,("Giving up for now on adapter [%s]\n", Adapter->DhclientInfo.name)); - } - Sleep(1000); - } - DH_DbgPrint(MID_TRACE,("Got link on [%s]\n", Adapter->DhclientInfo.name)); - } - - DH_DbgPrint(MID_TRACE,("Discover Interfaces\n")); - - /* set up the interface */ - discover_interfaces(&Adapter->DhclientInfo); - } bootp_packet_handler = do_packet; @@ -611,8 +584,6 @@ else warning("Could not find adapter for info %p\n", ip); set_name_servers( Adapter, new_lease ); - - reinitialize_interfaces(); } /* @@ -1102,7 +1073,6 @@ note("bound: immediate renewal."); state_bound(ip); } - reinitialize_interfaces(); return; } Modified: trunk/reactos/base/services/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dispatc… ============================================================================== --- trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] Fri Jul 24 23:06:20 2009 @@ -50,39 +50,9 @@ struct protocol *protocols = NULL; struct timeout *timeouts = NULL; static struct timeout *free_timeouts = NULL; -static int interfaces_invalidated = FALSE; void (*bootp_packet_handler)(struct interface_info *, struct dhcp_packet *, int, unsigned int, struct iaddr, struct hardware *); - -static int interface_status(struct interface_info *ifinfo); - -/* - * Use getifaddrs() to get a list of all the attached interfaces. For - * each interface that's of type INET and not the loopback interface, - * register that interface with the network I/O software, figure out - * what subnet it's on, and add it to the list of interfaces. - */ -void -discover_interfaces(struct interface_info *iface) -{ - PDHCP_ADAPTER Adapter = AdapterFindInfo( iface ); - - if_register_receive(iface); - if_register_send(iface); - - if( Adapter->DhclientState.state != S_STATIC ) { - add_protocol(iface->name, iface->rfdesc, got_one, iface); - iface->client->state = S_INIT; - state_reboot(iface); - } -} - -void -reinitialize_interfaces(void) -{ - interfaces_invalidated = 1; -} /* * Wait for packets to come in using poll(). When a packet comes in, @@ -93,18 +63,13 @@ void dispatch(void) { - int count, i, to_msec, nfds = 0; + int count, i, to_msec, nfds; struct protocol *l; fd_set fds; time_t howlong, cur_time; struct timeval timeval; ApiLock(); - - for (l = protocols; l; l = l->next) - nfds++; - - FD_ZERO(&fds); do { /* @@ -112,6 +77,13 @@ * a timeout registered, time out the select call then. */ another: + AdapterDiscover(); + + for (l = protocols, nfds = 0; l; l = l->next) + nfds++; + + FD_ZERO(&fds); + time(&cur_time); if (timeouts) { @@ -201,12 +173,9 @@ !ip->dead)) { DH_DbgPrint(MID_TRACE,("Handling %x\n", l)); (*(l->handler))(l); - if (interfaces_invalidated) - break; } i++; } - interfaces_invalidated = 0; } } while (1); @@ -236,16 +205,18 @@ warning("receive_packet failed on %s: %s", ip->name, strerror(errno)); ip->errors++; - if ((!interface_status(ip)) || - (ip->noifmedia && ip->errors > 20)) { + if (ip->errors > 20) { /* our interface has gone away. */ warning("Interface %s no longer appears valid.", ip->name); ip->dead = 1; - interfaces_invalidated = 1; close(l->fd); remove_protocol(l); - free(ip); + adapter = AdapterFindInfo(ip); + if (adapter) { + RemoveEntryList(&adapter->ListEntry); + free(adapter); + } } return; } @@ -269,75 +240,6 @@ from.sin_port, ifrom, &hfrom); } } - -#if 0 -int -interface_status(struct interface_info *ifinfo) -{ - char *ifname = ifinfo->name; - int ifsock = ifinfo->rfdesc; - struct ifreq ifr; - struct ifmediareq ifmr; - - /* get interface flags */ - memset(&ifr, 0, sizeof(ifr)); - strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(ifsock, SIOCGIFFLAGS, &ifr) < 0) { - syslog(LOG_ERR, "ioctl(SIOCGIFFLAGS) on %s: %m", ifname); - goto inactive; - } - - /* - * if one of UP and RUNNING flags is dropped, - * the interface is not active. - */ - if ((ifr.ifr_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) - goto inactive; - - /* Next, check carrier on the interface, if possible */ - if (ifinfo->noifmedia) - goto active; - memset(&ifmr, 0, sizeof(ifmr)); - strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name)); - if (ioctl(ifsock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { - if (errno != EINVAL) { - syslog(LOG_DEBUG, "ioctl(SIOCGIFMEDIA) on %s: %m", - ifname); - - ifinfo->noifmedia = 1; - goto active; - } - /* - * EINVAL (or ENOTTY) simply means that the interface - * does not support the SIOCGIFMEDIA ioctl. We regard it alive. - */ - ifinfo->noifmedia = 1; - goto active; - } - if (ifmr.ifm_status & IFM_AVALID) { - switch (ifmr.ifm_active & IFM_NMASK) { - case IFM_ETHER: - if (ifmr.ifm_status & IFM_ACTIVE) - goto active; - else - goto inactive; - break; - default: - goto inactive; - } - } -inactive: - return (0); -active: - return (1); -} -#else -int -interface_status(struct interface_info *ifinfo) -{ - return (1); -} -#endif void add_timeout(time_t when, void (*where)(void *), void *what) Modified: trunk/reactos/base/services/dhcp/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] Fri Jul 24 23:06:20 2009 @@ -73,6 +73,7 @@ #define srandom srand void AdapterInit(VOID); +void AdapterDiscover(VOID); HANDLE PipeInit(VOID); extern PDHCP_ADAPTER AdapterGetFirst(); extern PDHCP_ADAPTER AdapterGetNext(PDHCP_ADAPTER);

1 0

[fireball] 42181: - Implement desktop_close_handle. It is the second place in winstation.c which directly relies on ETHREAD's internal members for enumerating threads of a process. Should be reimplemented in a more compatible way, but so far it works in ReactOS and Windows 2003. - Sticked // FIXME where appropriate.
by fireball＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: fireball Date: Fri Jul 24 23:00:17 2009 New Revision: 42181 URL: http://svn.reactos.org/svn/reactos?rev=42181&view=rev Log: - Implement desktop_close_handle. It is the second place in winstation.c which directly relies on ETHREAD's internal members for enumerating threads of a process. Should be reimplemented in a more compatible way, but so far it works in ReactOS and Windows 2003. - Sticked // FIXME where appropriate. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] Fri Jul 24 23:00:17 2009 @@ -249,18 +249,45 @@ static int desktop_close_handle( struct object *obj, PPROCESSINFO process, obj_handle_t handle ) { -#if 0 - struct thread *thread; + PLIST_ENTRY ListHead, Entry; + PETHREAD FoundThread = NULL; + PTHREADINFO ThreadInfo; /* check if the handle is currently used by the process or one of its threads */ if (process->desktop == handle) return 0; - LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) - if (thread->desktop == handle) return 0; + + // FIXME: This code relies on ETHREAD internals! + + /* Lock the process */ + KeEnterCriticalRegion(); + ExfAcquirePushLockShared(&process->peProcess->ProcessLock); + + Entry = process->peProcess->ThreadListHead.Flink; + + ListHead = &process->peProcess->ThreadListHead; + while (ListHead != Entry) + { + /* Get the Thread */ + FoundThread = CONTAINING_RECORD(Entry, ETHREAD, ThreadListEntry); + ThreadInfo = PsGetThreadWin32Thread(FoundThread); + if (ThreadInfo && ThreadInfo->desktop == handle) + { + /* Unlock the process */ + ExfReleasePushLockShared(&process->peProcess->ProcessLock); + KeLeaveCriticalRegion(); + + return 0; + } + + /* Go to the next thread */ + Entry = Entry->Flink; + } + + /* Unlock the process */ + ExfReleasePushLockShared(&process->peProcess->ProcessLock); + KeLeaveCriticalRegion(); + return 1; -#else - UNIMPLEMENTED; - return 1; -#endif } static void desktop_destroy( struct object *obj ) @@ -306,6 +333,8 @@ if (!(old_desktop = get_desktop_obj( process, process->desktop, 0 ))) clear_error(); process->desktop = handle; + + // FIXME: This code relies on ETHREAD internals! /* Lock the process */ KeEnterCriticalRegion();

1 0

[cgutman] 42180: - Implement OID_GEN_HARDWARE_STATUS
by cgutman＠svn.reactos.org 24 Jul '09

24 Jul '09

Author: cgutman Date: Fri Jul 24 22:49:39 2009 New Revision: 42180 URL: http://svn.reactos.org/svn/reactos?rev=42180&view=rev Log: - Implement OID_GEN_HARDWARE_STATUS Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Fri Jul 24 22:49:39 2009 @@ -139,8 +139,7 @@ case OID_GEN_HARDWARE_STATUS: { - /* TODO: implement this... */ - GenericULONG = (ULONG)NdisHardwareStatusReady; + GenericULONG = (ULONG)((Adapter->MediaState == NdisMediaStateConnected) ? NdisHardwareStatusReady : NdisHardwareStatusNotReady); break; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs