Ros-diffs

ros-diffs@reactos.org

81390 discussions

[bfreisen] 45113: [Paint] Initial support for free selections, resizing selections and experimental selection transparency
by bfreisen＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: bfreisen Date: Sun Jan 17 00:21:45 2010 New Revision: 45113 URL: http://svn.reactos.org/svn/reactos?rev=45113&view=rev Log: [Paint] Initial support for free selections, resizing selections and experimental selection transparency Modified: trunk/reactos/base/applications/paint/globalvar.h trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/mouse.c trunk/reactos/base/applications/paint/selection.c trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/gl… ============================================================================== --- trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] Sun Jan 17 00:21:45 2010 @@ -43,6 +43,7 @@ extern HWND hSelection; extern HWND hImageArea; extern HBITMAP hSelBm; +extern HBITMAP hSelMask; extern int palColors[28]; Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Sun Jan 17 00:21:45 2010 @@ -60,6 +60,7 @@ HWND hSelection; HWND hImageArea; HBITMAP hSelBm; +HBITMAP hSelMask; /* initial palette colors; may be changed by the user during execution */ int palColors[28] = { 0x000000, 0x464646, 0x787878, 0x300099, 0x241ced, 0x0078ff, 0x0ec2ff, Modified: trunk/reactos/base/applications/paint/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/mo… ============================================================================== --- trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/mouse.c [iso-8859-1] Sun Jan 17 00:21:45 2010 @@ -27,6 +27,8 @@ POINT pointStack[256]; short pointSP; +POINT *ptStack = NULL; +int ptSP = 0; void startPaintingL(HDC hdc, short x, short y, int fg, int bg) @@ -38,15 +40,25 @@ switch (activeTool) { case 1: + ShowWindow(hSelection, SW_HIDE); + if (ptStack != NULL) + HeapFree(GetProcessHeap(), 0, ptStack); + ptStack = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(POINT) * 1024); + ptSP = 0; + ptStack[0].x = x; + ptStack[0].y = y; + break; case 10: case 11: case 13: case 15: case 16: newReversible(); + break; case 2: newReversible(); ShowWindow(hSelection, SW_HIDE); + rectSel_src[2] = rectSel_src[3] = 0; break; case 3: newReversible(); @@ -96,6 +108,17 @@ { switch (activeTool) { + case 1: + if (ptSP == 0) + newReversible(); + ptSP++; + if (ptSP % 1024 == 0) + ptStack = HeapReAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, ptStack, sizeof(POINT) * (ptSP + 1024)); + ptStack[ptSP].x = max(0, min(x, imgXRes)); + ptStack[ptSP].y = max(0, min(y, imgYRes)); + resetToU1(); + Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE); + break; case 2: { short tempX; @@ -174,6 +197,56 @@ { switch (activeTool) { + case 1: + { + POINT *ptStackCopy; + int i; + rectSel_src[0] = rectSel_src[1] = 0x7fffffff; + rectSel_src[2] = rectSel_src[3] = 0; + for (i = 0; i <= ptSP; i++) + { + if (ptStack[i].x < rectSel_src[0]) + rectSel_src[0] = ptStack[i].x; + if (ptStack[i].y < rectSel_src[1]) + rectSel_src[1] = ptStack[i].y; + if (ptStack[i].x > rectSel_src[2]) + rectSel_src[2] = ptStack[i].x; + if (ptStack[i].y > rectSel_src[3]) + rectSel_src[3] = ptStack[i].y; + } + rectSel_src[2] += 1 - rectSel_src[0]; + rectSel_src[3] += 1 - rectSel_src[1]; + rectSel_dest[0] = rectSel_src[0]; + rectSel_dest[1] = rectSel_src[1]; + rectSel_dest[2] = rectSel_src[2]; + rectSel_dest[3] = rectSel_src[3]; + if (ptSP != 0) + { + DeleteObject(hSelMask); + hSelMask = CreateBitmap(rectSel_src[2], rectSel_src[3], 1, 1, NULL); + DeleteObject(SelectObject(hSelDC, hSelMask)); + ptStackCopy = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(POINT) * (ptSP + 1)); + for (i = 0; i <= ptSP; i++) + { + ptStackCopy[i].x = ptStack[i].x - rectSel_src[0]; + ptStackCopy[i].y = ptStack[i].y - rectSel_src[1]; + } + Poly(hSelDC, ptStackCopy, ptSP + 1, 0x00ffffff, 0x00ffffff, 1, 2, TRUE); + HeapFree(GetProcessHeap(), 0, ptStackCopy); + SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(rectSel_src[2], rectSel_src[3])); + resetToU1(); + MaskBlt(hSelDC, 0, 0, rectSel_src[2], rectSel_src[3], hDrawingDC, rectSel_src[0], + rectSel_src[1], hSelMask, 0, 0, MAKEROP4(SRCCOPY, WHITENESS)); + Poly(hdc, ptStack, ptSP + 1, bg, bg, 1, 2, TRUE); + newReversible(); + + placeSelWin(); + ShowWindow(hSelection, SW_SHOW); + } + HeapFree(GetProcessHeap(), 0, ptStack); + ptStack = NULL; + break; + } case 2: resetToU1(); if ((rectSel_src[2] != 0) && (rectSel_src[3] != 0)) @@ -181,8 +254,12 @@ DeleteObject(SelectObject (hSelDC, hSelBm = (HBITMAP) CreateDIBWithProperties(rectSel_src[2], rectSel_src[3]))); + DeleteObject(hSelMask); BitBlt(hSelDC, 0, 0, rectSel_src[2], rectSel_src[3], hDrawingDC, rectSel_src[0], rectSel_src[1], SRCCOPY); + Rect(hdc, rectSel_src[0], rectSel_src[1], rectSel_src[0] + rectSel_src[2], + rectSel_src[1] + rectSel_src[3], bgColor, bgColor, 0, TRUE); + newReversible(); placeSelWin(); ShowWindow(hSelection, SW_SHOW); } @@ -255,6 +332,7 @@ case 15: case 16: newReversible(); + break; case 3: newReversible(); Replace(hdc, x, y, x, y, fg, bg, rubberRadius); Modified: trunk/reactos/base/applications/paint/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/se… ============================================================================== --- trunk/reactos/base/applications/paint/selection.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/selection.c [iso-8859-1] Sun Jan 17 00:21:45 2010 @@ -13,12 +13,51 @@ #include "drawing.h" #include "history.h" #include "mouse.h" +#include "dib.h" /* FUNCTIONS ********************************************************/ +LPCTSTR cursors[9] = { IDC_SIZEALL, IDC_SIZENWSE, IDC_SIZENS, IDC_SIZENESW, + IDC_SIZEWE, IDC_SIZEWE, IDC_SIZENESW, IDC_SIZENS, IDC_SIZENWSE +}; + BOOL moving = FALSE; +int action = 0; short xPos; short yPos; +short xFrac; +short yFrac; + +int +identifyCorner(short x, short y, short w, short h) +{ + if (y < 3) + { + if (x < 3) + return 1; + if ((x < w / 2 + 2) && (x >= w / 2 - 1)) + return 2; + if (x >= w - 3) + return 3; + } + if ((y < h / 2 + 2) && (y >= h / 2 - 1)) + { + if (x < 3) + return 4; + if (x >= w - 3) + return 5; + } + if (y >= h - 3) + { + if (x < 3) + return 6; + if ((x < w / 2 + 2) && (x >= w / 2 - 1)) + return 7; + if (x >= w - 3) + return 8; + } + return 0; +} LRESULT CALLBACK SelectionWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -41,36 +80,140 @@ xPos = LOWORD(lParam); yPos = HIWORD(lParam); SetCapture(hwnd); + if (action != 0) + SetCursor(LoadCursor(NULL, cursors[action])); moving = TRUE; break; case WM_MOUSEMOVE: if (moving) { + int xDelta; + int yDelta; resetToU1(); - rectSel_dest[0] += (short)LOWORD(lParam) - xPos; - rectSel_dest[1] += (short)HIWORD(lParam) - yPos; - - Rect(hDrawingDC, rectSel_src[0], rectSel_src[1], rectSel_src[0] + rectSel_src[2], - rectSel_src[1] + rectSel_src[3], bgColor, bgColor, 0, TRUE); + xFrac += (short)LOWORD(lParam) - xPos; + yFrac += (short)HIWORD(lParam) - yPos; + if (zoom < 1000) + { + xDelta = xFrac * 1000 / zoom; + xFrac = 0; + yDelta = yFrac * 1000 / zoom; + yFrac = 0; + } + else + { + xDelta = xFrac * 1000 / zoom; + xFrac -= (xFrac * 1000 / zoom) * zoom / 1000; + yDelta = yFrac * 1000 / zoom; + yFrac -= (yFrac * 1000 / zoom) * zoom / 1000; + } + switch (action) + { + case 0: + rectSel_dest[0] += xDelta; + rectSel_dest[1] += yDelta; + break; + case 1: + rectSel_dest[0] += xDelta; + rectSel_dest[1] += yDelta; + rectSel_dest[2] -= xDelta; + rectSel_dest[3] -= yDelta; + break; + case 2: + rectSel_dest[1] += yDelta; + rectSel_dest[3] -= yDelta; + break; + case 3: + rectSel_dest[2] += xDelta; + rectSel_dest[1] += yDelta; + break; + case 4: + rectSel_dest[0] += xDelta; + rectSel_dest[2] -= xDelta; + break; + case 5: + rectSel_dest[2] += xDelta; + break; + case 6: + rectSel_dest[0] += xDelta; + rectSel_dest[2] -= xDelta; + rectSel_dest[3] += yDelta; + break; + case 7: + rectSel_dest[3] += yDelta; + break; + case 8: + rectSel_dest[2] += xDelta; + rectSel_dest[3] += yDelta; + break; + } + + if (action != 0) + StretchBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY); + else if (transpBg == 0) - BitBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], - hSelDC, 0, 0, SRCCOPY); + MaskBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], + hSelDC, 0, 0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); else - BitBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], - hSelDC, 0, 0, SRCAND); - //TransparentBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], - // hSelDC, 0, 0, rectSel_dest[2], rectSel_dest[3], bgColor); + { + HBITMAP tempMask; + HBRUSH oldBrush; + HDC tempDC; + tempMask = CreateBitmap(rectSel_dest[2], rectSel_dest[3], 1, 1, NULL); + oldBrush = SelectObject(hSelDC, CreateSolidBrush(bgColor)); + tempDC = CreateCompatibleDC(hSelDC); + SelectObject(tempDC, tempMask); + MaskBlt(tempDC, 0, 0, rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, hSelMask, 0, 0, + MAKEROP4(NOTSRCCOPY, BLACKNESS)); + DeleteDC(tempDC); + DeleteObject(SelectObject(hSelDC, oldBrush)); + + MaskBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], + hSelDC, 0, 0, tempMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); + DeleteObject(tempMask); + } SendMessage(hImageArea, WM_PAINT, 0, 0); xPos = LOWORD(lParam); yPos = HIWORD(lParam); //SendMessage(hwnd, WM_PAINT, 0, 0); } + else + { + int w = rectSel_dest[2] * zoom / 1000 + 6; + int h = rectSel_dest[3] * zoom / 1000 + 6; + xPos = LOWORD(lParam); + yPos = HIWORD(lParam); + action = identifyCorner(xPos, yPos, w, h); + if (action != 0) + SetCursor(LoadCursor(NULL, cursors[action])); + } break; case WM_LBUTTONUP: if (moving) { moving = FALSE; ReleaseCapture(); + if (action != 0) + { + HDC hTempDC; + HBITMAP hTempBm; + hTempDC = CreateCompatibleDC(hSelDC); + hTempBm = CreateDIBWithProperties(rectSel_dest[2], rectSel_dest[3]); + SelectObject(hTempDC, hTempBm); + SelectObject(hSelDC, hSelBm); + StretchBlt(hTempDC, 0, 0, rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, + GetDIBWidth(hSelBm), GetDIBHeight(hSelBm), SRCCOPY); + DeleteObject(hSelBm); + hSelBm = hTempBm; + hTempBm = CreateBitmap(rectSel_dest[2], rectSel_dest[3], 1, 1, NULL); + SelectObject(hTempDC, hTempBm); + SelectObject(hSelDC, hSelMask); + StretchBlt(hTempDC, 0, 0, rectSel_dest[2], rectSel_dest[3], hSelDC, 0, 0, + GetDIBWidth(hSelMask), GetDIBHeight(hSelMask), SRCCOPY); + DeleteObject(hSelMask); + hSelMask = hTempBm; + SelectObject(hSelDC, hSelBm); + DeleteDC(hTempDC); + } placeSelWin(); ShowWindow(hSelection, SW_HIDE); ShowWindow(hSelection, SW_SHOW); Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Sun Jan 17 00:21:45 2010 @@ -744,18 +744,15 @@ break; case IDM_EDITDELETESELECTION: { - /* FIXME: deleting freeform selections unsupported */ - RECT selectionRect, areaRect; - long x1, x2, y1, y2; - - GetWindowRect(hSelection, &selectionRect); - GetWindowRect(hImageArea, &areaRect); - x1 = ((selectionRect.left - areaRect.left) / (zoom / 1000)) + 1; - y1 = ((selectionRect.top - areaRect.top) / (zoom / 1000)) + 1; - x2 = (selectionRect.right - areaRect.left) / (zoom / 1000); - y2 = (selectionRect.bottom - areaRect.top) / (zoom / 1000); - Rect(hDrawingDC, x1, y1, x2, y2, bgColor, bgColor, 0, TRUE); - ShowWindow(hSelection, SW_HIDE); + /* remove selection window and already painted content using undo(), + paint Rect for rectangular selections and nothing for freeform selections */ + undo(); + if (activeTool == 2) + { + newReversible(); + Rect(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2] + rectSel_dest[0], + rectSel_dest[3] + rectSel_dest[1], bgColor, bgColor, 0, TRUE); + } break; } case IDM_EDITSELECTALL:

1 0

[tkreuzer] 45112: [KE] - Save extended xmm registers and in the ExceptionFrame - Restore registeres from the ExceptionFrame
by tkreuzer＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: tkreuzer Date: Sat Jan 16 20:21:37 2010 New Revision: 45112 URL: http://svn.reactos.org/svn/reactos?rev=45112&view=rev Log: [KE] - Save extended xmm registers and in the ExceptionFrame - Restore registeres from the ExceptionFrame Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Jan 16 20:21:37 2010 @@ -139,7 +139,7 @@ /* Save previous mode and swap gs when it was UserMode */ mov ax, [rbp + KTRAP_FRAME_SegCs] - and ax, 1 + and al, 1 mov [rbp + KTRAP_FRAME_PreviousMode], al jz 1f swapgs @@ -282,6 +282,16 @@ mov [rsp + KEXCEPTION_FRAME_R13], r13 mov [rsp + KEXCEPTION_FRAME_R14], r14 mov [rsp + KEXCEPTION_FRAME_R15], r15 + movdqa [rsp + KEXCEPTION_FRAME_Xmm6], xmm6 + movdqa [rsp + KEXCEPTION_FRAME_Xmm7], xmm7 + movdqa [rsp + KEXCEPTION_FRAME_Xmm8], xmm8 + movdqa [rsp + KEXCEPTION_FRAME_Xmm9], xmm9 + movdqa [rsp + KEXCEPTION_FRAME_Xmm10], xmm10 + movdqa [rsp + KEXCEPTION_FRAME_Xmm11], xmm11 + movdqa [rsp + KEXCEPTION_FRAME_Xmm12], xmm12 + movdqa [rsp + KEXCEPTION_FRAME_Xmm13], xmm13 + movdqa [rsp + KEXCEPTION_FRAME_Xmm14], xmm14 + movdqa [rsp + KEXCEPTION_FRAME_Xmm15], xmm15 mov qword ptr [rsp + KEXCEPTION_FRAME_Return], 0 /* Call KiDispatchException */ @@ -291,6 +301,22 @@ mov r9b, [r8 + KTRAP_FRAME_PreviousMode] // PreviousMode mov byte ptr [rsp + KEXCEPTION_FRAME_P5], 1 // FirstChance call _KiDispatchException + + /* Restore registers */ + mov r12, [rsp + KEXCEPTION_FRAME_R12] + mov r13, [rsp + KEXCEPTION_FRAME_R13] + mov r14, [rsp + KEXCEPTION_FRAME_R14] + mov r15, [rsp + KEXCEPTION_FRAME_R15] + movdqa xmm6, [rsp + KEXCEPTION_FRAME_Xmm6] + movdqa xmm7, [rsp + KEXCEPTION_FRAME_Xmm7] + movdqa xmm8, [rsp + KEXCEPTION_FRAME_Xmm8] + movdqa xmm9, [rsp + KEXCEPTION_FRAME_Xmm9] + movdqa xmm10, [rsp + KEXCEPTION_FRAME_Xmm10] + movdqa xmm11, [rsp + KEXCEPTION_FRAME_Xmm11] + movdqa xmm12, [rsp + KEXCEPTION_FRAME_Xmm12] + movdqa xmm13, [rsp + KEXCEPTION_FRAME_Xmm13] + movdqa xmm14, [rsp + KEXCEPTION_FRAME_Xmm14] + movdqa xmm15, [rsp + KEXCEPTION_FRAME_Xmm15] add rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME ret

1 0

[fireball] 45111: - Reduce differences to stock Wine code.
by fireball＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: fireball Date: Sat Jan 16 20:15:51 2010 New Revision: 45111 URL: http://svn.reactos.org/svn/reactos?rev=45111&view=rev Log: - Reduce differences to stock Wine code. Modified: branches/arwinss/reactos/dll/win32/gdi32/brush.c Modified: branches/arwinss/reactos/dll/win32/gdi32/brush.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/brush.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/brush.c [iso-8859-1] Sat Jan 16 20:15:51 2010 @@ -153,10 +153,8 @@ { if (ptr->logbrush.lbStyle == BS_PATTERN) DeleteObject( (HGDIOBJ)ptr->logbrush.lbHatch ); -#ifndef __REACTOS__ else if (ptr->logbrush.lbStyle == BS_DIBPATTERN) GlobalFree( (HGLOBAL)ptr->logbrush.lbHatch ); -#endif } HeapFree( GetProcessHeap(), 0, ptr ); return 0;

1 0

[spetreolle] 45110: silence wdmaud debug
by spetreolle＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: spetreolle Date: Sat Jan 16 19:54:31 2010 New Revision: 45110 URL: http://svn.reactos.org/svn/reactos?rev=45110&view=rev Log: silence wdmaud debug Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] Sat Jan 16 19:54:31 2010 @@ -5,6 +5,7 @@ <include base="wdmaud_kernel">.</include> <include base="mmixer">.</include> <include base="libsamplerate">.</include> + <define name="NDEBUG">1</define>   <library>mmebuddy</library>

1 0

[spetreolle] 45109: Assign rpcss to its actual group. Fixes rpcss/spooler load order.
by spetreolle＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: spetreolle Date: Sat Jan 16 19:44:17 2010 New Revision: 45109 URL: http://svn.reactos.org/svn/reactos?rev=45109&view=rev Log: Assign rpcss to its actual group. Fixes rpcss/spooler load order. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Jan 16 19:44:17 2010 @@ -861,6 +861,7 @@ "Video Save", \ "File System", \ "Event log", \ + "COM Infrastructure", \ "NDIS", \ "PNP_TDI", \ "TDI", \ @@ -1177,7 +1178,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","DisplayName",0x00000000,"Remote Procedure Call" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000,"RPC subsystem which is responsible for Remote procedure Calls on the local machine" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Group",0x00000000," RPC Service" +HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Group",0x00000000,"COM Infrastructure" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"%SystemRoot%\system32\rpcss.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ObjectName",0x00000000,"LocalSystem" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x00000002 @@ -1198,7 +1199,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Group",0x00000000,"SpoolerGroup" HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","ImagePath",0x00020000,"%SystemRoot%\system32\spoolsv.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Type",0x00010001,0x00000110 ; WLAN service

1 0

[ekohl] 45108: Display CSConfigFlags.
by ekohl＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: ekohl Date: Sat Jan 16 18:07:41 2010 New Revision: 45108 URL: http://svn.reactos.org/svn/reactos?rev=45108&view=rev Log: Display CSConfigFlags. Modified: trunk/reactos/dll/win32/devmgr/advprop.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Sat Jan 16 18:07:41 2010 @@ -791,6 +791,7 @@ // SetListViewText(hwndListView, 0, dap->szTemp); } + static VOID DisplayDevNodeEnumerator(IN PDEVADVPROP_INFO dap, IN HWND hwndListView) @@ -825,6 +826,30 @@ } +static VOID +DisplayCsFlags(IN PDEVADVPROP_INFO dap, + IN HWND hwndListView) +{ + DWORD dwValue = 0; + INT index; + + CM_Get_HW_Prof_Flags_Ex(dap->szDevName, + 0, /* current hardware profile */ + &dwValue, + 0, + dap->hMachine); + + index = 0; + if (dwValue & CSCONFIGFLAG_DISABLED) + SetListViewText(hwndListView, index++, L"CSCONFIGFLAG_DISABLED"); + + if (dwValue & CSCONFIGFLAG_DO_NOT_CREATE) + SetListViewText(hwndListView, index++, L"CSCONFIGFLAG_DO_NOT_CREATE"); + + if (dwValue & CSCONFIGFLAG_DO_NOT_START) + SetListViewText(hwndListView, index++, L"CSCONFIGFLAG_DO_NOT_START"); +} + static VOID DisplayDeviceProperties(IN PDEVADVPROP_INFO dap, @@ -875,9 +900,6 @@ case 5: /* Enumerator */ DisplayDevNodeEnumerator(dap, hwndListView); -// DisplayDevicePropertyText(dap, -// hwndListView, -// SPDRP_ENUMERATOR_NAME); break; case 6: /* Capabilities */ @@ -897,22 +919,50 @@ SPDRP_CONFIGFLAGS); break; + case 9: /* CSConfig Flags */ + DisplayCsFlags(dap, + hwndListView); + break; + #if 0 - case 9: /* CSConfig Flags */ + case 10: /* Ejection relation */ + break; + + case 11: /* Removal relations */ + break; + + case 12: /* Bus relation */ break; #endif - case 13: /* Upper Filters */ + case 13: /* Device Upper Filters */ DisplayDevicePropertyText(dap, hwndListView, SPDRP_UPPERFILTERS); break; - case 14: /* Lower Filters */ + case 14: /* Device Lower Filters */ DisplayDevicePropertyText(dap, hwndListView, SPDRP_LOWERFILTERS); break; + +#if 0 + case 15: /* Class Upper Filters */ + break; + + case 16: /* Class Lower Filters */ + break; + + case 17: /* Class Installer */ + break; + + case 18: /* Class Coinstaller */ + break; + + case 19: /* Device Coinstaller */ + break; +#endif default: SetListViewText(hwndListView, 0, L"<Not implemented yet>");

1 0

[ekohl] 45107: Implement CM_Set_HW_Prof[_Ex].
by ekohl＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: ekohl Date: Sat Jan 16 17:31:58 2010 New Revision: 45107 URL: http://svn.reactos.org/svn/reactos?rev=45107&view=rev Log: Implement CM_Set_HW_Prof[_Ex]. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/include/ddk/cfgmgr32.h trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat Jan 16 17:31:58 2010 @@ -1809,7 +1809,9 @@ /* Function 55 */ DWORD PNP_SetHwProf( - handle_t hBinding) + handle_t hBinding, + DWORD ulHardwareProfile, + DWORD ulFlags) { UNIMPLEMENTED; return CR_CALL_NOT_IMPLEMENTED; Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sat Jan 16 17:31:58 2010 @@ -3775,6 +3775,60 @@ /*********************************************************************** + * CM_Set_HW_Prof [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Set_HW_Prof( + ULONG ulHardwareProfile, ULONG ulFlags) +{ + TRACE("%lu %lu\n", ulHardwareProfile, ulFlags); + return CM_Set_HW_Prof_Ex(ulHardwareProfile, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Set_HW_Prof_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Set_HW_Prof_Ex( + ULONG ulHardwareProfile, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + CONFIGRET ret; + + TRACE("%lu %lu %lx\n", ulHardwareProfile, ulFlags, hMachine); + + if (!IsUserAdmin()) + return CR_ACCESS_DENIED; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + RpcTryExcept + { + ret = PNP_SetHwProf(BindingHandle, ulHardwareProfile, ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; +} + + +/*********************************************************************** * CM_Set_HW_Prof_FlagsA [SETUPAPI.@] */ CONFIGRET WINAPI CM_Set_HW_Prof_FlagsA( Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sat Jan 16 17:31:58 2010 @@ -192,8 +192,8 @@ @ stdcall CM_Set_DevNode_Registry_PropertyW(long long ptr long long) @ stdcall CM_Set_DevNode_Registry_Property_ExA(long long ptr long long long) @ stdcall CM_Set_DevNode_Registry_Property_ExW(long long ptr long long long) -@ stub CM_Set_HW_Prof -@ stub CM_Set_HW_Prof_Ex +@ stdcall CM_Set_HW_Prof(long long) +@ stdcall CM_Set_HW_Prof_Ex(long long long) @ stdcall CM_Set_HW_Prof_FlagsA(str long long long) @ stdcall CM_Set_HW_Prof_FlagsW(wstr long long long) @ stdcall CM_Set_HW_Prof_Flags_ExA(str long long long long) Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/cfgmgr32.h [iso-8859-1] Sat Jan 16 17:31:58 2010 @@ -2117,8 +2117,20 @@ #define CM_Set_DevNode_Registry_Property_Ex CM_Set_DevNode_Registry_Property_ExA #endif /* UNICODE */ -/* FIXME: Obsolete CM_Set_HW_Prof */ -/* FIXME: Obsolete CM_Set_HW_Prof_Ex */ +CMAPI +CONFIGRET +WINAPI +CM_Set_HW_Prof( + IN ULONG ulHardwareProfile, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Set_HW_Prof_Ex( + IN ULONG ulHardwareProfile, + IN ULONG ulFlags, + IN HMACHINE hMachine); /* CM_Set_HW_Prof_Flags[_Ex].ulFlags constants */ #define CM_SET_HW_PROF_FLAGS_UI_NOT_OK (0x00000001) Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Sat Jan 16 17:31:58 2010 @@ -724,7 +724,9 @@ /* Function 55 */ DWORD PNP_SetHwProf( - [in] handle_t hBinding); + [in] handle_t hBinding, + [in] DWORD ulHardwareProfile, + [in] DWORD ulFlags); /* Function 56 */ DWORD PNP_QueryArbitratorFreeData( Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg… ============================================================================== --- trunk/reactos/include/reactos/wine/cfgmgr32.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/cfgmgr32.h [iso-8859-1] Sat Jan 16 17:31:58 2010 @@ -301,6 +301,8 @@ CONFIGRET WINAPI CM_Get_First_Log_Conf_Ex( PLOG_CONF, DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Global_State( PULONG, ULONG ); CONFIGRET WINAPI CM_Get_Global_State_Ex( PULONG, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Set_HW_Prof( ULONG, ULONG ); +CONFIGRET WINAPI CM_Set_HW_Prof_Ex( ULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_HW_Prof_FlagsA( DEVINSTID_A, ULONG, PULONG, ULONG ); CONFIGRET WINAPI CM_Get_HW_Prof_FlagsW( DEVINSTID_W, ULONG, PULONG, ULONG ); #define CM_Get_HW_Prof_Flags WINELIB_NAME_AW(CM_Get_HW_Prof_Flags)

1 0

[ekohl] 45106: Implement PNP_HwProfFlags.
by ekohl＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: ekohl Date: Sat Jan 16 17:18:00 2010 New Revision: 45106 URL: http://svn.reactos.org/svn/reactos?rev=45106&view=rev Log: Implement PNP_HwProfFlags. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat Jan 16 17:18:00 2010 @@ -1527,8 +1527,70 @@ DWORD ulNameLength, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + CONFIGRET ret = CR_SUCCESS; + WCHAR szKeyName[MAX_PATH]; + HKEY hKey; + HKEY hDeviceKey; + DWORD dwSize; + + UNREFERENCED_PARAMETER(hBinding); + + DPRINT("PNP_HwProfFlags() called\n"); + + if (ulConfig == 0) + { + wcscpy(szKeyName, + L"System\\CurrentControlSet\\HardwareProfiles\\Current\\System\\CurrentControlSet\\Enum"); + } + else + { + swprintf(szKeyName, + L"System\\CurrentControlSet\\HardwareProfiles\\%04u\\System\\CurrentControlSet\\Enum", + ulConfig); + } + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + szKeyName, + 0, + KEY_QUERY_VALUE, + &hKey) != ERROR_SUCCESS) + return CR_REGISTRY_ERROR; + + if (ulAction == PNP_GET_HWPROFFLAGS) + { + if (RegOpenKeyExW(hKey, + pDeviceID, + 0, + KEY_QUERY_VALUE, + &hDeviceKey) != ERROR_SUCCESS) + { + *pulValue = 0; + } + else + { + dwSize = sizeof(DWORD); + if (!RegQueryValueExW(hDeviceKey, + L"CSConfigFlags", + NULL, + NULL, + (LPBYTE)pulValue, + &dwSize) != ERROR_SUCCESS) + { + *pulValue = 0; + } + + RegCloseKey(hDeviceKey); + } + } + else if (ulAction == PNP_SET_HWPROFFLAGS) + { + /* FIXME: not implemented yet */ + ret = CR_CALL_NOT_IMPLEMENTED; + } + + RegCloseKey(hKey); + + return ret; }

1 0

[fireball] 45105: - Update to Wine-1.1.31.
by fireball＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: fireball Date: Sat Jan 16 17:05:35 2010 New Revision: 45105 URL: http://svn.reactos.org/svn/reactos?rev=45105&view=rev Log: - Update to Wine-1.1.31. Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c branches/arwinss/reactos/dll/win32/comctl32/comctl32.h branches/arwinss/reactos/dll/win32/comctl32/datetime.c branches/arwinss/reactos/dll/win32/comctl32/ipaddress.c branches/arwinss/reactos/dll/win32/comctl32/listview.c branches/arwinss/reactos/dll/win32/comctl32/monthcal.c branches/arwinss/reactos/dll/win32/comctl32/toolbar.c branches/arwinss/reactos/dll/win32/comctl32/treeview.c branches/arwinss/reactos/dll/win32/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct…

1 0

[fireball] 45104: - Remove all ROS-specific modifications from comctl32-1.1.30 except the TOOLTIPS_NotifyFormat one for now.
by fireball＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: fireball Date: Sat Jan 16 16:43:36 2010 New Revision: 45104 URL: http://svn.reactos.org/svn/reactos?rev=45104&view=rev Log: - Remove all ROS-specific modifications from comctl32-1.1.30 except the TOOLTIPS_NotifyFormat one for now. Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.c branches/arwinss/reactos/dll/win32/comctl32/propsheet.c branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc branches/arwinss/reactos/dll/win32/comctl32/treeview.c Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… ============================================================================== --- branches/arwinss/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Sat Jan 16 16:43:36 2010 @@ -156,7 +156,7 @@ * This function CANNOT be used to reduce the number of images. */ static void -IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cy) +IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy) { HDC hdcBitmap; HBITMAP hbmNewBitmap, hbmNull; @@ -167,14 +167,15 @@ && (himl->cy >= cy)) return; + if (cx == 0) cx = himl->cx; nNewCount = himl->cCurImage + nImageCount + himl->cGrow; - imagelist_get_bitmap_size(himl, nNewCount, himl->cx, &sz); + imagelist_get_bitmap_size(himl, nNewCount, cx, &sz); TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, cy, nNewCount); hdcBitmap = CreateCompatibleDC (0); - hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, himl->cx); + hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, cx); if (hbmNewBitmap == 0) ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, cy); @@ -248,7 +249,7 @@ nImageCount = bmp.bmWidth / himl->cx; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); hdcBitmap = CreateCompatibleDC(0); @@ -350,7 +351,7 @@ else nImageCount = 0; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); nIndex = himl->cCurImage; himl->cCurImage += nImageCount; @@ -2304,7 +2305,7 @@ if (nIndex == -1) { if (himl->cCurImage + 1 > himl->cMaxImage) - IMAGELIST_InternalExpandBitmaps (himl, 1, 0); + IMAGELIST_InternalExpandBitmaps (himl, 1, 0, 0); nIndex = himl->cCurImage; himl->cCurImage++; Modified: branches/arwinss/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… ============================================================================== --- branches/arwinss/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Sat Jan 16 16:43:36 2010 @@ -2422,28 +2422,6 @@ return FALSE; } -BOOL CALLBACK -EnumChildProc(HWND hwnd, LPARAM lParam) -{ - WCHAR szType[20]; - RealGetWindowClassW(hwnd, szType, 20); - - if (strcmpW(szType, WC_EDITW) == 0) - { - if (IsWindowEnabled(hwnd) && IsWindowVisible(hwnd)) - { - SetFocus(hwnd); - return FALSE; - } - } - else - { - EnumChildWindows(hwnd, EnumChildProc, 0); - } - - return TRUE; -} - /****************************************************************************** * PROPSHEET_SetWizButtons * @@ -2464,6 +2442,17 @@ EnableWindow(hwndBack, FALSE); EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); + + /* set the default pushbutton to an enabled button */ + if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); + else if (dwFlags & PSWIZB_NEXT) + SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); + else if (dwFlags & PSWIZB_BACK) + SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); + else + SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); + if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); @@ -2494,31 +2483,6 @@ } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); - - /* set the default pushbutton to an enabled button and give it focus */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) - { - SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); - SetFocus(hwndFinish); - } - else if (dwFlags & PSWIZB_NEXT) - { - SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); - SetFocus(hwndNext); - } - else if (dwFlags & PSWIZB_BACK) - { - SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); - SetFocus(hwndBack); - } - else - { - SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); - SetFocus(GetDlgItem(hwndDlg, IDCANCEL)); - } - - /* Now try to find an edit control that deserves focus */ - EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0); } /****************************************************************************** Modified: branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… ============================================================================== --- branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Sat Jan 16 16:43:36 2010 @@ -19,10 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" #include "comctl32.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: branches/arwinss/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… ============================================================================== --- branches/arwinss/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sat Jan 16 16:43:36 2010 @@ -2843,12 +2843,7 @@ } } - // - // This is correct, but is causes and infinite loop of WM_PAINT messages, resulting - // in continuous painting of the scroll bar in reactos. Comment out until the real - // bug is found - // - //TREEVIEW_UpdateScrollBars(infoPtr); + TREEVIEW_UpdateScrollBars(infoPtr); if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode =

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