Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[hbelusca] 64360: [NTVDM]: Fix a bug introduced in revision 64324, where I didn't restore the original values of CF and AX. Fix some keyboard issues in Mystery Mansion.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 27 23:45:24 2014 New Revision: 64360 URL: http://svn.reactos.org/svn/reactos?rev=64360&view=rev Log: [NTVDM]: Fix a bug introduced in revision 64324, where I didn't restore the original values of CF and AX. Fix some keyboard issues in Mystery Mansion. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sat Sep 27 23:45:24 2014 @@ -194,6 +194,7 @@ // Keyboard IRQ 1 static VOID WINAPI BiosKeyboardIrq(LPWORD Stack) { + BOOLEAN SkipScanCode; BYTE ScanCode, VirtualKey; WORD Character; @@ -204,17 +205,24 @@ * In return, if CF is set we continue processing the scan code * stored in AL, and if not, we skip it. */ + BYTE CF, AX; + CF = getCF(); + AX = getAX(); + setCF(1); setAL(IOReadB(PS2_DATA_PORT)); setAH(0x4F); Int32Call(&BiosContext, BIOS_MISC_INTERRUPT); - /* Check whether CL is clear. If so, skip the scan code. */ - if (getCF() == 0) goto Quit; - /**/setCF(0);/**/ // FIXME: HACK: Reset CF otherwise we enter in an infinite loop. - /* Retrieve the modified scan code in AL */ + SkipScanCode = (getCF() == 0); ScanCode = getAL(); + + setAX(AX); + setCF(CF); + + /* Check whether CF is clear. If so, skip the scan code. */ + if (SkipScanCode) goto Quit; /* Get the corresponding virtual key code */ VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK);

10 years, 2 months

[tkreuzer] 64359: [WIN32K] Fix NtGdiExcludeClipRect. Should fix regressions from r64260.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Sep 27 22:59:13 2014 New Revision: 64359 URL: http://svn.reactos.org/svn/reactos?rev=64359&view=rev Log: [WIN32K] Fix NtGdiExcludeClipRect. Should fix regressions from r64260. Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Sat Sep 27 22:59:13 2014 @@ -226,34 +226,27 @@ iComplexity = REGION_SubtractRectFromRgn(pdc->dclevel.prgnClip, pdc->dclevel.prgnClip, &rect); - - /* Emulate Windows behavior */ - if (iComplexity == SIMPLEREGION) - iComplexity = COMPLEXREGION; - } - else - { - /* Check if the rect intersects with the window rect */ - if (RECTL_bIntersectRect(&rect, &rect, &pdc->erclWindow)) - { - /* It does. In this case create an empty region */ - pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); - iComplexity = NULLREGION; + } + else + { + /* We don't have a clip region yet, create an empty region */ + pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); + if (pdc->dclevel.prgnClip == NULL) + { + iComplexity = ERROR; } else { - /* Otherwise, emulate strange Windows behavior... */ - pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 1, 1); - iComplexity = COMPLEXREGION; - } - - /* Check if creating the region failed */ - if (pdc->dclevel.prgnClip == NULL) - { - /* Return error code */ - iComplexity = ERROR; - } - } + /* Subtract the rect from the VIS region */ + iComplexity = REGION_SubtractRectFromRgn(pdc->dclevel.prgnClip, + pdc->prgnVis, + &rect); + } + } + + /* Emulate Windows behavior */ + if (iComplexity == SIMPLEREGION) + iComplexity = COMPLEXREGION; /* If we succeeded, mark the RAO region as dirty */ if (iComplexity != ERROR)

10 years, 2 months

[hpoussin] 64358: [NTOSKRNL] Partly implement FsRtlRegisterUncProvider/FsRtlDeregisterUncProvider Currently only support one UNC provider at the time. Also disable mup.sys, which is not used for now.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Sep 27 21:07:48 2014 New Revision: 64358 URL: http://svn.reactos.org/svn/reactos?rev=64358&view=rev Log: [NTOSKRNL] Partly implement FsRtlRegisterUncProvider/FsRtlDeregisterUncProvider Currently only support one UNC provider at the time. Also disable mup.sys, which is not used for now. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/ntoskrnl/fsrtl/unc.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat Sep 27 21:07:48 2014 @@ -1266,7 +1266,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000000,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000000,"\Device\NamedPipe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PRN",0x00000000,"\DosDevices\LPT1" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x00000000,"\Device\Mup" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x00000000,"\Device\Mup" ; System environment settings HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" @@ -1509,13 +1509,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Type",0x00010001,0x00000002 ; Multiple UNC provider driver -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Description",0x00000000,"Multiple UNC Provider (MUP)" -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ErrorControl",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Description",0x00000000,"Multiple UNC Provider (MUP)" +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ErrorControl",0x00010001,0x00000001 ;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"Network" -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ImagePath",0x00020000,"system32\drivers\mup.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Type",0x00010001,0x00000002 +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"File System" +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ImagePath",0x00020000,"system32\drivers\mup.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Start",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Type",0x00010001,0x00000002 ; NDIS driver - the only boot-start network driver HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","ErrorControl",0x00010001,0x00000001 Modified: trunk/reactos/ntoskrnl/fsrtl/unc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/unc.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/unc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/unc.c [iso-8859-1] Sat Sep 27 21:07:48 2014 @@ -32,8 +32,18 @@ NTAPI FsRtlDeregisterUncProvider(IN HANDLE Handle) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNICODE_STRING DosDevicesUNC = RTL_CONSTANT_STRING(L"\\DosDevices\\UNC"); + + DPRINT("FsRtlDeregisterUncProvider: Handle=%p\n", Handle); + // + // Normal implementation should look like: + // - notify mup.sys? + // - at last deregistration, destroy \DosDevices\UNC symbolic link + // + + ZwClose(Handle); + + IoDeleteSymbolicLink(&DosDevicesUNC); } /*++ @@ -61,7 +71,64 @@ IN PUNICODE_STRING RedirectorDeviceName, IN BOOLEAN MailslotsSupported) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); - return STATUS_NOT_IMPLEMENTED; + UNICODE_STRING DevNull = RTL_CONSTANT_STRING(L"\\Device\\Null"); + UNICODE_STRING DosDevicesUNC = RTL_CONSTANT_STRING(L"\\DosDevices\\UNC"); + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + HANDLE FileHandle; + NTSTATUS Status; + + DPRINT("FsRtlRegisterUncProvider: Redirector=%wZ MailslotsSupported=%d\n", + RedirectorDeviceName, MailslotsSupported); + + // + // Current implementation is a hack, as it only supports one UNC provider. + // However, it doesn't require to have a functional mup.sys driver. + // + + // + // Normal implementation should look like: + // - at registration 1, creates symlink \DosDevices\UNC to new provider; + // returns handle to \Device\Null + // - at registration 2, load mup.sys, register both providers to mup.sys + // and change \DosDevices\UNC to DD_MUP_DEVICE_NAME; + // returns handle to new provider + // - at next registrations, register provider to mup.sys; + // returns handle to new provider + // + + *Handle = (HANDLE)-1; + InitializeObjectAttributes(&ObjectAttributes, + &DevNull, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateFile(&FileHandle, + GENERIC_WRITE, + &ObjectAttributes, + &Iosb, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to open %wZ\n", &DevNull); + return Status; + } + + Status = IoCreateSymbolicLink(&DosDevicesUNC, RedirectorDeviceName); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to create symbolic link %wZ -> %wZ\n", &DosDevicesUNC, RedirectorDeviceName); + DPRINT1("FIXME: multiple unc provider registered?\n"); + ZwClose(FileHandle); + return Status; + } + + *Handle = FileHandle; + return STATUS_SUCCESS; }

10 years, 2 months

[tfaber] 64357: [MSVCRT] - Move __CxxFrameHandler3 to msvcrtex. Windows 2003's dll does not export this, and their msvcrt.lib doesn't have it, but we need this to support modern compilers.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 27 20:32:22 2014 New Revision: 64357 URL: http://svn.reactos.org/svn/reactos?rev=64357&view=rev Log: [MSVCRT] - Move __CxxFrameHandler3 to msvcrtex. Windows 2003's dll does not export this, and their msvcrt.lib doesn't have it, but we need this to support modern compilers. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/cpprt/i386/cpprt.s Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sat Sep 27 20:32:22 2014 @@ -891,6 +891,3 @@ @ cdecl wctomb(ptr long) @ varargs wprintf(wstr) @ varargs wscanf(wstr) - -# Functions not exported in native dll: -@ cdecl -arch=i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler Modified: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/cpprt.s… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] Sat Sep 27 20:32:22 2014 @@ -13,4 +13,7 @@ ; void __stdcall `eh vector destructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *)) DEFINE_ALIAS ??_M@YGXPAXIHP6EX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YGXPAXIHP6EX0@Z@Z +; These are the same +DEFINE_ALIAS ___CxxFrameHandler3, ___CxxFrameHandler + END

10 years, 2 months

[akhaldi] 64356: [PSDK] * Fix PIMAGEHLP_STATUS_ROUTINE params.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 20:00:19 2014 New Revision: 64356 URL: http://svn.reactos.org/svn/reactos?rev=64356&view=rev Log: [PSDK] * Fix PIMAGEHLP_STATUS_ROUTINE params. Modified: trunk/reactos/include/psdk/imagehlp.h Modified: trunk/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re… ============================================================================== --- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Sat Sep 27 20:00:19 2014 @@ -106,7 +106,7 @@ BindMismatchedSymbols, BindSymbolsNotUpdated } IMAGEHLP_STATUS_REASON; -typedef BOOL(WINAPI*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG); +typedef BOOL(WINAPI*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,PCSTR,PCSTR,ULONG_PTR,ULONG_PTR); typedef struct _LOADED_IMAGE { PSTR ModuleName; HANDLE hFile;

10 years, 2 months

[akhaldi] 64355: [IMAGEHLP_WINETEST] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 19:47:51 2014 New Revision: 64355 URL: http://svn.reactos.org/svn/reactos?rev=64355&view=rev Log: [IMAGEHLP_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/imagehlp/image.c trunk/rostests/winetests/imagehlp/integrity.c Modified: trunk/rostests/winetests/imagehlp/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/image.… ============================================================================== --- trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] Sat Sep 27 19:47:51 2014 @@ -31,6 +31,8 @@ static HMODULE hImageHlp; static BOOL (WINAPI *pImageGetDigestStream)(HANDLE, DWORD, DIGEST_FUNCTION, DIGEST_HANDLE); +static BOOL (WINAPI *pBindImageEx)(DWORD Flags, const char *ImageName, const char *DllPath, + const char *SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine); /* minimal PE file image */ #define VA_START 0x400000 @@ -149,6 +151,9 @@ BOOL todo; }; +static int status_routine_called[BindSymbolsNotUpdated+1]; + + static BOOL WINAPI accumulating_stream_output(DIGEST_HANDLE handle, BYTE *pb, DWORD cb) { @@ -273,6 +278,40 @@ bin.nt_headers.OptionalHeader.CheckSum = sum; } +static BOOL CALLBACK testing_status_routine(IMAGEHLP_STATUS_REASON reason, const char *ImageName, + const char *DllName, ULONG_PTR Va, ULONG_PTR Parameter) +{ + char kernel32_path[MAX_PATH]; + + if (0 <= (int)reason && reason <= BindSymbolsNotUpdated) + status_routine_called[reason]++; + else + ok(0, "expected reason between 0 and %d, got %d\n", BindSymbolsNotUpdated+1, reason); + + switch(reason) + { + case BindImportModule: + ok(!strcmp(DllName, "KERNEL32.DLL"), "expected DllName to be KERNEL32.DLL, got %s\n", + DllName); + break; + + case BindImportProcedure: + case BindForwarderNOT: + GetSystemDirectoryA(kernel32_path, MAX_PATH); + strcat(kernel32_path, "\\KERNEL32.DLL"); + ok(!lstrcmpiA(DllName, kernel32_path), "expected DllName to be %s, got %s\n", + kernel32_path, DllName); + ok(!strcmp((char *)Parameter, "ExitProcess"), + "expected Parameter to be ExitProcess, got %s\n", (char *)Parameter); + break; + + default: + ok(0, "got unexpected reason %d\n", reason); + break; + } + return TRUE; +} + static void test_get_digest_stream(void) { BOOL ret; @@ -281,6 +320,11 @@ DWORD count; struct update_accum accum = { 0, NULL }; + if (!pImageGetDigestStream) + { + win_skip("ImageGetDigestStream function is not available\n"); + return; + } SetLastError(0xdeadbeef); ret = pImageGetDigestStream(NULL, 0, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, @@ -329,6 +373,60 @@ DeleteFileA(temp_file); } +static void test_bind_image_ex(void) +{ + BOOL ret; + HANDLE file; + char temp_file[MAX_PATH]; + DWORD count; + + if (!pBindImageEx) + { + win_skip("BindImageEx function is not available\n"); + return; + } + + /* call with a non-existent file */ + SetLastError(0xdeadbeef); + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, "nonexistent.dll", 0, 0, + testing_status_routine); + todo_wine ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); + + file = create_temp_file(temp_file); + if (file == INVALID_HANDLE_VALUE) + { + skip("couldn't create temp file\n"); + return; + } + + WriteFile(file, &bin, sizeof(bin), &count, NULL); + CloseHandle(file); + + /* call with a proper PE file, but with StatusRoutine set to NULL */ + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, + NULL); + ok(ret, "BindImageEx failed: %d\n", GetLastError()); + + /* call with a proper PE file and StatusRoutine */ + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, + testing_status_routine); + ok(ret, "BindImageEx failed: %d\n", GetLastError()); + + todo_wine ok(status_routine_called[BindImportModule] == 1, + "StatusRoutine was called %d times\n", status_routine_called[BindImportModule]); + + todo_wine ok((status_routine_called[BindImportProcedure] == 1) +#if defined(_WIN64) + || broken(status_routine_called[BindImportProcedure] == 0) /* < Win8 */ +#endif + , "StatusRoutine was called %d times\n", status_routine_called[BindImportProcedure]); + + DeleteFileA(temp_file); +} + START_TEST(image) { hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -340,14 +438,10 @@ } pImageGetDigestStream = (void *) GetProcAddress(hImageHlp, "ImageGetDigestStream"); - - if (!pImageGetDigestStream) - { - win_skip("ImageGetDigestStream function is not available\n"); - } else - { - test_get_digest_stream(); - } + pBindImageEx = (void *) GetProcAddress(hImageHlp, "BindImageEx"); + + test_get_digest_stream(); + test_bind_image_ex(); FreeLibrary(hImageHlp); } Modified: trunk/rostests/winetests/imagehlp/integrity.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/integr… ============================================================================== --- trunk/rostests/winetests/imagehlp/integrity.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imagehlp/integrity.c [iso-8859-1] Sat Sep 27 19:47:51 2014 @@ -135,7 +135,7 @@ return filesize; } -static void test_add_certificate(const char *cert_data, int len) +static DWORD test_add_certificate(const char *cert_data, int len) { HANDLE hFile; LPWIN_CERTIFICATE cert; @@ -148,7 +148,7 @@ if (hFile == INVALID_HANDLE_VALUE) { skip("Unable to open %s, skipping test\n", test_dll_path); - return; + return ~0; } cert_len = sizeof(WIN_CERTIFICATE) + len; @@ -158,7 +158,7 @@ { skip("Unable to allocate memory, skipping test\n"); CloseHandle(hFile); - return; + return ~0; } cert->dwLength = cert_len; @@ -168,9 +168,11 @@ ret = pImageAddCertificate(hFile, cert, &index); ok(ret, "Unable to add certificate to image, error %x\n", GetLastError()); + trace("added cert index %d\n", index); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); + return index; } static void test_get_certificate(const char *cert_data, int index) @@ -239,7 +241,7 @@ START_TEST(integrity) { - DWORD file_size, file_size_orig; + DWORD file_size, file_size_orig, first, second; hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -272,25 +274,27 @@ pImageGetCertificateHeader = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateHeader"); pImageRemoveCertificate = (void *) GetProcAddress(hImageHlp, "ImageRemoveCertificate"); - test_add_certificate(test_cert_data, sizeof(test_cert_data)); - test_get_certificate(test_cert_data, 0); - test_remove_certificate(0); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); + test_get_certificate(test_cert_data, first); + test_remove_certificate(first); file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); /* Try adding multiple certificates */ - test_add_certificate(test_cert_data, sizeof(test_cert_data)); - test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); - - test_get_certificate(test_cert_data, 0); - test_get_certificate(test_cert_data_2, 1); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); + second = test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); + ok(second == first + 1, "got %d %d\n", first, second); + + test_get_certificate(test_cert_data, first); + test_get_certificate(test_cert_data_2, second); /* Remove the first one and verify the second certificate is intact */ - test_remove_certificate(0); - test_get_certificate(test_cert_data_2, 0); - - test_remove_certificate(0); + test_remove_certificate(first); + second--; + test_get_certificate(test_cert_data_2, second); + + test_remove_certificate(second); file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size);

10 years, 2 months

[akhaldi] 64354: [TRANSLATIONS] * Second part of the russian translation update by Kudratov Olimjon. CORE-8495 #resolve #comment Second part committed in r64354. Thanks!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 19:44:10 2014 New Revision: 64354 URL: http://svn.reactos.org/svn/reactos?rev=64354&view=rev Log: [TRANSLATIONS] * Second part of the russian translation update by Kudratov Olimjon. CORE-8495 #resolve #comment Second part committed in r64354. Thanks! Added: trunk/reactos/base/applications/network/net/lang/ru-RU.rc (with props) trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc (with props) trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/network/net/net.rc trunk/reactos/base/applications/network/wlanconf/wlanconf.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc trunk/reactos/subsystems/ntvdm/ntvdm.rc Added: trunk/reactos/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -0,0 +1,64 @@ +/* Russian translation by Kudratov Olimjon, 2014.09.25 */ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ACCOUNTS_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET ACCOUNTS [/FORCELOGOFF:{ÐÐ¸Ð½ÑÑÑ | NO}] [/MINPWLEN: ÐÐ»Ð¸Ð½Ð°]\n\ + [/MAXPWAGE:{ÐÐ½Ð¸ | UNLIMITED}] [/MINPWAGE:ÐÐ½Ð¸]\n\ + [/UNIQUEPW:Ð§Ð¸ÑÐ»Ð¾] [/DOMAIN]\n" + IDS_ACCOUNTS_HELP "ACCOUNTS\n..." + IDS_COMPUTER_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET COMPUTER ..." + IDS_COMPUTER_HELP "COMPUTER\n..." + IDS_CONFIG_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET CONFIG ..." + IDS_CONFIG_HELP "CONFIG\n..." + IDS_CONTINUE_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET CONTINUE <ÐÐ¼Ñ ÑÐ»ÑÐ¶Ð±Ñ>" + IDS_CONTINUE_HELP "CONTINUE\n..." + IDS_FILE_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET FILE ..." + IDS_FILE_HELP "FILE\n..." + IDS_GROUP_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET GROUP ..." + IDS_GROUP_HELP "GROUP\n..." + IDS_HELPMSG_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET HELPMSG <ÐÐ¾Ð´ Ð¾ÑÐ¸Ð±ÐºÐ¸>" + IDS_HELPMSG_HELP "HELPMSG\n..." + IDS_LOCALGROUP_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET LOCALGROUP ..." + IDS_LOCALGROUP_HELP "LOCALGROUP\n..." + IDS_NAME_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET NAME ..." + IDS_NAME_HELP "NAME\n..." + IDS_PRINT_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET PRINT ..." + IDS_PRINT_HELP "PRINT\n..." + IDS_PAUSE_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET PAUSE <ÐÐ¼Ñ ÑÐ»ÑÐ¶Ð±Ñ>" + IDS_PAUSE_HELP "PAUSE\n..." + IDS_SEND_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET SEND ..." + IDS_SEND_HELP "SEND\n..." + IDS_SESSION_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET SESSION ..." + IDS_SESSION_HELP "SESSION\n..." + IDS_SHARE_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET SHARE ..." + IDS_SHARE_HELP "SHARE\n..." + IDS_START_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET START ..." + IDS_START_HELP "START\n..." + IDS_STATISTICS_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET STATISTICS ..." + IDS_STATISTICS_HELP "STATISTICS\n..." + IDS_STOP_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET STOP <ÐÐ¼Ñ ÑÐ»ÑÐ¶Ð±Ñ>" + IDS_STOP_HELP "STOP\n..." + IDS_TIME_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET TIME ..." + IDS_TIME_HELP "TIME\n..." + IDS_USE_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET USE ..." + IDS_USE_HELP "USE\n..." + IDS_USER_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET USER ..." + IDS_USER_HELP "USER\n..." + IDS_VIEW_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET VIEW ..." + IDS_VIEW_HELP "VIEW\n..." + IDS_HELP_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET HELP <ÐÐ¾Ð¼Ð°Ð½Ð´Ð°>\n - Ð¸Ð»Ð¸ -\nNET <ÐÐ¾Ð¼Ð°Ð½Ð´Ð°> /HELP\n\n\ + ÐÐ¾ÑÑÑÐ¿Ð½Ñ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ:\n\n\ + NET ACCOUNTS NET HELP NET SHARE\n\ + NET COMPUTER NET HELPMSG NET START\n\ + NET CONFIG NET LOCALGROUP NET STATISTICS\n\ + NET CONFIG SERVER NET NAME NET STOP\n\ + NET CONFIG WORKSTATION NET PAUSE NET TIME\n\ + NET CONTINUE NET PRINT NET USE\n\ + NET FILE NET SEND NET USER\n\ + NET GROUP NET SESSION NET VIEW\n\n\ + ..." + IDS_NET_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ + HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ + SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" +END Propchange: trunk/reactos/base/applications/network/net/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/net/net.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -18,3 +18,6 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Added: trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -0,0 +1,38 @@ +/* Russian translation by Kudratov Olimjon, 2014.09.25 */ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nÐÐ°ÑÑÑÐ¾Ð¹ÑÐµ WLAN Ð°Ð´Ð°Ð¿ÑÐµÑ.\n\n\ +WLANCONF [-c SSID [-w WEP] [-a]] [-d] [-s]\n\n\ +\t-c SSID\t\tÐÐ¾Ð´ÐºÐ»ÑÑÐ°ÐµÑÑÑ Ðº ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ SSID,\n\ +\t-w WEP\t\tÐÐ°Ð´Ð°ÐµÑ WEP ÐºÐ»ÑÑ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n\ +\t-a\t\tÐ£ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐµÐ»ÐµÐ²ÑÑ ÑÐµÑÑ is ad-hoc\n\ +\t-d\t\tÐÑÐºÐ»ÑÑÐ°ÐµÑÑÑ Ð¾Ñ ÑÐµÐºÑÑÐµÐ¹ ÑÐ¾ÑÐºÐ¸ Ð´Ð¾ÑÑÑÐ¿Ð°.\n\ +\t-s\t\tÐ¡ÐºÐ°Ð½Ð¸ÑÑÐµÑ Ð¸ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐ¿Ð¸ÑÐ¾Ðº ÑÐ¾ÑÐµÐº Ð´Ð¾ÑÑÑÐ¿Ð°\n\ +\t\t\tÐ² Ð¾Ð±Ð»Ð°ÑÑÐ¸.\n\n\ +ÐÑÐ¸ Ð¾ÑÑÑÑÑÑÐ²Ð¸Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐµÐºÑÑÐµÐ¼ WLAN ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸\n" + IDS_NO_NETWORK "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐµÑÐµÐ¹ Ð² Ð¾Ð±Ð»Ð°ÑÑÐ¸\n" + IDS_NO_WLAN_ADAPTER "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ WLAN Ð°Ð´Ð°Ð¿ÑÐµÑ Ð² ÑÐ¸ÑÑÐµÐ¼Ðµ\n" + IDS_SUCCESS "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð° ÑÑÐ¿ÐµÑÐ½Ð¾.\n" + IDS_WLAN_DISCONNECT "\nWLAN Ð¾ÑÐºÐ»ÑÑÐµÐ½\n" + IDS_MSG_WEP_ENABLED "WEP Ð²ÐºÐ»ÑÑÐµÐ½: %s\n" + IDS_MSG_NETWORK_MODE "Ð ÐµÐ¶Ð¸Ð¼ ÑÐµÑÐ¸: %s\n" + IDS_MSG_CURRENT_WIRELESS "\nÐ¢ÐµÐºÑÑÐ°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸ Ð±ÐµÑÐ¿ÑÐ¾Ð²Ð¾Ð´Ð½Ð¾Ð¹ ÑÐµÑÐ¸:\n\n" + IDS_MSG_ENCRYPTED "ÐÐ°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð¾: %s\n" + IDS_MSG_NETWORK_TYPE "Ð¢Ð¸Ð¿ ÑÐµÑÐ¸: %s\n" + IDS_MSG_RSSI "RSSI: %i dBm\n" + IDS_MSG_SUPPORT_RATE "ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐµ ÑÐºÐ¾ÑÐ¾ÑÑÐ¸ (Mbps): " + IDS_MSG_TRANSMISSION_POWER "ÐÐ¾ÑÐ½Ð¾ÑÑÑ Ð¿ÐµÑÐµÐ´Ð°ÑÑÐ¸ÐºÐ°: %d mW\n" + IDS_MSG_ANTENNA_COUNT "Ð§Ð¸ÑÐ»Ð¾ Ð°Ð½ÑÐµÐ½Ð½: %d\n" + IDS_MSG_TRANSMIT_ANTENNA "ÐÐµÑÐµÐ´Ð°ÑÑÐ°Ñ Ð°Ð½ÑÐµÐ½Ð½Ð°: %d\n" + IDS_MSG_TRANSMIT_ANTENNA_ANY "ÐÐµÑÐµÐ´Ð°ÑÑÐ°Ñ Ð°Ð½ÑÐµÐ½Ð½Ð°: ÐÑÐ±Ð°Ñ\n" + IDS_MSG_RECEIVE_ANTENNA "ÐÑÐ¸Ð½Ð¸Ð¼Ð°ÑÑÐ°Ñ Ð°Ð½ÑÐµÐ½Ð½Ð°: %d\n" + IDS_MSG_RECEIVE_ANTENNA_ANY "ÐÑÐ¸Ð½Ð¸Ð¼Ð°ÑÑÐ°Ñ Ð°Ð½ÑÐµÐ½Ð½Ð°: ÐÑÐ±Ð°Ñ\n" + IDS_MSG_FRAGMENT_THRESHOLD "ÐÐ¾ÑÐ¾Ð³ ÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸: %d Ð±Ð°Ð¹Ñ\n" + IDS_MSG_RTS_THRESHOLD "ÐÐ¾ÑÐ¾Ð³ RTS: %d Ð±Ð°Ð¹Ñ\n" + IDS_YES "ÐÐ°" + IDS_NO "ÐÐµÑ" + IDS_ADHOC "Adhoc" + IDS_INFRASTRUCTURE "ÐÐ½ÑÑÐ°ÑÑÑÑÐºÑÑÑÐ°" +END Propchange: trunk/reactos/base/applications/network/wlanconf/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -31,6 +31,9 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif #ifdef LANGUAGE_SQ_AL #include "lang/sq-AL.rc" #endif Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -31,8 +31,8 @@ IDS_SEARCH "&ÐÐ¾Ð¸ÑÐº" IDS_FAVORITES "&ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ" - IDS_HIDETABS "Hide &Tabs" - IDS_SHOWTABS "Show &Tabs" + IDS_HIDETABS "&Ð¡ÐºÑÑÑÑ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸" + IDS_SHOWTABS "&ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸" END STRINGTABLE @@ -54,12 +54,12 @@ POPUP "" /* Options */ { MENUITEM "", IDTB_EXPAND - MENUITEM "S&ync", IDTB_SYNC - MENUITEM "&Back", IDTB_BACK - MENUITEM "&Forward", IDTB_FORWARD - MENUITEM "&Home", IDTB_HOME - MENUITEM "&Stop", IDTB_STOP - MENUITEM "&Refresh", IDTB_REFRESH - MENUITEM "&Print...", IDTB_PRINT + MENUITEM "Ð¡&Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ", IDTB_SYNC + MENUITEM "&ÐÐ°Ð·Ð°Ð´", IDTB_BACK + MENUITEM "&ÐÐ¿ÐµÑÐµÐ´", IDTB_FORWARD + MENUITEM "&ÐÐ¾Ð¼Ð¾Ð¹", IDTB_HOME + MENUITEM "&ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", IDTB_STOP + MENUITEM "Ð&Ð±Ð½Ð¾Ð²Ð¸ÑÑ", IDTB_REFRESH + MENUITEM "&ÐÐµÑÐ°ÑÑ...", IDTB_PRINT } } Added: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ru-R… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc (added) +++ trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -0,0 +1,14 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_HIDE_MOUSE, "&Ð¡Ð¿ÑÑÑÐ°ÑÑ ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ñ Ð¼ÑÑÐ¸" + IDS_SHOW_MOUSE, "&ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ñ Ð¼ÑÑÐ¸" + IDS_VDM_MENU , "ReactOS &VDM" +END + +STRINGTABLE +BEGIN + IDS_VDM_DUMPMEM, "ÐÐ°Ð¼Ð¿ &Ð¿Ð°Ð¼ÑÑÐ¸" + IDS_VDM_QUIT , "&ÐÑÐ¹ÑÐ¸ Ð¸Ð· ReactOS VDM" +END Propchange: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.rc [iso-8859-1] Sat Sep 27 19:44:10 2014 @@ -40,3 +40,6 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif

10 years, 2 months

[akhaldi] 64353: [IEFRAME] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 19:41:46 2014 New Revision: 64353 URL: http://svn.reactos.org/svn/reactos?rev=64353&view=rev Log: [IEFRAME] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/ieframe/ie.c trunk/reactos/dll/win32/ieframe/ieframe.h trunk/reactos/dll/win32/ieframe/navigate.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ieframe/ie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ie.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] Sat Sep 27 19:41:46 2014 @@ -354,8 +354,11 @@ static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pHWND); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pHWND); + + *pHWND = (SHANDLE_PTR)This->frame_hwnd; + return S_OK; } static HRESULT WINAPI InternetExplorer_get_FullName(IWebBrowser2 *iface, BSTR *FullName) Modified: trunk/reactos/dll/win32/ieframe/ieframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] Sat Sep 27 19:41:46 2014 @@ -326,8 +326,6 @@ HRESULT WINAPI WebBrowser_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI WebBrowserV1_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; - extern LONG module_ref DECLSPEC_HIDDEN; extern HINSTANCE ieframe_instance DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/ieframe/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/navigate… ============================================================================== --- trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] Sat Sep 27 19:41:46 2014 @@ -653,7 +653,7 @@ return CreateURLMoniker(NULL, url, mon); size = sizeof(new_url)/sizeof(WCHAR); - hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE); + hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT); TRACE("was %s got %s\n", debugstr_w(url), debugstr_w(new_url)); if(FAILED(hres)) { WARN("UrlApplyScheme failed: %08x\n", hres); @@ -914,11 +914,9 @@ TRACE("navigating to %s\n", debugstr_w(url)); - if((Flags && V_VT(Flags) != VT_EMPTY) - || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)) - FIXME("Unsupported args (Flags %p:%d; TargetFrameName %p:%d)\n", - Flags, Flags ? V_VT(Flags) : -1, TargetFrameName, - TargetFrameName ? V_VT(TargetFrameName) : -1); + if((Flags && V_VT(Flags) != VT_EMPTY && V_VT(Flags) != VT_ERROR) + || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY && V_VT(TargetFrameName) != VT_ERROR)) + FIXME("Unsupported args (Flags %s; TargetFrameName %s)\n", debugstr_variant(Flags), debugstr_variant(TargetFrameName)); if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1) && V_ARRAY(PostData)) { SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 27 19:41:46 2014 @@ -82,7 +82,7 @@ reactos/dll/win32/httpapi # Synced to Wine-1.7.17 reactos/dll/win32/iccvid # Synced to Wine-1.7.17 reactos/dll/win32/icmp # Out of sync -reactos/dll/win32/ieframe # Synced to Wine-1.7.17 +reactos/dll/win32/ieframe # Synced to Wine-1.7.27 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.17 reactos/dll/win32/imagehlp # Synced to Wine-1.7.17 reactos/dll/win32/imm32 # Synced to Wine-1.7.17

10 years, 2 months

[akhaldi] 64352: [HNETCFG] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 19:37:39 2014 New Revision: 64352 URL: http://svn.reactos.org/svn/reactos?rev=64352&view=rev Log: [HNETCFG] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/hnetcfg/apps.c trunk/reactos/dll/win32/hnetcfg/hnetcfg.c trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h trunk/reactos/dll/win32/hnetcfg/port.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hnetcfg/apps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/apps.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] Sat Sep 27 19:37:39 2014 @@ -95,6 +95,7 @@ &IID_INetFwAuthorizedApplication, &IID_INetFwAuthorizedApplications, &IID_INetFwMgr, + &IID_INetFwOpenPort, &IID_INetFwPolicy, &IID_INetFwProfile }; Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] Sat Sep 27 19:37:39 2014 @@ -101,6 +101,7 @@ static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; +static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -131,6 +132,10 @@ { cf = &fw_app_cf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_NetFwOpenPort )) + { + cf = &fw_openport_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.idl [iso-8859-1] Sat Sep 27 19:37:39 2014 @@ -35,3 +35,11 @@ uuid(ec9846b3-2762-4a6b-a214-6acb603462d2) ] coclass NetFwAuthorizedApplication { interface INetFwAuthorizedApplications; } + +[ + helpstring("HNetCfg.FwOpenPort"), + progid("HNetCfg.FwOpenPort"), + threading(both), + uuid(0ca545c6-37ad-4a6c-bf92-9f7610067ef5) +] +coclass NetFwOpenPort { interface INetFwOpenPort; } Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.rgs [iso-8859-1] Sat Sep 27 19:37:39 2014 @@ -15,6 +15,11 @@ InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } ProgId = s 'HNetCfg.FwAuthorizedApplication' } + '{0CA545C6-37AD-4A6C-BF92-9F7610067EF5}' = s 'HNetCfg.FwOpenPort' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + ProgId = s 'HNetCfg.FwOpenPort' + } } 'HNetCfg.FwMgr' = s 'HNetCfg.FwMgr' { @@ -24,4 +29,8 @@ { CLSID = s '{EC9846B3-2762-4A6B-A214-6ACB603462D2}' } + 'HNetCfg.FwOpenPort' = s 'HNetCfg.FwOpenPort' + { + CLSID = s '{0CA545C6-37AD-4A6C-BF92-9F7610067EF5}' + } } Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] Sat Sep 27 19:37:39 2014 @@ -42,6 +42,7 @@ INetFwAuthorizedApplication_tid, INetFwAuthorizedApplications_tid, INetFwMgr_tid, + INetFwOpenPort_tid, INetFwPolicy_tid, INetFwProfile_tid, last_tid @@ -55,6 +56,7 @@ HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT NetFwOpenPort_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; #endif /* _HNETCFG_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/hnetcfg/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/port.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/port.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/port.c [iso-8859-1] Sat Sep 27 19:37:39 2014 @@ -79,8 +79,9 @@ { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_port_GetTypeInfo( @@ -91,8 +92,8 @@ { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwOpenPort_tid, ppTInfo ); } static HRESULT WINAPI fw_port_GetIDsOfNames( @@ -104,9 +105,18 @@ DISPID *rgDispId ) { fw_port *This = impl_from_INetFwOpenPort( iface ); - - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwOpenPort_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_port_Invoke( @@ -121,10 +131,20 @@ UINT *puArgErr ) { fw_port *This = impl_from_INetFwOpenPort( iface ); - - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwOpenPort_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwOpenPort_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_port_get_Name( @@ -305,7 +325,7 @@ fw_port_get_BuiltIn }; -static HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) { fw_port *fp; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 27 19:37:39 2014 @@ -78,7 +78,7 @@ reactos/dll/win32/gdiplus # Synced to Wine-1.7.27 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.27 reactos/dll/win32/hlink # Synced to Wine-1.7.17 -reactos/dll/win32/hnetcfg # Synced to Wine-1.7.17 +reactos/dll/win32/hnetcfg # Synced to Wine-1.7.27 reactos/dll/win32/httpapi # Synced to Wine-1.7.17 reactos/dll/win32/iccvid # Synced to Wine-1.7.17 reactos/dll/win32/icmp # Out of sync

10 years, 2 months

[akhaldi] 64351: [CMD_WINETEST] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 27 19:31:30 2014 New Revision: 64351 URL: http://svn.reactos.org/svn/reactos?rev=64351&view=rev Log: [CMD_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/cmd/batch.c trunk/rostests/winetests/cmd/test_builtins.cmd trunk/rostests/winetests/cmd/test_builtins.cmd.exp trunk/rostests/winetests/cmd/test_cmdline.cmd trunk/rostests/winetests/cmd/test_cmdline.cmd.exp Modified: trunk/rostests/winetests/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/batch.c?rev… ============================================================================== --- trunk/rostests/winetests/cmd/batch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/batch.c [iso-8859-1] Sat Sep 27 19:31:30 2014 @@ -140,9 +140,9 @@ size = GetFileSize(file, NULL); - map = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL); + map = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); CloseHandle(file); - ok(map != NULL, "CreateFileMapping(%s) failed: %u\n", file_name, GetLastError()); + ok(map != NULL, "CreateFileMappingA(%s) failed: %u\n", file_name, GetLastError()); if(!map) return 0; @@ -409,7 +409,7 @@ return size; } -static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG_PTR param) +static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) { const char *cmd_data, *out_data; DWORD cmd_size, out_size; @@ -466,8 +466,14 @@ drive[0] = workdir[0]; drive[1] = workdir[1]; /* Should be ':' */ memcpy(path, workdir + drive_len, (workdir_len - drive_len) * sizeof(drive[0])); - path[workdir_len - drive_len] = '\\'; - path_len = workdir_len - drive_len + 1; + + /* Only add trailing backslash to 'path' for non-root directory */ + if (workdir_len - drive_len > 1) { + path[workdir_len - drive_len] = '\\'; + path_len = workdir_len - drive_len + 1; + } else { + path_len = 1; /* \ */ + } shortpath_len = GetShortPathNameA(path, shortpath, sizeof(shortpath)/sizeof(shortpath[0])); Modified: trunk/rostests/winetests/cmd/test_builtins.cmd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… ============================================================================== --- trunk/rostests/winetests/cmd/test_builtins.cmd [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_builtins.cmd [iso-8859-1] Sat Sep 27 19:31:30 2014 @@ -286,10 +286,35 @@ echo '%WINE_FOO%' set WINE_FOO=foo@tab@ echo '%WINE_FOO%' +rem Space symbol must appear in `var` +set WINE_FOO=value@space@ +echo '%WINE_FOO%' +rem Space symbol must NOT appear in `var` +set "WINE_FOO=value"@space@ +echo '%WINE_FOO%' +rem Mixed examples: +set WINE_FOO=jim fred +echo '%WINE_FOO%' +set WINE_FOO="jim" fred +echo '%WINE_FOO%' +set "WINE_FOO=jim fred" +echo '%WINE_FOO%' +set "WINE_FOO=jim" fred +echo '%WINE_FOO%' +rem Only the final quote ends the string +set "WINE_FOO=apple"banana"grape"orange +echo '%WINE_FOO%' set WINE_FOO= echo ------------ Testing variable expansion ------------ call :setError 0 +echo ~p0 should be path containing batch file +echo %~p0 +mkdir dummydir +cd dummydir +echo %~p0 +cd .. +rmdir dummydir echo ~dp0 should be directory containing batch file echo %~dp0 mkdir dummydir @@ -363,6 +388,7 @@ for %%i in ("g h" i) do echo %%~sdi for %%i in ("g h" i) do echo %%~dsi for %%i in ("j k" l.eh) do echo '%%~xsi' +for %%i in ("") do echo '%%~i,%%~fi,%%~di,%%~pi,%%~ni,%%~xi,%%~si,%%~ai,%%~ti,%%~zi' echo --- in parameters for %%i in ("A B" C) do call :echoFun %%i @@ -998,7 +1024,22 @@ call :ValidateExpected echo for /R passed -cd .. & rd /s/Q foobar +echo --- Complex wildcards unix and windows slash +cd .. +echo Windows slashs, valid path +for %%f in (foobar\baz\bazbaz) do echo ASIS: %%f +for %%f in (foobar\baz\*) do echo WC : %%f +echo Windows slashs, invalid path +for %%f in (foobar\jim\bazbaz) do echo ASIS: %%f +for %%f in (foobar\jim\*) do echo WC : %%f +echo Unix slashs, valid path +for %%f in (foobar/baz/bazbaz) do echo ASIS: %%f +for %%f in (foobar/baz/*) do echo WC : %%f +echo Unix slashs, invalid path +for %%f in (foobar/jim/bazbaz) do echo ASIS: %%f +for %%f in (foobar/jim/*) do echo WC : %%f +echo Done +rd /s/Q foobar echo --- for /L rem Some cases loop forever writing 0s, like e.g. (1,0,1), (1,a,3) or (a,b,c); those can't be tested here for /L %%i in (1,2,0) do echo %%i @@ -2199,7 +2240,7 @@ rem ASCII and BINARY tests rem Note: hard coded numbers deliberate because need to ensure whether rem an additional EOF has been added or not. There is no way to handle -rem EOFs in batch, so assume if a single byte appears, its an EOF! +rem EOFs in batch, so assume if a single byte appears, it's an EOF! rem ****************************************************************** rem Confirm original sizes of file1,2,3 @@ -2283,7 +2324,7 @@ rem ------------------------------------------------------------------------------------------- rem This shows when concatenating, an ascii destination always adds on an EOF but when we -rem are not concatenating, its a direct copy regardless of destination if being read as binary +rem are not concatenating, it's a direct copy regardless of destination if being read as binary rem ------------------------------------------------------------------------------------------- rem All 3 have eof's, plus an extra = 6 + 9 + 12 + eof @@ -2538,17 +2579,72 @@ echo ------------ Testing GOTO ------------ if a==a goto dest1 +echo FAILURE at dest 1 :dest1 echo goto with no leading space worked +if a==a goto :dest1b +echo FAILURE at dest 1b +:dest1b +echo goto with colon and no leading space worked if b==b goto dest2 +echo FAILURE at dest 2 :dest2 echo goto with a leading space worked if c==c goto dest3 +echo FAILURE at dest 3 :dest3 echo goto with a leading tab worked if d==d goto dest4 +echo FAILURE at dest 4 :dest4@space@ echo goto with a following space worked +if e==e goto dest5 +echo FAILURE at dest 5 +:dest5&& echo FAILURE +echo goto with following amphersands worked + +del failure.txt >nul 2>&1 +if f==f goto dest6 +echo FAILURE at dest 6 +:dest6>FAILURE.TXT +if exist FAILURE.TXT echo FAILURE at dest 6 as file exists +echo goto with redirections worked +del FAILURE.TXT >nul 2>&1 + +:: some text that is ignored | dir >cmd_output | another test +if exist cmd_output echo FAILURE at dest 6 as file exists +echo Ignoring double colons worked +del cmd_output >nul 2>&1 + +rem goto a label which does not exist issues an error message and +rem acts the same as goto :EOF, and ensure ::label is never matched +del testgoto.bat >nul 2>&1 +echo goto :dest7 ^>nul 2^>^&1 >> testgoto.bat +echo echo FAILURE at dest 7 - Should have not found label and issued an error plus ended the batch>> testgoto.bat +echo ::dest7>> testgoto.bat +echo echo FAILURE at dest 7 - Incorrectly went to label >> testgoto.bat +call testgoto.bat +del testgoto.bat >nul 2>&1 + +del testgoto.bat >nul 2>&1 +echo goto ::dest8 ^>nul 2^>^&1 >> testgoto.bat +echo echo FAILURE at dest 8 - Should have not found label and issued an error plus ended the batch>> testgoto.bat +echo ::dest8>> testgoto.bat +echo echo FAILURE at dest 8 - Incorrectly went to label >> testgoto.bat +call testgoto.bat +del testgoto.bat >nul 2>&1 + +if g==g goto dest9 +echo FAILURE at dest 9 +:dest91 +echo FAILURE at dest 91 +@ : dest9>rubbish +echo label with mixed whitespace and no echo worked + +if h==h goto :dest10:this is ignored +echo FAILURE at dest 10 +:dest10:this is also ignored +echo Correctly ignored trailing information echo ------------ Testing PATH ------------ set WINE_backup_path=%path% Modified: trunk/rostests/winetests/cmd/test_builtins.cmd.exp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… ============================================================================== --- trunk/rostests/winetests/cmd/test_builtins.cmd.exp [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_builtins.cmd.exp [iso-8859-1] Sat Sep 27 19:31:30 2014 @@ -251,10 +251,20 @@ '' 'foo@space@' 'foo@tab@' +'value@space@' +'value' +'jim fred' +'"jim" fred' +'jim fred' +'jim' +'apple"banana"grape' ------------ Testing variable expansion ------------ +~p0 should be path containing batch file +@path@ +@path@ ~dp0 should be directory containing batch file -@pwd@\ -@pwd@\ +@drive@@path@ +@drive@@path@ CD value @pwd@@or_broken@CD value@space@ % P @@ -289,8 +299,8 @@ C 'A B'@or_broken@'' 'C'@or_broken@'' -@pwd@\C D@or_broken@%~ff -@pwd@\E@or_broken@%~ff +@drive@@path@C D@or_broken@%~ff +@drive@@path@E@or_broken@%~ff @drive@ @drive@ @path@@or_broken@%~pd @@ -319,13 +329,14 @@ @drive@ '' '.eh' +',,,,,,,,,' --- in parameters "A B" C 'A B'@or_broken@'' 'C'@or_broken@'' -@pwd@\C D -@pwd@\E +@drive@@path@C D +@drive@@path@E @drive@ @drive@ @path@ @@ -381,22 +392,22 @@ foo6@space@ @todo_wine@------------ Testing cd ------------ singleFile -Current dir: @pwd@\foobar@or_broken@Current dir:@space@ -@pwd@\foobar +Current dir: @drive@@path@foobar@or_broken@Current dir:@space@ +@drive@@path@foobar @pwd@ -@pwd@\foobar +@drive@@path@foobar @pwd@ -@pwd@\foobar +@drive@@path@foobar @pwd@ @pwd@ @pwd@ -@pwd@\foobar\bar bak -@pwd@\foobar\bar bak -@pwd@\foobar\bar bak -@pwd@\foobar\bar bak -@pwd@\foobar\bar bak +@drive@@path@foobar\bar bak +@drive@@path@foobar\bar bak +@drive@@path@foobar\bar bak +@drive@@path@foobar\bar bak +@drive@@path@foobar\bar bak @pwd@ -@pwd@\foobar +@drive@@path@foobar ------------ Testing type ------------ @pwd@>type foobaz@space@ @@ -683,6 +694,18 @@ With duplicates enumeration Strip missing wildcards, keep unwildcarded names for /R passed +--- Complex wildcards unix and windows slash +Windows slashs, valid path +ASIS: foobar\baz\bazbaz +WC : foobar\baz\bazbaz +Windows slashs, invalid path +ASIS: foobar\jim\bazbaz +Unix slashs, valid path +ASIS: foobar/baz/bazbaz +WC : bazbaz +Unix slashs, invalid path +ASIS: foobar/jim/bazbaz +Done --- for /L 1 3 @@ -1067,31 +1090,31 @@ --- pushing non-existing dir @pwd@ --- basic behaviour -@pwd@\foobar +@drive@@path@foobar @pwd@ -@pwd@\foobar\baz -@pwd@\foobar -@pwd@\foobar +@drive@@path@foobar\baz +@drive@@path@foobar +@drive@@path@foobar @pwd@ -@pwd@\foobar +@drive@@path@foobar @pwd@ ------------ Testing attrib ------------ -A @pwd@\foobar\foo@or_broken@A @pwd@\foobar\foo@or_broken@A I @pwd@\foobar\foo +A @drive@@path@foobar\foo@or_broken@A @drive@@path@foobar\foo@or_broken@A I @drive@@path@foobar\foo --- read-only attribute -A R @pwd@\foobar\foo@or_broken@A R @pwd@\foobar\foo@or_broken@A R I @pwd@\foobar\foo +A R @drive@@path@foobar\foo@or_broken@A R @drive@@path@foobar\foo@or_broken@A R I @drive@@path@foobar\foo foo foo original contents Read-only file not deleted Read-only file forcibly deleted --- recursive behaviour -A @pwd@\foobar\baz\level2@or_broken@A @pwd@\foobar\baz\level2@or_broken@A I @pwd@\foobar\baz\level2 -A R @pwd@\foobar\level1@or_broken@A R @pwd@\foobar\level1@or_broken@A R I @pwd@\foobar\level1 -A R @pwd@\foobar\baz\level2@or_broken@A R @pwd@\foobar\baz\level2@or_broken@A R I @pwd@\foobar\baz\level2 -A @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar +A @drive@@path@foobar\baz\level2@or_broken@A @drive@@path@foobar\baz\level2@or_broken@A I @drive@@path@foobar\baz\level2 +A R @drive@@path@foobar\level1@or_broken@A R @drive@@path@foobar\level1@or_broken@A R I @drive@@path@foobar\level1 +A R @drive@@path@foobar\baz\level2@or_broken@A R @drive@@path@foobar\baz\level2@or_broken@A R I @drive@@path@foobar\baz\level2 +A @drive@@path@foobar\bar@or_broken@A @drive@@path@foobar\bar@or_broken@A I @drive@@path@foobar\bar --- folders processing - @pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar -@todo_wine@ R @pwd@\foobar\baz@or_broken@ R @pwd@\foobar\baz@or_broken@ @pwd@\foobar\baz@or_broken@ R I @pwd@\foobar\baz -A @pwd@\foobar\baz\toto@or_broken@A @pwd@\foobar\baz\toto@or_broken@A I @pwd@\foobar\baz\toto + @drive@@path@foobar@or_broken@ @drive@@path@foobar@or_broken@ I @drive@@path@foobar +@todo_wine@ R @drive@@path@foobar\baz@or_broken@ R @drive@@path@foobar\baz@or_broken@ @drive@@path@foobar\baz@or_broken@ R I @drive@@path@foobar\baz +A @drive@@path@foobar\baz\toto@or_broken@A @drive@@path@foobar\baz\toto@or_broken@A I @drive@@path@foobar\baz\toto toto lulu file created in read-only dir @@ -1228,17 +1251,17 @@ --- setlocal with corresponding endlocal globalval localval -@pwd@\foobar\foobar2 +@drive@@path@foobar\foobar2 globalval -@pwd@\foobar +@drive@@path@foobar globalval -@pwd@\foobar +@drive@@path@foobar --- setlocal with no corresponding endlocal globalval localval -@pwd@\foobar\foobar2 +@drive@@path@foobar\foobar2 globalval -@pwd@\foobar +@drive@@path@foobar --- setlocal within same batch program Var1 ok 1 Var2 ok 2 @@ -1256,23 +1279,23 @@ --- Extra setlocal in called batch value2 2set1endvalue1 -@pwd@\foobar\foodir3 +@drive@@path@foobar\foodir3 Finished: value2 -@pwd@\foobar\foodir2 +@drive@@path@foobar\foodir2 value1 -@pwd@\foobar +@drive@@path@foobar --- Extra endlocal in called batch value2 value2 -@pwd@\foobar\foodir2 +@drive@@path@foobar\foodir2 value2 -@pwd@\foobar\foodir2 +@drive@@path@foobar\foodir2 Finished: value2 -@pwd@\foobar\foodir2 +@drive@@path@foobar\foodir2 value1 -@pwd@\foobar +@drive@@path@foobar --- endlocal in called function rather than batch pgm is ineffective 2 2 @@ -1294,9 +1317,15 @@ 7 should still be 7 ------------ Testing GOTO ------------ goto with no leading space worked +goto with colon and no leading space worked goto with a leading space worked goto with a leading tab worked goto with a following space worked +goto with following amphersands worked +goto with redirections worked +Ignoring double colons worked +label with mixed whitespace and no echo worked +Correctly ignored trailing information ------------ Testing PATH ------------ PATH=original PATH=try2 Modified: trunk/rostests/winetests/cmd/test_cmdline.cmd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_cmdlin… ============================================================================== --- trunk/rostests/winetests/cmd/test_cmdline.cmd [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_cmdline.cmd [iso-8859-1] Sat Sep 27 19:31:30 2014 @@ -95,6 +95,7 @@ echo @echo 2 > "saytwo.bat" echo @echo 3 > "say (3).bat" echo @echo 4 > "say .bat" +echo @echo 5 > "bazbaz(5).bat" echo ------ Testing invocation of batch files ---------- call say one @@ -144,6 +145,11 @@ call :setError 0 cmd /c say" "(3) prints 4?! if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +rem Deliberately invoking a fully qualified batch name containing a bracket +rem should fail, as a bracket is a command delimiter. +cmd /c "bazbaz(5).bat" +if errorlevel 1 echo Passed echo ---------- Testing CMD /C quoting ----------------- cmd /c @echo "hi" @@ -261,7 +267,7 @@ call tell(12(34) call tell(12;34) echo --------- Finished -------------- -del tell.bat say*.* +del tell.bat say*.* bazbaz*.bat exit :setError exit /B %1 Modified: trunk/rostests/winetests/cmd/test_cmdline.cmd.exp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_cmdlin… ============================================================================== --- trunk/rostests/winetests/cmd/test_cmdline.cmd.exp [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_cmdline.cmd.exp [iso-8859-1] Sat Sep 27 19:31:30 2014 @@ -70,6 +70,7 @@ 0@space@ 3@space@ 4@space@ +Passed ---------- Testing CMD /C quoting ----------------- "hi" 1@space@

10 years, 2 months

← Newer
1
...
5
6
7
8
9
10
11
...
42
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 September 2014