Ros-diffs January 2015

ros-diffs@reactos.org

17 participants
207 discussions

[jimtabor] 66085: [Win32ss] - Fix window from point so it handles disabled windows correctly. - Cleanup processing mouse routine. - See CORE-7447.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jan 25 15:57:22 2015 New Revision: 66085 URL: http://svn.reactos.org/svn/reactos?rev=66085&view=rev Log: [Win32ss] - Fix window from point so it handles disabled windows correctly. - Cleanup processing mouse routine. - See CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sun Jan 25 15:57:22 2015 @@ -61,7 +61,9 @@ continue; } - if ((pWnd->style & WS_VISIBLE) && IntPtInWindow(pWnd, x, y)) + if ((pWnd->style & WS_VISIBLE) && + (pWnd->ExStyle & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) == 0 && + IntPtInWindow(pWnd, x, y)) return pWnd; } @@ -1476,18 +1478,17 @@ MOUSEHOOKSTRUCT hook; BOOL eatMsg = FALSE; - PWND pwndMsg, pwndDesktop, pwndOrig; + PWND pwndMsg, pwndDesktop; PUSER_MESSAGE_QUEUE MessageQueue; PTHREADINFO pti; PSYSTEM_CURSORINFO CurInfo; PDESKTOP pDesk; - DECLARE_RETURN(BOOL); pti = PsGetCurrentThreadWin32Thread(); pwndDesktop = UserGetDesktopWindow(); MessageQueue = pti->MessageQueue; CurInfo = IntGetSysCursorInfo(); - pwndOrig = pwndMsg = ValidateHwndNoErr(msg->hwnd); + pwndMsg = ValidateHwndNoErr(msg->hwnd); clk_msg = MessageQueue->msgDblClk; pDesk = pwndDesktop->head.rpdesk; @@ -1496,7 +1497,6 @@ { hittest = HTCLIENT; pwndMsg = MessageQueue->spwndCapture; - if (pwndMsg) UserReferenceObject(pwndMsg); } else { @@ -1504,18 +1504,6 @@ Start with null window. See wine win.c:test_mouse_input:WM_COMMAND tests. */ pwndMsg = co_WinPosWindowFromPoint( NULL, &msg->pt, &hittest, FALSE); - // - // CORE-6129, Override if a diabled window, it might have a visible popup. - // - if ( pwndOrig && pwndOrig->style & WS_DISABLED ) - { - if ( hittest == (USHORT)HTERROR ) - { - if (pwndMsg) UserReferenceObject(pwndMsg); - pwndMsg = pwndOrig; - UserReferenceObject(pwndMsg); - } - } } TRACE("Got mouse message for %p, hittest: 0x%x\n", msg->hwnd, hittest); @@ -1525,7 +1513,7 @@ { /* Remove and ignore the message */ *RemoveMessages = TRUE; - RETURN(FALSE); + return FALSE; } if ( MessageQueue == gpqCursor ) // Cursor must use the same Queue! @@ -1600,7 +1588,7 @@ if (!((first == 0 && last == 0) || (message >= first || message <= last))) { TRACE("Message out of range!!!\n"); - RETURN(FALSE); + return FALSE; } /* update static double click conditions */ @@ -1611,7 +1599,7 @@ if (!((first == 0 && last == 0) || (message >= first || message <= last))) { TRACE("Message out of range!!!\n"); - RETURN(FALSE); + return FALSE; } // Update mouse move down keys. @@ -1621,7 +1609,7 @@ } } - if(gspv.bMouseClickLock) + if (gspv.bMouseClickLock) { BOOL IsClkLck = FALSE; @@ -1649,11 +1637,11 @@ /* Remove and ignore the message */ *RemoveMessages = TRUE; TRACE("Remove and ignore the message\n"); - RETURN(FALSE); + return FALSE; } } - /* message is accepted now (but may still get dropped) */ + /* message is accepted now (but still get dropped) */ event.message = msg->message; event.time = msg->time; @@ -1679,23 +1667,23 @@ /* Remove and skip message */ *RemoveMessages = TRUE; - RETURN(FALSE); + return FALSE; } if ((hittest == (USHORT)HTERROR) || (hittest == (USHORT)HTNOWHERE)) { co_IntSendMessage( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message )); - ERR("HT errors!\n"); + /* Remove and skip message */ *RemoveMessages = TRUE; - RETURN(FALSE); + return FALSE; } if ((*RemoveMessages == FALSE) || MessageQueue->spwndCapture) { /* Accept the message */ msg->message = message; - RETURN(TRUE); + return TRUE; } if ((msg->message == WM_LBUTTONDOWN) || @@ -1753,13 +1741,7 @@ co_IntSendMessage( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message )); msg->message = message; - RETURN(!eatMsg); - -CLEANUP: - if(pwndMsg) - UserDereferenceObject(pwndMsg); - - END_CLEANUP; + return !eatMsg; } BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages) Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Sun Jan 25 15:57:22 2015 @@ -2417,29 +2417,41 @@ IN BOOL Ignore ) { - PWND pwndChild; HWND *List, *phWnd; - + PWND pwndChild = NULL; + + /* not visible */ if (!(ScopeWin->style & WS_VISIBLE)) { return NULL; } + /* not in window or in window region */ + if (!IntPtInWindow(ScopeWin, Point->x, Point->y)) + { + return NULL; + } + + /* transparent */ + if ((ScopeWin->ExStyle & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) == (WS_EX_LAYERED|WS_EX_TRANSPARENT)) + { + return NULL; + } + if (!Ignore && (ScopeWin->style & WS_DISABLED)) - { + { /* disabled child */ + if ((ScopeWin->style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return NULL; + /* process the hit error */ *HitTest = HTERROR; - return NULL; - } - - if (!IntPtInWindow(ScopeWin, Point->x, Point->y)) - { - return NULL; - } - - UserReferenceObject(ScopeWin); - - if (RECTL_bPointInRect(&ScopeWin->rcClient, Point->x, Point->y)) - { + return ScopeWin; + } + + /* not minimized and check if point is inside the window */ + if (!(ScopeWin->style & WS_MINIMIZE) && + RECTL_bPointInRect(&ScopeWin->rcClient, Point->x, Point->y) ) + { + UserReferenceObject(ScopeWin); + List = IntWinListChildren(ScopeWin); if (List) { @@ -2462,6 +2474,7 @@ } ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } + UserDereferenceObject(ScopeWin); } if (ScopeWin->head.pti == PsGetCurrentThreadWin32Thread()) @@ -2470,20 +2483,23 @@ if ((*HitTest) == (USHORT)HTTRANSPARENT) { - UserDereferenceObject(ScopeWin); return NULL; } } else { - if (*HitTest == HTNOWHERE) *HitTest = HTCLIENT; + if (*HitTest == HTNOWHERE && pwndChild == NULL) *HitTest = HTCLIENT; } return ScopeWin; } PWND APIENTRY -co_WinPosWindowFromPoint(IN PWND ScopeWin, IN POINT *WinPoint, IN OUT USHORT* HitTest, IN BOOL Ignore) +co_WinPosWindowFromPoint( + IN PWND ScopeWin, + IN POINT *WinPoint, + IN OUT USHORT* HitTest, + IN BOOL Ignore) { PWND Window; POINT Point = *WinPoint; @@ -3433,7 +3449,6 @@ RETURN( NULL); CLEANUP: - if (Window) UserDereferenceObject(Window); if (DesktopWindow) UserDerefObjectCo(DesktopWindow); TRACE("Leave NtUserWindowFromPoint, ret=%p\n", _ret_);

9 years, 7 months

[tfaber] 66084: [WIN32K:NTUSER] - Do not use pwndChild uninitialized in co_WinPosSearchChildren

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jan 25 15:26:13 2015 New Revision: 66084 URL: http://svn.reactos.org/svn/reactos?rev=66084&view=rev Log: [WIN32K:NTUSER] - Do not use pwndChild uninitialized in co_WinPosSearchChildren Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Sun Jan 25 15:26:13 2015 @@ -2438,10 +2438,10 @@ UserReferenceObject(ScopeWin); - if ( RECTL_bPointInRect(&ScopeWin->rcClient, Point->x, Point->y) ) + if (RECTL_bPointInRect(&ScopeWin->rcClient, Point->x, Point->y)) { List = IntWinListChildren(ScopeWin); - if(List) + if (List) { for (phWnd = List; *phWnd; ++phWnd) { @@ -2452,7 +2452,7 @@ pwndChild = co_WinPosSearchChildren(pwndChild, Point, HitTest, Ignore); - if(pwndChild != NULL) + if (pwndChild != NULL) { /* We found a window. Don't send any more WM_NCHITTEST messages */ ExFreePoolWithTag(List, USERTAG_WINDOWLIST); @@ -2476,7 +2476,7 @@ } else { - if (*HitTest == HTNOWHERE && pwndChild == NULL) *HitTest = HTCLIENT; + if (*HitTest == HTNOWHERE) *HitTest = HTCLIENT; } return ScopeWin;

9 years, 7 months

[hbelusca] 66083: [CDMAKE] - Disable unused dir_hash_next_dir function and corresponding target_dir_traversal structure definition. - Be really sure de->head and de->child are initialized at NULL. ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 24 00:15:08 2015 New Revision: 66083 URL: http://svn.reactos.org/svn/reactos?rev=66083&view=rev Log: [CDMAKE] - Disable unused dir_hash_next_dir function and corresponding target_dir_traversal structure definition. - Be really sure de->head and de->child are initialized at NULL. - Remove extra parentheses and unused variable. Modified: trunk/reactos/tools/cdmake/dirhash.c trunk/reactos/tools/cdmake/dirhash.h Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Sat Jan 24 00:15:08 2015 @@ -138,12 +138,14 @@ hashcode = djb_hash(targetnorm); de = calloc(1, sizeof(*de)); de->parent = parent_de; + de->head = NULL; + de->child = NULL; de->normalized_name = strdup(targetnorm); de->case_name = strdup(chop_filename(casename)); de->next = parent_de->child; parent_de->child = de; ent = &dh->buckets[hashcode % NUM_DIR_HASH_BUCKETS]; - while ((*ent)) + while (*ent) { ent = &(*ent)->next; } @@ -170,6 +172,7 @@ tf->target_name = strdup(chop_filename(target)); } +#if 0 static struct target_dir_entry * dir_hash_next_dir(struct target_dir_hash *dh, struct target_dir_traversal *t) { @@ -200,13 +203,13 @@ return t->it; } } +#endif static void dir_hash_destroy_dir(struct target_dir_hash *dh, struct target_dir_entry *de) { struct target_file *tf; struct target_dir_entry *te; - unsigned int hashcode; while ((te = de->child)) { de->child = te->next; Modified: trunk/reactos/tools/cdmake/dirhash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.h?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] Sat Jan 24 00:15:08 2015 @@ -26,11 +26,13 @@ struct target_dir_entry root; }; +#if 0 struct target_dir_traversal { struct target_dir_entry *it; int i; }; +#endif void normalize_dirname(char *filename); void dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target);

9 years, 7 months

[hbelusca] 66082: [DOSMBR] - tab --> 4-spaces. - add some Uppercases at the beginning of sentences...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 23 22:21:09 2015 New Revision: 66082 URL: http://svn.reactos.org/svn/reactos?rev=66082&view=rev Log: [DOSMBR] - tab --> 4-spaces. - add some Uppercases at the beginning of sentences... Modified: trunk/reactos/boot/freeldr/bootsect/dosmbr.S trunk/reactos/boot/freeldr/bootsect/dosmbr.asm Modified: trunk/reactos/boot/freeldr/bootsect/dosmbr.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/dosm… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/dosmbr.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/dosmbr.S [iso-8859-1] Fri Jan 23 22:21:09 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Bootsector for ISO file system * PURPOSE: Normal DOS boot sector - * Ported to nasm from FreeDOS fdisk 1.2.0 by: + * Ported to NASM from FreeDOS fdisk 1.2.0 by: * PROGRAMMERS: Casper Hornstrup (chorns(a)users.sourceforge.net) */ @@ -58,7 +58,7 @@ /*****************************************************************/ call print - .asciz "no active partition found" + .asciz "No active partition found" WAIT_FOR_REBOOT: jmp WAIT_FOR_REBOOT @@ -67,22 +67,22 @@ /*****************************************************************/ trouble_reading_drive: call print - .asciz "read error while reading drive" + .asciz "Read error while reading drive" jmp WAIT_FOR_REBOOT /*****************************************************************/ invalid_partition_code: call print - .asciz "partition signature != 55AA" + .asciz "Partition signature != 55AA" jmp WAIT_FOR_REBOOT /*****************************************************************/ active_partition_found: -// call print -// .asciz "loading active partition" +// call print +// .asciz "Loading active partition" call read_boot_sector @@ -135,16 +135,16 @@ LBABios: // copy start address of partition to DAP - mov ax, [di + 8] - mov word ptr ds:[_bios_LBA_low], ax - mov ax,[di + 8 + 2] - mov word ptr ds:[_bios_LBA_high], ax + mov ax, [di + 8] + mov word ptr ds:[_bios_LBA_low], ax + mov ax,[di + 8 + 2] + mov word ptr ds:[_bios_LBA_high], ax mov ax, HEX(4200) // regs.a.x = LBA_READ; mov si, offset _bios_LBA_address_packet // regs.si = FP_OFF(&dap); - int HEX(13) - ret + int HEX(13) + ret /***************************************************************** * read disk, using standard BIOS @@ -153,15 +153,15 @@ mov ax, HEX(0204) // regs.a.x = 0x0201; mov bx, HEX(7c00) // regs.b.x = FP_OFF(buffer); - /* regs.c.x = + /* regs.c.x = ((chs.Cylinder & 0xff) << 8) + ((chs.Cylinder & 0x300) >> 2) + ; chs.Sector; that was easy ;-) */ - mov cx, word ptr ds:[di + 2] + mov cx, word ptr ds:[di + 2] mov dh, byte ptr ds:[di + 1] // regs.d.b.h = chs.Head; // regs.es = FP_SEG(buffer); - int HEX(13) - ret + int HEX(13) + ret /****** PRINT * prints text after call to this function. Modified: trunk/reactos/boot/freeldr/bootsect/dosmbr.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/dosm… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/dosmbr.asm [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/dosmbr.asm [iso-8859-1] Fri Jan 23 22:21:09 2015 @@ -1,7 +1,7 @@ ; -; normal DOS boot sector +; Normal DOS boot sector ; -; Ported to nasm from FreeDOS fdisk 1.2.0 by: +; Ported to NASM from FreeDOS fdisk 1.2.0 by: ; Casper Hornstrup (chorns(a)users.sourceforge.net) ; @@ -53,7 +53,7 @@ ;***************************************************************** call print - db 'no active partition found',0 + db 'No active partition found',0 WAIT_FOR_REBOOT: jmp $ @@ -62,14 +62,14 @@ ;***************************************************************** trouble_reading_drive: call print - db 'read error while reading drive',0 + db 'Read error while reading drive',0 jmp WAIT_FOR_REBOOT ;***************************************************************** invalid_partition_code: call print - db 'partition signature != 55AA',0 + db 'Partition signature != 55AA',0 jmp WAIT_FOR_REBOOT @@ -78,7 +78,7 @@ active_partition_found: ; call print -; db 'loading active partition',0 +; db 'Loading active partition',0 call read_boot_sector

9 years, 7 months

[hbelusca] 66081: [HYBRIDCD]: It appears we need to manually create the default_user/desktop folder to not fail (as we do for the real livecd).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 23 22:19:33 2015 New Revision: 66081 URL: http://svn.reactos.org/svn/reactos?rev=66081&view=rev Log: [HYBRIDCD]: It appears we need to manually create the default_user/desktop folder to not fail (as we do for the real livecd). Modified: trunk/reactos/boot/CMakeLists.txt Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=66… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Fri Jan 23 22:19:33 2015 @@ -26,8 +26,8 @@ VERBATIM) ##hybridcd -#clear it out -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "") +#clear it out and create the empty Desktop folder +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop\n") add_custom_target(hybridcd COMMAND native-cdmake -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin @${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst REACTOS ${REACTOS_BINARY_DIR}/hybridcd.iso

9 years, 7 months

[hbelusca] 66080: [CDMAKE] - llmosrt.c --> llmsort.c as it should be named. - Remove useless free(...) calls and a temp variable.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 23 21:38:15 2015 New Revision: 66080 URL: http://svn.reactos.org/svn/reactos?rev=66080&view=rev Log: [CDMAKE] - llmosrt.c --> llmsort.c as it should be named. - Remove useless free(...) calls and a temp variable. Added: trunk/reactos/tools/cdmake/llmsort.c - copied unchanged from r66079, trunk/reactos/tools/cdmake/llmosrt.c Removed: trunk/reactos/tools/cdmake/llmosrt.c Modified: trunk/reactos/tools/cdmake/CMakeLists.txt trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/cdmake/dirhash.c Modified: trunk/reactos/tools/cdmake/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/CMakeLists.tx… ============================================================================== --- trunk/reactos/tools/cdmake/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/CMakeLists.txt [iso-8859-1] Fri Jan 23 21:38:15 2015 @@ -1,2 +1,2 @@ -add_executable(cdmake cdmake.c dirhash.c llmosrt.c) +add_executable(cdmake cdmake.c dirhash.c llmsort.c) Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Fri Jan 23 21:38:15 2015 @@ -653,7 +653,7 @@ { PDIR_RECORD d; - d = calloc(1, sizeof(DIR_RECORD)); + d = calloc(1, sizeof(*d)); if (d == NULL) error_exit("Insufficient memory"); d->next_in_memory = root.next_in_memory; @@ -687,7 +687,7 @@ char *n; */ - d = calloc(1, sizeof(DIR_RECORD)); + d = calloc(1, sizeof(*d)); if (d == NULL) error_exit("Insufficient memory"); d->next_in_memory = root.next_in_memory; Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Fri Jan 23 21:38:15 2015 @@ -39,7 +39,6 @@ last_slash = strrchr(name, '\\'); if (!last_slash) { - free(*dirname); *dirname = malloc(1); **dirname = 0; } @@ -48,7 +47,6 @@ char *newdata = malloc(last_slash - name + 1); memcpy(newdata, name, last_slash - name); newdata[last_slash - name] = 0; - free(*dirname); *dirname = newdata; } } @@ -157,7 +155,6 @@ { struct target_file *tf; struct target_dir_entry *de; - const char *filename = chop_filename(target); char *targetdir = NULL; char *targetnorm; chop_dirname(target, &targetdir); @@ -170,7 +167,7 @@ tf->next = de->head; de->head = tf; tf->source_name = strdup(source); - tf->target_name = strdup(filename); + tf->target_name = strdup(chop_filename(target)); } static struct target_dir_entry * Removed: trunk/reactos/tools/cdmake/llmosrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/llmosrt.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/llmosrt.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/llmosrt.c (removed) @@ -1,105 +0,0 @@ -/* A Linked-List Memory Sort - by Philip J. Erdelsky - pje(a)acm.org - http://www.alumni.caltech.edu/~pje/ -*/ - -/* According to his website, this file was released into the public domain by Phillip J. Erdelsky */ - - -#include <stdio.h> - -void *sort_linked_list(void *p, unsigned index, int (*compare)(void *, void *)) -{ - unsigned base; - unsigned long block_size; - - struct record - { - struct record *next[1]; - /* other members not directly accessed by this function */ - }; - - struct tape - { - struct record *first, *last; - unsigned long count; - } tape[4]; - - /* Distribute the records alternately to tape[0] and tape[1]. */ - - tape[0].count = tape[1].count = 0L; - tape[0].first = NULL; - base = 0; - while (p != NULL) - { - struct record *next = ((struct record *)p)->next[index]; - ((struct record *)p)->next[index] = tape[base].first; - tape[base].first = ((struct record *)p); - tape[base].count++; - p = next; - base ^= 1; - } - - /* If the list is empty or contains only a single record, then */ - /* tape[1].count == 0L and this part is vacuous. */ - - for (base = 0, block_size = 1L; tape[base+1].count != 0L; - base ^= 2, block_size <<= 1) - { - int dest; - struct tape *tape0, *tape1; - tape0 = tape + base; - tape1 = tape + base + 1; - dest = base ^ 2; - tape[dest].count = tape[dest+1].count = 0; - for (; tape0->count != 0; dest ^= 1) - { - unsigned long n0, n1; - struct tape *output_tape = tape + dest; - n0 = n1 = block_size; - while (1) - { - struct record *chosen_record; - struct tape *chosen_tape; - if (n0 == 0 || tape0->count == 0) - { - if (n1 == 0 || tape1->count == 0) - break; - chosen_tape = tape1; - n1--; - } - else if (n1 == 0 || tape1->count == 0) - { - chosen_tape = tape0; - n0--; - } - else if ((*compare)(tape0->first, tape1->first) > 0) - { - chosen_tape = tape1; - n1--; - } - else - { - chosen_tape = tape0; - n0--; - } - chosen_tape->count--; - chosen_record = chosen_tape->first; - chosen_tape->first = chosen_record->next[index]; - if (output_tape->count == 0) - output_tape->first = chosen_record; - else - output_tape->last->next[index] = chosen_record; - output_tape->last = chosen_record; - output_tape->count++; - } - } - } - - if (tape[base].count > 1L) - tape[base].last->next[index] = NULL; - return tape[base].first; -} - -/* EOF */

9 years, 7 months

[hbelusca] 66079: Branch for the upcoming FOSDEM 2015 release.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 23 00:01:42 2015 New Revision: 66079 URL: http://svn.reactos.org/svn/reactos?rev=66079&view=rev Log: Branch for the upcoming FOSDEM 2015 release. Added: branches/ReactOS-0.3.17-FOSDEM2015/ - copied from r66078, trunk/

9 years, 7 months

[jimtabor] 66078: [Win32ss] - Plugging in the real fix for CORE-6129! - Works like it should, but CMD properties window gets active when it should not. See CORE-6651.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jan 22 23:31:22 2015 New Revision: 66078 URL: http://svn.reactos.org/svn/reactos?rev=66078&view=rev Log: [Win32ss] - Plugging in the real fix for CORE-6129! - Works like it should, but CMD properties window gets active when it should not. See CORE-6651. Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/ntuser/winpos.h Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Thu Jan 22 23:31:22 2015 @@ -754,6 +754,29 @@ return(Hook ? 1 : 0); // Don't call us again from user space. } +#if 0 // Keep it for later! +PWND FASTCALL +co_IntFindChildWindowToOwner(PWND Root, PWND Owner) +{ + PWND Ret; + PWND Child, OwnerWnd; + + for(Child = Root->spwndChild; Child; Child = Child->spwndNext) + { + OwnerWnd = Child->spwndOwner; + if(!OwnerWnd) + continue; + + if(OwnerWnd == Owner) + { + Ret = Child; + return Ret; + } + } + return NULL; +} +#endif + VOID FASTCALL DefWndPrint( PWND pwnd, HDC hdc, ULONG uFlags) { /* Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu Jan 22 23:31:22 2015 @@ -1466,27 +1466,6 @@ } } -PWND FASTCALL -co_IntFindChildWindowToOwner(PWND Root, PWND Owner) -{ - PWND Ret; - PWND Child, OwnerWnd; - - for(Child = Root->spwndChild; Child; Child = Child->spwndNext) - { - OwnerWnd = Child->spwndOwner; - if(!OwnerWnd) - continue; - - if(OwnerWnd == Owner) - { - Ret = Child; - return Ret; - } - } - return NULL; -} - BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT last) { MSG clk_msg; @@ -1497,7 +1476,7 @@ MOUSEHOOKSTRUCT hook; BOOL eatMsg = FALSE; - PWND pwndMsg, pwndDesktop, pwndPopUP; + PWND pwndMsg, pwndDesktop, pwndOrig; PUSER_MESSAGE_QUEUE MessageQueue; PTHREADINFO pti; PSYSTEM_CURSORINFO CurInfo; @@ -1508,7 +1487,7 @@ pwndDesktop = UserGetDesktopWindow(); MessageQueue = pti->MessageQueue; CurInfo = IntGetSysCursorInfo(); - pwndPopUP = pwndMsg = ValidateHwndNoErr(msg->hwnd); + pwndOrig = pwndMsg = ValidateHwndNoErr(msg->hwnd); clk_msg = MessageQueue->msgDblClk; pDesk = pwndDesktop->head.rpdesk; @@ -1526,23 +1505,14 @@ */ pwndMsg = co_WinPosWindowFromPoint( NULL, &msg->pt, &hittest, FALSE); // - // CORE-6129, Override if a diabled window with a visible popup was selected. + // CORE-6129, Override if a diabled window, it might have a visible popup. // - if (pwndPopUP && pwndPopUP->style & WS_DISABLED) + if ( pwndOrig && pwndOrig->style & WS_DISABLED ) { - TRACE("window disabled\n"); - pwndPopUP = co_IntFindChildWindowToOwner(UserGetDesktopWindow(), pwndPopUP); - if ( pwndPopUP && - pwndPopUP->style & WS_POPUP && - pwndPopUP->style & WS_VISIBLE && - (pwndPopUP->head.pti->MessageQueue != gpqForeground || - pwndPopUP->head.pti->MessageQueue->spwndActive != pwndPopUP) && - //pwndPopUP != pwndPopUP->head.rpdesk->pDeskInfo->spwndShell needs testing. - pwndPopUP != ValidateHwndNoErr(InputWindowStation->ShellWindow) ) + if ( hittest == (USHORT)HTERROR ) { - TRACE("Found Popup!\n"); - UserDereferenceObject(pwndMsg); - pwndMsg = pwndPopUP; + if (pwndMsg) UserReferenceObject(pwndMsg); + pwndMsg = pwndOrig; UserReferenceObject(pwndMsg); } } @@ -1571,6 +1541,7 @@ pt = msg->pt; message = msg->message; + /* Note: windows has no concept of a non-client wheel message */ if (message != WM_MOUSEWHEEL) { @@ -1711,11 +1682,10 @@ RETURN(FALSE); } - if ((hittest == HTERROR) || (hittest == HTNOWHERE)) - { - co_IntSendMessage( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, - MAKELONG( hittest, msg->message )); - + if ((hittest == (USHORT)HTERROR) || (hittest == (USHORT)HTNOWHERE)) + { + co_IntSendMessage( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message )); + ERR("HT errors!\n"); /* Remove and skip message */ *RemoveMessages = TRUE; RETURN(FALSE); @@ -1745,6 +1715,8 @@ { PWND pwndTop = pwndMsg; pwndTop = IntGetNonChildAncestor(pwndTop); + + TRACE("Mouse pti %p pwndMsg pti %p pwndTop pti %p\n",MessageQueue->ptiMouse,pwndMsg->head.pti,pwndTop->head.pti); if (pwndTop && pwndTop != pwndDesktop) { Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Thu Jan 22 23:31:22 2015 @@ -349,7 +349,6 @@ { WndTo = Wnd->head.pti->MessageQueue->spwndActivePrev; if (can_activate_window( WndTo )) goto done; - } // Find any window to bring to top. Works Okay for wine since it does not see X11 windows. @@ -2410,13 +2409,12 @@ return(WasVisible); } -static -PWND FASTCALL +static PWND co_WinPosSearchChildren( - PWND ScopeWin, - POINT *Point, - USHORT *HitTest, - BOOL Ignore + IN PWND ScopeWin, + IN POINT *Point, + IN OUT USHORT *HitTest, + IN BOOL Ignore ) { PWND pwndChild; @@ -2429,6 +2427,7 @@ if (!Ignore && (ScopeWin->style & WS_DISABLED)) { + *HitTest = HTERROR; return NULL; } @@ -2467,8 +2466,8 @@ if (ScopeWin->head.pti == PsGetCurrentThreadWin32Thread()) { - *HitTest = (USHORT)co_IntSendMessage(ScopeWin->head.h, WM_NCHITTEST, 0, - MAKELONG(Point->x, Point->y)); + *HitTest = (USHORT)co_IntSendMessage(ScopeWin->head.h, WM_NCHITTEST, 0, MAKELONG(Point->x, Point->y)); + if ((*HitTest) == (USHORT)HTTRANSPARENT) { UserDereferenceObject(ScopeWin); @@ -2476,13 +2475,15 @@ } } else - *HitTest = HTCLIENT; + { + if (*HitTest == HTNOWHERE && pwndChild == NULL) *HitTest = HTCLIENT; + } return ScopeWin; } -PWND FASTCALL -co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest, BOOL Ignore) +PWND APIENTRY +co_WinPosWindowFromPoint(IN PWND ScopeWin, IN POINT *WinPoint, IN OUT USHORT* HitTest, IN BOOL Ignore) { PWND Window; POINT Point = *WinPoint; Modified: trunk/reactos/win32ss/user/ntuser/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] Thu Jan 22 23:31:22 2015 @@ -52,7 +52,7 @@ BOOLEAN FASTCALL co_WinPosSetWindowPos(PWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx, INT cy, UINT flags); BOOLEAN FASTCALL co_WinPosShowWindow(PWND Window, INT Cmd); void FASTCALL co_WinPosSendSizeMove(PWND Window); -PWND FASTCALL co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest, BOOL Ignore); +PWND APIENTRY co_WinPosWindowFromPoint(IN PWND ScopeWin, IN POINT *WinPoint, IN OUT USHORT* HitTest, IN BOOL Ignore); VOID FASTCALL co_WinPosActivateOtherWindow(PWND); PWND FASTCALL IntRealChildWindowFromPoint(PWND,LONG,LONG); BOOL FASTCALL IntScreenToClient(PWND,LPPOINT);

9 years, 7 months

[hbelusca] 66077: [WALLPAPER] Remove now unneeded RBuild file.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jan 22 22:29:48 2015 New Revision: 66077 URL: http://svn.reactos.org/svn/reactos?rev=66077&view=rev Log: [WALLPAPER] Remove now unneeded RBuild file. Removed: trunk/wallpaper/directory.rbuild Removed: trunk/wallpaper/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/directory.rbuild?rev=660… ============================================================================== --- trunk/wallpaper/directory.rbuild [iso-8859-1] (original) +++ trunk/wallpaper/directory.rbuild (removed) @@ -1,3 +0,0 @@ -<group> - <installfile>Angelus_02_ROSWP.bmp</installfile> -</group>

9 years, 7 months

[akhaldi] 66076: [DBGHELP] Restrict the Clang workaround in r64203. Fixes CORE-9084. Many thanks to David Quintana and The Arty for their help. Dedicated to Jim ; )

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 22 21:13:57 2015 New Revision: 66076 URL: http://svn.reactos.org/svn/reactos?rev=66076&view=rev Log: [DBGHELP] Restrict the Clang workaround in r64203. Fixes CORE-9084. Many thanks to David Quintana and The Arty for their help. Dedicated to Jim ;) Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] Thu Jan 22 21:13:57 2015 @@ -2381,7 +2381,7 @@ } if (dwarf2_find_attribute(&ctx, di, DW_AT_stmt_list, &stmt_list)) { -#ifdef __REACTOS__ +#if defined(__REACTOS__) && defined(__clang__) unsigned long stmt_list_val = stmt_list.u.uvalue; if (stmt_list_val > module->module.BaseOfImage) {

9 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2015