Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[tfaber] 66347: [GDI32_APITEST] - Refactor EnumFontFamilies test to be more generic, and check for some common expected system fonts. This shows that EnumFontFamilies behaves correctly, but that we...

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 18 13:18:30 2015 New Revision: 66347 URL: http://svn.reactos.org/svn/reactos?rev=66347&view=rev Log: [GDI32_APITEST] - Refactor EnumFontFamilies test to be more generic, and check for some common expected system fonts. This shows that EnumFontFamilies behaves correctly, but that we're missing the System font in the enumeration. CORE-9222 Modified: trunk/rostests/apitests/gdi32/EnumFontFamilies.c Modified: trunk/rostests/apitests/gdi32/EnumFontFamilies.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EnumFontFa… ============================================================================== --- trunk/rostests/apitests/gdi32/EnumFontFamilies.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/EnumFontFamilies.c [iso-8859-1] Wed Feb 18 13:18:30 2015 @@ -7,6 +7,7 @@ #include <apitest.h> +#include <winnls.h> #include <wingdi.h> #include <winddi.h> #include <strsafe.h> @@ -17,6 +18,67 @@ static int EnumProcCalls; static ENUMLOGFONTA LastFontA; static ENUMLOGFONTW LastFontW; + +typedef int WRAP_ENUM_FONT_FAMILIES(_In_ HDC, _In_ PCWSTR, _In_ PVOID, _In_ LPARAM); +typedef WRAP_ENUM_FONT_FAMILIES *PWRAP_ENUM_FONT_FAMILIES; + +static +int +WrapEnumFontFamiliesA( + _In_ HDC hdc, + _In_ PCWSTR Family, + _In_ PVOID EnumProc, + _In_ LPARAM lParam) +{ + char FamilyA[100]; + WideCharToMultiByte(CP_ACP, 0, Family, -1, FamilyA, sizeof(FamilyA), NULL, NULL); + return EnumFontFamiliesA(hdc, FamilyA, EnumProc, lParam); +} + +static +int +WrapEnumFontFamiliesW( + _In_ HDC hdc, + _In_ PCWSTR Family, + _In_ PVOID EnumProc, + _In_ LPARAM lParam) +{ + return EnumFontFamiliesW(hdc, Family, EnumProc, lParam); +} + +static +int +WrapEnumFontFamiliesExA( + _In_ HDC hdc, + _In_ PCWSTR Family, + _In_ PVOID EnumProc, + _In_ LPARAM lParam) +{ + LOGFONTA lf; + + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + WideCharToMultiByte(CP_ACP, 0, Family, -1, lf.lfFaceName, sizeof(lf.lfFaceName), NULL, NULL); + return EnumFontFamiliesExA(hdc, &lf, EnumProc, lParam, 0); +} + +static +int +WrapEnumFontFamiliesExW( + _In_ HDC hdc, + _In_ PCWSTR Family, + _In_ PVOID EnumProc, + _In_ LPARAM lParam) +{ + LOGFONTW lf; + + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + StringCbCopyW(lf.lfFaceName, sizeof(lf.lfFaceName), Family); + return EnumFontFamiliesExW(hdc, &lf, EnumProc, lParam, 0); +} static int @@ -60,98 +122,71 @@ static void -TestEnumFontFamiliesA( - _In_ HDC hdc, - _In_ PCSTR FontName) -{ +TestEnumFontFamilies( + _In_ HDC hdc, + _In_ PCWSTR FontName, + _In_ BOOLEAN ExpectToFind) +{ + const struct + { + PWRAP_ENUM_FONT_FAMILIES Wrapper; + PCSTR Name; + BOOLEAN Wide; + } *fun, functions[] = + { + { WrapEnumFontFamiliesA, "EnumFontFamiliesA", FALSE }, + { WrapEnumFontFamiliesW, "EnumFontFamiliesW", TRUE }, + { WrapEnumFontFamiliesExA, "EnumFontFamiliesExA", FALSE }, + { WrapEnumFontFamiliesExW, "EnumFontFamiliesExW", TRUE }, + }; + const struct + { + PVOID Context; + PCSTR Description; + } *ctx, contexts[] = + { + { &ContextContinue, "Continue" }, + { &ContextStop, "Stop" }, + }; int ret; DWORD error; - - EnumProcCalls = 0; - SetLastError(0xdeadbeef); - ret = EnumFontFamiliesA(hdc, - FontName, - EnumProcA, - (LPARAM)&ContextContinue); - error = GetLastError(); - ok(ret == 1, "ret is %d, expected 1\n", ret); - ok(error == 0xdeadbeef, "error is %lu\n", error); - ok(EnumProcCalls == 0, "EnumProcCalls is %d\n", EnumProcCalls); -} - -static -void -TestEnumFontFamiliesW( - _In_ HDC hdc, - _In_ PCWSTR FontName) -{ - int ret; - DWORD error; - - EnumProcCalls = 0; - SetLastError(0xdeadbeef); - ret = EnumFontFamiliesW(hdc, - FontName, - EnumProcW, - (LPARAM)&ContextContinue); - error = GetLastError(); - ok(ret == 1, "ret is %d, expected 1\n", ret); - ok(error == 0xdeadbeef, "error is %lu\n", error); - ok(EnumProcCalls == 0, "EnumProcCalls is %d\n", EnumProcCalls); -} - -static -void -TestEnumFontFamiliesExA( - _In_ HDC hdc, - _In_ PCSTR FontName) -{ - int ret; - DWORD error; - LOGFONTA lf; - - EnumProcCalls = 0; - ZeroMemory(&lf, sizeof(lf)); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = 0; - StringCbCopyA(lf.lfFaceName, sizeof(lf.lfFaceName), FontName); - SetLastError(0xdeadbeef); - ret = EnumFontFamiliesExA(hdc, - &lf, - EnumProcA, - (LPARAM)&ContextContinue, - 0); - error = GetLastError(); - ok(ret == 1, "ret is %d, expected 1\n", ret); - ok(error == 0xdeadbeef, "error is %lu\n", error); - ok(EnumProcCalls == 0, "EnumProcCalls is %d\n", EnumProcCalls); -} - -static -void -TestEnumFontFamiliesExW( - _In_ HDC hdc, - _In_ PCWSTR FontName) -{ - int ret; - DWORD error; - LOGFONTW lf; - - EnumProcCalls = 0; - ZeroMemory(&lf, sizeof(lf)); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = 0; - StringCbCopyW(lf.lfFaceName, sizeof(lf.lfFaceName), FontName); - SetLastError(0xdeadbeef); - ret = EnumFontFamiliesExW(hdc, - &lf, - EnumProcW, - (LPARAM)&ContextContinue, - 0); - error = GetLastError(); - ok(ret == 1, "ret is %d, expected 1\n", ret); - ok(error == 0xdeadbeef, "error is %lu\n", error); - ok(EnumProcCalls == 0, "EnumProcCalls is %d\n", EnumProcCalls); + unsigned iFunction; + unsigned iContext; + + for (iContext = 0; iContext < _countof(contexts); iContext++) + { + ctx = &contexts[iContext]; + for (iFunction = 0; iFunction < _countof(functions); iFunction++) + { + fun = &functions[iFunction]; + EnumProcCalls = 0; + SetLastError(0xdeadbeef); + ret = fun->Wrapper(hdc, + FontName, + fun->Wide ? (PVOID)EnumProcW : (PVOID)EnumProcA, + (LPARAM)ctx->Context); + error = GetLastError(); + ok(error == 0xdeadbeef, "[%s, %s, '%ls'] error is %lu\n", fun->Name, ctx->Description, FontName, error); + if (ExpectToFind) + { + if (ctx->Context == &ContextContinue) + { + ok(ret == 7, "[%s, %s, '%ls'] ret is %d, expected 7\n", fun->Name, ctx->Description, FontName, ret); + ok(EnumProcCalls >= 1, "[%s, %s, '%ls'] EnumProcCalls is %d\n", fun->Name, ctx->Description, FontName, EnumProcCalls); + } + else + { + ok(ret == 0, "[%s, %s, '%ls'] ret is %d, expected 0\n", fun->Name, ctx->Description, FontName, ret); + ok(EnumProcCalls == 1, "[%s, %s, '%ls'] EnumProcCalls is %d\n", fun->Name, ctx->Description, FontName, EnumProcCalls); + } + } + else + { + ok(ret == 1, "[%s, %s, '%ls'] ret is %d, expected 1\n", fun->Name, ctx->Description, FontName, ret); + ok(EnumProcCalls == 0, "[%s, %s, '%ls'] EnumProcCalls is %d\n", fun->Name, ctx->Description, FontName, EnumProcCalls); + } + } + } } START_TEST(EnumFontFamilies) @@ -165,10 +200,17 @@ return; } - TestEnumFontFamiliesA(hdc, "ThisFontDoesNotExist"); - TestEnumFontFamiliesW(hdc, L"ThisFontDoesNotExist"); - TestEnumFontFamiliesExA(hdc, "ThisFontDoesNotExist"); - TestEnumFontFamiliesExW(hdc, L"ThisFontDoesNotExist"); + TestEnumFontFamilies(hdc, L"ThisFontDoesNotExist", FALSE); + /* Basic fonts that should be installed */ + TestEnumFontFamilies(hdc, L"MS Sans Serif", TRUE); + TestEnumFontFamilies(hdc, L"Tahoma", TRUE); + TestEnumFontFamilies(hdc, L"System", TRUE); + /* Show case insensitivity */ + TestEnumFontFamilies(hdc, L"tahOmA", TRUE); + /* Special fonts that we have a hack for in win32k ;) */ + TestEnumFontFamilies(hdc, L"Marlett", TRUE); + TestEnumFontFamilies(hdc, L"Symbol", TRUE); + TestEnumFontFamilies(hdc, L"VGA", FALSE); DeleteDC(hdc); }

9 years, 8 months

[tfaber] 66346: [MSXML3_WINETEST] - Re-enable test_save CORE-6738 ROSTESTS-82

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 18 11:44:01 2015 New Revision: 66346 URL: http://svn.reactos.org/svn/reactos?rev=66346&view=rev Log: [MSXML3_WINETEST] - Re-enable test_save CORE-6738 ROSTESTS-82 Removed: trunk/rostests/winetests/msxml3/msxml3_ros.diff Modified: trunk/rostests/winetests/msxml3/domdoc.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Wed Feb 18 11:44:01 2015 @@ -352,9 +352,7 @@ istream_Clone }; -#if CORE_6738_IS_FIXED static IStream savestream = { &StreamVtbl }; -#endif #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) static void _expect_children(IXMLDOMNode *node, int line) @@ -6000,7 +5998,6 @@ free_bstrs(); } -#if CORE_6738_IS_FIXED static void test_save(void) { IXMLDOMDocument *doc, *doc2; @@ -6131,7 +6128,6 @@ IXMLDOMDocument_Release(doc); free_bstrs(); } -#endif /* CORE_6738_IS_FIXED */ static void test_testTransforms(void) { @@ -11934,9 +11930,7 @@ test_XSLPattern(); test_cloneNode(); test_xmlTypes(); -#if CORE_6738_IS_FIXED test_save(); -#endif test_testTransforms(); test_namespaces_basic(); test_namespaces_change(); Removed: trunk/rostests/winetests/msxml3/msxml3_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/msxml3_r… ============================================================================== --- trunk/rostests/winetests/msxml3/msxml3_ros.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/msxml3_ros.diff (removed) @@ -1,94 +0,0 @@ -Index: domdoc.c -=================================================================== ---- domdoc.c (revision 57310) -+++ domdoc.c (working copy) -@@ -1447,6 +1447,9 @@ - #define EXPECT_HR(hr,hr_exp) \ - ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) - -+#define EXPECT_NOT_HR(hr,hr_exp) \ -+ ok(hr != hr_exp, "got 0x%08x, expected not 0x%08x\n", hr, hr_exp) -+ - static const WCHAR szEmpty[] = { 0 }; - static const WCHAR szIncomplete[] = { - '<','?','x','m','l',' ', -@@ -4244,6 +4247,30 @@ - free_bstrs(); - } - -+/* -+ * This function is to display that xmlnodelist_QueryInterface -+ * generates SEGV for these conditions, and once fixed make sure -+ * it never does it again. -+ */ -+static void verify_nodelist_query_interface(IXMLDOMNodeList *node_list) -+{ -+ HRESULT hr; -+ /* -+ * NOTE: The following calls are supposed to test wine's -+ * xmlnodelist_QueryInterface behaving properly. -+ * While we should be able to expect E_POINTER (due to the NULL pointer), -+ * it seems MS' own implementation(s) violate the spec and return -+ * E_INVALIDARG. To not get cought be a potentially correct implementation -+ * in the future, we check for NOT S_OK. -+ */ -+ hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, NULL); -+ EXPECT_NOT_HR(hr, S_OK); -+ hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); -+ EXPECT_NOT_HR(hr, S_OK); -+ hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IXMLDOMNodeList, NULL); -+ EXPECT_NOT_HR(hr, S_OK); -+} -+ - static void test_get_childNodes(void) - { - IXMLDOMNodeList *node_list, *node_list2; -@@ -4271,6 +4298,8 @@ - hr = IXMLDOMElement_get_childNodes( element, &node_list ); - EXPECT_HR(hr, S_OK); - -+ verify_nodelist_query_interface(node_list); -+ - hr = IXMLDOMNodeList_get_length( node_list, &len ); - EXPECT_HR(hr, S_OK); - ok( len == 4, "len %d\n", len); -Index: domdoc.c -=================================================================== ---- domdoc.c (revision 57539) -+++ domdoc.c (revision 57540) -@@ -1398,7 +1398,9 @@ - istream_Clone - }; - -+#if CORE_6738_IS_FIXED - static IStream savestream = { &StreamVtbl }; -+#endif - - #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) - static void _expect_children(IXMLDOMNode *node, int line) -@@ -7274,6 +7276,7 @@ - free_bstrs(); - } - -+#if CORE_6738_IS_FIXED - static void test_save(void) - { - IXMLDOMDocument *doc, *doc2; -@@ -7410,6 +7413,7 @@ - IXMLDOMDocument_Release(doc); - free_bstrs(); - } -+#endif /* CORE_6738_IS_FIXED */ - - static void test_testTransforms(void) - { -@@ -12538,7 +12542,9 @@ - test_XSLPattern(); - test_cloneNode(); - test_xmlTypes(); -+#if CORE_6738_IS_FIXED - test_save(); -+#endif - test_testTransforms(); - test_namespaces_basic(); - test_namespaces_change();

9 years, 8 months

[tfaber] 66345: [GDIPLUS_WINETESTS] - Re-enable test_font_metrics, test_logfont and test_fontfamily. CORE-6660 ROSTESTS-79 CORE-6643 #resolve - Skip test_font_substitution instead. ROSTESTS-154

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 18 11:20:37 2015 New Revision: 66345 URL: http://svn.reactos.org/svn/reactos?rev=66345&view=rev Log: [GDIPLUS_WINETESTS] - Re-enable test_font_metrics, test_logfont and test_fontfamily. CORE-6660 ROSTESTS-79 CORE-6643 #resolve - Skip test_font_substitution instead. ROSTESTS-154 Modified: trunk/rostests/winetests/gdiplus/font.c Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Wed Feb 18 11:20:37 2015 @@ -101,7 +101,6 @@ GdipDeleteFontFamily(fontfamily); } -#if CORE_6660_IS_FIXED static void test_logfont(void) { LOGFONTA lfa, lfa2; @@ -283,7 +282,6 @@ GdipDeleteFontFamily(clonedFontFamily); } -#endif // CORE_6660_IS_FIXED static void test_fontfamily_properties (void) { @@ -495,7 +493,6 @@ GdipDeleteFontFamily(fontfamily); } -#if CORE_6660_IS_FIXED static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme, DWORD type, LPARAM lparam) { @@ -732,7 +729,6 @@ GdipDeleteGraphics(graphics); DeleteDC(hdc); } -#endif // CORE_6660_IS_FIXED static void test_font_substitution(void) { @@ -1117,15 +1113,14 @@ GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_font_transform(); - test_font_substitution(); -#if CORE_6660_IS_FIXED + if (!winetest_interactive) + skip("ROSTESTS-154: Skipping test_font_substitution because of improper error handling\n"); + else + test_font_substitution(); test_font_metrics(); -#endif test_createfont(); -#if CORE_6660_IS_FIXED test_logfont(); test_fontfamily(); -#endif test_fontfamily_properties(); test_getgenerics(); test_installedfonts();

9 years, 8 months

[tfaber] 66344: [GDIPLUS_WINETEST] - Re-enable test_string_functions CORE-6659 ROSTESTS-78 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 18 10:50:00 2015 New Revision: 66344 URL: http://svn.reactos.org/svn/reactos?rev=66344&view=rev Log: [GDIPLUS_WINETEST] - Re-enable test_string_functions CORE-6659 ROSTESTS-78 #resolve Removed: trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff Modified: trunk/rostests/winetests/gdiplus/graphics.c Removed: trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/gdiplus… ============================================================================== --- trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff (removed) @@ -1,62 +0,0 @@ -Index: graphics.c -=================================================================== ---- graphics.c (revision 57206) -+++ graphics.c (working copy) -@@ -2819,6 +2819,7 @@ - ReleaseDC(hwnd, hdc); - } - -+#if CORE_6659_IS_FIXED - static void test_string_functions(void) - { - GpStatus status; -@@ -3138,6 +3139,7 @@ - - ReleaseDC(hwnd, hdc); - } -+#endif /* CORE_6659_IS_FIXED */ - - static void test_get_set_interpolation(void) - { -@@ -3361,7 +3363,9 @@ - test_clear(); - test_textcontrast(); - test_fromMemoryBitmap(); -+#if CORE_6659_IS_FIXED - test_string_functions(); -+#endif - test_get_set_interpolation(); - test_get_set_textrenderinghint(); - test_getdc_scaled(); - -Index: font.c -=================================================================== ---- font.c (revision 57301) -+++ font.c (working copy) -@@ -87,6 +87,7 @@ - GdipDeleteFontFamily(fontfamily); - } - -+#if CORE_6660_IS_FIXED - static void test_logfont(void) - { - LOGFONTA lfa, lfa2; -@@ -274,6 +275,7 @@ - - GdipDeleteFontFamily(clonedFontFamily); - } -+#endif // CORE_6660_IS_FIXED - - static void test_fontfamily_properties (void) - { -@@ -740,8 +742,10 @@ - test_font_metrics(); - #endif - test_createfont(); -+#if CORE_6660_IS_FIXED - test_logfont(); - test_fontfamily(); -+#endif - test_fontfamily_properties(); - test_getgenerics(); - test_installedfonts(); Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Wed Feb 18 10:50:00 2015 @@ -2931,7 +2931,6 @@ ReleaseDC(hwnd, hdc); } -#if CORE_6659_IS_FIXED static void test_string_functions(void) { GpStatus status; @@ -3300,7 +3299,6 @@ ReleaseDC(hwnd, hdc); } -#endif /* CORE_6659_IS_FIXED */ static void test_get_set_interpolation(void) { @@ -5620,9 +5618,7 @@ test_clear(); test_textcontrast(); test_fromMemoryBitmap(); -#if CORE_6659_IS_FIXED test_string_functions(); -#endif test_get_set_interpolation(); test_get_set_textrenderinghint(); test_getdc_scaled();

9 years, 8 months

[tfaber] 66343: [WININET_WINETEST] - Re-enable test_cert_struct in test_secure_connection ROSTESTS-121 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Feb 18 10:06:46 2015 New Revision: 66343 URL: http://svn.reactos.org/svn/reactos?rev=66343&view=rev Log: [WININET_WINETEST] - Re-enable test_cert_struct in test_secure_connection ROSTESTS-121 #resolve Modified: trunk/rostests/winetests/wininet/http.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Wed Feb 18 10:06:46 2015 @@ -4667,14 +4667,7 @@ ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); - if (!winetest_interactive) - { - skip("test_cert_struct(req, &test_winehq_org_cert), ROSTESTS-121\n"); - } - else - { - test_cert_struct(req, &test_winehq_org_cert); - } + test_cert_struct(req, &test_winehq_org_cert); /* Querying the same option through InternetQueryOptionW still results in * ASCII strings being returned.

9 years, 8 months

[jgardou] 66342: [WIN32SS/NTGDI] - Reject bits data early in SetBitmapBits when it's clear that they can't fit in the destination bitmap. Fixes ugly Office 2007 rulers showing garbage.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 17 20:41:51 2015 New Revision: 66342 URL: http://svn.reactos.org/svn/reactos?rev=66342&view=rev Log: [WIN32SS/NTGDI] - Reject bits data early in SetBitmapBits when it's clear that they can't fit in the destination bitmap. Fixes ugly Office 2007 rulers showing garbage. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Tue Feb 17 20:41:51 2015 @@ -11,7 +11,8 @@ #define NDEBUG #include <debug.h> -void +static +int NTAPI UnsafeSetBitmapBits( PSURFACE psurf, @@ -32,6 +33,9 @@ lDeltaDst = psurf->SurfObj.lDelta; lDeltaSrc = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); + if (cjBits && (cjBits < (lDeltaSrc * nHeight))) + return 0; + while (nHeight--) { /* Copy one line */ @@ -40,6 +44,7 @@ pjDst += lDeltaDst; } + return 1; } HBITMAP @@ -538,9 +543,8 @@ _SEH2_TRY { - ProbeForRead(pUnsafeBits, Bytes, 1); - UnsafeSetBitmapBits(psurf, Bytes, pUnsafeBits); - ret = 1; + ProbeForRead(pUnsafeBits, Bytes, sizeof(WORD)); + ret = UnsafeSetBitmapBits(psurf, Bytes, pUnsafeBits); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

9 years, 8 months

[jgardou] 66341: [NTOS/SE] - Properly dereference thread object in NtOpenThreadTokenEx

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 17 20:41:47 2015 New Revision: 66341 URL: http://svn.reactos.org/svn/reactos?rev=66341&view=rev Log: [NTOS/SE] - Properly dereference thread object in NtOpenThreadTokenEx Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Tue Feb 17 20:41:47 2015 @@ -3015,6 +3015,8 @@ if (CopyOnOpen && NewThread) ObDereferenceObject(NewThread); + ObDereferenceObject(Thread); + if (NT_SUCCESS(Status)) { _SEH2_TRY

9 years, 8 months

[jgardou] 66340: [NTOS] - Properly close handle thread when failing to start it.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 17 20:41:40 2015 New Revision: 66340 URL: http://svn.reactos.org/svn/reactos?rev=66340&view=rev Log: [NTOS] - Properly close handle thread when failing to start it. Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Tue Feb 17 20:41:40 2015 @@ -481,7 +481,7 @@ ObDereferenceObject(Thread); /* Close its handle, killing it */ - ObCloseHandle(ThreadHandle, PreviousMode); + ObCloseHandle(hThread, PreviousMode); /* Return the exception code */ _SEH2_YIELD(return _SEH2_GetExceptionCode()); @@ -523,7 +523,7 @@ ObDereferenceObject(Thread); /* Close its handle, killing it */ - ObCloseHandle(ThreadHandle, PreviousMode); + ObCloseHandle(hThread, PreviousMode); return Status; }

9 years, 8 months

[tfaber] 66339: [PSDK] - Move OFN_DONTADDTORECENT and OFN_ENABLEINCLUDENOTIFY to commdlg.h where they belong

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Feb 17 18:37:24 2015 New Revision: 66339 URL: http://svn.reactos.org/svn/reactos?rev=66339&view=rev Log: [PSDK] - Move OFN_DONTADDTORECENT and OFN_ENABLEINCLUDENOTIFY to commdlg.h where they belong Modified: trunk/reactos/include/psdk/commdlg.h trunk/reactos/include/psdk/dlgs.h Modified: trunk/reactos/include/psdk/commdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commdlg.h?rev… ============================================================================== --- trunk/reactos/include/psdk/commdlg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commdlg.h [iso-8859-1] Tue Feb 17 18:37:24 2015 @@ -95,7 +95,9 @@ #define WM_CHOOSEFONT_SETFLAGS (WM_USER+102) #define OFN_ALLOWMULTISELECT 512 #define OFN_CREATEPROMPT 0x2000 +#define OFN_DONTADDTORECENT 0x2000000 #define OFN_ENABLEHOOK 32 +#define OFN_ENABLEINCLUDENOTIFY 0x400000 #define OFN_ENABLESIZING 0x800000 #define OFN_ENABLETEMPLATE 64 #define OFN_ENABLETEMPLATEHANDLE 128 Modified: trunk/reactos/include/psdk/dlgs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dlgs.h?rev=66… ============================================================================== --- trunk/reactos/include/psdk/dlgs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dlgs.h [iso-8859-1] Tue Feb 17 18:37:24 2015 @@ -15,11 +15,6 @@ #define FORMATDLGORD31 1543 #define FORMATDLGORD30 1544 #define RUNDLGORD 1545 - -#ifdef _WINE -#define OFN_DONTADDTORECENT 0x02000000 -#define OFN_ENABLEINCLUDENOTIFY 0x00400000 -#endif #if (WINVER >= 0x0400) #define PAGESETUPDLGORD 1546

9 years, 8 months

[tfaber] 66338: [WMIUTILS] - The dll belongs in system32\wbem; make it so. Spotted by Robert Naumann. CORE-9212

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Feb 17 18:23:06 2015 New Revision: 66338 URL: http://svn.reactos.org/svn/reactos?rev=66338&view=rev Log: [WMIUTILS] - The dll belongs in system32\wbem; make it so. Spotted by Robert Naumann. CORE-9212 Modified: trunk/reactos/dll/win32/wmiutils/CMakeLists.txt trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/dll/win32/wmiutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmiutils/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wmiutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wmiutils/CMakeLists.txt [iso-8859-1] Tue Feb 17 18:23:06 2015 @@ -14,4 +14,4 @@ set_module_type(wmiutils win32dll) target_link_libraries(wmiutils wine) add_importlibs(wmiutils oleaut32 msvcrt kernel32 ntdll) -add_cd_file(TARGET wmiutils DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET wmiutils DESTINATION reactos/system32/wbem FOR all) Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Tue Feb 17 18:23:06 2015 @@ -102,7 +102,7 @@ 11,,winhttp.dll,1 11,,wininet.dll,2 11,,wintrust.dll,1 -11,,wmiutils.dll,1 +11,wbem,wmiutils.dll,1 11,,wshom.ocx,1 11,,wuapi.dll,1 11,wbem,wbemdisp.dll,1

9 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
38
Older →

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