Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[akhaldi] 62838: [SHELL32_WINETEST] * Sync with Wine 1.7.17. * Speedup build. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 20 13:19:24 2014 New Revision: 62838 URL: http://svn.reactos.org/svn/reactos?rev=62838&view=rev Log: [SHELL32_WINETEST] * Sync with Wine 1.7.17. * Speedup build. CORE-8080 Modified: trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/shell32/appbar.c trunk/rostests/winetests/shell32/assoc.c trunk/rostests/winetests/shell32/autocomplete.c trunk/rostests/winetests/shell32/brsfolder.c trunk/rostests/winetests/shell32/ebrowser.c trunk/rostests/winetests/shell32/msg.h trunk/rostests/winetests/shell32/progman_dde.c trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellole.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/string.c trunk/rostests/winetests/shell32/systray.c trunk/rostests/winetests/shell32/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLi… Modified: trunk/rostests/winetests/shell32/appbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/appbar.… Modified: trunk/rostests/winetests/shell32/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/assoc.c… Modified: trunk/rostests/winetests/shell32/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/autocom… Modified: trunk/rostests/winetests/shell32/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/brsfold… Modified: trunk/rostests/winetests/shell32/ebrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/ebrowse… Modified: trunk/rostests/winetests/shell32/msg.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/msg.h?r… Modified: trunk/rostests/winetests/shell32/progman_dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/progman… Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… Modified: trunk/rostests/winetests/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellol… Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… Modified: trunk/rostests/winetests/shell32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/string.… Modified: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray… Modified: trunk/rostests/winetests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlis…

10 years, 5 months

[akhaldi] 62837: [MSVCRT_WINETEST] * Fix *nix build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 20 13:14:11 2014 New Revision: 62837 URL: http://svn.reactos.org/svn/reactos?rev=62837&view=rev Log: [MSVCRT_WINETEST] * Fix *nix build. Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Sun Apr 20 13:14:11 2014 @@ -1,5 +1,7 @@ -add_definitions(-D__msvcrt_ulong=ULONG) +add_definitions( + -D_CRT_NONSTDC_NO_DEPRECATE + -D__msvcrt_ulong=ULONG) list(APPEND SOURCE cpp.c

10 years, 5 months

[akhaldi] 62836: [MSVCRT_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 20 13:10:24 2014 New Revision: 62836 URL: http://svn.reactos.org/svn/reactos?rev=62836&view=rev Log: [MSVCRT_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Removed: trunk/rostests/winetests/msvcrt/msvcrt_test.dsp Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt trunk/rostests/winetests/msvcrt/cpp.c trunk/rostests/winetests/msvcrt/data.c trunk/rostests/winetests/msvcrt/dir.c trunk/rostests/winetests/msvcrt/file.c trunk/rostests/winetests/msvcrt/heap.c trunk/rostests/winetests/msvcrt/locale.c trunk/rostests/winetests/msvcrt/misc.c trunk/rostests/winetests/msvcrt/printf.c trunk/rostests/winetests/msvcrt/scanf.c trunk/rostests/winetests/msvcrt/signal.c trunk/rostests/winetests/msvcrt/string.c trunk/rostests/winetests/msvcrt/testlist.c trunk/rostests/winetests/msvcrt/time.c Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -1,8 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_CRT_NONSTDC_NO_DEPRECATE - -D__msvcrt_ulong=ULONG) +add_definitions(-D__msvcrt_ulong=ULONG) list(APPEND SOURCE cpp.c @@ -23,12 +20,14 @@ add_executable(msvcrt_winetest ${SOURCE}) +set_module_type(msvcrt_winetest win32cui) +add_importlibs(msvcrt_winetest msvcrt kernel32) + if(MSVC) target_link_libraries(msvcrt_winetest oldnames) + add_importlibs(msvcrt_winetest ntdll) else() add_target_compile_flags(msvcrt_winetest "-Wno-format") endif() -set_module_type(msvcrt_winetest win32cui) -add_importlibs(msvcrt_winetest msvcrt kernel32 ntdll) add_cd_file(TARGET msvcrt_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/cpp.c?re… ============================================================================== --- trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -238,6 +238,55 @@ } else { +#ifdef __arm__ + SETNOFAIL(poperator_new, "??_U@YAPAXI@Z"); + SETNOFAIL(poperator_delete, "??_V@YAXPAX@Z"); + + SET(pexception_ctor, "??0exception@std@@QAA@ABQBD@Z"); + SET(pexception_copy_ctor, "??0exception@std@@QAA@ABV01@@Z"); + SET(pexception_default_ctor, "??0exception@std@@QAA@XZ"); + SET(pexception_dtor, "??1exception@std@@UAA@XZ"); + SET(pexception_opequals, "??4exception@std@@QAAAAV01@ABV01@@Z"); + SET(pexception_what, "?what@exception@std@@UBAPBDXZ"); + SET(pexception_vector_dtor, "??_Eexception@@UAEPAXI@Z");/**/ + SET(pexception_scalar_dtor, "??_Gexception@@UAEPAXI@Z");/**/ + + SET(pbad_typeid_ctor, "??0bad_typeid@std@@QAA@PBD@Z"); + SETNOFAIL(pbad_typeid_ctor_closure, "??_Fbad_typeid@std@@QAAXXZ"); + SET(pbad_typeid_copy_ctor, "??0bad_typeid@std@@QAA@ABV01@@Z"); + SET(pbad_typeid_dtor, "??1bad_typeid@std@@UAA@XZ"); + SET(pbad_typeid_opequals, "??4bad_typeid@std@@QAAAAV01@ABV01@@Z"); + SET(pbad_typeid_what, "?what@exception@std@@UBAPBDXZ"); + SET(pbad_typeid_vector_dtor, "??_Ebad_cast@@UAEPAXI@Z"); + SET(pbad_typeid_scalar_dtor, "??_Gbad_cast@@UAEPAXI@Z"); + + SETNOFAIL(pbad_cast_ctor, "??0bad_cast@@QAE@ABQBD@Z"); + if (!pbad_cast_ctor) + SET(pbad_cast_ctor, "??0bad_cast@std@@AAA@PBQBD@Z"); + SETNOFAIL(pbad_cast_ctor2, "??0bad_cast@std@@QAA@PBD@Z"); + SETNOFAIL(pbad_cast_ctor_closure, "??_Fbad_cast@std@@QAAXXZ"); + /* FIXME: No ARM equivalent for "??0bad_cast@@QAE@ABV0@@Z" */ + SET(pbad_cast_dtor, "??1bad_cast@std@@UAA@XZ"); + SET(pbad_cast_opequals, "??4bad_cast@std@@QAAAAV01@ABV01@@Z"); + SET(pbad_cast_what, "?what@exception@std@@UBAPBDXZ"); + SET(pbad_cast_vector_dtor, "??_Ebad_cast@@UAEPAXI@Z"); + SET(pbad_cast_scalar_dtor, "??_Gbad_cast@@UAEPAXI@Z"); + + SET(p__non_rtti_object_ctor, "??0__non_rtti_object@std@@QAA@PBD@Z"); + SET(p__non_rtti_object_copy_ctor, "??0__non_rtti_object@std@@QAA@ABV01@@Z"); + SET(p__non_rtti_object_dtor, "??1__non_rtti_object@std@@UAA@XZ"); + SET(p__non_rtti_object_opequals, "??4__non_rtti_object@std@@QAAAAV01@ABV01@@Z"); + SET(p__non_rtti_object_what, "?what@exception@std@@UBAPBDXZ"); + SET(p__non_rtti_object_vector_dtor, "??_E__non_rtti_object@@UAEPAXI@Z"); + SET(p__non_rtti_object_scalar_dtor, "??_G__non_rtti_object@@UAEPAXI@Z"); + + SET(ptype_info_dtor, "??1type_info@@UAA@XZ"); + SET(ptype_info_raw_name, "?raw_name@type_info@@QBAPBDXZ"); + SET(ptype_info_name, "?name@type_info@@QBEPBDXZ"); + SET(ptype_info_before, "?before@type_info@@QBA_NABV1@@Z"); + SET(ptype_info_opequals_equals, "??8type_info@@QBA_NABV0@@Z"); + SET(ptype_info_opnot_equals, "??9type_info@@QBA_NABV0@@Z"); +#else SETNOFAIL(poperator_new, "??_U@YAPAXI@Z"); SETNOFAIL(poperator_delete, "??_V@YAXPAX@Z"); @@ -285,6 +334,7 @@ SET(ptype_info_before, "?before@type_info@@QBEHABV1@@Z"); SET(ptype_info_opequals_equals, "??8type_info@@QBEHABV0@@Z"); SET(ptype_info_opnot_equals, "??9type_info@@QBEHABV0@@Z"); +#endif /* __arm__ */ } if (!poperator_new) @@ -901,6 +951,12 @@ { {RTTI_REF(child_class_rtti, base_descriptor[0]), RTTI_REF(child_class_rtti, base_descriptor[1])} }, {0, 0, 2, RTTI_REF(child_class_rtti, base_array)}, {1, 0, 0, RTTI_REF(child_class_rtti, type_info[1]), RTTI_REF(child_class_rtti, object_hierarchy), RTTI_REF(child_class_rtti, object_locator)} + }, virtual_base_class_rtti = { + { {NULL, NULL, "simple_class"}, {NULL, NULL, "child_class"} }, + { {RTTI_REF(virtual_base_class_rtti, type_info[1]), 0, {0x10, sizeof(void*), sizeof(int)}, 0}, {RTTI_REF(virtual_base_class_rtti, type_info[0]), 0, {8, -1, 0}, 0} }, + { {RTTI_REF(virtual_base_class_rtti, base_descriptor[0]), RTTI_REF(virtual_base_class_rtti, base_descriptor[1])} }, + {0, 0, 2, RTTI_REF(virtual_base_class_rtti, base_array)}, + {1, 0, 0, RTTI_REF(virtual_base_class_rtti, type_info[1]), RTTI_REF(virtual_base_class_rtti, object_hierarchy), RTTI_REF(virtual_base_class_rtti, object_locator)} }; static struct rtti_data simple_class_sig0_rtti, child_class_sig0_rtti; @@ -912,6 +968,9 @@ void *simple_class_sig0 = &simple_class_sig0_vtbl[1]; void *child_class_sig0_vtbl[2] = {&child_class_sig0_rtti.object_locator}; void *child_class_sig0 = &child_class_sig0_vtbl[1]; + void *virtual_base_class_vtbl[2] = {&virtual_base_class_rtti.object_locator}; + int virtual_base_class_vbtbl[2] = {0, 0x100}; + void *virtual_base_class[2] = {&virtual_base_class_vtbl[1], virtual_base_class_vbtbl}; static const char* e_name = "name"; type_info *ti,*bti; @@ -958,7 +1017,7 @@ call_func1(pexception_dtor, &e); call_func1(pbad_typeid_dtor, &b); - memcpy(&simple_class_sig0_rtti, &simple_class_rtti, sizeof(struct rtti_data)); + simple_class_sig0_rtti = simple_class_rtti; simple_class_sig0_rtti.object_locator.signature = 0; simple_class_sig0_rtti.base_descriptor[0].type_descriptor = RTTI_REF_SIG0(simple_class_sig0_rtti, type_info[0], base); simple_class_sig0_rtti.base_array.bases[0] = RTTI_REF_SIG0(simple_class_sig0_rtti, base_descriptor[0], base); @@ -966,7 +1025,7 @@ simple_class_sig0_rtti.object_locator.type_descriptor = RTTI_REF_SIG0(simple_class_sig0_rtti, type_info[0], base); simple_class_sig0_rtti.object_locator.type_hierarchy = RTTI_REF_SIG0(simple_class_sig0_rtti, object_hierarchy, base); - memcpy(&child_class_sig0_rtti, &child_class_rtti, sizeof(struct rtti_data)); + child_class_sig0_rtti = child_class_rtti; child_class_sig0_rtti.object_locator.signature = 0; child_class_sig0_rtti.base_descriptor[0].type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[1], base); child_class_sig0_rtti.base_descriptor[1].type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[0], base); @@ -1026,6 +1085,9 @@ casted = p__RTDynamicCast(&child_class, 0, &child_class_rtti.type_info[0], &child_class_rtti.type_info[1], 0); ok(casted == (char*)&child_class+4, "failed cast to child class (%p %p)\n", casted, &child_class); + + casted = p__RTDynamicCast(&virtual_base_class, 0, &virtual_base_class_rtti.type_info[0], &virtual_base_class_rtti.type_info[1], 0); + ok(casted == (char*)&virtual_base_class+0x110+sizeof(void*), "failed cast to child class (%p %p)\n", casted, &virtual_base_class); } struct _demangle { @@ -1247,7 +1309,20 @@ /* 122 */ {"?_R2@?BN@???$_Fabs@N@std@@YANAEBV?$complex@N@1@PEAH@Z@4NB", "double const `double __cdecl std::_Fabs<double>(class std::complex<double> const & __ptr64,int * __ptr64)'::`29'::_R2", "?_R2@?BN@???$_Fabs@N@std@@YANAEBV?$complex@N@1@PEAH@Z@4NB"}, - +/* 123 */ {"?vtordisp_thunk@std@@$4PPPPPPPM@3EAA_NXZ", + "[thunk]:public: virtual bool __cdecl std::vtordisp_thunk`vtordisp{4294967292,4}' (void) __ptr64", + "[thunk]:public: virtual bool __cdecl std::vtordisp_thunk`vtordisp{-4,4}' (void) __ptr64"}, +/* 124 */ {"??_9CView@@$BBII@AE", + "[thunk]: __thiscall CView::`vcall'{392,{flat}}' }'", + "[thunk]: __thiscall CView::`vcall'{392,{flat}}' "}, +/* 125 */ {"?_dispatch@_impl_Engine@SalomeApp@@$R4CE@BA@PPPPPPPM@7AE_NAAVomniCallHandle@@@Z", + "[thunk]:public: virtual bool __thiscall SalomeApp::_impl_Engine::_dispatch`vtordispex{36,16,4294967292,8}' (class omniCallHandle &)", + "?_dispatch@_impl_Engine@SalomeApp@@$R4CE@BA@PPPPPPPM@7AE_NAAVomniCallHandle@@@Z"}, +/* 126 */ {"?_Doraise@bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)", NULL, 0x60}, +/* 127 */ {"??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", "class std::complex<float> & ptr64 cdecl std::operator*=(class std::complex<float> & ptr64,class std::complex<float> const & ptr64)", NULL, 1}, +/* 128 */ {"??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", + "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", + "??Xstd@@YAAEAV?$complex@M@0@AEAV10@AEBV10@@Z", 2}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; Modified: trunk/rostests/winetests/msvcrt/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/data.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/data.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/data.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -30,6 +30,11 @@ #include <winnls.h> #include <process.h> #include <errno.h> +#include <direct.h> + +void __cdecl __getmainargs(int *, char ***, char ***, int, int *); +static int* (__cdecl *p___p___argc)(void); +static char*** (__cdecl *p___p___argv)(void); typedef void (__cdecl *_INITTERMFUN)(void); static void (__cdecl *p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); @@ -71,7 +76,7 @@ static void test_initvar( HMODULE hmsvcrt ) { - OSVERSIONINFO osvi = { sizeof(OSVERSIONINFO) }; + OSVERSIONINFOA osvi = { sizeof(OSVERSIONINFOA) }; int *pp_winver = (int*)GetProcAddress(hmsvcrt, "_winver"); int *pp_winmajor = (int*)GetProcAddress(hmsvcrt, "_winmajor"); int *pp_winminor = (int*)GetProcAddress(hmsvcrt, "_winminor"); @@ -86,7 +91,7 @@ winver = *pp_winver; winminor = *pp_winminor; winmajor = *pp_winmajor; - GetVersionEx( &osvi); + GetVersionExA( &osvi); ok( winminor == osvi.dwMinorVersion, "Wrong value for _winminor %02x expected %02x\n", winminor, osvi.dwMinorVersion); ok( winmajor == osvi.dwMajorVersion, "Wrong value for _winmajor %02x expected %02x\n", @@ -124,9 +129,110 @@ ok( pgm != NULL, "_get_pgmptr returned a NULL pointer\n" ); } +static void test___getmainargs(void) +{ + int argc, new_argc, mode; + char **argv, **new_argv, **envp; + char tmppath[MAX_PATH], filepath[MAX_PATH]; + FILE *f; + + ok(GetTempPathA(MAX_PATH, tmppath) != 0, "GetTempPath failed\n"); + + mode = 0; + __getmainargs(&argc, &argv, &envp, 0, &mode); + ok(argc == 4, "argc = %d\n", argc); + ok(!strcmp(argv[1], "data"), "argv[1] = %s\n", argv[1]); + sprintf(filepath, "%s*\\*", tmppath); + ok(!strcmp(argv[2], filepath), "argv[2] = %s\n", argv[2]); + sprintf(filepath, "%swine_test/*", tmppath); + ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); + ok(!argv[4], "argv[4] != NULL\n"); + + if(p___p___argc && p___p___argv) { + new_argc = *p___p___argc(); + new_argv = *p___p___argv(); + ok(new_argc == 4, "*__p___argc() = %d\n", new_argc); + ok(new_argv == argv, "*__p___argv() = %p, epxected %p\n", new_argv, argv); + }else { + win_skip("__p___argc or __p___argv is not available\n"); + } + + mode = 0; + __getmainargs(&argc, &argv, &envp, 1, &mode); + ok(argc == 5, "argc = %d\n", argc); + ok(!strcmp(argv[1], "data"), "argv[1] = %s\n", argv[1]); + sprintf(filepath, "%s*\\*", tmppath); + ok(!strcmp(argv[2], filepath), "argv[2] = %s\n", argv[2]); + sprintf(filepath, "%swine_test/a", tmppath); + if(argv[3][strlen(argv[3])-1] == 'a') { + ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); + sprintf(filepath, "%swine_test/test", tmppath); + ok(!strcmp(argv[4], filepath), "argv[4] = %s\n", argv[4]); + }else { + ok(!strcmp(argv[4], filepath), "argv[4] = %s\n", argv[4]); + sprintf(filepath, "%swine_test/test", tmppath); + ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); + } + ok(!argv[5], "argv[5] != NULL\n"); + + if(p___p___argc && p___p___argv) { + new_argc = *p___p___argc(); + new_argv = *p___p___argv(); + ok(new_argc == argc, "*__p___argc() = %d, expected %d\n", new_argc, argc); + ok(new_argv == argv, "*__p___argv() = %p, epxected %p\n", new_argv, argv); + } + + sprintf(filepath, "%swine_test/b", tmppath); + f = fopen(filepath, "w"); + ok(f != NULL, "fopen(%s) failed: %d\n", filepath, errno); + fclose(f); + mode = 0; + __getmainargs(&new_argc, &new_argv, &envp, 1, &mode); + ok(new_argc == argc+1, "new_argc = %d, expected %d\n", new_argc, argc+1); + _unlink(filepath); +} + +static void test___getmainargs_parent(char *name) +{ + char cmdline[3*MAX_PATH]; + char tmppath[MAX_PATH], filepath[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION proc; + FILE *f; + int ret; + + ok(GetTempPathA(MAX_PATH, tmppath) != 0, "GetTempPath failed\n"); + sprintf(cmdline, "%s data %s*\\* %swine_test/*", name, tmppath, tmppath); + + sprintf(filepath, "%swine_test", tmppath); + ret = _mkdir(filepath); + ok(!ret, "_mkdir failed: %d\n", errno); + sprintf(filepath, "%swine_test\\a", tmppath); + f = fopen(filepath, "w"); + ok(f != NULL, "fopen(%s) failed: %d\n", filepath, errno); + fclose(f); + sprintf(filepath, "%swine_test\\test", tmppath); + f = fopen(filepath, "w"); + ok(f != NULL, "fopen(%s) failed: %d\n", filepath, errno); + fclose(f); + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &proc); + winetest_wait_child_process(proc.hProcess); + + _unlink(filepath); + sprintf(filepath, "%swine_test\\a", tmppath); + _unlink(filepath); + sprintf(filepath, "%swine_test", tmppath); + _rmdir(filepath); +} + START_TEST(data) { HMODULE hmsvcrt; + int arg_c; + char** arg_v; hmsvcrt = GetModuleHandleA("msvcrt.dll"); if (!hmsvcrt) @@ -135,8 +241,18 @@ { p_initterm=(void*)GetProcAddress(hmsvcrt, "_initterm"); p_get_pgmptr=(void*)GetProcAddress(hmsvcrt, "_get_pgmptr"); - } + p___p___argc=(void*)GetProcAddress(hmsvcrt, "__p___argc"); + p___p___argv=(void*)GetProcAddress(hmsvcrt, "__p___argv"); + } + + arg_c = winetest_get_mainargs(&arg_v); + if(arg_c >= 3) { + test___getmainargs(); + return; + } + test_initterm(); test_initvar(hmsvcrt); test_get_pgmptr(); -} + test___getmainargs_parent(arg_v[0]); +} Modified: trunk/rostests/winetests/msvcrt/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/dir.c?re… ============================================================================== --- trunk/rostests/winetests/msvcrt/dir.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/dir.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -25,6 +25,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <io.h> +#include <mbctype.h> #include <windef.h> #include <winbase.h> #include <winnls.h> @@ -345,28 +346,28 @@ BOOL rc,free1,free2; free1=free2=TRUE; - GetCurrentDirectory(MAX_PATH, prevpath); - GetTempPath(MAX_PATH,tmppath); + GetCurrentDirectoryA(MAX_PATH, prevpath); + GetTempPathA(MAX_PATH,tmppath); strcpy(level1,tmppath); strcat(level1,"msvcrt-test\\"); - rc = CreateDirectory(level1,NULL); + rc = CreateDirectoryA(level1,NULL); if (!rc && GetLastError()==ERROR_ALREADY_EXISTS) free1=FALSE; strcpy(level2,level1); strcat(level2,"nextlevel\\"); - rc = CreateDirectory(level2,NULL); + rc = CreateDirectoryA(level2,NULL); if (!rc && GetLastError()==ERROR_ALREADY_EXISTS) free2=FALSE; - SetCurrentDirectory(level2); + SetCurrentDirectoryA(level2); ok(_fullpath(full,"test", MAX_PATH)!=NULL,"_fullpath failed\n"); strcpy(teststring,level2); strcat(teststring,"test"); ok(strcmp(full,teststring)==0,"Invalid Path returned %s\n",full); ok(_fullpath(full,"\\test", MAX_PATH)!=NULL,"_fullpath failed\n"); - strncpy(teststring,level2,3); + memcpy(teststring,level2,3); teststring[3]=0; strcat(teststring,"test"); ok(strcmp(full,teststring)==0,"Invalid Path returned %s\n",full); @@ -383,11 +384,36 @@ ok(strcmp(freeme,teststring)==0,"Invalid Path returned %s\n",freeme); free(freeme); - SetCurrentDirectory(prevpath); + SetCurrentDirectoryA(prevpath); if (free2) - RemoveDirectory(level2); + RemoveDirectoryA(level2); if (free1) - RemoveDirectory(level1); + RemoveDirectoryA(level1); +} + +static void test_splitpath(void) +{ + const char* path = "c:\\\x83\x5c\x83\x74\x83\x67.bin"; + char drive[3], dir[MAX_PATH], fname[MAX_PATH], ext[MAX_PATH]; + int prev_cp = _getmbcp(); + + /* SBCS codepage */ + _setmbcp(1252); + _splitpath(path, drive, dir, fname, ext); + ok(!strcmp(drive, "c:"), "got %s\n", drive); + ok(!strcmp(dir, "\\\x83\x5c"), "got %s\n", dir); + ok(!strcmp(fname, "\x83\x74\x83\x67"), "got %s\n", fname); + ok(!strcmp(ext, ".bin"), "got %s\n", ext); + + /* MBCS (Japanese) codepage */ + _setmbcp(932); + _splitpath(path, drive, dir, fname, ext); + ok(!strcmp(drive, "c:"), "got %s\n", drive); + ok(!strcmp(dir, "\\"), "got %s\n", dir); + ok(!strcmp(fname, "\x83\x5c\x83\x74\x83\x67"), "got %s\n", fname); + ok(!strcmp(ext, ".bin"), "got %s\n", ext); + + _setmbcp(prev_cp); } START_TEST(dir) @@ -397,4 +423,5 @@ test_fullpath(); test_makepath(); test_makepath_s(); -} + test_splitpath(); +} Modified: trunk/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/file.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/file.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -33,18 +33,44 @@ #include <winnls.h> #include <process.h> #include <errno.h> +#include <locale.h> + +#define MSVCRT_FD_BLOCK_SIZE 32 +typedef struct { + HANDLE handle; + unsigned char wxflag; + char lookahead[3]; + int exflag; + CRITICAL_SECTION crit; +} ioinfo; +static ioinfo **__pioinfo; static HANDLE proc_handles[2]; static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); static int (__cdecl *p__wfopen_s)(FILE**, const wchar_t*, const wchar_t*); +static const char* get_base_name(const char *path) +{ + const char *ret = path+strlen(path)-1; + + while(ret >= path) { + if(*ret=='\\' || *ret=='/') + break; + ret--; + } + return ret+1; +} + static void init(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + + setlocale(LC_CTYPE, "C"); p_fopen_s = (void*)GetProcAddress(hmod, "fopen_s"); p__wfopen_s = (void*)GetProcAddress(hmod, "_wfopen_s"); + __pioinfo = (void*)GetProcAddress(hmod, "__pioinfo"); } static void test_filbuf( void ) @@ -443,11 +469,11 @@ FILE* f; size_t bytesWritten; size_t bytesRead; - WIN32_FIND_DATA findData; + WIN32_FIND_DATAA findData; HANDLE h; - GetTempPath (MAX_PATH, temppath); - GetTempFileName (temppath, "", 0, tempfile); + GetTempPathA(MAX_PATH, temppath); + GetTempFileNameA(temppath, "", 0, tempfile); f = fopen(tempfile, "w+bDT"); bytesWritten = fwrite(DATA, 1, sizeof(DATA), f); @@ -458,7 +484,7 @@ ok (bytesRead == bytesWritten && bytesRead == sizeof(DATA), "fopen file mode 'T' wrongly interpreted as 't'\n" ); - h = FindFirstFile(tempfile, &findData); + h = FindFirstFileA(tempfile, &findData); ok (h == INVALID_HANDLE_VALUE, "file wasn't deleted when closed.\n" ); @@ -708,7 +734,7 @@ ok(l==BUFSIZ-2, "ftell expected %d got %d\n", BUFSIZ-2, l); fgetws(wtextW,LLEN,tempfh); l=ftell(tempfh); - ok(l==BUFSIZ-2+strlen(mytext), "ftell expected %d got %d\n", BUFSIZ-2+lstrlen(mytext), l); + ok(l==BUFSIZ-2+strlen(mytext), "ftell expected %d got %d\n", BUFSIZ-2+lstrlenA(mytext), l); mytextW = AtoW (mytext); aptr = mytextW; wptr = wtextW; @@ -792,6 +818,190 @@ free(tempf); } +static void test_fgetwc_locale(const char* text, const char* locale, int codepage) +{ + char temppath[MAX_PATH], tempfile[MAX_PATH]; + FILE *tempfh; + static const WCHAR wchar_text[] = { 0xfeff, 0xff1f, '!' }; + WCHAR wtextW[BUFSIZ]; + int ret = 0, i; + wint_t ch; + + if (!setlocale(LC_CTYPE, locale)) + { + win_skip("%s locale not available\n", locale); + return; + } + + GetTempPathA(MAX_PATH, temppath); + GetTempFileNameA(temppath, "", 0, tempfile); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(text, 1, strlen(text), tempfh); + fclose(tempfh); + + if (codepage != 0) + { + /* mbstowcs rejects invalid multibyte sequence, + so we use MultiByteToWideChar here. */ + ret = MultiByteToWideChar(codepage, 0, text, -1, + wtextW, sizeof(wtextW)/sizeof(wtextW[0])); + ok(ret > 0, "MultiByteToWideChar failed\n"); + } + else + { + /* C locale */ + const char *p; + for (p = text; *p != '\0'; p++) + wtextW[ret++] = (unsigned char)*p; + wtextW[ret++] = 0; + } + + tempfh = fopen(tempfile, "rt"); + ok(tempfh != NULL, "can't open tempfile\n"); + + for (i = 0; i < ret-1; i++) + { + ch = fgetwc(tempfh); + ok(ch == wtextW[i], "got %04hx, expected %04hx (cp%d[%d])\n", ch, wtextW[i], codepage, i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (cp%d)\n", ch, codepage); + fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(wchar_text, 1, sizeof(wchar_text), tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rb"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], "got %04hx, expected %04x (cp%d[%d])\n", ch, wchar_text[i], codepage, i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (cp%d)\n", ch, codepage); + fclose(tempfh); + unlink(tempfile); +} + +static void test_fgetwc_unicode(void) +{ + char temppath[MAX_PATH], tempfile[MAX_PATH]; + FILE *tempfh; + static const WCHAR wchar_text[] = { 0xfeff, 0xff1f, '!' }; + char utf8_text[BUFSIZ]; + int ret, i; + wint_t ch; + + GetTempPathA(MAX_PATH, temppath); + GetTempFileNameA(temppath, "", 0, tempfile); + + if (!p_fopen_s) + { + win_skip("fopen_s not available\n"); + return; + } + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(wchar_text, 1, sizeof(wchar_text), tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt,ccs=unicode"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text, sizeof(wchar_text)/sizeof(wchar_text[0]), + utf8_text, sizeof(utf8_text), NULL, NULL); + ok(ret > 0, "utf-8 conversion failed\n"); + fwrite(utf8_text, sizeof(char), ret, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=UTF-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (utf8[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + unlink(temppath); +} + +static void test_fputwc(void) +{ + char temppath[MAX_PATH]; + char tempfile[MAX_PATH]; + FILE *f; + char buf[1024]; + int ret; + + GetTempPathA(MAX_PATH, temppath); + GetTempFileNameA(temppath, "", 0, tempfile); + + f = fopen(tempfile, "w"); + ret = fputwc('a', f); + ok(ret == 'a', "fputwc returned %x, expected 'a'\n", ret); + ret = fputwc('\n', f); + ok(ret == '\n', "fputwc returned %x, expected '\\n'\n", ret); + fclose(f); + + f = fopen(tempfile, "rb"); + ret = fread(buf, 1, sizeof(buf), f); + ok(ret == 3, "fread returned %d, expected 3\n", ret); + ok(!memcmp(buf, "a\r\n", 3), "incorrect file data\n"); + fclose(f); + + if(p_fopen_s) { + f = fopen(tempfile, "w,ccs=unicode"); + ret = fputwc('a', f); + ok(ret == 'a', "fputwc returned %x, expected 'a'\n", ret); + ret = fputwc('\n', f); + ok(ret == '\n', "fputwc returned %x, expected '\\n'\n", ret); + fclose(f); + + f = fopen(tempfile, "rb"); + ret = fread(buf, 1, sizeof(buf), f); + ok(ret == 8, "fread returned %d, expected 8\n", ret); + ok(!memcmp(buf, "\xff\xfe\x61\x00\r\x00\n\x00", 8), "incorrect file data\n"); + fclose(f); + + f = fopen(tempfile, "w,ccs=utf-8"); + ret = fputwc('a', f); + ok(ret == 'a', "fputwc returned %x, expected 'a'\n", ret); + ret = fputwc('\n', f); + ok(ret == '\n', "fputwc returned %x, expected '\\n'\n", ret); + fclose(f); + + f = fopen(tempfile, "rb"); + ret = fread(buf, 1, sizeof(buf), f); + ok(ret == 6, "fread returned %d, expected 6\n", ret); + ok(!memcmp(buf, "\xef\xbb\xbf\x61\r\n", 6), "incorrect file data\n"); + fclose(f); + }else { + win_skip("fputwc tests on unicode files\n"); + } + + _unlink(tempfile); +} + static void test_ctrlz( void ) { char* tempf; @@ -956,6 +1166,11 @@ _lseek(tempfd, -2, FILE_END); ret = _read(tempfd,btext,LLEN); ok(ret == 1 && *btext == '\n', "_read expected '\\n' got bad length: %d\n", ret); + _lseek(tempfd, -2, FILE_END); + ret = _read(tempfd,btext,1); + ok(ret == 1 && *btext == '\n', "_read returned %d, buf: %d\n", ret, *btext); + ret = read(tempfd,btext,1); + ok(ret == 0, "_read returned %d, expected 0\n", ret); _lseek(tempfd, -3, FILE_END); ret = _read(tempfd,btext,1); ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); @@ -975,7 +1190,7 @@ free(tempf); tempf=_tempnam(".","wne"); - tempfd = _open(tempf,_O_CREAT|_O_TRUNC|_O_BINARY|_O_RDWR,0); + tempfd = _open(tempf, _O_CREAT|_O_TRUNC|_O_BINARY|_O_RDWR, _S_IWRITE); ok( tempfd != -1, "Can't open '%s': %d\n", tempf, errno); /* open in BINARY mode */ ok(_write(tempfd,dostext,strlen(dostext)) == lstrlenA(dostext), @@ -1011,6 +1226,95 @@ ok(i == strlen(mytext)-1, "_read_i %d\n", i); _close(tempfd); + /* test read/write in unicode mode */ + if(p_fopen_s) + { + tempfd = _open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_WTEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _write(tempfd, "a", 1); + ok(ret == -1, "_write returned %d, expected -1\n", ret); + ret = _write(tempfd, "a\x00\n\x00\xff\xff", 6); + ok(ret == 6, "_write returned %d, expected 6\n", ret); + _close(tempfd); + + tempfd = _open(tempf, _O_RDONLY|_O_BINARY, 0); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _read(tempfd, btext, sizeof(btext)); + ok(ret == 10, "_read returned %d, expected 10\n", ret); + ok(!memcmp(btext, "\xff\xfe\x61\x00\r\x00\n\x00\xff\xff", 10), "btext is incorrect\n"); + _close(tempfd); + + tempfd = _open(tempf, _O_RDONLY|_O_WTEXT, 0); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + errno = 0xdeadbeef; + ret = _read(tempfd, btext, 3); + ok(ret == -1, "_read returned %d, expected -1\n", ret); + ok(errno == 22, "errno = %d\n", errno); + ret = _read(tempfd, btext, sizeof(btext)); + ok(ret == 6, "_read returned %d, expected 6\n", ret); + ok(!memcmp(btext, "\x61\x00\n\x00\xff\xff", 6), "btext is incorrect\n"); + _close(tempfd); + + tempfd = _open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_U8TEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + errno = 0xdeadbeef; + ret = _write(tempfd, "a", 1); + ok(ret == -1, "_write returned %d, expected -1\n", ret); + ok(errno == 22, "errno = %d\n", errno); + ret = _write(tempfd, "a\x00\n\x00\x62\x00", 6); + ok(ret == 6, "_write returned %d, expected 6\n", ret); + _close(tempfd); + + tempfd = _open(tempf, _O_RDONLY|_O_BINARY, 0); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _read(tempfd, btext, sizeof(btext)); + ok(ret == 7, "_read returned %d, expected 7\n", ret); + ok(!memcmp(btext, "\xef\xbb\xbf\x61\r\n\x62", 7), "btext is incorrect\n"); + _close(tempfd); + + tempfd = _open(tempf, _O_RDONLY|_O_WTEXT, 0); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _read(tempfd, btext, sizeof(btext)); + ok(ret == 6, "_read returned %d, expected 6\n", ret); + ok(!memcmp(btext, "\x61\x00\n\x00\x62\x00", 6), "btext is incorrect\n"); + + /* when buffer is small read sometimes fails in native implementation */ + lseek(tempfd, 3 /* skip bom */, SEEK_SET); + ret = _read(tempfd, btext, 4); + todo_wine ok(ret == -1, "_read returned %d, expected -1\n", ret); + + lseek(tempfd, 6, SEEK_SET); + ret = _read(tempfd, btext, 2); + ok(ret == 2, "_read returned %d, expected 2\n", ret); + ok(!memcmp(btext, "\x62\x00", 2), "btext is incorrect\n"); + _close(tempfd); + + tempfd = _open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_BINARY, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _write(tempfd, "\xef\xbb\xbf\x61\xc4\x85\x62\xc5\xbc\r\r\n", 12); + ok(ret == 12, "_write returned %d, expected 9\n", ret); + _close(tempfd); + + tempfd = _open(tempf, _O_RDONLY|_O_WTEXT, 0); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _read(tempfd, btext, sizeof(btext)); + ok(ret == 12, "_read returned %d, expected 12\n", ret); + ok(!memcmp(btext, "\x61\x00\x05\x01\x62\x00\x7c\x01\x0d\x00\x0a\x00", 12), "btext is incorrect\n"); + + /* test invalid utf8 sequence */ + lseek(tempfd, 5, SEEK_SET); + ret = _read(tempfd, btext, sizeof(btext)); + todo_wine ok(ret == 10, "_read returned %d, expected 10\n", ret); + /* invalid char should be replaced by U+FFFD in MultiByteToWideChar */ + todo_wine ok(!memcmp(btext, "\xfd\xff", 2), "invalid UTF8 character was not replaced by U+FFFD\n"); + ok(!memcmp(btext+ret-8, "\x62\x00\x7c\x01\x0d\x00\x0a\x00", 8), "btext is incorrect\n"); + _close(tempfd); + } + else + { + win_skip("unicode mode tests on file\n"); + } + ret =_chmod (tempf, _S_IREAD | _S_IWRITE); ok( ret == 0, "Can't chmod '%s' to read-write: %d\n", tempf, errno); @@ -1042,7 +1346,7 @@ "Wrong write result in child process on %d (%s)\n", fd, strerror(errno)); } -static void create_io_inherit_block( STARTUPINFO *startup, unsigned int count, const HANDLE *handles ) +static void create_io_inherit_block( STARTUPINFOA *startup, unsigned int count, const HANDLE *handles ) { static BYTE block[1024]; BYTE *wxflag_ptr; @@ -1072,7 +1376,7 @@ return buffer; } -static void test_stdout_handle( STARTUPINFO *startup, char *cmdline, HANDLE hstdout, BOOL expect_stdout, +static void test_stdout_handle( STARTUPINFOA *startup, char *cmdline, HANDLE hstdout, BOOL expect_stdout, const char *descr ) { const char *data; @@ -1112,7 +1416,7 @@ } CloseHandle( hErrorFile ); - DeleteFile( "fdopen.err" ); + DeleteFileA( "fdopen.err" ); } static void test_file_inherit( const char* selfname ) @@ -1121,13 +1425,13 @@ const char* arg_v[5]; char buffer[16]; char cmdline[MAX_PATH]; - STARTUPINFO startup; + STARTUPINFOA startup; SECURITY_ATTRIBUTES sa; HANDLE handles[3]; fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); - arg_v[0] = selfname; + arg_v[0] = get_base_name(selfname); arg_v[1] = "tests/file.c"; arg_v[2] = "inherit"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); @@ -1141,7 +1445,6 @@ fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY | O_NOINHERIT, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); - arg_v[0] = selfname; arg_v[1] = "tests/file.c"; arg_v[2] = "inherit_no"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); @@ -1159,7 +1462,7 @@ sprintf(cmdline, "%s file inherit 1", selfname); /* init an empty Reserved2, which should not be recognized as inherit-block */ - ZeroMemory(&startup, sizeof(STARTUPINFO)); + ZeroMemory(&startup, sizeof(startup)); startup.cb = sizeof(startup); create_io_inherit_block( &startup, 0, NULL ); test_stdout_handle( &startup, cmdline, 0, FALSE, "empty block" ); @@ -1172,7 +1475,7 @@ create_io_inherit_block( &startup, 3, handles ); test_stdout_handle( &startup, cmdline, handles[1], TRUE, "valid block" ); CloseHandle( handles[1] ); - DeleteFile("fdopen.tst"); + DeleteFileA("fdopen.tst"); /* test inherit block starting with unsigned zero */ handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, @@ -1181,7 +1484,7 @@ *(unsigned int *)startup.lpReserved2 = 0; test_stdout_handle( &startup, cmdline, handles[1], FALSE, "zero count block" ); CloseHandle( handles[1] ); - DeleteFile("fdopen.tst"); + DeleteFileA("fdopen.tst"); /* test inherit block with smaller size */ handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, @@ -1190,7 +1493,7 @@ startup.cbReserved2 -= 3; test_stdout_handle( &startup, cmdline, handles[1], TRUE, "small size block" ); CloseHandle( handles[1] ); - DeleteFile("fdopen.tst"); + DeleteFileA("fdopen.tst"); /* test inherit block with even smaller size */ handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, @@ -1199,7 +1502,7 @@ startup.cbReserved2 = sizeof(unsigned int) + sizeof(HANDLE) + sizeof(char); test_stdout_handle( &startup, cmdline, handles[1], FALSE, "smaller size block" ); CloseHandle( handles[1] ); - DeleteFile("fdopen.tst"); + DeleteFileA("fdopen.tst"); /* test inherit block with larger size */ handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, @@ -1208,7 +1511,7 @@ startup.cbReserved2 += 7; test_stdout_handle( &startup, cmdline, handles[1], TRUE, "large size block" ); CloseHandle( handles[1] ); - DeleteFile("fdopen.tst"); + DeleteFileA("fdopen.tst"); } static void test_tmpnam( void ) @@ -1320,6 +1623,7 @@ { const char name[] = "empty1"; char buff[16]; + unsigned char *ubuff = (unsigned char*)buff; FILE *file; int ret; int len; @@ -1347,6 +1651,69 @@ ret = fclose(file); ok(ret != EOF, "File failed to close\n"); + + ret = p_fopen_s(&file, name, "w, ccs=UNIcode"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + ret = fwrite("a", 1, 2, file); + ok(ret == 2, "fwrite returned %d\n", ret); + fclose(file); + + ret = p_fopen_s(&file, name, "r"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 2, file); + ok(len == 2, "len = %d\n", len); + ok(ubuff[0]==0xff && ubuff[1]==0xfe, "buff[0]=%02x, buff[1]=%02x\n", + ubuff[0], ubuff[1]); + fclose(file); + + ret = p_fopen_s(&file, name, "r,ccs=unicode"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 2, file); + ok(len == 2, "len = %d\n", len); + ok(ubuff[0]=='a' && ubuff[1]==0, "buff[0]=%02x, buff[1]=%02x\n", + ubuff[0], ubuff[1]); + fclose(file); + + ret = p_fopen_s(&file, name, "r,ccs=utf-16le"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 2, file); + ok(len == 2, "len = %d\n", len); + ok(ubuff[0]=='a' && ubuff[1]==0, "buff[0]=%02x, buff[1]=%02x\n", + ubuff[0], ubuff[1]); + fclose(file); + + ret = p_fopen_s(&file, name, "r,ccs=utf-8"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 2, file); + ok(len == 2, "len = %d\n", len); + ok(ubuff[0]=='a' && ubuff[1]==0, "buff[0]=%02x, buff[1]=%02x\n", + ubuff[0], ubuff[1]); + fclose(file); + + ret = p_fopen_s(&file, name, "w,ccs=utf-16le"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + fclose(file); + + ret = p_fopen_s(&file, name, "r"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 3, file); + ok(len == 2, "len = %d\n", len); + ok(ubuff[0]==0xff && ubuff[1]==0xfe, "buff[0]=%02x, buff[1]=%02x\n", + ubuff[0], ubuff[1]); + fclose(file); + + ret = p_fopen_s(&file, name, "w,ccs=utf-8"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + fclose(file); + + ret = p_fopen_s(&file, name, "r"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 4, file); + ok(len == 3, "len = %d\n", len); + ok(ubuff[0]==0xef && ubuff[1]==0xbb && ubuff[2]==0xbf, + "buff[0]=%02x, buff[1]=%02x, buff[2]=%02x\n", + ubuff[0], ubuff[1], ubuff[2]); + fclose(file); ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); } @@ -1392,6 +1759,61 @@ ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); } +static void test_setmode(void) +{ + const char name[] = "empty1"; + int fd, ret; + + if(!p_fopen_s) { + win_skip("unicode file modes are not available, skipping setmode tests\n"); + return; + } + + fd = _open(name, _O_CREAT|_O_WRONLY, _S_IWRITE); + ok(fd != -1, "failed to open file\n"); + + errno = 0xdeadbeef; + ret = _setmode(fd, 0xffffffff); + ok(ret == -1, "_setmode returned %x, expected -1\n", ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = _setmode(fd, 0); + ok(ret == -1, "_setmode returned %x, expected -1\n", ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = _setmode(fd, _O_BINARY|_O_TEXT); + ok(ret == -1, "_setmode returned %x, expected -1\n", ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = _setmode(fd, _O_WTEXT|_O_U16TEXT); + ok(ret == -1, "_setmode returned %x, expected -1\n", ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + ret = _setmode(fd, _O_BINARY); + ok(ret == _O_TEXT, "_setmode returned %x, expected _O_TEXT\n", ret); + + ret = _setmode(fd, _O_WTEXT); + ok(ret == _O_BINARY, "_setmode returned %x, expected _O_BINARY\n", ret); + + ret = _setmode(fd, _O_TEXT); + ok(ret == _O_WTEXT, "_setmode returned %x, expected _O_WTEXT\n", ret); + + ret = _setmode(fd, _O_U16TEXT); + ok(ret == _O_TEXT, "_setmode returned %x, expected _O_TEXT\n", ret); + + ret = _setmode(fd, _O_U8TEXT); + ok(ret == _O_WTEXT, "_setmode returned %x, expected _O_WTEXT\n", ret); + + ret = _setmode(fd, _O_TEXT); + ok(ret == _O_WTEXT, "_setmode returned %x, expected _O_WTEXT\n", ret); + + _close(fd); + _unlink(name); +} + static void test_get_osfhandle(void) { int fd; @@ -1443,6 +1865,11 @@ ok(buf.st_dev == buf.st_rdev, "st_dev (%d) and st_rdev (%d) differ\n", buf.st_dev, buf.st_rdev); ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); ok(buf.st_size == 0, "st_size is %d, expected 0\n", buf.st_size); + + errno = 0xdeadbeef; + ret = stat("stat.tst\\", &buf); + ok(ret == -1, "stat returned %d\n", ret); + ok(errno == ENOENT, "errno = %d\n", errno); close(fd); remove("stat.tst"); @@ -1483,6 +1910,35 @@ } else skip("pipe failed with errno %d\n", errno); + + /* Tests for directory */ + if(mkdir("stat.tst") == 0) + { + ret = stat("stat.tst ", &buf); + ok(!ret, "stat(directory) failed: errno=%d\n", errno); + ok((buf.st_mode & _S_IFMT) == _S_IFDIR, "bad format = %06o\n", buf.st_mode); + ok((buf.st_mode & 0777) == 0777, "bad st_mode = %06o\n", buf.st_mode); + ok(buf.st_dev == buf.st_rdev, "st_dev (%d) and st_rdev (%d) differ\n", buf.st_dev, buf.st_rdev); + ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); + + errno = 0xdeadbeef; + ret = stat("stat.tst\\ ", &buf); + ok(ret == -1, "stat returned %d\n", ret); + ok(errno == ENOENT, "errno = %d\n", errno); + rmdir( "stat.tst" ); + } + else + skip("mkdir failed with errno %d\n", errno); + + errno = 0xdeadbeef; + ret = stat("c:", &buf); + ok(ret == -1, "stat returned %d\n", ret); + ok(errno == ENOENT, "errno = %d\n", errno); + + ret = stat("c:/", &buf); + ok(!ret, "stat returned %d\n", ret); + ok(buf.st_dev == 2, "st_dev = %d\n", buf.st_dev); + ok(buf.st_rdev == 2, "st_rdev = %d\n", buf.st_rdev); } static const char* pipe_string="Hello world"; @@ -1538,7 +1994,7 @@ return; } - arg_v[0] = selfname; + arg_v[0] = get_base_name(selfname); arg_v[1] = "tests/file.c"; arg_v[2] = "pipes"; arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); @@ -1568,7 +2024,6 @@ return; } - arg_v[0] = selfname; arg_v[1] = "tests/file.c"; arg_v[2] = "pipes"; arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); @@ -1601,6 +2056,56 @@ i=fclose(file); ok(!i, "unable to close the pipe: %d\n", errno); + + /* test \r handling when it's the last character read */ + if (_pipe(pipes, 1024, O_BINARY) < 0) + { + ok(0, "pipe failed with errno %d\n", errno); + return; + } + r = write(pipes[1], "\r\n\rab\r\n", 7); + ok(r == 7, "write returned %d, errno = %d\n", r, errno); + setmode(pipes[0], O_TEXT); + r = read(pipes[0], buf, 1); + ok(r == 1, "read returned %d, expected 1\n", r); + ok(buf[0] == '\n', "buf[0] = %x, expected '\\n'\n", buf[0]); + r = read(pipes[0], buf, 1); + ok(r == 1, "read returned %d, expected 1\n", r); + ok(buf[0] == '\r', "buf[0] = %x, expected '\\r'\n", buf[0]); + r = read(pipes[0], buf, 1); + ok(r == 1, "read returned %d, expected 1\n", r); + ok(buf[0] == 'a', "buf[0] = %x, expected 'a'\n", buf[0]); + r = read(pipes[0], buf, 2); + ok(r == 2, "read returned %d, expected 1\n", r); + ok(buf[0] == 'b', "buf[0] = %x, expected 'b'\n", buf[0]); + ok(buf[1] == '\n', "buf[1] = %x, expected '\\n'\n", buf[1]); + + if (p_fopen_s) + { + /* test utf16 read with insufficient data */ + r = write(pipes[1], "a\0b", 3); + ok(r == 3, "write returned %d, errno = %d\n", r, errno); + buf[2] = 'z'; + buf[3] = 'z'; + setmode(pipes[0], _O_WTEXT); + r = read(pipes[0], buf, 4); + ok(r == 2, "read returned %d, expected 2\n", r); + ok(!memcmp(buf, "a\0bz", 4), "read returned incorrect data\n"); + r = write(pipes[1], "\0", 1); + ok(r == 1, "write returned %d, errno = %d\n", r, errno); + buf[0] = 'z'; + buf[1] = 'z'; + r = read(pipes[0], buf, 2); + ok(r == 0, "read returned %d, expected 0\n", r); + ok(!memcmp(buf, "\0z", 2), "read returned incorrect data\n"); + } + else + { + win_skip("unicode mode tests on pipe\n"); + } + + close(pipes[1]); + close(pipes[0]); } static void test_unlink(void) @@ -1621,6 +2126,99 @@ ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); } +static void test_stdin(void) +{ + HANDLE stdinh = GetStdHandle(STD_INPUT_HANDLE); + int stdin_dup, fd; + HANDLE h; + DWORD r; + + stdin_dup = _dup(STDIN_FILENO); + ok(stdin_dup != -1, "_dup(STDIN_FILENO) failed\n"); + + ok(stdinh == (HANDLE)_get_osfhandle(STDIN_FILENO), + "GetStdHandle(STD_INPUT_HANDLE) != _get_osfhandle(STDIN_FILENO)\n"); + + r = SetStdHandle(STD_INPUT_HANDLE, INVALID_HANDLE_VALUE); + ok(r == TRUE, "SetStdHandle returned %x, expected TRUE\n", r); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h == INVALID_HANDLE_VALUE, "h = %p\n", h); + + close(STDIN_FILENO); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h == NULL, "h != NULL\n"); + + fd = open("stdin.tst", O_WRONLY | O_CREAT, _S_IREAD |_S_IWRITE); + ok(fd != -1, "open failed\n"); + ok(fd == STDIN_FILENO, "fd = %d, expected STDIN_FILENO\n", fd); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h != NULL, "h == NULL\n"); + close(fd); + unlink("stdin.tst"); + + r = _dup2(stdin_dup, STDIN_FILENO); + ok(r != -1, "_dup2 failed\n"); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h != NULL, "h == NULL\n"); +} + +static void test_mktemp(void) +{ + char buf[16]; + + strcpy(buf, "a"); + ok(!_mktemp(buf), "_mktemp(\"a\") != NULL\n"); + + strcpy(buf, "testXXXXX"); + ok(!_mktemp(buf), "_mktemp(\"testXXXXX\") != NULL\n"); + + strcpy(buf, "testXXXXXX"); + ok(_mktemp(buf) != NULL, "_mktemp(\"testXXXXXX\") == NULL\n"); + + strcpy(buf, "testXXXXXXa"); + ok(!_mktemp(buf), "_mktemp(\"testXXXXXXa\") != NULL\n"); + + strcpy(buf, "**XXXXXX"); + ok(_mktemp(buf) != NULL, "_mktemp(\"**XXXXXX\") == NULL\n"); +} + +static void test__open_osfhandle(void) +{ + ioinfo *info; + HANDLE h, tmp; + int fd; + + errno = 0xdeadbeef; + fd = _open_osfhandle((intptr_t)INVALID_HANDLE_VALUE, 0); + ok(fd == -1, "_open_osfhandle returned %d\n", fd); + ok(errno == EBADF, "errno = %d\n", errno); + + h = CreateFileA("open_osfhandle.tst", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + fd = _open_osfhandle((intptr_t)h, 0); + ok(fd > 0, "_open_osfhandle returned %d (%d)\n", fd, errno); + info = &__pioinfo[fd/MSVCRT_FD_BLOCK_SIZE][fd%MSVCRT_FD_BLOCK_SIZE]; + ok(info->handle == h, "info->handle = %p, expected %p\n", info->handle, h); + ok(info->wxflag == 1, "info->wxflag = %x, expected 1\n", info->wxflag); + close(fd); + ok(info->handle == INVALID_HANDLE_VALUE, "info->handle = %p, expected INVALID_HANDLE_VALUE\n", info->handle); + ok(info->wxflag == 0, "info->wxflag = %x, expected 0\n", info->wxflag); + DeleteFileA("open_osfhandle.tst"); + + errno = 0xdeadbeef; + fd = _open_osfhandle((intptr_t)h, 0); + ok(fd == -1, "_open_osfhandle returned %d\n", fd); + ok(errno == EBADF, "errno = %d\n", errno); + + ok(CreatePipe(&h, &tmp, NULL, 0), "CreatePipe failed\n"); + fd = _open_osfhandle((intptr_t)h, 0); + ok(fd > 0, "_open_osfhandle returned %d (%d)\n", fd, errno); + info = &__pioinfo[fd/MSVCRT_FD_BLOCK_SIZE][fd%MSVCRT_FD_BLOCK_SIZE]; + ok(info->handle == h, "info->handle = %p, expected %p\n", info->handle, h); + ok(info->wxflag == 9, "info->wxflag = %x, expected 9\n", info->wxflag); + close(fd); + CloseHandle(tmp); +} + START_TEST(file) { int arg_c; @@ -1656,6 +2254,7 @@ test_fopen_fclose_fcloseall(); test_fopen_s(); test__wfopen_s(); + test_setmode(); test_fileops(); test_asciimode(); test_asciimode2(); @@ -1668,12 +2267,23 @@ test_flsbuf(); test_fflush(); test_fgetwc(); + /* \x83\xa9 is double byte character, \xe0\x7f is not (undefined). */ + test_fgetwc_locale("AB\x83\xa9\xe0\x7f", "Japanese_Japan.932", 932); + /* \x83 is U+0192 */ + test_fgetwc_locale("AB\x83\xa9", "English", 1252); + /* \x83 is U+0083 */ + test_fgetwc_locale("AB\x83\xa9", "C", 0); + test_fgetwc_unicode(); + test_fputwc(); test_ctrlz(); test_file_put_get(); test_tmpnam(); test_get_osfhandle(); test_setmaxstdio(); test_pipes(arg_v[0]); + test_stdin(); + test_mktemp(); + test__open_osfhandle(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order Modified: trunk/rostests/winetests/msvcrt/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/heap.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/heap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/heap.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -233,7 +233,7 @@ static void test_aligned(void) { - HMODULE msvcrt = GetModuleHandle("msvcrt.dll"); + HMODULE msvcrt = GetModuleHandleA("msvcrt.dll"); if (msvcrt == NULL) return; Modified: trunk/rostests/winetests/msvcrt/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/locale.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/locale.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/locale.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -49,9 +49,6 @@ ret = setlocale(20, "C"); ok(ret == NULL, "ret = %s\n", ret); - ret = setlocale(LC_ALL, ""); - ok(ret != NULL, "ret == NULL\n"); - ret = setlocale(LC_ALL, "C"); ok(!strcmp(ret, "C"), "ret = %s\n", ret); @@ -116,12 +113,14 @@ ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "chinese-simplified"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") || broken(!strcmp(ret, "Chinese_People's Republic of China.936")) || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); @@ -135,6 +134,7 @@ ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "cht"); @@ -142,6 +142,18 @@ if(ret) ok(!strcmp(ret, "Chinese (Traditional)_Taiwan.950") || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); + + ret = setlocale(LC_ALL, "Chinese_China.936"); +todo_wine + ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); + if(ret) + { +todo_wine + ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") + || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret); + trace("ret is %s\n", ret); + } ret = setlocale(LC_ALL, "csy"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); @@ -575,6 +587,27 @@ ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "English_United States.1252"), "ret = %s\n", ret); + + ret = setlocale(LC_ALL, "English_United States.ACP"); + ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); + if(ret) { + strcpy(buf, "English_United States."); + GetLocaleInfoA(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT), + LOCALE_IDEFAULTANSICODEPAGE, buf+strlen(buf), 80); + ok(!strcmp(ret, buf), "ret = %s, expected %s\n", ret, buf); + } + + ret = setlocale(LC_ALL, "English_United States.OCP"); + ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); + if(ret) { + strcpy(buf, "English_United States."); + GetLocaleInfoA(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT), + LOCALE_IDEFAULTCODEPAGE, buf+strlen(buf), 80); + ok(!strcmp(ret, buf), "ret = %s, expected %s\n", ret, buf); + } + + ret = setlocale(LC_ALL, "English_United States.UTF8"); + ok(ret == NULL, "ret != NULL\n"); } static void test_crtGetStringTypeW(void) @@ -632,6 +665,7 @@ char data[1]; } *ret; int size; + char buf[64]; if(!setlocale(LC_ALL, "english")) return; @@ -688,7 +722,10 @@ ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, "ret->str[40] = %s\n", ret->str[40]); - ok(!strcmp(ret->str[41], "dddd, MMMM dd, yyyy"), "ret->str[41] = %s\n", ret->str[41]); + size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), + LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, buf, sizeof(buf)); + ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); free(ret); if(!setlocale(LC_TIME, "german")) @@ -745,10 +782,8 @@ static void test___mb_cur_max_func(void) { int mb_cur_max; - CPINFO cp; setlocale(LC_ALL, "C"); - GetCPInfo(CP_ACP, &cp); /* for newer Windows */ if(!p___mb_cur_max_func) @@ -772,13 +807,7 @@ win_skip("Skipping __p___mb_cur_max tests\n"); else { mb_cur_max = *p__p___mb_cur_max(); - if (cp.MaxCharSize != 1) { - todo_wine ok(mb_cur_max == cp.MaxCharSize, "mb_cur_max = %d, expected %d\n", - mb_cur_max, cp.MaxCharSize); - } - else { - ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); - } + ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); /* some old Windows don't set chinese */ if (!setlocale(LC_ALL, "chinese")) Modified: trunk/rostests/winetests/msvcrt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/misc.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/misc.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -20,6 +20,7 @@ #include "wine/test.h" #include <errno.h> +#include <stdio.h> #include "msvcrt.h" static int (__cdecl *prand_s)(unsigned int *); @@ -309,9 +310,53 @@ ok(errno == 0xdeadbeef, "Expected errno to be 0xdeadbeef, got %d\n", errno); } +static void test__popen_child(void) +{ + /* don't execute any tests here */ + /* ExitProcess is used to set return code of _pclose */ + printf("child output\n"); + ExitProcess(0x37); +} + +static void test__popen(const char *name) +{ + FILE *pipe; + char buf[1024]; + int ret; + + sprintf(buf, "%s misc popen", name); + pipe = _popen(buf, "r"); + ok(pipe != NULL, "_popen failed with error: %d\n", errno); + + fgets(buf, sizeof(buf), pipe); + ok(!strcmp(buf, "child output\n"), "buf = %s\n", buf); + + ret = _pclose(pipe); + ok(ret == 0x37, "_pclose returned %x, expected 0x37\n", ret); + + errno = 0xdeadbeef; + ret = _pclose((FILE*)0xdeadbeef); + ok(ret == -1, "_pclose returned %x, expected -1\n", ret); + if(p_set_errno) + ok(errno == EBADF, "errno = %d\n", errno); +} + START_TEST(misc) { + int arg_c; + char** arg_v; + init(); + + arg_c = winetest_get_mainargs(&arg_v); + if(arg_c >= 3) { + if(!strcmp(arg_v[2], "popen")) + test__popen_child(); + else + ok(0, "invalid argument '%s'\n", arg_v[2]); + + return; + } test_rand_s(); test_I10_OUTPUT(); @@ -320,4 +365,5 @@ test__get_errno(); test__set_doserrno(); test__set_errno(); -} + test__popen(arg_v[0]); +} Removed: trunk/rostests/winetests/msvcrt/msvcrt_test.dsp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt_t… ============================================================================== --- trunk/rostests/winetests/msvcrt/msvcrt_test.dsp [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/msvcrt_test.dsp (removed) @@ -1,107 +0,0 @@ -# Microsoft Developer Studio Project File - Name="msvcrt_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=msvcrt_test - Win32 Wine Headers -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "msvcrt_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "msvcrt_test.mak" CFG="msvcrt_test - Win32 Wine Headers" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "msvcrt_test - Win32 MSVC Headers" (based on "Win32 (x86) Console Application") -!MESSAGE "msvcrt_test - Win32 Wine Headers" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe -!IF "$(CFG)" == "msvcrt_test - Win32 MSVC Headers" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Output\Win32_MSVC_Headers" -# PROP BASE Intermediate_Dir "Output\Win32_MSVC_Headers" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Output\Win32_MSVC_Headers" -# PROP Intermediate_Dir "Output\Win32_MSVC_Headers" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WINVER=0x0501" /D "_WIN32_WINNT=0x0501" /D "_WIN32_IE=0x0600" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ..\..\..\Output\\Win32_MSVC_Headers /D "WINVER=0x0501" /D "_WIN32_WINNT=0x0501" /D "_WIN32_IE=0x0600" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MSVCRT_TEST_" /D "__WINE_USE_NATIVE_HEADERS" /D __WINETEST_OUTPUT_DIR=\"Output\\Win32_MSVC_Headers\" /D "__i386__" /D "_X86_" /D inline=__inline /FR /FD /GZ /c -# ADD BASE RSC /l 0x41d /d "_DEBUG" -# ADD RSC /l 0x41d /i "..\..\..\Output\\Win32_MSVC_Headers" /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ELSEIF "$(CFG)" == "msvcrt_test - Win32 Wine Headers" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Output\Win32_Wine_Headers" -# PROP BASE Intermediate_Dir "Output\Win32_Wine_Headers" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Output\Win32_Wine_Headers" -# PROP Intermediate_Dir "Output\Win32_Wine_Headers" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WINVER=0x0501" /D "_WIN32_WINNT=0x0501" /D "_WIN32_IE=0x0600" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ..\..\..\Output\\Win32_Wine_Headers /I ..\..\..\include /D "WINVER=0x0501" /D "_WIN32_WINNT=0x0501" /D "_WIN32_IE=0x0600" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MSVCRT_TEST_" /D __WINETEST_OUTPUT_DIR=\"Output\\Win32_Wine_Headers\" /D "__i386__" /D "_X86_" /D inline=__inline /FR /FD /GZ /c -# ADD BASE RSC /l 0x41d /d "_DEBUG" -# ADD RSC /l 0x41d /i "..\..\..\Output\\Win32_Wine_Headers" /i "..\..\..\include" /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "msvcrt_test - Win32 MSVC Headers" -# Name "msvcrt_test - Win32 Wine Headers" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\cpp.c -# End Source File -# Begin Source File - -SOURCE=.\\ -# End Source File -# Begin Source File - -SOURCE=.\testlist.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project Modified: trunk/rostests/winetests/msvcrt/printf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/printf.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/printf.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/printf.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -27,6 +27,7 @@ #include <stdio.h> #include <errno.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -44,6 +45,7 @@ static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); static unsigned int (__cdecl *p__get_output_format)(void); +static unsigned int (__cdecl *p__set_output_format)(unsigned int); static int (__cdecl *p__vsprintf_p)(char*, size_t, const char*, __ms_va_list); static int (__cdecl *p_vswprintf)(wchar_t *str, const wchar_t *format, __ms_va_list valist); static int (__cdecl *p__vswprintf)(wchar_t *str, const wchar_t *format, __ms_va_list valist); @@ -66,6 +68,7 @@ p__ecvt_s = (void *)GetProcAddress(hmod, "_ecvt_s"); p__fcvt_s = (void *)GetProcAddress(hmod, "_fcvt_s"); p__get_output_format = (void *)GetProcAddress(hmod, "_get_output_format"); + p__set_output_format = (void *)GetProcAddress(hmod, "_set_output_format"); p__vsprintf_p = (void*)GetProcAddress(hmod, "_vsprintf_p"); p_vswprintf = (void*)GetProcAddress(hmod, "vswprintf"); p__vswprintf = (void*)GetProcAddress(hmod, "_vswprintf"); @@ -79,7 +82,7 @@ { char buffer[100]; const char *format; - double pnumber=789456123; + double pnumber=789456123, inf, nan; int x, r; WCHAR wide[] = { 'w','i','d','e',0}; @@ -326,18 +329,52 @@ format = "%#012x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x0000000001"),"Hexadecimal zero-padded \"%s\"\n",buffer); + ok( r==12, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"000000000000"),"Hexadecimal zero-padded \"%s\"\n",buffer); + ok( r==12, "return count wrong\n"); format = "%#04.8x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x00000001"), "Hexadecimal zero-padded precision \"%s\"\n",buffer); + ok( r==10, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"00000000"), "Hexadecimal zero-padded precision \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); format = "%#-08.2x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x01 "), "Hexadecimal zero-padded not left-adjusted \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"00 "), "Hexadecimal zero-padded not left-adjusted \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#.0x"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"0x1"), "Hexadecimal zero-padded zero-precision \"%s\"\n",buffer); + ok( r==3, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,""), "Hexadecimal zero-padded zero-precision \"%s\"\n",buffer); + ok( r==0, "return count wrong\n"); format = "%#08o"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"00000001"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#o"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"01"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==2, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"0"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==1, "return count wrong\n"); if (sizeof(void *) == 8) { @@ -515,6 +552,26 @@ ok(!strcmp(buffer,"8.6000e+000"), "failed\n"); ok( r==11, "return count wrong\n"); + format = "% 2.4e"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer," 8.6000e+000"), "failed: %s\n", buffer); + ok( r==12, "return count wrong\n"); + + format = "% 014.4e"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer," 008.6000e+000"), "failed: %s\n", buffer); + ok( r==14, "return count wrong\n"); + + format = "% 2.4e"; + r = sprintf(buffer, format,-8.6); + ok(!strcmp(buffer,"-8.6000e+000"), "failed: %s\n", buffer); + ok( r==12, "return count wrong\n"); + + format = "%+2.4e"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer,"+8.6000e+000"), "failed: %s\n", buffer); + ok( r==12, "return count wrong\n"); + format = "%2.4g"; r = sprintf(buffer, format,8.6); ok(!strcmp(buffer,"8.6"), "failed\n"); @@ -617,6 +674,41 @@ ok(!strcmp(buffer,"123"), "failed: \"%s\"\n", buffer); r = sprintf(buffer, format, 0x12345); ok(!strcmp(buffer,"2345"), "failed \"%s\"\n", buffer); + + nan = 0.0; + inf = 1.0/nan; + nan = sqrt(-1); + format = "%lf"; + r = sprintf(buffer, format, nan); + ok(r==9, "r = %d\n", r); + ok(!strcmp(buffer, "-1.#IND00"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, inf); + ok(r==8, "r = %d\n", r); + ok(!strcmp(buffer, "1.#INF00"), "failed: \"%s\"\n", buffer); + + format = "%le"; + r = sprintf(buffer, format, nan); + ok(r==14, "r = %d\n", r); + ok(!strcmp(buffer, "-1.#IND00e+000"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, inf); + ok(r==13, "r = %d\n", r); + ok(!strcmp(buffer, "1.#INF00e+000"), "failed: \"%s\"\n", buffer); + + format = "%lg"; + r = sprintf(buffer, format, nan); + ok(r==7, "r = %d\n", r); + ok(!strcmp(buffer, "-1.#IND"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, inf); + ok(r==6, "r = %d\n", r); + ok(!strcmp(buffer, "1.#INF"), "failed: \"%s\"\n", buffer); + + format = "%010.2lf"; + r = sprintf(buffer, format, nan); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "-000001.#J"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, inf); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "0000001.#J"), "failed: \"%s\"\n", buffer); } static void test_swprintf( void ) @@ -671,7 +763,9 @@ static void test_fprintf(void) { - static char file_name[] = "fprintf.tst"; + static const char file_name[] = "fprintf.tst"; + static const WCHAR utf16_test[] = {'u','n','i','c','o','d','e','\n',0}; + FILE *fp = fopen(file_name, "wb"); char buf[1024]; int ret; @@ -685,6 +779,11 @@ ok(ret == 14, "ret = %d\n", ret); ret = ftell(fp); ok(ret == 26, "ftell returned %d\n", ret); + + ret = fwprintf(fp, utf16_test); + ok(ret == 8, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 42, "ftell returned %d\n", ret); fclose(fp); @@ -699,6 +798,51 @@ ret = ftell(fp); ok(ret == 26, "ret = %d\n", ret); ok(!memcmp(buf, "contains\0null\n", 14), "buf = %s\n", buf); + + memset(buf, 0, sizeof(buf)); + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); + ok(ret == 41, "ret = %d\n", ret); + ok(!memcmp(buf, utf16_test, sizeof(utf16_test)), + "buf = %s\n", wine_dbgstr_w((WCHAR*)buf)); + + fclose(fp); + + fp = fopen(file_name, "wt"); + + ret = fprintf(fp, "simple test\n"); + ok(ret == 12, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 13, "ftell returned %d\n", ret); + + ret = fprintf(fp, "contains%cnull\n", '\0'); + ok(ret == 14, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 28, "ftell returned %d\n", ret); + + ret = fwprintf(fp, utf16_test); + ok(ret == 8, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 37, "ftell returned %d\n", ret); + + fclose(fp); + + fp = fopen(file_name, "rb"); + ret = fscanf(fp, "%[^\n] ", buf); + ok(ret == 1, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 13, "ftell returned %d\n", ret); + ok(!strcmp(buf, "simple test\r"), "buf = %s\n", buf); + + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); + ok(ret == 28, "ret = %d\n", ret); + ok(!memcmp(buf, "contains\0null\r\n", 15), "buf = %s\n", buf); + + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); + ok(ret == 37, "ret = %d\n", ret); + ok(!strcmp(buf, "unicode\r\n"), "buf = %s\n", buf); fclose(fp); unlink(file_name); @@ -1244,15 +1388,34 @@ static void test__get_output_format(void) { unsigned int ret; - - if (!p__get_output_format) + char buf[64]; + int c; + + if (!p__get_output_format || !p__set_output_format) { - win_skip("_get_output_format not available\n"); + win_skip("_get_output_format or _set_output_format is not available\n"); return; } ret = p__get_output_format(); ok(ret == 0, "got %d\n", ret); + + c = sprintf(buf, "%E", 1.23); + ok(c == 13, "c = %d\n", c); + ok(!strcmp(buf, "1.230000E+000"), "buf = %s\n", buf); + + ret = p__set_output_format(_TWO_DIGIT_EXPONENT); + ok(ret == 0, "got %d\n", ret); + + c = sprintf(buf, "%E", 1.23); + ok(c == 12, "c = %d\n", c); + ok(!strcmp(buf, "1.230000E+00"), "buf = %s\n", buf); + + ret = p__get_output_format(); + ok(ret == _TWO_DIGIT_EXPONENT, "got %d\n", ret); + + ret = p__set_output_format(_TWO_DIGIT_EXPONENT); + ok(ret == _TWO_DIGIT_EXPONENT, "got %d\n", ret); } START_TEST(printf) Modified: trunk/rostests/winetests/msvcrt/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/scanf.c?… ============================================================================== --- trunk/rostests/winetests/msvcrt/scanf.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/scanf.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -131,6 +131,13 @@ ok( ret == 1, "Error with format \"%s\"\n","%*[a-cd-dg-e]%c"); ok( buffer[0] == 'h', "Error with \"abcefgdh\" \"%c\"\n", buffer[0]); + buffer1[0] = 'b'; + ret = sscanf("a","%s%s", buffer, buffer1); + ok( ret == 1, "expected 1, got %u\n", ret); + ok( buffer[0] == 'a', "buffer[0] = '%c'\n", buffer[0]); + ok( buffer[1] == '\0', "buffer[1] = '%c'\n", buffer[1]); + ok( buffer1[0] == 'b', "buffer1[0] = '%c'\n", buffer1[0]); + /* check digits */ ret = sprintf(buffer,"%d:%d:%d",hour,min,sec); ok( ret == 8, "expected 8, got %u\n", ret); Modified: trunk/rostests/winetests/msvcrt/signal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/signal.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/signal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/signal.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -26,6 +26,13 @@ static void __cdecl sighandler(int signum) { + void **ret = __pxcptinfoptrs(); + + ok(ret != NULL, "ret = NULL\n"); + if(signum == SIGABRT) + ok(*ret == (void*)0xdeadbeef, "*ret = %p\n", *ret); + else if(signum == SIGSEGV) + ok(*ret == NULL, "*ret = %p\n", *ret); ++test_value; } @@ -42,7 +49,32 @@ ok(test_value == 1, "SIGBREAK handler not invoked\n"); } +static void test___pxcptinfoptrs(void) +{ + void **ret = __pxcptinfoptrs(); + int res; + + ok(ret != NULL, "ret == NULL\n"); + ok(*ret == NULL, "*ret != NULL\n"); + + test_value = 0; + + *ret = (void*)0xdeadbeef; + signal(SIGSEGV, sighandler); + res = raise(SIGSEGV); + ok(res == 0, "failed to raise SIGSEGV\n"); + ok(*ret == (void*)0xdeadbeef, "*ret = %p\n", *ret); + + signal(SIGABRT, sighandler); + res = raise(SIGABRT); + ok(res == 0, "failed to raise SIGBREAK\n"); + ok(*ret == (void*)0xdeadbeef, "*ret = %p\n", *ret); + + ok(test_value == 2, "test_value = %d\n", test_value); +} + START_TEST(signal) { test_signal(); + test___pxcptinfoptrs(); } Modified: trunk/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/string.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/string.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -19,8 +19,6 @@ */ #include "wine/test.h" -#include "winbase.h" -#include "winnls.h" #include <string.h> #include <mbstring.h> #include <wchar.h> @@ -30,6 +28,12 @@ #include <locale.h> #include <errno.h> #include <limits.h> +#include <math.h> + +/* make it use a definition from string.h */ +#undef strncpy +#include "winbase.h" +#include "winnls.h" static char *buf_to_string(const unsigned char *bin, int len, int nr) { @@ -70,6 +74,8 @@ static size_t (__cdecl *p_strnlen)(const char *, size_t); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); +static __int64 (__cdecl *p_wcstoi64)(const wchar_t *, wchar_t **, int); +static unsigned __int64 (__cdecl *p_wcstoui64)(const wchar_t *, wchar_t **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); @@ -89,6 +95,7 @@ static int (__cdecl *p_tolower)(int); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); +static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -428,9 +435,7 @@ expect_eq(_ismbblead(0x84), 1, int, "%d"); expect_eq(_ismbblead(0xd3), 1, int, "%d"); expect_eq(_ismbblead(0xd7), 0, int, "%d"); - todo_wine { - expect_eq(_ismbblead(0xd8), 1, int, "%d"); - } + expect_eq(_ismbblead(0xd8), 1, int, "%d"); expect_eq(_ismbblead(0xd9), 1, int, "%d"); expect_eq(_ismbbtrail(0x30), 0, int, "%d"); @@ -806,23 +811,33 @@ return; } + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + /* Test NULL Dest */ + errno = EBADF; ret = p_wcscpy_s(NULL, 18, szLongText); ok(ret == EINVAL, "p_wcscpy_s expect EINVAL got %d\n", ret); + ok(errno == EINVAL, "expected errno EINVAL got %d\n", errno); /* Test NULL Source */ + errno = EBADF; szDest[0] = 'A'; ret = p_wcscpy_s(szDest, 18, NULL); ok(ret == EINVAL, "expected EINVAL got %d\n", ret); - ok(szDest[0] == 0, "szDest[0] not 0\n"); + ok(errno == EINVAL, "expected errno EINVAL got %d\n", errno); + ok(szDest[0] == 0, "szDest[0] not 0, got %c\n", szDest[0]); /* Test invalid size */ + errno = EBADF; szDest[0] = 'A'; ret = p_wcscpy_s(szDest, 0, szLongText); /* Later versions changed the return value for this case to EINVAL, * and don't modify the result if the dest size is 0. */ ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(errno == ERANGE || errno == EINVAL, "expected errno ERANGE/EINVAL got %d\n", errno); ok(szDest[0] == 0 || ret == EINVAL, "szDest[0] not 0\n"); /* Copy same buffer size */ @@ -831,14 +846,20 @@ ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); /* Copy smaller buffer size */ + errno = EBADF; szDest[0] = 'A'; ret = p_wcscpy_s(szDestShort, 8, szLongText); ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(errno == ERANGE || errno == EINVAL, "expected errno ERANGE/EINVAL got %d\n", errno); ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); if(!p_wcsncpy_s) { win_skip("wcsncpy_s not found\n"); + + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); return; } @@ -884,6 +905,10 @@ ok(ret == STRUNCATE, "expected ERROR_SUCCESS got %d\n", ret); ok(szDestShort[0]=='1' && szDestShort[1]=='1' && szDestShort[2]=='1' && szDestShort[3]=='1', "szDestShort = %s\n", wine_dbgstr_w(szDestShort)); + + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); } static void test__wcsupr_s(void) @@ -1318,6 +1343,26 @@ errno = 0; ul = strtoul("9223372036854775807L", &e, 0); ok(ul==4294967295ul, "wrong value %u\n", ul); + ok(errno == ERANGE, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-2", NULL, 0); + ok(ul == -2, "wrong value %u\n", ul); + ok(errno == 0, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-4294967294", NULL, 0); + ok(ul == 2, "wrong value %u\n", ul); + ok(errno == 0, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-4294967295", NULL, 0); + ok(ul==1, "wrong value %u\n", ul); + ok(errno == 0, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-4294967296", NULL, 0); + ok(ul == 1, "wrong value %u\n", ul); ok(errno == ERANGE, "wrong errno %d\n", errno); } @@ -1590,6 +1635,14 @@ wOut[4] = '!'; wOut[5] = '\0'; mOut[4] = '!'; mOut[5] = '\0'; + if(pmbstowcs_s) { + /* crashes on some systems */ + errno = 0xdeadbeef; + ret = mbstowcs(wOut, NULL, 4); + ok(ret == -1, "mbstowcs did not return -1\n"); + ok(errno == EINVAL, "errno = %d\n", errno); + } + ret = mbstowcs(NULL, mSimple, 0); ok(ret == 4, "mbstowcs did not return 4\n"); @@ -1840,6 +1893,11 @@ ok(!strcmp(buffer, "-12345678"), "Expected output buffer string to be \"-12345678\", got \"%s\"\n", buffer); + + itoa(100, buffer, 100); + ok(!strcmp(buffer, "10"), + "Expected output buffer string to be \"10\", got \"%s\"\n", buffer); + if (p_set_invalid_parameter_handler) ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); @@ -2189,6 +2247,24 @@ buffer); } +static void test__mbstok(void) +{ + const unsigned char delim[] = "t"; + + char str[] = "!.!test"; + unsigned char *ret; + + strtok(str, "!"); + + ret = _mbstok(NULL, delim); + /* most versions of msvcrt use the same buffer for strtok and _mbstok */ + ok(!ret || broken((char*)ret==str+4), + "_mbstok(NULL, \"t\") = %p, expected NULL (%p)\n", ret, str); + + ret = _mbstok(NULL, delim); + ok(!ret, "_mbstok(NULL, \"t\") = %p, expected NULL\n", ret); +} + static void test__ultoa_s(void) { errno_t ret; @@ -2336,36 +2412,66 @@ ret = p_wcrtomb((char*)dst, 0xffff, NULL); ok(ret == -1, "wcrtomb did not return -1\n"); - ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x20\n", dst[0]); + ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x3f\n", dst[0]); setlocale(LC_ALL, "C"); } static void test_tolower(void) { - int ret; - + char ch, lch; + int ret, len; + + /* test C locale when locale was never changed */ ret = p_tolower(0x41); ok(ret == 0x61, "ret = %x\n", ret); ret = p_tolower(0xF4); ok(ret == 0xF4, "ret = %x\n", ret); + errno = 0xdeadbeef; ret = p_tolower((char)0xF4); - ok(ret==0xF4/*Vista+*/ || ret==(char)0xF4, "ret = %x\n", ret); - - /* is it using different locale (CP_ACP) for negative values?? */ - /* current implementation matches msvcr90 behaviour */ + todo_wine ok(ret == (char)0xF4, "ret = %x\n", ret); + todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; ret = p_tolower((char)0xD0); - todo_wine ok(ret==0xF0/*Vista+*/ || ret==(char)0xD0, "ret = %x\n", ret); + todo_wine ok(ret == (char)0xD0, "ret = %x\n", ret); + todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + /* test C locale after setting locale */ + if(!setlocale(LC_ALL, "us")) { + win_skip("skipping tolower tests that depends on locale\n"); + return; + } + setlocale(LC_ALL, "C"); + + ch = 0xF4; + errno = 0xdeadbeef; + ret = p_tolower(ch); + len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1); + if(len) + ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret); + else + ok(ret == ch, "ret = %x\n", ret); + if(!len || ret==(unsigned char)lch) + ok(errno == EILSEQ, "errno = %d\n", errno); + + ch = 0xD0; + errno = 0xdeadbeef; + ret = p_tolower(ch); + len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1); + if(len) + ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret); + else + ok(ret == ch, "ret = %x\n", ret); + if(!len || ret==(unsigned char)lch) + ok(errno == EILSEQ, "errno = %d\n", errno); ret = p_tolower(0xD0); ok(ret == 0xD0, "ret = %x\n", ret); - if(!setlocale(LC_ALL, "us")) { - win_skip("skipping tolower tests that depends on locale\n"); - return; - } + ok(setlocale(LC_ALL, "us") != NULL, "setlocale failed\n"); ret = p_tolower((char)0xD0); ok(ret == 0xF0, "ret = %x\n", ret); @@ -2374,6 +2480,194 @@ ok(ret == 0xF0, "ret = %x\n", ret); setlocale(LC_ALL, "C"); +} + +static void test__atodbl(void) +{ + _CRT_DOUBLE d; + char num[32]; + int ret; + + if(!p__atodbl_l) { + /* Old versions of msvcrt use different values for _OVERFLOW and _UNDERFLOW + * Because of this lets skip _atodbl tests when _atodbl_l is not available */ + win_skip("_atodbl_l is not available\n"); + return; + } + + num[0] = 0; + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"\") returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + + strcpy(num, "t"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"t\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"t\") returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + + strcpy(num, "0"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"0\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"0\") returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + + strcpy(num, "123"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"123\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 123, "d.x = %lf, expected 123\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"123\") returned %d, expected 0\n", ret); + ok(d.x == 123, "d.x = %lf, expected 123\n", d.x); + + strcpy(num, "1e-309"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == _UNDERFLOW, "_atodbl_l(&d, \"1e-309\", NULL) returned %d, expected _UNDERFLOW\n", ret); + ok(d.x!=0 && almost_equal(d.x, 0), "d.x = %le, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == _UNDERFLOW, "_atodbl(&d, \"1e-309\") returned %d, expected _UNDERFLOW\n", ret); + ok(d.x!=0 && almost_equal(d.x, 0), "d.x = %le, expected 0\n", d.x); + + strcpy(num, "1e309"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == _OVERFLOW, "_atodbl_l(&d, \"1e309\", NULL) returned %d, expected _OVERFLOW\n", ret); + ret = _atodbl(&d, num); + ok(ret == _OVERFLOW, "_atodbl(&d, \"1e309\") returned %d, expected _OVERFLOW\n", ret); +} + +static void test__stricmp(void) +{ + int ret; + + ret = _stricmp("test", "test"); + ok(ret == 0, "_stricmp returned %d\n", ret); + ret = _stricmp("a", "z"); + ok(ret < 0, "_stricmp returned %d\n", ret); + ret = _stricmp("z", "a"); + ok(ret > 0, "_stricmp returned %d\n", ret); + ret = _stricmp("\xa5", "\xb9"); + ok(ret < 0, "_stricmp returned %d\n", ret); + + if(!setlocale(LC_ALL, "polish")) { + win_skip("stricmp tests\n"); + return; + } + + ret = _stricmp("test", "test"); + ok(ret == 0, "_stricmp returned %d\n", ret); + ret = _stricmp("a", "z"); + ok(ret < 0, "_stricmp returned %d\n", ret); + ret = _stricmp("z", "a"); + ok(ret > 0, "_stricmp returned %d\n", ret); + ret = _stricmp("\xa5", "\xb9"); + ok(ret == 0, "_stricmp returned %d\n", ret); + + setlocale(LC_ALL, "C"); +} + +static void test__wcstoi64(void) +{ + static const WCHAR digit[] = { '9', 0 }; + static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ + static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ + static const WCHAR thai[] = { 0x0e59, 0 }; /* THAI DIGIT NINE */ + static const WCHAR fullwidth[] = { 0xff19, 0 }; /* FULLWIDTH DIGIT NINE */ + static const WCHAR hex[] = { 0xff19, 'f', 0x0e59, 0xff46, 0 }; + + __int64 res; + unsigned __int64 ures; + WCHAR *endpos; + + if (!p_wcstoi64 || !p_wcstoui64) { + win_skip("_wcstoi64 or _wcstoui64 not found\n"); + return; + } + + res = p_wcstoi64(digit, NULL, 10); + ok(res == 9, "res != 9\n"); + res = p_wcstoi64(stock, &endpos, 10); + ok(res == 0, "res != 0\n"); + ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + res = p_wcstoi64(tamil, &endpos, 10); + ok(res == 0, "res != 0\n"); + ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); + res = p_wcstoi64(thai, NULL, 10); + todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(fullwidth, NULL, 10); + todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(hex, NULL, 16); + todo_wine ok(res == 0x9f9, "res != 0x9f9\n"); + + ures = p_wcstoui64(digit, NULL, 10); + ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(stock, &endpos, 10); + ok(ures == 0, "ures != 0\n"); + ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ures = p_wcstoui64(tamil, &endpos, 10); + ok(ures == 0, "ures != 0\n"); + ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); + ures = p_wcstoui64(thai, NULL, 10); + todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(fullwidth, NULL, 10); + todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(hex, NULL, 16); + todo_wine ok(ures == 0x9f9, "ures != 0x9f9\n"); + + return; +} + +static void test_atoi(void) +{ + int r; + + r = atoi("0"); + ok(r == 0, "atoi(0) = %d\n", r); + + r = atoi("-1"); + ok(r == -1, "atoi(-1) = %d\n", r); + + r = atoi("1"); + ok(r == 1, "atoi(1) = %d\n", r); + + r = atoi("4294967296"); + ok(r == 0, "atoi(4294967296) = %d\n", r); +} + +static void test_strncpy(void) +{ +#define TEST_STRNCPY_LEN 10 + char *ret; + char dst[TEST_STRNCPY_LEN + 1]; + char not_null_terminated[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'}; + + /* strlen(src) > TEST_STRNCPY_LEN */ + ret = strncpy(dst, "01234567890123456789", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); + + /* without null-terminated */ + ret = strncpy(dst, not_null_terminated, TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); + + /* strlen(src) < TEST_STRNCPY_LEN */ + strcpy(dst, "0123456789"); + ret = strncpy(dst, "012345", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strcmp(dst, "012345"), "dst != 012345\n"); + ok(dst[TEST_STRNCPY_LEN - 1] == '\0', "dst[TEST_STRNCPY_LEN - 1] != 0\n"); + + /* strlen(src) == TEST_STRNCPY_LEN */ + ret = strncpy(dst, "0123456789", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); } START_TEST(string) @@ -2403,6 +2697,8 @@ p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); p_strtoi64 = (void *)GetProcAddress(hMsvcrt, "_strtoi64"); p_strtoui64 = (void *)GetProcAddress(hMsvcrt, "_strtoui64"); + p_wcstoi64 = (void *)GetProcAddress(hMsvcrt, "_wcstoi64"); + p_wcstoui64 = (void *)GetProcAddress(hMsvcrt, "_wcstoui64"); pmbstowcs_s = (void *)GetProcAddress(hMsvcrt, "mbstowcs_s"); pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); pwcsrtombs = (void *)GetProcAddress(hMsvcrt, "wcsrtombs"); @@ -2420,6 +2716,7 @@ p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); + p__atodbl_l = (void*)GetProcAddress(hMsvcrt, "_atodbl_l"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -2429,15 +2726,12 @@ ok(pmemcmp(mem+5,xilstring, nLen) == 0, "Got result %s\n",mem+5); - /* Test _swab function */ + /* run tolower tests first */ + test_tolower(); test_swab(); - - /* Test ismbblead*/ test_mbcp(); - /* test _mbsspn */ test_mbsspn(); test_mbsspnp(); - /* test _strdup */ test_strdup(); test_strcpy_s(); test_memcpy_s(); @@ -2450,6 +2744,7 @@ test_mbctombb(); test_ismbclegal(); test_strtok(); + test__mbstok(); test_wcscpy_s(); test__wcsupr_s(); test_strtol(); @@ -2468,5 +2763,9 @@ test__mbslwr_s(); test_wctob(); test_wctomb(); - test_tolower(); -} + test__atodbl(); + test__stricmp(); + test__wcstoi64(); + test_atoi(); + test_strncpy(); +} Modified: trunk/rostests/winetests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/testlist… ============================================================================== --- trunk/rostests/winetests/msvcrt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/testlist.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_cpp(void); extern void func_data(void); Modified: trunk/rostests/winetests/msvcrt/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/time.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/time.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/time.c [iso-8859-1] Sun Apr 20 13:10:24 2014 @@ -46,13 +46,15 @@ static errno_t (__cdecl *p_localtime64_s)(struct tm*, __time64_t*); static int* (__cdecl *p__daylight)(void); static int* (__cdecl *p___p__daylight)(void); +static long* (__cdecl *p___p__dstbias)(void); +static long* (__cdecl *p___p__timezone)(void); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static size_t (__cdecl *p_wcsftime)(wchar_t *, size_t, const wchar_t *, const struct tm *); static char* (__cdecl *p_asctime)(const struct tm *); static void init(void) { - HMODULE hmod = LoadLibrary("msvcrt.dll"); + HMODULE hmod = LoadLibraryA("msvcrt.dll"); p_gmtime32 = (void*)GetProcAddress(hmod, "_gmtime32"); p_gmtime = (void*)GetProcAddress(hmod, "gmtime"); @@ -64,6 +66,8 @@ p_localtime64_s = (void*)GetProcAddress(hmod, "_localtime64_s"); p__daylight = (void*)GetProcAddress(hmod, "__daylight"); p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); + p___p__dstbias = (void*)GetProcAddress(hmod, "__p__dstbias"); + p___p__timezone = (void*)GetProcAddress(hmod, "__p__timezone"); p_strftime = (void*)GetProcAddress(hmod, "strftime"); p_wcsftime = (void*)GetProcAddress(hmod, "wcsftime"); p_asctime = (void*)GetProcAddress(hmod, "asctime"); @@ -105,7 +109,7 @@ gmt = -1; gmt_tm = p_gmtime32(&gmt); - ok(gmt_tm == NULL, "gmt_tm != NULL\n"); + ok(gmt_tm==NULL || broken(gmt_tm->tm_year==70 && gmt_tm->tm_sec<0), "gmt_tm != NULL\n"); gmt = valid = 0; gmt_tm = p_gmtime32(&gmt); @@ -177,9 +181,12 @@ errno = 0; gmt = -1; err = p_gmtime32_s(&gmt_tm_s, &gmt); - ok(err == EINVAL, "err = %d\n", err); - ok(errno == EINVAL, "errno = %d\n", errno); - ok(gmt_tm_s.tm_year == -1, "tm_year = %d\n", gmt_tm_s.tm_year); + ok(gmt_tm_s.tm_year == -1 || broken(gmt_tm_s.tm_year == 70 && gmt_tm_s.tm_sec < 0), + "tm_year = %d, tm_sec = %d\n", gmt_tm_s.tm_year, gmt_tm_s.tm_sec); + if(gmt_tm_s.tm_year == -1) { + ok(err==EINVAL, "err = %d\n", err); + ok(errno==EINVAL, "errno = %d\n", errno); + } } static void test_mktime(void) @@ -804,10 +811,68 @@ ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); } +static void test__tzset(void) +{ + char TZ_env[256]; + int ret; + + if(!p___p__daylight || !p___p__timezone || !p___p__dstbias) { + win_skip("__p__daylight, __p__timezone or __p__dstbias is not available\n"); + return; + } + + _snprintf(TZ_env,255,"TZ=%s",(getenv("TZ")?getenv("TZ"):"")); + + ret = *p___p__daylight(); + ok(ret == 1, "*__p__daylight() = %d\n", ret); + ret = *p___p__timezone(); + ok(ret == 28800, "*__p__timezone() = %d\n", ret); + ret = *p___p__dstbias(); + ok(ret == -3600, "*__p__dstbias() = %d\n", ret); + + _putenv("TZ=xxx+1yyy"); + _tzset(); + ret = *p___p__daylight(); + ok(ret == 121, "*__p__daylight() = %d\n", ret); + ret = *p___p__timezone(); + ok(ret == 3600, "*__p__timezone() = %d\n", ret); + ret = *p___p__dstbias(); + ok(ret == -3600, "*__p__dstbias() = %d\n", ret); + + *p___p__dstbias() = 0; + _putenv("TZ=xxx+1:3:5zzz"); + _tzset(); + ret = *p___p__daylight(); + ok(ret == 122, "*__p__daylight() = %d\n", ret); + ret = *p___p__timezone(); + ok(ret == 3785, "*__p__timezone() = %d\n", ret); + ret = *p___p__dstbias(); + ok(ret == 0, "*__p__dstbias() = %d\n", ret); + + _putenv(TZ_env); +} + +static void test_clock(void) +{ + static const int THRESH = 50; + clock_t s, e; + int i; + + for (i = 0; i < 10; i++) + { + s = clock(); + Sleep(1000); + e = clock(); + + ok(abs((e-s) - 1000) < THRESH, "clock off on loop %i: %i\n", i, e-s); + } +} + START_TEST(time) { init(); + test__tzset(); test_strftime(); test_ctime(); test_gmtime(); @@ -821,4 +886,5 @@ test_localtime64_s(); test_daylight(); test_asctime(); -} + test_clock(); +}

10 years, 5 months

[akhaldi] 62835: [GDI32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 20 13:01:01 2014 New Revision: 62835 URL: http://svn.reactos.org/svn/reactos?rev=62835&view=rev Log: [GDI32_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Added: trunk/rostests/winetests/gdi32/wine_vdmx.sfd (with props) trunk/rostests/winetests/gdi32/wine_vdmx.ttf (with props) Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt trunk/rostests/winetests/gdi32/bitmap.c trunk/rostests/winetests/gdi32/brush.c trunk/rostests/winetests/gdi32/clipping.c trunk/rostests/winetests/gdi32/dc.c trunk/rostests/winetests/gdi32/dib.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/gdiobj.c trunk/rostests/winetests/gdi32/generated.c trunk/rostests/winetests/gdi32/mapping.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/gdi32/palette.c trunk/rostests/winetests/gdi32/path.c trunk/rostests/winetests/gdi32/pen.c trunk/rostests/winetests/gdi32/resource.rc trunk/rostests/winetests/gdi32/testlist.c trunk/rostests/winetests/gdi32/vertical.sfd trunk/rostests/winetests/gdi32/vertical.ttf trunk/rostests/winetests/gdi32/wine_test.sfd trunk/rostests/winetests/gdi32/wine_test.ttf [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… Modified: trunk/rostests/winetests/gdi32/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/brush.c?r… Modified: trunk/rostests/winetests/gdi32/clipping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/clipping.… Modified: trunk/rostests/winetests/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dc.c?rev=… Modified: trunk/rostests/winetests/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dib.c?rev… Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… Modified: trunk/rostests/winetests/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/gdiobj.c?… Modified: trunk/rostests/winetests/gdi32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/generated… Modified: trunk/rostests/winetests/gdi32/mapping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/mapping.c… Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… Modified: trunk/rostests/winetests/gdi32/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/palette.c… Modified: trunk/rostests/winetests/gdi32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/path.c?re… Modified: trunk/rostests/winetests/gdi32/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/pen.c?rev… Modified: trunk/rostests/winetests/gdi32/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/resource.… Modified: trunk/rostests/winetests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/testlist.… Modified: trunk/rostests/winetests/gdi32/vertical.sfd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/vertical.… Modified: trunk/rostests/winetests/gdi32/vertical.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/vertical.… Modified: trunk/rostests/winetests/gdi32/wine_test.sfd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/wine_test… Modified: trunk/rostests/winetests/gdi32/wine_test.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/wine_test… Added: trunk/rostests/winetests/gdi32/wine_vdmx.sfd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/wine_vdmx… Added: trunk/rostests/winetests/gdi32/wine_vdmx.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/wine_vdmx…

10 years, 5 months

[akhaldi] 62834: [SETUPAPI_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 20 12:37:05 2014 New Revision: 62834 URL: http://svn.reactos.org/svn/reactos?rev=62834&view=rev Log: [SETUPAPI_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/setupapi/devclass.c trunk/rostests/winetests/setupapi/devinst.c trunk/rostests/winetests/setupapi/diskspace.c trunk/rostests/winetests/setupapi/install.c trunk/rostests/winetests/setupapi/misc.c trunk/rostests/winetests/setupapi/parser.c trunk/rostests/winetests/setupapi/query.c trunk/rostests/winetests/setupapi/setupcab.c trunk/rostests/winetests/setupapi/stringtable.c Modified: trunk/rostests/winetests/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/devcla… ============================================================================== --- trunk/rostests/winetests/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/devclass.c [iso-8859-1] Sun Apr 20 12:37:05 2014 @@ -22,6 +22,7 @@ #include <stdarg.h> #include <stdio.h> +#undef __WINESRC__ #undef __ROS_LONG64__ #include "windef.h" #include "winbase.h" Modified: trunk/rostests/winetests/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/devins… ============================================================================== --- trunk/rostests/winetests/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/devinst.c [iso-8859-1] Sun Apr 20 12:37:05 2014 @@ -52,8 +52,8 @@ static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailW)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); -static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(CONST GUID *, LPCSTR, HWND, DWORD); -static HDEVINFO (WINAPI *pSetupDiGetClassDevsW)(CONST GUID *, LPCWSTR, HWND, DWORD); +static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(const GUID *, LPCSTR, HWND, DWORD); +static HDEVINFO (WINAPI *pSetupDiGetClassDevsW)(const GUID *, LPCWSTR, HWND, DWORD); static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD); @@ -241,7 +241,7 @@ * the keys under the DeviceClasses key after a SetupDiDestroyDeviceInfoList. */ RegOpenKeyW(HKEY_LOCAL_MACHINE, devclass, &key); - RegQueryInfoKey(key, NULL, NULL, NULL, &subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + RegQueryInfoKeyW(key, NULL, NULL, NULL, &subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (subkeys > 0) { trace("We are most likely on Windows 2000\n"); @@ -342,8 +342,8 @@ static void create_inf_file(LPCSTR filename) { DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); static const char data[] = "[Version]\n" @@ -410,7 +410,7 @@ ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey), "Couldn't delete classkey\n"); - DeleteFile(tmpfile); + DeleteFileA(tmpfile); } static void testCreateDeviceInfo(void) @@ -533,7 +533,7 @@ DWORD subkeys; /* Check if we have subkeys */ - RegQueryInfoKey(key, NULL, NULL, NULL, &subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + RegQueryInfoKeyA(key, NULL, NULL, NULL, &subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (subkeys > 0) { int i; @@ -1370,6 +1370,7 @@ { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; + static const char* signatures[] = {"\"$CHICAGO$\"", "\"$Windows NT$\""}; char cn[MAX_PATH]; char filename[MAX_PATH]; @@ -1377,6 +1378,7 @@ BOOL retval; GUID guid; HANDLE h; + int i; if(!pSetupDiGetINFClassA) { @@ -1444,96 +1446,100 @@ retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); - - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - - WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); - - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - - WritePrivateProfileStringA("Version", "Class", "WINE", filename); - - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); - - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); - - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(count == 5, "expected count==5, got %u\n", count); - - /* invalid parameter */ - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); - - DeleteFileA(filename); - - WritePrivateProfileStringA("Version", "Signature", "\"$CHICAGO$\"", filename); - WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); - - SetLastError(0xdeadbeef); - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); - - /* network adapter guid */ - WritePrivateProfileStringA("Version", "ClassGUID", - "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); - - /* this test succeeds only if the guid is known to the system */ - count = 0xdeadbeef; - retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); - ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); - todo_wine - ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); - - DeleteFileA(filename); + for(i=0; i < sizeof(signatures)/sizeof(char*); i++) + { + trace("testing signarture %s\n", signatures[i]); + h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h == INVALID_HANDLE_VALUE) + { + win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); + return; + } + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + WritePrivateProfileStringA("Version", "Signature", signatures[i], filename); + + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + + WritePrivateProfileStringA("Version", "Class", "WINE", filename); + + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, 5, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 4, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + ok(count == 5, "expected count==5, got %u\n", count); + + /* invalid parameter */ + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(NULL, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, NULL, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, NULL, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + DeleteFileA(filename); + + WritePrivateProfileStringA("Version", "Signature", signatures[i], filename); + WritePrivateProfileStringA("Version", "ClassGUID", "WINE", filename); + + SetLastError(0xdeadbeef); + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); + ok(RPC_S_INVALID_STRING_UUID == GetLastError() || + ERROR_INVALID_PARAMETER == GetLastError(), + "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " + "got %u\n", GetLastError()); + + /* network adapter guid */ + WritePrivateProfileStringA("Version", "ClassGUID", + "{4d36e972-e325-11ce-bfc1-08002be10318}", filename); + + /* this test succeeds only if the guid is known to the system */ + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); + ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + todo_wine + ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); + + DeleteFileA(filename); + } } START_TEST(devinst) Modified: trunk/rostests/winetests/setupapi/diskspace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/disksp… ============================================================================== --- trunk/rostests/winetests/setupapi/diskspace.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/diskspace.c [iso-8859-1] Sun Apr 20 12:37:05 2014 @@ -29,6 +29,8 @@ #include "wine/test.h" +static BOOL is_win9x; + static void test_SetupCreateDiskSpaceListA(void) { HDSKSPC ret; @@ -149,8 +151,6 @@ static void test_SetupDuplicateDiskSpaceListA(void) { HDSKSPC handle, duplicate; - int is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && - GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; if (is_win9x) win_skip("SetupDuplicateDiskSpaceListA crashes with NULL disk space handle on Win9x\n"); @@ -305,8 +305,6 @@ BOOL ret; HDSKSPC handle; LONGLONG space; - int is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && - GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; if (is_win9x) win_skip("SetupQuerySpaceRequiredOnDriveA crashes with NULL disk space handle on Win9x\n"); @@ -476,6 +474,8 @@ START_TEST(diskspace) { + is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; test_SetupCreateDiskSpaceListA(); test_SetupCreateDiskSpaceListW(); test_SetupDuplicateDiskSpaceListA(); Modified: trunk/rostests/winetests/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/instal… ============================================================================== --- trunk/rostests/winetests/setupapi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/install.c [iso-8859-1] Sun Apr 20 12:37:05 2014 @@ -63,7 +63,7 @@ static void create_inf_file(LPCSTR filename, const char *data) { DWORD res; - HANDLE handle = CreateFile(filename, GENERIC_WRITE, 0, NULL, + HANDLE handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(handle != INVALID_HANDLE_VALUE); assert(WriteFile(handle, data, strlen(data), &res, NULL)); @@ -107,7 +107,7 @@ LONG ret; /* Functional tests for success of install and clean up */ - ret = RegDeleteKey(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest"); + ret = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest"); ok((expectsuccess && ret == ERROR_SUCCESS) || (!expectsuccess && ret == ERROR_FILE_NOT_FOUND), "Expected registry key Software\\Wine\\setupapitest to %s, RegDeleteKey returned %d\n", @@ -126,7 +126,7 @@ sprintf(path, "%s\\%s", CURR_DIR, inffile); run_cmdline("DefaultInstall", 128, path); ok_registry(TRUE); - ret = DeleteFile(inffile); + ret = DeleteFileA(inffile); ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); /* Test handling of spaces in path, unquoted and quoted */ @@ -140,7 +140,7 @@ run_cmdline("DefaultInstall", 128, path); ok_registry(FALSE); - ret = DeleteFile(infwithspaces); + ret = DeleteFileA(infwithspaces); ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } @@ -180,7 +180,7 @@ RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest"); RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest"); } - ret = DeleteFile(inffile); + ret = DeleteFileA(inffile); ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } @@ -216,7 +216,7 @@ ok(GetLastError() == ERROR_SECTION_NOT_FOUND, "Expected ERROR_SECTION_NOT_FOUND, got %08x\n", GetLastError()); SetupCloseInfFile(infhandle); - DeleteFile(inffile); + DeleteFileA(inffile); /* Add the section */ strcat(inf, "[Winetest.Services]\n"); @@ -228,7 +228,7 @@ ok(GetLastError() == ERROR_SECTION_NOT_FOUND, "Expected ERROR_SECTION_NOT_FOUND, got %08x\n", GetLastError()); SetupCloseInfFile(infhandle); - DeleteFile(inffile); + DeleteFileA(inffile); /* Add a reference */ strcat(inf, "AddService=Winetest,,Winetest.Service\n"); @@ -240,7 +240,7 @@ ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", GetLastError()); SetupCloseInfFile(infhandle); - DeleteFile(inffile); + DeleteFileA(inffile); /* Add the section */ strcat(inf, "[Winetest.Service]\n"); @@ -252,7 +252,7 @@ ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", GetLastError()); SetupCloseInfFile(infhandle); - DeleteFile(inffile); + DeleteFileA(inffile); /* Just the ServiceBinary */ strcat(inf, "ServiceBinary=%12%\\winetest.sys\n"); @@ -264,7 +264,7 @@ ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", GetLastError()); SetupCloseInfFile(infhandle); - DeleteFile(inffile); + DeleteFileA(inffile); /* Add the ServiceType */ strcat(inf, "ServiceType=1\n"); @@ -276,7 +276,7 @@ ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", GetLastError()); SetupCloseInfFile(infhandle); - DeleteFile(inffile); + DeleteFileA(inffile); /* Add the StartType */ strcat(inf, "StartType=4\n"); @@ -288,7 +288,7 @@ ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", GetLastError()); SetupCloseInfFile(infhandle); - DeleteFile(inffile); + DeleteFileA(inffile); /* This should be it, the minimal entries to install a service */ strcat(inf, "ErrorControl=1"); @@ -300,14 +300,14 @@ { skip("Not enough rights to install the service\n"); SetupCloseInfFile(infhandle); - DeleteFile(inffile); + DeleteFileA(inffile); return; } ok(ret, "Expected success\n"); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); SetupCloseInfFile(infhandle); - DeleteFile(inffile); + DeleteFileA(inffile); scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); @@ -334,7 +334,7 @@ ok(ret, "Expected success\n"); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); SetupCloseInfFile(infhandle); - DeleteFile(inffile); + DeleteFileA(inffile); /* TODO: Test the Flags */ } @@ -395,7 +395,7 @@ run_cmdline("DefaultInstall", 128, path); /* Driver should have been installed */ - attrs = GetFileAttributes(driver); + attrs = GetFileAttributesA(driver); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected driver to exist\n"); scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); @@ -412,9 +412,9 @@ CloseServiceHandle(scm_handle); /* File cleanup */ - DeleteFile(inffile); - DeleteFile("winetest.sys"); - DeleteFile(driver); + DeleteFileA(inffile); + DeleteFileA("winetest.sys"); + DeleteFileA(driver); } static void test_profile_items(void) @@ -458,34 +458,34 @@ run_cmdline("DefaultInstall", 128, path); snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); - if (INVALID_FILE_ATTRIBUTES == GetFileAttributes(path)) + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesA(path)) { win_skip("ProfileItems not implemented on this system\n"); } else { snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); - ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "directory not created\n"); + ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "directory not created\n"); snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); - ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "link not created\n"); + ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "link not created\n"); snprintf(path, MAX_PATH, "%s\\TestGroup", commonprogs); - ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "group not created\n"); + ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "group not created\n"); } snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); - DeleteFile(path); + DeleteFileA(path); snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); - DeleteFile(path); + DeleteFileA(path); snprintf(path, MAX_PATH, "%s\\TestItem2.lnk", commonprogs); - DeleteFile(path); + DeleteFileA(path); snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); - RemoveDirectory(path); + RemoveDirectoryA(path); snprintf(path, MAX_PATH, "%s\\TestGroup", commonprogs); - RemoveDirectory(path); + RemoveDirectoryA(path); cleanup: if (hShell32) FreeLibrary(hShell32); - DeleteFile(inffile); + DeleteFileA(inffile); } static void test_inffilelistA(void) @@ -541,8 +541,8 @@ ok(!lstrcmpA(p,inffile2) || !lstrcmpA(p,inffile), "unexpected filename %s\n",p); - DeleteFile(inffile); - DeleteFile(inffile2); + DeleteFileA(inffile); + DeleteFileA(inffile2); SetCurrentDirectoryA(CURR_DIR); RemoveDirectoryA(dir); } @@ -711,22 +711,22 @@ ok(!lstrcmpW(p,inffile2W) || !lstrcmpW(p,inffileW) || !lstrcmpW(p,invalid_infW), "unexpected filename %s\n",wine_dbgstr_w(p)); - DeleteFile(inffile); - DeleteFile(inffile2); - DeleteFile(invalid_inf); + DeleteFileA(inffile); + DeleteFileA(inffile2); + DeleteFileA(invalid_inf); SetCurrentDirectoryA(CURR_DIR); RemoveDirectoryA(dirA); } START_TEST(install) { - HMODULE hsetupapi = GetModuleHandle("setupapi.dll"); + HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); char temp_path[MAX_PATH], prev_path[MAX_PATH]; DWORD len; - GetCurrentDirectory(MAX_PATH, prev_path); - GetTempPath(MAX_PATH, temp_path); - SetCurrentDirectory(temp_path); + GetCurrentDirectoryA(MAX_PATH, prev_path); + GetTempPathA(MAX_PATH, temp_path); + SetCurrentDirectoryA(temp_path); strcpy(CURR_DIR, temp_path); len = strlen(CURR_DIR); @@ -753,7 +753,7 @@ skip("InstallHinfSectionA is broken (stub)\n"); pInstallHinfSectionA = NULL; } - ret = DeleteFile(inffile); + ret = DeleteFileA(inffile); ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } if (!pInstallHinfSectionW && !pInstallHinfSectionA) @@ -779,5 +779,5 @@ test_inffilelist(); test_inffilelistA(); - SetCurrentDirectory(prev_path); -} + SetCurrentDirectoryA(prev_path); +} Modified: trunk/rostests/winetests/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/misc.c… ============================================================================== --- trunk/rostests/winetests/setupapi/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/misc.c [iso-8859-1] Sun Apr 20 12:37:05 2014 @@ -51,8 +51,8 @@ static void create_inf_file(LPCSTR filename) { DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); static const char data[] = "[Version]\n" @@ -72,15 +72,15 @@ CHAR temp[MAX_PATH]; LPSTR ptr; - GetTempFileName(CURR_DIR, "set", 0, temp); + GetTempFileNameA(CURR_DIR, "set", 0, temp); ptr = strrchr(temp, '\\'); - lstrcpy(path, ptr + 1); + strcpy(path, ptr + 1); } static BOOL file_exists(LPSTR path) { - return GetFileAttributes(path) != INVALID_FILE_ATTRIBUTES; + return GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES; } static BOOL check_format(LPSTR path, LPSTR inf) @@ -90,19 +90,19 @@ static const CHAR format[] = "\\INF\\oem"; - GetWindowsDirectory(check, MAX_PATH); - lstrcat(check, format); - res = CompareString(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, check, -1, path, lstrlen(check)) == CSTR_EQUAL && - path[lstrlen(check)] != '\\'; - - return (!inf) ? res : res && (inf == path + lstrlen(check) - 3); + GetWindowsDirectoryA(check, MAX_PATH); + strcat(check, format); + res = CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, check, -1, path, strlen(check)) == CSTR_EQUAL && + path[strlen(check)] != '\\'; + + return (!inf) ? res : res && (inf == path + strlen(check) - 3); } static void test_original_file_name(LPCSTR original, LPCSTR dest) { HINF hinf; PSP_INF_INFORMATION pspii; - SP_ORIGINAL_FILE_INFO spofi; + SP_ORIGINAL_FILE_INFO_A spofi; BOOL res; DWORD size; @@ -115,12 +115,12 @@ hinf = SetupOpenInfFileA(dest, NULL, INF_STYLE_WIN4, NULL); ok(hinf != NULL, "SetupOpenInfFileA failed with error %d\n", GetLastError()); - res = SetupGetInfInformation(hinf, INFINFO_INF_SPEC_IS_HINF, NULL, 0, &size); + res = SetupGetInfInformationA(hinf, INFINFO_INF_SPEC_IS_HINF, NULL, 0, &size); ok(res, "SetupGetInfInformation failed with error %d\n", GetLastError()); pspii = HeapAlloc(GetProcessHeap(), 0, size); - res = SetupGetInfInformation(hinf, INFINFO_INF_SPEC_IS_HINF, pspii, size, NULL); + res = SetupGetInfInformationA(hinf, INFINFO_INF_SPEC_IS_HINF, pspii, size, NULL); ok(res, "SetupGetInfInformation failed with error %d\n", GetLastError()); spofi.cbSize = 0; @@ -173,8 +173,8 @@ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); /* try an absolute nonexistent SourceInfFileName */ - lstrcpy(path, CURR_DIR); - lstrcat(path, "\\nonexistent"); + strcpy(path, CURR_DIR); + strcat(path, "\\nonexistent"); SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(path, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); @@ -207,7 +207,7 @@ * popups during the installation though as it also needs a catalog file (signed?). */ win_skip("Needs a different inf file on Vista+\n"); - DeleteFile(tmpfile); + DeleteFileA(tmpfile); return; } @@ -225,9 +225,9 @@ ok(file_exists(tmpfile), "Expected source inf to exist\n"); /* try an absolute SourceInfFileName, without DestinationInfFileName */ - lstrcpy(path, CURR_DIR); - lstrcat(path, "\\"); - lstrcat(path, tmpfile); + strcpy(path, CURR_DIR); + strcat(path, "\\"); + strcat(path, tmpfile); SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, NULL, 0, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); @@ -253,18 +253,18 @@ res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(lstrlen(dest) != 0, "Expected a non-zero length string\n"); + ok(strlen(dest) != 0, "Expected a non-zero length string\n"); ok(file_exists(dest), "Expected destination inf to exist\n"); ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); ok(file_exists(path), "Expected source inf to exist\n"); - lstrcpy(dest_save, dest); - DeleteFile(dest_save); + strcpy(dest_save, dest); + DeleteFileA(dest_save); /* get the DestinationInfFileName, DestinationInfFileNameSize is too small * - inf is still copied */ - lstrcpy(dest, "aaa"); + strcpy(dest, "aaa"); size = 0; SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, 5, &size, NULL); @@ -273,19 +273,19 @@ "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(file_exists(path), "Expected source inf to exist\n"); ok(file_exists(dest_save), "Expected dest inf to exist\n"); - ok(!lstrcmp(dest, "aaa"), "Expected dest to be unchanged\n"); - ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); + ok(!strcmp(dest, "aaa"), "Expected dest to be unchanged\n"); + ok(size == strlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); /* get the DestinationInfFileName and DestinationInfFileNameSize */ SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(lstrlen(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlen(dest), size); + ok(lstrlenA(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlenA(dest), size); ok(file_exists(dest), "Expected destination inf to exist\n"); ok(check_format(dest, NULL), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); ok(file_exists(path), "Expected source inf to exist\n"); - ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); + ok(size == lstrlenA(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); test_original_file_name(strrchr(path, '\\') + 1, dest); @@ -294,14 +294,14 @@ res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, &inf); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(lstrlen(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlen(dest), size); + ok(lstrlenA(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlenA(dest), size); ok(file_exists(dest), "Expected destination inf to exist\n"); ok((inf && inf[0] != 0) || broken(!inf), /* Win98 */ "Expected inf to point to the filename\n"); ok(check_format(dest, inf), "Expected %%windir%%\\inf\\OEMx.inf, got %s\n", dest); ok(file_exists(path), "Expected source inf to exist\n"); - ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); + ok(size == lstrlenA(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); /* try SP_COPY_DELETESOURCE */ SetLastError(0xdeadbeef); @@ -733,7 +733,7 @@ START_TEST(misc) { - HMODULE hsetupapi = GetModuleHandle("setupapi.dll"); + HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); pSetupGetFileCompressionInfoExA = (void*)GetProcAddress(hsetupapi, "SetupGetFileCompressionInfoExA"); pSetupCopyOEMInfA = (void*)GetProcAddress(hsetupapi, "SetupCopyOEMInfA"); Modified: trunk/rostests/winetests/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/parser… ============================================================================== --- trunk/rostests/winetests/setupapi/parser.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/parser.c [iso-8859-1] Sun Apr 20 12:37:05 2014 @@ -103,36 +103,36 @@ const char *data; DWORD error; UINT err_line; - int todo; + BOOL todo; } invalid_files[] = { /* file contents expected error (or 0) errline todo */ - { "\r\n", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "abcd\r\n", ERROR_WRONG_INF_STYLE, 0, 1 }, - { "[Version]\r\n", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "[Version]\nSignature=", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "[Version]\nSignature=foo", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "[version]\nsignature=$chicago$", 0, 0, 0 }, - { "[VERSION]\nSIGNATURE=$CHICAGO$", 0, 0, 0 }, - { "[Version]\nSignature=$chicago$,abcd", 0, 0, 0 }, - { "[Version]\nabc=def\nSignature=$chicago$", 0, 0, 0 }, - { "[Version]\nabc=def\n[Version]\nSignature=$chicago$", 0, 0, 0 }, - { STD_HEADER, 0, 0, 0 }, - { STD_HEADER "[]\r\n", 0, 0, 0 }, - { STD_HEADER "]\r\n", 0, 0, 0 }, - { STD_HEADER "[" A255 "]\r\n", 0, 0, 0 }, - { STD_HEADER "[ab\r\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER "\n\n[ab\x1a]\n", ERROR_BAD_SECTION_NAME_LINE, 5, 0 }, - { STD_HEADER "[" A256 "]\r\n", ERROR_SECTION_NAME_TOO_LONG, 3, 0 }, - { "[abc]\n" STD_HEADER, 0, 0, 0 }, - { "abc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, 0 }, - { ";\n;\nabc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, 0 }, - { ";\n;\nab\nab\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, 0 }, - { ";aa\n;bb\n" STD_HEADER, 0, 0, 0 }, - { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, + { "\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "abcd\r\n", ERROR_WRONG_INF_STYLE, 0, TRUE }, + { "[Version]\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "[Version]\nSignature=", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "[Version]\nSignature=foo", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "[version]\nsignature=$chicago$", 0, 0, FALSE }, + { "[VERSION]\nSIGNATURE=$CHICAGO$", 0, 0, FALSE }, + { "[Version]\nSignature=$chicago$,abcd", 0, 0, FALSE }, + { "[Version]\nabc=def\nSignature=$chicago$", 0, 0, FALSE }, + { "[Version]\nabc=def\n[Version]\nSignature=$chicago$", 0, 0, FALSE }, + { STD_HEADER, 0, 0, FALSE }, + { STD_HEADER "[]\r\n", 0, 0, FALSE }, + { STD_HEADER "]\r\n", 0, 0, FALSE }, + { STD_HEADER "[" A255 "]\r\n", 0, 0, FALSE }, + { STD_HEADER "[ab\r\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER "\n\n[ab\x1a]\n", ERROR_BAD_SECTION_NAME_LINE, 5, FALSE }, + { STD_HEADER "[" A256 "]\r\n", ERROR_SECTION_NAME_TOO_LONG, 3, FALSE }, + { "[abc]\n" STD_HEADER, 0, 0, FALSE }, + { "abc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { ";\n;\nabc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, + { ";\n;\nab\nab\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, + { ";aa\n;bb\n" STD_HEADER, 0, 0, FALSE }, + { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, }; static void test_invalid_files(void) @@ -290,8 +290,8 @@ ret = pSetupEnumInfSectionsA( hinf, index, buffer, sizeof(buffer), &len ); ok( ret, "SetupEnumInfSectionsA failed err %u\n", GetLastError() ); ok( len == 3 || len == 8, "wrong len %u\n", len ); - ok( !lstrcmpi( buffer, "version" ) || !lstrcmpi( buffer, "s1" ) || - !lstrcmpi( buffer, "s2" ) || !lstrcmpi( buffer, "s3" ) || !lstrcmpi( buffer, "strings" ), + ok( !lstrcmpiA( buffer, "version" ) || !lstrcmpiA( buffer, "s1" ) || + !lstrcmpiA( buffer, "s2" ) || !lstrcmpiA( buffer, "s3" ) || !lstrcmpiA( buffer, "strings" ), "bad section '%s'\n", buffer ); } SetupCloseInfFile( hinf ); @@ -542,7 +542,7 @@ hinf = test_file_contents( contents, &err ); ok( hinf != NULL, "Expected valid INF file\n" ); - ret = SetupFindFirstLine( hinf, "FileBranchInfo", NULL, &context ); + ret = SetupFindFirstLineA( hinf, "FileBranchInfo", NULL, &context ); ok( ret, "Failed to find first line\n" ); /* native Windows crashes if a NULL context is sent in */ Modified: trunk/rostests/winetests/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/query.… ============================================================================== --- trunk/rostests/winetests/setupapi/query.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/query.c [iso-8859-1] Sun Apr 20 12:37:05 2014 @@ -102,8 +102,8 @@ static void create_inf_file(LPSTR filename, const char *data, DWORD size) { DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); WriteFile(hf, data, size, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); } Modified: trunk/rostests/winetests/setupapi/setupcab.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/setupc… ============================================================================== --- trunk/rostests/winetests/setupapi/setupcab.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/setupcab.c [iso-8859-1] Sun Apr 20 12:37:05 2014 @@ -91,7 +91,7 @@ const struct { PCSTR CabinetFile; - PSP_FILE_CALLBACK MsgHandler; + PSP_FILE_CALLBACK_A MsgHandler; DWORD expected_lasterror; int todo_lasterror; } invalid_parameters[] = @@ -161,7 +161,7 @@ const struct { PCWSTR CabinetFile; - PSP_FILE_CALLBACK MsgHandler; + PSP_FILE_CALLBACK_W MsgHandler; DWORD expected_lasterror; int todo_lasterror; } invalid_parameters[] = Modified: trunk/rostests/winetests/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/string… ============================================================================== --- trunk/rostests/winetests/setupapi/stringtable.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/stringtable.c [iso-8859-1] Sun Apr 20 12:37:05 2014 @@ -48,10 +48,6 @@ static DWORD (WINAPI *pStringTableLookUpString)(HSTRING_TABLE, LPWSTR, DWORD); static DWORD (WINAPI *pStringTableLookUpStringEx)(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); static LPWSTR (WINAPI *pStringTableStringFromId)(HSTRING_TABLE, DWORD); -#if 0 -static BOOL (WINAPI *pStringTableStringFromIdEx)(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); -static VOID (WINAPI *pStringTableTrim)(HSTRING_TABLE); -#endif static HMODULE hdll; static WCHAR string[] = {'s','t','r','i','n','g',0};

10 years, 5 months

[hbelusca] 62833: [KERNEL32][CONSRV] Make kernel32 / winsrv console CSR structures Win2k3-compliant. The aim is to be able to put our kernel32.dll or winsrv.dll on win2k3, and vice-versa. Part 2/X ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Apr 20 11:25:38 2014 New Revision: 62833 URL: http://svn.reactos.org/svn/reactos?rev=62833&view=rev Log: [KERNEL32][CONSRV] Make kernel32 / winsrv console CSR structures Win2k3-compliant. The aim is to be able to put our kernel32.dll or winsrv.dll on win2k3, and vice-versa. Part 2/X CORE-7931 Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sun Apr 20 11:25:38 2014 @@ -277,7 +277,6 @@ BOOL bInheritHandle, DWORD dwOptions) { - NTSTATUS Status; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_DUPLICATEHANDLE DuplicateHandleRequest = &ApiMessage.Data.DuplicateHandleRequest; @@ -285,26 +284,27 @@ (!(dwOptions & DUPLICATE_SAME_ACCESS) && (dwDesiredAccess & ~(GENERIC_READ | GENERIC_WRITE))) ) { - SetLastError (ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - DuplicateHandleRequest->ConsoleHandle = hConsole; - DuplicateHandleRequest->Access = dwDesiredAccess; - DuplicateHandleRequest->Inheritable = bInheritHandle; - DuplicateHandleRequest->Options = dwOptions; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepDuplicateHandle), - sizeof(CONSOLE_DUPLICATEHANDLE)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + DuplicateHandleRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + DuplicateHandleRequest->SourceHandle = hConsole; + DuplicateHandleRequest->DesiredAccess = dwDesiredAccess; + DuplicateHandleRequest->InheritHandle = bInheritHandle; + DuplicateHandleRequest->Options = dwOptions; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepDuplicateHandle), + sizeof(*DuplicateHandleRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return INVALID_HANDLE_VALUE; } - return DuplicateHandleRequest->ConsoleHandle; + return DuplicateHandleRequest->TargetHandle; } @@ -337,6 +337,7 @@ } *lpModeFlags = GetDisplayModeRequest->DisplayMode; // ModeFlags + return TRUE; } @@ -407,6 +408,7 @@ *Flags = HardwareStateRequest->Flags; *State = HardwareStateRequest->State; + return TRUE; } @@ -496,16 +498,15 @@ BOOL bInheritHandle, DWORD dwShareMode) { - NTSTATUS Status = STATUS_SUCCESS; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_OPENCONSOLE OpenConsoleRequest = &ApiMessage.Data.OpenConsoleRequest; CONSOLE_HANDLE_TYPE HandleType; - if (wsName && 0 == _wcsicmp(wsName, BaseConInputFileName)) + if (wsName && (_wcsicmp(wsName, BaseConInputFileName) == 0)) { HandleType = HANDLE_INPUT; } - else if (wsName && 0 == _wcsicmp(wsName, BaseConOutputFileName)) + else if (wsName && (_wcsicmp(wsName, BaseConOutputFileName) == 0)) { HandleType = HANDLE_OUTPUT; } @@ -522,22 +523,23 @@ return INVALID_HANDLE_VALUE; } - OpenConsoleRequest->HandleType = HandleType; - OpenConsoleRequest->Access = dwDesiredAccess; - OpenConsoleRequest->Inheritable = bInheritHandle; - OpenConsoleRequest->ShareMode = dwShareMode; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepOpenConsole), - sizeof(CONSOLE_OPENCONSOLE)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + OpenConsoleRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + OpenConsoleRequest->HandleType = HandleType; + OpenConsoleRequest->DesiredAccess = dwDesiredAccess; + OpenConsoleRequest->InheritHandle = bInheritHandle; + OpenConsoleRequest->ShareMode = dwShareMode; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepOpenConsole), + sizeof(*OpenConsoleRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return INVALID_HANDLE_VALUE; } - return OpenConsoleRequest->ConsoleHandle; + return OpenConsoleRequest->Handle; } @@ -1082,19 +1084,20 @@ SetConsoleCursorPosition(HANDLE hConsoleOutput, COORD dwCursorPosition) { - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; - - ApiMessage.Data.SetCursorPositionRequest.OutputHandle = hConsoleOutput; - ApiMessage.Data.SetCursorPositionRequest.Position = dwCursorPosition; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCursorPosition), - sizeof(CONSOLE_SETCURSORPOSITION)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_SETCURSORPOSITION SetCursorPositionRequest = &ApiMessage.Data.SetCursorPositionRequest; + + SetCursorPositionRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + SetCursorPositionRequest->OutputHandle = hConsoleOutput; + SetCursorPositionRequest->Position = dwCursorPosition; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCursorPosition), + sizeof(*SetCursorPositionRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -1112,7 +1115,6 @@ GetConsoleMode(HANDLE hConsoleHandle, LPDWORD lpMode) { - NTSTATUS Status; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETSETCONSOLEMODE ConsoleModeRequest = &ApiMessage.Data.ConsoleModeRequest; @@ -1122,19 +1124,51 @@ return FALSE; } - ConsoleModeRequest->ConsoleHandle = hConsoleHandle; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetMode), - sizeof(CONSOLE_GETSETCONSOLEMODE)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - *lpMode = ConsoleModeRequest->ConsoleMode; + ConsoleModeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + ConsoleModeRequest->Handle = hConsoleHandle; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetMode), + sizeof(*ConsoleModeRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } + + *lpMode = ConsoleModeRequest->Mode; + + return TRUE; +} + + +/*-------------------------------------------------------------- + * SetConsoleMode + * + * @implemented + */ +BOOL +WINAPI +SetConsoleMode(HANDLE hConsoleHandle, + DWORD dwMode) +{ + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_GETSETCONSOLEMODE ConsoleModeRequest = &ApiMessage.Data.ConsoleModeRequest; + + ConsoleModeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + ConsoleModeRequest->Handle = hConsoleHandle; + ConsoleModeRequest->Mode = dwMode; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetMode), + sizeof(*ConsoleModeRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } return TRUE; } @@ -1150,20 +1184,20 @@ GetNumberOfConsoleInputEvents(HANDLE hConsoleInput, LPDWORD lpNumberOfEvents) { - NTSTATUS Status; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETNUMINPUTEVENTS GetNumInputEventsRequest = &ApiMessage.Data.GetNumInputEventsRequest; - GetNumInputEventsRequest->InputHandle = hConsoleInput; - GetNumInputEventsRequest->NumInputEvents = 0; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetNumberOfInputEvents), - sizeof(CONSOLE_GETNUMINPUTEVENTS)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + GetNumInputEventsRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetNumInputEventsRequest->InputHandle = hConsoleInput; + GetNumInputEventsRequest->NumberOfEvents = 0; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetNumberOfInputEvents), + sizeof(*GetNumInputEventsRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -1173,7 +1207,7 @@ return FALSE; } - *lpNumberOfEvents = GetNumInputEventsRequest->NumInputEvents; + *lpNumberOfEvents = GetNumInputEventsRequest->NumberOfEvents; return TRUE; } @@ -1188,21 +1222,21 @@ WINAPI GetLargestConsoleWindowSize(HANDLE hConsoleOutput) { - NTSTATUS Status; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETLARGESTWINDOWSIZE GetLargestWindowSizeRequest = &ApiMessage.Data.GetLargestWindowSizeRequest; - GetLargestWindowSizeRequest->OutputHandle = hConsoleOutput; + GetLargestWindowSizeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetLargestWindowSizeRequest->OutputHandle = hConsoleOutput; GetLargestWindowSizeRequest->Size.X = 0; GetLargestWindowSizeRequest->Size.Y = 0; - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetLargestWindowSize), - sizeof(CONSOLE_GETLARGESTWINDOWSIZE)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetLargestWindowSize), + sizeof(*GetLargestWindowSizeRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); } DPRINT1("GetLargestConsoleWindowSize, X = %d, Y = %d\n", GetLargestWindowSizeRequest->Size.X, GetLargestWindowSizeRequest->Size.Y); @@ -1220,8 +1254,8 @@ GetConsoleCursorInfo(HANDLE hConsoleOutput, PCONSOLE_CURSOR_INFO lpConsoleCursorInfo) { - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_GETSETCURSORINFO CursorInfoRequest = &ApiMessage.Data.CursorInfoRequest; if (!lpConsoleCursorInfo) { @@ -1233,19 +1267,51 @@ return FALSE; } - ApiMessage.Data.CursorInfoRequest.OutputHandle = hConsoleOutput; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCursorInfo), - sizeof(CONSOLE_GETSETCURSORINFO)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - *lpConsoleCursorInfo = ApiMessage.Data.CursorInfoRequest.Info; + CursorInfoRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + CursorInfoRequest->OutputHandle = hConsoleOutput; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCursorInfo), + sizeof(*CursorInfoRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } + + *lpConsoleCursorInfo = CursorInfoRequest->Info; + + return TRUE; +} + + +/*-------------------------------------------------------------- + * SetConsoleCursorInfo + * + * @implemented + */ +BOOL +WINAPI +SetConsoleCursorInfo(HANDLE hConsoleOutput, + CONST CONSOLE_CURSOR_INFO *lpConsoleCursorInfo) +{ + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_GETSETCURSORINFO CursorInfoRequest = &ApiMessage.Data.CursorInfoRequest; + + CursorInfoRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + CursorInfoRequest->OutputHandle = hConsoleOutput; + CursorInfoRequest->Info = *lpConsoleCursorInfo; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCursorInfo), + sizeof(*CursorInfoRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } return TRUE; } @@ -1267,37 +1333,6 @@ /*-------------------------------------------------------------- - * SetConsoleMode - * - * @implemented - */ -BOOL -WINAPI -SetConsoleMode(HANDLE hConsoleHandle, - DWORD dwMode) -{ - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; - PCONSOLE_GETSETCONSOLEMODE ConsoleModeRequest = &ApiMessage.Data.ConsoleModeRequest; - - ConsoleModeRequest->ConsoleHandle = hConsoleHandle; - ConsoleModeRequest->ConsoleMode = dwMode; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetMode), - sizeof(CONSOLE_GETSETCONSOLEMODE)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - - -/*-------------------------------------------------------------- * SetConsoleActiveScreenBuffer * * @implemented @@ -1306,18 +1341,19 @@ WINAPI SetConsoleActiveScreenBuffer(HANDLE hConsoleOutput) { - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; - - ApiMessage.Data.SetScreenBufferRequest.OutputHandle = hConsoleOutput; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetActiveScreenBuffer), - sizeof(CONSOLE_SETACTIVESCREENBUFFER)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_SETACTIVESCREENBUFFER SetScreenBufferRequest = &ApiMessage.Data.SetScreenBufferRequest; + + SetScreenBufferRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + SetScreenBufferRequest->OutputHandle = hConsoleOutput; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetActiveScreenBuffer), + sizeof(*SetScreenBufferRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -1334,18 +1370,19 @@ WINAPI FlushConsoleInputBuffer(HANDLE hConsoleInput) { - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; - - ApiMessage.Data.FlushInputBufferRequest.InputHandle = hConsoleInput; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFlushInputBuffer), - sizeof(CONSOLE_FLUSHINPUTBUFFER)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_FLUSHINPUTBUFFER FlushInputBufferRequest = &ApiMessage.Data.FlushInputBufferRequest; + + FlushInputBufferRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + FlushInputBufferRequest->InputHandle = hConsoleInput; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFlushInputBuffer), + sizeof(*FlushInputBufferRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -1363,49 +1400,20 @@ SetConsoleScreenBufferSize(HANDLE hConsoleOutput, COORD dwSize) { - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; - - ApiMessage.Data.SetScreenBufferSizeRequest.OutputHandle = hConsoleOutput; - ApiMessage.Data.SetScreenBufferSizeRequest.Size = dwSize; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetScreenBufferSize), - sizeof(CONSOLE_SETSCREENBUFFERSIZE)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - - -/*-------------------------------------------------------------- - * SetConsoleCursorInfo - * - * @implemented - */ -BOOL -WINAPI -SetConsoleCursorInfo(HANDLE hConsoleOutput, - CONST CONSOLE_CURSOR_INFO *lpConsoleCursorInfo) -{ - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; - - ApiMessage.Data.CursorInfoRequest.OutputHandle = hConsoleOutput; - ApiMessage.Data.CursorInfoRequest.Info = *lpConsoleCursorInfo; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCursorInfo), - sizeof(CONSOLE_GETSETCURSORINFO)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_SETSCREENBUFFERSIZE SetScreenBufferSizeRequest = &ApiMessage.Data.SetScreenBufferSizeRequest; + + SetScreenBufferSizeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + SetScreenBufferSizeRequest->OutputHandle = hConsoleOutput; + SetScreenBufferSizeRequest->Size = dwSize; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetScreenBufferSize), + sizeof(*SetScreenBufferSizeRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -1513,7 +1521,6 @@ BOOL bAbsolute, CONST SMALL_RECT *lpConsoleWindow) { - NTSTATUS Status; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_SETWINDOWINFO SetWindowInfoRequest = &ApiMessage.Data.SetWindowInfoRequest; @@ -1523,17 +1530,18 @@ return FALSE; } - SetWindowInfoRequest->OutputHandle = hConsoleOutput; - SetWindowInfoRequest->Absolute = bAbsolute; - SetWindowInfoRequest->WindowRect = *lpConsoleWindow; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetWindowInfo), - sizeof(CONSOLE_SETWINDOWINFO)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + SetWindowInfoRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + SetWindowInfoRequest->OutputHandle = hConsoleOutput; + SetWindowInfoRequest->Absolute = bAbsolute; + SetWindowInfoRequest->WindowRect = *lpConsoleWindow; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetWindowInfo), + sizeof(*SetWindowInfoRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -1551,19 +1559,20 @@ SetConsoleTextAttribute(HANDLE hConsoleOutput, WORD wAttributes) { - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; - - ApiMessage.Data.SetTextAttribRequest.OutputHandle = hConsoleOutput; - ApiMessage.Data.SetTextAttribRequest.Attrib = wAttributes; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetTextAttribute), - sizeof(CONSOLE_SETTEXTATTRIB)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_SETTEXTATTRIB SetTextAttribRequest = &ApiMessage.Data.SetTextAttribRequest; + + SetTextAttribRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + SetTextAttribRequest->OutputHandle = hConsoleOutput; + SetTextAttribRequest->Attributes = wAttributes; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetTextAttribute), + sizeof(*SetTextAttribRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -1677,8 +1686,8 @@ GenerateConsoleCtrlEvent(DWORD dwCtrlEvent, DWORD dwProcessGroupId) { - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_GENERATECTRLEVENT GenerateCtrlEventRequest = &ApiMessage.Data.GenerateCtrlEventRequest; if (dwCtrlEvent != CTRL_C_EVENT && dwCtrlEvent != CTRL_BREAK_EVENT) { @@ -1686,16 +1695,17 @@ return FALSE; } - ApiMessage.Data.GenerateCtrlEventRequest.Event = dwCtrlEvent; - ApiMessage.Data.GenerateCtrlEventRequest.ProcessGroup = dwProcessGroupId; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGenerateCtrlEvent), - sizeof(CONSOLE_GENERATECTRLEVENT)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + GenerateCtrlEventRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GenerateCtrlEventRequest->CtrlEvent = dwCtrlEvent; + GenerateCtrlEventRequest->ProcessGroupId = dwProcessGroupId; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGenerateCtrlEvent), + sizeof(*GenerateCtrlEventRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -1704,16 +1714,18 @@ static DWORD -IntGetConsoleTitle(LPVOID lpConsoleTitle, DWORD nSize, BOOL bUnicode) -{ - NTSTATUS Status; +IntGetConsoleTitle(LPVOID lpConsoleTitle, DWORD dwNumChars, BOOLEAN bUnicode) +{ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETSETCONSOLETITLE TitleRequest = &ApiMessage.Data.TitleRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - if (nSize == 0) return 0; - - TitleRequest->Length = nSize * (bUnicode ? 1 : sizeof(WCHAR)); + if (dwNumChars == 0) return 0; + + TitleRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + TitleRequest->Length = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + TitleRequest->Unicode = bUnicode; + CaptureBuffer = CsrAllocateCaptureBuffer(1, TitleRequest->Length); if (CaptureBuffer == NULL) { @@ -1726,42 +1738,32 @@ TitleRequest->Length, (PVOID*)&TitleRequest->Title); - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetTitle), - sizeof(CONSOLE_GETSETCONSOLETITLE)); - if (!NT_SUCCESS(Status)) + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetTitle), + sizeof(*TitleRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) { CsrFreeCaptureBuffer(CaptureBuffer); - BaseSetLastNTError(Status); + BaseSetLastNTError(ApiMessage.Status); return 0; } - if (bUnicode) - { - if (nSize >= sizeof(WCHAR)) - wcscpy((LPWSTR)lpConsoleTitle, TitleRequest->Title); - } - else - { - if (nSize < TitleRequest->Length / sizeof(WCHAR) || - !WideCharToMultiByte(CP_ACP, // ANSI code page - 0, // performance and mapping flags - TitleRequest->Title, // address of wide-character string - -1, // number of characters in string - (LPSTR)lpConsoleTitle, // address of buffer for new string - nSize, // size of buffer - NULL, // FAST - NULL)) - { - /* Yes, if the buffer isn't big enough, it returns 0... Bad API */ - *(LPSTR)lpConsoleTitle = '\0'; - TitleRequest->Length = 0; - } - } + dwNumChars = TitleRequest->Length / (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + + if (dwNumChars > 0) + { + memcpy(lpConsoleTitle, TitleRequest->Title, TitleRequest->Length); + + if (bUnicode) + ((LPWSTR)lpConsoleTitle)[dwNumChars] = L'\0'; + else + ((LPSTR)lpConsoleTitle)[dwNumChars] = '\0'; + } + CsrFreeCaptureBuffer(CaptureBuffer); - return TitleRequest->Length / sizeof(WCHAR); + return dwNumChars; } @@ -1793,21 +1795,16 @@ } -/*-------------------------------------------------------------- - * SetConsoleTitleW - * - * @implemented - */ -BOOL -WINAPI -SetConsoleTitleW(LPCWSTR lpConsoleTitle) -{ - NTSTATUS Status; +static BOOL +IntSetConsoleTitle(CONST VOID *lpConsoleTitle, DWORD dwNumChars, BOOLEAN bUnicode) +{ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETSETCONSOLETITLE TitleRequest = &ApiMessage.Data.TitleRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - TitleRequest->Length = wcslen(lpConsoleTitle) * sizeof(WCHAR); + TitleRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + TitleRequest->Length = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + TitleRequest->Unicode = bUnicode; CaptureBuffer = CsrAllocateCaptureBuffer(1, TitleRequest->Length); if (CaptureBuffer == NULL) @@ -1822,20 +1819,32 @@ TitleRequest->Length, (PVOID*)&TitleRequest->Title); - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetTitle), - sizeof(CONSOLE_GETSETCONSOLETITLE)); + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetTitle), + sizeof(*TitleRequest)); CsrFreeCaptureBuffer(CaptureBuffer); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } + + return TRUE; +} + +/*-------------------------------------------------------------- + * SetConsoleTitleW + * + * @implemented + */ +BOOL +WINAPI +SetConsoleTitleW(LPCWSTR lpConsoleTitle) +{ + return IntSetConsoleTitle(lpConsoleTitle, wcslen(lpConsoleTitle), TRUE); } @@ -1848,22 +1857,7 @@ WINAPI SetConsoleTitleA(LPCSTR lpConsoleTitle) { - BOOL Ret; - ULONG Length = strlen(lpConsoleTitle) + 1; - LPWSTR WideTitle = HeapAlloc(GetProcessHeap(), 0, Length * sizeof(WCHAR)); - - if (!WideTitle) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - MultiByteToWideChar(CP_ACP, 0, lpConsoleTitle, -1, WideTitle, Length); - - Ret = SetConsoleTitleW(WideTitle); - - HeapFree(GetProcessHeap(), 0, WideTitle); - return Ret; + return IntSetConsoleTitle(lpConsoleTitle, strlen(lpConsoleTitle), FALSE); } @@ -2160,6 +2154,7 @@ } *lpConsoleSelectionInfo = GetSelectionInfoRequest->Info; + return TRUE; } Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sun Apr 20 11:25:38 2014 @@ -274,8 +274,9 @@ typedef struct { - HANDLE OutputHandle; - COORD Position; + HANDLE ConsoleHandle; + HANDLE OutputHandle; + COORD Position; } CONSOLE_SETCURSORPOSITION, *PCONSOLE_SETCURSORPOSITION; typedef struct @@ -295,20 +296,27 @@ typedef struct { + HANDLE ConsoleHandle; HANDLE OutputHandle; CONSOLE_CURSOR_INFO Info; +/* + DWORD Size; + BOOLEAN Visible; +*/ } CONSOLE_GETSETCURSORINFO, *PCONSOLE_GETSETCURSORINFO; typedef struct { - HANDLE OutputHandle; - WORD Attrib; + HANDLE ConsoleHandle; + HANDLE OutputHandle; + WORD Attributes; } CONSOLE_SETTEXTATTRIB, *PCONSOLE_SETTEXTATTRIB; typedef struct { - HANDLE ConsoleHandle; /* A valid input or output console handle */ - DWORD ConsoleMode; + HANDLE ConsoleHandle; + HANDLE Handle; + DWORD Mode; } CONSOLE_GETSETCONSOLEMODE, *PCONSOLE_GETSETCONSOLEMODE; typedef struct @@ -358,6 +366,7 @@ typedef struct { + HANDLE ConsoleHandle; HANDLE OutputHandle; /* Handle to screen buffer to switch to */ } CONSOLE_SETACTIVESCREENBUFFER, *PCONSOLE_SETACTIVESCREENBUFFER; @@ -378,8 +387,10 @@ typedef struct { - DWORD Length; - PWCHAR Title; + HANDLE ConsoleHandle; + DWORD Length; + PVOID Title; + BOOLEAN Unicode; } CONSOLE_GETSETCONSOLETITLE, *PCONSOLE_GETSETCONSOLETITLE; typedef struct @@ -395,6 +406,7 @@ typedef struct { + HANDLE ConsoleHandle; HANDLE InputHandle; } CONSOLE_FLUSHINPUTBUFFER, *PCONSOLE_FLUSHINPUTBUFFER; @@ -527,10 +539,12 @@ typedef struct { - HANDLE ConsoleHandle; - DWORD Access; - BOOL Inheritable; - DWORD Options; + HANDLE ConsoleHandle; + HANDLE SourceHandle; + DWORD DesiredAccess; + BOOLEAN InheritHandle; + DWORD Options; + HANDLE TargetHandle; } CONSOLE_DUPLICATEHANDLE, *PCONSOLE_DUPLICATEHANDLE; /* @@ -546,14 +560,16 @@ { HANDLE ConsoleHandle; CONSOLE_HANDLE_TYPE HandleType; - DWORD Access; - BOOL Inheritable; - DWORD ShareMode; + DWORD DesiredAccess; + BOOL InheritHandle; + DWORD ShareMode; + HANDLE Handle; } CONSOLE_OPENCONSOLE, *PCONSOLE_OPENCONSOLE; typedef struct { + HANDLE ConsoleHandle; HANDLE OutputHandle; COORD Size; } CONSOLE_GETLARGESTWINDOWSIZE, *PCONSOLE_GETLARGESTWINDOWSIZE; @@ -575,6 +591,7 @@ typedef struct { + HANDLE ConsoleHandle; HANDLE OutputHandle; BOOL Absolute; SMALL_RECT WindowRect; // New console window position in the screen-buffer frame (Absolute == TRUE) @@ -668,20 +685,23 @@ typedef struct { - DWORD Event; - DWORD ProcessGroup; + HANDLE ConsoleHandle; + DWORD CtrlEvent; + DWORD ProcessGroupId; } CONSOLE_GENERATECTRLEVENT, *PCONSOLE_GENERATECTRLEVENT; typedef struct { + HANDLE ConsoleHandle; HANDLE InputHandle; - DWORD NumInputEvents; + DWORD NumberOfEvents; } CONSOLE_GETNUMINPUTEVENTS, *PCONSOLE_GETNUMINPUTEVENTS; typedef struct { - HANDLE OutputHandle; - COORD Size; + HANDLE ConsoleHandle; + HANDLE OutputHandle; + COORD Size; } CONSOLE_SETSCREENBUFFERSIZE, *PCONSOLE_SETSCREENBUFFERSIZE; typedef struct Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Sun Apr 20 11:25:38 2014 @@ -519,24 +519,24 @@ NTSTATUS NTAPI ConDrvGetConsoleNumberOfInputEvents(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, - OUT PULONG NumEvents) + OUT PULONG NumberOfEvents) { PLIST_ENTRY CurrentInput; - if (Console == NULL || InputBuffer == NULL || NumEvents == NULL) + if (Console == NULL || InputBuffer == NULL || NumberOfEvents == NULL) return STATUS_INVALID_PARAMETER; /* Validity check */ ASSERT(Console == InputBuffer->Header.Console); - *NumEvents = 0; + *NumberOfEvents = 0; /* If there are any events ... */ CurrentInput = InputBuffer->InputEvents.Flink; while (CurrentInput != &InputBuffer->InputEvents) { CurrentInput = CurrentInput->Flink; - (*NumEvents)++; + (*NumberOfEvents)++; } return STATUS_SUCCESS; Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Sun Apr 20 11:25:38 2014 @@ -197,7 +197,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ static NTSTATUS -ConDrvConsoleCtrlEventTimeout(IN ULONG Event, +ConDrvConsoleCtrlEventTimeout(IN ULONG CtrlEvent, IN PCONSOLE_PROCESS_DATA ProcessData, IN ULONG Timeout) { @@ -215,7 +215,7 @@ { Thread = CreateRemoteThread(ProcessData->Process->ProcessHandle, NULL, 0, ProcessData->CtrlDispatcher, - UlongToPtr(Event), 0, NULL); + UlongToPtr(CtrlEvent), 0, NULL); if (NULL == Thread) { Status = RtlGetLastNtStatus(); @@ -245,10 +245,10 @@ } static NTSTATUS -ConDrvConsoleCtrlEvent(IN ULONG Event, +ConDrvConsoleCtrlEvent(IN ULONG CtrlEvent, IN PCONSOLE_PROCESS_DATA ProcessData) { - return ConDrvConsoleCtrlEventTimeout(Event, ProcessData, 0); + return ConDrvConsoleCtrlEventTimeout(CtrlEvent, ProcessData, 0); } VOID FASTCALL @@ -879,7 +879,8 @@ IN PCONSOLE_IO_OBJECT Object, IN ULONG ConsoleMode) { -#define CONSOLE_VALID_CONTROL_MODES ( ENABLE_EXTENDED_FLAGS | ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE ) +#define CONSOLE_VALID_CONTROL_MODES ( ENABLE_EXTENDED_FLAGS | \ + ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE ) #define CONSOLE_VALID_INPUT_MODES ( ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | \ ENABLE_ECHO_INPUT | ENABLE_WINDOW_INPUT | \ ENABLE_MOUSE_INPUT ) @@ -956,39 +957,80 @@ NTSTATUS NTAPI ConDrvGetConsoleTitle(IN PCONSOLE Console, - IN OUT PWCHAR Title, + IN BOOLEAN Unicode, + IN OUT PVOID TitleBuffer, IN OUT PULONG BufLength) { ULONG Length; - if (Console == NULL || Title == NULL || BufLength == NULL) + if (Console == NULL || TitleBuffer == NULL || BufLength == NULL) return STATUS_INVALID_PARAMETER; /* Copy title of the console to the user title buffer */ - if (*BufLength >= sizeof(WCHAR)) - { - Length = min(*BufLength - sizeof(WCHAR), Console->Title.Length); - RtlCopyMemory(Title, Console->Title.Buffer, Length); - Title[Length / sizeof(WCHAR)] = L'\0'; - } - - *BufLength = Console->Title.Length; + if (Unicode) + { + if (*BufLength >= sizeof(WCHAR)) + { + Length = min(*BufLength - sizeof(WCHAR), Console->Title.Length); + RtlCopyMemory(TitleBuffer, Console->Title.Buffer, Length); + ((PWCHAR)TitleBuffer)[Length / sizeof(WCHAR)] = L'\0'; + *BufLength = Length; + } + else + { + *BufLength = Console->Title.Length; + } + } + else + { + if (*BufLength >= sizeof(CHAR)) + { + Length = min(*BufLength - sizeof(CHAR), Console->Title.Length / sizeof(WCHAR)); + Length = WideCharToMultiByte(Console->CodePage, 0, + Console->Title.Buffer, Length, + TitleBuffer, Length, + NULL, NULL); + ((PCHAR)TitleBuffer)[Length] = '\0'; + *BufLength = Length; + } + else + { + *BufLength = Console->Title.Length / sizeof(WCHAR); + } + } return STATUS_SUCCESS; } NTSTATUS NTAPI ConDrvSetConsoleTitle(IN PCONSOLE Console, - IN PWCHAR Title, + IN BOOLEAN Unicode, + IN PVOID TitleBuffer, IN ULONG BufLength) { PWCHAR Buffer; - - if (Console == NULL || Title == NULL) + ULONG Length; + + if (Console == NULL || TitleBuffer == NULL) return STATUS_INVALID_PARAMETER; + if (Unicode) + { + /* Length is in bytes */ + Length = BufLength; + } + else + { + /* Use the console input CP for the conversion */ + Length = MultiByteToWideChar(Console->CodePage, 0, + TitleBuffer, BufLength, + NULL, 0); + /* The returned Length was in number of wchars, convert it in bytes */ + Length *= sizeof(WCHAR); + } + /* Allocate a new buffer to hold the new title (NULL-terminated) */ - Buffer = ConsoleAllocHeap(0, BufLength + sizeof(WCHAR)); + Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, Length + sizeof(WCHAR)); if (!Buffer) return STATUS_NO_MEMORY; /* Free the old title */ @@ -996,9 +1038,22 @@ /* Copy title to console */ Console->Title.Buffer = Buffer; - Console->Title.Length = BufLength; + Console->Title.Length = Length; Console->Title.MaximumLength = Console->Title.Length + sizeof(WCHAR); - RtlCopyMemory(Console->Title.Buffer, Title, Console->Title.Length); + + if (Unicode) + { + RtlCopyMemory(Console->Title.Buffer, TitleBuffer, Console->Title.Length); + } + else + { + MultiByteToWideChar(Console->CodePage, 0, + TitleBuffer, BufLength, + Console->Title.Buffer, + Console->Title.Length / sizeof(WCHAR)); + } + + /* NULL-terminate */ Console->Title.Buffer[Console->Title.Length / sizeof(WCHAR)] = L'\0'; // TermChangeTitle(Console); @@ -1066,7 +1121,7 @@ NTSTATUS NTAPI ConDrvConsoleProcessCtrlEvent(IN PCONSOLE Console, IN ULONG ProcessGroupId, - IN ULONG Event) + IN ULONG CtrlEvent) { NTSTATUS Status = STATUS_SUCCESS; PLIST_ENTRY current_entry; @@ -1094,7 +1149,7 @@ */ if (ProcessGroupId == 0 || current->Process->ProcessGroupId == ProcessGroupId) { - Status = ConDrvConsoleCtrlEvent(Event, current); + Status = ConDrvConsoleCtrlEvent(CtrlEvent, current); } } Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sun Apr 20 11:25:38 2014 @@ -1259,7 +1259,7 @@ NTSTATUS NTAPI ConDrvSetConsoleTextAttribute(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN WORD Attribute) + IN WORD Attributes) { if (Console == NULL || Buffer == NULL) return STATUS_INVALID_PARAMETER; @@ -1267,7 +1267,7 @@ /* Validity check */ ASSERT(Console == Buffer->Header.Console); - Buffer->ScreenDefaultAttrib = Attribute; + Buffer->ScreenDefaultAttrib = Attributes; return STATUS_SUCCESS; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Sun Apr 20 11:25:38 2014 @@ -444,7 +444,7 @@ NTSTATUS NTAPI ConDrvGetConsoleNumberOfInputEvents(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, - OUT PULONG NumEvents); + OUT PULONG NumberOfEvents); CSR_API(SrvGetConsoleNumberOfInputEvents) { NTSTATUS Status; @@ -460,7 +460,7 @@ Status = ConDrvGetConsoleNumberOfInputEvents(InputBuffer->Header.Console, InputBuffer, - &GetNumInputEventsRequest->NumInputEvents); + &GetNumInputEventsRequest->NumberOfEvents); ConSrvReleaseInputBuffer(InputBuffer, TRUE); return Status; Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Sun Apr 20 11:25:38 2014 @@ -720,7 +720,7 @@ NTSTATUS NTAPI ConDrvSetConsoleTextAttribute(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN WORD Attribute); + IN WORD Attributes); CSR_API(SrvSetConsoleTextAttribute) { NTSTATUS Status; @@ -736,7 +736,7 @@ Status = ConDrvSetConsoleTextAttribute(Buffer->Header.Console, Buffer, - SetTextAttribRequest->Attrib); + SetTextAttribRequest->Attributes); ConSrvReleaseScreenBuffer(Buffer, TRUE); return Status; Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sun Apr 20 11:25:38 2014 @@ -439,12 +439,12 @@ PCONSOLE_IO_OBJECT Object; Status = ConSrvGetObject(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - ConsoleModeRequest->ConsoleHandle, + ConsoleModeRequest->Handle, &Object, NULL, GENERIC_READ, TRUE, 0); if (!NT_SUCCESS(Status)) return Status; Status = ConDrvGetConsoleMode(Object->Console, Object, - &ConsoleModeRequest->ConsoleMode); + &ConsoleModeRequest->Mode); ConSrvReleaseObject(Object, TRUE); return Status; @@ -461,12 +461,12 @@ PCONSOLE_IO_OBJECT Object; Status = ConSrvGetObject(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - ConsoleModeRequest->ConsoleHandle, + ConsoleModeRequest->Handle, &Object, NULL, GENERIC_WRITE, TRUE, 0); if (!NT_SUCCESS(Status)) return Status; Status = ConDrvSetConsoleMode(Object->Console, Object, - ConsoleModeRequest->ConsoleMode); + ConsoleModeRequest->Mode); ConSrvReleaseObject(Object, TRUE); return Status; @@ -474,7 +474,8 @@ NTSTATUS NTAPI ConDrvGetConsoleTitle(IN PCONSOLE Console, - IN OUT PWCHAR Title, + IN BOOLEAN Unicode, + IN OUT PVOID TitleBuffer, IN OUT PULONG BufLength); CSR_API(SrvGetConsoleTitle) { @@ -498,6 +499,7 @@ } Status = ConDrvGetConsoleTitle(Console, + TitleRequest->Unicode, TitleRequest->Title, &TitleRequest->Length); @@ -507,7 +509,8 @@ NTSTATUS NTAPI ConDrvSetConsoleTitle(IN PCONSOLE Console, - IN PWCHAR Title, + IN BOOLEAN Unicode, + IN PVOID TitleBuffer, IN ULONG BufLength); CSR_API(SrvSetConsoleTitle) { @@ -531,9 +534,9 @@ } Status = ConDrvSetConsoleTitle(Console, + TitleRequest->Unicode, TitleRequest->Title, TitleRequest->Length); - if (NT_SUCCESS(Status)) TermChangeTitle(Console); ConSrvReleaseConsole(Console, TRUE); @@ -629,8 +632,8 @@ if (!NT_SUCCESS(Status)) return Status; Status = ConDrvConsoleProcessCtrlEvent(Console, - GenerateCtrlEventRequest->ProcessGroup, - GenerateCtrlEventRequest->Event); + GenerateCtrlEventRequest->ProcessGroupId, + GenerateCtrlEventRequest->CtrlEvent); ConSrvReleaseConsole(Console, TRUE); return Status; Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Sun Apr 20 11:25:38 2014 @@ -688,11 +688,11 @@ PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); PCONSOLE Console; - DWORD DesiredAccess = OpenConsoleRequest->Access; + DWORD DesiredAccess = OpenConsoleRequest->DesiredAccess; DWORD ShareMode = OpenConsoleRequest->ShareMode; PCONSOLE_IO_OBJECT Object; - OpenConsoleRequest->ConsoleHandle = INVALID_HANDLE_VALUE; + OpenConsoleRequest->Handle = INVALID_HANDLE_VALUE; Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) @@ -726,10 +726,10 @@ else { Status = ConSrvInsertObject(ProcessData, - &OpenConsoleRequest->ConsoleHandle, + &OpenConsoleRequest->Handle, Object, DesiredAccess, - OpenConsoleRequest->Inheritable, + OpenConsoleRequest->InheritHandle, ShareMode); } @@ -746,11 +746,13 @@ PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); PCONSOLE Console; - HANDLE ConsoleHandle = DuplicateHandleRequest->ConsoleHandle; - ULONG Index = HandleToULong(ConsoleHandle) >> 2; + HANDLE SourceHandle = DuplicateHandleRequest->SourceHandle; + ULONG Index = HandleToULong(SourceHandle) >> 2; PCONSOLE_IO_HANDLE Entry; DWORD DesiredAccess; + DuplicateHandleRequest->TargetHandle = INVALID_HANDLE_VALUE; + Status = ConSrvGetConsole(ProcessData, &Console, TRUE); if (!NT_SUCCESS(Status)) { @@ -763,11 +765,11 @@ // ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) || // (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) ); - if ( /** !IsConsoleHandle(ConsoleHandle) || **/ + if ( /** !IsConsoleHandle(SourceHandle) || **/ Index >= ProcessData->HandleTableSize || (Entry = &ProcessData->HandleTable[Index])->Object == NULL) { - DPRINT1("Couldn't duplicate invalid handle %p\n", ConsoleHandle); + DPRINT1("Couldn't duplicate invalid handle 0x%p\n", SourceHandle); Status = STATUS_INVALID_HANDLE; goto Quit; } @@ -778,12 +780,12 @@ } else { - DesiredAccess = DuplicateHandleRequest->Access; + DesiredAccess = DuplicateHandleRequest->DesiredAccess; /* Make sure the source handle has all the desired flags */ if ((Entry->Access & DesiredAccess) == 0) { - DPRINT1("Handle %p only has access %X; requested %X\n", - ConsoleHandle, Entry->Access, DesiredAccess); + DPRINT1("Handle 0x%p only has access %X; requested %X\n", + SourceHandle, Entry->Access, DesiredAccess); Status = STATUS_INVALID_PARAMETER; goto Quit; } @@ -791,10 +793,10 @@ /* Insert the new handle inside the process handles table */ Status = ConSrvInsertObject(ProcessData, - &DuplicateHandleRequest->ConsoleHandle, // Use the new handle value! + &DuplicateHandleRequest->TargetHandle, Entry->Object, DesiredAccess, - DuplicateHandleRequest->Inheritable, + DuplicateHandleRequest->InheritHandle, Entry->ShareMode); if (NT_SUCCESS(Status) && (DuplicateHandleRequest->Options & DUPLICATE_CLOSE_SOURCE)) Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Apr 20 11:25:38 2014 @@ -344,7 +344,7 @@ NTSTATUS NTAPI ConDrvConsoleProcessCtrlEvent(IN PCONSOLE Console, IN ULONG ProcessGroupId, - IN ULONG Event); + IN ULONG CtrlEvent); /* coninput.c */ VOID NTAPI ConioProcessKey(PCONSOLE Console, MSG* msg);

10 years, 5 months

[akhaldi] 62832: [ACTXPRXY] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 20 00:25:16 2014 New Revision: 62832 URL: http://svn.reactos.org/svn/reactos?rev=62832&view=rev Log: [ACTXPRXY] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.idl trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for activscp.idl */ +#pragma makedep proxy +#pragma makedep register + #include "activscp.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for comcat.idl */ +#pragma makedep proxy +#pragma makedep register + #include "comcat.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for docobj.idl */ +#pragma makedep proxy +#pragma makedep register + #include "docobj.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for hlink.idl */ +#pragma makedep proxy +#pragma makedep register + #include "hlink.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiface.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for htiface.idl */ +#pragma makedep proxy +#pragma makedep register + #include "htiface.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for htiframe.idl */ +#pragma makedep proxy +#pragma makedep register + #include "htiframe.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for objsafe.idl */ +#pragma makedep proxy +#pragma makedep register + #include "objsafe.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for ocmm.idl */ +#pragma makedep proxy +#pragma makedep register + #include "ocmm.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -1,3 +1,6 @@ +#pragma makedep proxy +#pragma makedep register + #include "servprov.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for shldisp.idl */ +#pragma makedep proxy +#pragma makedep register + #include "shldisp.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for shobjidl.idl */ +#pragma makedep proxy +#pragma makedep register + #include "shobjidl.idl" [ Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] Sun Apr 20 00:25:16 2014 @@ -18,6 +18,9 @@ /* just a wrapper for urlhist.idl */ +#pragma makedep proxy +#pragma makedep register + #include "urlhist.idl" [ 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] Sun Apr 20 00:25:16 2014 @@ -49,7 +49,7 @@ reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.17 reactos/dll/win32/activeds # Synced to Wine-1.7.1 -reactos/dll/win32/actxprxy # Synced to Wine-1.7.1 +reactos/dll/win32/actxprxy # Synced to Wine-1.7.17 reactos/dll/win32/advpack # Synced to Wine-1.7.1 reactos/dll/win32/atl # Synced to Wine-1.7.1 reactos/dll/win32/atl100 # Synced to Wine-1.7.1

10 years, 5 months

[akhaldi] 62831: [DXDIAGN_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 20 00:20:32 2014 New Revision: 62831 URL: http://svn.reactos.org/svn/reactos?rev=62831&view=rev Log: [DXDIAGN_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/dxdiagn/container.c Modified: trunk/rostests/winetests/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dxdiagn/contain… ============================================================================== --- trunk/rostests/winetests/dxdiagn/container.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dxdiagn/container.c [iso-8859-1] Sun Apr 20 00:20:32 2014 @@ -938,6 +938,9 @@ static const WCHAR szRevisionId[] = {'s','z','R','e','v','i','s','i','o','n','I','d',0}; static const WCHAR dwRefreshRate[] = {'d','w','R','e','f','r','e','s','h','R','a','t','e',0}; static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; + static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; + static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const struct property_test property_tests[] = { @@ -959,6 +962,9 @@ {szRevisionId, VT_BSTR}, {dwRefreshRate, VT_UI4}, {szManufacturer, VT_BSTR}, + {b3DAccelerationExists, VT_BOOL}, + {b3DAccelerationEnabled, VT_BOOL}, + {bDDAccelerationEnabled, VT_BOOL}, }; IDxDiagContainer *display_cont = NULL;

10 years, 5 months

[akhaldi] 62830: [DXDIAGN] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 20 00:20:21 2014 New Revision: 62830 URL: http://svn.reactos.org/svn/reactos?rev=62830&view=rev Log: [DXDIAGN] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.idl trunk/reactos/dll/directx/wine/dxdiagn/provider.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/d… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.idl [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.idl [iso-8859-1] Sun Apr 20 00:20:21 2014 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep register + [ helpstring("DxDiagProvider Class"), threading(apartment), Modified: trunk/reactos/dll/directx/wine/dxdiagn/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/p… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/provider.c [iso-8859-1] Sun Apr 20 00:20:21 2014 @@ -52,6 +52,9 @@ static const WCHAR szRevisionId[] = {'s','z','R','e','v','i','s','i','o','n','I','d',0}; static const WCHAR dwRefreshRate[] = {'d','w','R','e','f','r','e','s','h','R','a','t','e',0}; static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t','u','r','e','r',0}; +static const WCHAR szChipType[] = {'s','z','C','h','i','p','T','y','p','e',0}; +static const WCHAR szDACType[] = {'s','z','D','A','C','T','y','p','e',0}; +static const WCHAR szRevision[] = {'s','z','R','e','v','i','s','i','o','n',0}; struct IDxDiagProviderImpl { @@ -898,10 +901,15 @@ static const WCHAR id_fmtW[] = {'0','x','%','0','4','x',0}; static const WCHAR subsysid_fmtW[] = {'0','x','%','0','8','x',0}; static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; + static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; + static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; + static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; D3DADAPTER_IDENTIFIER9 adapter_info; D3DDISPLAYMODE adapter_mode; + D3DCAPS9 device_caps; DWORD available_mem = 0; + BOOL hardware_accel; snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), adapterid_fmtW, index); display_adapter = allocate_information_node(buffer); @@ -1002,6 +1010,18 @@ if (FAILED(hr)) goto cleanup; + hr = add_bstr_property(display_adapter, szChipType, szEmpty); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDACType, szEmpty); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szRevision, szEmpty); + if (FAILED(hr)) + goto cleanup; + if (!get_texture_memory(&adapter_info.DeviceIdentifier, &available_mem)) WARN("get_texture_memory helper failed\n"); @@ -1012,6 +1032,21 @@ goto cleanup; hr = add_bstr_property(display_adapter, szDisplayMemoryEnglish, buffer); + if (FAILED(hr)) + goto cleanup; + + hr = IDirect3D9_GetDeviceCaps(pDirect3D9, index, D3DDEVTYPE_HAL, &device_caps); + hardware_accel = SUCCEEDED(hr); + + hr = add_bool_property(display_adapter, b3DAccelerationEnabled, hardware_accel); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, b3DAccelerationExists, hardware_accel); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDDAccelerationEnabled, hardware_accel); if (FAILED(hr)) goto cleanup; } @@ -1028,7 +1063,7 @@ static const WCHAR *empty_properties[] = {szDeviceIdentifier, szVendorId, szDeviceId, szKeyDeviceKey, szKeyDeviceID, szDriverName, szDriverVersion, szSubSysId, szRevisionId, - szManufacturer}; + szManufacturer, szChipType, szDACType, szRevision}; IDxDiagContainerImpl_Container *display_adapter; HRESULT hr; @@ -1603,16 +1638,17 @@ } hr = fill_filter_container(subcont, pMoniker); + IMoniker_Release(pMoniker); if (FAILED(hr)) { + WARN("Skipping invalid filter\n"); free_information_tree(subcont); - IMoniker_Release(pMoniker); - break; + hr = S_OK; + continue; } add_subcontainer(node, subcont); i++; - IMoniker_Release(pMoniker); } IEnumMoniker_Release(pEnum); 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] Sun Apr 20 00:20:21 2014 @@ -41,7 +41,7 @@ reactos/dll/directx/wine/dplay # Synced to Wine-1.7.1 reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.17 reactos/dll/directx/wine/dsound # Synced to Wine-1.5.26 -reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.1 +reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.17 reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.17 reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.1 reactos/dll/directx/wine/qedit # Synced to Wine-1.7.17

10 years, 5 months

[akhaldi] 62829: [DPLAYX_WINETEST] * Sync with Wine 1.7.17. CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Apr 20 00:08:29 2014 New Revision: 62829 URL: http://svn.reactos.org/svn/reactos?rev=62829&view=rev Log: [DPLAYX_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/dplayx/dplayx.c Modified: trunk/rostests/winetests/dplayx/dplayx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dplayx/dplayx.c… ============================================================================== --- trunk/rostests/winetests/dplayx/dplayx.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dplayx/dplayx.c [iso-8859-1] Sun Apr 20 00:08:29 2014 @@ -87,8 +87,6 @@ static LPCSTR Guid2str(const GUID *guid) { - LPSTR buffer = get_temp_buffer(); - if (!guid) return "(null)"; /* Service providers */ @@ -124,12 +122,7 @@ if (IsEqualGUID(guid, &DPAID_ComPort)) return "DPAID_ComPort"; - sprintf( buffer, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - return buffer; - + return wine_dbgstr_guid(guid); } @@ -667,7 +660,7 @@ /* IP address string */ addressElements[1].guidDataType = DPAID_INet; - addressElements[1].dwDataSize = lstrlen(strIPAddressString) + 1; + addressElements[1].dwDataSize = lstrlenA(strIPAddressString) + 1; addressElements[1].lpData = (LPVOID) strIPAddressString; /* Optional Port number */ @@ -6470,7 +6463,7 @@ &IID_IUnknown, (void**)&dpl); ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), "DirectPlayLobby create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dpl || dpl == (IDirectPlayLobby*)0xdeadbeef, "dp4 = %p\n", dpl); + ok(!dpl || dpl == (IDirectPlayLobby*)0xdeadbeef, "dpl = %p\n", dpl); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectPlayLobby, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay,

10 years, 5 months

← Newer
1
...
23
24
25
26
27
28
29
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2014