Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[tkreuzer] 66157: [WIN32K] Always update surface flags in EngModifySurface

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 4 08:21:54 2015 New Revision: 66157 URL: http://svn.reactos.org/svn/reactos?rev=66157&view=rev Log: [WIN32K] Always update surface flags in EngModifySurface Modified: trunk/reactos/win32ss/gdi/eng/surface.c Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Wed Feb 4 08:21:54 2015 @@ -434,18 +434,20 @@ _In_ FLONG flHooks, _In_ FLONG flSurface, _In_ DHSURF dhsurf, - _In_ VOID *pvScan0, + _In_ PVOID pvScan0, _In_ LONG lDelta, - _Reserved_ VOID *pvReserved) + _Reserved_ PVOID pvReserved) { SURFOBJ *pso; PSURFACE psurf; PDEVOBJ* ppdev; PPALETTE ppal; + /* Lock the surface */ psurf = SURFACE_ShareLockSurface(hsurf); if (psurf == NULL) { + DPRINT1("Failed to reference surface %p\n", hsurf); return FALSE; } @@ -466,6 +468,16 @@ SURFACE_vSetPalette(psurf, ppal); PALETTE_ShareUnlockPalette(ppal); + /* Update surface flags */ + if (flSurface & MS_NOTSYSTEMMEMORY) + pso->fjBitmap |= BMF_NOTSYSMEM; + else + pso->fjBitmap &= ~BMF_NOTSYSMEM; + if (flSurface & MS_SHAREDACCESS) + psurf->flags |= SHAREACCESS_SURFACE; + else + psurf->flags &= ~SHAREACCESS_SURFACE; + /* Check if the caller passed bitmap bits */ if ((pvScan0 != NULL) && (lDelta != 0)) { @@ -491,16 +503,6 @@ pso->pvBits = (PCHAR)pso->pvScan0 - pso->cjBits - lDelta; pso->fjBitmap &= ~BMF_TOPDOWN; } - - /* Update surface flags */ - if (flSurface & MS_NOTSYSTEMMEMORY) - pso->fjBitmap |= BMF_NOTSYSMEM; - else - pso->fjBitmap &= ~BMF_NOTSYSMEM; - if (flSurface & MS_SHAREDACCESS) - psurf->flags |= SHAREACCESS_SURFACE; - else - psurf->flags &= ~SHAREACCESS_SURFACE; } else { @@ -530,7 +532,7 @@ psurf = SURFACE_ShareLockSurface(hsurf); if (!psurf) { - DPRINT1("Could not reference surface to delete\n"); + DPRINT1("Could not reference surface %p to delete\n", hsurf); return FALSE; }

9 years, 10 months

[aandrejevic] 66156: [FAST486] Implement FDECSTP, FINCSTP and FXTRACT.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Feb 4 03:22:48 2015 New Revision: 66156 URL: http://svn.reactos.org/svn/reactos?rev=66156&view=rev Log: [FAST486] Implement FDECSTP, FINCSTP and FXTRACT. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6615… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Wed Feb 4 03:22:48 2015 @@ -1526,36 +1526,66 @@ /* FXTRACT */ case 0x34: { + FAST486_FPU_DATA_REG Value = FPU_ST(0); + + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_IS_INDEFINITE(&Value)) + { + State->FpuStatus.Ie = TRUE; + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) State->FpuStatus.Sf = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + if (FPU_IS_ZERO(&Value)) + { + /* The exponent of zero is negative infinity */ + FPU_ST(0).Sign = TRUE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_MANTISSA_HIGH_BIT; + } + else if (FPU_IS_INFINITY(&Value)) + { + /* The exponent of infinity is positive infinity */ + FPU_ST(0).Sign = FALSE; + FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; + FPU_ST(0).Mantissa = FPU_MANTISSA_HIGH_BIT; + } + else + { + /* Store the unbiased exponent in ST0 */ + Fast486FpuFromInteger(State, + (LONGLONG)Value.Exponent - (LONGLONG)FPU_REAL10_BIAS, + &FPU_ST(0)); + } + + /* Now push the mantissa as a real number, with the original sign */ + Value.Exponent = FPU_REAL10_BIAS; + Fast486FpuPush(State, &Value); + + break; + } + + /* FPREM1 */ + case 0x35: + { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; break; } - /* FPREM1 */ - case 0x35: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - break; - } - /* FDECSTP */ case 0x36: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - + State->FpuStatus.Top--; break; } /* FINCSTP */ case 0x37: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - + State->FpuStatus.Top++; break; }

9 years, 10 months

[hbelusca] 66155: [FAST486]: Use a more "regular" syntax (i.e. understandable by other compilers than GCC).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Feb 4 03:12:03 2015 New Revision: 66155 URL: http://svn.reactos.org/svn/reactos?rev=66155&view=rev Log: [FAST486]: Use a more "regular" syntax (i.e. understandable by other compilers than GCC). Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6615… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Wed Feb 4 03:12:03 2015 @@ -33,60 +33,60 @@ /* CONSTANTS ******************************************************************/ /* 0.00 */ -static const FAST486_FPU_DATA_REG FpuZero = -{ - .Sign = FALSE, - .Exponent = 0, - .Mantissa = 0ULL -}; +static const FAST486_FPU_DATA_REG FpuZero = {0ULL, 0, FALSE}; +// { +// .Sign = FALSE, +// .Exponent = 0, +// .Mantissa = 0ULL +// }; /* 1.00 */ -static const FAST486_FPU_DATA_REG FpuOne = -{ - .Sign = FALSE, - .Exponent = FPU_REAL10_BIAS, - .Mantissa = 0x8000000000000000ULL -}; +static const FAST486_FPU_DATA_REG FpuOne = {0x8000000000000000ULL, FPU_REAL10_BIAS, FALSE}; +// { +// .Sign = FALSE, +// .Exponent = FPU_REAL10_BIAS, +// .Mantissa = 0x8000000000000000ULL +// }; /* Pi */ -static const FAST486_FPU_DATA_REG FpuPi = -{ - .Sign = FALSE, - .Exponent = FPU_REAL10_BIAS + 1, - .Mantissa = 0xC90FDAA22168C234ULL -}; +static const FAST486_FPU_DATA_REG FpuPi = {0xC90FDAA22168C234ULL, FPU_REAL10_BIAS + 1, FALSE}; +// { +// .Sign = FALSE, +// .Exponent = FPU_REAL10_BIAS + 1, +// .Mantissa = 0xC90FDAA22168C234ULL +// }; /* lb(10) */ -static const FAST486_FPU_DATA_REG FpuL2Ten = -{ - .Sign = FALSE, - .Exponent = FPU_REAL10_BIAS + 1, - .Mantissa = 0xD49A784BCD1D8AFEULL -}; +static const FAST486_FPU_DATA_REG FpuL2Ten = {0xD49A784BCD1D8AFEULL, FPU_REAL10_BIAS + 1, FALSE}; +// { +// .Sign = FALSE, +// .Exponent = FPU_REAL10_BIAS + 1, +// .Mantissa = 0xD49A784BCD1D8AFEULL +// }; /* lb(e) */ -static const FAST486_FPU_DATA_REG FpuL2E = -{ - .Sign = FALSE, - .Exponent = FPU_REAL10_BIAS, - .Mantissa = 0xB8AA3B295C17F0BBULL -}; +static const FAST486_FPU_DATA_REG FpuL2E = {0xB8AA3B295C17F0BBULL, FPU_REAL10_BIAS, FALSE}; +// { +// .Sign = FALSE, +// .Exponent = FPU_REAL10_BIAS, +// .Mantissa = 0xB8AA3B295C17F0BBULL +// }; /* lg(2) */ -static const FAST486_FPU_DATA_REG FpuLgTwo = -{ - .Sign = FALSE, - .Exponent = FPU_REAL10_BIAS - 2, - .Mantissa = 0x9A209A84FBCFF798ULL -}; +static const FAST486_FPU_DATA_REG FpuLgTwo = {0x9A209A84FBCFF798ULL, FPU_REAL10_BIAS - 2, FALSE}; +// { +// .Sign = FALSE, +// .Exponent = FPU_REAL10_BIAS - 2, +// .Mantissa = 0x9A209A84FBCFF798ULL +// }; /* ln(2) */ -static const FAST486_FPU_DATA_REG FpuLnTwo = -{ - .Sign = FALSE, - .Exponent = FPU_REAL10_BIAS - 1, - .Mantissa = 0xB17217F7D1CF79ABULL -}; +static const FAST486_FPU_DATA_REG FpuLnTwo = {0xB17217F7D1CF79ABULL, FPU_REAL10_BIAS - 1, FALSE}; +// { +// .Sign = FALSE, +// .Exponent = FPU_REAL10_BIAS - 1, +// .Mantissa = 0xB17217F7D1CF79ABULL +// }; /* PRIVATE FUNCTIONS **********************************************************/

9 years, 10 months

[aandrejevic] 66154: [FAST486] Implement FCHS, FABS, FTST, FXAM, FLD1, FLDL2T, FLDL2E, FLDPI, FLDLG2, FLDLN2 and FLDZ.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Feb 4 02:47:13 2015 New Revision: 66154 URL: http://svn.reactos.org/svn/reactos?rev=66154&view=rev Log: [FAST486] Implement FCHS, FABS, FTST, FXAM, FLD1, FLDL2T, FLDL2E, FLDPI, FLDLG2, FLDLN2 and FLDZ. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Wed Feb 4 02:47:13 2015 @@ -428,6 +428,8 @@ USHORT Exponent; UCHAR Sign; } FAST486_FPU_DATA_REG, *PFAST486_FPU_DATA_REG; + +typedef const FAST486_FPU_DATA_REG *PCFAST486_FPU_DATA_REG; typedef union _FAST486_FPU_STATUS_REG { Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Wed Feb 4 02:47:13 2015 @@ -1578,7 +1578,7 @@ BOOLEAN FASTCALL Fast486FpuPush(PFAST486_STATE State, - PFAST486_FPU_DATA_REG Data) + PCFAST486_FPU_DATA_REG Data) { State->FpuStatus.Top--; Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6615… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Wed Feb 4 02:47:13 2015 @@ -30,6 +30,64 @@ #include "common.h" #include "fpu.h" +/* CONSTANTS ******************************************************************/ + +/* 0.00 */ +static const FAST486_FPU_DATA_REG FpuZero = +{ + .Sign = FALSE, + .Exponent = 0, + .Mantissa = 0ULL +}; + +/* 1.00 */ +static const FAST486_FPU_DATA_REG FpuOne = +{ + .Sign = FALSE, + .Exponent = FPU_REAL10_BIAS, + .Mantissa = 0x8000000000000000ULL +}; + +/* Pi */ +static const FAST486_FPU_DATA_REG FpuPi = +{ + .Sign = FALSE, + .Exponent = FPU_REAL10_BIAS + 1, + .Mantissa = 0xC90FDAA22168C234ULL +}; + +/* lb(10) */ +static const FAST486_FPU_DATA_REG FpuL2Ten = +{ + .Sign = FALSE, + .Exponent = FPU_REAL10_BIAS + 1, + .Mantissa = 0xD49A784BCD1D8AFEULL +}; + +/* lb(e) */ +static const FAST486_FPU_DATA_REG FpuL2E = +{ + .Sign = FALSE, + .Exponent = FPU_REAL10_BIAS, + .Mantissa = 0xB8AA3B295C17F0BBULL +}; + +/* lg(2) */ +static const FAST486_FPU_DATA_REG FpuLgTwo = +{ + .Sign = FALSE, + .Exponent = FPU_REAL10_BIAS - 2, + .Mantissa = 0x9A209A84FBCFF798ULL +}; + +/* ln(2) */ +static const FAST486_FPU_DATA_REG FpuLnTwo = +{ + .Sign = FALSE, + .Exponent = FPU_REAL10_BIAS - 1, + .Mantissa = 0xB17217F7D1CF79ABULL +}; + /* PRIVATE FUNCTIONS **********************************************************/ #ifndef FAST486_NO_FPU @@ -167,7 +225,7 @@ static inline BOOLEAN FASTCALL Fast486FpuToInteger(PFAST486_STATE State, - PFAST486_FPU_DATA_REG Value, + PCFAST486_FPU_DATA_REG Value, PLONGLONG Result) { ULONG Bits; @@ -272,7 +330,7 @@ static inline BOOLEAN FASTCALL Fast486FpuToSingleReal(PFAST486_STATE State, - PFAST486_FPU_DATA_REG Value, + PCFAST486_FPU_DATA_REG Value, PULONG Result) { ULONGLONG Remainder; @@ -404,7 +462,7 @@ static inline BOOLEAN FASTCALL Fast486FpuToDoubleReal(PFAST486_STATE State, - PFAST486_FPU_DATA_REG Value, + PCFAST486_FPU_DATA_REG Value, PULONGLONG Result) { ULONGLONG Remainder; @@ -536,7 +594,7 @@ static inline BOOLEAN FASTCALL Fast486FpuToPackedBcd(PFAST486_STATE State, - PFAST486_FPU_DATA_REG Value, + PCFAST486_FPU_DATA_REG Value, PUCHAR Result) { INT i; @@ -562,8 +620,8 @@ static inline VOID FASTCALL Fast486FpuAdd(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, + PCFAST486_FPU_DATA_REG FirstOperand, + PCFAST486_FPU_DATA_REG SecondOperand, PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG FirstAdjusted = *FirstOperand; @@ -656,8 +714,8 @@ static inline VOID FASTCALL Fast486FpuSubtract(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, + PCFAST486_FPU_DATA_REG FirstOperand, + PCFAST486_FPU_DATA_REG SecondOperand, PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG NegativeSecondOperand = *SecondOperand; @@ -671,8 +729,8 @@ static inline VOID FASTCALL Fast486FpuCompare(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand) + PCFAST486_FPU_DATA_REG FirstOperand, + PCFAST486_FPU_DATA_REG SecondOperand) { if (FPU_IS_NAN(FirstOperand) || FPU_IS_NAN(SecondOperand)) { @@ -724,8 +782,8 @@ static inline VOID FASTCALL Fast486FpuMultiply(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, + PCFAST486_FPU_DATA_REG FirstOperand, + PCFAST486_FPU_DATA_REG SecondOperand, PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG TempResult; @@ -756,8 +814,8 @@ static inline VOID FASTCALL Fast486FpuDivide(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, + PCFAST486_FPU_DATA_REG FirstOperand, + PCFAST486_FPU_DATA_REG SecondOperand, PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG TempResult; @@ -1309,8 +1367,16 @@ /* FCHS */ case 0x20: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + /* Invert the sign */ + FPU_ST(0).Sign = !FPU_ST(0).Sign; break; } @@ -1318,8 +1384,16 @@ /* FABS */ case 0x21: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + /* Set the sign to positive */ + FPU_ST(0).Sign = FALSE; break; } @@ -1327,26 +1401,58 @@ /* FTST */ case 0x24: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - + Fast486FpuCompare(State, &FPU_ST(0), &FpuZero); break; } /* FXAM */ case 0x25: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - break; - } - - /* FTSTP */ - case 0x26: - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + /* The sign bit goes in C1, even if the register's empty */ + State->FpuStatus.Code1 = FPU_ST(0).Sign; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + State->FpuStatus.Code0 = 1; + State->FpuStatus.Code2 = 0; + State->FpuStatus.Code3 = 1; + } + else if (FPU_GET_TAG(0) == FPU_TAG_SPECIAL) + { + if (FPU_IS_INFINITY(&FPU_ST(0))) + { + State->FpuStatus.Code0 = 1; + State->FpuStatus.Code2 = 1; + State->FpuStatus.Code3 = 0; + } + else + { + State->FpuStatus.Code0 = 1; + State->FpuStatus.Code2 = 0; + State->FpuStatus.Code3 = 0; + } + } + else if (FPU_GET_TAG(0) == FPU_TAG_ZERO) + { + State->FpuStatus.Code0 = 0; + State->FpuStatus.Code2 = 0; + State->FpuStatus.Code3 = 1; + } + else + { + if (FPU_IS_NORMALIZED(&FPU_ST(0))) + { + State->FpuStatus.Code0 = 0; + State->FpuStatus.Code2 = 1; + State->FpuStatus.Code3 = 0; + } + else + { + State->FpuStatus.Code0 = 0; + State->FpuStatus.Code2 = 1; + State->FpuStatus.Code3 = 1; + } + } break; } @@ -1366,9 +1472,18 @@ /* FLDZ */ case 0x2E: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - + PCFAST486_FPU_DATA_REG Constants[] = + { + &FpuOne, + &FpuL2Ten, + &FpuL2E, + &FpuPi, + &FpuLgTwo, + &FpuLnTwo, + &FpuZero + }; + + Fast486FpuPush(State, Constants[ModRegRm.SecondRegister]); break; }

9 years, 10 months

[hbelusca] 66153: [MPLAY32]: Use a consistent type/naming for mci errors.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Feb 4 01:42:11 2015 New Revision: 66153 URL: http://svn.reactos.org/svn/reactos?rev=66153&view=rev Log: [MPLAY32]: Use a consistent type/naming for mci errors. Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Wed Feb 4 01:42:11 2015 @@ -44,26 +44,26 @@ void EnableMenuItems(HWND hwnd) { + MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; MCI_DGV_RECT_PARMS mciVideoRect; MCI_DGV_WINDOW_PARMSW mciVideoWindow; - DWORD dwError; EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_ENABLED); - dwError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_TEST, (DWORD_PTR)&mciGeneric); - if (dwError == 0) + mciError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_TEST, (DWORD_PTR)&mciGeneric); + if (mciError == 0) { EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_ENABLED); } mciVideoWindow.hWnd = hwnd; - dwError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); - if (!dwError) - { - dwError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD_PTR)&mciVideoRect); - if (!dwError) + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); + if (!mciError) + { + mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD_PTR)&mciVideoRect); + if (!mciError) { EnableMenuItem(hMainMenu, IDM_SWITCHVIEW, MF_BYCOMMAND | MF_ENABLED); } @@ -155,17 +155,17 @@ } static VOID -ShowMCIError(HWND hwnd, DWORD dwError) +ShowMCIError(HWND hwnd, MCIERROR mciError) { TCHAR szErrorMessage[MAX_MCISTR]; TCHAR szTempMessage[MAX_MCISTR + 44]; - if (mciGetErrorString(dwError, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])) == FALSE) + if (mciGetErrorString(mciError, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])) == FALSE) { LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])); } - _stprintf(szTempMessage, _T("MMSYS%lu: %s"), dwError, szErrorMessage); + _stprintf(szTempMessage, _T("MMSYS%lu: %s"), mciError, szErrorMessage); MessageBox(hwnd, szTempMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION); } @@ -391,13 +391,13 @@ static DWORD CloseMciDevice(VOID) { + MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; - DWORD dwError; if (bIsOpened) { - dwError = mciSendCommand(wDeviceId, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); - if (dwError) return dwError; + mciError = mciSendCommand(wDeviceId, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); + if (mciError) return mciError; bIsOpened = FALSE; } @@ -409,10 +409,10 @@ static DWORD OpenMciDevice(HWND hwnd, LPTSTR lpType, LPTSTR lpFileName) { + MCIERROR mciError; MCI_STATUS_PARMS mciStatus; MCI_OPEN_PARMS mciOpen; TCHAR szNewTitle[MAX_PATH]; - DWORD dwError; if (bIsOpened) { @@ -425,18 +425,18 @@ mciOpen.wDeviceID = 0; mciOpen.lpstrAlias = NULL; - dwError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, (DWORD_PTR)&mciOpen); - if (dwError != 0) - { - return dwError; + mciError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, (DWORD_PTR)&mciOpen); + if (mciError != 0) + { + return mciError; } mciStatus.dwItem = MCI_STATUS_LENGTH; - dwError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR)&mciStatus); - if (dwError != 0) - { - return dwError; + mciError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR)&mciStatus); + if (mciError != 0) + { + return mciError; } SendMessage(hTrackBar, TBM_SETRANGEMIN, (WPARAM) TRUE, (LPARAM) 1); @@ -495,24 +495,24 @@ static VOID SeekPlayback(HWND hwnd, DWORD dwNewPos) { + MCIERROR mciError; MCI_SEEK_PARMS mciSeek; MCI_PLAY_PARMS mciPlay; - DWORD dwError; if (bIsOpened) { mciSeek.dwTo = (DWORD_PTR)dwNewPos; - dwError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_TO, (DWORD_PTR)&mciSeek); - if (dwError != 0) - { - ShowMCIError(hwnd, dwError); + mciError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_TO, (DWORD_PTR)&mciSeek); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); } mciPlay.dwCallback = (DWORD_PTR)hwnd; - dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); - if (dwError != 0) - { - ShowMCIError(hwnd, dwError); + mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); } } } @@ -566,15 +566,15 @@ static VOID PausePlayback(HWND hwnd) { + MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; - DWORD dwError; if (bIsOpened) { - dwError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); - if (dwError != 0) - { - ShowMCIError(hwnd, dwError); + mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); } bIsPaused = TRUE; } @@ -583,15 +583,15 @@ static VOID ResumePlayback(HWND hwnd) { + MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; - DWORD dwError; if (bIsPaused) { - dwError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_WAIT, (DWORD_PTR)&mciGeneric); - if (dwError != 0) - { - ShowMCIError(hwnd, dwError); + mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_WAIT, (DWORD_PTR)&mciGeneric); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); } bIsPaused = FALSE; } @@ -600,13 +600,13 @@ static VOID ShowDeviceProperties(HWND hwnd) { + MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; - DWORD dwError; - - dwError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_WAIT, (DWORD_PTR)&mciGeneric); - if (dwError != 0) - { - ShowMCIError(hwnd, dwError); + + mciError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_WAIT, (DWORD_PTR)&mciGeneric); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); } }

9 years, 10 months

[hbelusca] 66152: [MPLAY32] Build the Open-File filter mask in runtime, according to the supported extensions and media devices registered in the registry. Patch by Ricardo Hanke. CORE-7883 #resolv...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Feb 4 01:36:17 2015 New Revision: 66152 URL: http://svn.reactos.org/svn/reactos?rev=66152&view=rev Log: [MPLAY32] Build the Open-File filter mask in runtime, according to the supported extensions and media devices registered in the registry. Patch by Ricardo Hanke. CORE-7883 #resolve #comment Committed, with number-of-chars vs. number-of-bytes fixes by me, plus minor modification to build the filter only once when mplay32 is launched, and use a default filter if runtime filter build fails. Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/de-DE.rc trunk/reactos/base/applications/mplay32/lang/en-US.rc trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/fr-FR.rc trunk/reactos/base/applications/mplay32/lang/he-IL.rc trunk/reactos/base/applications/mplay32/lang/it-IT.rc trunk/reactos/base/applications/mplay32/lang/ja-JP.rc trunk/reactos/base/applications/mplay32/lang/nl-NL.rc trunk/reactos/base/applications/mplay32/lang/no-NO.rc trunk/reactos/base/applications/mplay32/lang/pl-PL.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/sk-SK.rc trunk/reactos/base/applications/mplay32/lang/sq-AL.rc trunk/reactos/base/applications/mplay32/lang/sv-SE.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/mplay32/lang/zh-CN.rc trunk/reactos/base/applications/mplay32/lang/zh-TW.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mplay32/mplay32.h Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -47,7 +47,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "ÐÑÐ¸ÑÐºÐ¸ Ð¿Ð¾Ð´Ð´ÑÑÐ¶Ð°Ð½Ð¸ (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "ÐÑÐ¸ÑÐºÐ¸ Ð¿Ð¾Ð´Ð´ÑÑÐ¶Ð°Ð½Ð¸" IDS_TOOLTIP_PLAY "ÐÑÑÐºÐ°Ð½Ðµ" IDS_TOOLTIP_STOP "Ð¡Ð¿Ð¸ÑÐ°Ð½Ðµ" IDS_TOOLTIP_EJECT "ÐÐ·Ð²Ð°Ð¶Ð´Ð°Ð½Ðµ" Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -48,7 +48,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "VÅ¡echny podporovanÃ© (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "VÅ¡echny podporovanÃ©" IDS_TOOLTIP_PLAY "PÅehrÃ¡t" IDS_TOOLTIP_STOP "Zastavit" IDS_TOOLTIP_EJECT "Vysunout" Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -43,7 +43,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Alle unterstÃ¼tzten (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "Alle unterstÃ¼tzten" IDS_TOOLTIP_PLAY "Wiedergabe" IDS_TOOLTIP_STOP "Stopp" IDS_TOOLTIP_EJECT "Auswerfen" Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -43,7 +43,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "All Supported (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "All Supported" IDS_TOOLTIP_PLAY "Play" IDS_TOOLTIP_STOP "Stop" IDS_TOOLTIP_EJECT "Eject" Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -43,7 +43,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Todos los archivos soportados (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "Todos los archivos soportados" IDS_TOOLTIP_PLAY "Reproducir" IDS_TOOLTIP_STOP "Detener" IDS_TOOLTIP_EJECT "Expulsar" Modified: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -43,7 +43,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Tous les types supportÃ©s (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "Tous les types supportÃ©s" IDS_TOOLTIP_PLAY "Lecture" IDS_TOOLTIP_STOP "Stop" IDS_TOOLTIP_EJECT "Ãjecter" Modified: trunk/reactos/base/applications/mplay32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -43,7 +43,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "×× ××§××¦×× ×× ×ª×××× (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "×× ××§××¦×× ×× ×ª××××" IDS_TOOLTIP_PLAY "× ××" IDS_TOOLTIP_STOP "×¢×¦××¨" IDS_TOOLTIP_EJECT "×××¦×" Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -43,7 +43,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Tutti i tipi supportati (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "Tutti i tipi supportati" IDS_TOOLTIP_PLAY "Riproduci" IDS_TOOLTIP_STOP "Interrompi" IDS_TOOLTIP_EJECT "Espelli" Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -43,7 +43,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "ãã¹ã¦ã®ãµãã¼ãããããã¡ã¤ã« (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "ãã¹ã¦ã®ãµãã¼ãããããã¡ã¤ã«" IDS_TOOLTIP_PLAY "åç" IDS_TOOLTIP_STOP "åæ¢" IDS_TOOLTIP_EJECT "åãåºã" Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -43,7 +43,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Mediabestanden (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "Mediabestanden" IDS_TOOLTIP_PLAY "Afspelen" IDS_TOOLTIP_STOP "Stoppen" IDS_TOOLTIP_EJECT "Uitwerpen" Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -43,7 +43,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Alle kompaktible filer (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "Alle kompaktible filer" IDS_TOOLTIP_PLAY "Spill av" IDS_TOOLTIP_STOP "Stopp" IDS_TOOLTIP_EJECT "LÃ¸s ut" Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -51,7 +51,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Wszystkie formaty (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "Wszystkie formaty" IDS_TOOLTIP_PLAY "Odtwarzaj" IDS_TOOLTIP_STOP "Zatrzymaj" IDS_TOOLTIP_EJECT "WysuÅ" Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -45,7 +45,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Todos os formatos (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "Todos os formatos" IDS_TOOLTIP_PLAY "Executar" IDS_TOOLTIP_STOP "Pausar" IDS_TOOLTIP_EJECT "Ejetar" Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -49,7 +49,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Toate admisibile (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "Toate admisibile" IDS_TOOLTIP_PLAY "Redare conÈinut multimedia" IDS_TOOLTIP_STOP "Oprirea lecturii" IDS_TOOLTIP_EJECT "Scoate" Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -43,7 +43,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "ÐÑÐµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐµ (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "ÐÑÐµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐµ" IDS_TOOLTIP_PLAY "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ" IDS_TOOLTIP_STOP "ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ" IDS_TOOLTIP_EJECT "ÐÐ·Ð²Ð»ÐµÑÑ" Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -48,7 +48,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "VÅ¡etky podporovanÃ© (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "VÅ¡etky podporovanÃ©" IDS_TOOLTIP_PLAY "PrehraÅ¥" IDS_TOOLTIP_STOP "ZastaviÅ¥" IDS_TOOLTIP_EJECT "VysunÃºÅ¥" Modified: trunk/reactos/base/applications/mplay32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -47,7 +47,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "TÃ« gjith suportimet (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "TÃ« gjith suportimet" IDS_TOOLTIP_PLAY "Fillo" IDS_TOOLTIP_STOP "Ndalo" IDS_TOOLTIP_EJECT "Nxjerr" Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -50,7 +50,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Alla kompaktibla filer (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "Alla kompaktibla filer" IDS_TOOLTIP_PLAY "Spela upp" IDS_TOOLTIP_STOP "Stopp" IDS_TOOLTIP_EJECT "Mata ut" Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -45,7 +45,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "Desteklenen KÃ¼tÃ¼kler (*.wav, *.cda, *.mid, *.midi, *.avi)\0*.wav;*.cda;*.mid;*.midi;*.avi\0" + IDS_ALL_TYPES_FILTER "Desteklenen KÃ¼tÃ¼kler" IDS_TOOLTIP_PLAY "Ãal" IDS_TOOLTIP_STOP "Durdur" IDS_TOOLTIP_EJECT "ÃÄ±kart" Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -51,7 +51,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "ÐÑÑ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÐ²Ð°Ð½Ñ (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "ÐÑÑ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÐ²Ð°Ð½Ñ" IDS_TOOLTIP_PLAY "ÐÑÐ´ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ" IDS_TOOLTIP_STOP "ÐÑÐ¿Ð¸Ð½Ð¸ÑÐ¸" IDS_TOOLTIP_EJECT "ÐÐ¸ÑÑÐ³ÑÐ¸" Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -45,7 +45,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "æææ¯æçæ ¼å¼ (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "æææ¯æçæ ¼å¼" IDS_TOOLTIP_PLAY "ææ¾" IDS_TOOLTIP_STOP "åæ¢" IDS_TOOLTIP_EJECT "å¼¹åº" Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -51,7 +51,7 @@ STRINGTABLE BEGIN - IDS_ALL_TYPES_FILTER "æææ¯æ´æ ¼å¼ (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" + IDS_ALL_TYPES_FILTER "æææ¯æ´æ ¼å¼" IDS_TOOLTIP_PLAY "ææ¾" IDS_TOOLTIP_STOP "åæ¢" IDS_TOOLTIP_EJECT "å¸è¼" Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -8,13 +8,18 @@ #define MAIN_WINDOW_HEIGHT 125 #define MAIN_WINDOW_MIN_WIDTH 250 +#define MAX_MCISTR 256 HINSTANCE hInstance = NULL; HWND hTrackBar = NULL; HWND hToolBar = NULL; HMENU hMainMenu = NULL; + TCHAR szAppTitle[256] = _T(""); -TCHAR szPrevFile[MAX_PATH] = _T("\0"); +TCHAR szPrevFile[MAX_PATH] = _T(""); +TCHAR szDefaultFilter[MAX_PATH] = _T(""); +TCHAR *szFilter = NULL; + WORD wDeviceId; BOOL bIsOpened = FALSE; BOOL bIsPaused = FALSE; @@ -152,12 +157,12 @@ static VOID ShowMCIError(HWND hwnd, DWORD dwError) { - TCHAR szErrorMessage[256]; - TCHAR szTempMessage[300]; - - if (mciGetErrorString(dwError, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)) == FALSE) - { - LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)); + TCHAR szErrorMessage[MAX_MCISTR]; + TCHAR szTempMessage[MAX_MCISTR + 44]; + + if (mciGetErrorString(dwError, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])) == FALSE) + { + LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])); } _stprintf(szTempMessage, _T("MMSYS%lu: %s"), dwError, szErrorMessage); @@ -321,6 +326,69 @@ } static DWORD +GetNumDevices(VOID) +{ + MCI_SYSINFO_PARMS mciSysInfo; + DWORD dwNumDevices = 0; + + mciSysInfo.dwCallback = 0; + mciSysInfo.lpstrReturn = (LPTSTR)&dwNumDevices; + mciSysInfo.dwRetSize = sizeof(dwNumDevices); + mciSysInfo.dwNumber = 0; + mciSysInfo.wDeviceType = MCI_ALL_DEVICE_ID; + + mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_QUANTITY, (DWORD_PTR)&mciSysInfo); + + return *(DWORD*)mciSysInfo.lpstrReturn; +} + +static DWORD +GetDeviceName(DWORD dwDeviceIndex, LPTSTR lpDeviceName, DWORD dwDeviceNameSize) +{ + MCI_SYSINFO_PARMS mciSysInfo; + + mciSysInfo.dwCallback = 0; + mciSysInfo.lpstrReturn = lpDeviceName; + mciSysInfo.dwRetSize = dwDeviceNameSize; + mciSysInfo.dwNumber = dwDeviceIndex; + mciSysInfo.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; + + return mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME, (DWORD_PTR)&mciSysInfo); +} + +static DWORD +GetDeviceFriendlyName(LPTSTR lpDeviceName, LPTSTR lpFriendlyName, DWORD dwFriendlyNameSize) +{ + MCIERROR mciError; + MCI_OPEN_PARMS mciOpen; + MCI_INFO_PARMS mciInfo; + MCI_GENERIC_PARMS mciGeneric; + + mciOpen.dwCallback = 0; + mciOpen.wDeviceID = 0; + mciOpen.lpstrDeviceType = lpDeviceName; + mciOpen.lpstrElementName = NULL; + mciOpen.lpstrAlias = NULL; + + mciError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_WAIT, (DWORD_PTR)&mciOpen); + if (mciError) + { + return mciError; + } + + mciInfo.dwCallback = 0; + mciInfo.lpstrReturn = lpFriendlyName; + mciInfo.dwRetSize = dwFriendlyNameSize; + + mciError = mciSendCommand(mciOpen.wDeviceID, MCI_INFO, MCI_INFO_PRODUCT, (DWORD_PTR)&mciInfo); + + mciGeneric.dwCallback = 0; + mciSendCommand(mciOpen.wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); + + return mciError; +} + +static DWORD CloseMciDevice(VOID) { MCI_GENERIC_PARMS mciGeneric; @@ -607,7 +675,7 @@ { TCHAR szErrorMessage[256]; - LoadString(hInstance, IDS_UNKNOWNFILEEXT, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)); + LoadString(hInstance, IDS_UNKNOWNFILEEXT, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])); MessageBox(hwnd, szErrorMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION); return; } @@ -640,17 +708,215 @@ } static VOID +BuildFileFilter(VOID) +{ + TCHAR szDeviceName[MAX_MCISTR]; + TCHAR szFriendlyName[MAX_MCISTR]; + TCHAR *szDevice = NULL; + static TCHAR szDefaultExtension[] = _T("*.*"); + TCHAR *szExtensionList = NULL; + TCHAR *szExtension = NULL; + TCHAR *c = NULL; + TCHAR *d = NULL; + DWORD dwNumValues; + DWORD dwNumDevices; + DWORD dwValueNameLen; + DWORD dwValueDataSize; + DWORD dwMaskLen; + DWORD dwFilterSize; + DWORD dwDeviceSize; + DWORD dwExtensionLen; + DWORD i; + DWORD j; + UINT uSizeRemain; + UINT uMaskRemain; + HKEY hKey = NULL; + + /* Always load the default (all files) filter */ + LoadString(hInstance, IDS_ALL_TYPES_FILTER, szDefaultFilter, sizeof(szDefaultFilter) / sizeof(szDefaultFilter[0])); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\MCI Extensions"), 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + goto Failure; + } + + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, &dwNumValues, &dwValueNameLen, &dwValueDataSize, NULL, NULL) != ERROR_SUCCESS) + { + goto Failure; + } + + dwMaskLen = ((dwValueNameLen + 3) * dwNumValues) + 1; + + szExtensionList = malloc(dwMaskLen * sizeof(TCHAR)); + if (!szExtensionList) + { + goto Failure; + } + + dwNumDevices = GetNumDevices(); + + /* Allocate space for every pair of Device and Extension Filter */ + dwFilterSize = (MAX_MCISTR + (dwMaskLen * 2) + 5) * dwNumDevices; + + /* Add space for the "All supported" entry */ + dwFilterSize = (dwFilterSize + (dwMaskLen * 2) + 7) * sizeof(TCHAR) + sizeof(szDefaultFilter); + + szFilter = malloc(dwFilterSize); + if (!szFilter) + { + goto Failure; + } + + szExtension = malloc((dwValueNameLen + 1) * sizeof(TCHAR)); + if (!szExtension) + { + goto Failure; + } + + szDevice = malloc(dwValueDataSize + sizeof(TCHAR)); + if (!szDevice) + { + goto Failure; + } + + ZeroMemory(szFilter, dwFilterSize); + + uSizeRemain = dwFilterSize; + c = szFilter; + + for (j = 1; j <= dwNumDevices; j++) + { + if (GetDeviceName(j, szDeviceName, sizeof(szDeviceName))) + { + continue; + } + + if (GetDeviceFriendlyName(szDeviceName, szFriendlyName, sizeof(szFriendlyName))) + { + continue; + } + + /* Copy the default extension list, that may be overwritten after... */ + StringCbCopy(szExtensionList, dwMaskLen * sizeof(TCHAR), szDefaultExtension); + + /* Try to determine the real extension list */ + uMaskRemain = dwMaskLen * sizeof(TCHAR); + d = szExtensionList; + + for (i = 0; i < dwNumValues; i++) + { + dwExtensionLen = dwValueNameLen + 1; + dwDeviceSize = dwValueDataSize + sizeof(TCHAR); + + ZeroMemory(szDevice, dwDeviceSize); + + if (RegEnumValue(hKey, i, szExtension, &dwExtensionLen, NULL, NULL, (LPBYTE)szDevice, &dwDeviceSize) == ERROR_SUCCESS) + { + CharLowerBuff(szDevice, dwDeviceSize / sizeof(TCHAR)); + CharLowerBuff(szDeviceName, sizeof(szDeviceName) / sizeof(szDeviceName[0])); + if (_tcscmp(szDeviceName, szDevice) == 0) + { + CharLowerBuff(szExtension, dwExtensionLen); + StringCbPrintfEx(d, uMaskRemain, &d, &uMaskRemain, 0, _T("%s%s%s"), _T("*."), szExtension, _T(";")); + } + } + } + + /* Remove the last separator */ + d--; + uSizeRemain += sizeof(*d); + *d = _T('\0'); + + /* Add the description */ + StringCbPrintfEx(c, uSizeRemain, &c, &uSizeRemain, 0, _T("%s (%s)"), szFriendlyName, szExtensionList); + + /* Skip one char to seperate the description from the filter mask */ + c++; + uSizeRemain -= sizeof(*c); + + /* Append the filter mask */ + StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0); + + /* Skip another char to seperate the elements of the filter mask */ + c++; + uSizeRemain -= sizeof(*c); + } + + /* Build the full list of supported extensions */ + uMaskRemain = dwMaskLen * sizeof(TCHAR); + d = szExtensionList; + + for (i = 0; i < dwNumValues; i++) + { + dwExtensionLen = dwValueNameLen + 1; + + if (RegEnumValue(hKey, i, szExtension, &dwExtensionLen, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + CharLowerBuff(szExtension, dwExtensionLen); + StringCbPrintfEx(d, uMaskRemain, &d, &uMaskRemain, 0, _T("%s%s%s"), _T("*."), szExtension, _T(";")); + } + } + + /* Remove the last separator */ + d--; + uSizeRemain += sizeof(*d); + *d = _T('\0'); + + /* Add the default (all files) description */ + StringCbPrintfEx(c, uSizeRemain, &c, &uSizeRemain, 0, _T("%s (%s)"), szDefaultFilter, szExtensionList); + + /* Skip one char to seperate the description from the filter mask */ + c++; + uSizeRemain -= sizeof(*c); + + /* Append the filter mask */ + StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0); + +Cleanup: + if (szExtensionList) free(szExtensionList); + if (szExtension) free(szExtension); + if (szDevice) free(szDevice); + RegCloseKey(hKey); + + return; + +Failure: + /* We failed at retrieving the supported files, so use the default filter */ + if (szFilter) free(szFilter); + szFilter = szDefaultFilter; + + uSizeRemain = sizeof(szDefaultFilter); + c = szFilter; + + /* Add the default (all files) description */ + StringCbPrintfEx(c, uSizeRemain, &c, &uSizeRemain, 0, _T("%s (%s)"), szDefaultFilter, szDefaultExtension); + + /* Skip one char to seperate the description from the filter mask */ + c++; + uSizeRemain -= sizeof(*c); + + /* Append the filter mask */ + StringCbCopyEx(c, uSizeRemain, szDefaultExtension, &c, &uSizeRemain, 0); + + goto Cleanup; +} + +static VOID +CleanupFileFilter(VOID) +{ + if (szFilter && szFilter != szDefaultFilter) free(szFilter); +} + +static VOID OpenFileDialog(HWND hwnd) { OPENFILENAME OpenFileName; - TCHAR szFile[MAX_PATH + 1] = _T("\0"); - TCHAR szFilter[MAX_PATH], szCurrentDir[MAX_PATH]; + TCHAR szFile[MAX_PATH + 1] = _T(""); + TCHAR szCurrentDir[MAX_PATH]; ZeroMemory(&OpenFileName, sizeof(OpenFileName)); - LoadString(hInstance, IDS_ALL_TYPES_FILTER, szFilter, sizeof(szFilter) / sizeof(TCHAR)); - - if (!GetCurrentDirectory(sizeof(szCurrentDir) / sizeof(TCHAR), szCurrentDir)) + if (!GetCurrentDirectory(sizeof(szCurrentDir) / sizeof(szCurrentDir[0]), szCurrentDir)) { _tcscpy(szCurrentDir, _T("c:\\")); } @@ -660,7 +926,7 @@ OpenFileName.hInstance = hInstance; OpenFileName.lpstrFilter = szFilter; OpenFileName.lpstrFile = szFile; - OpenFileName.nMaxFile = sizeof(szFile) / sizeof((szFile)[0]); + OpenFileName.nMaxFile = sizeof(szFile) / sizeof(szFile[0]); OpenFileName.lpstrInitialDir = szCurrentDir; OpenFileName.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_SHAREAWARE; OpenFileName.lpstrDefExt = _T("\0"); @@ -689,7 +955,7 @@ TCHAR droppedfile[MAX_PATH]; drophandle = (HDROP)wParam; - DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile) / sizeof(TCHAR)); + DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile) / sizeof(droppedfile[0])); DragFinish(drophandle); PlayFile(hwnd, droppedfile); break; @@ -862,7 +1128,7 @@ case IDM_CLOSE_FILE: StopPlayback(hwnd); - _tcscpy(szPrevFile, _T("\0")); + szPrevFile[0] = _T('\0'); break; case IDM_REPEAT: @@ -928,7 +1194,7 @@ hInstance = hInst; - LoadString(hInstance, IDS_APPTITLE, szAppTitle, sizeof(szAppTitle) / sizeof(TCHAR)); + LoadString(hInstance, IDS_APPTITLE, szAppTitle, sizeof(szAppTitle) / sizeof(szAppTitle[0])); WndClass.cbSize = sizeof(WNDCLASSEX); WndClass.lpszClassName = szClassName; @@ -965,6 +1231,8 @@ hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCELERATORS)); + BuildFileFilter(); + DragAcceptFiles(hwnd, TRUE); DisableMenuItems(); @@ -991,6 +1259,8 @@ } } + CleanupFileFilter(); + DestroyAcceleratorTable(hAccel); return (INT)msg.wParam; Modified: trunk/reactos/base/applications/mplay32/mplay32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.h [iso-8859-1] Wed Feb 4 01:36:17 2015 @@ -1,4 +1,5 @@ #include <stdarg.h> +#include <stdlib.h> #include <windef.h> #include <winbase.h> #include <winuser.h> @@ -10,6 +11,7 @@ #include <digitalv.h> #include <commctrl.h> #include <tchar.h> +#include <strsafe.h> #include "resource.h"

9 years, 10 months

[aandrejevic] 66151: [FAST486] Add stubs for the remaining FPU instructions. Implement FNOP.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Feb 3 03:26:59 2015 New Revision: 66151 URL: http://svn.reactos.org/svn/reactos?rev=66151&view=rev Log: [FAST486] Add stubs for the remaining FPU instructions. Implement FNOP. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6615… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Tue Feb 3 03:26:59 2015 @@ -1222,8 +1222,307 @@ } else { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + switch ((ModRegRm.Register << 3) | ModRegRm.SecondRegister) + { + /* FLD */ + case 0x00: + case 0x01: + case 0x02: + case 0x03: + case 0x04: + case 0x05: + case 0x06: + case 0x07: + { + if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) + { + Fast486FpuException(State); + return; + } + } + + Fast486FpuPush(State, &FPU_ST(ModRegRm.SecondRegister)); + break; + } + + /* FXCH */ + case 0x08: + case 0x09: + case 0x0A: + case 0x0B: + case 0x0C: + case 0x0D: + case 0x0E: + case 0x0F: + { + FAST486_FPU_DATA_REG Temp; + + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) + || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + break; + } + + /* Exchange */ + Temp = FPU_ST(0); + FPU_ST(0) = FPU_ST(ModRegRm.SecondRegister); + FPU_ST(ModRegRm.SecondRegister) = Temp; + + FPU_UPDATE_TAG(0); + FPU_UPDATE_TAG(ModRegRm.SecondRegister); + + break; + } + + /* FNOP */ + case 0x10: + { + /* Do nothing */ + break; + } + + /* FSTP */ + case 0x18: + case 0x19: + case 0x1A: + case 0x1B: + case 0x1C: + case 0x1D: + case 0x1E: + case 0x1F: + { + FPU_ST(ModRegRm.SecondRegister) = FPU_ST(0); + FPU_UPDATE_TAG(ModRegRm.SecondRegister); + + Fast486FpuPop(State); + break; + } + + /* FCHS */ + case 0x20: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FABS */ + case 0x21: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FTST */ + case 0x24: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FXAM */ + case 0x25: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FTSTP */ + case 0x26: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FLD1 */ + case 0x28: + /* FLDL2T */ + case 0x29: + /* FLDL2E */ + case 0x2A: + /* FLDPI */ + case 0x2B: + /* FLDLG2 */ + case 0x2C: + /* FLDLN2 */ + case 0x2D: + /* FLDZ */ + case 0x2E: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* F2XM1 */ + case 0x30: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FYL2X */ + case 0x31: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FPTAN */ + case 0x32: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FPATAN */ + case 0x33: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FXTRACT */ + case 0x34: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FPREM1 */ + case 0x35: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FDECSTP */ + case 0x36: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FINCSTP */ + case 0x37: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FPREM */ + case 0x38: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FYL2XP1 */ + case 0x39: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FSQRT */ + case 0x3A: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FSINCOS */ + case 0x3B: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FRNDINT */ + case 0x3C: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FSCALE */ + case 0x3D: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FSIN */ + case 0x3E: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FCOS */ + case 0x3F: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + return; + } + } } #endif

9 years, 10 months

[dquintana] 66150: [RSHELL] * Add comments in some key places. * Reshuffled the order of a few methods.

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Feb 2 22:06:59 2015 New Revision: 66150 URL: http://svn.reactos.org/svn/reactos?rev=66150&view=rev Log: [RSHELL] * Add comments in some key places. * Reshuffled the order of a few methods. Modified: trunk/reactos/base/shell/rshell/CMenuBand.cpp trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp trunk/reactos/base/shell/rshell/CMenuSite.cpp trunk/reactos/base/shell/rshell/CMenuToolbars.cpp trunk/reactos/base/shell/rshell/CMergedFolder.cpp trunk/reactos/base/shell/rshell/CStartMenu.cpp trunk/reactos/base/shell/rshell/ShellDDE.cpp Modified: trunk/reactos/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuBan… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Mon Feb 2 22:06:59 2015 @@ -128,6 +128,8 @@ HWND hwnd, DWORD dwFlags) { + HRESULT hr; + TRACE("CMenuBand::SetMenu called, hmenu=%p; hwnd=%p, flags=%x\n", hmenu, hwnd, dwFlags); BOOL created = FALSE; @@ -138,17 +140,21 @@ m_hmenu = NULL; } - if (m_staticToolbar == NULL) + m_hmenu = hmenu; + m_menuOwner = hwnd; + + if (m_hmenu && m_staticToolbar == NULL) { m_staticToolbar = new CMenuStaticToolbar(this); created = true; } - m_hmenu = hmenu; - m_menuOwner = hwnd; - - HRESULT hr = m_staticToolbar->SetMenu(hmenu, hwnd, dwFlags); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + + if (m_staticToolbar) + { + hr = m_staticToolbar->SetMenu(hmenu, hwnd, dwFlags); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } if (m_site) { @@ -287,8 +293,11 @@ int syStatic = maxStatic.cy; int syShlFld = sy - syStatic; + // TODO: Windows has a more complex system to decide ordering. + // Because we only support two toolbars at once, this is enough for us. if (m_shellBottom) { + // Static menu on top if (m_SFToolbar) { m_SFToolbar->SetPosSize( @@ -306,8 +315,9 @@ syStatic); } } - else // shell menu on top - { + else + { + // Folder menu on top if (m_SFToolbar) { m_SFToolbar->SetPosSize( @@ -547,6 +557,10 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) { + // When called from outside, this is straightforward: + // Things that a submenu needs to know, are spread down, and + // things that the parent needs to know, are spread up. No drama. + // The fun is in _MenuItemSelect (internal method). switch (dwSelectType) { case MPOS_CHILDTRACKING: @@ -585,6 +599,7 @@ return S_OK; } +// Used by the focus manager to update the child band pointer HRESULT CMenuBand::_SetChildBand(CMenuBand * child) { m_childBand = child; @@ -595,6 +610,7 @@ return S_OK; } +// User by the focus manager to update the parent band pointer HRESULT CMenuBand::_SetParentBand(CMenuBand * parent) { m_parentBand = parent; @@ -633,7 +649,6 @@ HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) { - // HACK, so I can test for a submenu in the DeskBar if (!ppunkClient) return E_POINTER; *ppunkClient = NULL; @@ -754,7 +769,6 @@ smData.pidlItem = pidl; smData.hwnd = m_menuOwner ? m_menuOwner : m_topLevelWindow; smData.hmenu = m_hmenu; - smData.pvUserData = NULL; if (m_SFToolbar) m_SFToolbar->GetShellFolder(NULL, &smData.pidlFolder, IID_PPV_ARG(IShellFolder, &smData.psf)); HRESULT hr = m_psmc->CallbackSM(&smData, uMsg, wParam, lParam); @@ -859,7 +873,6 @@ if (m_SFToolbar) m_SFToolbar->ChangeHotItem(tb, id, dwFlags); _MenuItemSelect(MPOS_CHILDTRACKING); - return S_OK; } @@ -921,6 +934,7 @@ HRESULT CMenuBand::_MenuItemSelect(DWORD changeType) { + // Needed to prevent the this point from vanishing mid-function CComPtr<CMenuBand> safeThis = this; HRESULT hr; @@ -957,6 +971,9 @@ } } + // In this context, the parent is the CMenuDeskBar, so when it bubbles upward, + // it is notifying the deskbar, and not the the higher-level menu. + // Same for the child: since it points to a CMenuDeskBar, it's not just recursing. switch (changeType) { case MPOS_EXECUTE: Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Mon Feb 2 22:06:59 2015 @@ -23,6 +23,26 @@ #include "CMenuDeskBar.h" +/* As far as I can tell, the submenu hierarchy looks like this: +* +* The DeskBar's Child is the Band it contains. +* The DeskBar's Parent is the SID_SMenuPopup of the Site. +* +* The Band's Child is the IMenuPopup of the child submenu. +* The Band's Parent is the SID_SMenuPopup of the Site (the DeskBar). +* +* When the DeskBar receives a selection event: +* If it requires closing the window, it will notify the Child (Band) using CancelLevel. +* If it has to spread upwards (everything but CancelLevel), it will notify the Parent. +* +* When the Band receives a selection event, this is where it gets fuzzy: +* In which cases does it call the Parent? Probably not CancelLevel. +* In which cases does it call the Child? +* How does it react to calls? +* +*/ + + WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar); extern "C" @@ -576,26 +596,6 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(DWORD dwSelectType) { CComPtr<IDeskBar> safeThis = this; - - /* As far as I can tell, the submenu hierarchy looks like this: - * - * The DeskBar's Child is the Band it contains. - * The DeskBar's Parent is the SID_SMenuPopup of the Site. - * - * The Band's Child is the IMenuPopup of the child submenu. - * The Band's Parent is the SID_SMenuPopup of the Site (the DeskBar). - * - * When the DeskBar receives a selection event: - * If it requires closing the window, it will notify the Child (Band) using CancelLevel. - * If it has to spread upwards (everything but CancelLevel), it will notify the Parent. - * - * When the Band receives a selection event, this is where it gets fuzzy: - * In which cases does it call the Parent? Probably not CancelLevel. - * In which cases does it call the Child? - * How does it react to calls? - * - */ - CComPtr<IMenuPopup> oldParent = m_SubMenuParent; TRACE("OnSelect dwSelectType=%d\n", this, dwSelectType); @@ -623,9 +623,11 @@ HRESULT CMenuDeskBar::_CloseBar() { - CComPtr<IDeskBar> safeThis = this; CComPtr<IDeskBarClient> dbc; HRESULT hr; + + // Ensure that our data isn't destroyed while we are working + CComPtr<IDeskBar> safeThis = this; m_Shown = false; Modified: trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuFoc… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Mon Feb 2 22:06:59 2015 @@ -17,6 +17,28 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +/* +This file implements the CMenuFocusManager class. + +This class manages the shell menus, by overriding the hot-tracking behaviour. + +For the shell menus, it uses a GetMessage hook, +where it intercepts messages directed to the menu windows. + +In order to show submenus using system popups, it also has a MessageFilter hook. + +The menu is tracked using a stack structure. When a CMenuBand wants to open a submenu, +it pushes the submenu band, or HMENU to track in case of system popups, +and when the menu has closed, it pops the same pointer or handle. + +While a shell menu is open, it overrides the menu toolbar's hottracking behaviour, +using its own logic to track both the active menu item, and the opened submenu's parent item. + +While a system popup is open, it tracks the mouse movements so that it can cancel the popup, +and switch to another submenu when the mouse goes over another item from the parent. + +*/ #include "precomp.h" #include <windowsx.h> #include <commoncontrols.h> @@ -65,11 +87,13 @@ DWORD CMenuFocusManager::TlsIndex = 0; +// Gets the thread's assigned manager without refcounting CMenuFocusManager * CMenuFocusManager::GetManager() { return reinterpret_cast<CMenuFocusManager *>(TlsGetValue(TlsIndex)); } +// Obtains a manager for the thread, with refcounting CMenuFocusManager * CMenuFocusManager::AcquireManager() { CMenuFocusManager * obj = NULL; @@ -93,6 +117,7 @@ return obj; } +// Releases a previously acquired manager, and deletes it if the refcount reaches 0 void CMenuFocusManager::ReleaseManager(CMenuFocusManager * obj) { if (!obj->Release()) @@ -176,6 +201,7 @@ { } +// Used so that the toolbar can properly ignore mouse events, when the menu is being used with the keyboard void CMenuFocusManager::DisableMouseTrack(HWND parent, BOOL disableThis) { BOOL bDisable = FALSE; @@ -328,6 +354,8 @@ if (SendMessage(child, WM_USER_ISTRACKEDITEM, iHitTestResult, 0) == S_FALSE) { + // The current tracked item has changed, notify the toolbar + TRACE("Hot item tracking detected a change (capture=%p / cCapture=%p)...\n", m_captureHwnd, cCapture); DisableMouseTrack(NULL, FALSE); if (isTracking && iHitTestResult >= 0 && m_current->type == TrackedMenuEntry) @@ -692,6 +720,7 @@ return S_OK; } +// Used to update the tracking info to account for a change in the top-level menu HRESULT CMenuFocusManager::UpdateFocus() { HRESULT hr; @@ -699,11 +728,13 @@ TRACE("UpdateFocus\n"); + // Assign the new current item if (m_bandCount > 0) m_current = &(m_bandStack[m_bandCount - 1]); else m_current = NULL; + // Remove the menu capture if necesary if (!m_current || m_current->type != MenuPopupEntry) { SetMenuCapture(NULL); @@ -714,6 +745,7 @@ } } + // Obtain the top-level window for the new active menu if (m_current && m_current->type != TrackedMenuEntry) { hr = m_current->mb->_GetTopLevelWindow(&(m_current->hwnd)); @@ -721,6 +753,7 @@ return hr; } + // Refresh the parent pointer if (m_bandCount >= 2) { m_parent = &(m_bandStack[m_bandCount - 2]); @@ -731,6 +764,7 @@ m_parent = NULL; } + // Refresh the menubar pointer, if applicable if (m_bandCount >= 1 && m_bandStack[0].type == MenuBarEntry) { m_menuBar = &(m_bandStack[0]); @@ -740,6 +774,7 @@ m_menuBar = NULL; } + // Remove the old hooks if the menu type changed, or we don't have a menu anymore if (old && (!m_current || old->type != m_current->type)) { if (m_current && m_current->type != TrackedMenuEntry) @@ -752,6 +787,7 @@ return hr; } + // And place new ones if necessary if (m_current && (!old || old->type != m_current->type)) { hr = PlaceHooks(); @@ -759,6 +795,7 @@ return hr; } + // Give the user a chance to move the mouse to the new menu if (m_parent) { DisableMouseTrack(m_parent->hwnd, TRUE); @@ -822,6 +859,7 @@ return S_OK; } +// Begin tracking top-level menu bar (for file browser windows) HRESULT CMenuFocusManager::PushMenuBar(CMenuBand * mb) { TRACE("PushMenuBar %p\n", mb); @@ -837,6 +875,7 @@ return UpdateFocus(); } +// Begin tracking a shell menu popup (start menu or submenus) HRESULT CMenuFocusManager::PushMenuPopup(CMenuBand * mb) { TRACE("PushTrackedPopup %p\n", mb); @@ -862,6 +901,7 @@ return hr; } +// Begin tracking a system popup submenu (submenu of the file browser windows) HRESULT CMenuFocusManager::PushTrackedPopup(HMENU popup) { TRACE("PushTrackedPopup %p\n", popup); @@ -881,6 +921,7 @@ return UpdateFocus(); } +// Stop tracking the menubar HRESULT CMenuFocusManager::PopMenuBar(CMenuBand * mb) { StackEntryType type; @@ -925,6 +966,7 @@ return S_OK; } +// Stop tracking a shell menu HRESULT CMenuFocusManager::PopMenuPopup(CMenuBand * mb) { StackEntryType type; @@ -971,6 +1013,7 @@ return S_OK; } +// Stop tracking a system popup submenu HRESULT CMenuFocusManager::PopTrackedPopup(HMENU popup) { StackEntryType type; Modified: trunk/reactos/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuSit… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Mon Feb 2 22:06:59 2015 @@ -40,55 +40,12 @@ { } -HRESULT STDMETHODCALLTYPE CMenuSite::ContextSensitiveHelp(BOOL fEnterMode) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuSite::GetBandSiteInfo(BANDSITEINFO *pbsinfo) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuSite::RemoveBand(DWORD dwBandID) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuSite::SetBandSiteInfo(const BANDSITEINFO *pbsinfo) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuSite::SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuSite::SetModeDBC(DWORD dwMode) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuSite::TranslateAcceleratorIO(LPMSG lpMsg) -{ - return S_FALSE; -} - -HRESULT STDMETHODCALLTYPE CMenuSite::HasFocusIO() -{ - return S_FALSE; -} - -HRESULT STDMETHODCALLTYPE CMenuSite::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus) -{ - return S_OK; -} - +// Child Band management (simplified due to only supporting one single child) HRESULT STDMETHODCALLTYPE CMenuSite::AddBand(IUnknown * punk) { HRESULT hr; + // Little helper, for readability #define TO_HRESULT(x) ((HRESULT)(S_OK+(x))) CComPtr<IUnknown> pUnknown; @@ -144,11 +101,6 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CMenuSite::Exec(const GUID * pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) -{ - return IUnknown_Exec(m_DeskBarSite, *pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); -} - HRESULT STDMETHODCALLTYPE CMenuSite::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv) { if (dwBandID != 0 || m_BandObject == NULL) @@ -160,6 +112,27 @@ return m_BandObject->QueryInterface(riid, ppv); } +HRESULT STDMETHODCALLTYPE CMenuSite::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) +{ + if (dwBandID != 0) + return E_FAIL; + + if (!m_BandObject) + { + *ppstb = NULL; + return E_NOINTERFACE; + } + + HRESULT hr = m_BandObject->QueryInterface(IID_PPV_ARG(IDeskBand, ppstb)); + + *pdwState = 1; + + if (cchName > 0) + pszName[0] = 0; + + return hr; +} + HRESULT STDMETHODCALLTYPE CMenuSite::GetSize(DWORD dwWhich, LPRECT prc) { memset(prc, 0, sizeof(*prc)); @@ -208,27 +181,6 @@ return S_OK; return m_WinEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); -} - -HRESULT STDMETHODCALLTYPE CMenuSite::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) -{ - if (dwBandID != 0) - return E_FAIL; - - if (!m_BandObject) - { - *ppstb = NULL; - return E_NOINTERFACE; - } - - HRESULT hr = m_BandObject->QueryInterface(IID_PPV_ARG(IDeskBand, ppstb)); - - *pdwState = 1; - - if (cchName > 0) - pszName[0] = 0; - - return hr; } HRESULT STDMETHODCALLTYPE CMenuSite::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) @@ -251,11 +203,15 @@ return IUnknown_QueryService(m_DeskBarSite, guidService, riid, ppvObject); } +HRESULT STDMETHODCALLTYPE CMenuSite::Exec(const GUID * pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + // Forward Exec calls directly to the parent deskbar + return IUnknown_Exec(m_DeskBarSite, *pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); +} + HRESULT STDMETHODCALLTYPE CMenuSite::QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) { - if (!m_DeskBarSite) - return E_FAIL; - + // Forward QueryStatus calls directly to the parent deskbar return IUnknown_QueryStatus(m_DeskBarSite, *pguidCmdGroup, cCmds, prgCmds, pCmdText); } @@ -265,6 +221,7 @@ CComPtr<IUnknown> protectThis(this->ToIUnknown()); + // Only initialize if a parent site is being assigned if (punkSite) { HWND hWndSite; @@ -282,23 +239,24 @@ } m_DeskBarSite = punkSite; - - return S_OK; - } - - if (m_DeskBand) - { - m_DeskBand->CloseDW(0); - } - - hr = IUnknown_SetSite(m_BandObject, NULL); - - m_BandObject = NULL; - m_DeskBand = NULL; - m_WinEventHandler = NULL; - m_hWndBand = NULL; - m_hWnd = NULL; - m_DeskBarSite = NULL; + } + else + { + // Otherwise, deinitialize. + if (m_DeskBand) + { + m_DeskBand->CloseDW(0); + } + + hr = IUnknown_SetSite(m_BandObject, NULL); + + m_BandObject = NULL; + m_DeskBand = NULL; + m_WinEventHandler = NULL; + m_hWndBand = NULL; + m_hWnd = NULL; + m_DeskBarSite = NULL; + } return S_OK; } @@ -359,3 +317,48 @@ return FALSE; } + +HRESULT STDMETHODCALLTYPE CMenuSite::ContextSensitiveHelp(BOOL fEnterMode) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::GetBandSiteInfo(BANDSITEINFO *pbsinfo) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::RemoveBand(DWORD dwBandID) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::SetBandSiteInfo(const BANDSITEINFO *pbsinfo) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::SetModeDBC(DWORD dwMode) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::TranslateAcceleratorIO(LPMSG lpMsg) +{ + return S_FALSE; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::HasFocusIO() +{ + return S_FALSE; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus) +{ + return S_OK; +} Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Mon Feb 2 22:06:59 2015 @@ -1189,7 +1189,6 @@ SMINFO * sminfo = new SMINFO(); sminfo->dwMask = SMIM_ICON | SMIM_FLAGS; - // FIXME: remove before deleting the toolbar or it will leak HRESULT hr = m_menuBand->_CallCBWithItemId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo)); if (FAILED_UNEXPECTEDLY(hr)) Modified: trunk/reactos/base/shell/rshell/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMergedF… ============================================================================== --- trunk/reactos/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] Mon Feb 2 22:06:59 2015 @@ -152,6 +152,7 @@ DSA_DeleteAllItems(m_hDsa); m_hDsaCount = 0; + // The sources are not ordered so load all of the items for the user folder first TRACE("Loading Local entries...\n"); for (;;) { @@ -186,6 +187,7 @@ m_hDsaCount++; } + // Then load the items for the common folder TRACE("Loading Common entries...\n"); for (;;) { @@ -213,6 +215,8 @@ ILFree(pidl); + // Try to find an existing entry with the same name, and makr it as shared. + // FIXME: This is sub-optimal, a hash table would be a lot more efficient. BOOL bShared = FALSE; for (int i = 0; i < (int)m_hDsaCount; i++) { @@ -235,6 +239,7 @@ } } + // If an entry was not found, add a new one for this item if (!bShared) { TRACE("Inserting item %d with name %S\n", m_hDsaCount, name); Modified: trunk/reactos/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CStartMe… ============================================================================== --- trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Mon Feb 2 22:06:59 2015 @@ -232,8 +232,8 @@ HRESULT OnExec(LPSMDATA psmd) { - // HACK: Instead of running explorer.exe with the path, we should be using ShellExecute to "open" the path directly! - // Remove once ShellExecute can handle CLSID path components. + // HACK: Because our ShellExecute can't handle CLSID components in paths, we can't launch the paths using the "open" verb. + // FIXME: Change this back to using the path as the filename and the "open" verb, once ShellExecute can handle CLSID path components. if (psmd->uId == IDM_CONTROLPANEL) ShellExecuteW(NULL, NULL, L"explorer.exe", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", NULL, SW_SHOWNORMAL); Modified: trunk/reactos/base/shell/rshell/ShellDDE.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/ShellDDE… ============================================================================== --- trunk/reactos/base/shell/rshell/ShellDDE.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/ShellDDE.cpp [iso-8859-1] Mon Feb 2 22:06:59 2015 @@ -22,6 +22,9 @@ #include <ddeml.h> #include <strsafe.h> #include <shlwapi_undoc.h> + +/* WARNING: Although this is a functional implementation of the DDE parsing, the handlers are not implemented here. +The actual working implementation is in shell32 instead. */ WINE_DEFAULT_DEBUG_CHANNEL(shelldde);

9 years, 10 months

[jimtabor] 66149: [Win32ss] - Fix SeaMonkey crash while restarting the web browser.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Feb 2 06:22:26 2015 New Revision: 66149 URL: http://svn.reactos.org/svn/reactos?rev=66149&view=rev Log: [Win32ss] - Fix SeaMonkey crash while restarting the web browser. Modified: trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Mon Feb 2 06:22:26 2015 @@ -942,47 +942,49 @@ FASTCALL IntFlashWindowEx(PWND pWnd, PFLASHWINFO pfwi) { - PFLASHDATA pfData; + DWORD FlashState; + UINT uCount = pfwi->uCount; BOOL Activate = FALSE, Ret = FALSE; - pfData = UserGetProp(pWnd, AtomFlashWndState); - if (!pfData) - { - pfData = ExAllocatePoolWithTag(NonPagedPool, sizeof(FLASHDATA), USERTAG_WINDOW); - - pfData->FlashState = 0; - pfData->uCount = pfwi->uCount; - - IntSetProp(pWnd, AtomFlashWndState, (HANDLE) pfData); - } - - if (pfData->FlashState == FLASHW_FINISHED) + ASSERT(pfwi); + + FlashState = (DWORD)UserGetProp(pWnd, AtomFlashWndState); + + if (FlashState == FLASHW_FINISHED) { // Cycle has finished, kill timer and set this to Stop. - pfData->FlashState |= FLASHW_KILLSYSTIMER; + FlashState |= FLASHW_KILLSYSTIMER; pfwi->dwFlags = FLASHW_STOP; } else { - if (pfData->FlashState) + if (FlashState) { if (pfwi->dwFlags == FLASHW_SYSTIMER) { - // Called from system timer, restore flags. - pfwi->dwFlags = pfData->FlashState; + // Called from system timer, restore flags, counts and state. + pfwi->dwFlags = LOWORD(FlashState); + uCount = HIWORD(FlashState); + FlashState = MAKELONG(LOWORD(FlashState),0); } - } - else + else + { + // Clean out the trash! Fix SeaMonkey crash after restart. + FlashState = 0; + } + } + + if (FlashState == 0) { // First time in cycle, setup flash state. if ( pWnd->state & WNDS_ACTIVEFRAME || (pfwi->dwFlags & FLASHW_CAPTION && pWnd->style & (WS_BORDER|WS_DLGFRAME))) { - pfData->FlashState = FLASHW_STARTED|FLASHW_ACTIVE; + FlashState = FLASHW_STARTED|FLASHW_ACTIVE; } } // Set previous window state. - Ret = !!(pfData->FlashState & FLASHW_ACTIVE); + Ret = !!(FlashState & FLASHW_ACTIVE); if ( pfwi->dwFlags & FLASHW_TIMERNOFG && gpqForeground == pWnd->head.pti->MessageQueue ) @@ -1002,7 +1004,7 @@ } else { - Activate = (pfData->FlashState & FLASHW_ACTIVE) == 0; + Activate = (FlashState & FLASHW_ACTIVE) == 0; } if ( pfwi->dwFlags == FLASHW_STOP || pfwi->dwFlags & FLASHW_CAPTION ) @@ -1019,31 +1021,29 @@ if ( pfwi->dwFlags == FLASHW_STOP ) { - if (pfData->FlashState & FLASHW_KILLSYSTIMER) + if (FlashState & FLASHW_KILLSYSTIMER) { IntKillTimer(pWnd, ID_EVENT_SYSTIMER_FLASHWIN, TRUE); } IntRemoveProp(pWnd, AtomFlashWndState); - - ExFreePoolWithTag(pfData, USERTAG_WINDOW); } else { // Have a count and started, set timer. - if ( pfData->uCount ) - { - pfData->FlashState |= FLASHW_COUNT; - - if (!(Activate ^ !!(pfData->FlashState & FLASHW_STARTED))) - pfData->uCount--; - - if (!(pfData->FlashState & FLASHW_KILLSYSTIMER)) + if ( uCount ) + { + FlashState |= FLASHW_COUNT; + + if (!(Activate ^ !!(FlashState & FLASHW_STARTED))) + uCount--; + + if (!(FlashState & FLASHW_KILLSYSTIMER)) pfwi->dwFlags |= FLASHW_TIMER; } if (pfwi->dwFlags & FLASHW_TIMER) { - pfData->FlashState |= FLASHW_KILLSYSTIMER; + FlashState |= FLASHW_KILLSYSTIMER; IntSetTimer( pWnd, ID_EVENT_SYSTIMER_FLASHWIN, @@ -1052,17 +1052,19 @@ TMRF_SYSTEM ); } - if (pfData->FlashState & FLASHW_COUNT && pfData->uCount == 0) + if (FlashState & FLASHW_COUNT && uCount == 0) { // Keep spinning? Nothing else to do. - pfData->FlashState = FLASHW_FINISHED; + FlashState = FLASHW_FINISHED; } else { // Save state and flags so this can be restored next time through. - pfData->FlashState ^= (pfData->FlashState ^ -!!(Activate)) & FLASHW_ACTIVE; - pfData->FlashState ^= (pfData->FlashState ^ pfwi->dwFlags) & (FLASHW_MASK & ~FLASHW_TIMER); - } + FlashState ^= (FlashState ^ -!!(Activate)) & FLASHW_ACTIVE; + FlashState ^= (FlashState ^ pfwi->dwFlags) & (FLASHW_MASK & ~FLASHW_TIMER); + } + FlashState = MAKELONG(LOWORD(FlashState),uCount); + IntSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState); } return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Mon Feb 2 06:22:26 2015 @@ -7,11 +7,6 @@ #define FLASHW_COUNT 0x00002000 #define FLASHW_KILLSYSTIMER 0x00004000 #define FLASHW_ACTIVE 0x00008000 - -typedef struct _FLASHDATA{ - DWORD FlashState; - UINT uCount; -} FLASHDATA, *PFLASHDATA; BOOL FASTCALL co_UserRedrawWindow(PWND Wnd, const RECTL* UpdateRect, PREGION UpdateRgn, ULONG Flags); VOID FASTCALL IntInvalidateWindows(PWND Window, PREGION Rgn, ULONG Flags);

9 years, 10 months

[ekohl] 66148: [NTOSKRNL] SeAssignSecurityEx: Add support for SEF_DEFAULT_OWNER_FROM_PARENT and SEF_DEFAULT_GROUP_FROM_PARENT. This fixes several kmtest:SeInheritance bugs.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 1 23:01:31 2015 New Revision: 66148 URL: http://svn.reactos.org/svn/reactos?rev=66148&view=rev Log: [NTOSKRNL] SeAssignSecurityEx: Add support for SEF_DEFAULT_OWNER_FROM_PARENT and SEF_DEFAULT_GROUP_FROM_PARENT. This fixes several kmtest:SeInheritance bugs. Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=66148… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Sun Feb 1 23:01:31 2015 @@ -1184,8 +1184,27 @@ } if (!Owner) { - DPRINT("Use token owner sid!\n"); - Owner = Token->UserAndGroups[Token->DefaultOwnerIndex].Sid; + if (AutoInheritFlags & 0x20 /* FIXME: SEF_DEFAULT_OWNER_FROM_PARENT */) + { + DPRINT("Use parent owner sid!\n"); + if (!ARGUMENT_PRESENT(ParentDescriptor)) + { + SeUnlockSubjectContext(SubjectContext); + return STATUS_INVALID_OWNER; + } + + Owner = SepGetOwnerFromDescriptor(ParentDescriptor); + if (!Owner) + { + SeUnlockSubjectContext(SubjectContext); + return STATUS_INVALID_OWNER; + } + } + else + { + DPRINT("Use token owner sid!\n"); + Owner = Token->UserAndGroups[Token->DefaultOwnerIndex].Sid; + } } OwnerLength = RtlLengthSid(Owner); NT_ASSERT(OwnerLength % sizeof(ULONG) == 0); @@ -1197,8 +1216,27 @@ } if (!Group) { - DPRINT("Use token group sid!\n"); - Group = Token->PrimaryGroup; + if (AutoInheritFlags & 0x40 /* FIXME: SEF_DEFAULT_GROUP_FROM_PARENT */) + { + DPRINT("Use parent group sid!\n"); + if (!ARGUMENT_PRESENT(ParentDescriptor)) + { + SeUnlockSubjectContext(SubjectContext); + return STATUS_INVALID_PRIMARY_GROUP; + } + + Group = SepGetGroupFromDescriptor(ParentDescriptor); + if (!Group) + { + SeUnlockSubjectContext(SubjectContext); + return STATUS_INVALID_PRIMARY_GROUP; + } + } + else + { + DPRINT("Use token group sid!\n"); + Group = Token->PrimaryGroup; + } } if (!Group) {

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015