Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 67041: [INF] remove BOM
by cwittich＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: cwittich Date: Sat Apr 4 13:08:21 2015 New Revision: 67041 URL: http://svn.reactos.org/svn/reactos?rev=67041&view=rev Log: [INF] remove BOM Modified: trunk/reactos/media/inf/battery.inf Modified: trunk/reactos/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/battery.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/battery.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/battery.inf [iso-8859-1] Sat Apr 4 13:08:21 2015 @@ -1,4 +1,4 @@ -ï»¿; BATTERY.INF +; BATTERY.INF [Version] Signature = "$Windows NT$"

1 0

[tkreuzer] 67040: [GDI32_APITEST] Add more tests for ExtCreatePen. This adds tests for almost all thinkable combinations of parameters. On win7: "ExtCreatePen: 7594830 tests executed (0 marked as t...
by tkreuzer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tkreuzer Date: Sat Apr 4 12:53:05 2015 New Revision: 67040 URL: http://svn.reactos.org/svn/reactos?rev=67040&view=rev Log: [GDI32_APITEST] Add more tests for ExtCreatePen. This adds tests for almost all thinkable combinations of parameters. On win7: "ExtCreatePen: 7594830 tests executed (0 marked as todo, 0 failures), 0 skipped." After evaluating the results on WHS2003, this test will be disabled, since it is expected that most of these fail on ros atm. Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateP… ============================================================================== --- trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] Sat Apr 4 12:53:05 2015 @@ -11,35 +11,533 @@ #include <winddi.h> #include <include/ntgdityp.h> #include <include/ntgdihdl.h> - -void Test_ExtCreatePen() +#include <stdio.h> + +#define ok_lasterror(err) \ + ok(GetLastError() == err, "expected last error " #err " but got 0x%lx\n", GetLastError()); + +#define ok_elp(hPen, elp, pstyle, width, bstyle, color, hatch, cstyle) \ + ok(GetObjectA(hPen, sizeof(elpBuffer), elp) != 0, "GetObject failed\n"); \ + ok((elp)->elpPenStyle == (pstyle), "Wrong elpPenStyle, expected 0x%lx, got 0x%lx\n", pstyle, (elp)->elpPenStyle); \ + ok((elp)->elpWidth == width, "Wrong elpWidth, expected %lu, got %lu\n", width, (elp)->elpWidth); \ + ok((elp)->elpBrushStyle == (bstyle), "Wrong elpBrushStyle, expected 0x%lx, got 0x%lx\n", bstyle, (elp)->elpBrushStyle); \ + ok((elp)->elpColor == color, "Wrong elpColor, expected 0x%lx, got 0x%lx\n", color, (elp)->elpColor); \ + ok((elp)->elpHatch == hatch, "Wrong elpHatch, expected 0x%p, got 0x%p\n", (PVOID)hatch, (PVOID)(elp)->elpColor); \ + ok((elp)->elpNumEntries == cstyle, "Wrong elpNumEntries, expected %lu got %lu\n", cstyle, (elp)->elpNumEntries); + +void Test_ExtCreatePen_Params() { - HPEN hPen; - LOGBRUSH logbrush; - DWORD dwStyles[17] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17}; - - logbrush.lbStyle = BS_SOLID; - logbrush.lbColor = RGB(1,2,3); - logbrush.lbHatch = 0; - hPen = ExtCreatePen(PS_COSMETIC, 1,&logbrush, 0, 0); - ok(hPen != 0, "ExtCreatePen failed\n"); - if (!hPen) return; - - /* Test if we have an EXTPEN */ - ok(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_EXTPEN, "hPen=%p\n", hPen); - DeleteObject(hPen); - - /* test userstyles */ - hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 17, (CONST DWORD*)&dwStyles); - ok(hPen == 0, "\n"); - hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 16, (CONST DWORD*)&dwStyles); - ok(hPen != 0, "\n"); - - DeleteObject(hPen); + HPEN hPen; + LOGBRUSH logbrush; + struct + { + EXTLOGPEN extlogpen; + ULONG styles[16]; + } elpBuffer; + PEXTLOGPEN pelp = &elpBuffer.extlogpen; + + DWORD adwStyles[17] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17}; + + /* Test NULL logbrush */ + SetLastError(0); + _SEH2_TRY + { + hPen = ExtCreatePen(PS_COSMETIC, 1, NULL, 0, 0); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(0xdeadc0de); + } + _SEH2_END; + ok_lasterror(0xdeadc0de); + + logbrush.lbStyle = BS_SOLID; + logbrush.lbColor = RGB(1, 2, 3); + logbrush.lbHatch = 0; + hPen = ExtCreatePen(PS_COSMETIC, 1, &logbrush, 0, 0); + ok(hPen != NULL, "ExtCreatePen failed\n"); + ok_elp(hPen, pelp, PS_COSMETIC, 1, BS_SOLID, RGB(1,2,3), 0, 0); + + /* Test if we have an EXTPEN */ + ok(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_EXTPEN, "hPen=%p\n", hPen); + DeleteObject(hPen); + + /* Test invalid style mask (0x0F) */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(9, 1, &logbrush, 0, 0); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test PS_ALTERNATE with PS_GEOMETRIC */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_ALTERNATE | PS_GEOMETRIC, 1, &logbrush, 0, NULL); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test invalid endcap mask (0xF00) */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(0x300, 1, &logbrush, 0, 0); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test invalid join mask (F000) */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(0x3000, 1, &logbrush, 0, 0); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test invalid type mask (F0000) */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(0x20000, 1, &logbrush, 0, 0); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test PS_COSMETIC with dwWidth != 1 */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_COSMETIC, -1, &logbrush, 0, 0); + ok(hPen != NULL, "ExtCreatePen failed\n"); + ok_lasterror(0xdeadc0de); + ok_elp(hPen, pelp, PS_COSMETIC, 1, BS_SOLID, RGB(1,2,3), 0, 0); + DeleteObject(hPen); + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_COSMETIC, 2, &logbrush, 0, 0); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_COSMETIC, 0, &logbrush, 0, 0); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test PS_COSMETIC with PS_ENDCAP_SQUARE */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_COSMETIC | PS_ENDCAP_SQUARE, 1, &logbrush, 0, NULL); + ok(hPen != NULL, "ExtCreatePen failed\n"); + ok_lasterror(0xdeadc0de); + ok_elp(hPen, pelp, PS_COSMETIC | PS_ENDCAP_SQUARE, 1, BS_SOLID, RGB(1,2,3), 0, 0); + DeleteObject(hPen); + + /* Test styles without PS_USERSTYLE */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_GEOMETRIC, 1, &logbrush, 16, adwStyles); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_GEOMETRIC, 1, &logbrush, 0, adwStyles); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_GEOMETRIC, 1, &logbrush, 16, NULL); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test PS_USERSTYLE */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 16, adwStyles); + ok(hPen != NULL, "ExtCreatePen failed\n"); + ok_lasterror(0xdeadc0de); + ok_elp(hPen, pelp, PS_GEOMETRIC | PS_USERSTYLE, 5, BS_SOLID, RGB(1,2,3), 0, 16); + DeleteObject(hPen); + + /* Test PS_USERSTYLE with PS_COSMETIC */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_COSMETIC | PS_USERSTYLE, 5, &logbrush, 16, adwStyles); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test PS_USERSTYLE with 17 styles */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 17, adwStyles); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test PS_USERSTYLE with 1 style */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 1, adwStyles); + ok(hPen != NULL, "ExtCreatePen failed\n"); + ok_lasterror(0xdeadc0de); + ok_elp(hPen, pelp, PS_GEOMETRIC | PS_USERSTYLE, 5, BS_SOLID, RGB(1,2,3), 0, 1); + DeleteObject(hPen); + + /* Test PS_USERSTYLE with NULL lpStyles */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 1, &logbrush, 2, NULL); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test PS_NULL */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_NULL, 1, &logbrush, 0, NULL); + ok(hPen == GetStockObject(NULL_PEN), "ExtCreatePen should return NULL_PEN, but returned %p\n", hPen); + ok_lasterror(0xdeadc0de); + + /* When the size is anything other than sizeof(EXTLOGPEN), we will get a LOGPEN! */ + ok(GetObjectA(hPen, sizeof(EXTLOGPEN) + 1, pelp) == sizeof(LOGPEN), "GetObject failed\n"); + + /* ACHTUNG: special handling, we want sizeof(EXTLOGPEN) and nothing else */ + ok(GetObjectA(hPen, sizeof(EXTLOGPEN), pelp) == sizeof(EXTLOGPEN), "GetObject failed\n"); + ok(pelp->elpPenStyle == PS_NULL, "Wrong elpPenStyle, expected PS_NULL, got 0x%lx\n", pelp->elpPenStyle); + ok(pelp->elpWidth == 0, "Wrong elpWidth, expected 0, got %lu\n", pelp->elpWidth); + ok(pelp->elpBrushStyle == BS_SOLID, "Wrong elpBrushStyle, expected BS_SOLID, got 0x%lx\n", pelp->elpBrushStyle); + ok(pelp->elpColor == 0, "Wrong elpColor, expected 0, got 0x%lx\n", pelp->elpColor); + ok(pelp->elpHatch == 0, "Wrong elpHatch, expected 0, got 0x%p\n", (PVOID)pelp->elpColor); + ok(pelp->elpNumEntries == 0, "Wrong elpNumEntries, expected %lu got %lu\n", 0, pelp->elpNumEntries); + + /* Test PS_NULL with styles */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_NULL, 1, &logbrush, 1, adwStyles); + ok(hPen == NULL, "ExtCreatePen should fail\n"); + ok_lasterror(ERROR_INVALID_PARAMETER); + + /* Test 0 width */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_GEOMETRIC, 0, &logbrush, 0, 0); + ok(hPen != NULL, "ExtCreatePen failed\n"); + ok_lasterror(0xdeadc0de); + ok_elp(hPen, pelp, PS_GEOMETRIC, 0, BS_SOLID, RGB(1,2,3), 0, 0); + DeleteObject(hPen); + + /* Test negative width */ + SetLastError(0xdeadc0de); + hPen = ExtCreatePen(PS_GEOMETRIC, -7942, &logbrush, 0, 0); + ok(hPen != NULL, "ExtCreatePen failed\n"); + ok_lasterror(0xdeadc0de); + ok_elp(hPen, pelp, PS_GEOMETRIC, 7942, BS_SOLID, RGB(1,2,3), 0, 0); + DeleteObject(hPen); + +} + +BOOL +Test_ExtCreatePen_Expect( + DWORD dwPenStyle, + DWORD dwWidth, + DWORD dwStyleCount, + PDWORD pdwStyles, + UINT lbStyle, + ULONG_PTR lbHatch, + PBOOL pbExpectException, + PEXTLOGPEN pelpExpect) +{ + *pbExpectException = FALSE; + + if ((dwPenStyle & PS_STYLE_MASK) == PS_USERSTYLE) + { + if (pdwStyles == NULL) + { + return FALSE; + } + } + else + { + if ((dwStyleCount != 0) || (pdwStyles != NULL)) + { + return FALSE; + } + } + + if (lbStyle == BS_PATTERN) + { + if (lbHatch == 0) return FALSE; + } + + if (lbStyle == BS_DIBPATTERNPT) + { + if (lbHatch == 0) return FALSE; + if (lbHatch < 0xFFFF) + { + *pbExpectException = TRUE; + return FALSE; + } + } + + if (lbStyle == BS_DIBPATTERN) + { + return FALSE; + } + + if ((dwPenStyle & PS_STYLE_MASK) == PS_USERSTYLE) + { + if (dwStyleCount == 0) + { + return FALSE; + } + + if (dwStyleCount > 16) + { + return FALSE; + } + + if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) + { + if (pdwStyles[0] == 0) + { + return FALSE; + } + } + else + { + if ((pdwStyles[0] == 0) && (dwStyleCount == 1)) + { + return FALSE; + } + } + } + + if ((dwPenStyle & PS_STYLE_MASK) == PS_NULL) + { + pelpExpect->elpPenStyle = PS_NULL; + pelpExpect->elpWidth = 0; + pelpExpect->elpBrushStyle = BS_SOLID; + pelpExpect->elpColor = 0; + pelpExpect->elpHatch = 0; + pelpExpect->elpNumEntries = 0; + return TRUE; + } + + + if (((dwPenStyle & PS_STYLE_MASK) >> 0) > PS_ALTERNATE) return FALSE; + if (((dwPenStyle & PS_ENDCAP_MASK) >> 8) > 2) return FALSE; + if (((dwPenStyle & PS_JOIN_MASK) >> 12) > 2) return FALSE; + if (((dwPenStyle & PS_TYPE_MASK) >> 16) > 1) return FALSE; + + dwWidth = abs(((LONG)dwWidth)); + + if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) + { + if (dwWidth != 1) return FALSE; + + if ((lbStyle != BS_SOLID) && + (lbStyle != BS_HATCHED)) + { + return FALSE; + } + + if (lbStyle == BS_HATCHED) + { + if ((lbHatch != 8) && + (lbHatch != 10) && + (lbHatch != 12)) + { + return FALSE; + } + + if (lbHatch >= HS_API_MAX) + { + return FALSE; + } + } + + if ((dwPenStyle & PS_STYLE_MASK) == PS_INSIDEFRAME) + { + return FALSE; + } + } + else + { + if ((dwPenStyle & PS_STYLE_MASK) == PS_ALTERNATE) + { + return FALSE; + } + + if (((dwPenStyle & PS_STYLE_MASK) != PS_SOLID) && + ((dwPenStyle & PS_STYLE_MASK) != PS_INSIDEFRAME) && + ((dwPenStyle & PS_STYLE_MASK) != PS_USERSTYLE)) + { + if (dwWidth == 0) + { + return FALSE; + } + } + + if (lbStyle == BS_NULL) + { + pelpExpect->elpPenStyle = PS_NULL; + pelpExpect->elpWidth = 0; + pelpExpect->elpBrushStyle = BS_SOLID; + pelpExpect->elpColor = 0; + pelpExpect->elpHatch = 0; + pelpExpect->elpNumEntries = 0; + return TRUE; + } + + if (lbStyle > BS_HATCHED) + { + return FALSE; + } + + if (lbStyle == BS_HATCHED) + { + if (lbHatch >= HS_API_MAX) + { + return FALSE; + } + } + + } + + pelpExpect->elpPenStyle = dwPenStyle; + pelpExpect->elpWidth = dwWidth; + pelpExpect->elpBrushStyle = lbStyle; + pelpExpect->elpColor = RGB(1,2,3); + pelpExpect->elpHatch = lbHatch; + pelpExpect->elpNumEntries = dwStyleCount; + //pelpExpect->elpStyleEntry[1]; + + return TRUE; +} + +void +Test_ExtCreatePen_Helper( + DWORD dwPenStyle, + DWORD dwWidth, + DWORD dwStyleCount, + PDWORD pdwStyles, + UINT lbStyle, + ULONG_PTR lbHatch) +{ + LOGBRUSH lb; + HPEN hpen; + BOOL bExpectSuccess, bExpectException, bGotException = FALSE; + struct + { + EXTLOGPEN extlogpen; + ULONG styles[16]; + } elpBuffer; + PEXTLOGPEN pelp = &elpBuffer.extlogpen; + EXTLOGPEN elpExpect; + + lb.lbStyle = lbStyle; + lb.lbColor = RGB(1,2,3); + lb.lbHatch = lbHatch; + + bExpectSuccess = Test_ExtCreatePen_Expect( + dwPenStyle, + dwWidth, + dwStyleCount, + pdwStyles, + lbStyle, + lbHatch, + &bExpectException, + &elpExpect); + + _SEH2_TRY + { + hpen = ExtCreatePen(dwPenStyle, dwWidth, &lb, dwStyleCount, pdwStyles); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bGotException = TRUE; + } + _SEH2_END; + +#define ok2(expression, text, expected, got) \ + ok(expression, text \ + "(dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%lu, lbHatch=%p)\n", \ + expected, got, dwPenStyle, dwWidth, dwStyleCount, pdwStyles, lbStyle, (PVOID)lbHatch); + + //ok(bGotException == bExpectException, "ExtCreatePen expected exception=%lu for " + // "dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%lu, lbHatch=%p\n", + // bExpectException, dwPenStyle, dwWidth, dwStyleCount, pdwStyles, lbStyle, (PVOID)lbHatch); + + ok2(bGotException == bExpectException, "ExtCreatePen expception, expected %lu, got %lu", bExpectException, bGotException); + + if (!bExpectSuccess) + { + ok(hpen == NULL, "ExtCreatePen should fail for " + "dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%lu, lbHatch=%p\n", + dwPenStyle, dwWidth, dwStyleCount, pdwStyles, lbStyle, (PVOID)lbHatch); + } + else + { + ok(hpen != NULL, "ExtCreatePen failed for " + "dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%lu, lbHatch=%p\n", + dwPenStyle, dwWidth, dwStyleCount, pdwStyles, lbStyle, (PVOID)lbHatch); + if (hpen != NULL) + { + if (GetObjectA(hpen, sizeof(elpBuffer), pelp) < sizeof(EXTLOGPEN)) + { + if (!GetObjectA(hpen, sizeof(EXTLOGPEN), pelp)) + { + ok(0, "failed again?\n"); + return; + } + } + + ok2(pelp->elpPenStyle == elpExpect.elpPenStyle, "elpPenStyle, expected 0x%lx, got 0x%lx\n", elpExpect.elpPenStyle, pelp->elpPenStyle); + ok2(pelp->elpWidth == elpExpect.elpWidth, "elpWidth, expected 0x%lx, got 0x%lx\n", elpExpect.elpWidth, pelp->elpWidth); + ok2(pelp->elpBrushStyle == elpExpect.elpBrushStyle, "elpBrushStyle, expected 0x%lx, got 0x%lx\n", elpExpect.elpBrushStyle, pelp->elpBrushStyle); + ok2(pelp->elpColor == elpExpect.elpColor, "elpColor, expected 0x%lx, got 0x%lx\n", elpExpect.elpColor, pelp->elpColor); + ok2(pelp->elpHatch == elpExpect.elpHatch, "elpHatch, expected 0x%lx, got 0x%lx\n", elpExpect.elpHatch, pelp->elpHatch); + ok2(pelp->elpNumEntries == elpExpect.elpNumEntries, "elpNumEntries, expected 0x%lx, got 0x%lx\n", elpExpect.elpNumEntries, pelp->elpNumEntries); + //for (i = 0; i < pelp->elpNumEntries; i++) + //{ + // ok2(pelp->elpStyleEntry[i] == elpExpect.elpStyleEntry[i], "elpHatch, expected 0x%lx, got 0x%lx\n", elpExpect.elpStyleEntry[i], pelp->elpStyleEntry[i]); + //} + } + } + +} + +void Test_ExtCreatePen_Params2() +{ + ULONG aflPenType[] = {PS_COSMETIC, PS_GEOMETRIC, 0x20000}; + ULONG iType, iStyle, iEndCap, iJoin, iWidth, iStyleCount, iStyles, iBrushStyle, iHatch; + DWORD adwStyles[17] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17}; + DWORD adwStyles2[17] = {0,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17}; + + printf("adwStyles=%p, adwStyles2=%p\n", adwStyles, adwStyles2); + + //for (iType = 0; iType < sizeof(aflPenType) / sizeof(aflPenType[0]); iType++) + for (iType = 0; iType < 3; iType++) + { + ULONG aflPenStyle[] = {PS_SOLID, PS_DASH, PS_DOT, PS_DASHDOT, PS_DASHDOTDOT, PS_NULL, PS_INSIDEFRAME, PS_USERSTYLE, PS_ALTERNATE, 9}; + //for (iStyle = 0; iStyle < sizeof(aflPenStyle) / sizeof(aflPenStyle[0]); iStyle++) + for (iStyle = 0; iStyle < 10; iStyle++) + { + ULONG aflEndCap[] = {PS_ENDCAP_ROUND, PS_ENDCAP_SQUARE, PS_ENDCAP_FLAT, 0x300, 0x400}; + for (iEndCap = 0; iEndCap < sizeof(aflEndCap) / sizeof(aflEndCap[0]); iEndCap++) + { + ULONG aflJoin[] = {PS_JOIN_ROUND, PS_JOIN_BEVEL, PS_JOIN_MITER, 0x3000, 0x4000}; + for (iJoin = 0; iJoin < sizeof(aflJoin) / sizeof(aflJoin[0]); iJoin++) + { + DWORD adwWidth[] = {0, 1, 2}; + ULONG flPenStyle = aflPenType[iType] | aflPenStyle[iStyle] | aflEndCap[iEndCap] | aflJoin[iJoin]; + + for (iWidth = 0; iWidth < sizeof(adwWidth) / sizeof(adwWidth[0]); iWidth++) + { + ULONG adwStyleCount[] = {0, 1, 2, 16, 17}; + for (iStyleCount = 0; iStyleCount < sizeof(adwStyleCount) / sizeof(adwStyleCount[0]); iStyleCount++) + { + PULONG apdwStyles[] = {NULL, adwStyles, adwStyles2}; + for (iStyles = 0; iStyles < sizeof(apdwStyles) / sizeof(apdwStyles[0]); iStyles++) + { + UINT albStyle[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; + for (iBrushStyle = 0; iBrushStyle < sizeof(albStyle) / sizeof(albStyle[0]); iBrushStyle++) + { + ULONG_PTR alHatch[] = {0, 1, 6, 7, 8, 9, 10, 11, 12, 13}; + + for (iHatch = 0; iHatch < sizeof(alHatch) / sizeof(alHatch[0]); iHatch++) + { + Test_ExtCreatePen_Helper(flPenStyle, + adwWidth[iWidth], + adwStyleCount[iStyleCount], + apdwStyles[iStyles], + albStyle[iBrushStyle], + alHatch[iHatch]); + } + } + } + } + } + } + } + } + } + } START_TEST(ExtCreatePen) { - Test_ExtCreatePen(); + Test_ExtCreatePen_Params(); + Test_ExtCreatePen_Params2(); }

1 0

[cwittich] 67039: [INF] correctly handle ACPI\ACPI0003 as AcAdapter
by cwittich＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: cwittich Date: Sat Apr 4 12:33:51 2015 New Revision: 67039 URL: http://svn.reactos.org/svn/reactos?rev=67039&view=rev Log: [INF] correctly handle ACPI\ACPI0003 as AcAdapter Modified: trunk/reactos/media/inf/battery.inf Modified: trunk/reactos/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/battery.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/battery.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/battery.inf [iso-8859-1] Sat Apr 4 12:33:51 2015 @@ -1,4 +1,4 @@ -; BATTERY.INF +ï»¿; BATTERY.INF [Version] Signature = "$Windows NT$" @@ -30,10 +30,21 @@ [GenericMfg] %ACPI\PNP0C0A.DeviceDesc% = CmBatt,ACPI\PNP0C0A -%ACPI\ACPI0003.DeviceDesc% = CmBatt,ACPI\ACPI0003 +%ACPI\ACPI0003.DeviceDesc% = AcAdapter,ACPI\ACPI0003 + +[AcAdapter] +AddReg=AcAdapter_Addreg +CopyFiles = CmBatt_CopyFiles + +[AcAdapter_Addreg] +HKR,,PowerSourceType,%REG_BINARY%,01,00,00,00 [CmBatt] +AddReg=CmBatt_Addreg CopyFiles = CmBatt_CopyFiles + +[CmBatt_Addreg] +HKR,,PowerSourceType,%REG_BINARY%,00,00,00,00 [CmBatt_CopyFiles] cmbatt.sys

1 0

[dreimer] 67038: Add Oracle JRE 7u76 to RAPPS either. It worked nicely @ CLT and more than once I was asked for it.
by dreimer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: dreimer Date: Sat Apr 4 12:06:37 2015 New Revision: 67038 URL: http://svn.reactos.org/svn/reactos?rev=67038&view=rev Log: Add Oracle JRE 7u76 to RAPPS either. It worked nicely @ CLT and more than once I was asked for it. Added: trunk/reactos/base/applications/rapps/rapps/jre.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/jre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/jre.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/jre.txt [iso-8859-1] Sat Apr 4 12:06:37 2015 @@ -0,0 +1,13 @@ +[Section] +Name = Java SE Runtime Environment 7 +Version = 7u76 +License = Oracle Binary Code License +Description = Do you want to run Java programs? If so, download the Java Runtime Environment. +Size = 28.1 MB +Category = 7 +URLSite = http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880… +URLDownload = http://svn.reactos.org/packages/jre-7u76-windows-i586.exe +CDPath = none + +[Section.0407] +Description = Sie wollen Java Programme nutzen? Wenn ja, laden Sie die Java Runtime Environment herunter. Propchange: trunk/reactos/base/applications/rapps/rapps/jre.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 67037: Add more drivers to RAPPS by Jared CORE-9409 #comment Added the NVidia drivers. Have fun ^^
by dreimer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: dreimer Date: Sat Apr 4 11:47:01 2015 New Revision: 67037 URL: http://svn.reactos.org/svn/reactos?rev=67037&view=rev Log: Add more drivers to RAPPS by Jared CORE-9409 #comment Added the NVidia drivers. Have fun ^^ Added: trunk/reactos/base/applications/rapps/rapps/nvdisp.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/nvdisp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/nvdisp.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/nvdisp.txt [iso-8859-1] Sat Apr 4 11:47:01 2015 @@ -0,0 +1,15 @@ +[Section] +Name = NVidia Display drivers +Version = 52.16 +License = Unknown +Description = Display driver for RIVA TNT2, GeForce/Quadro 1/2/3/4 cards from NVidia. +Size = 18.5 MB +Category = 13 +URLSite = http://www.nvidia.com/ +URLDownload = http://download.nvidia.com/Windows/52.16/52.16_win2kxp_international_whql.e… +CDPath = none + +[Section.0407] +Name = NVidia Display Treiber +License = Unbekannt +Description = Display Treiber fÃ¼r RIVA TNT2, GeForce/Quadro 1/2/3/4 Karten von NVidia. Propchange: trunk/reactos/base/applications/rapps/rapps/nvdisp.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 67036: Add fall game to rapps by manuel CORE-9127 #resolve #comment Added, have fun ^^
by dreimer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: dreimer Date: Sat Apr 4 11:31:08 2015 New Revision: 67036 URL: http://svn.reactos.org/svn/reactos?rev=67036&view=rev Log: Add fall game to rapps by manuel CORE-9127 #resolve #comment Added, have fun ^^ Added: trunk/reactos/base/applications/rapps/rapps/fall.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/fall.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fall.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/fall.txt [iso-8859-1] Sat Apr 4 11:31:08 2015 @@ -0,0 +1,13 @@ +[Section] +Name = Fall +Version = 0.1.3 +License = GPL +Description = Penguins are falling from and iceberg and you have to bounce them into the docks. +Size = 371 kB +Category = 4 +URLSite = http://insomnia.sourceforge.net/fall/fall.html +URLDownload = http://download.sourceforge.net/project/insomnia/fall/stable/Fall-win32.zip +CDPath = none + +[Section.0407] +Description = Pinguine fallen von einem Eisberg herunter und man muss sie auf sicheres Land befÃ¶rdern. Propchange: trunk/reactos/base/applications/rapps/rapps/fall.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 67035: Adding New Apps for Rapps by Erdem Ersoy + German translations by me CORE-7493 #resolve #comment Added, have fun ^^
by dreimer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: dreimer Date: Sat Apr 4 11:24:24 2015 New Revision: 67035 URL: http://svn.reactos.org/svn/reactos?rev=67035&view=rev Log: Adding New Apps for Rapps by Erdem Ersoy + German translations by me CORE-7493 #resolve #comment Added, have fun ^^ Added: trunk/reactos/base/applications/rapps/rapps/famitracker.txt (with props) trunk/reactos/base/applications/rapps/rapps/md5summer.txt (with props) trunk/reactos/base/applications/rapps/rapps/winamp.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/famitracker.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/famitracker.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/famitracker.txt [iso-8859-1] Sat Apr 4 11:24:24 2015 @@ -0,0 +1,21 @@ +; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + +[Section] +Name = FamiTracker +Version = 0.4.6 +License = Freeware +Description = FamiTracker is a free windows tracker for producing music for the NES and Famicom systems. +Size = 1.53 MB +Category = 1 +URLSite = http://famitracker.com/index.php +URLDownload = http://famitracker.com/files/FamiTracker-v0.4.6.zip +CDPath = none + +[Section.0407] +Description = FamiTracker ist ein kostenloser Windows Tracker zur Erstellung von Musik fÃ¼r NES und Famicom Systeme. + +[Section.041f] +License = Ãcretsiz +Description = FamiTracker, NES ve Famicom dizgeleri iÃ§in mÃ»sikÃ® Ã¼retmeye bir Ã¼cretsiz pencere izleyicisidir. +Size = 1,53 MB Propchange: trunk/reactos/base/applications/rapps/rapps/famitracker.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/md5summer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/md5summer.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/md5summer.txt [iso-8859-1] Sat Apr 4 11:24:24 2015 @@ -0,0 +1,21 @@ +; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + +[Section] +Name = MD5summer +Version = 1.2.0.11 +License = Freeware +Description = MD5summer is an application for Microsoft Windows which generates and verifies md5 checksums. +Size = 452kB +Category = 12 +URLSite = http://www.md5summer.org/ +URLDownload = http://www.md5summer.org/md5v12011.zip +CDPath = none + +[Section.0407] +Description = MD5summer ist eine Windows Anwendung, welche MD5 Checksummen generiert und verifiziert. + +[Section.041f] +License = Ãcretsiz +Description = MD5summer, md5 saÄlama toplamlarÄ±nÄ± oluÅturan ve doÄrulayan, Microsoft Windows iÃ§in bir uygulamadÄ±r. +Size = 452 KB Propchange: trunk/reactos/base/applications/rapps/rapps/md5summer.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/winamp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winamp.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/winamp.txt [iso-8859-1] Sat Apr 4 11:24:24 2015 @@ -0,0 +1,22 @@ +; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + +[Section] +Name = Winamp +Version = 5.666 Full +License = Freemium +Description = Winamp is a media player that supports extensibility with plug-ins and skins, and features music visualization, playlist and a media library, supported by a large online community. +Size = 14.3 MB +Category = 1 +URLSite = http://www.winamp.com/ +URLDownload = http://winampplugins.co.uk/Winamp/winamp5666_full_all_redux.exe +CDPath = none + +[Section.0407] +Description = Winamp ist ein Media Player welcher Erweiterbarkeit mit Plug-Ins und Skins ermÃ¶glicht und Musikvisualisierung, Playlist und Medienbibliothek bietet. Er wird durch eine groÃe Online-Community unterstÃ¼tzt. + +[Section.041f] +Version = 5.666 Eksiksiz +License = Ãcretsiz SeÃ§kin +Description = Winamp, eklentilerle ve dÄ±Å gÃ¶rÃ¼nÃ¼mlerle geniÅletilebilirliÄi destekleyen, mÃ»sikÃ® farazÃ®leÅtirmeyi, Ã§alma dizelgesini ve bÃ¼yÃ¼k bir Ã§evrim iÃ§i topluluk eliyle desteklenen bir ortam kitaplÄ±ÄÄ±nÄ± barÄ±ndÄ±ran bir ortam oynatÄ±cÄ±sÄ±dÄ±r. +Size = 14,3 MB Propchange: trunk/reactos/base/applications/rapps/rapps/winamp.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 67034: Add to RAPPS internet browser K-Meleon by Alexander Rechitskiy CORE-9404 #resolve #comment Added, have fun ^^
by dreimer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: dreimer Date: Sat Apr 4 11:05:00 2015 New Revision: 67034 URL: http://svn.reactos.org/svn/reactos?rev=67034&view=rev Log: Add to RAPPS internet browser K-Meleon by Alexander Rechitskiy CORE-9404 #resolve #comment Added, have fun ^^ Added: trunk/reactos/base/applications/rapps/rapps/kmeleon.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/kmeleon.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kmeleon.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/kmeleon.txt [iso-8859-1] Sat Apr 4 11:05:00 2015 @@ -0,0 +1,13 @@ +[Section] +Name = K-Meleon +Version = 75.0 RC2 +License = GPL +Description = An extremely fast, customizable and still lightweight web browser based on the Gecko layout engine. +Size = 26.1 MB +Category = 5 +URLSite = http://kmeleon.sourceforge.net +URLDownload = http://download.sourceforge.net/project/kmeleon/k-meleon-dev/K-Meleon75.0RC… +CDPath = none + +[Section.0407] +Description = Ein extrem schneller, erweiterbarer und dennoch kleiner Web Browser basierend auf der Gecko Layout Engine. Propchange: trunk/reactos/base/applications/rapps/rapps/kmeleon.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 67033: ADD to RAPPS Microsoft Office Compatibility Pack for Word, Excel, and PowerPoint File Formats by Alexander Rechitskiy CORE-9350 #resolve #comment Added, have fun ^^
by dreimer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: dreimer Date: Sat Apr 4 10:51:07 2015 New Revision: 67033 URL: http://svn.reactos.org/svn/reactos?rev=67033&view=rev Log: ADD to RAPPS Microsoft Office Compatibility Pack for Word, Excel, and PowerPoint File Formats by Alexander Rechitskiy CORE-9350 #resolve #comment Added, have fun ^^ Added: trunk/reactos/base/applications/rapps/rapps/officeformatpack.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/officeformatpack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/officeformatpack.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/officeformatpack.txt [iso-8859-1] Sat Apr 4 10:51:07 2015 @@ -0,0 +1,14 @@ +[Section] +Name = Microsoft Office Compatibility Pack for Word, Excel, and PowerPoint File Formats +Version = 4 +License = Unknown +Description = Needed to open *.docx, *.xlsx, etc on Word/Excel Viewer and Office 2003. +Size = 37.0 MB +Category = 6 +URLSite = http://www.microsoft.com/en-us/download/details.aspx?id=3 +URLDownload = http://download.microsoft.com/download/9/2/2/9222D67F-7630-4F49-BD26-476B51… +CDPath = none + +[Section.0407] +License = Unbekannt +Description = Wird zum Ãffnen von *.docx, *.xlsx, etc unter Word/Excel Viewer und Office 2003 benÃ¶tigt. Propchange: trunk/reactos/base/applications/rapps/rapps/officeformatpack.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 67032: Add support of ReiserFS (RO) to ReactOS by Alexander Rechitskiy CORE-8625 #resolve #comment Committed. Have fun ^^
by dreimer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: dreimer Date: Sat Apr 4 10:39:24 2015 New Revision: 67032 URL: http://svn.reactos.org/svn/reactos?rev=67032&view=rev Log: Add support of ReiserFS (RO) to ReactOS by Alexander Rechitskiy CORE-8625 #resolve #comment Committed. Have fun ^^ Added: trunk/reactos/base/applications/rapps/rapps/rfstools.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/rfstools.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rfstools.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/rfstools.txt [iso-8859-1] Sat Apr 4 10:39:24 2015 @@ -0,0 +1,13 @@ +[Section] +Name = RFSTool +Version = 0.14 +License = GPL +Description = Allows you to access ReiserFS partitions from a Windows system. +Size = 54 kB +Category = 12 +URLSite = http://p-nand-q.com/download/rfstool/index.html +URLDownload = http://p-nand-q.com/download/rfstool/rfstool-0.14.zip +CDPath = none + +[Section.0407] +Description = ErmÃ¶glicht den Zugriff auf ReiserFS Partitionen unter Windows. Propchange: trunk/reactos/base/applications/rapps/rapps/rfstools.txt ------------------------------------------------------------------------------ svn:eol-style = native

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