Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 65055: [GDI32] - Improve formatting - Use more consistent variable names - Remove unnecessary casts - Add some annotations - No intended code changes
by tkreuzer＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: tkreuzer Date: Mon Oct 27 23:37:05 2014 New Revision: 65055 URL: http://svn.reactos.org/svn/reactos?rev=65055&view=rev Log: [GDI32] - Improve formatting - Use more consistent variable names - Remove unnecessary casts - Add some annotations - No intended code changes Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Mon Oct 27 23:37:05 2014 @@ -7,14 +7,15 @@ HDC FASTCALL -IntCreateDICW ( LPCWSTR lpwszDriver, - LPCWSTR lpwszDevice, - LPCWSTR lpwszOutput, - PDEVMODEW lpInitData, - ULONG iType ) +IntCreateDICW( + LPCWSTR lpwszDriver, + LPCWSTR lpwszDevice, + LPCWSTR lpwszOutput, + PDEVMODEW lpInitData, + ULONG iType) { UNICODE_STRING Device, Output; - HDC hDC = NULL; + HDC hdc = NULL; BOOL Display = FALSE, Default = FALSE; ULONG UMdhpdev = 0; @@ -60,32 +61,32 @@ DPRINT1("Not a DISPLAY device! %wZ\n", &Device); } - hDC = NtGdiOpenDCW( (Default ? NULL : &Device), - (PDEVMODEW) lpInitData, - (lpwszOutput ? &Output : NULL), - iType, // DCW 0 and ICW 1. - Display, - hspool, - (PVOID) NULL, // NULL for now. - (PVOID) &UMdhpdev ); + hdc = NtGdiOpenDCW((Default ? NULL : &Device), + (PDEVMODEW) lpInitData, + (lpwszOutput ? &Output : NULL), + iType, // DCW 0 and ICW 1. + Display, + hspool, + (PVOID) NULL, // NULL for now. + (PVOID) &UMdhpdev ); #if 0 // Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { PDC_ATTR Dc_Attr; PLDC pLDC; - GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr); + GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&Dc_Attr); pLDC = LocalAlloc(LMEM_ZEROINIT, sizeof(LDC)); Dc_Attr->pvLDC = pLDC; - pLDC->hDC = hDC; + pLDC->hDC = hdc; pLDC->iType = LDC_LDC; // 1 (init) local DC, 2 EMF LDC DbgPrint("DC_ATTR Allocated -> 0x%x\n",Dc_Attr); } #endif - return hDC; + return hdc; } @@ -94,22 +95,24 @@ */ HDC WINAPI -CreateCompatibleDC ( HDC hdc) -{ - HDC rhDC; -// PDC_ATTR Dc_Attr; - - rhDC = NtGdiCreateCompatibleDC(hdc); +CreateCompatibleDC( + _In_ HDC hdc) +{ + HDC hdcNew; +// PDC_ATTR pdcattr; + + hdcNew = NtGdiCreateCompatibleDC(hdc); #if 0 - if ( hdc && rhDC) - { - if (GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) - { - if ( Dc_Attr->pvLIcm ) IcmCompatibleDC(rhDC, hdc, Dc_Attr); + if ( hdc && hdcNew) + { + if (GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + { + if (pdcattr->pvLIcm) IcmCompatibleDC(hdcNew, hdc, pdcattr); } } #endif - return rhDC; + + return hdcNew; } /* @@ -118,64 +121,68 @@ HDC WINAPI CreateDCA ( - LPCSTR lpszDriver, - LPCSTR lpszDevice, - LPCSTR lpszOutput, - CONST DEVMODEA * lpdvmInit -) + LPCSTR lpszDriver, + LPCSTR lpszDevice, + LPCSTR lpszOutput, + CONST DEVMODEA * lpdvmInit) { ANSI_STRING DriverA, DeviceA, OutputA; UNICODE_STRING DriverU, DeviceU, OutputU; LPDEVMODEW dvmInitW = NULL; - HDC hDC; + HDC hdc; /* * If needed, convert to Unicode * any string parameter. */ - if (NULL != lpszDriver) + if (lpszDriver != NULL) { RtlInitAnsiString(&DriverA, (LPSTR)lpszDriver); RtlAnsiStringToUnicodeString(&DriverU, &DriverA, TRUE); } else + { DriverU.Buffer = NULL; - if (NULL != lpszDevice) + } + + if (lpszDevice != NULL) { RtlInitAnsiString(&DeviceA, (LPSTR)lpszDevice); RtlAnsiStringToUnicodeString(&DeviceU, &DeviceA, TRUE); } else + { DeviceU.Buffer = NULL; - if (NULL != lpszOutput) + } + + if (lpszOutput != NULL) { RtlInitAnsiString(&OutputA, (LPSTR)lpszOutput); RtlAnsiStringToUnicodeString(&OutputU, &OutputA, TRUE); } else + { OutputU.Buffer = NULL; - - if ( lpdvmInit ) + } + + if (lpdvmInit != NULL) dvmInitW = GdiConvertToDevmodeW((LPDEVMODEA)lpdvmInit); - hDC = IntCreateDICW ( DriverU.Buffer, - DeviceU.Buffer, - OutputU.Buffer, - lpdvmInit ? dvmInitW : NULL, - 0 ); - HEAP_free (dvmInitW); - /* - * Free Unicode parameters. - */ + hdc = IntCreateDICW(DriverU.Buffer, + DeviceU.Buffer, + OutputU.Buffer, + lpdvmInit ? dvmInitW : NULL, + 0); + HEAP_free(dvmInitW); + + /* Free Unicode parameters. */ RtlFreeUnicodeString(&DriverU); RtlFreeUnicodeString(&DeviceU); RtlFreeUnicodeString(&OutputU); - /* - * Return the possible DC handle. - */ - return hDC; + /* Return the DC handle. */ + return hdc; } @@ -185,18 +192,16 @@ HDC WINAPI CreateDCW ( - LPCWSTR lpwszDriver, - LPCWSTR lpwszDevice, - LPCWSTR lpwszOutput, - CONST DEVMODEW *lpInitData -) -{ - - return IntCreateDICW ( lpwszDriver, - lpwszDevice, - lpwszOutput, - (PDEVMODEW) lpInitData, - 0 ); + LPCWSTR lpwszDriver, + LPCWSTR lpwszDevice, + LPCWSTR lpwszOutput, + CONST DEVMODEW *lpInitData) +{ + return IntCreateDICW(lpwszDriver, + lpwszDevice, + lpwszOutput, + (PDEVMODEW)lpInitData, + 0); } @@ -206,17 +211,16 @@ HDC WINAPI CreateICW( - LPCWSTR lpszDriver, - LPCWSTR lpszDevice, - LPCWSTR lpszOutput, - CONST DEVMODEW *lpdvmInit -) -{ - return IntCreateDICW ( lpszDriver, - lpszDevice, - lpszOutput, - (PDEVMODEW) lpdvmInit, - 1 ); + LPCWSTR lpszDriver, + LPCWSTR lpszDevice, + LPCWSTR lpszOutput, + CONST DEVMODEW *lpdvmInit) +{ + return IntCreateDICW(lpszDriver, + lpszDevice, + lpszOutput, + (PDEVMODEW)lpdvmInit, + 1); } @@ -226,48 +230,48 @@ HDC WINAPI CreateICA( - LPCSTR lpszDriver, - LPCSTR lpszDevice, - LPCSTR lpszOutput, - CONST DEVMODEA *lpdvmInit -) + LPCSTR lpszDriver, + LPCSTR lpszDevice, + LPCSTR lpszOutput, + CONST DEVMODEA *lpdvmInit) { NTSTATUS Status; LPWSTR lpszDriverW, lpszDeviceW, lpszOutputW; LPDEVMODEW dvmInitW = NULL; - HDC rc = 0; - - Status = HEAP_strdupA2W ( &lpszDriverW, lpszDriver ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); + HDC hdc = 0; + + Status = HEAP_strdupA2W(&lpszDriverW, lpszDriver); + if (!NT_SUCCESS(Status)) + SetLastError(RtlNtStatusToDosError(Status)); else { - Status = HEAP_strdupA2W ( &lpszDeviceW, lpszDevice ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); + Status = HEAP_strdupA2W(&lpszDeviceW, lpszDevice); + if (!NT_SUCCESS(Status)) + SetLastError(RtlNtStatusToDosError(Status)); else { - Status = HEAP_strdupA2W ( &lpszOutputW, lpszOutput ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); + Status = HEAP_strdupA2W(&lpszOutputW, lpszOutput); + if (!NT_SUCCESS(Status)) + SetLastError(RtlNtStatusToDosError(Status)); else { - if ( lpdvmInit ) + if (lpdvmInit) dvmInitW = GdiConvertToDevmodeW((LPDEVMODEA)lpdvmInit); - rc = IntCreateDICW ( lpszDriverW, - lpszDeviceW, - lpszOutputW, - lpdvmInit ? dvmInitW : NULL, - 1 ); - HEAP_free (dvmInitW); - HEAP_free ( lpszOutputW ); - } - HEAP_free ( lpszDeviceW ); - } - HEAP_free ( lpszDriverW ); - } - return rc; + hdc = IntCreateDICW(lpszDriverW, + lpszDeviceW, + lpszOutputW, + lpdvmInit ? dvmInitW : NULL, + 1 ); + HEAP_free(dvmInitW); + HEAP_free(lpszOutputW); + } + HEAP_free(lpszDeviceW); + } + HEAP_free(lpszDriverW); + } + + return hdc; } @@ -276,14 +280,14 @@ */ BOOL WINAPI -DeleteDC(HDC hDC) -{ - BOOL Ret = TRUE; +DeleteDC(HDC hdc) +{ + BOOL bResult = TRUE; PLDC pLDC = NULL; HANDLE hPrinter = NULL; - ULONG hType = GDI_HANDLE_GET_TYPE(hDC); - - pLDC = GdiGetLDC(hDC); + ULONG hType = GDI_HANDLE_GET_TYPE(hdc); + + pLDC = GdiGetLDC(hdc); if (hType != GDILoObjType_LO_DC_TYPE) { @@ -293,24 +297,27 @@ SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (pLDC->Flags & LDC_INIT_DOCUMENT) AbortDoc(hDC); + if (pLDC->Flags & LDC_INIT_DOCUMENT) AbortDoc(hdc); if (pLDC->hPrinter) { - DocumentEventEx(NULL, pLDC->hPrinter, hDC, DOCUMENTEVENT_DELETEDC, 0, NULL, 0, NULL); + DocumentEventEx(NULL, pLDC->hPrinter, hdc, DOCUMENTEVENT_DELETEDC, 0, NULL, 0, NULL); hPrinter = pLDC->hPrinter; pLDC->hPrinter = NULL; } } - Ret = NtGdiDeleteObjectApp(hDC); - - if (Ret && pLDC ) + bResult = NtGdiDeleteObjectApp(hdc); + + if (bResult && pLDC) { DPRINT1("Delete the Local DC structure\n"); LocalFree( pLDC ); } - if (hPrinter) fpClosePrinter(hPrinter); - return Ret; + + if (hPrinter) + fpClosePrinter(hPrinter); + + return bResult; } /* @@ -370,7 +377,7 @@ PTEB pTeb; PGDIBSOBJECT pgO; - if ((!GdiGetHandleUserData(hObject, dwType, (PVOID) &Brh_Attr)) || + if ((!GdiGetHandleUserData(hObject, dwType, (PVOID*)&Brh_Attr)) || (Brh_Attr == NULL)) break; pTeb = NtCurrentTeb(); @@ -397,7 +404,8 @@ INT WINAPI -GetArcDirection( HDC hdc ) +GetArcDirection( + _In_ HDC hdc) { return GetDCDWord( hdc, GdiGetArcDirection, 0); } @@ -405,9 +413,11 @@ INT WINAPI -SetArcDirection( HDC hdc, INT nDirection ) -{ - return GetAndSetDCDWord( hdc, GdiGetSetArcDirection, nDirection, 0, 0, 0 ); +SetArcDirection( + _In_ HDC hdc, + _In_ INT nDirection) +{ + return GetAndSetDCDWord(hdc, GdiGetSetArcDirection, nDirection, 0, 0, 0); } /* @@ -474,24 +484,25 @@ */ int WINAPI -GetDeviceCaps(HDC hDC, - int i) -{ - PDC_ATTR Dc_Attr; +GetDeviceCaps( + _In_ HDC hdc, + _In_ int nIndex) +{ + PDC_ATTR pdcattr; PLDC pLDC; PDEVCAPS pDevCaps = GdiDevCaps; // Primary display device capabilities. DPRINT("Device CAPS1\n"); - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - { - if ( i == TECHNOLOGY) return DT_METAFILE; + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + { + if (nIndex == TECHNOLOGY) return DT_METAFILE; return 0; } else { - pLDC = GdiGetLDC(hDC); + pLDC = GdiGetLDC(hdc); if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -499,7 +510,7 @@ } if (!(pLDC->Flags & LDC_DEVCAPS)) { - if (!NtGdiGetDeviceCapsAll(hDC, &pLDC->DevCaps)) + if (!NtGdiGetDeviceCapsAll(hdc, &pLDC->DevCaps)) SetLastError(ERROR_INVALID_PARAMETER); pLDC->Flags |= LDC_DEVCAPS; } @@ -508,14 +519,14 @@ } else { - if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) return 0; - if (!(Dc_Attr->ulDirty_ & DC_PRIMARY_DISPLAY) ) - return NtGdiGetDeviceCaps(hDC,i); + if (!(pdcattr->ulDirty_ & DC_PRIMARY_DISPLAY) ) + return NtGdiGetDeviceCaps(hdc, nIndex); } DPRINT("Device CAPS2\n"); - switch (i) + switch (nIndex) { case DRIVERVERSION: return pDevCaps->ulVersion; @@ -643,11 +654,10 @@ DWORD WINAPI GetRelAbs( - HDC hdc, - DWORD dwIgnore -) -{ - return GetDCDWord( hdc, GdiGetRelAbs, 0); + _In_ HDC hdc, + _In_ DWORD dwIgnore) +{ + return GetDCDWord(hdc, GdiGetRelAbs, 0); } @@ -658,10 +668,9 @@ WINAPI SetRelAbs( HDC hdc, - INT Mode -) -{ - return GetAndSetDCDWord( hdc, GdiGetSetRelAbs, Mode, 0, 0, 0 ); + INT Mode) +{ + return GetAndSetDCDWord(hdc, GdiGetSetRelAbs, Mode, 0, 0, 0); } @@ -670,17 +679,25 @@ */ DWORD WINAPI -GetAndSetDCDWord( HDC hDC, INT u, DWORD dwIn, DWORD Unk1, DWORD Unk2, DWORD Unk3 ) -{ +GetAndSetDCDWord( + _In_ HDC hdc, + _In_ UINT u, + _In_ DWORD dwIn, + _In_ ULONG ulMFId, + _In_ USHORT usMF16Id, + _In_ DWORD dwError) +{ + DWORD dwResult; BOOL Ret = TRUE; -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + + /* Handle something other than a normal dc object. */ + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) return 0; //call MFDRV else { - PLDC pLDC = GdiGetLDC(hDC); + PLDC pLDC = GdiGetLDC(hdc); if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -695,12 +712,14 @@ } } } - Ret = NtGdiGetAndSetDCDword( hDC, u, dwIn, (DWORD*) &u ); - if (Ret) - return u; - else + + if (!NtGdiGetAndSetDCDword(hdc, u, dwIn, &dwResult)) + { SetLastError(ERROR_INVALID_HANDLE); - return 0; + return 0; + } + + return dwResult; } @@ -709,11 +728,19 @@ */ DWORD WINAPI -GetDCDWord( HDC hDC, INT u, DWORD Result ) -{ - BOOL Ret = NtGdiGetDCDword( hDC, u, (DWORD*) &u ); - if (!Ret) return Result; - else return u; +GetDCDWord( + _In_ HDC hdc, + _In_ UINT u, + _In_ DWORD dwError) +{ + DWORD dwResult; + + if (!NtGdiGetDCDword(hdc, u, &dwResult)) + { + return dwError; + } + + return dwResult; } @@ -724,10 +751,9 @@ WINAPI GetAspectRatioFilterEx( HDC hdc, - LPSIZE lpAspectRatio -) -{ - return NtGdiGetDCPoint( hdc, GdiGetAspectRatioFilter, (PPOINTL) lpAspectRatio ); + LPSIZE lpAspectRatio) +{ + return NtGdiGetDCPoint(hdc, GdiGetAspectRatioFilter, (PPOINTL)lpAspectRatio ); } @@ -738,8 +764,7 @@ WINAPI GetDCOrgEx( HDC hdc, - LPPOINT lpPoint -) + LPPOINT lpPoint) { return NtGdiGetDCPoint( hdc, GdiGetDCOrg, (PPOINTL)lpPoint ); } @@ -766,7 +791,10 @@ */ int WINAPI -GetObjectW(HGDIOBJ hGdiObj, int cbSize, LPVOID lpBuffer) +GetObjectW( + _In_ HGDIOBJ hGdiObj, + _In_ int cbSize, + _Out_ LPVOID lpBuffer) { DWORD dwType; INT cbResult = 0; @@ -858,7 +886,10 @@ ULONG WINAPI -GetFontObjectA(HGDIOBJ hfont, ULONG cbSize, LPVOID lpBuffer) +GetFontObjectA( + _In_ HGDIOBJ hfont, + _In_ ULONG cbSize, + _Out_ LPVOID lpBuffer) { ENUMLOGFONTEXDVW elfedvW; ENUMLOGFONTEXDVA elfedvA; @@ -904,7 +935,10 @@ */ int WINAPI -GetObjectA(HGDIOBJ hGdiObj, int cbSize, LPVOID lpBuffer) +GetObjectA( + _In_ HGDIOBJ hGdiObj, + _In_ int cbSize, + _Out_ LPVOID lpBuffer) { DWORD dwType = GDI_HANDLE_GET_TYPE(hGdiObj); @@ -927,13 +961,15 @@ COLORREF WINAPI GetDCBrushColor( - HDC hdc -) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return CLR_INVALID; - return (COLORREF) Dc_Attr->ulBrushClr; + _In_ HDC hdc) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + return CLR_INVALID; + + return pdcattr->ulBrushClr; } /* @@ -942,13 +978,14 @@ COLORREF WINAPI GetDCPenColor( - HDC hdc -) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return CLR_INVALID; - return (COLORREF) Dc_Attr->ulPenClr; + _In_ HDC hdc) +{ + PDC_ATTR pdcattr; + + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + return CLR_INVALID; + + return pdcattr->ulPenClr; } /* @@ -957,26 +994,27 @@ COLORREF WINAPI SetDCBrushColor( - HDC hdc, - COLORREF crColor -) -{ - PDC_ATTR Dc_Attr; - COLORREF OldColor = CLR_INVALID; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return OldColor; - else - { - OldColor = (COLORREF) Dc_Attr->ulBrushClr; - Dc_Attr->ulBrushClr = (ULONG) crColor; - - if ( Dc_Attr->crBrushClr != crColor ) // if same, don't force a copy. - { - Dc_Attr->ulDirty_ |= DIRTY_FILL; - Dc_Attr->crBrushClr = crColor; - } - } - return OldColor; + _In_ HDC hdc, + _In_ COLORREF crColor) +{ + PDC_ATTR pdcattr; + COLORREF crOldColor; + + /* Get the DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + return CLR_INVALID; + + /* Get old color and store the new */ + crOldColor = pdcattr->ulBrushClr; + pdcattr->ulBrushClr = crColor; + + if (pdcattr->crBrushClr != crColor) + { + pdcattr->ulDirty_ |= DIRTY_FILL; + pdcattr->crBrushClr = crColor; + } + + return crOldColor; } /* @@ -989,18 +1027,18 @@ _In_ COLORREF crColor) { PDC_ATTR pdcattr; - COLORREF OldColor; - - /* Get the dc attribute */ + COLORREF crOldColor; + + /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); - if (!pdcattr) + if (pdcattr == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return CLR_INVALID; } /* Get old color and store the new */ - OldColor = (COLORREF)pdcattr->ulPenClr; + crOldColor = pdcattr->ulPenClr; pdcattr->ulPenClr = (ULONG)crColor; if (pdcattr->crPenClr != crColor) @@ -1009,7 +1047,7 @@ pdcattr->crPenClr = crColor; } - return OldColor; + return crOldColor; } /* @@ -1018,11 +1056,16 @@ */ COLORREF WINAPI -GetBkColor(HDC hdc) -{ - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - return Dc_Attr->ulBackgroundClr; +GetBkColor( + _In_ HDC hdc) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + return 0; + + return pdcattr->ulBackgroundClr; } /* @@ -1031,22 +1074,24 @@ COLORREF WINAPI SetBkColor( - HDC hdc, - COLORREF crColor -) -{ - PDC_ATTR Dc_Attr; - COLORREF OldColor = CLR_INVALID; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return OldColor; + _In_ HDC hdc, + _In_ COLORREF crColor) +{ + PDC_ATTR pdcattr; + COLORREF crOldColor; + + /* Get the DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + return CLR_INVALID; + #if 0 - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SetBkColor( hDC, crColor ); + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetBkColor(hdc, crColor ); else { - PLDC pLDC = Dc_Attr->pvLDC; + PLDC pLDC = pdcattr->pvLDC; if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -1054,20 +1099,23 @@ } if (pLDC->iType == LDC_EMFLDC) { - return EMFDRV_SetBkColor( hDC, crColor ); + return EMFDRV_SetBkColor(hdc, crColor ); } } } #endif - OldColor = (COLORREF) Dc_Attr->ulBackgroundClr; - Dc_Attr->ulBackgroundClr = (ULONG) crColor; - - if ( Dc_Attr->crBackgroundClr != crColor ) - { - Dc_Attr->ulDirty_ |= (DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL); - Dc_Attr->crBackgroundClr = crColor; - } - return OldColor; + + /* Get old color and store the new */ + crOldColor = pdcattr->ulBackgroundClr; + pdcattr->ulBackgroundClr = crColor; + + if (pdcattr->crBackgroundClr != crColor) + { + pdcattr->ulDirty_ |= (DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL); + pdcattr->crBackgroundClr = crColor; + } + + return crOldColor; } /* @@ -1078,9 +1126,13 @@ WINAPI GetBkMode(HDC hdc) { - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - return Dc_Attr->lBkMode; + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + return 0; + + return pdcattr->lBkMode; } /* @@ -1089,37 +1141,42 @@ */ int WINAPI -SetBkMode(HDC hdc, - int iBkMode) -{ - PDC_ATTR Dc_Attr; - INT OldMode = 0; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return OldMode; +SetBkMode( + _In_ HDC hdc, + _In_ int iBkMode) +{ + PDC_ATTR pdcattr; + INT iOldMode; + + /* Get the DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + return 0; #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) return MFDRV_SetBkMode( hdc, iBkMode ) - else - { - PLDC pLDC = Dc_Attr->pvLDC; - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_SetBkMode( hdc, iBkMode ) - } - } - } + else + { + PLDC pLDC = pdcattr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetBkMode(hdc, iBkMode) + } + } + } #endif - OldMode = Dc_Attr->lBkMode; - Dc_Attr->jBkMode = iBkMode; // Processed - Dc_Attr->lBkMode = iBkMode; // Raw - return OldMode; + + iOldMode = pdcattr->lBkMode; + pdcattr->jBkMode = iBkMode; // Processed + pdcattr->lBkMode = iBkMode; // Raw + + return iOldMode; } /* @@ -1130,9 +1187,17 @@ WINAPI GetPolyFillMode(HDC hdc) { - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - return Dc_Attr->lFillMode; + PDC_ATTR pdcattr; + + /* Get DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + return 0; + } + + /* Return current fill mode */ + return pdcattr->lFillMode; } /* @@ -1140,11 +1205,13 @@ */ int WINAPI -SetPolyFillMode(HDC hdc, - int iPolyFillMode) -{ - INT fmode; - PDC_ATTR Dc_Attr; +SetPolyFillMode( + _In_ HDC hdc, + _In_ int iPolyFillMode) +{ + INT iOldPolyFillMode; + PDC_ATTR pdcattr; + #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { @@ -1165,21 +1232,26 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; + + /* Get DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + { + return 0; + } if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { - if (Dc_Attr->ulDirty_ & DC_MODE_DIRTY) - { - NtGdiFlush(); // Sync up Dc_Attr from Kernel space. - Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); - } - } - - fmode = Dc_Attr->lFillMode; - Dc_Attr->lFillMode = iPolyFillMode; - - return fmode; + if (pdcattr->ulDirty_ & DC_MODE_DIRTY) + { + NtGdiFlush(); // Sync up pdcattr from Kernel space. + pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + + iOldPolyFillMode = pdcattr->lFillMode; + pdcattr->lFillMode = iPolyFillMode; + + return iOldPolyFillMode; } /* @@ -1190,9 +1262,16 @@ WINAPI GetGraphicsMode(HDC hdc) { - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - return Dc_Attr->iGraphicsMode; + PDC_ATTR pdcattr; + + /* Get DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + { + return 0; + } + + /* Return current graphics mode */ + return pdcattr->iGraphicsMode; } /* @@ -1200,37 +1279,48 @@ */ int WINAPI -SetGraphicsMode(HDC hdc, - int iMode) -{ - INT oMode; - PDC_ATTR Dc_Attr; +SetGraphicsMode( + _In_ HDC hdc, + _In_ int iMode) +{ + INT iOldMode; + PDC_ATTR pdcattr; + + /* Check parameters */ if ((iMode < GM_COMPATIBLE) || (iMode > GM_ADVANCED)) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - - if (iMode == Dc_Attr->iGraphicsMode) return iMode; + + /* Get DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + { + return 0; + } + + /* Check for trivial case */ + if (iMode == pdcattr->iGraphicsMode) + return iMode; if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { - if (Dc_Attr->ulDirty_ & DC_MODE_DIRTY) - { - NtGdiFlush(); // Sync up Dc_Attr from Kernel space. - Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); - } - } + if (pdcattr->ulDirty_ & DC_MODE_DIRTY) + { + NtGdiFlush(); // Sync up pdcattr from Kernel space. + pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + /* One would think that setting the graphics mode to GM_COMPATIBLE * would also reset the world transformation matrix to the unity * matrix. However, in Windows, this is not the case. This doesn't * make a lot of sense to me, but that's the way it is. */ - oMode = Dc_Attr->iGraphicsMode; - Dc_Attr->iGraphicsMode = iMode; - - return oMode; + iOldMode = pdcattr->iGraphicsMode; + pdcattr->iGraphicsMode = iMode; + + return iOldMode; } /* @@ -1239,9 +1329,8 @@ HDC WINAPI ResetDCW( - HDC hdc, - CONST DEVMODEW *lpInitData -) + _In_ HDC hdc, + _In_ CONST DEVMODEW *lpInitData) { NtGdiResetDC ( hdc, (PDEVMODEW)lpInitData, NULL, NULL, NULL); return hdc; @@ -1254,9 +1343,8 @@ HDC WINAPI ResetDCA( - HDC hdc, - CONST DEVMODEA *lpInitData -) + _In_ HDC hdc, + _In_ CONST DEVMODEA *lpInitData) { LPDEVMODEW InitDataW; @@ -1274,12 +1362,11 @@ DWORD WINAPI GetObjectType( - HGDIOBJ h -) + HGDIOBJ h) { DWORD Ret = 0; - if(GdiIsHandleValid(h)) + if (GdiIsHandleValid(h)) { LONG Type = GDI_HANDLE_GET_TYPE(h); switch(Type) @@ -1324,6 +1411,11 @@ break; case GDI_OBJECT_TYPE_EXTPEN: Ret = OBJ_EXTPEN; + break; + + case GDILoObjType_LO_ALTDC_TYPE: + // FIXME: could be something else? + Ret = OBJ_ENHMETADC; break; default: @@ -1344,23 +1436,27 @@ HGDIOBJ WINAPI GetStockObject( - INT h -) -{ - HGDIOBJ Ret = NULL; - if ((h < 0) || (h >= NB_STOCK_OBJECTS)) return Ret; - Ret = stock_objects[h]; - if (!Ret) - { - HGDIOBJ Obj = NtGdiGetStockObject( h ); - - if (GdiIsHandleValid(Obj)) - { - stock_objects[h] = Obj; - return Obj; - }// Returns Null anyway. - } - return Ret; + INT fnObject) +{ + HGDIOBJ hobj; + + if ((fnObject < 0) || (fnObject >= NB_STOCK_OBJECTS)) + return NULL; + + hobj = stock_objects[fnObject]; + if (hobj == NULL) + { + hobj = NtGdiGetStockObject(fnObject); + + if (!GdiIsHandleValid(hobj)) + { + return NULL; + } + + stock_objects[fnObject] = hobj; + } + + return hobj; } /* FIXME: include correct header */ @@ -1371,18 +1467,18 @@ HPALETTE WINAPI SelectPalette( - HDC hDC, - HPALETTE hPal, + HDC hdc, + HPALETTE hpal, BOOL bForceBackground) { #if 0 - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SelectPalette( hDC, hPal, bForceBackground); + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SelectPalette(hdc, hpal, bForceBackground); else { - PLDC pLDC = GdiGetLDC(hDC); + PLDC pLDC = GdiGetLDC(hdc); if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -1390,12 +1486,12 @@ } if (pLDC->iType == LDC_EMFLDC) { - if return EMFDRV_SelectPalette( hDC, hPal, bForceBackground); + if return EMFDRV_SelectPalette(hdc, hpal, bForceBackground); } } } #endif - return NtUserSelectPalette(hDC, hPal, bForceBackground); + return NtUserSelectPalette(hdc, hpal, bForceBackground); } /* @@ -1406,9 +1502,13 @@ WINAPI GetMapMode(HDC hdc) { - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - return Dc_Attr->iMapMode; + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &pdcattr)) + return 0; + + return pdcattr->iMapMode; } /* @@ -1422,30 +1522,33 @@ { PDC_ATTR pdcattr; + /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); - if (!pdcattr) + if (pdcattr == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } #if 0 - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) return MFDRV_SetMapMode(hdc, iMode); else { SetLastError(ERROR_INVALID_HANDLE); return 0; } + } #endif - // Force change if Isotropic is set for recompute. + /* Force change if Isotropic is set for recompute. */ if ((iMode != pdcattr->iMapMode) || (iMode == MM_ISOTROPIC)) { pdcattr->ulDirty_ &= ~SLOW_WIDTHS; return GetAndSetDCDWord( hdc, GdiGetSetMapMode, iMode, 0, 0, 0 ); } + return pdcattr->iMapMode; } @@ -1457,9 +1560,13 @@ WINAPI GetStretchBltMode(HDC hdc) { - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - return Dc_Attr->lStretchBltMode; + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + return 0; + + return pdcattr->lStretchBltMode; } /* @@ -1467,10 +1574,12 @@ */ int WINAPI -SetStretchBltMode(HDC hdc, int iStretchMode) -{ - INT oSMode; - PDC_ATTR Dc_Attr; +SetStretchBltMode( + _In_ HDC hdc, + _In_ int iStretchMode) +{ + INT iOldMode; + PDC_ATTR pdcattr; #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { @@ -1491,17 +1600,18 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - - oSMode = Dc_Attr->lStretchBltMode; - Dc_Attr->lStretchBltMode = iStretchMode; + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + return 0; + + iOldMode = pdcattr->lStretchBltMode; + pdcattr->lStretchBltMode = iStretchMode; // Wine returns an error here. We set the default. if ((iStretchMode <= 0) || (iStretchMode > MAXSTRETCHBLTMODE)) iStretchMode = WHITEONBLACK; - Dc_Attr->jStretchBltMode = iStretchMode; - - return oSMode; + pdcattr->jStretchBltMode = iStretchMode; + + return iOldMode; } /* @@ -1511,9 +1621,16 @@ WINAPI GetHFONT(HDC hdc) { - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return NULL; - return Dc_Attr->hlfntNew; + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + { + return NULL; + } + + /* Return the current font */ + return pdcattr->hlfntNew; } @@ -1523,14 +1640,15 @@ */ HGDIOBJ WINAPI -SelectObject(HDC hDC, - HGDIOBJ hGdiObj) -{ - PDC_ATTR pDc_Attr; +SelectObject( + _In_ HDC hdc, + _In_ HGDIOBJ hGdiObj) +{ + PDC_ATTR pdcattr; HGDIOBJ hOldObj = NULL; UINT uType; - if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) + if(!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) { SetLastError(ERROR_INVALID_HANDLE); return NULL; @@ -1547,39 +1665,39 @@ switch (uType) { case GDI_OBJECT_TYPE_REGION: - return (HGDIOBJ)ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY); + return (HGDIOBJ)ExtSelectClipRgn(hdc, hGdiObj, RGN_COPY); case GDI_OBJECT_TYPE_BITMAP: - return NtGdiSelectBitmap(hDC, hGdiObj); + return NtGdiSelectBitmap(hdc, hGdiObj); case GDI_OBJECT_TYPE_BRUSH: - hOldObj = pDc_Attr->hbrush; - pDc_Attr->ulDirty_ |= DC_BRUSH_DIRTY; - pDc_Attr->hbrush = hGdiObj; + hOldObj = pdcattr->hbrush; + pdcattr->ulDirty_ |= DC_BRUSH_DIRTY; + pdcattr->hbrush = hGdiObj; return hOldObj; -// return NtGdiSelectBrush(hDC, hGdiObj); +// return NtGdiSelectBrush(hdc, hGdiObj); case GDI_OBJECT_TYPE_PEN: case GDI_OBJECT_TYPE_EXTPEN: - hOldObj = pDc_Attr->hpen; - pDc_Attr->ulDirty_ |= DC_PEN_DIRTY; - pDc_Attr->hpen = hGdiObj; + hOldObj = pdcattr->hpen; + pdcattr->ulDirty_ |= DC_PEN_DIRTY; + pdcattr->hpen = hGdiObj; return hOldObj; -// return NtGdiSelectPen(hDC, hGdiObj); +// return NtGdiSelectPen(hdc, hGdiObj); case GDI_OBJECT_TYPE_FONT: - hOldObj = pDc_Attr->hlfntNew; + hOldObj = pdcattr->hlfntNew; if (hOldObj == hGdiObj) return hOldObj; - pDc_Attr->ulDirty_ &= ~SLOW_WIDTHS; - pDc_Attr->ulDirty_ |= DIRTY_CHARSET; - pDc_Attr->hlfntNew = hGdiObj; - - if (!(pDc_Attr->ulDirty_ & DC_DIBSECTION)) + pdcattr->ulDirty_ &= ~SLOW_WIDTHS; + pdcattr->ulDirty_ |= DIRTY_CHARSET; + pdcattr->hlfntNew = hGdiObj; + + if (!(pdcattr->ulDirty_ & DC_DIBSECTION)) { PGDIBSOBJECT pgO; - pgO = GdiAllocBatchCommand(hDC, GdiBCSelObj); + pgO = GdiAllocBatchCommand(hdc, GdiBCSelObj); if (pgO) { pgO->hgdiobj = hGdiObj; @@ -1588,18 +1706,18 @@ } // default for select object font - return NtGdiSelectFont(hDC, hGdiObj); + return NtGdiSelectFont(hdc, hGdiObj); #if 0 case GDI_OBJECT_TYPE_METADC: - return MFDRV_SelectObject( hDC, hGdiObj); + return MFDRV_SelectObject(hdc, hGdiObj); case GDI_OBJECT_TYPE_EMF: - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) return NULL; - return EMFDRV_SelectObject( hDC, hGdiObj); + PLDC pLDC = GdiGetLDC(hdc); + if (!pLDC) return NULL; + return EMFDRV_SelectObject(hdc, hGdiObj); #endif case GDI_OBJECT_TYPE_COLORSPACE: - SetColorSpace(hDC, (HCOLORSPACE) hGdiObj); + SetColorSpace(hdc, (HCOLORSPACE) hGdiObj); return NULL; case GDI_OBJECT_TYPE_PALETTE:

1 0

[jgardou] 65054: [KERNEL32] - Do not try to open memory events under the process object root directory. CORE-8600 #resolve
by jgardou＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: jgardou Date: Mon Oct 27 22:05:51 2014 New Revision: 65054 URL: http://svn.reactos.org/svn/reactos?rev=65054&view=rev Log: [KERNEL32] - Do not try to open memory events under the process object root directory. CORE-8600 #resolve Modified: trunk/reactos/dll/win32/kernel32/client/resntfy.c Modified: trunk/reactos/dll/win32/kernel32/client/resntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/resntfy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/resntfy.c [iso-8859-1] Mon Oct 27 22:05:51 2014 @@ -41,7 +41,7 @@ InitializeObjectAttributes(&ObjectAttributes, &EventName, 0, - BaseGetNamedObjectDirectory(), + NULL, NULL); Status = NtOpenEvent(&hEvent,

1 0

[tkreuzer] 65053: [GDI32] Add Support routines for client objects. Will be used later. You might wonder why the code uses a lame hash table to link the client object handles to the user mode pointe...
by tkreuzer＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: tkreuzer Date: Mon Oct 27 20:53:59 2014 New Revision: 65053 URL: http://svn.reactos.org/svn/reactos?rev=65053&view=rev Log: [GDI32] Add Support routines for client objects. Will be used later. You might wonder why the code uses a lame hash table to link the client object handles to the user mode pointer, when it should be clear that a *client* object should have a user mode attribute, like other objects, that we can use, especially since that is the only real purpose of that object. Well, tell that the MS developer, who implemented client objects without a user mode attribute... Added: trunk/reactos/win32ss/gdi/gdi32/objects/clientobj.c (with props) Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeLis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] Mon Oct 27 20:53:59 2014 @@ -24,6 +24,7 @@ objects/arc.c objects/bitmap.c objects/brush.c + objects/clientobj.c objects/coord.c objects/dc.c objects/eng.c Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Mon Oct 27 20:53:59 2014 @@ -395,4 +395,20 @@ #endif } +HGDIOBJ +WINAPI +GdiInsertClientObj( + _In_ PVOID pvObject, + _In_ GDILOOBJTYPE eObjType); + +PVOID +WINAPI +GdiGetClientObject( + _In_ HGDIOBJ hobj); + +PVOID +WINAPI +GdiRemoveClientObject( + _In_ HGDIOBJ hobj); + /* EOF */ Modified: trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/main/dll… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c [iso-8859-1] Mon Oct 27 20:53:59 2014 @@ -10,6 +10,7 @@ PGDIHANDLECACHE GdiHandleCache = NULL; BOOL gbLpk = FALSE; RTL_CRITICAL_SECTION semLocal; +extern CRITICAL_SECTION gcsClientObjLinks; /* * GDI32.DLL does have an entry point for disable threadlibrarycall,. The initialization is done by a call @@ -49,6 +50,7 @@ GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; RtlInitializeCriticalSection(&semLocal); + InitializeCriticalSection(&gcsClientObjLinks); } Added: trunk/reactos/win32ss/gdi/gdi32/objects/clientobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/clientobj.c (added) +++ trunk/reactos/win32ss/gdi/gdi32/objects/clientobj.c [iso-8859-1] Mon Oct 27 20:53:59 2014 @@ -0,0 +1,150 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WIN32 subsystem + * PURPOSE: Support functions for GDI client objects + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <precomp.h> + +CRITICAL_SECTION gcsClientObjLinks; + +typedef struct _CLIENTOBJLINK +{ + struct _CLIENTOBJLINK *pcolNext; + HGDIOBJ hobj; + PVOID pvObj; +} CLIENTOBJLINK, *PCLIENTOBJLINK; + +PCLIENTOBJLINK gapcolHashTable[127]; + +HGDIOBJ +WINAPI +GdiInsertClientObj( + _In_ PVOID pvObject, + _In_ GDILOOBJTYPE eObjType) +{ + PCLIENTOBJLINK pcol; + ULONG iHashIndex; + HGDIOBJ hobj; + + /* Call win32k to create a client object handle */ + hobj = NtGdiCreateClientObj(eObjType); + if (hobj == NULL) + { + return NULL; + } + + /* Calculate the hash index */ + iHashIndex = (ULONG_PTR)hobj % _countof(gapcolHashTable); + + /* Allocate a link structure */ + pcol = HeapAlloc(GetProcessHeap(), 0, sizeof(*pcol)); + if (pcol == NULL) + { + NtGdiDeleteClientObj(hobj); + return NULL; + } + + /* Setup the link structure */ + pcol->hobj = hobj; + pcol->pvObj = pvObject; + + /* Enter the critical section */ + EnterCriticalSection(&gcsClientObjLinks); + + /* Insert the link structure */ + pcol->pcolNext = gapcolHashTable[iHashIndex]; + gapcolHashTable[iHashIndex] = pcol; + + /* Leave the critical section */ + LeaveCriticalSection(&gcsClientObjLinks); + + return hobj; +} + +PVOID +WINAPI +GdiGetClientObject( + _In_ HGDIOBJ hobj) +{ + ULONG iHashIndex; + PCLIENTOBJLINK pcol; + PVOID pvObject = NULL; + + /* Calculate the hash index */ + iHashIndex = (ULONG_PTR)hobj % _countof(gapcolHashTable); + + /* Enter the critical section */ + EnterCriticalSection(&gcsClientObjLinks); + + /* Loop the link entries in this hash bucket */ + pcol = gapcolHashTable[iHashIndex]; + while (pcol != NULL) + { + /* Check if this is the object we want */ + if (pcol->hobj == hobj) + { + /* Get the object pointer and bail out */ + pvObject = pcol->pvObj; + break; + } + + /* Go to the next entry */ + pcol = pcol->pcolNext; + } + + /* Leave the critical section */ + LeaveCriticalSection(&gcsClientObjLinks); + + return pvObject; +} + +PVOID +WINAPI +GdiRemoveClientObject( + _In_ HGDIOBJ hobj) +{ + PCLIENTOBJLINK pcol, *ppcol; + ULONG iHashIndex; + PVOID pvObject = NULL; + + /* Calculate the hash index */ + iHashIndex = (ULONG_PTR)hobj % _countof(gapcolHashTable); + + /* Enter the critical section */ + EnterCriticalSection(&gcsClientObjLinks); + + /* Loop the link entries in this hash bucket */ + ppcol = &gapcolHashTable[iHashIndex]; + while (*ppcol != NULL) + { + /* Get the current client object link */ + pcol = *ppcol; + + /* Check if this is the one we want */ + if (pcol->hobj == hobj) + { + /* Update the link pointer, removing this link */ + *ppcol = pcol->pcolNext; + + /* Get the object pointer */ + pvObject = pcol->pvObj; + + /* Free the link structure */ + HeapFree(GetProcessHeap(), 0, pcol); + + /* We're done */ + break; + } + + /* Go to the next link pointer */ + ppcol = &(pcol->pcolNext); + } + + /* Leave the critical section */ + LeaveCriticalSection(&gcsClientObjLinks); + + /* Return the object pointer, or NULL if we did not find it */ + return pvObject; +} Propchange: trunk/reactos/win32ss/gdi/gdi32/objects/clientobj.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 65052: [WIN32K] - Fail in NtGdiCreateClientObj, when the object type is not valid. This is based on Windows behavior, only more strict. Windows allows to set the stock bit and reuse coun...
by tkreuzer＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: tkreuzer Date: Mon Oct 27 20:40:11 2014 New Revision: 65052 URL: http://svn.reactos.org/svn/reactos?rev=65052&view=rev Log: [WIN32K] - Fail in NtGdiCreateClientObj, when the object type is not valid. This is based on Windows behavior, only more strict. Windows allows to set the stock bit and reuse count, which is probably not what we want. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Mon Oct 27 20:40:11 2014 @@ -1272,6 +1272,15 @@ POBJ pObject; HANDLE handle; + /* Check if ulType is valid */ + if ((ulType != GDILoObjType_LO_METAFILE16_TYPE) && + (ulType != GDILoObjType_LO_METAFILE_TYPE) && + (ulType != GDILoObjType_LO_METADC16_TYPE)) + { + DPRINT1("NtGdiCreateClientObj: Invalid object type 0x%lx.\n", ulType); + return NULL; + } + /* Allocate a new object */ pObject = GDIOBJ_AllocateObject(GDIObjType_CLIENTOBJ_TYPE, sizeof(CLIENTOBJ), @@ -1281,9 +1290,6 @@ DPRINT1("NtGdiCreateClientObj: Could not allocate a clientobj.\n"); return NULL; } - - /* Mask out everything that would change the type in a wrong manner */ - ulType &= (GDI_HANDLE_TYPE_MASK & ~GDI_HANDLE_BASETYPE_MASK); /* Set the real object type */ pObject->hHmgr = UlongToHandle(ulType | GDILoObjType_LO_CLIENTOBJ_TYPE);

1 0

[gadamopoulos] 65051: [SHELL32] - Rewrite the monstrosity that was supposed to open control panel items. Still not really correct but works.
by gadamopoulos＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: gadamopoulos Date: Mon Oct 27 18:26:09 2014 New Revision: 65051 URL: http://svn.reactos.org/svn/reactos?rev=65051&view=rev Log: [SHELL32] - Rewrite the monstrosity that was supposed to open control panel items. Still not really correct but works. Modified: branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp branches/shell-experiments/dll/win32/shell32/folders/cpanel.h Modified: branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Mon Oct 27 18:26:09 2014 @@ -763,126 +763,6 @@ return S_OK; } - -/************************************************************************** -* IShellExecuteHookW Implementation -*/ - -static HRESULT -ExecuteAppletFromCLSID(LPOLESTR pOleStr) -{ - WCHAR wszBuf[128], wszCmd[MAX_PATH]; - DWORD cbCmd = sizeof(wszCmd); - - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"CLSID\\%s\\shell\\open\\command", pOleStr); - - if (RegGetValueW(HKEY_CLASSES_ROOT, wszBuf, NULL, RRF_RT_REG_SZ, NULL, (PVOID)wszCmd, &cbCmd) != ERROR_SUCCESS) - { - ERR("RegGetValueW(%ls) failed with %u\n", wszBuf, GetLastError()); - return E_FAIL; - } - - if (!ExpandEnvironmentStringsW(wszCmd, wszBuf, _countof(wszBuf))) - return E_FAIL; - - PROCESS_INFORMATION pi; - STARTUPINFOW si; - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - if (!CreateProcessW(NULL, wszBuf, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - return E_FAIL; - - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - return S_OK; -} - -EXTERN_C void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); - -HRESULT WINAPI CControlPanelFolder::ExecuteFromIdList(LPCITEMIDLIST pidl) -{ - PIDLCPanelStruct *pCPanel = _ILGetCPanelPointer(ILFindLastID(pidl)); - - if (!pCPanel) - { - /* Is it GUID to control panel applet? */ - IID *piid = _ILGetGUIDPointer(ILFindLastID(pidl)); - if (!piid) - return E_INVALIDARG; - - /* Start it */ - LPOLESTR pOleStr; - if (StringFromCLSID(*piid, &pOleStr) == S_OK) - { - HRESULT hr = ExecuteAppletFromCLSID(pOleStr); - CoTaskMemFree(pOleStr); - return hr; - } - - ERR("Cannot open cpanel applet\n"); - return E_INVALIDARG; - } - - /* Build control panel applet cmd - Note: we pass the applet name to Control_RunDLL to distinguish between multiple applets in one .cpl file */ - WCHAR wszCmd[2*MAX_PATH]; - WCHAR wszAppletName[MAX_PATH]; - - if(!MultiByteToWideChar(CP_ACP, 0, pCPanel->szName + pCPanel->offsDispName, -1, wszAppletName, MAX_PATH)) - return E_FAIL; - - StringCbPrintfW(wszCmd, sizeof(wszCmd), L"rundll32 shell32.dll,Control_RunDLL \"%hs\",\"%ls\"", pCPanel->szName, wszAppletName); - - /* Start the applet */ - TRACE("Run cpl %ls\n", wszCmd); - STARTUPINFO si; - PROCESS_INFORMATION pi; - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - if (!CreateProcessW(NULL, wszCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - return E_FAIL; - - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - return S_OK; -} - -HRESULT WINAPI CControlPanelFolder::Execute(LPSHELLEXECUTEINFOW psei) -{ - TRACE("(%p)->execute(%p)\n", this, psei); - - if (!psei) - return E_INVALIDARG; - - if (!(psei->fMask & SEE_MASK_IDLIST)) - { - FIXME("no idlist given!\n"); - return E_FAIL; - } - - return ExecuteFromIdList((LPCITEMIDLIST)psei->lpIDList); -} - -/************************************************************************** -* IShellExecuteHookA Implementation -*/ - -HRESULT WINAPI CControlPanelFolder::Execute(LPSHELLEXECUTEINFOA psei) -{ - TRACE("(%p)->execute(%p)\n", this, psei); - - if (!psei) - return E_INVALIDARG; - - if (!(psei->fMask & SEE_MASK_IDLIST)) - { - FIXME("no idlist given!\n"); - return E_FAIL; - } - - return ExecuteFromIdList((LPCITEMIDLIST)psei->lpIDList); -} - /************************************************************************** * IContextMenu2 Implementation */ @@ -929,30 +809,38 @@ */ HRESULT WINAPI CControlPanelFolder::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { - SHELLEXECUTEINFOW sei; WCHAR szPath[MAX_PATH]; char szTarget[MAX_PATH]; STRRET strret; WCHAR* pszPath; INT Length, cLength; - PIDLCPanelStruct *pcpanel; CComPtr<IPersistFile> ppf; CComPtr<IShellLinkA> isl; HRESULT hResult; + PIDLCPanelStruct *pcpanel = _ILGetCPanelPointer(apidl[0]); + TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n", this, lpcmi, lpcmi->lpVerb, lpcmi->hwnd); if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_OPEN)) //FIXME { - ZeroMemory(&sei, sizeof(sei)); - sei.cbSize = sizeof(sei); - sei.fMask = SEE_MASK_INVOKEIDLIST; - sei.lpIDList = ILCombine(pidlRoot, apidl[0]); - sei.hwnd = lpcmi->hwnd; - sei.nShow = SW_SHOWNORMAL; - sei.lpVerb = L"open"; -ERR("here\n"); - return Execute(&sei); + LPITEMIDLIST lpIDList = ILCombine(pidlRoot, apidl[0]); + + if (!pcpanel) + { + /* UGLY HACK! */ + LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageW(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + HRESULT hr; + + if (lpSB == NULL) + return E_FAIL; + + hr = lpSB->BrowseObject(lpIDList, 0); + return hr; + } + + /* Note: we pass the applet name to Control_RunDLL to distinguish between multiple applets in one .cpl file */ + ShellExecuteA(NULL, "cplopen", pcpanel->szName, pcpanel->szName + pcpanel->offsDispName, NULL, 0); } else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_CREATELINK)) //FIXME { Modified: branches/shell-experiments/dll/win32/shell32/folders/cpanel.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/cpanel.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/cpanel.h [iso-8859-1] Mon Oct 27 18:26:09 2014 @@ -27,8 +27,6 @@ public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder2, - public IShellExecuteHookA, - public IShellExecuteHookW, public IContextMenu2 { private: @@ -75,12 +73,6 @@ // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); - // IShellExecuteHookW - virtual HRESULT WINAPI Execute(LPSHELLEXECUTEINFOW psei); - - // IShellExecuteHookA - virtual HRESULT WINAPI Execute(LPSHELLEXECUTEINFOA psei); - // IContextMenu virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); @@ -100,8 +92,6 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IShellExecuteHookA, IShellExecuteHookA) - COM_INTERFACE_ENTRY_IID(IID_IShellExecuteHookW, IShellExecuteHookW) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) END_COM_MAP()

1 0

[zguo] 65049: [0.3.17] Set version number for release.
by zguo＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: zguo Date: Mon Oct 27 17:23:05 2014 New Revision: 65049 URL: http://svn.reactos.org/svn/reactos?rev=65049&view=rev Log: [0.3.17] Set version number for release. Modified: branches/0.3.17/reactos/include/reactos/version.cmake Modified: branches/0.3.17/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/include/reactos/… ============================================================================== --- branches/0.3.17/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/0.3.17/reactos/include/reactos/version.cmake [iso-8859-1] Mon Oct 27 17:23:05 2014 @@ -32,11 +32,11 @@ today(KERNEL_VERSION_BUILD) set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "4") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "3") +set(KERNEL_VERSION_PATCH_LEVEL "17") set(COPYRIGHT_YEAR "2014") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")

1 0

[akhaldi] 65050: [ADVAPI32] * Update GetTrusteeForm{A, W}(). CORE-8540
by akhaldi＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: akhaldi Date: Mon Oct 27 17:23:05 2014 New Revision: 65050 URL: http://svn.reactos.org/svn/reactos?rev=65050&view=rev Log: [ADVAPI32] * Update GetTrusteeForm{A,W}(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Mon Oct 27 17:23:05 2014 @@ -2037,25 +2037,32 @@ pTrustee->ptstrName = name; } -/****************************************************************************** - * GetTrusteeFormW [ADVAPI32.@] - */ -TRUSTEE_FORM WINAPI -GetTrusteeFormA(PTRUSTEE_A pTrustee) -{ - return pTrustee->TrusteeForm; -} - - -/****************************************************************************** - * GetTrusteeFormW [ADVAPI32.@] - */ -TRUSTEE_FORM WINAPI -GetTrusteeFormW(PTRUSTEE_W pTrustee) -{ - return pTrustee->TrusteeForm; -} - +/****************************************************************************** + * GetTrusteeFormA [ADVAPI32.@] + */ +TRUSTEE_FORM WINAPI GetTrusteeFormA(PTRUSTEEA pTrustee) +{ + TRACE("(%p)\n", pTrustee); + + if (!pTrustee) + return TRUSTEE_BAD_FORM; + + return pTrustee->TrusteeForm; +} + +/****************************************************************************** + * GetTrusteeFormW [ADVAPI32.@] + */ +TRUSTEE_FORM WINAPI GetTrusteeFormW(PTRUSTEEW pTrustee) +{ + TRACE("(%p)\n", pTrustee); + + if (!pTrustee) + return TRUSTEE_BAD_FORM; + + return pTrustee->TrusteeForm; +} + /****************************************************************************** * GetTrusteeNameA [ADVAPI32.@] */

1 0

[zguo] 65048: [NTFS] Cherrypick additional NTFS related fixes, including ability to browse NTFS volume.
by zguo＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: zguo Date: Mon Oct 27 17:18:17 2014 New Revision: 65048 URL: http://svn.reactos.org/svn/reactos?rev=65048&view=rev Log: [NTFS] Cherrypick additional NTFS related fixes, including ability to browse NTFS volume. Modified: branches/0.3.17/reactos/ (props changed) branches/0.3.17/reactos/drivers/filesystems/ntfs/attrib.c branches/0.3.17/reactos/drivers/filesystems/ntfs/dirctl.c branches/0.3.17/reactos/drivers/filesystems/ntfs/fcb.c branches/0.3.17/reactos/drivers/filesystems/ntfs/mft.c branches/0.3.17/reactos/drivers/filesystems/ntfs/ntfs.h Propchange: branches/0.3.17/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 27 17:18:17 2014 @@ -18,4 +18,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976 +/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976,65025-65028,65041 Modified: branches/0.3.17/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/filesyst… ============================================================================== --- branches/0.3.17/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Mon Oct 27 17:18:17 2014 @@ -287,16 +287,25 @@ } PFILENAME_ATTRIBUTE -GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord) +GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord, UCHAR NameType) { PNTFS_ATTR_RECORD Attribute; + PFILENAME_ATTRIBUTE Name; Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && Attribute->Type != AttributeEnd) { if (Attribute->Type == AttributeFileName) - return (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + { + Name = (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + if (Name->NameType == NameType || + (Name->NameType == NTFS_FILE_NAME_WIN32_AND_DOS && NameType == NTFS_FILE_NAME_WIN32) || + (Name->NameType == NTFS_FILE_NAME_WIN32_AND_DOS && NameType == NTFS_FILE_NAME_DOS)) + { + return Name; + } + } Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); } Modified: branches/0.3.17/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/filesyst… ============================================================================== --- branches/0.3.17/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Mon Oct 27 17:18:17 2014 @@ -135,7 +135,7 @@ DPRINT("NtfsGetNameInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -163,7 +163,7 @@ DPRINT("NtfsGetDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -204,7 +204,7 @@ DPRINT("NtfsGetFullDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -242,12 +242,13 @@ ULONG BufferLength) { ULONG Length; - PFILENAME_ATTRIBUTE FileName; + PFILENAME_ATTRIBUTE FileName, ShortFileName; DPRINT("NtfsGetBothDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord); + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); ASSERT(FileName != NULL); + ShortFileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); Length = FileName->NameLength * sizeof (WCHAR); if ((sizeof(FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) @@ -258,6 +259,19 @@ ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, sizeof(ULONG)); RtlCopyMemory(Info->FileName, FileName->Name, Length); + if (ShortFileName) + { + /* Should we upcase the filename? */ + ASSERT(ShortFileName->NameLength <= ARRAYSIZE(Info->ShortName)); + Info->ShortNameLength = ShortFileName->NameLength * sizeof(WCHAR); + RtlCopyMemory(Info->ShortName, ShortFileName->Name, Info->ShortNameLength); + } + else + { + Info->ShortName[0] = 0; + Info->ShortNameLength = 0; + } + Info->CreationTime.QuadPart = FileName->CreationTime; Info->LastAccessTime.QuadPart = FileName->LastAccessTime; Info->LastWriteTime.QuadPart = FileName->LastWriteTime; @@ -271,9 +285,6 @@ // Info->FileIndex=; Info->EaSize = 0; - - Info->ShortName[0] = 0; - Info->ShortNameLength = 0; return STATUS_SUCCESS; } Modified: branches/0.3.17/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/filesyst… ============================================================================== --- branches/0.3.17/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Mon Oct 27 17:18:17 2014 @@ -289,7 +289,7 @@ return NULL; } - FileName = GetFileNameFromRecord(MftRecord); + FileName = GetFileNameFromRecord(MftRecord, NTFS_FILE_NAME_WIN32); if (!FileName) { ExFreePoolWithTag(MftRecord, TAG_NTFS); @@ -391,7 +391,7 @@ DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p)\n", Vcb, DirectoryFCB, Name, Record, fileFCB); - FileName = GetFileNameFromRecord(Record); + FileName = GetFileNameFromRecord(Record, NTFS_FILE_NAME_WIN32); if (!FileName) { return STATUS_OBJECT_NAME_NOT_FOUND; // Not sure that's the best here Modified: branches/0.3.17/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/filesyst… ============================================================================== --- branches/0.3.17/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Mon Oct 27 17:18:17 2014 @@ -85,7 +85,7 @@ PCWSTR Name, ULONG NameLength) { - DPRINT1("FindAttributeHelper(%p, %p, %p, 0x%x, %S, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); + DPRINT("FindAttributeHelper(%p, %p, %p, 0x%x, %S, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); while (AttrRecord < AttrRecordEnd) { @@ -146,7 +146,7 @@ PWCHAR AttrName; AttrName = (PWCHAR)((PCHAR)AttrRecord + AttrRecord->NameOffset); - DPRINT("%s, %s\n", AttrName, Name); + DPRINT("%.*S, %.*S\n", AttrRecord->NameLength, AttrName, NameLength, Name); if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) { /* Found it, fill up the context and return. */ @@ -180,7 +180,7 @@ PNTFS_ATTR_RECORD AttrRecord; PNTFS_ATTR_RECORD AttrRecordEnd; - DPRINT1("FindAttribute(%p, %p, %u, %S, %u, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx); + DPRINT("FindAttribute(%p, %p, 0x%x, %S, %u, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx); AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + MftRecord->AttributeOffset); AttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + Vcb->NtfsInfo.BytesPerFileRecord); @@ -397,12 +397,12 @@ { ULONGLONG BytesRead; - DPRINT1("ReadFileRecord(%p, %I64x, %p)\n", Vcb, index, file); + DPRINT("ReadFileRecord(%p, %I64x, %p)\n", Vcb, index, file); BytesRead = ReadAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (PCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord); if (BytesRead != Vcb->NtfsInfo.BytesPerFileRecord) { - DPRINT1("ReadFileRecord failed: %u read, %u expected\n", BytesRead, Vcb->NtfsInfo.BytesPerFileRecord); + DPRINT1("ReadFileRecord failed: %I64u read, %u expected\n", BytesRead, Vcb->NtfsInfo.BytesPerFileRecord); return STATUS_PARTIAL_COPY; } @@ -469,7 +469,7 @@ EntryName.Buffer = IndexEntry->FileName.Name; EntryName.Length = - EntryName.MaximumLength = IndexEntry->FileName.NameLength; + EntryName.MaximumLength = IndexEntry->FileName.NameLength * sizeof(WCHAR); if (DirSearch) { @@ -477,7 +477,7 @@ } else { - return (RtlCompareUnicodeString(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == TRUE); + return (RtlCompareUnicodeString(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == 0); } } @@ -507,7 +507,7 @@ NTSTATUS Status; ULONG CurrentEntry = 0; - DPRINT1("NtfsFindMftRecord(%p, %I64d, %wZ, %p, %u, %p)\n", Vcb, MFTIndex, FileName, FirstEntry, DirSearch, OutMFTIndex); + DPRINT("NtfsFindMftRecord(%p, %I64d, %wZ, %p, %u, %p)\n", Vcb, MFTIndex, FileName, FirstEntry, DirSearch, OutMFTIndex); MftRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, @@ -631,9 +631,9 @@ IndexBuffer = (PINDEX_BUFFER)IndexRecord; ASSERT(IndexBuffer->Ntfs.Type == 'XDNI'); ASSERT(IndexBuffer->Header.AllocatedSize + 0x18 == IndexBlockSize); - IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)(&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); - IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); - //ASSERT(IndexEntryEnd <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); FIXME: Why doesn't it work? + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); + IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); + ASSERT(IndexEntryEnd <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) @@ -653,6 +653,7 @@ } ++CurrentEntry; + ASSERT(IndexEntry->Length >= sizeof(INDEX_ENTRY_ATTRIBUTE)); IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); } @@ -686,13 +687,13 @@ NTSTATUS Status; ULONG FirstEntry = 0; - DPRINT1("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); + DPRINT("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); FsRtlDissectName(*PathName, &Current, &Remaining); while (Current.Length != 0) { - DPRINT1("Current: %wZ\n", &Current); + DPRINT("Current: %wZ\n", &Current); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) @@ -701,7 +702,7 @@ } if (Remaining.Length == 0) - return STATUS_OBJECT_PATH_NOT_FOUND; + break; FsRtlDissectName(Current, &Current, &Remaining); } @@ -762,11 +763,12 @@ { NTSTATUS Status; - DPRINT1("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); + DPRINT("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) { + DPRINT("NtfsFindFileAt: NtfsFindMftRecord() failed with status 0x%08lx\n", Status); return Status; } Modified: branches/0.3.17/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/filesyst… ============================================================================== --- branches/0.3.17/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon Oct 27 17:18:17 2014 @@ -448,7 +448,7 @@ NtfsDumpFileAttributes(PFILE_RECORD_HEADER FileRecord); PFILENAME_ATTRIBUTE -GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord); +GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord, UCHAR NameType); /* blockdev.c */

1 0

[zguo] 65047: [WIN32K] Cherrypick margin fix for menus. CORE-8667
by zguo＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: zguo Date: Mon Oct 27 17:15:09 2014 New Revision: 65047 URL: http://svn.reactos.org/svn/reactos?rev=65047&view=rev Log: [WIN32K] Cherrypick margin fix for menus. CORE-8667 Modified: branches/0.3.17/reactos/ (props changed) branches/0.3.17/reactos/win32ss/user/ntuser/menu.c branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c Propchange: branches/0.3.17/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 27 17:15:09 2014 @@ -18,4 +18,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909 +/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976 Modified: branches/0.3.17/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/win32ss/user/ntu… ============================================================================== --- branches/0.3.17/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Mon Oct 27 17:15:09 2014 @@ -649,7 +649,7 @@ lpmi->cyMenu = Menu->cyMenu; lpmi->spwndNotify = Menu->spwndNotify; lpmi->cxTextAlign = Menu->cxTextAlign; - lpmi->iTop = Menu->iMaxTop; + lpmi->iTop = Menu->iTop; lpmi->iMaxTop = Menu->iMaxTop; lpmi->dwArrowsOn = Menu->dwArrowsOn; Modified: branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/win32ss/user/use… ============================================================================== --- branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Mon Oct 27 17:15:09 2014 @@ -43,7 +43,7 @@ #define MENU_COL_SPACE 4 /* top and bottom margins for popup menus */ -#define MENU_TOP_MARGIN 3 +#define MENU_TOP_MARGIN 2 //3 #define MENU_BOTTOM_MARGIN 2 #define MENU_TYPE_MASK (MF_STRING | MF_BITMAP | MF_OWNERDRAW | MF_SEPARATOR) @@ -395,7 +395,7 @@ MenuInfo->cyMenu = pMenu->cyMenu; MenuInfo->spwndNotify = pMenu->spwndNotify; MenuInfo->cxTextAlign = pMenu->cxTextAlign; - MenuInfo->iTop = pMenu->iMaxTop; + MenuInfo->iTop = pMenu->iTop; MenuInfo->iMaxTop = pMenu->iMaxTop; MenuInfo->dwArrowsOn = pMenu->dwArrowsOn; @@ -1301,7 +1301,7 @@ orgX = maxX; //if( lpitem.fType & (MF_MENUBREAK | MF_MENUBARBREAK)) // orgX += MENU_COL_SPACE; - orgY = 2;//MENU_TOP_MARGIN; + orgY = MENU_TOP_MARGIN; maxTab = maxTabWidth = 0; /* Parse items until column break or end of menu */

1 0

[zguo] 65046: [UNIATA] Update version of UNIATA to 45b1 for 0.3.17.
by zguo＠svn.reactos.org 27 Oct '14

27 Oct '14

Author: zguo Date: Mon Oct 27 17:10:31 2014 New Revision: 65046 URL: http://svn.reactos.org/svn/reactos?rev=65046&view=rev Log: [UNIATA] Update version of UNIATA to 45b1 for 0.3.17. Modified: branches/0.3.17/reactos/ (props changed) branches/0.3.17/reactos/drivers/storage/ide/uniata/id_ata.cpp branches/0.3.17/reactos/drivers/storage/ide/uniata/id_dma.cpp branches/0.3.17/reactos/drivers/storage/ide/uniata/id_sata.cpp branches/0.3.17/reactos/drivers/storage/ide/uniata/uniata_ver.h Propchange: branches/0.3.17/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 27 17:10:31 2014 @@ -18,4 +18,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64859,64908-64909 +/trunk/reactos:64752-64754,64765,64769,64771,64776,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909 Modified: branches/0.3.17/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/storage/… ============================================================================== --- branches/0.3.17/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Oct 27 17:10:31 2014 @@ -1692,7 +1692,7 @@ deviceExtension->FullIdentifyData.NVCache_Version )); - KdPrint2((PRINT_PREFIX "R-rate %#x\n", + KdPrint2((PRINT_PREFIX "R-rate %d\n", deviceExtension->FullIdentifyData.NominalMediaRotationRate )); @@ -5071,9 +5071,9 @@ if(AtaReq->retry < MAX_RETRIES) { //fallback_pio: if(!(deviceExtension->HwFlags & UNIATA_AHCI)) { - AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION; + //AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION; + // Downrate will happen in AtapiDmaReinit(), try UDMA-2 for HDD only AtaReq->Flags |= REQ_FLAG_FORCE_DOWNRATE; -// LunExt->DeviceFlags |= DFLAGS_FORCE_DOWNRATE; } AtaReq->ReqState = REQ_STATE_QUEUED; goto reenqueue_req; @@ -5093,6 +5093,7 @@ ((error >> 4) == SCSI_SENSE_HARDWARE_ERROR)) { if(AtaReq->retry < MAX_RETRIES) { //fallback_pio: + // Downrate will happen in AtapiDmaReinit(), use PIO immediately for ATAPI AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION; AtaReq->Flags |= REQ_FLAG_FORCE_DOWNRATE; // LunExt->DeviceFlags |= DFLAGS_FORCE_DOWNRATE; @@ -5449,6 +5450,7 @@ chan->ChannelCtrlFlags &= ~CTRFLAGS_DMA_OPERATION; goto CompleteRequest; } +continue_read_drq: // Ensure that this is a read command. if (srb->SrbFlags & SRB_FLAGS_DATA_IN) { @@ -5489,7 +5491,6 @@ } } } - } else { KdPrint2((PRINT_PREFIX "IdeIntr: Read %#x Dwords\n", wordCount/2)); @@ -5580,6 +5581,12 @@ status = SRB_STATUS_SUCCESS; goto CompleteRequest; + } + } else { + if(!atapiDev && !DataOverrun && (srb->SrbFlags & SRB_FLAGS_DATA_IN) && + (statusByte == (IDE_STATUS_IDLE | IDE_STATUS_DRQ))) { + KdPrint2((PRINT_PREFIX " HDD read data ready \n")); + goto continue_read_drq; } } } @@ -6689,6 +6696,7 @@ // Adjust buffer address and words left count. AtaReq->WordsLeft -= wordCount; AtaReq->DataBuffer += wordCount; + AtaReq->WordsTransfered += wordCount; // Wait for interrupt. return SRB_STATUS_PENDING; Modified: branches/0.3.17/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/storage/… ============================================================================== --- branches/0.3.17/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Mon Oct 27 17:10:31 2014 @@ -587,10 +587,8 @@ case ATA_PROMISE_ID: if(ChipType == PRNEW) { ULONG Channel = deviceExtension->Channel + lChannel; + if(chan->ChannelCtrlFlags & CTRFLAGS_LBA48) { - AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, - AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) | - (Channel ? 0x08 : 0x02)); AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),(Channel ? 0x24 : 0x20), ((Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? 0x05000000 : 0x06000000) | (Srb->DataTransferLength >> 1) ); @@ -659,10 +657,12 @@ case ATA_PROMISE_ID: if(ChipType == PRNEW) { ULONG Channel = deviceExtension->Channel + lChannel; +/* + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & + ~(Channel ? 0x08 : 0x02)); +*/ if(chan->ChannelCtrlFlags & CTRFLAGS_LBA48) { - AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, - AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & - ~(Channel ? 0x08 : 0x02)); AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),(Channel ? 0x24 : 0x20), 0 ); @@ -1555,10 +1555,13 @@ return; break; } - case ATA_PROMISE_ID: + case ATA_PROMISE_ID: { /***********/ /* Promise */ /***********/ + + UCHAR sel66 = Channel ? 0x08: 0x02; + if(ChipType < PRTX) { if (isAtapi) { udmamode = @@ -1566,12 +1569,29 @@ } } for(i=udmamode; i>=0; i--) { + + if(ChipType == PRNEW) { + if(i>2) { + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) | + sel66); + } else { + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & + ~sel66); + } + } + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) { promise_timing(deviceExtension, dev, (UCHAR)(ATA_UDMA + i)); // ??? return; } } - + if(ChipType == PRNEW) { + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & + ~sel66); + } for(i=wdmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { promise_timing(deviceExtension, dev, (UCHAR)(ATA_WDMA0+i)); @@ -1587,7 +1607,7 @@ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); promise_timing(deviceExtension, dev, ATA_PIO0 + apiomode); return; - break; + break; } case ATA_ATI_ID: KdPrint2((PRINT_PREFIX "ATI\n")); Modified: branches/0.3.17/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/storage/… ============================================================================== --- branches/0.3.17/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Mon Oct 27 17:10:31 2014 @@ -968,6 +968,12 @@ KdPrint2((PRINT_PREFIX "\n")); /* get the number of HW channels */ + + /* CAP.NOP sometimes indicate the index of the last enabled + * port, at other times, that of the last possible port, so + * determining the maximum port number requires looking at + * both CAP.NOP and PI. + */ PI = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_PI); deviceExtension->AHCI_PI = PI; KdPrint2((PRINT_PREFIX " AHCI PI %#x\n", PI)); Modified: branches/0.3.17/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/drivers/storage/… ============================================================================== --- branches/0.3.17/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ branches/0.3.17/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Mon Oct 27 17:10:31 2014 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "45a8" -#define UNIATA_VER_DOT 0.45.1.8 +#define UNIATA_VER_STR "45b1" +#define UNIATA_VER_DOT 0.45.2.1 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 45 -#define UNIATA_VER_SUB_MJ 1 -#define UNIATA_VER_SUB_MN 8 -#define UNIATA_VER_DOT_COMMA 0,45,1,8 -#define UNIATA_VER_DOT_STR "0.45.1.8" +#define UNIATA_VER_SUB_MJ 2 +#define UNIATA_VER_SUB_MN 1 +#define UNIATA_VER_DOT_COMMA 0,45,2,1 +#define UNIATA_VER_DOT_STR "0.45.2.1" #define UNIATA_VER_YEAR 2014 #define UNIATA_VER_YEAR_STR "2014"

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