Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 54190: [PORTCLS] - Don't modify status code of irps which are not handled
by janderwald＠svn.reactos.org 18 Oct '11

18 Oct '11

Author: janderwald Date: Tue Oct 18 14:00:20 2011 New Revision: 54190 URL: http://svn.reactos.org/svn/reactos?rev=54190&view=rev Log: [PORTCLS] - Don't modify status code of irps which are not handled Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Tue Oct 18 14:00:20 2011 @@ -159,10 +159,9 @@ } DPRINT("unhandled function %u\n", IoStack->MinorFunction); - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Status = Irp->IoStatus.Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; + return Status; } VOID

1 0

[gadamopoulos] 54189: [desk.cpl] - Apply a wallpaper and desktop background only when they have changed - Fixes changing desktop background to the color defined by the theme
by gadamopoulos＠svn.reactos.org 18 Oct '11

18 Oct '11

Author: gadamopoulos Date: Tue Oct 18 13:36:44 2011 New Revision: 54189 URL: http://svn.reactos.org/svn/reactos?rev=54189&view=rev Log: [desk.cpl] - Apply a wallpaper and desktop background only when they have changed - Fixes changing desktop background to the color defined by the theme Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Tue Oct 18 13:36:44 2011 @@ -40,6 +40,9 @@ typedef struct _DATA { + BOOL bWallpaperChanged; + BOOL bClrBackgroundChanged; + BackgroundItem backgroundItems[MAX_BACKGROUNDS]; PDIBITMAP pWallpaperBitmap; @@ -365,6 +368,7 @@ { /* Save selected color to var */ g_GlobalData.desktop_color = cc.rgbResult; + pData->bClrBackgroundChanged = TRUE; /* Apply button will be activated */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); @@ -509,6 +513,8 @@ if (pData->pWallpaperBitmap == NULL) return; } + + pData->bWallpaperChanged = TRUE; InvalidateRect(GetDlgItem(hwndDlg, IDC_BACKGROUND_PREVIEW), NULL, TRUE); @@ -802,8 +808,10 @@ switch(lpnm->code) { case PSN_APPLY: - SetWallpaper(pData); - SetDesktopBackColor(hwndDlg, pData); + if(pData->bWallpaperChanged) + SetWallpaper(pData); + if(pData->bClrBackgroundChanged) + SetDesktopBackColor(hwndDlg, pData); return TRUE; case LVN_ITEMCHANGED:

1 0

[tkreuzer] 54188: [WIN32K] Copy the BITMAPINFO to a safe kernel mode buffer, before accessing it. Fixes bug 6587.
by tkreuzer＠svn.reactos.org 18 Oct '11

18 Oct '11

Author: tkreuzer Date: Tue Oct 18 13:13:37 2011 New Revision: 54188 URL: http://svn.reactos.org/svn/reactos?rev=54188&view=rev Log: [WIN32K] Copy the BITMAPINFO to a safe kernel mode buffer, before accessing it. Fixes bug 6587. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Tue Oct 18 13:13:37 2011 @@ -365,13 +365,19 @@ EXLATEOBJ exlo; PPALETTE ppalDIB = NULL; HPALETTE hpalDIB = NULL; + LPBITMAPINFO pbmiSafe; if (!Bits) return 0; + + pbmiSafe = ExAllocatePoolWithTag(PagedPool, cjMaxInfo, 'pmTG'); + if (!pbmiSafe) return 0; _SEH2_TRY { ProbeForRead(bmi, cjMaxInfo, 1); ProbeForRead(Bits, cjMaxBits, 1); + RtlCopyMemory(pbmiSafe, bmi, cjMaxInfo); + bmi = pbmiSafe; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -381,19 +387,19 @@ if (!NT_SUCCESS(Status)) { - return 0; + goto Exit2; } pDC = DC_LockDc(hDC); if (!pDC) { EngSetLastError(ERROR_INVALID_HANDLE); - return 0; + goto Exit2; } if (pDC->dctype == DC_TYPE_INFO) { DC_UnlockDc(pDC); - return 0; + goto Exit2; } pSurf = pDC->dclevel.pSurface; @@ -505,7 +511,8 @@ if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); if (hpalDIB) GreDeleteObject(hpalDIB); DC_UnlockDc(pDC); - +Exit2: + ExFreePool(pbmiSafe); return ret; }

1 0

[gadamopoulos] 54187: [user32_apitest] - Add one more testcase and fix another one for SPI_SETNONCLIENTMETRICS
by gadamopoulos＠svn.reactos.org 18 Oct '11

18 Oct '11

Author: gadamopoulos Date: Tue Oct 18 11:19:24 2011 New Revision: 54187 URL: http://svn.reactos.org/svn/reactos?rev=54187&view=rev Log: [user32_apitest] - Add one more testcase and fix another one for SPI_SETNONCLIENTMETRICS Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SystemPar… ============================================================================== --- trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] Tue Oct 18 11:19:24 2011 @@ -64,11 +64,24 @@ {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, {2,WM_GETMINMAXINFO}, {2,WM_NCCALCSIZE}, - {2,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE}, + {2,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOSIZE}, {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, {1,WM_GETMINMAXINFO}, {1,WM_NCCALCSIZE}, - {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOSIZE}, + {0,0}}; + +MSG_ENTRY NcMetricsChange1_chain[]={ + {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, + {2,WM_GETMINMAXINFO}, + {2,WM_NCCALCSIZE}, + {2,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOSIZE}, + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, + {1,WM_GETMINMAXINFO}, + {1,WM_NCCALCSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOSIZE}, + {2,WM_SETTINGCHANGE}, + {1,WM_SETTINGCHANGE}, {0,0}}; MSG_ENTRY CaptionHeight_chain[]={ @@ -80,7 +93,7 @@ {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, {1,WM_GETMINMAXINFO}, {1,WM_NCCALCSIZE}, - {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE}, {1,WM_MOVE}, {0,0}}; @@ -88,21 +101,33 @@ { NONCLIENTMETRICS NonClientMetrics; + /* WARNING: this test requires themes and dwm to be disabled */ + SetCursorPos(0,0); + /* Retrieve th non client metrics */ NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); FlushMessages(); COMPARE_CACHE(empty_chain); + + /* Set the non client metric without making any change */ SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); FlushMessages(); COMPARE_CACHE(NcMetricsChange_chain); + /* Set the same metrics again with the SPIF_SENDCHANGE param */ + SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, SPIF_SENDCHANGE|SPIF_UPDATEINIFILE ); + FlushMessages(); + COMPARE_CACHE(NcMetricsChange1_chain); + + /* Slightly change the caption height */ NonClientMetrics.iCaptionHeight += 1; SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); FlushMessages(); COMPARE_CACHE(CaptionHeight_chain); + /* Restore the original caption height */ NonClientMetrics.iCaptionHeight -= 1; SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); FlushMessages();

1 0

[gadamopoulos] 54186: [win32k] -Force all top level windows to update the size and position of their non client area when SPI_SETNONCLIENTMETRICS is used -Should fix changing the non client metrics...
by gadamopoulos＠svn.reactos.org 18 Oct '11

18 Oct '11

Author: gadamopoulos Date: Tue Oct 18 10:54:13 2011 New Revision: 54186 URL: http://svn.reactos.org/svn/reactos?rev=54186&view=rev Log: [win32k] -Force all top level windows to update the size and position of their non client area when SPI_SETNONCLIENTMETRICS is used -Should fix changing the non client metrics like caption height for open windows (before this we needed to close and reopen existing windows to let them be painted properly) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Tue Oct 18 10:54:13 2011 @@ -694,6 +694,41 @@ return (UINT_PTR)KEY_DESKTOP; } +static BOOL +SpiNotifyNCMetricsChanged() +{ + PWND pwndDesktop, pwndCurrent; + HWND *ahwnd; + USER_REFERENCE_ENTRY Ref; + int i; + + pwndDesktop = UserGetDesktopWindow(); + ASSERT(pwndDesktop); + + ahwnd = IntWinListChildren(pwndDesktop); + if(!ahwnd) + return FALSE; + + for (i = 0; ahwnd[i]; i++) + { + pwndCurrent = UserGetWindowObject(ahwnd[i]); + if(!pwndCurrent) + continue; + + UserRefObjectCo(pwndCurrent, &Ref); + co_WinPosSetWindowPos(pwndCurrent, 0, pwndCurrent->rcWindow.left,pwndCurrent->rcWindow.top, + pwndCurrent->rcWindow.right-pwndCurrent->rcWindow.left + ,pwndCurrent->rcWindow.bottom - pwndCurrent->rcWindow.top, + SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS| + SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW); + UserDerefObjectCo(pwndCurrent); + } + + ExFreePool(ahwnd); + + return TRUE; +} + static UINT_PTR SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) @@ -863,6 +898,8 @@ SpiStoreFont(L"StatusFont", &gspv.ncm.lfStatusFont); SpiStoreFont(L"MessageFont", &gspv.ncm.lfMessageFont); } + if(!SpiNotifyNCMetricsChanged()) + return 0; return (UINT_PTR)KEY_METRIC; case SPI_GETMINIMIZEDMETRICS:

1 0

[gadamopoulos] 54185: [win32k] - Do not send message WM_NCCALCSIZE asynchronously because we need its return value from the receiver. Should fix resizing or moving the non-client area of windows
by gadamopoulos＠svn.reactos.org 18 Oct '11

18 Oct '11

Author: gadamopoulos Date: Tue Oct 18 10:48:03 2011 New Revision: 54185 URL: http://svn.reactos.org/svn/reactos?rev=54185&view=rev Log: [win32k] - Do not send message WM_NCCALCSIZE asynchronously because we need its return value from the receiver. Should fix resizing or moving the non-client area of windows Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Tue Oct 18 10:48:03 2011 @@ -570,7 +570,7 @@ params.lppos = &winposCopy; winposCopy = *WinPos; - wvrFlags = co_IntSendMessageNoWait(Window->head.h, WM_NCCALCSIZE, TRUE, (LPARAM) &params); + wvrFlags = co_IntSendMessage(Window->head.h, WM_NCCALCSIZE, TRUE, (LPARAM) &params); /* If the application send back garbage, ignore it */ if (params.rgrc[0].left <= params.rgrc[0].right &&

1 0

[jimtabor] 54184: - Add hits to track callback and winproc faults.
by jimtabor＠svn.reactos.org 18 Oct '11

18 Oct '11

Author: jimtabor Date: Tue Oct 18 00:39:06 2011 New Revision: 54184 URL: http://svn.reactos.org/svn/reactos?rev=54184&view=rev Log: - Add hits to track callback and winproc faults. Modified: trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Tue Oct 18 00:39:06 2011 @@ -1133,7 +1133,7 @@ MSG UnicodeMsg; BOOL Hook = FALSE, MsgOverride = FALSE, Dialog; LRESULT Result = 0, PreResult = 0; - DWORD Data = 0; + DWORD Hit = 0, Data = 0; if (WndProc == NULL) { @@ -1189,6 +1189,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Hit = 1; } _SEH2_END; @@ -1237,6 +1238,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Hit = 2; } _SEH2_END; @@ -1258,6 +1260,18 @@ Exit: if (Hook) EndUserApiHook(); + if (Hit) + { + switch(Hit) + { + case 1: + ERR("CallWindowProcW Ansi Failed!\n"); + break; + case 2: + ERR("CallWindowProcW Unicode Failed!\n"); + break; + } + } return Result; } @@ -1274,7 +1288,7 @@ MSG UnicodeMsg; BOOL Hook = FALSE, MsgOverride = FALSE, Dialog; LRESULT Result = 0, PreResult = 0; - DWORD Data = 0; + DWORD Hit = 0, Data = 0; if (WndProc == NULL) { @@ -1321,6 +1335,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Hit = 1; } _SEH2_END; @@ -1374,6 +1389,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Hit = 2; } _SEH2_END; @@ -1400,6 +1416,18 @@ Exit: if (Hook) EndUserApiHook(); + if (Hit) + { + switch(Hit) + { + case 1: + ERR("CallWindowProcA Ansi Failed!\n"); + break; + case 2: + ERR("CallWindowProcA Unicode Failed!\n"); + break; + } + } return Result; } @@ -1562,6 +1590,7 @@ LRESULT Ret = 0; MSG UnicodeMsg; PWND Wnd; + BOOL Hit = FALSE; if ( lpmsg->message & ~WM_MAXIMUM ) { @@ -1590,7 +1619,11 @@ if ( lpmsg->message == WM_SYSTIMER ) return NtUserDispatchMessage( (PMSG)lpmsg ); - if (!NtUserValidateTimerCallback(lpmsg->hwnd, lpmsg->wParam, lpmsg->lParam)) return 0; + if (!NtUserValidateTimerCallback(lpmsg->hwnd, lpmsg->wParam, lpmsg->lParam)) + { + WARN("Validating Timer Callback failed!\n"); + return 0; + } _SEH2_TRY // wine does this. Hint: Prevents call to another thread.... { @@ -1601,6 +1634,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Hit = TRUE; } _SEH2_END; } @@ -1630,6 +1664,11 @@ } } } + + if (Hit) + { + WARN("Exception in Timer Callback WndProcA!\n"); + } return Ret; } @@ -1642,6 +1681,7 @@ { LRESULT Ret = 0; PWND Wnd; + BOOL Hit = FALSE; if ( lpmsg->message & ~WM_MAXIMUM ) { @@ -1670,7 +1710,11 @@ if ( lpmsg->message == WM_SYSTIMER ) return NtUserDispatchMessage( (PMSG) lpmsg ); - if (!NtUserValidateTimerCallback(lpmsg->hwnd, lpmsg->wParam, lpmsg->lParam)) return 0; + if (!NtUserValidateTimerCallback(lpmsg->hwnd, lpmsg->wParam, lpmsg->lParam)) + { + WARN("Validating Timer Callback failed!\n"); + return 0; + } _SEH2_TRY { @@ -1681,6 +1725,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Hit = TRUE; } _SEH2_END; } @@ -1699,6 +1744,10 @@ Ret = NtUserDispatchMessage( (PMSG) lpmsg ); } + if (Hit) + { + WARN("Exception in Timer Callback WndProcW!\n"); + } return Ret; }

1 0

[janderwald] 54183: [SHELL32] - Remove unwanted change
by janderwald＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: janderwald Date: Mon Oct 17 16:53:16 2011 New Revision: 54183 URL: http://svn.reactos.org/svn/reactos?rev=54183&view=rev Log: [SHELL32] - Remove unwanted change Modified: trunk/reactos/dll/win32/shell32/fprop.cpp Modified: trunk/reactos/dll/win32/shell32/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] Mon Oct 17 16:53:16 2011 @@ -20,7 +20,7 @@ #include <precomp.h> -WINE_DEFAULT_DEBUG_CHANNEL(shell1); +WINE_DEFAULT_DEBUG_CHANNEL(shell); #define MAX_PROPERTY_SHEET_PAGE 32

1 0

[janderwald] 54182: [SHELL32] - Check first it the path is a drive path - Fixes launching drive property dialog when clicked in the shell view area
by janderwald＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: janderwald Date: Mon Oct 17 16:51:46 2011 New Revision: 54182 URL: http://svn.reactos.org/svn/reactos?rev=54182&view=rev Log: [SHELL32] - Check first it the path is a drive path - Fixes launching drive property dialog when clicked in the shell view area Modified: trunk/reactos/dll/win32/shell32/fprop.cpp Modified: trunk/reactos/dll/win32/shell32/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] Mon Oct 17 16:51:46 2011 @@ -20,7 +20,7 @@ #include <precomp.h> -WINE_DEFAULT_DEBUG_CHANNEL(shell); +WINE_DEFAULT_DEBUG_CHANNEL(shell1); #define MAX_PROPERTY_SHEET_PAGE 32 @@ -895,15 +895,16 @@ wFileName[wLength-1] = L'\0'; } + if (PathIsRootW(wFileName)) + { + return SH_ShowDriveProperties(wFileName, pidlFolder, apidl); + } + if (PathIsDirectoryW(wFileName)) { return SH_ShowFolderProperties(wFileName, pidlFolder, apidl); } - if (wcslen(wFileName) == 3) - { - return SH_ShowDriveProperties(wFileName, pidlFolder, apidl); - } pFileName = wcsrchr(wFileName, '\\');

1 0

[jgardou] 54181: [WinMM] - fix typo, sorry.
by jgardou＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: jgardou Date: Mon Oct 17 16:47:42 2011 New Revision: 54181 URL: http://svn.reactos.org/svn/reactos?rev=54181&view=rev Log: [WinMM] - fix typo, sorry. Modified: trunk/reactos/dll/win32/winmm/lolvldrv.c Modified: trunk/reactos/dll/win32/winmm/lolvldrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lolvldrv.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/lolvldrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/lolvldrv.c [iso-8859-1] Mon Oct 17 16:47:42 2011 @@ -634,7 +634,7 @@ } /* unload driver, in reverse order of loading */ - i = MMDrvsHi - 1; + i = MMDrvsHi; while (i-- > 0) { MMDRV_ExitPerType(&MMDrvs[i], MMDRV_AUX);

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