Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[akhaldi] 67394: [SCRRUN] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 10:54:23 2015 New Revision: 67394 URL: http://svn.reactos.org/svn/reactos?rev=67394&view=rev Log: [SCRRUN] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/scrrun/scrrun.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/scrrun/scrrun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.c?… ============================================================================== --- trunk/reactos/dll/win32/scrrun/scrrun.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/scrrun.c [iso-8859-1] Sat Apr 25 10:54:23 2015 @@ -139,6 +139,7 @@ } *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(typeinfos[tid]); return S_OK; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 25 10:54:23 2015 @@ -171,7 +171,7 @@ reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.37 reactos/dll/win32/sccbase # Synced to Wine-1.7.27 reactos/dll/win32/schannel # Synced to Wine-1.7.27 -reactos/dll/win32/scrrun # Synced to Wine-1.7.27 +reactos/dll/win32/scrrun # Synced to WineStaging-1.7.37 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to Wine-1.7.27

1 0

[akhaldi] 67393: [RSAENH_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 10:51:57 2015 New Revision: 67393 URL: http://svn.reactos.org/svn/reactos?rev=67393&view=rev Log: [RSAENH_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/rsaenh/rsaenh.c Modified: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c… ============================================================================== --- trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] Sat Apr 25 10:51:57 2015 @@ -62,7 +62,7 @@ 12,12,16} }; -static int win2k; +static int win2k, nt4; /* * 1. Take the MD5 Hash of the container name (with an extra null byte) @@ -200,7 +200,7 @@ hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE; /* we are using NULL as provider name for RSA_AES provider as the provider - * names are different in Windows XP and Vista. It's different to what + * names are different in Windows XP and Vista. This differs from what * is defined in the SDK on Windows XP. * This provider is available on Windows XP, Windows 2003 and Vista. */ @@ -249,7 +249,10 @@ SetLastError(0xdeadbeef); result = CryptGetProvParam(hProv, PP_SIG_KEYSIZE_INC, (BYTE*)&dwInc, &dwLen, 0); if (!result && GetLastError() == NTE_BAD_TYPE) + { skip("PP_SIG_KEYSIZE_INC is not supported (win9x or NT)\n"); + nt4++; + } else ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); @@ -1472,16 +1475,16 @@ result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen); ok(result, "%08x\n", GetLastError()); - /* Setting the salt also succeeds... */ + /* Setting the salt value will not reset the salt length in base or strong providers */ result = CryptSetKeyParam(hKey, KP_SALT, pbData, 0); ok(result, "setting salt failed: %08x\n", GetLastError()); - /* but the resulting salt length is now zero? */ dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - ok(dwLen == 0 || - broken(dwLen == 11), /* Win9x/WinMe/NT4 */ - "unexpected salt length %d\n", dwLen); + if (BASE_PROV || STRONG_PROV) + ok(dwLen == 11, "expected salt length 11, got %d\n", dwLen); + else + ok(dwLen == 0 || broken(nt4 && dwLen == 11), "expected salt length 0, got %d\n", dwLen); /* What sizes salt can I set? */ salt.pbData = pbData; for (i=0; i<24; i++) @@ -1719,16 +1722,16 @@ result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen); ok(result, "%08x\n", GetLastError()); - /* Setting the salt also succeeds... */ + /* Setting the salt value will not reset the salt length in base or strong providers */ result = CryptSetKeyParam(hKey, KP_SALT, pbData, 0); ok(result, "setting salt failed: %08x\n", GetLastError()); - /* but the resulting salt length is now zero? */ dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - ok(dwLen == 0 || - broken(dwLen == 11), /* Win9x/WinMe/NT4 */ - "unexpected salt length %d\n", dwLen); + if (BASE_PROV || STRONG_PROV) + ok(dwLen == 11, "expected salt length 11, got %d\n", dwLen); + else + ok(dwLen == 0 || broken(nt4 && dwLen == 11), "expected salt length 0, got %d\n", dwLen); /* What sizes salt can I set? */ salt.pbData = pbData; for (i=0; i<24; i++)

1 0

[akhaldi] 67392: [RSAENH] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 10:51:25 2015 New Revision: 67392 URL: http://svn.reactos.org/svn/reactos?rev=67392&view=rev Log: [RSAENH] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] Sat Apr 25 10:51:25 2015 @@ -3466,6 +3466,8 @@ switch (pCryptKey->aiAlgid) { case CALG_RC2: case CALG_RC4: + { + KEYCONTAINER *pKeyContainer = get_key_container(pCryptKey->hProv); if (!pbData) { SetLastError(ERROR_INVALID_PARAMETER); @@ -3478,11 +3480,13 @@ pbData, 11); pCryptKey->dwSaltLen = 11; setup_key(pCryptKey); - /* Strange but true: salt length reset to 0 after setting - * it via KP_SALT. - */ - pCryptKey->dwSaltLen = 0; + /* After setting the salt value if the provider is not base or + * strong the salt length will be reset. */ + if (pKeyContainer->dwPersonality != RSAENH_PERSONALITY_BASE && + pKeyContainer->dwPersonality != RSAENH_PERSONALITY_STRONG) + pCryptKey->dwSaltLen = 0; break; + } default: SetLastError(NTE_BAD_KEY); return FALSE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 25 10:51:25 2015 @@ -168,7 +168,7 @@ reactos/dll/win32/riched32 # Synced to Wine-1.7.27 reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.17 reactos/dll/win32/rsabase # Synced to Wine-1.7.27 -reactos/dll/win32/rsaenh # Synced to Wine-1.7.27 +reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.37 reactos/dll/win32/sccbase # Synced to Wine-1.7.27 reactos/dll/win32/schannel # Synced to Wine-1.7.27 reactos/dll/win32/scrrun # Synced to Wine-1.7.27

1 0

[tfaber] 67391: [GDI32_APITEST] - Add a test for NtGdiAddFontResourceW. This goes in gdi32_apitest until we fix w32knapi to be Testman-compatible (ROSTESTS-167). Patch by Víctor Martínez Calvo. ROS...
by tfaber＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: tfaber Date: Sat Apr 25 10:41:32 2015 New Revision: 67391 URL: http://svn.reactos.org/svn/reactos?rev=67391&view=rev Log: [GDI32_APITEST] - Add a test for NtGdiAddFontResourceW. This goes in gdi32_apitest until we fix w32knapi to be Testman-compatible (ROSTESTS-167). Patch by Víctor Martínez Calvo. ROSTESTS-166 #resolve Added: trunk/rostests/apitests/gdi32/NtGdiAddFontResource.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Sat Apr 25 10:41:32 2015 @@ -51,6 +51,7 @@ GetTextExtentExPoint.c GetTextFace.c MaskBlt.c + NtGdiAddFontResource.c OffsetClipRgn.c OffsetRgn.c PaintRgn.c @@ -71,7 +72,7 @@ testlist.c) add_executable(gdi32_apitest ${SOURCE}) -target_link_libraries(gdi32_apitest ${PSEH_LIB}) +target_link_libraries(gdi32_apitest ${PSEH_LIB} win32ksys) set_module_type(gdi32_apitest win32cui) -add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32) +add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET gdi32_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/gdi32/NtGdiAddFontResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/NtGdiAddFo… ============================================================================== --- trunk/rostests/apitests/gdi32/NtGdiAddFontResource.c (added) +++ trunk/rostests/apitests/gdi32/NtGdiAddFontResource.c [iso-8859-1] Sat Apr 25 10:41:32 2015 @@ -0,0 +1,101 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for NtGdiAddFontResourceW + * PROGRAMMERS: VÃctor MartÃnez Calvo ( victor.martinez(a)reactos.org ) + */ + +#include <apitest.h> +#include <wingdi.h> +#include <ndk/rtlfuncs.h> +#include <strsafe.h> + + +INT +APIENTRY +NtGdiAddFontResourceW( + _In_reads_(cwc) WCHAR *pwszFiles, + _In_ ULONG cwc, + _In_ ULONG cFiles, + _In_ FLONG f, + _In_ DWORD dwPidTid, + _In_opt_ DESIGNVECTOR *pdv); + +void Test_NtGdiAddFontResourceW() +{ + WCHAR lpszFontPath[MAX_PATH]; + WCHAR lpszFontSearch[MAX_PATH]; + + INT ret; + UNICODE_STRING NtAbsPath; + WIN32_FIND_DATAW FindFileData; + HANDLE hFind; + ULONG cwc; + + // Create "Font" folder Path + GetWindowsDirectoryW(lpszFontPath, MAX_PATH); + StringCbCatW(lpszFontPath, sizeof(lpszFontPath), L"\\Fonts\\"); + + // Search first .ttf file in Fonts Path + StringCbCopyW(lpszFontSearch, sizeof(lpszFontSearch), lpszFontPath); + StringCbCatW(lpszFontSearch, sizeof(lpszFontSearch), L"*.ttf"); + + hFind = FindFirstFileW(lpszFontSearch, &FindFileData); + + if (hFind == INVALID_HANDLE_VALUE) + { + skip("Unable to find fonts in Font directory!\n"); + return; + } + + // File found. Create FontPath to File. + StringCbCatW(lpszFontPath, sizeof(lpszFontPath), FindFileData.cFileName); + + // Fail due "cwc" being zero. + SetLastError(0xdeaddead); + RtlInitUnicodeString(&NtAbsPath, NULL); + RtlDosPathNameToNtPathName_U(lpszFontPath, &NtAbsPath, NULL, NULL); + cwc = 0; + ret = NtGdiAddFontResourceW(NtAbsPath.Buffer, cwc, 1, 0, 0, 0); + + ok(ret == 0, "Expected 0 files added. Added: %d\n", ret); + ok(GetLastError() == 0xdeaddead, "Expected 0xdeaddead. Obtained: 0x%lx\n", GetLastError()); + + RtlFreeUnicodeString(&NtAbsPath); + + // "cwc" must count the null terminator. Otherwise fails. + SetLastError(0xdeaddead); + RtlInitUnicodeString(&NtAbsPath, NULL); + RtlDosPathNameToNtPathName_U(lpszFontPath, &NtAbsPath, NULL, NULL); + cwc = NtAbsPath.Length / sizeof(WCHAR); + ret = NtGdiAddFontResourceW(NtAbsPath.Buffer, cwc, 1, 0, 0, 0); + + ok(ret == 0, "Expected 0 files added. Added: %d\n", ret); + ok(GetLastError() == 0xdeaddead, "Expected 0xdeaddead. Obtained: 0x%lx\n", GetLastError()); + + RtlFreeUnicodeString(&NtAbsPath); + + // Correct "cwc" value. + SetLastError(0xdeaddead); + RtlInitUnicodeString(&NtAbsPath, NULL); + RtlDosPathNameToNtPathName_U(lpszFontPath, &NtAbsPath, NULL, NULL); + cwc = NtAbsPath.Length / sizeof(WCHAR) + 1; + ret = NtGdiAddFontResourceW(NtAbsPath.Buffer, cwc, 1, 0, 0, 0); + + ok(ret == 1, "Expected 1 files added. Added: %d\n", ret); + ok(GetLastError() == 0xdeaddead, "Expected 0xdeaddead. Obtained: 0x%lx\n", GetLastError()); + + RtlFreeUnicodeString(&NtAbsPath); + + // Test an invalid pointer. + SetLastError(0xdeadbeef); + ret = NtGdiAddFontResourceW((PVOID)-4, 123, 1, 0, 0, NULL); + + ok(ret == 0, "Expected 0 files added. Added: %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef. Obtained: 0x%lx\n", GetLastError()); +} + +START_TEST(NtGdiAddFontResource) +{ + Test_NtGdiAddFontResourceW(); +} Propchange: trunk/rostests/apitests/gdi32/NtGdiAddFontResource.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sat Apr 25 10:41:32 2015 @@ -52,6 +52,7 @@ extern void func_GetTextExtentExPoint(void); extern void func_GetTextFace(void); extern void func_MaskBlt(void); +extern void func_NtGdiAddFontResource(void); extern void func_OffsetClipRgn(void); extern void func_OffsetRgn(void); extern void func_PaintRgn(void); @@ -120,6 +121,7 @@ { "GetTextExtentExPoint", func_GetTextExtentExPoint }, { "GetTextFace", func_GetTextFace }, { "MaskBlt", func_MaskBlt }, + { "NtGdiAddFontResource", func_NtGdiAddFontResource}, { "OffsetClipRgn", func_OffsetClipRgn }, { "OffsetRgn", func_OffsetRgn }, { "PaintRgn", func_PaintRgn },

1 0

[tfaber] 67390: [NETSHELL] - Don't use the connection's name as the tab title in the Connection Properties dialog. Patch by Lee Schroeder. CORE-9603 #resolve
by tfaber＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: tfaber Date: Sat Apr 25 10:26:04 2015 New Revision: 67390 URL: http://svn.reactos.org/svn/reactos?rev=67390&view=rev Log: [NETSHELL] - Don't use the connection's name as the tab title in the Connection Properties dialog. Patch by Lee Schroeder. CORE-9603 #resolve Modified: trunk/reactos/dll/shellext/netshell/lanconnectui.cpp Modified: trunk/reactos/dll/shellext/netshell/lanconnectui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lanc… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lanconnectui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lanconnectui.cpp [iso-8859-1] Sat Apr 25 10:26:04 2015 @@ -590,7 +590,7 @@ if (FAILED(hr)) return hr; - hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, (LPARAM)this, m_pProperties->pszwName); + hProp = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_NETPROPERTIES), LANPropertiesUIDlg, reinterpret_cast<LPARAM>(this), NULL); if (hProp) { ret = (*pfnAddPage)(hProp, lParam);

1 0

[akhaldi] 67389: [USER32] Mark some functions as synced with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 10:07:43 2015 New Revision: 67389 URL: http://svn.reactos.org/svn/reactos?rev=67389&view=rev Log: [USER32] Mark some functions as synced with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/win32ss/user/user32/windows/font.c Modified: trunk/reactos/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] Sat Apr 25 10:07:43 2015 @@ -1313,7 +1313,7 @@ * * @implemented * - * Synced with wine 1.1.32 + * Synced with Wine Staging 1.7.37 */ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) @@ -1390,6 +1390,7 @@ * DrawTextW (USER32.@) * * @implemented + * Synced with Wine Staging 1.7.37 */ INT WINAPI DrawTextW( HDC hdc, LPCWSTR str, INT count, LPRECT rect, UINT flags ) { @@ -1409,6 +1410,7 @@ * DrawTextA (USER32.@) * * @implemented + * Synced with Wine Staging 1.7.37 */ INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags ) {

1 0

[akhaldi] 67388: [USER32] Sync DrawTextExW() with Wine Staging 1.7.37. CORE-9246 CORE-9585
by akhaldi＠svn.reactos.org 25 Apr '15

25 Apr '15

Author: akhaldi Date: Sat Apr 25 09:50:09 2015 New Revision: 67388 URL: http://svn.reactos.org/svn/reactos?rev=67388&view=rev Log: [USER32] Sync DrawTextExW() with Wine Staging 1.7.37. CORE-9246 CORE-9585 Modified: trunk/reactos/win32ss/user/user32/windows/font.c Modified: trunk/reactos/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] Sat Apr 25 09:50:09 2015 @@ -1096,7 +1096,7 @@ /* * @implemented * - * Synced with wine 1.1.32 + * Synced with Wine Staging 1.7.37 */ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) @@ -1116,12 +1116,12 @@ int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; - int invert_y=0; + BOOL invert_y=FALSE; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); - if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", + if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", dtp->iTabLength, dtp->iLeftMargin, dtp->iRightMargin); if (!str) return 0; @@ -1143,6 +1143,15 @@ if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS)) return 0; + if (GetGraphicsMode(hdc) == GM_COMPATIBLE) + { + SIZE window_ext, viewport_ext; + GetWindowExtEx(hdc, &window_ext); + GetViewportExtEx(hdc, &viewport_ext); + if ((window_ext.cy > 0) != (viewport_ext.cy > 0)) + invert_y = TRUE; + } + if (count == -1) { count = strlenW(str); @@ -1152,21 +1161,12 @@ { rect->right = rect->left; if( flags & DT_SINGLELINE) - rect->bottom = rect->top + lh; + rect->bottom = rect->top + (invert_y ? -lh : lh); else rect->bottom = rect->top; } return lh; } - } - - if (GetGraphicsMode(hdc) == GM_COMPATIBLE) - { - SIZE window_ext, viewport_ext; - GetWindowExtEx(hdc, &window_ext); - GetViewportExtEx(hdc, &viewport_ext); - if ((window_ext.cy > 0) != (viewport_ext.cy > 0)) - invert_y = 1; } if (dtp) @@ -1215,9 +1215,10 @@ if (flags & DT_SINGLELINE) { - if (flags & DT_VCENTER) y = rect->top + - (rect->bottom - rect->top) / 2 - size.cy / 2; - else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; + if (flags & DT_VCENTER) + y = rect->top + (rect->bottom - rect->top) / 2 + (invert_y ? (size.cy / 2) : (-size.cy / 2)); + else if (flags & DT_BOTTOM) + y = rect->bottom + (invert_y ? 0 : -size.cy); } if (!(flags & DT_CALCRECT)) @@ -1234,7 +1235,10 @@ p = str; while (p < str+len && *p != TAB) p++; len_seg = p - str; if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size)) + { + HeapFree (GetProcessHeap(), 0, retstr); return 0; + } } else len_seg = len; @@ -1242,7 +1246,11 @@ if (!ExtTextOutW( hdc, xseg, y, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), - rect, str, len_seg, NULL )) return 0; + rect, str, len_seg, NULL )) + { + HeapFree (GetProcessHeap(), 0, retstr); + return 0; + } if (prefix_offset != -1 && prefix_offset < len_seg) { TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect); @@ -1271,14 +1279,11 @@ } } } - } - else if (size.cx > max_width) - max_width = size.cx; - - if (invert_y) - y -= lh; - else - y += lh; + } + else if (size.cx > max_width) + max_width = size.cx; + + y += invert_y ? -lh : lh; if (dtp) dtp->uiLengthDrawn += len; }

1 0

[aandrejevic] 67387: [NTVDM] Fix INT 21h, AH = 29h: stop at the first non-printable character, make all the characters uppercase in the FCB.
by aandrejevic＠svn.reactos.org 24 Apr '15

24 Apr '15

Author: aandrejevic Date: Fri Apr 24 23:47:54 2015 New Revision: 67387 URL: http://svn.reactos.org/svn/reactos?rev=67387&view=rev Log: [NTVDM] Fix INT 21h, AH = 29h: stop at the first non-printable character, make all the characters uppercase in the FCB. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri Apr 24 23:47:54 2015 @@ -1794,7 +1794,7 @@ /* Parse the file name */ i = 0; - while (*FileName && (i < 8)) + while ((*FileName >= 0x20) && (i < 8)) { if (*FileName == '.') break; else if (*FileName == '*') @@ -1803,7 +1803,7 @@ break; } - Fcb->FileName[i++] = *FileName++; + Fcb->FileName[i++] = RtlUpperChar(*FileName++); } /* Fill the whole field with blanks only if bit 2 is not set */ @@ -1813,14 +1813,14 @@ } /* Skip to the extension part */ - while (*FileName && *FileName != '.') FileName++; + while (*FileName >= 0x20 && *FileName != '.') FileName++; if (*FileName == '.') FileName++; /* Now parse the extension */ i = 0; FillChar = ' '; - while (*FileName && (i < 3)) + while ((*FileName >= 0x20) && (i < 3)) { if (*FileName == '*') { @@ -1828,7 +1828,7 @@ break; } - Fcb->FileExt[i++] = *FileName++; + Fcb->FileExt[i++] = RtlUpperChar(*FileName++); } /* Fill the whole field with blanks only if bit 3 is not set */

1 0

[cwittich] 67386: [NTOSKRNL] spelling fixes only no code changes
by cwittich＠svn.reactos.org 24 Apr '15

24 Apr '15

Author: cwittich Date: Fri Apr 24 19:40:38 2015 New Revision: 67386 URL: http://svn.reactos.org/svn/reactos?rev=67386&view=rev Log: [NTOSKRNL] spelling fixes only no code changes Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c trunk/reactos/ntoskrnl/ex/atom.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/exintrin.c trunk/reactos/ntoskrnl/ex/fmutex.c trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/ex/locale.c Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/powerpc/cm… ============================================================================== --- trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] Fri Apr 24 19:40:38 2015 @@ -827,7 +827,7 @@ if (BiosVersion) ExFreePoolWithTag(BiosVersion, TAG_CM); Quickie: - /* Close the procesor handle */ + /* Close the processor handle */ NtClose(KeyHandle); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/ex/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=673… ============================================================================== --- trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] Fri Apr 24 19:40:38 2015 @@ -78,7 +78,7 @@ * Pointer to RTL_ATOM * * @return STATUS_SUCCESS in case of success, proper error code - * othwerwise. + * otherwise. * * @remarks None * @@ -198,7 +198,7 @@ * Atom identifier * * @return STATUS_SUCCESS in case of success, proper error code - * othwerwise. + * otherwise. * * @remarks None * @@ -235,7 +235,7 @@ * Pointer to RTL_ATOM * * @return STATUS_SUCCESS in case of success, proper error code - * othwerwise. + * otherwise. * * @remarks None * @@ -360,7 +360,7 @@ * buffer size * * @return STATUS_SUCCESS in case of success, proper error code - * othwerwise. + * otherwise. * * @remarks None * Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Fri Apr 24 19:40:38 2015 @@ -221,7 +221,7 @@ /* It failed, check if we had a block */ if (NewBlock) { - /* We did, remove the refernces that we had added */ + /* We did, remove the references that we had added */ ExfReleaseRundownProtectionEx(&NewBlock->RundownProtect, MAX_FAST_REFS + 1); } @@ -333,7 +333,7 @@ * @implemented * * Opens or creates a Callback Object. Creates only if Create is true. - * Allows multiple Callback Functions to be registred only if + * Allows multiple Callback Functions to be registered only if * AllowMultipleCallbacks is true. * See: http://www.osronline.com/ddkx/kmarch/k102_967m.htm * http://www.osronline.com/article.cfm?id=24 Modified: trunk/reactos/ntoskrnl/ex/exintrin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/exintrin.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] Fri Apr 24 19:40:38 2015 @@ -103,7 +103,7 @@ IN SIZE_T Length, IN ULONG Alignment) { - ULONG_PTR Last, Current = (ULONG_PTR)Address; + ULONG_PTR Last, Current = (ULONG_PTR)Address; PAGED_CODE(); /* Only probe if we have a valid length */ Modified: trunk/reactos/ntoskrnl/ex/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fmutex.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fmutex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/fmutex.c [iso-8859-1] Fri Apr 24 19:40:38 2015 @@ -31,7 +31,7 @@ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(IN OUT PFAST_MUTEX FastMutex) { /* Call the inline */ - _ExEnterCriticalRegionAndAcquireFastMutexUnsafe(FastMutex); + _ExEnterCriticalRegionAndAcquireFastMutexUnsafe(FastMutex); } /* @@ -42,7 +42,7 @@ ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(IN OUT PFAST_MUTEX FastMutex) { /* Call the inline */ - _ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(FastMutex); + _ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(FastMutex); } /* Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Fri Apr 24 19:40:38 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ex/init.c + * FILE: ntoskrnl/ex/handle.c * PURPOSE: Generic Executive Handle Tables * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Thomas Weidenmueller <w3seek(a)reactos.com> @@ -516,7 +516,7 @@ Mid = ExpAllocateMidLevelTable(HandleTable, DoInit, &Low); if (!Mid) { - /* We failed, free the high level table as welll */ + /* We failed, free the high level table as well */ ExpFreeTablePagedPool(HandleTable->QuotaProcess, High, SizeOfHandle(HIGH_LEVEL_ENTRIES)); @@ -928,7 +928,7 @@ /* Remove the handle from the list */ ExRemoveHandleTable(HandleTable); - /* Check if we have a desotry callback */ + /* Check if we have a destroy callback */ if (DestroyHandleProcedure) { /* FIXME: */ Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Fri Apr 24 19:40:38 2015 @@ -237,7 +237,7 @@ UserKey = NULL; } - /* Initailize the object attributes */ + /* Initialize the object attributes */ InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,

1 0

[aandrejevic] 67385: [NTVDM] - Implement INT 21h AH = 29h (Parse Filename into FCB). - Loading an overlay does not create a new process.
by aandrejevic＠svn.reactos.org 24 Apr '15

24 Apr '15

Author: aandrejevic Date: Fri Apr 24 19:35:54 2015 New Revision: 67385 URL: http://svn.reactos.org/svn/reactos?rev=67385&view=rev Log: [NTVDM] - Implement INT 21h AH = 29h (Parse Filename into FCB). - Loading an overlay does not create a new process. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri Apr 24 19:35:54 2015 @@ -1768,6 +1768,78 @@ break; } + /* Parse Filename into FCB */ + case 0x29: + { + PCHAR FileName = (PCHAR)SEG_OFF_TO_PTR(getDS(), getSI()); + PDOS_FCB Fcb = (PDOS_FCB)SEG_OFF_TO_PTR(getES(), getDI()); + BYTE Options = getAL(); + INT i; + CHAR FillChar = ' '; + + if (FileName[1] == ':') + { + /* Set the drive number */ + Fcb->DriveNumber = RtlUpperChar(FileName[0]) - 'A' + 1; + + /* Skip to the file name part */ + FileName += 2; + } + else + { + /* No drive number specified */ + if (Options & (1 << 1)) Fcb->DriveNumber = CurrentDrive + 1; + else Fcb->DriveNumber = 0; + } + + /* Parse the file name */ + i = 0; + while (*FileName && (i < 8)) + { + if (*FileName == '.') break; + else if (*FileName == '*') + { + FillChar = '?'; + break; + } + + Fcb->FileName[i++] = *FileName++; + } + + /* Fill the whole field with blanks only if bit 2 is not set */ + if ((FillChar != ' ') || (i != 0) || !(Options & (1 << 2))) + { + for (; i < 8; i++) Fcb->FileName[i] = FillChar; + } + + /* Skip to the extension part */ + while (*FileName && *FileName != '.') FileName++; + if (*FileName == '.') FileName++; + + /* Now parse the extension */ + i = 0; + FillChar = ' '; + + while (*FileName && (i < 3)) + { + if (*FileName == '*') + { + FillChar = '?'; + break; + } + + Fcb->FileExt[i++] = *FileName++; + } + + /* Fill the whole field with blanks only if bit 3 is not set */ + if ((FillChar != ' ') || (i != 0) || !(Options & (1 << 3))) + { + for (; i < 3; i++) Fcb->FileExt[i] = FillChar; + } + + break; + } + /* Get System Date */ case 0x2A: { @@ -2498,7 +2570,22 @@ LPSTR ProgramName = SEG_OFF_TO_PTR(getDS(), getDX()); PDOS_EXEC_PARAM_BLOCK ParamBlock = SEG_OFF_TO_PTR(getES(), getBX()); DWORD ReturnAddress = MAKELONG(Stack[STACK_IP], Stack[STACK_CS]); - WORD ErrorCode = DosCreateProcess(LoadType, ProgramName, ParamBlock, ReturnAddress); + WORD ErrorCode; + + if (LoadType != DOS_LOAD_OVERLAY) + { + ErrorCode = DosCreateProcess(LoadType, ProgramName, ParamBlock, ReturnAddress); + } + else + { + ErrorCode = DosLoadExecutable(DOS_LOAD_OVERLAY, + ProgramName, + FAR_POINTER(ParamBlock->CommandLine), + SEG_OFF_TO_PTR(ParamBlock->Environment, 0), + ReturnAddress, + NULL, + NULL); + } if (ErrorCode == ERROR_SUCCESS) {

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2015