Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 23 Jan '15

23 Jan '15

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

1 0

[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 23 Jan '15

23 Jan '15

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 */

1 0

[hbelusca] 66079: Branch for the upcoming FOSDEM 2015 release.
by hbelusca＠svn.reactos.org 23 Jan '15

23 Jan '15

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/

1 0

[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 22 Jan '15

22 Jan '15

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);

1 0

[hbelusca] 66077: [WALLPAPER] Remove now unneeded RBuild file.
by hbelusca＠svn.reactos.org 22 Jan '15

22 Jan '15

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>

1 0

[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 22 Jan '15

22 Jan '15

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) {

1 0

[tkreuzer] 66075: [WIN32K] Fix broken ASSERTs CORE-8938 #resolve
by tkreuzer＠svn.reactos.org 22 Jan '15

22 Jan '15

Author: tkreuzer Date: Thu Jan 22 21:03:46 2015 New Revision: 66075 URL: http://svn.reactos.org/svn/reactos?rev=66075&view=rev Log: [WIN32K] Fix broken ASSERTs CORE-8938 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Thu Jan 22 21:03:46 2015 @@ -459,7 +459,7 @@ DC_vUpdateDC(PDC pdc) { // PREGION VisRgn ; - PPDEVOBJ ppdev = pdc->ppdev ; + PPDEVOBJ ppdev = pdc->ppdev; pdc->dhpdev = ppdev->dhpdev; Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu Jan 22 21:03:46 2015 @@ -737,8 +737,8 @@ lpr = &rgnSrc->Buffer[i]; /* Make sure the source rect is not retarded */ - ASSERT(lpr->bottom > rect->top); - ASSERT(lpr->right > rect->left); + ASSERT(lpr->bottom > lpr->top); + ASSERT(lpr->right > lpr->left); /* We already checked above, this should hold true */ ASSERT(lpr->bottom > rect->top); @@ -749,15 +749,15 @@ { rpr = &rgnDst->Buffer[j]; - /* Crop the rect with the intersect rect and add offset */ + /* Crop the rect with the intersect rect */ rpr->top = max(lpr->top, rect->top); rpr->bottom = min(lpr->bottom, rect->bottom); rpr->left = max(lpr->left, rect->left); rpr->right = min(lpr->right, rect->right); /* Make sure the resulting rect is not retarded */ - ASSERT(lpr->bottom > rect->top); - ASSERT(lpr->right > rect->left); + ASSERT(rpr->bottom > rpr->top); + ASSERT(rpr->right > rpr->left); /* Track new bounds */ if (rpr->left < left) left = rpr->left;

1 0

[jimtabor] 66074: [NtUser] - Finally fix ATI tests. Break through while testing User32:win.c:test_window_from_point. See CORE-6551. - If any trouble, please create a new Jira report.
by jimtabor＠svn.reactos.org 21 Jan '15

21 Jan '15

Author: jimtabor Date: Wed Jan 21 23:15:28 2015 New Revision: 66074 URL: http://svn.reactos.org/svn/reactos?rev=66074&view=rev Log: [NtUser] - Finally fix ATI tests. Break through while testing User32:win.c:test_window_from_point. See CORE-6551. - If any trouble, please create a new Jira report. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Wed Jan 21 23:15:28 2015 @@ -150,7 +150,7 @@ HWND *phwndTopLevel, *phwndCurrent; PWND pwndCurrent, pwndDesktop; - pwndDesktop = UserGetDesktopWindow(); + pwndDesktop = co_GetDesktopWindow(Window);//UserGetDesktopWindow(); if (Window->spwndParent == pwndDesktop ) { phwndTopLevel = IntWinListChildren(pwndDesktop); @@ -168,8 +168,9 @@ ExFreePool(phwndTopLevel); } } - } - //// + //// + } + OldTID = WindowPrev ? IntGetWndThreadId(WindowPrev) : NULL; NewTID = Window ? IntGetWndThreadId(Window) : NULL; ptiOld = WindowPrev ? WindowPrev->head.pti : NULL; @@ -245,10 +246,10 @@ (WPARAM)(Window == (gpqForeground ? gpqForeground->spwndActive : NULL)), 0); //(LPARAM)hWndPrev); - co_IntSendMessageNoWait( UserHMGetHandle(Window), - WM_ACTIVATE, - MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, Window->style & WS_MINIMIZE), - (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); + co_IntSendMessage( UserHMGetHandle(Window), + WM_ACTIVATE, + MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, Window->style & WS_MINIMIZE), + (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); if (Window->spwndParent == UserGetDesktopWindow() && Window->spwndOwner == NULL && @@ -528,7 +529,7 @@ else { //ERR("Activate Not same PQ and WQ and Wnd.\n"); - co_IntSendMessageNoWait(hWnd, WM_ASYNC_SETACTIVEWINDOW, (WPARAM)Wnd, (LPARAM)MouseActivate ); + co_IntSendMessage(hWnd, WM_ASYNC_SETACTIVEWINDOW, (WPARAM)Wnd, (LPARAM)MouseActivate ); Ret = TRUE; } return Ret && fgRet; Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Wed Jan 21 23:15:28 2015 @@ -1111,7 +1111,7 @@ if ( ptiCur ) { if (!Window || - Window->head.pti->MessageQueue == ptiCur->MessageQueue ) + Window->head.pti == ptiCur ) { return NULL; }

1 0

[hbelusca] 66073: [REACTOS] HybridCD: Move the livecd.iso file into the livecd directory.
by hbelusca＠svn.reactos.org 21 Jan '15

21 Jan '15

Author: hbelusca Date: Wed Jan 21 22:24:47 2015 New Revision: 66073 URL: http://svn.reactos.org/svn/reactos?rev=66073&view=rev Log: [REACTOS] HybridCD: Move the livecd.iso file into the livecd directory. Modified: trunk/reactos/boot/bootdata/hybridcd.ini trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/bootdata/hybridcd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hybridcd.ini… ============================================================================== --- trunk/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] Wed Jan 21 22:24:47 2015 @@ -61,14 +61,14 @@ [LiveCD_RamDisk] BootType=Windows2003 SystemPath=ramdisk(0)\reactos -Options=/MININT /RDPATH=livecd.iso /RDEXPORTASCD +Options=/MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD [LiveCD_RamDisk_Debug] BootType=Windows2003 SystemPath=ramdisk(0)\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd.iso /RDEXPORTASCD +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD [LiveCD_RamDisk_Screen] BootType=Windows2003 SystemPath=ramdisk(0)\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd.iso /RDEXPORTASCD +Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Wed Jan 21 22:24:47 2015 @@ -419,7 +419,7 @@ add_cd_file( FILE ${CMAKE_CURRENT_BINARY_DIR}/livecd.iso - DESTINATION root + DESTINATION livecd FOR hybridcd) get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST)

1 0

[akhaldi] 66072: [TCPIP_DRVTEST] Temporarily fix build.
by akhaldi＠svn.reactos.org 21 Jan '15

21 Jan '15

Author: akhaldi Date: Wed Jan 21 18:38:26 2015 New Revision: 66072 URL: http://svn.reactos.org/svn/reactos?rev=66072&view=rev Log: [TCPIP_DRVTEST] Temporarily fix build. Modified: trunk/rostests/drivers/tcpip/tcp_info.c Modified: trunk/rostests/drivers/tcpip/tcp_info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/tcp_info.c?… ============================================================================== --- trunk/rostests/drivers/tcpip/tcp_info.c [iso-8859-1] (original) +++ trunk/rostests/drivers/tcpip/tcp_info.c [iso-8859-1] Wed Jan 21 18:38:26 2015 @@ -14,6 +14,10 @@ #include <tdiinfo.h> #include <iptypes.h> #include <winsock.h> + +/* FIXME */ +#define AT_MIB_ADDRXLAT_INFO_ID 1 +#define AT_MIB_ADDRXLAT_ENTRY_ID 0x101 /* Route info */ typedef struct IPRouteEntry {

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