Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mnordell] 57374: Add test for RtlDosPathNameToNtPathName_U. This time with the actual test file too.
by mnordell＠svn.reactos.org 24 Sep '12

24 Sep '12

Author: mnordell Date: Mon Sep 24 12:20:06 2012 New Revision: 57374 URL: http://svn.reactos.org/svn/reactos?rev=57374&view=rev Log: Add test for RtlDosPathNameToNtPathName_U. This time with the actual test file too. Added: trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c (with props) Added: trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosPath… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c (added) +++ trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c [iso-8859-1] Mon Sep 24 12:20:06 2012 @@ -1,0 +1,437 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for RtlDosPathNameToNtPathName_U + * PROGRAMMER: Mike "tamlin" Nordell + */ +/* TODO: + * - Make the code UNICODE aware. If a user is inside a directory with + * non-ANSI characters somewhere in the path, all bets are currently off. + * - Remove hard-coded path size limits. + * - Un-tabify to match style of other code. + */ + +/* Test to see that ntdll.RtlDosPathNameToNtPathName_U behaves _exactly_ + * like Windows with all possible input to it. + * - relative path. + * - absolute paths + * - \\.\C:\foo + * - \\.\C:\foo\ + * - \\?\C:\foo + * - \\?\C:\foo\ + * - \??\C: + * - \??\C:\ + * + * Caveat: The "\??\*" form behaves different depending on Windows version. + * + * Code is assumed to be compiled as 32-bit "ANSI" (i.e. with _UNICODE) undefined. + */ + +// Enable this define to compile the test as a ReactOS auto-test. +// Disable it to compile on plain Win32, to test-run and get info. +#define COMPILE_AS_ROSTEST + +#ifndef COMPILE_AS_ROSTEST +# define PRINT_INFO // Also print, in addition to testing +# include <windows.h> +# include <stdio.h> +# include <stddef.h> +#else /* Compile for ReactOS or wine */ +# define WIN32_NO_STATUS +# include <stdio.h> +# include <wine/test.h> +# include <pseh/pseh2.h> +# include <ndk/rtlfuncs.h> +#endif + +/* +BOOLEAN +NTAPI +RtlDosPathNameToNtPathName_U(IN PCWSTR DosName, + OUT PUNICODE_STRING NtName, + OUT PCWSTR *PartName, + OUT PRTL_RELATIVE_NAME_U RelativeName) +*/ + +#ifndef COMPILE_AS_ROSTEST + +typedef struct UNICODE_STRING { + USHORT Length; + USHORT MaximumLength; + PWSTR Buffer; +} UNICODE_STRING, *PUNICODE_STRING; + +typedef struct _RTLP_CURDIR_REF +{ + LONG RefCount; + HANDLE Handle; +} RTLP_CURDIR_REF, *PRTLP_CURDIR_REF; + +typedef struct RTL_RELATIVE_NAME_U { + UNICODE_STRING RelativeName; + HANDLE ContainingDirectory; + PRTLP_CURDIR_REF CurDirRef; +} RTL_RELATIVE_NAME_U, *PRTL_RELATIVE_NAME_U; + +typedef BOOLEAN (__stdcall *RtlDosPathNameToNtPathName_U_t)(PCWSTR,PUNICODE_STRING,PCWSTR*,PRTL_RELATIVE_NAME_U); + +RtlDosPathNameToNtPathName_U_t RtlDosPathNameToNtPathName_U; + +#endif // !COMPILE_AS_ROSTEST + + +static void report_error(const char* pszErr) +{ +#ifdef COMPILE_AS_ROSTEST + ok(FALSE, "%s\n", pszErr); +#else + printf("\a** %s!\n", pszErr); +#endif +} + + +#ifndef COMPILE_AS_ROSTEST +static void prucs(const char* pszDesc, UNICODE_STRING* pucs) +{ + WCHAR wszTmp[512]; + memcpy(wszTmp, pucs->Buffer, pucs->Length); + wszTmp[pucs->Length/2] = 0; + printf("%-12s: \"%S\"\n", pszDesc, wszTmp); +} +#endif + +// Test RtlDosPathNameToNtPathName_U . +// pwszExpected shall contain the expected result for NtName +// *without* the leading "\??\". +// pwszExpectedPartName shall contain the expected result for PartName. +// NULL Expected means result is expected to be NULL too. +static void test2(LPCWSTR pwsz, LPCWSTR pwszExpected, LPCWSTR pwszExpectedPartName) +{ + UNICODE_STRING NtName; + PWSTR PartName; + RTL_RELATIVE_NAME_U RelativeName; + BOOLEAN bOK; + + bOK = RtlDosPathNameToNtPathName_U(pwsz, &NtName, (PCWSTR*)&PartName, &RelativeName); + + if (!bOK) { + report_error("RtlDosPathNameToNtPathName_U failed"); + printf("input: \"%S\"\n", pwsz); + return; +// exit(1); + } + +#if !defined(COMPILE_AS_ROSTEST) && defined(PRINT_INFO) + printf("--------------------------\n"); + printf("in : \"%S\"\n", pwsz); + prucs("NtName", &NtName); + if (PartName) { + printf("PartName : \"%S\"\n", PartName); + } else { + // This is not the place to test that printf handles NULL strings. + printf("PartName : (null)\n"); + } +// prucs("RelativeName", &RelativeName.RelativeName); +#endif + + // Disregarding input, output (NtName) shall always start with "\??\". + if (memcmp(NtName.Buffer, L"\\??\\", 8)) { + report_error("NtName does not start with \"\\??\\\""); + return; +// exit(1); + } + if (pwszExpected) { + PWSTR pwszActual = NtName.Buffer + 4; + const size_t lenExp = wcslen(pwszExpected); + const size_t lenAct = (NtName.Length - 8) / 2; + if (lenExp != lenAct || + memcmp(pwszActual, pwszExpected, lenExp * 2)) + { + report_error("Actual NtName does not match expectations!"); + printf("Expected: %2u chars \"%S\"\n", lenExp, pwszExpected); + printf("Actual : %2u chars \"%S\"\n", lenAct, lenAct ? pwszActual : L"(null)"); + return; +// exit(1); + } + } else + if (NtName.Length) + { + PWSTR pwszActual = NtName.Buffer + 4; + const size_t lenAct = (NtName.Length - 8) / 2; + report_error("Unexpected NtName (expected NULL)"); + printf("Actual : %2u chars \"%S\"\n", lenAct, pwszActual); + } + + if (pwszExpectedPartName) { + if (!PartName) { + report_error("Actual PartName is unexpectedly NULL!"); + printf("Expected: \"%S\"\n", pwszExpectedPartName); + return; +// exit(1); + } + if (wcscmp(PartName, pwszExpectedPartName)) { + report_error("Actual PartName does not match expected!"); + printf("Expected: \"%S\"\n", pwszExpectedPartName); + printf("Actual : \"%S\"\n", PartName); + return; + } + } else + if (PartName) + { + report_error("Unexpected PartName (expected NULL)"); + printf("Actual : %S\n", PartName); + } +} + +// NULL Expected means result is expected to be NULL too. +static void test(const char* psz, const char* pszExpected, const char* pszExpectedPartName) +{ + WCHAR wszTmp1[512]; + WCHAR wszTmp2[512]; + WCHAR wszTmp3[512]; + LPCWSTR p2 = 0; + LPCWSTR p3 = 0; + swprintf(wszTmp1, L"%S", psz); + if (pszExpected) { + swprintf(wszTmp2, L"%S", pszExpected); + p2 = wszTmp2; + } + if (pszExpectedPartName) { + swprintf(wszTmp3, L"%S", pszExpectedPartName); + p3 = wszTmp3; + } + test2(wszTmp1, p2, p3); +} + + +typedef struct DirComponents +{ + char szCD[512]; + char szCDPlusSlash[512]; + char* pszLastCDComponent; + char szCurDrive[4]; + char szParentDir[512]; + char szParentDirPlusSlash[512]; + char szNextLastCDComponent[260]; + const char* pszNextLastCDComponent; + const char* pszParentDir; + const char* pszParentDirPlusSlash; +} DirComponents; + + +static void InitDirComponents(DirComponents* p) +{ + p->pszNextLastCDComponent = 0; + p->pszParentDir = 0; + p->pszParentDirPlusSlash = 0; + + GetCurrentDirectory(sizeof(p->szCD) / sizeof(*p->szCD), p->szCD); + + if (strlen(p->szCD) < 2 || p->szCD[1] != ':') { + printf("Expected curdir to be a drive letter. It's not. It's \"%s\"\n", p->szCD); +#ifdef COMPILE_AS_ROSTEST + ok(FALSE, "Expected curdir to be a drive letter. It's not. It's \"%s\"\n", p->szCD); +#endif + exit(1); + } + + // Note that if executed from the root directory, a slash already + // is appended. Take the opportunity to verify this. + if (p->szCD[2] != '\\') { + printf("CD is missing a slash as its third character! \"%s\"\n", p->szCD); +#ifdef COMPILE_AS_ROSTEST + ok(FALSE, "CD is missing a slash as its third character! \"%s\"\n", p->szCD); +#endif + exit(1); + } + + strcpy(p->szCDPlusSlash, p->szCD); + if (strlen(p->szCD) > 3) { + // Append trailing backslash + strcat(p->szCDPlusSlash, "\\"); + } + + memcpy(p->szCurDrive, p->szCD, 2); + p->szCurDrive[2] = 0; + + p->pszLastCDComponent = strrchr(p->szCD, '\\'); + if (p->pszLastCDComponent) + { + // We have a parent directory + memcpy(p->szParentDir, p->szCD, p->pszLastCDComponent - p->szCD); + p->szParentDir[p->pszLastCDComponent - p->szCD] = 0; + p->pszParentDir = p->szParentDir; + if (strlen(p->szParentDir) == 2 && p->szParentDir[1] == ':') { + // When run from root directory, this is expected to + // have a trailing backslash + strcat(p->szParentDir, "\\"); + } + strcpy(p->szParentDirPlusSlash, p->szParentDir); + if (p->szParentDirPlusSlash[strlen(p->szParentDirPlusSlash)-1] != '\\') { + strcat(p->szParentDirPlusSlash, "\\"); + } + p->pszParentDirPlusSlash = p->szParentDirPlusSlash; + + // Check if we have a directory above that too. + *p->pszLastCDComponent = 0; + p->pszNextLastCDComponent = strrchr(p->szCD, '\\'); + *p->pszLastCDComponent = '\\'; + if (p->pszNextLastCDComponent) { + ++p->pszNextLastCDComponent; // skip the leading slash + if (p->pszNextLastCDComponent + 1 >= p->pszLastCDComponent) { + p->pszNextLastCDComponent = 0; + } else { + const size_t siz = p->pszLastCDComponent - p->pszNextLastCDComponent; + memcpy(p->szNextLastCDComponent, p->pszNextLastCDComponent, siz); + p->szNextLastCDComponent[siz] = 0; + p->pszNextLastCDComponent = p->szNextLastCDComponent; + } + } + } + if (p->pszLastCDComponent && p->pszLastCDComponent[1] == 0) { + // If the backslash is the last character in the path, + // this is a NULL-component. + p->pszLastCDComponent = 0; + } else { + ++p->pszLastCDComponent; // skip the leading slash + } +} + + +#ifndef COMPILE_AS_ROSTEST +static void InitFunctionPointer() +{ + HINSTANCE hDll = LoadLibrary("ntdll"); + if (!hDll) { + printf("Major failure. Couldn't even load ntdll!\n"); + exit(1); + } + RtlDosPathNameToNtPathName_U = + (RtlDosPathNameToNtPathName_U_t)GetProcAddress(hDll, "RtlDosPathNameToNtPathName_U"); + if (!hDll) { + printf("Major failure. Couldn't get RtlDosPathNameToNtPathName_U!\n"); + exit(1); + } +} +#endif // !COMPILE_AS_ROSTEST + + +#ifdef COMPILE_AS_ROSTEST +START_TEST(RtlDosPathNameToNtPathName_U) +#else +int main() +#endif +{ +#if defined(PRINT_INFO) +#ifdef COMPILE_AS_ROSTEST + PPEB Peb = NtCurrentPeb(); + const DWORD dwWinVer = (DWORD)(Peb->OSMinorVersion << 8) | Peb->OSMajorVersion; +#else + const DWORD dwWinVer = GetVersion(); +#endif + const BYTE WinVerMaj = (BYTE)dwWinVer; + const BYTE WinVerMin = HIBYTE(LOWORD(dwWinVer)); +#endif // PRINT_INFO + + DirComponents cd; + +#ifndef COMPILE_AS_ROSTEST + InitFunctionPointer(); +#endif + + InitDirComponents(&cd); + +#if defined(PRINT_INFO) + printf("WinVer: %d.%d\n", WinVerMaj, WinVerMin); + printf("pszLastCDComponent \"%s\"\n", cd.pszLastCDComponent); + printf("pszNextLastCDComponent \"%s\"\n", cd.pszNextLastCDComponent); + printf("pszParentDir \"%s\"\n", cd.pszParentDir); + printf("pszParentDirPlusSlash \"%s\"\n", cd.pszParentDirPlusSlash); +#endif + + +#define PREP0 +#define PREP1 "\\\\.\\" +#define PREP2 "\\\\?\\" + + // The following tests shall return strictly defined strings, + // why we can use hard-coded expectations.. + test(PREP1 "C:" , "C:" , "C:"); + test(PREP2 "C:" , "C:" , "C:"); + test(PREP0 "C:\\" , "C:\\" , NULL); + test(PREP1 "C:\\" , "C:\\" , NULL); + test(PREP2 "C:\\" , "C:\\" , NULL); + test(PREP0 "C:\\foo" , "C:\\foo" , "foo"); + test(PREP1 "C:\\foo" , "C:\\foo" , "foo"); + test(PREP2 "C:\\foo" , "C:\\foo" , "foo"); + test(PREP0 "C:\\foo\\" , "C:\\foo\\" , NULL); + test(PREP1 "C:\\foo\\" , "C:\\foo\\" , NULL); + test(PREP2 "C:\\foo\\" , "C:\\foo\\" , NULL); + test(PREP0 "C:\\foo\\bar" , "C:\\foo\\bar" , "bar"); + test(PREP1 "C:\\foo\\bar" , "C:\\foo\\bar" , "bar"); + test(PREP2 "C:\\foo\\bar" , "C:\\foo\\bar" , "bar"); + test(PREP0 "C:\\foo\\bar\\", "C:\\foo\\bar\\" , NULL); + test(PREP1 "C:\\foo\\bar\\", "C:\\foo\\bar\\" , NULL); + test(PREP2 "C:\\foo\\bar\\", "C:\\foo\\bar\\" , NULL); + test(PREP1 "." , "" , NULL); + test(PREP2 "." , "." , "."); + test(PREP1 ".\\" , "" , NULL); + test(PREP2 ".\\" , ".\\" , NULL); + test(PREP1 ".." , "" , NULL); + test(PREP2 ".." , ".." , ".."); + test(PREP1 "..\\" , "" , NULL); + test(PREP2 "..\\" , "..\\" , NULL); + + // The following tests returns results based on current directory. + test(PREP0 "." , cd.szCD , cd.pszLastCDComponent); + test(PREP0 ".\\" , cd.szCDPlusSlash , NULL); + test(PREP0 ".." , cd.pszParentDir , cd.pszNextLastCDComponent); + test(PREP0 "..\\" , cd.pszParentDirPlusSlash, NULL); + test(cd.szCD , cd.szCD , cd.pszLastCDComponent); + test(cd.szCDPlusSlash , cd.szCDPlusSlash , NULL); + +#if 0 + // This following test is "problematic", as it returns results based on + // what your CD on C: is, whether or not you actually run the program + // from C:. For that reason, it's currently disabled. + test(PREP0 "C:" , "C:\\" , NULL); +#endif + +#if 0 // Disabled due to... see the comment inside the block. + { + char szExp[32]; + BOOL bValid = FALSE; + char szPrepend[32]; + szPrepend[0] = 0; + // Strictly speaking, this "Should Never Happen(tm)", calling + // RtlDosPathNameToNtPathName_U with a source already formed as + // a full NT name ("\??\"), why it's not the end of the world + // that this test is currently disabled. + // + // NOTE: _At least_ XP sp2 prepends this. + // Prepending curdrive like this is most likely a bug, but for + // compatibility it may become a requirement to "shim" this. + // + // Known operating systems prepending "Z:\??\" (assuming the + // process' CD is on the volume Z:): + // - XP sp2. + // + // Known operating systems not prepending: + // - Win7 64 (as 32-bit) + if (WinVerMaj == 5) { + sprintf(szPrepend, "%s\\??\\", cd.szCurDrive); + } + + sprintf(szExp, "%s%s", szPrepend, "C:"); // Win7 64 (as 32-bit) + test("\\??\\C:", szExp, "C:"); + + sprintf(szExp, "%s%s", szPrepend, "C:\\"); + test("\\??\\C:\\", szExp, NULL); + } +#endif + +#ifndef COMPILE_AS_ROSTEST + return 0; +#endif +} + Propchange: trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mnordell] 57373: Add test for RtlDosPathNameToNtPathName_U.
by mnordell＠svn.reactos.org 24 Sep '12

24 Sep '12

Author: mnordell Date: Mon Sep 24 12:17:04 2012 New Revision: 57373 URL: http://svn.reactos.org/svn/reactos?rev=57373&view=rev Log: Add test for RtlDosPathNameToNtPathName_U. Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Mon Sep 24 12:17:04 2012 @@ -5,6 +5,7 @@ RtlBitmap.c RtlDetermineDosPathNameType.c RtlDoesFileExists.c + RtlDosPathNameToNtPathName_U.c RtlDosSearchPath_U.c RtlDosSearchPath_Ustr.c RtlGetFullPathName_U.c Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Mon Sep 24 12:17:04 2012 @@ -11,6 +11,7 @@ extern void func_RtlBitmap(void); extern void func_RtlDetermineDosPathNameType(void); extern void func_RtlDoesFileExists(void); +extern void func_RtlDosPathNameToNtPathName_U(void); extern void func_RtlDosSearchPath_U(void); extern void func_RtlDosSearchPath_Ustr(void); extern void func_RtlGetFullPathName_U(void); @@ -28,6 +29,7 @@ { "RtlBitmapApi", func_RtlBitmap }, { "RtlDetermineDosPathNameType", func_RtlDetermineDosPathNameType }, { "RtlDoesFileExists", func_RtlDoesFileExists }, + { "RtlDosPathNameToNtPathName_U", func_RtlDosPathNameToNtPathName_U }, { "RtlDosSearchPath_U", func_RtlDosSearchPath_U }, { "RtlDosSearchPath_Ustr", func_RtlDosSearchPath_Ustr }, { "RtlGetFullPathName_U", func_RtlGetFullPathName_U },

1 0

[fireball] 57372: - Compiling fixes. - CMake switch.
by fireball＠svn.reactos.org 23 Sep '12

23 Sep '12

Author: fireball Date: Sun Sep 23 20:35:42 2012 New Revision: 57372 URL: http://svn.reactos.org/svn/reactos?rev=57372&view=rev Log: - Compiling fixes. - CMake switch. Added: branches/arwinss/reactos/subsystems/win32/win32k/CMakeLists.txt (with props) branches/arwinss/reactos/subsystems/win32/win32k/include/napi.h - copied, changed from r50633, trunk/reactos/subsystems/win32/win32k/include/napi.h branches/arwinss/reactos/subsystems/win32/win32k/win32k.spec - copied, changed from r50632, branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec Removed: branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engxform.c branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h Added: branches/arwinss/reactos/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/CMakeLists.txt (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Sun Sep 23 20:35:42 2012 @@ -1,0 +1,146 @@ +spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) + +include_directories( + . + include + ${REACTOS_SOURCE_DIR}/win32ss + ${REACTOS_SOURCE_DIR}/ntoskrnl/include + ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +add_definitions( + -DLANGPACK + -D_WIN32K_) + +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dib) + +list(APPEND GENDIB_FILES + ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c + ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c + ${CMAKE_CURRENT_BINARY_DIR}/dib/dib32gen.c) + +add_custom_command( + OUTPUT ${GENDIB_FILES} + COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/dib + DEPENDS native-gendib) + +list(APPEND SOURCE + dib/dib1bpp.c + dib/dib4bpp.c + dib/dib8bpp.c + dib/dib16bpp.c + dib/dib24bpp.c + dib/dib32bpp.c + dib/floodfill.c + dib/stretchblt.c + eng/device.c + eng/driver.c + eng/engblt.c + eng/engbrush.c + eng/engclip.c + eng/engdev.c + eng/engdrv.c + eng/engevent.c + eng/engerror.c + eng/engfile.c + eng/engfloat.c + eng/engfont.c + eng/engmem.c + eng/engmisc.c + eng/engpaint.c + eng/engpal.c + eng/engpath.c + eng/engpointer.c + eng/engprint.c + eng/engquery.c + eng/engrtl.c + eng/engsem.c + eng/engsurf.c + eng/engtext.c + eng/engwnd.c + eng/engxform.c + eng/engxlate.c + gdi/bitmap.c + gdi/dc.c + gdi/enum.c + gdi/misc.c + gre/arc.c + gre/bitblt.c + gre/brushobj.c + gre/clipobj.c + gre/drawing.c + gre/ellipse.c + gre/font.c + gre/gdiobj.c + gre/lineto.c + gre/pen.c + gre/polyfill.c + gre/rect.c + gre/surfobj.c + main/csr.c + main/err.c + main/init.c + main/cursor.c + main/display.c + main/monitor.c + main/kbdlayout.c + main/keyboard.c + swm/winman.c + wine/atom.c + wine/class.c + wine/clipboard.c + wine/directory.c + wine/handle.c + wine/hook.c + wine/main.c + wine/object.c + wine/process.c + wine/queue.c + wine/region.c + wine/stubs.c + wine/timeout.c + wine/user.c + wine/window.c + wine/winesup.c + wine/winstation.c + win32k.rc) + +list(APPEND SOURCE + dib/dib.c + ${GENDIB_FILES}) + +if(ARCH MATCHES i386) +list(APPEND SOURCE + dib/i386/dib24bpp_hline.s + dib/i386/dib32bpp_hline.s + dib/i386/dib32bpp_colorfill.s + eng/i386/floatobj.S + math/i386/cos_asm.s + math/i386/sin_asm.s + math/i386/atan2_asm.s + math/i386/floor_asm.s + math/i386/ceil_asm.s) +else() +list(APPEND SOURCE + dib/dib24bppc.c + dib/dib32bppc.c) +endif() + +add_library(win32k SHARED + ${CMAKE_CURRENT_BINARY_DIR}/win32k.def + ${SOURCE}) + +set_module_type(win32k kernelmodedriver) + +target_link_libraries(win32k + ${PSEH_LIB} + dxguid + libcntpr) + +add_importlibs(win32k ntoskrnl hal) +add_pch(win32k pch.h) +add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) + +add_library(win32ksys sys-stubs.S) +set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h) Propchange: branches/arwinss/reactos/subsystems/win32/win32k/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engxform.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engxform.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engxform.c [iso-8859-1] Sun Sep 23 20:35:42 2012 @@ -95,16 +95,16 @@ ULONG HintFromAccel(ULONG flAccel) { - switch (flAccel & (MX_NOTRANSLATE | MX_IDENTITYSCALE | MX_SCALE)) - { - case (MX_SCALE | MX_IDENTITYSCALE | MX_NOTRANSLATE): - return GX_IDENTITY; - case (MX_SCALE | MX_IDENTITYSCALE): - return GX_OFFSET; - case MX_SCALE: - return GX_SCALE; - default: - return GX_GENERAL; + switch (flAccel & (XFORM_SCALE|XFORM_UNITY|XFORM_NO_TRANSLATION)) + { + case (XFORM_SCALE|XFORM_UNITY|XFORM_NO_TRANSLATION): + return GX_IDENTITY; + case (XFORM_SCALE|XFORM_UNITY): + return GX_OFFSET; + case XFORM_SCALE: + return GX_SCALE; + default: + return GX_GENERAL; } } @@ -115,7 +115,7 @@ XFORMOBJ_UpdateAccel( IN XFORMOBJ *pxo) { - PMATRIX pmx = (PMATRIX)pxo; + PMATRIX pmx = (PMATRIX)pxo;//XFORMOBJ_pmx(pxo); /* Copy Dx and Dy to FIX format */ pmx->fxDx = FLOATOBJ_GetFix(&pmx->efDx); @@ -124,27 +124,27 @@ pmx->flAccel = 0; if (FLOATOBJ_Equal0(&pmx->efDx) && - FLOATOBJ_Equal0(&pmx->efDy)) - { - pmx->flAccel |= MX_NOTRANSLATE; + FLOATOBJ_Equal0(&pmx->efDy)) + { + pmx->flAccel |= XFORM_NO_TRANSLATION; } if (FLOATOBJ_Equal0(&pmx->efM12) && - FLOATOBJ_Equal0(&pmx->efM21)) - { - pmx->flAccel |= MX_SCALE; + FLOATOBJ_Equal0(&pmx->efM21)) + { + pmx->flAccel |= XFORM_SCALE; } if (FLOATOBJ_Equal1(&pmx->efM11) && - FLOATOBJ_Equal1(&pmx->efM22)) - { - pmx->flAccel |= MX_IDENTITYSCALE; + FLOATOBJ_Equal1(&pmx->efM22)) + { + pmx->flAccel |= XFORM_UNITY; } if (FLOATOBJ_IsLong(&pmx->efM11) && FLOATOBJ_IsLong(&pmx->efM12) && - FLOATOBJ_IsLong(&pmx->efM21) && FLOATOBJ_IsLong(&pmx->efM22)) - { - pmx->flAccel |= MX_INTEGER; + FLOATOBJ_IsLong(&pmx->efM21) && FLOATOBJ_IsLong(&pmx->efM22)) + { + pmx->flAccel |= XFORM_INTEGER; } return HintFromAccel(pmx->flAccel); @@ -296,56 +296,57 @@ FLOATOBJ fo1, fo2; FLONG flAccel; - pmx = (PMATRIX)pxo; - flAccel = pmx->flAccel & (MX_INTEGER|MX_SCALE|MX_IDENTITYSCALE); - - switch (flAccel) - { - case (MX_SCALE | MX_IDENTITYSCALE): - case (MX_SCALE | MX_IDENTITYSCALE | MX_INTEGER): + pmx = (PMATRIX)pxo;//XFORMOBJ_pmx(pxo); + flAccel = pmx->flAccel; + + if ((flAccel & (XFORM_SCALE|XFORM_UNITY)) == (XFORM_SCALE|XFORM_UNITY)) + { /* Identity transformation, nothing todo */ - break; - - case (MX_IDENTITYSCALE | MX_INTEGER): - /* 1-scale integer transform */ - i = cPoints - 1; - do - { - LONG x = pptIn[i].x + pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21); - LONG y = pptIn[i].y + pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12); - pptOut[i].y = y; - pptOut[i].x = x; - } - while (--i >= 0); - break; - - case (MX_SCALE | MX_INTEGER): - /* Diagonal integer transform */ - i = cPoints - 1; - do - { - pptOut[i].x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11); - pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22); - } - while (--i >= 0); - break; - - case (MX_INTEGER): - /* Full integer transform */ - i = cPoints - 1; - do - { - LONG x; - x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11); - x += pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21); - pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22); - pptOut[i].y += pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12); - pptOut[i].x = x; - } - while (--i >= 0); - break; - - case (MX_IDENTITYSCALE): + } + else if (flAccel & XFORM_INTEGER) + { + if (flAccel & XFORM_UNITY) + { + /* 1-scale integer transform */ + i = cPoints - 1; + do + { + LONG x = pptIn[i].x + pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21); + LONG y = pptIn[i].y + pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12); + pptOut[i].y = y; + pptOut[i].x = x; + } + while (--i >= 0); + } + else if (flAccel & XFORM_SCALE) + { + /* Diagonal integer transform */ + i = cPoints - 1; + do + { + pptOut[i].x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11); + pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22); + } + while (--i >= 0); + } + else + { + /* Full integer transform */ + i = cPoints - 1; + do + { + LONG x; + x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11); + x += pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21); + pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22); + pptOut[i].y += pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12); + pptOut[i].x = x; + } + while (--i >= 0); + } + } + else if (flAccel & XFORM_UNITY) + { /* 1-scale transform */ i = cPoints - 1; do @@ -358,9 +359,9 @@ pptOut[i].y = pptIn[i].y + FLOATOBJ_GetLong(&fo2); } while (--i >= 0); - break; - - case (MX_SCALE): + } + else if (flAccel & XFORM_SCALE) + { /* Diagonal float transform */ i = cPoints - 1; do @@ -373,9 +374,9 @@ pptOut[i].y = FLOATOBJ_GetLong(&fo2); } while (--i >= 0); - break; - - default: + } + else + { /* Full float transform */ i = cPoints - 1; do @@ -386,16 +387,14 @@ pptOut[i].y = FLOATOBJ_GetLong(&fo2); } while (--i >= 0); - break; - } - - if (!(pmx->flAccel & MX_NOTRANSLATE)) + } + + if (!(pmx->flAccel & XFORM_NO_TRANSLATION)) { /* Translate points */ i = cPoints - 1; do { -// DPRINT1("Translating Points (%d,%d)->(%d,%d)\n", pptOut[i].x, pptOut[i].y, pptOut[i].x + pmx->fxDx, pptOut[i].y + pmx->fxDy); pptOut[i].x += pmx->fxDx; pptOut[i].y += pmx->fxDy; } Copied: branches/arwinss/reactos/subsystems/win32/win32k/include/napi.h (from r50633, trunk/reactos/subsystems/win32/win32k/include/napi.h) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/napi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/napi.h [iso-8859-1] Sun Sep 23 20:35:42 2012 @@ -5,7 +5,7 @@ * PROGRAMMER: Timo Kreuzer */ -#define SVC_(name, argcount) (ULONG_PTR)Nt##name, +#define SVC_(name, argcount) (ULONG_PTR)name, ULONG_PTR Win32kSSDT[] = { #include "w32ksvc.h" }; @@ -16,7 +16,7 @@ #include "w32ksvc.h" }; -#define MIN_SYSCALL_NUMBER 0 +#define MIN_SYSCALL_NUMBER 0x1000 #define NUMBER_OF_SYSCALLS (sizeof(Win32kSSPT) / sizeof(Win32kSSPT[0])) -#define MAX_SYSCALL_NUMBER (NUMBER_OF_SYSCALLS - 1) +#define MAX_SYSCALL_NUMBER 0x1000 + (NUMBER_OF_SYSCALLS - 1) ULONG Win32kNumberOfSysCalls = NUMBER_OF_SYSCALLS; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Sun Sep 23 20:35:42 2012 @@ -46,12 +46,12 @@ #include <csrss/csrss.h> /* Public Win32K Headers */ -#include <win32k/callback.h> -#include <win32k/ntusrtyp.h> -#include <win32k/ntuser.h> -#include <win32k/ntgdityp.h> -#include <win32k/ntgdihdl.h> -#include <psdk/ntgdi.h> +#include <include/callback.h> +#include <include/ntusrtyp.h> +#include <include/ntuser.h> +#include <include/ntgdityp.h> +#include <include/ntgdihdl.h> +#include <ntgdi.h> /* Internal Win32K Header */ #include <win32kp.h> Removed: branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec (removed) @@ -1,229 +1,0 @@ -#include "include/reactos/msvctarget.h" -#undef i386 - -@ stdcall FLOATOBJ_AddFloatObj(ptr ptr) -@ stdcall FLOATOBJ_DivFloatObj(ptr ptr) -@ stdcall FLOATOBJ_MulFloatObj(ptr ptr) -@ stdcall FLOATOBJ_SubFloatObj(ptr ptr) -@ stdcall BRUSHOBJ_hGetColorTransform(ptr) -@ stdcall BRUSHOBJ_pvAllocRbrush(ptr long) -@ stdcall BRUSHOBJ_pvGetRbrush(ptr) -@ stdcall BRUSHOBJ_ulGetBrushColor(ptr) -@ stdcall CLIPOBJ_bEnum(ptr long ptr) -@ stdcall CLIPOBJ_cEnumStart(ptr long long long long) -@ stdcall CLIPOBJ_ppoGetPath(ptr) -@ stdcall EngAcquireSemaphore(ptr) -@ stdcall EngAllocMem(long long long) -@ stdcall EngAllocPrivateUserMem(ptr ptr long) -@ stdcall EngAllocSectionMem(ptr long ptr long) -@ stdcall EngAllocUserMem(ptr long) -@ stdcall EngAlphaBlend(ptr ptr ptr ptr ptr ptr ptr) -@ stdcall EngAssociateSurface(ptr ptr long) -@ stdcall EngBitBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) -@ stdcall EngBugCheckEx(long ptr ptr ptr ptr) NTOSKRNL.KeBugCheckEx -@ stdcall EngCheckAbort(ptr) -@ stdcall EngClearEvent(ptr) -@ stdcall EngComputeGlyphSet(long long long) -@ stdcall EngControlSprites(ptr long) -@ stdcall EngCopyBits(ptr ptr ptr ptr ptr ptr) -@ stdcall EngCreateBitmap(long long long long long ptr) -@ stdcall EngCreateClip() -@ stdcall EngCreateDeviceBitmap(ptr long long long) -@ stdcall EngCreateDeviceSurface(ptr long long long) -@ stdcall EngCreateDriverObj(ptr ptr ptr) -@ stdcall EngCreateEvent(ptr) -@ stdcall EngCreatePalette(long long long long long long) -@ stdcall EngCreatePath() -@ stdcall EngCreateSemaphore() -@ stdcall EngCreateWnd(ptr ptr ptr long long) -@ stdcall EngDebugBreak() NTOSKRNL.DbgBreakPoint -@ stdcall EngDebugPrint(ptr ptr ptr) -@ stdcall EngDeleteClip(ptr) -@ stdcall EngDeleteDriverObj(ptr long long) -@ stdcall EngDeleteEvent(ptr) -@ stdcall EngDeleteFile(ptr) -@ stdcall EngDeletePalette(ptr) -@ stdcall EngDeletePath(ptr) -@ stdcall EngDeleteSafeSemaphore(ptr) -@ stdcall EngDeleteSemaphore(ptr) -@ stdcall EngDeleteSurface(ptr) -@ stdcall EngDeleteWnd(ptr) -@ stdcall EngDeviceIoControl(ptr long ptr long ptr long ptr) -@ stdcall EngDitherColor(ptr long long long) -@ stdcall EngDxIoctl(long ptr long) -@ stdcall EngEnumForms(ptr long ptr long ptr ptr) -@ stdcall EngEraseSurface(ptr ptr long) -@ stdcall EngFileIoControl(ptr long ptr ptr ptr ptr ptr) -@ stdcall EngFileWrite(ptr ptr ptr ptr) -@ stdcall EngFillPath(ptr ptr ptr ptr ptr long long) -@ stdcall EngFindImageProcAddress(ptr ptr) -@ stdcall EngFindResource(ptr long long ptr) -@ stdcall EngFntCacheAlloc(long long) -@ stdcall EngFntCacheFault(long long) -@ stdcall EngFntCacheLookUp(long ptr) -@ stdcall EngFreeMem(ptr) -@ stdcall EngFreeModule(ptr) -@ stdcall EngFreePrivateUserMem(ptr ptr) -@ stdcall EngFreeSectionMem(ptr ptr) -@ stdcall EngFreeUserMem(ptr) -@ stdcall EngGetCurrentCodePage(ptr ptr) -@ stdcall EngGetCurrentProcessId() NTOSKRNL.PsGetCurrentProcessId -@ stdcall EngGetCurrentThreadId() NTOSKRNL.PsGetCurrentThreadId -@ stdcall EngGetDriverName(ptr) -@ stdcall EngGetFileChangeTime(ptr ptr) -@ stdcall EngGetFilePath(ptr ptr) -@ stdcall EngGetForm(ptr ptr long ptr long ptr) -@ stdcall EngGetLastError() -@ stdcall EngGetPrinter(ptr long ptr long ptr) -@ stdcall EngGetPrinterData(ptr ptr ptr ptr long ptr) -@ stdcall EngGetPrinterDataFileName(ptr) -@ stdcall EngGetPrinterDriver(ptr ptr long ptr long ptr) -@ stdcall EngGetProcessHandle() -@ stdcall EngGetTickCount() -@ stdcall EngGetType1FontList(ptr ptr long ptr ptr ptr) -@ stdcall EngGradientFill(ptr ptr ptr ptr long ptr long ptr ptr long) -@ stdcall EngHangNotification(ptr ptr) -@ stdcall EngInitializeSafeSemaphore(ptr) -@ stdcall EngIsSemaphoreOwned(ptr) -@ stdcall EngIsSemaphoreOwnedByCurrentThread(ptr) -@ stdcall EngLineTo(ptr ptr ptr long long long long ptr long) -@ stdcall EngLoadImage(ptr) -@ stdcall EngLoadModule(ptr) -@ stdcall EngLoadModuleForWrite(ptr long) -@ stdcall EngLockDirectDrawSurface(ptr) -@ stdcall EngLockDriverObj(ptr) -@ stdcall EngLockSurface(ptr) -@ stdcall EngLpkInstalled() -@ stdcall EngMapEvent(ptr ptr ptr ptr ptr) -@ stdcall EngMapFile(ptr long ptr) -@ stdcall EngMapFontFile(ptr ptr ptr) -@ stdcall EngMapFontFileFD(ptr ptr ptr) -@ stdcall EngMapModule(ptr ptr) -@ stdcall EngMapSection(ptr long ptr ptr) -@ stdcall EngMarkBandingSurface(ptr) -@ stdcall EngModifySurface(ptr ptr long long ptr ptr long ptr) -@ stdcall EngMovePointer(ptr long long ptr) -@ stdcall EngMulDiv(long long long) -@ stdcall EngMultiByteToUnicodeN(ptr long ptr ptr long) NTOSKRNL.RtlMultiByteToUnicodeN -@ stdcall EngMultiByteToWideChar(long ptr long ptr long) -@ stdcall EngNineGrid(ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall EngPaint(ptr ptr ptr ptr long) -@ stdcall EngPlgBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) -@ stdcall EngProbeForRead(ptr long long) NTOSKRNL.ProbeForRead -@ stdcall EngProbeForReadAndWrite(ptr long long) NTOSKRNL.ProbeForWrite -@ stdcall EngQueryDeviceAttribute(ptr long ptr long ptr long) -@ stdcall EngQueryFileTimeStamp(ptr) -@ stdcall EngQueryLocalTime(ptr) -@ stdcall EngQueryPalette(ptr ptr long ptr) -@ stdcall EngQueryPerformanceCounter(ptr) -@ stdcall EngQueryPerformanceFrequency(ptr) -@ stdcall EngQuerySystemAttribute(long ptr) -@ stdcall EngReadStateEvent(ptr) -@ stdcall EngReleaseSemaphore(ptr) -@ stdcall EngRestoreFloatingPointState(ptr) -@ stdcall EngSaveFloatingPointState(ptr long) -@ stdcall EngSecureMem(ptr long) -@ stdcall EngSetEvent(ptr) -@ stdcall EngSetLastError(long) -@ stdcall EngSetPointerShape(ptr ptr ptr ptr long long long long ptr long) -@ stdcall EngSetPointerTag(ptr ptr ptr ptr long) -@ stdcall EngSetPrinterData(ptr ptr long ptr long) -@ stdcall EngSort(ptr long long ptr) -@ stdcall EngStretchBlt(ptr ptr ptr ptr ptr long long ptr ptr ptr long) -@ stdcall EngStretchBltROP(ptr ptr ptr ptr ptr long long ptr ptr ptr long ptr long) -@ stdcall EngStrokeAndFillPath(ptr ptr ptr ptr ptr ptr ptr ptr long long) -@ stdcall EngStrokePath(ptr ptr ptr ptr ptr ptr ptr long) -@ stdcall EngTextOut(ptr ptr ptr ptr ptr ptr ptr ptr ptr long) -@ stdcall EngTransparentBlt(ptr ptr ptr ptr ptr ptr long long) -@ stdcall EngUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteN -@ stdcall EngUnloadImage(ptr) -@ stdcall EngUnlockDirectDrawSurface(ptr) -@ stdcall EngUnlockDriverObj(ptr) -@ stdcall EngUnlockSurface(ptr) -@ stdcall EngUnmapEvent(ptr) -@ stdcall EngUnmapFile(ptr) -@ stdcall EngUnmapFontFile(ptr) -@ stdcall EngUnmapFontFileFD(ptr) -@ stdcall EngUnsecureMem(ptr) -@ stdcall EngWaitForSingleObject(ptr ptr) -@ stdcall EngWideCharToMultiByte(long ptr long ptr long) -@ stdcall EngWritePrinter(ptr ptr long ptr) -@ stdcall -arch=i386 FLOATOBJ_Add(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_AddFloat(ptr long) -@ stdcall -arch=i386 FLOATOBJ_AddLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_Div(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_DivFloat(ptr long) -@ stdcall -arch=i386 FLOATOBJ_DivLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_Equal(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_EqualLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_GetFloat(ptr) -@ stdcall -arch=i386 FLOATOBJ_GetLong(ptr) -@ stdcall -arch=i386 FLOATOBJ_GreaterThan(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_GreaterThanLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_LessThan(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_LessThanLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_Mul(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_MulFloat(ptr long) -@ stdcall -arch=i386 FLOATOBJ_MulLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_Neg(ptr) -@ stdcall -arch=i386 FLOATOBJ_SetFloat(ptr long) -@ stdcall -arch=i386 FLOATOBJ_SetLong(ptr long) -@ stdcall -arch=i386 FLOATOBJ_Sub(ptr ptr) -@ stdcall -arch=i386 FLOATOBJ_SubFloat(ptr long) -@ stdcall -arch=i386 FLOATOBJ_SubLong(ptr long) -@ stdcall FONTOBJ_cGetAllGlyphHandles(ptr ptr) -@ stdcall FONTOBJ_cGetGlyphs(ptr long long ptr ptr) -@ stdcall FONTOBJ_pQueryGlyphAttrs(ptr long) -@ stdcall FONTOBJ_pfdg(ptr) -@ stdcall FONTOBJ_pifi(ptr) -@ stdcall FONTOBJ_pjOpenTypeTablePointer(ptr long ptr) -@ stdcall FONTOBJ_pvTrueTypeFontFile(ptr ptr) -@ stdcall FONTOBJ_pwszFontFilePaths(ptr ptr) -@ stdcall FONTOBJ_pxoGetXform(ptr) -@ stdcall FONTOBJ_vGetInfo(ptr long ptr) -@ stdcall HT_ComputeRGBGammaTable(long long long long long ptr) -@ stdcall HT_Get8BPPFormatPalette(ptr long long long) -@ stdcall HT_Get8BPPMaskPalette(ptr long long long long long) -@ stdcall HeapVidMemAllocAligned(ptr long long ptr ptr) -@ stdcall PALOBJ_cGetColors(ptr long long ptr) -@ stdcall PATHOBJ_bCloseFigure(ptr) -@ stdcall PATHOBJ_bEnum(ptr ptr) -@ stdcall PATHOBJ_bEnumClipLines(ptr long ptr) -@ stdcall PATHOBJ_bMoveTo(ptr long long) -@ stdcall PATHOBJ_bPolyBezierTo(ptr ptr long) -@ stdcall PATHOBJ_bPolyLineTo(ptr ptr long) -@ stdcall PATHOBJ_vEnumStart(ptr) -@ stdcall PATHOBJ_vEnumStartClipLines(ptr ptr ptr ptr) -@ stdcall PATHOBJ_vGetBounds(ptr ptr) -@ stdcall RtlAnsiCharToUnicodeChar(ptr) NTOSKRNL.RtlAnsiCharToUnicodeChar -@ stdcall RtlMultiByteToUnicodeN(ptr long ptr ptr long) NTOSKRNL.RtlMultiByteToUnicodeN -@ stdcall RtlRaiseException(ptr) NTOSKRNL.RtlRaiseException -@ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteN -@ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteSize -@ stdcall RtlUnwind(ptr ptr ptr ptr) NTOSKRNL.RtlUnwind -@ stdcall RtlUpcaseUnicodeChar(long) NTOSKRNL.RtlUpcaseUnicodeChar -@ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUpcaseUnicodeToMultiByteN -@ stdcall STROBJ_bEnum(ptr ptr ptr) -@ stdcall STROBJ_bEnumPositionsOnly(ptr ptr ptr) -@ stdcall STROBJ_bGetAdvanceWidths(ptr long long ptr) -@ stdcall STROBJ_dwGetCodePage(ptr) -@ stdcall STROBJ_fxBreakExtra(ptr) -@ stdcall STROBJ_fxCharacterExtra(ptr) -@ stdcall STROBJ_vEnumStart(ptr) -@ stdcall VidMemFree(ptr ptr) -@ stdcall WNDOBJ_bEnum(ptr long ptr) -@ stdcall WNDOBJ_cEnumStart(ptr long long long) -@ stdcall WNDOBJ_vSetConsumer(ptr ptr) -@ stdcall XFORMOBJ_bApplyXform(ptr long long ptr ptr) -@ stdcall XFORMOBJ_iGetFloatObjXform(ptr ptr) -@ stdcall XFORMOBJ_iGetXform(ptr ptr) -@ stdcall XLATEOBJ_cGetPalette(ptr long long ptr) -@ stdcall XLATEOBJ_hGetColorTransform(ptr) -@ stdcall XLATEOBJ_iXlate(ptr long) -@ stdcall XLATEOBJ_piVector(ptr) -@ cdecl _abnormal_termination() NTOSKRNL._abnormal_termination -@ cdecl _except_handler2() NTOSKRNL._except_handler2 -@ cdecl _global_unwind2() NTOSKRNL._global_unwind2 -@ cdecl _itoa() NTOSKRNL._itoa -@ cdecl _itow() NTOSKRNL._itow -@ cdecl _local_unwind2() NTOSKRNL._local_unwind2 Copied: branches/arwinss/reactos/subsystems/win32/win32k/win32k.spec (from r50632, branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.spec [iso-8859-1] Sun Sep 23 20:35:42 2012 @@ -1,10 +1,7 @@ -#include "include/reactos/msvctarget.h" -#undef i386 - -@ stdcall FLOATOBJ_AddFloatObj(ptr ptr) -@ stdcall FLOATOBJ_DivFloatObj(ptr ptr) -@ stdcall FLOATOBJ_MulFloatObj(ptr ptr) -@ stdcall FLOATOBJ_SubFloatObj(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_MulFloatObj(ptr ptr) +@ stdcall -arch=i386 FLOATOBJ_SubFloatObj(ptr ptr) @ stdcall BRUSHOBJ_hGetColorTransform(ptr) @ stdcall BRUSHOBJ_pvAllocRbrush(ptr long) @ stdcall BRUSHOBJ_pvGetRbrush(ptr)

1 0

[fireball] 57371: - Minor compiling fixes. - CMake switch.
by fireball＠svn.reactos.org 23 Sep '12

23 Sep '12

Author: fireball Date: Sun Sep 23 20:32:14 2012 New Revision: 57371 URL: http://svn.reactos.org/svn/reactos?rev=57371&view=rev Log: - Minor compiling fixes. - CMake switch. Added: branches/arwinss/reactos/dll/win32/winent.drv/CMakeLists.txt (with props) Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h Added: branches/arwinss/reactos/dll/win32/winent.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/CMakeLists.txt (added) +++ branches/arwinss/reactos/dll/win32/winent.drv/CMakeLists.txt [iso-8859-1] Sun Sep 23 20:32:14 2012 @@ -1,0 +1,45 @@ + + +add_definitions(-D__WINESRC__) +add_definitions(-D_WINE) + +include_directories( + include + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include + ${REACTOS_SOURCE_DIR}/win32ss/include) + +spec2def(winent.drv winent.drv.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + bitblt.c + clipboard.c + dib.c + event.c + font.c + gdidrv.c + gdiobj.c + graphics.c + main.c + userdrv.c + mouse.c + window.c + ogldrv.c + + winent.rc + ${CMAKE_CURRENT_BINARY_DIR}/winent_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/winent.def) + +add_library(winent SHARED ${SOURCE}) +set_module_type(winent win32dll UNICODE) +set_target_properties(winent PROPERTIES SUFFIX ".drv") + +target_link_libraries(winent + win32ksys + dxguid + wine + ${PSEH_LIB}) + +add_importlibs(winent gdi32 user32 imm32 msvcrt kernel32 ntdll) +#add_pch(winent include/precomp.h) +add_cd_file(TARGET winent DESTINATION reactos/system32 FOR all) Propchange: branches/arwinss/reactos/dll/win32/winent.drv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Sun Sep 23 20:32:14 2012 @@ -30,13 +30,13 @@ #define NTOS_USER_MODE #include <ndk/ntndk.h> #include <winddi.h> -#include <win32k/ntgdityp.h> +#include <ntgdityp.h> #include "wine/rosuser.h" #include "wine/ntrosgdi.h" #include "wine/list.h" #include "wine/unicode.h" #include "wine/server.h" -#include "win32k/ntgdihdl.h" +#include <ntgdihdl.h> #include <pseh/pseh2.h> /* GDI escapes */

1 0

[fireball] 57370: - CMake switch.
by fireball＠svn.reactos.org 23 Sep '12

23 Sep '12

Author: fireball Date: Sun Sep 23 20:31:19 2012 New Revision: 57370 URL: http://svn.reactos.org/svn/reactos?rev=57370&view=rev Log: - CMake switch. Added: branches/arwinss/reactos/dll/win32/gdi32/CMakeLists.txt (with props) Added: branches/arwinss/reactos/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/CMakeLists.txt (added) +++ branches/arwinss/reactos/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Sun Sep 23 20:31:19 2012 @@ -1,0 +1,57 @@ + + +add_definitions(-DLANGPACK) +add_definitions(-D__WINESRC__) +add_definitions(-D_WINE) + +include_directories( + include + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include + ${REACTOS_SOURCE_DIR}/win32ss/include) + +spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + atan2.c + bidi.c + bitblt.c + bitmap.c + brush.c + clipping.c + dc.c + dib.c + driver.c + enhmetafile.c + enhmeta2.c + font.c + freetype.c + gdiobj.c + icm.c + mapping.c + metafile.c + opengl.c + painting.c + palette.c + path.c + pen.c + printdrv.c + region.c + regglue.c + gdi32.rc + ${CMAKE_CURRENT_BINARY_DIR}/gdi32_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/gdi32.def) + +add_library(gdi32 SHARED ${SOURCE}) + +set_module_type(gdi32 win32dll UNICODE) + +target_link_libraries(gdi32 + win32ksys + dxguid + wine + ${PSEH_LIB}) + +add_importlibs(gdi32 user32 freetype usp10 msvcrt kernel32 ntdll) +#add_pch(gdi32 include/precomp.h) +add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all) Propchange: branches/arwinss/reactos/dll/win32/gdi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 57369: - Minor compiling fixes. - CMake switch.
by fireball＠svn.reactos.org 23 Sep '12

23 Sep '12

Author: fireball Date: Sun Sep 23 20:30:27 2012 New Revision: 57369 URL: http://svn.reactos.org/svn/reactos?rev=57369&view=rev Log: - Minor compiling fixes. - CMake switch. Added: branches/arwinss/reactos/dll/win32/user32/CMakeLists.txt (with props) Modified: branches/arwinss/reactos/dll/win32/user32/csr.c branches/arwinss/reactos/dll/win32/user32/desktop.c branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/property.c branches/arwinss/reactos/dll/win32/user32/scroll.c branches/arwinss/reactos/dll/win32/user32/user_private.h Added: branches/arwinss/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/CMakeLists.txt (added) +++ branches/arwinss/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -1,0 +1,90 @@ +add_definitions(-D__WINESRC__ + -D_WINE) + +remove_definitions(-DWINVER=0x502 + -D_WIN32_WINNT=0x502 + -D_WIN32_WINDOWS=0x502 + -D_SETUPAPI_VER=0x502) + +add_definitions(-DWINVER=0x0600 + -D_WIN32_WINNT=0x0600 + -D_WIN32_WINDOWS=0x600 + -D_SETUPAPI_VER=0x600) + +spec2def(user32.dll user32.spec ADD_IMPORTLIB) + +include_directories( + BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/win32ss/include + ) + +set_rc_compiler() + +list(APPEND SOURCE + atom.c + button.c + caret.c + class.c + clipboard.c + combo.c + csr.c + cursoricon.c + dde_client.c + dde_misc.c + dde_server.c + defdlg.c + defwnd.c + desktop.c + dialog.c + driver.c + edit.c + exticon.c + focus.c + hook.c + icontitle.c + input.c + legacy.c + listbox.c + lstr.c + mdi.c + menu.c + message.c + misc.c + msgbox.c + nonclient.c + painting.c + property.c + resource.c + scroll.c + spy.c + static.c + sysparams.c + text.c + uitools.c + user_main.c + win.c + winhelp.c + winpos.c + winproc.c + winstation.c + wsprintf.c + resources/user32.rc + ${CMAKE_CURRENT_BINARY_DIR}/user32_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/user32.def) + +add_library(user32 SHARED ${SOURCE}) +set_module_type(user32 win32dll UNICODE) + +target_link_libraries(user32 + user32_wsprintf + wine + win32ksys + ${PSEH_LIB}) + +add_delay_importlibs(user32 imm32 usp10) +add_importlibs(user32 gdi32 advapi32 version msvcrt kernel32 ntdll) +add_pch(user32 include/user32.h) +add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) + Propchange: branches/arwinss/reactos/dll/win32/user32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/dll/win32/user32/csr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/csr.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/csr.c [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -92,7 +92,7 @@ NTSTATUS Status; CsrRequest = MAKE_CSR_API(REGISTER_LOGON_PROCESS, CSR_GUI); - Request.Data.RegisterLogonProcessRequest.ProcessId = dwProcessId; + Request.Data.RegisterLogonProcessRequest.ProcessId = (HANDLE)dwProcessId; Request.Data.RegisterLogonProcessRequest.Register = bRegister; Status = CsrClientCallServer(&Request, Modified: branches/arwinss/reactos/dll/win32/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/desktop.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/desktop.c [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winnls.h" #include "controls.h" +#include "user_private.h" static HBRUSH hbrushPattern; static HBITMAP hbitmapWallPaper; Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -426,7 +426,7 @@ */ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPCRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); + return USER_Driver->pEnumDisplayMonitors( hdc, (LPRECT)rect, proc, lp ); } /*********************************************************************** Modified: branches/arwinss/reactos/dll/win32/user32/property.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -29,6 +29,7 @@ #include "winuser.h" #include "wine/unicode.h" #include "winternl.h" +#include "user_private.h" #include "wine/server.h" /* size of buffer needed to store an atom string */ Modified: branches/arwinss/reactos/dll/win32/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/scroll.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/scroll.c [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -1529,7 +1529,7 @@ case WM_SETCURSOR: if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEGRIP) { - ULONG_PTR cursor = (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) ? IDC_SIZENESW : IDC_SIZENWSE; + ULONG_PTR cursor = (ULONG_PTR)((GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) ? IDC_SIZENESW : IDC_SIZENWSE); return (LRESULT)SetCursor( LoadCursorA( 0, (LPSTR)cursor )); } return DefWindowProcW( hwnd, message, wParam, lParam ); Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -36,6 +36,10 @@ #ifndef __REACTOS__ #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313 +#else +// Hack to silence IDC_ARROW cast errors +#undef MAKEINTRESOURCE +#define MAKEINTRESOURCE(i) ((ULONG_PTR)((WORD)(i))) #endif /* internal messages codes */

1 0

[mnordell] 57368: Added descriptive DPRINT for an ioctl intended for the mount manager. Hopefully helps someone else trying to find that device 0x4d or 77 is, when no such device exists. It's not d...
by mnordell＠svn.reactos.org 23 Sep '12

23 Sep '12

Author: mnordell Date: Sun Sep 23 05:38:35 2012 New Revision: 57368 URL: http://svn.reactos.org/svn/reactos?rev=57368&view=rev Log: Added descriptive DPRINT for an ioctl intended for the mount manager. Hopefully helps someone else trying to find that device 0x4d or 77 is, when no such device exists. It's not defined by value in header file but by ASCII 'M'. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sun Sep 23 05:38:35 2012 @@ -2870,7 +2870,11 @@ break; default: - DPRINT1(" unknown ioctl code: 0x%lX\n", Stack->Parameters.DeviceIoControl.IoControlCode); + if ('M' == (Stack->Parameters.DeviceIoControl.IoControlCode >> 16)) { + DPRINT1(" got ioctl intended for the mount manager: 0x%lX\n", Stack->Parameters.DeviceIoControl.IoControlCode); + } else { + DPRINT1(" unknown ioctl code: 0x%lX\n", Stack->Parameters.DeviceIoControl.IoControlCode); + } Status = STATUS_NOT_IMPLEMENTED; break; }

1 0

[tkreuzer] 57367: [WIN32K] Unmap the desktop heap in IntFreeDesktopHeap. Fixes leaking session space memory, when creating and deleting desktops. I would revert the "hackfix" from r57348, but for m...
by tkreuzer＠svn.reactos.org 22 Sep '12

22 Sep '12

Author: tkreuzer Date: Sat Sep 22 23:14:16 2012 New Revision: 57367 URL: http://svn.reactos.org/svn/reactos?rev=57367&view=rev Log: [WIN32K] Unmap the desktop heap in IntFreeDesktopHeap. Fixes leaking session space memory, when creating and deleting desktops. I would revert the "hackfix" from r57348, but for me changing MiPteToAddress to MiAddressToPte looks more like a legit bug fix, rather than "increasing system view space to 36MB instead of 20MB". But I'm probably missing something. In that case, Alex, please revert your hack, it shouldn't be needed anymore. CORE-6688 #resolve Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sat Sep 22 23:14:16 2012 @@ -554,7 +554,7 @@ ULONG Value; //ERR("DesktopWindowProc\n"); - *lResult = 0; + *lResult = 0; switch (Msg) { @@ -596,7 +596,7 @@ case WM_SYSCOLORCHANGE: co_UserRedrawWindow(Wnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN); return TRUE; - } + } return FALSE; // Not processed so go with callback. } @@ -813,6 +813,12 @@ static VOID IntFreeDesktopHeap(IN OUT PDESKTOP Desktop) { + if (Desktop->pheapDesktop != NULL) + { + MmUnmapViewInSessionSpace(Desktop->pheapDesktop); + Desktop->pheapDesktop = NULL; + } + if (Desktop->hsectionDesktop != NULL) { ObDereferenceObject(Desktop->hsectionDesktop);

1 0

[fireball] 57366: [WIN32CSR] - Re-enable delay-importing of user32, gdi32 and advapi32 as it was before in the RBuild times.
by fireball＠svn.reactos.org 22 Sep '12

22 Sep '12

Author: fireball Date: Sat Sep 22 13:31:18 2012 New Revision: 57366 URL: http://svn.reactos.org/svn/reactos?rev=57366&view=rev Log: [WIN32CSR] - Re-enable delay-importing of user32,gdi32 and advapi32 as it was before in the RBuild times. Modified: trunk/reactos/win32ss/user/win32csr/CMakeLists.txt Modified: trunk/reactos/win32ss/user/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/CMak… ============================================================================== --- trunk/reactos/win32ss/user/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/CMakeLists.txt [iso-8859-1] Sat Sep 22 13:31:18 2012 @@ -36,7 +36,8 @@ set_module_type(win32csr win32dll) -add_importlibs(win32csr user32 gdi32 advapi32 psapi msvcrt kernel32 ntdll csrsrv) +add_importlibs(win32csr psapi msvcrt kernel32 ntdll csrsrv) +add_delay_importlibs(win32csr user32 gdi32 advapi32) add_pch(win32csr w32csr.h)

1 0

[tfaber] 57365: [RPCRT4] - Fix overlapped I/O error handling for pipe transport - ROS now works with Windows npfs.sys again (CORE-2198) - Wine has this completely reworked, so this ros-diff should ...
by tfaber＠svn.reactos.org 22 Sep '12

22 Sep '12

Author: tfaber Date: Sat Sep 22 12:47:03 2012 New Revision: 57365 URL: http://svn.reactos.org/svn/reactos?rev=57365&view=rev Log: [RPCRT4] - Fix overlapped I/O error handling for pipe transport - ROS now works with Windows npfs.sys again (CORE-2198) - Wine has this completely reworked, so this ros-diff should finally disappear with the next sync Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Sat Sep 22 12:47:03 2012 @@ -438,10 +438,11 @@ { DWORD bytes_read; ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &ovl); - if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) - break; - ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_read, TRUE); - if (!ret && (GetLastError() != ERROR_MORE_DATA)) + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_read, TRUE); + if (!ret && GetLastError() == ERROR_MORE_DATA) + ret = TRUE; + if (!ret || !bytes_read) break; bytes_left -= bytes_read; buf += bytes_read; @@ -458,7 +459,7 @@ BOOL ret = TRUE; unsigned int bytes_left = count; OVERLAPPED ovl; - + ZeroMemory(&ovl, sizeof(ovl)); ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); @@ -466,10 +467,9 @@ { DWORD bytes_written; ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &ovl); - if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) - break; - ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_written, TRUE); - if (!ret && (GetLastError() != ERROR_MORE_DATA)) + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_written, TRUE); + if (!ret || !bytes_written) break; bytes_left -= bytes_written; buf += bytes_written; Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ro… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] Sat Sep 22 12:47:03 2012 @@ -127,7 +127,7 @@ I_RpcFree(pname); return r; -@@ -412,18 +429,24 @@ static int rpcrt4_conn_np_read(RpcConnec +@@ -412,11 +429,17 @@ static int rpcrt4_conn_np_read(RpcConnec char *buf = buffer; BOOL ret = TRUE; unsigned int bytes_left = count; @@ -140,15 +140,13 @@ { DWORD bytes_read; - ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); -- if (!ret && GetLastError() == ERROR_MORE_DATA) -- ret = TRUE; -- if (!ret || !bytes_read) + ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &ovl); -+ if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) -+ break; -+ ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_read, TRUE); -+ if (!ret && (GetLastError() != ERROR_MORE_DATA)) - break; ++ if (!ret && GetLastError() == ERROR_IO_PENDING) ++ ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_read, TRUE); + if (!ret && GetLastError() == ERROR_MORE_DATA) + ret = TRUE; + if (!ret || !bytes_read) +@@ -424,6 +447,7 @@ static int rpcrt4_conn_np_read(RpcConnec bytes_left -= bytes_read; buf += bytes_read; } @@ -156,12 +154,12 @@ return ret ? count : -1; } -@@ -434,16 +457,24 @@ static int rpcrt4_conn_np_write(RpcConne +@@ -434,16 +458,23 @@ static int rpcrt4_conn_np_write(RpcConne const char *buf = buffer; BOOL ret = TRUE; unsigned int bytes_left = count; + OVERLAPPED ovl; -+ ++ + ZeroMemory(&ovl, sizeof(ovl)); + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); @@ -169,12 +167,10 @@ { DWORD bytes_written; - ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, NULL); -- if (!ret || !bytes_written) + ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &ovl); -+ if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) -+ break; -+ ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_written, TRUE); -+ if (!ret && (GetLastError() != ERROR_MORE_DATA)) ++ if (!ret && GetLastError() == ERROR_IO_PENDING) ++ ret = GetOverlappedResult(npc->pipe, &ovl, &bytes_written, TRUE); + if (!ret || !bytes_written) break; bytes_left -= bytes_written; buf += bytes_written;

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