Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 43543: Add some structure offset macros to asm.h for amd64
by tkreuzer＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: tkreuzer Date: Sat Oct 17 22:19:42 2009 New Revision: 43543 URL: http://svn.reactos.org/svn/reactos?rev=43543&view=rev Log: Add some structure offset macros to asm.h for amd64 Modified: trunk/reactos/include/ndk/amd64/asm.h Modified: trunk/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/asm.h?re… ============================================================================== --- trunk/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/asm.h [iso-8859-1] Sat Oct 17 22:19:42 2009 @@ -49,6 +49,15 @@ #define KTHREAD_INITIAL_STACK 0x28 #define KTHREAD_STACK_LIMIT 0x30 #define KTHREAD_WAIT_IRQL 0x156 +#define KTHREAD_TEB 0x0B0+0x10 +#define KTHREAD_KERNEL_STACK 0x038 +#define KTHREAD_NPX_STATE 0x85 +#define KTHREAD_SERVICE_TABLE 0x1E8 +#define KTHREAD_PREVIOUS_MODE 0x137 +#define KTHREAD_TRAP_FRAME 0x1D8 +#define KTHREAD_CALLBACK_STACK 0x1E0 +#define KTHREAD_APCSTATE_PROCESS 0x068 +#define KPROCESS_DIRECTORY_TABLE_BASE 0x028 // // KPRCB Offsets

1 0

[sginsberg] 43542: - Fix msvc build broken in 43466 -- please stop hurting msvc, it just wants to be loved (and wants __declspec placed first).
by sginsberg＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: sginsberg Date: Sat Oct 17 22:01:58 2009 New Revision: 43542 URL: http://svn.reactos.org/svn/reactos?rev=43542&view=rev Log: - Fix msvc build broken in 43466 -- please stop hurting msvc, it just wants to be loved (and wants __declspec placed first). Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=43542&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Oct 17 22:01:58 2009 @@ -151,7 +151,7 @@ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ - FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS] DECLSPEC_ALIGN(8); /* Free lists */ + DECLSPEC_ALIGN(8) FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ DWORD flags; /* Heap flags */ DWORD magic; /* Magic number */ PRTL_HEAP_COMMIT_ROUTINE commitRoutine;

1 0

[cwittich] 43541: sync dialog to wine 1.1.31 (fixes one dialog winetest)
by cwittich＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: cwittich Date: Sat Oct 17 22:00:54 2009 New Revision: 43541 URL: http://svn.reactos.org/svn/reactos?rev=43541&view=rev Log: sync dialog to wine 1.1.31 (fixes one dialog winetest) Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sat Oct 17 22:00:54 2009 @@ -181,10 +181,11 @@ if (hOwner) hOwner = GetAncestor( hOwner, GA_ROOT ); if (!hOwner) return; - EnableWindow( hOwner, TRUE ); -} - - /*********************************************************************** + EnableWindow( hOwner, TRUE ); +} + + +/*********************************************************************** * DIALOG_DisableOwner * * Helper function for modal dialogs to disable the @@ -205,7 +206,7 @@ return FALSE; } - /*********************************************************************** +/*********************************************************************** * DIALOG_GetControl32 * * Return the class and text of the control pointed to by ptr, @@ -303,10 +304,11 @@ p++; /* Next control is on dword boundary */ - return (const WORD *)((((int)p) + 3) & ~3); -} - - /*********************************************************************** + return (const WORD *)(((UINT_PTR)p + 3) & ~3); +} + + +/*********************************************************************** * DIALOG_CreateControls32 * * Create the control windows for a dialog. @@ -645,9 +647,9 @@ /* Get the font name */ result->pointSize = 0; + result->faceName = NULL; result->weight = FW_DONTCARE; result->italic = FALSE; - result->faceName = NULL; if (result->style & DS_SETFONT) { @@ -660,18 +662,18 @@ */ if (result->pointSize == 0x7fff) { - /* We could call SystemParametersInfo here, but then we'd have - * to convert from pixel size to point size (which can be - * imprecise). - */ + /* We could call SystemParametersInfo here, but then we'd have + * to convert from pixel size to point size (which can be + * imprecise). + */ TRACE(" FONT: Using message box font\n"); } else { if (result->dialogEx) { - result->weight = GET_WORD(p); p++; - result->italic = LOBYTE(GET_WORD(p)); p++; + result->weight = GET_WORD(p); p++; + result->italic = LOBYTE(GET_WORD(p)); p++; } result->faceName = (LPCWSTR)p; p += wcslen( result->faceName ) + 1; @@ -726,7 +728,7 @@ /* If no saved focus control exists, set focus to the first visible, non-disabled, WS_TABSTOP control in the dialog */ infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); - if (!IsWindow( infoPtr->hwndFocus )) return; + if (!IsWindow( infoPtr->hwndFocus )) return; } DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); @@ -783,20 +785,19 @@ ncMetrics.cbSize = sizeof(NONCLIENTMETRICSW); if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncMetrics, 0)) - { - hUserFont = CreateFontIndirectW( &ncMetrics.lfMessageFont ); - } - } - else - { - /* We convert the size to pixels and then make it -ve. This works - * for both +ve and -ve template.pointSize */ - int pixels; - pixels = MulDiv(template.pointSize, GetDeviceCaps(dc , LOGPIXELSY), 72); - hUserFont = CreateFontW( -pixels, 0, 0, 0, template.weight, - template.italic, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, - PROOF_QUALITY, FF_DONTCARE, - template.faceName ); + { + hUserFont = CreateFontIndirectW( &ncMetrics.lfMessageFont ); + } + } + else + { + /* We convert the size to pixels and then make it -ve. This works + * for both +ve and -ve template.pointSize */ + int pixels = MulDiv(template.pointSize, GetDeviceCaps(dc , LOGPIXELSY), 72); + hUserFont = CreateFontW( -pixels, 0, 0, 0, template.weight, + template.italic, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, + PROOF_QUALITY, FF_DONTCARE, + template.faceName ); } if (hUserFont) @@ -840,7 +841,7 @@ { HMONITOR monitor = 0; MONITORINFO mon_info; - + mon_info.cbSize = sizeof(mon_info); if (template.style & DS_CENTER) { @@ -947,7 +948,7 @@ dlgInfo->hMenu = hMenu; dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = 0; + dlgInfo->idResult = IDOK; dlgInfo->flags = flags; /* dlgInfo->hDialogHeap = 0; */ @@ -993,6 +994,7 @@ if( IsWindow(hwnd) ) DestroyWindow( hwnd ); return 0; } + /*********************************************************************** * DEFDLG_FindDefButton

1 0

[fireball] 43540: - It was really too early to remove PatBlt and BitBlt. Get them back for now, since they are still supported.
by fireball＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: fireball Date: Sat Oct 17 21:47:26 2009 New Revision: 43540 URL: http://svn.reactos.org/svn/reactos?rev=43540&view=rev Log: - It was really too early to remove PatBlt and BitBlt. Get them back for now, since they are still supported. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sat Oct 17 21:47:26 2009 @@ -40,7 +40,6 @@ return FALSE; } -#if 0 BOOL CDECL RosDrv_BitBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT width, INT height, NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, DWORD rop ) @@ -76,7 +75,6 @@ return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, physDevSrc->hKernelDC, xSrc, ySrc, rop); } -#endif int CDECL RosDrv_ChoosePixelFormat(NTDRV_PDEVICE *physDev, const PIXELFORMATDESCRIPTOR *ppfd) @@ -398,6 +396,29 @@ return FALSE; } +BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) +{ + POINT pts[2], ptBrush; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = left + width; + pts[1].y = top + height; + + LPtoDP(physDev->hUserDC, pts, 2); + width = pts[1].x - pts[0].x; + height = pts[1].y - pts[0].y; + left = pts[0].x; + top = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + + return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); +} + BOOL CDECL RosDrv_Pie( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -752,16 +773,8 @@ GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); - if (!physDevSrc) - { - /* This is PatBlt */ - return RosGdiPatBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, rop); - } - else - { - return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, - physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); - } + return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, + physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); } BOOL CDECL RosDrv_SwapBuffers(NTDRV_PDEVICE *physDev) Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec [iso-8859-1] Sat Oct 17 21:47:26 2009 @@ -2,6 +2,7 @@ @ cdecl AlphaBlend(ptr long long long long ptr long long long long long) RosDrv_AlphaBlend @ cdecl Arc(ptr long long long long long long long long) RosDrv_Arc +@ cdecl BitBlt(ptr long long long long ptr long long long) RosDrv_BitBlt @ cdecl ChoosePixelFormat(ptr ptr) RosDrv_ChoosePixelFormat @ cdecl Chord(ptr long long long long long long long long) RosDrv_Chord @ cdecl CreateBitmap(ptr long ptr) RosDrv_CreateBitmap @@ -30,6 +31,7 @@ @ cdecl GetTextMetrics(ptr ptr) RosDrv_GetTextMetrics @ cdecl LineTo(ptr long long) RosDrv_LineTo @ cdecl PaintRgn(ptr long) RosDrv_PaintRgn +@ cdecl PatBlt(ptr long long long long long) RosDrv_PatBlt @ cdecl Pie(ptr long long long long long long long long) RosDrv_Pie @ cdecl PolyPolygon(ptr ptr ptr long) RosDrv_PolyPolygon @ cdecl PolyPolyline(ptr ptr ptr long) RosDrv_PolyPolyline

1 0

[cwittich] 43539: sync edit to wine 1.1.31
by cwittich＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: cwittich Date: Sat Oct 17 21:35:42 2009 New Revision: 43539 URL: http://svn.reactos.org/svn/reactos?rev=43539&view=rev Log: sync edit to wine 1.1.31 Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sat Oct 17 21:35:42 2009 @@ -164,6 +164,7 @@ (LPARAM)(es->hwndSelf)); \ } while(0) + /********************************************************************* * * EM_CANUNDO @@ -1225,7 +1226,7 @@ { WARN("edit hwnd %p already destroyed\n", es->hwndSelf); return; - } + } if (!es->lock_count) { ERR("lock_count == 0 ... please report\n"); @@ -3676,8 +3677,8 @@ } break; case VK_ESCAPE: - if (!(es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) - PostMessageW(es->hwndParent, WM_CLOSE, 0, 0); + if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) + PostMessageW(es->hwndParent, WM_CLOSE, 0, 0); break; case VK_TAB: if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) @@ -4601,8 +4602,8 @@ * WM_XXX messages before WM_NCCREATE is completed. */ - es->is_unicode = unicode; - es->style = lpcs->style; + es->is_unicode = unicode; + es->style = lpcs->style; es->bEnableState = !(es->style & WS_DISABLED); @@ -4670,7 +4671,7 @@ * If WS_BORDER without WS_EX_CLIENTEDGE is specified we shouldn't have * a nonclient area and we should handle painting the border ourselves. * - * When making modifications please ensure that the code still works + * When making modifications please ensure that the code still works * for edit controls created directly with style 0x50800000, exStyle 0 * (which should have a single pixel border) */ @@ -4691,7 +4692,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name) { RECT clientRect; - + TRACE("%s\n", debugstr_w(name)); /* * To initialize some final structure members, we call some helper @@ -4701,7 +4702,7 @@ */ EDIT_WM_SetFont(es, 0, FALSE); EDIT_EM_EmptyUndoBuffer(es); - + /* We need to calculate the format rect (applications may send EM_SETMARGINS before the control gets visible) */ GetClientRect(es->hwndSelf, &clientRect); @@ -4803,7 +4804,7 @@ LRESULT result = 0; TRACE("hwnd=%p msg=%x (%s) wparam=%lx lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); - + if (!es && msg != WM_NCCREATE) return DefWindowProcT(hwnd, msg, wParam, lParam, unicode); @@ -5121,6 +5122,9 @@ case EM_SETREADONLY16: #endif case EM_SETREADONLY: + { + DWORD old_style = es->style; + if (wParam) { SetWindowLongPtrW( hwnd, GWL_STYLE, GetWindowLongPtrW( hwnd, GWL_STYLE ) | ES_READONLY ); @@ -5130,8 +5134,13 @@ GetWindowLongPtrW( hwnd, GWL_STYLE ) & ~ES_READONLY ); es->style &= ~ES_READONLY; } - result = 1; - break; + + if (old_style ^ es->style) + InvalidateRect(es->hwndSelf, NULL, TRUE); + + result = 1; + break; + } #ifndef __REACTOS__ case EM_SETWORDBREAKPROC16: @@ -5208,7 +5217,7 @@ case WM_GETDLGCODE: result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS; - + if (es->style & ES_MULTILINE) result |= DLGC_WANTALLKEYS; @@ -5483,12 +5492,12 @@ case WM_IME_CONTROL: break; - + default: result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); break; } - + if (es) EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result);

1 0

[tkreuzer] 43538: disable ROS_LONG64 hack for amd64
by tkreuzer＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: tkreuzer Date: Sat Oct 17 21:19:22 2009 New Revision: 43538 URL: http://svn.reactos.org/svn/reactos?rev=43538&view=rev Log: disable ROS_LONG64 hack for amd64 Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Oct 17 21:19:22 2009 @@ -106,7 +106,7 @@ #endif typedef char CHAR; typedef short SHORT; -#ifndef __ROS_LONG64__ +#if !defined(__ROS_LONG64__) || defined(_M_AMD64) typedef long LONG; #else typedef int LONG; @@ -3278,8 +3278,8 @@ ULONGLONG Alignment; struct { SLIST_ENTRY Next; - WORD Depth; - WORD Sequence; + USHORT Depth; + USHORT Sequence; } DUMMYSTRUCTNAME; } SLIST_HEADER, *PSLIST_HEADER; #endif

1 0

[tkreuzer] 43537: Merge 41030 from amd64 branch
by tkreuzer＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: tkreuzer Date: Sat Oct 17 21:16:01 2009 New Revision: 43537 URL: http://svn.reactos.org/svn/reactos?rev=43537&view=rev Log: Merge 41030 from amd64 branch Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4353… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat Oct 17 21:16:01 2009 @@ -573,7 +573,7 @@ #define PSLIST_ENTRY PSINGLE_LIST_ENTRY #if defined(_WIN64) -typedef union _SLIST_HEADER { +typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER { struct { ULONGLONG Alignment; ULONGLONG Region; Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Oct 17 21:16:01 2009 @@ -3239,20 +3239,53 @@ struct _SINGLE_LIST_ENTRY *Next; } SINGLE_LIST_ENTRY,*PSINGLE_LIST_ENTRY; +// +// Slist Header +// #ifndef _SLIST_HEADER_ #define _SLIST_HEADER_ + #define SLIST_ENTRY SINGLE_LIST_ENTRY #define _SLIST_ENTRY _SINGLE_LIST_ENTRY #define PSLIST_ENTRY PSINGLE_LIST_ENTRY + +#if defined(_WIN64) +typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER { + struct { + ULONGLONG Alignment; + ULONGLONG Region; + } DUMMYSTRUCTNAME; + struct { + ULONGLONG Depth:16; + ULONGLONG Sequence:9; + ULONGLONG NextEntry:39; + ULONGLONG HeaderType:1; + ULONGLONG Init:1; + ULONGLONG Reserved:59; + ULONGLONG Region:3; + } Header8; + struct { + ULONGLONG Depth:16; + ULONGLONG Sequence:48; + ULONGLONG HeaderType:1; + ULONGLONG Init:1; + ULONGLONG Reserved:2; + ULONGLONG NextEntry:60; + } Header16; +} SLIST_HEADER, *PSLIST_HEADER; +#else typedef union _SLIST_HEADER { - ULONGLONG Alignment; - _ANONYMOUS_STRUCT struct { - SLIST_ENTRY Next; - WORD Depth; - WORD Sequence; - } DUMMYSTRUCTNAME; -} SLIST_HEADER,*PSLIST_HEADER; -#endif /* !_SLIST_HEADER_ */ + ULONGLONG Alignment; + struct { + SLIST_ENTRY Next; + WORD Depth; + WORD Sequence; + } DUMMYSTRUCTNAME; +} SLIST_HEADER, *PSLIST_HEADER; +#endif + +#endif /* _SLIST_HEADER_ */ + NTSYSAPI VOID

1 0

[cwittich] 43536: [Shell32]: in shell view, use the expected value for the effect in Drag & Drop operation patch by <eric dot pouech at orange dot fr>
by cwittich＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: cwittich Date: Sat Oct 17 21:15:04 2009 New Revision: 43536 URL: http://svn.reactos.org/svn/reactos?rev=43536&view=rev Log: [Shell32]: in shell view, use the expected value for the effect in Drag & Drop operation patch by <eric dot pouech at orange dot fr> Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Sat Oct 17 21:15:04 2009 @@ -1450,8 +1450,8 @@ if (pds) { - DWORD dwEffect; - DoDragDrop(pda, pds, dwEffect, &dwEffect); + DWORD dwEffect2; + DoDragDrop(pda, pds, dwEffect, &dwEffect2); } IDataObject_Release(pda); }

1 0

[fireball] 43535: - Properly remove mouse pointer.
by fireball＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: fireball Date: Sat Oct 17 20:53:14 2009 New Revision: 43535 URL: http://svn.reactos.org/svn/reactos?rev=43535&view=rev Log: - Properly remove mouse pointer. Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c [iso-8859-1] Sat Oct 17 20:53:14 2009 @@ -114,6 +114,13 @@ ICONINFO IconInfo; NTSTATUS Status = STATUS_SUCCESS; + /* Special case for removing a pointer */ + if (!IconInfoUnsafe) + { + GreSetCursor(NULL, &CursorInfo); + return; + } + _SEH2_TRY { ProbeForRead(IconInfoUnsafe, sizeof(ICONINFO), 1);

1 0

[tkreuzer] 43534: build kdcom for amd64, too
by tkreuzer＠svn.reactos.org 17 Oct '09

17 Oct '09

Author: tkreuzer Date: Sat Oct 17 18:34:07 2009 New Revision: 43534 URL: http://svn.reactos.org/svn/reactos?rev=43534&view=rev Log: build kdcom for amd64, too Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] Sat Oct 17 18:34:07 2009 @@ -16,4 +16,9 @@ <file>kdbg.c</file> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="i386"> + <file>kdbg.c</file> + </directory> + </if> </module>

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