Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 38853: - It is understandable now why certain applications fail when accessing thread information from user mode, it is the wrong information being accessed.
by jimtabor＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: jimtabor Date: Sat Jan 17 15:14:52 2009 New Revision: 38853 URL: http://svn.reactos.org/svn/reactos?rev=38853&view=rev Log: - It is understandable now why certain applications fail when accessing thread information from user mode, it is the wrong information being accessed. Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat Jan 17 15:14:52 2009 @@ -4,7 +4,7 @@ typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; #include <pshpack1.h> - +// FIXME! Move to ntuser.h typedef struct _TL { struct _TL* next; @@ -28,17 +28,19 @@ typedef struct _THREADINFO { - W32THREAD W32Thread; - PVOID ppi; // FIXME: use PPROCESSINFO - PDESKTOPINFO pDeskInfo; - PCLIENTINFO pClientInfo; - LIST_ENTRY PtiLink; + W32THREAD W32Thread; + PTL ptl; + PVOID ppi; // FIXME: use PPROCESSINFO + struct _USER_MESSAGE_QUEUE* MessageQueue; + struct _KBL* KeyboardLayout; + PCLIENTTHREADINFO pcti; + struct _DESKTOP* Desktop; + PDESKTOPINFO pDeskInfo; + PCLIENTINFO pClientInfo; + LIST_ENTRY PtiLink; - struct _USER_MESSAGE_QUEUE* MessageQueue; LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; - struct _KBL* KeyboardLayout; - struct _DESKTOP* Desktop; HANDLE hDesktop; BOOLEAN IsExiting; SINGLE_LIST_ENTRY ReferencesList; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Sat Jan 17 15:14:52 2009 @@ -505,6 +505,7 @@ ti->kpi = GetW32ProcessInfo(); ti->pi = UserHeapAddressToUser(ti->kpi); ti->Hooks = W32Thread->Hooks; + W32Thread->pcti = &ti->ClientThreadInfo; if (W32Thread->Desktop != NULL) { ti->Desktop = W32Thread->Desktop->DesktopInfo; @@ -518,6 +519,7 @@ /* update the TEB */ Teb = NtCurrentTeb(); ci = GetWin32ClientInfo(); + W32Thread->pClientInfo = ci; _SEH2_TRY { ProbeForWrite(Teb,

1 0

[cfinck] 38852: Use DECLSPEC_NORETURN and place it at the top of the prototype to fix MSVC compilation. Hint by Stefan ; -)
by cfinck＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cfinck Date: Sat Jan 17 15:11:38 2009 New Revision: 38852 URL: http://svn.reactos.org/svn/reactos?rev=38852&view=rev Log: Use DECLSPEC_NORETURN and place it at the top of the prototype to fix MSVC compilation. Hint by Stefan ;-) Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Jan 17 15:11:38 2009 @@ -428,10 +428,10 @@ IN PEXCEPTION_RECORD ExceptionRecord ); -NTSYSAPI -VOID -NTAPI -__declspec(noreturn) +DECLSPEC_NORETURN +NTSYSAPI +VOID +NTAPI RtlRaiseStatus( IN NTSTATUS Status );

1 0

[cwittich] 38851: fix a kernel32 console winetest crash
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 15:05:15 2009 New Revision: 38851 URL: http://svn.reactos.org/svn/reactos?rev=38851&view=rev Log: fix a kernel32 console winetest crash Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Sat Jan 17 15:05:15 2009 @@ -2850,6 +2850,12 @@ NTSTATUS Status; + if (!lpConsoleCursorInfo) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + CsrRequest = MAKE_CSR_API(GET_CURSOR_INFO, CSR_CONSOLE); Request.Data.GetCursorInfoRequest.ConsoleHandle = hConsoleOutput; Status = CsrClientCallServer( &Request, NULL, CsrRequest, sizeof( CSR_API_MESSAGE ) );

1 0

[mkupfer] 38850: Fix wrong strings for default mouse cursor settings
by mkupfer＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: mkupfer Date: Sat Jan 17 14:46:28 2009 New Revision: 38850 URL: http://svn.reactos.org/svn/reactos?rev=38850&view=rev Log: Fix wrong strings for default mouse cursor settings Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Sat Jan 17 14:46:28 2009 @@ -1052,7 +1052,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\998","Name",0x00000000,"Uzbekistan" ;Cursors Schemes -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cursors\Schemes","ReactOS Default",0x00020000,"\",,,,,,,,,,,,,\"" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cursors\Schemes","ReactOS Default",0x00020000,""",,,,,,,,,,,,,""" ;PowerCfg HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg","LastID",0x00000002,"0" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Sat Jan 17 14:46:28 2009 @@ -1058,7 +1058,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\998","Name",0x00000000,"Uzbekistan" ;Cursors Schemes -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cursors\Schemes","ReactOS Default",0x00020000,"\",,,,,,,,,,,,,\"" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cursors\Schemes","ReactOS Default",0x00020000,""",,,,,,,,,,,,,""" ;PowerCfg HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg","LastID",0x00000002,"0"

1 0

[cfinck] 38849: A Wine test can output "1 failure" or "X failures" in its summary. I only supported the latter one so far, now both lines will work properly.
by cfinck＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cfinck Date: Sat Jan 17 14:39:59 2009 New Revision: 38849 URL: http://svn.reactos.org/svn/reactos?rev=38849&view=rev Log: A Wine test can output "1 failure" or "X failures" in its summary. I only supported the latter one so far, now both lines will work properly. Modified: trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php Modified: trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/web… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php [iso-8859-1] Sat Jan 17 14:39:59 2009 @@ -72,7 +72,7 @@ // Validate and parse the log $line = strrchr($_POST["log"], ":"); - if(sscanf($line, ": %u tests executed (%u marked as todo, %u failures), %u skipped.", $count, $todo, $failures, $skipped) != 4) + if(sscanf($line, ": %u tests executed (%u marked as todo, %u %s%u skipped.", $count, $todo, $failures, $ignore, $skipped) != 5) return "Log is invalid!"; // Add the information into the DB

1 0

[cwittich] 38848: sync rsaenh_winetest with wine 1.1.13
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 14:25:16 2009 New Revision: 38848 URL: http://svn.reactos.org/svn/reactos?rev=38848&view=rev Log: sync rsaenh_winetest with wine 1.1.13 Modified: trunk/rostests/winetests/rsaenh/rsaenh.c Modified: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c… ============================================================================== --- trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] Sat Jan 17 14:25:16 2009 @@ -146,9 +146,16 @@ { BOOL result; + SetLastError(0xdeadbeef); result = CryptReleaseContext(hProv, 1); - ok(!result && GetLastError()==NTE_BAD_FLAGS, "%08x\n", GetLastError()); + ok(!result || broken(result) /* Win98 */, "Expected failure\n"); + ok(GetLastError()==NTE_BAD_FLAGS, "Expected NTE_BAD_FLAGS, got %08x\n", GetLastError()); + /* Just to prove that Win98 also released the CSP */ + SetLastError(0xdeadbeef); + result = CryptReleaseContext(hProv, 0); + ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%08x\n", GetLastError()); + CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } @@ -167,6 +174,11 @@ * This provider is available on Windows XP, Windows 2003 and Vista. */ result = CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT); + if (!result && GetLastError() == NTE_PROV_TYPE_NOT_DEF) + { + win_skip("RSA_ASE provider not supported\n"); + return 0; + } ok(!result && GetLastError()==NTE_BAD_FLAGS, "%d, %08x\n", result, GetLastError()); if (!CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, 0)) @@ -248,7 +260,7 @@ unsigned char pbData[2000]; int i; - *phKey = (HCRYPTKEY)NULL; + *phKey = 0; for (i=0; i<2000; i++) pbData[i] = (unsigned char)i; result = CryptCreateHash(hProv, CALG_MD2, 0, 0, &hHash); if (!result) { @@ -258,7 +270,7 @@ } ok(result, "%08x\n", GetLastError()); if (!result) return FALSE; - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); if (!result) return FALSE; result = CryptDeriveKey(hProv, aiAlgid, hHash, (len << 16) | CRYPT_EXPORTABLE, phKey); @@ -303,7 +315,7 @@ /* rsaenh compiled without OpenSSL */ ok(GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); } else { - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); len = sizeof(DWORD); @@ -324,7 +336,7 @@ result = CryptCreateHash(hProv, CALG_MD4, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); len = sizeof(DWORD); @@ -348,7 +360,7 @@ result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashlen, &len, 0); ok(result && (hashlen == 16), "%08x, hashlen: %d\n", GetLastError(), hashlen); - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); len = 16; @@ -378,8 +390,11 @@ /* Can't add data after the hash been retrieved */ SetLastError(0xdeadbeef); - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); - ok(!result && GetLastError() == NTE_BAD_HASH_STATE, "%08x\n", GetLastError()); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + ok(!result, "Expected failure\n"); + ok(GetLastError() == NTE_BAD_HASH_STATE || + GetLastError() == NTE_BAD_ALGID, /* Win9x, WinMe, NT4 */ + "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID, got %08x\n", GetLastError()); /* You can still retrieve the hash, its value just hasn't changed */ result = CryptGetHashParam(hHash, HP_HASHVAL, pbHashValue, &len, 0); @@ -394,7 +409,7 @@ result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, (BYTE*)pbData, 5, 0); + result = CryptHashData(hHash, pbData, 5, 0); ok(result, "%08x\n", GetLastError()); if(pCryptDuplicateHash) { @@ -451,17 +466,17 @@ ok(result, "%08x\n", GetLastError()); dwLen = 23; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, NULL, &dwLen, 24); + result = CryptEncrypt(hKey, 0, TRUE, 0, NULL, &dwLen, 24); ok(result, "CryptEncrypt failed: %08x\n", GetLastError()); ok(dwLen == 24, "Unexpected length %d\n", dwLen); SetLastError(ERROR_SUCCESS); dwLen = 23; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abData, &dwLen, 24); + result = CryptEncrypt(hKey, 0, TRUE, 0, abData, &dwLen, 24); ok(result && dwLen == 24 && !memcmp(ecb, abData, sizeof(ecb)), "%08x, dwLen: %d\n", GetLastError(), dwLen); - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abData, &dwLen); + result = CryptDecrypt(hKey, 0, TRUE, 0, abData, &dwLen); ok(result && dwLen == 23 && !memcmp(plain, abData, sizeof(plain)), "%08x, dwLen: %d\n", GetLastError(), dwLen); @@ -470,16 +485,16 @@ ok(result, "%08x\n", GetLastError()); dwLen = 23; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, NULL, &dwLen, 24); + result = CryptEncrypt(hKey, 0, TRUE, 0, NULL, &dwLen, 24); ok(result, "CryptEncrypt failed: %08x\n", GetLastError()); ok(dwLen == 24, "Unexpected length %d\n", dwLen); dwLen = 23; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abData, &dwLen, 24); + result = CryptEncrypt(hKey, 0, TRUE, 0, abData, &dwLen, 24); ok(result && dwLen == 24 && !memcmp(cbc, abData, sizeof(cbc)), "%08x, dwLen: %d\n", GetLastError(), dwLen); - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abData, &dwLen); + result = CryptDecrypt(hKey, 0, TRUE, 0, abData, &dwLen); ok(result && dwLen == 23 && !memcmp(plain, abData, sizeof(plain)), "%08x, dwLen: %d\n", GetLastError(), dwLen); @@ -488,20 +503,20 @@ ok(result, "%08x\n", GetLastError()); dwLen = 16; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, FALSE, 0, abData, &dwLen, 24); + result = CryptEncrypt(hKey, 0, FALSE, 0, abData, &dwLen, 24); ok(result && dwLen == 16, "%08x, dwLen: %d\n", GetLastError(), dwLen); dwLen = 7; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abData+16, &dwLen, 8); + result = CryptEncrypt(hKey, 0, TRUE, 0, abData+16, &dwLen, 8); ok(result && dwLen == 8 && !memcmp(cfb, abData, sizeof(cfb)), "%08x, dwLen: %d\n", GetLastError(), dwLen); dwLen = 8; - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, FALSE, 0, abData, &dwLen); + result = CryptDecrypt(hKey, 0, FALSE, 0, abData, &dwLen); ok(result && dwLen == 8, "%08x, dwLen: %d\n", GetLastError(), dwLen); dwLen = 16; - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abData+8, &dwLen); + result = CryptDecrypt(hKey, 0, TRUE, 0, abData+8, &dwLen); ok(result && dwLen == 15 && !memcmp(plain, abData, sizeof(plain)), "%08x, dwLen: %d\n", GetLastError(), dwLen); @@ -510,7 +525,7 @@ ok(result, "%08x\n", GetLastError()); dwLen = 23; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abData, &dwLen, 24); + result = CryptEncrypt(hKey, 0, TRUE, 0, abData, &dwLen, 24); ok(!result && GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); CryptDestroyKey(hKey); @@ -534,10 +549,10 @@ for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; dwLen = 13; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, 16); - ok(result, "%08x\n", GetLastError()); - - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); + ok(result, "%08x\n", GetLastError()); + + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); for (i=0; i<4; i++) @@ -545,11 +560,11 @@ memcpy(pbData,cTestData[i].origstr,cTestData[i].strlen); dwLen = cTestData[i].enclen; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); @@ -590,10 +605,10 @@ for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; dwLen = 13; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, 16); - ok(result, "%08x\n", GetLastError()); - - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); + ok(result, "%08x\n", GetLastError()); + + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); for (i=0; i<4; i++) @@ -601,11 +616,11 @@ memcpy(pbData,cTestData[i].origstr,cTestData[i].strlen); dwLen = cTestData[i].enclen; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); ok(memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)==0,"decryption incorrect %d\n",i); @@ -638,12 +653,12 @@ for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; dwLen = 13; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, 16); - ok(result, "%08x\n", GetLastError()); - + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); + ok(result, "%08x\n", GetLastError()); + ok(!memcmp(pbData, des3, sizeof(des3)), "3DES encryption failed!\n"); - - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); for (i=0; i<4; i++) @@ -651,11 +666,11 @@ memcpy(pbData,cTestData[i].origstr,cTestData[i].strlen); dwLen = cTestData[i].enclen; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); ok(memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)==0,"decryption incorrect %d\n",i); @@ -696,10 +711,10 @@ for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; dwLen = 13; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, 16); - ok(result, "%08x\n", GetLastError()); - - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); + ok(result, "%08x\n", GetLastError()); + + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); for (i=0; i<4; i++) @@ -707,11 +722,11 @@ memcpy(pbData,cTestData[i].origstr,cTestData[i].strlen); dwLen = cTestData[i].enclen; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); @@ -728,9 +743,9 @@ static void test_rc2(void) { - static const BYTE rc2encrypted[16] = { - 0x02, 0x34, 0x7d, 0xf6, 0x1d, 0xc5, 0x9b, 0x8b, - 0x2e, 0x0d, 0x63, 0x80, 0x72, 0xc1, 0xc2, 0xb1 }; + static const BYTE rc2_40_encrypted[16] = { + 0xc0, 0x9a, 0xe4, 0x2f, 0x0a, 0x47, 0x67, 0x11, + 0xfb, 0x18, 0x87, 0xce, 0x0c, 0x75, 0x07, 0xb1 }; static const BYTE rc2_128_encrypted[] = { 0x82,0x81,0xf7,0xff,0xdd,0xd7,0x88,0x8c,0x2a,0x2a,0xc0,0xce,0x4c,0x89, 0xb6,0x66 }; @@ -749,14 +764,16 @@ if (!result) { ok(GetLastError()==NTE_BAD_ALGID, "%08x\n", GetLastError()); } else { - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + CRYPT_INTEGER_BLOB salt; + + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); dwLen = 16; result = CryptGetHashParam(hHash, HP_HASHVAL, pbHashValue, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - result = CryptDeriveKey(hProv, CALG_RC2, hHash, 56 << 16, &hKey); + result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &hKey); ok(result, "%08x\n", GetLastError()); dwLen = sizeof(DWORD); @@ -798,10 +815,10 @@ ok(result, "%08x\n", GetLastError()); dwDataLen = 13; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwDataLen, 24); - ok(result, "%08x\n", GetLastError()); - - ok(!memcmp(pbData, rc2encrypted, 8), "RC2 encryption failed!\n"); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); + ok(result, "%08x\n", GetLastError()); + + ok(!memcmp(pbData, rc2_40_encrypted, 16), "RC2 encryption failed!\n"); result = CryptGetKeyParam(hKey, KP_IV, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); @@ -809,8 +826,23 @@ CryptGetKeyParam(hKey, KP_IV, pbTemp, &dwLen, 0); HeapFree(GetProcessHeap(), 0, pbTemp); - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwDataLen); - ok(result, "%08x\n", GetLastError()); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen); + ok(result, "%08x\n", GetLastError()); + + /* What sizes salt can I set? */ + salt.pbData = pbData; + for (i=0; i<24; i++) + { + salt.cbData = i; + result = CryptSetKeyParam(hKey, KP_SALT_EX, (BYTE *)&salt, 0); + ok(result, "setting salt failed for size %d: %08x\n", i, GetLastError()); + } + salt.cbData = 25; + SetLastError(0xdeadbeef); + result = CryptSetKeyParam(hKey, KP_SALT_EX, (BYTE *)&salt, 0); + ok(!result || + broken(result), /* Win9x, WinMe, NT4, W2K */ + "%08x\n", GetLastError()); result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); @@ -823,7 +855,7 @@ if (!result) { ok(GetLastError()==NTE_BAD_ALGID, "%08x\n", GetLastError()); } else { - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); dwLen = 16; @@ -848,7 +880,7 @@ CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); + ok(dwKeyLen == 56 || broken(dwKeyLen == 40), "%d (%08x)\n", dwKeyLen, GetLastError()); dwKeyLen = 128; result = CryptSetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (LPBYTE)&dwKeyLen, 0); @@ -864,7 +896,7 @@ ok(result, "%08x\n", GetLastError()); dwDataLen = 13; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwDataLen, 24); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); ok(result, "%08x\n", GetLastError()); ok(!memcmp(pbData, rc2_128_encrypted, sizeof(rc2_128_encrypted)), @@ -901,7 +933,9 @@ /* rsaenh compiled without OpenSSL */ ok(GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); } else { - result = CryptHashData(hHash, (BYTE*)pbData, sizeof(pbData), 0); + CRYPT_INTEGER_BLOB salt; + + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); ok(result, "%08x\n", GetLastError()); dwLen = 16; @@ -938,16 +972,31 @@ ok(result, "%08x\n", GetLastError()); dwDataLen = 16; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, NULL, &dwDataLen, 24); + result = CryptEncrypt(hKey, 0, TRUE, 0, NULL, &dwDataLen, 24); ok(result, "%08x\n", GetLastError()); dwDataLen = 16; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwDataLen, 24); + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); ok(result, "%08x\n", GetLastError()); ok(!memcmp(pbData, rc4, dwDataLen), "RC4 encryption failed!\n"); - result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwDataLen); - ok(result, "%08x\n", GetLastError()); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen); + ok(result, "%08x\n", GetLastError()); + + /* What sizes salt can I set? */ + salt.pbData = pbData; + for (i=0; i<24; i++) + { + salt.cbData = i; + result = CryptSetKeyParam(hKey, KP_SALT_EX, (BYTE *)&salt, 0); + ok(result, "setting salt failed for size %d: %08x\n", i, GetLastError()); + } + salt.cbData = 25; + SetLastError(0xdeadbeef); + result = CryptSetKeyParam(hKey, KP_SALT_EX, (BYTE *)&salt, 0); + ok(!result || + broken(result), /* Win9x, WinMe, NT4, W2K */ + "%08x\n", GetLastError()); result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); @@ -978,7 +1027,7 @@ result = CryptSetHashParam(hHash, HP_HMAC_INFO, (BYTE*)&hmacInfo, 0); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, (BYTE*)abData, sizeof(abData), 0); + result = CryptHashData(hHash, abData, sizeof(abData), 0); ok(result, "%08x\n", GetLastError()); dwLen = sizeof(abData)/sizeof(BYTE); @@ -1004,30 +1053,30 @@ BOOL result; DWORD dwLen; BYTE abData[256], abEnc[264]; - static const BYTE mac[8] = { 0x0d, 0x3e, 0x15, 0x6b, 0x85, 0x63, 0x5c, 0x11 }; + static const BYTE mac_40[8] = { 0xb7, 0xa2, 0x46, 0xe9, 0x11, 0x31, 0xe0, 0xad}; int i; for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abData[i] = (BYTE)i; for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abEnc[i] = (BYTE)i; - if (!derive_key(CALG_RC2, &hKey, 56)) return; + if (!derive_key(CALG_RC2, &hKey, 40)) return; dwLen = 256; - result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abEnc, &dwLen, 264); + result = CryptEncrypt(hKey, 0, TRUE, 0, abEnc, &dwLen, 264); ok (result && dwLen == 264, "%08x, dwLen: %d\n", GetLastError(), dwLen); result = CryptCreateHash(hProv, CALG_MAC, hKey, 0, &hHash); ok(result, "%08x\n", GetLastError()); if (!result) return; - result = CryptHashData(hHash, (BYTE*)abData, sizeof(abData), 0); + result = CryptHashData(hHash, abData, sizeof(abData), 0); ok(result, "%08x\n", GetLastError()); dwLen = sizeof(abData)/sizeof(BYTE); result = CryptGetHashParam(hHash, HP_HASHVAL, abData, &dwLen, 0); ok(result && dwLen == 8, "%08x, dwLen: %d\n", GetLastError(), dwLen); - ok(!memcmp(abData, mac, sizeof(mac)), "MAC failed!\n"); + ok(!memcmp(abData, mac_40, sizeof(mac_40)), "MAC failed!\n"); result = CryptDestroyHash(hHash); ok(result, "%08x\n", GetLastError()); @@ -1038,8 +1087,11 @@ /* Provoke errors */ if (!derive_key(CALG_RC4, &hKey, 56)) return; + SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MAC, hKey, 0, &hHash); - ok(!result && GetLastError() == NTE_BAD_KEY, "%08x\n", GetLastError()); + ok((!result && GetLastError() == NTE_BAD_KEY) || + broken(result), /* Win9x, WinMe, NT4, W2K */ + "%08x\n", GetLastError()); result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); @@ -1387,10 +1439,11 @@ if (result) return; /* check that we get a bad signature error when the signature is too short*/ + SetLastError(0xdeadbeef); result = CryptVerifySignature(hHash, abSignatureMD2, 64, hPubSignKey, NULL, 0); - ok(!result && NTE_BAD_SIGNATURE == GetLastError(), - "Expected NTE_BAD_SIGNATURE error, got %08x\n", GetLastError()); - if (result) return; + ok((!result && NTE_BAD_SIGNATURE == GetLastError()) || + broken(result), /* Win9x, WinMe, NT4 */ + "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); result = CryptVerifySignature(hHash, abSignatureMD2, 128, hPubSignKey, NULL, 0); ok(result, "%08x\n", GetLastError()); @@ -1590,6 +1643,11 @@ }; result = CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_VERIFYCONTEXT|CRYPT_NEWKEYSET); + if (!result) + { + win_skip("no PROV_RSA_SCHANNEL support\n"); + return; + } ok (result, "%08x\n", GetLastError()); if (result) CryptReleaseContext(hProv, 0); @@ -1724,8 +1782,12 @@ /* If PP_ENUMCONTAINERS is queried with CRYPT_FIRST and abData == NULL, it returns * the maximum legal length of container names (which is MAX_PATH + 1 == 261) */ + SetLastError(0xdeadbeef); result = CryptGetProvParam(hProv, PP_ENUMCONTAINERS, NULL, &dwBufferLen, CRYPT_FIRST); - ok (result && dwBufferLen == MAX_PATH + 1, "%08x\n", GetLastError()); + ok (result, "%08x\n", GetLastError()); + ok (dwBufferLen == MAX_PATH + 1 || + broken(dwBufferLen != MAX_PATH + 1), /* Win9x, WinMe, NT4 */ + "Expected dwBufferLen to be (MAX_PATH + 1), it was : %d\n", dwBufferLen); /* If the result fits into abContainerName dwBufferLen is left untouched */ dwBufferLen = (DWORD)sizeof(abContainerName);

1 0

[cwittich] 38847: sync ws2_32_winetest with wine 1.1.13
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 14:21:03 2009 New Revision: 38847 URL: http://svn.reactos.org/svn/reactos?rev=38847&view=rev Log: sync ws2_32_winetest with wine 1.1.13 Modified: trunk/rostests/winetests/ws2_32/sock.c Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Sat Jan 17 14:21:03 2009 @@ -225,16 +225,16 @@ memset ( p, c, chunk_size ); } -static char* test_buffer ( char *buf, int chunk_size, int n_chunks ) +static int test_buffer ( char *buf, int chunk_size, int n_chunks ) { char c, *p; int i; for ( c = FIRST_CHAR, p = buf; c < FIRST_CHAR + n_chunks; c++, p += chunk_size ) { for ( i = 0; i < chunk_size; i++ ) - if ( p[i] != c ) return p + i; - } - return NULL; + if ( p[i] != c ) return i; + } + return -1; } /* @@ -403,9 +403,8 @@ { test_params *gen = par->general; server_memory *mem; - int n_recvd, n_sent, n_expected = gen->n_chunks * gen->chunk_size, tmp, i, + int pos, n_recvd, n_sent, n_expected = gen->n_chunks * gen->chunk_size, tmp, i, id = GetCurrentThreadId(); - char *p; trace ( "simple_server (%x) starting\n", id ); @@ -435,8 +434,8 @@ n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); ok ( n_recvd == n_expected, "simple_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); - p = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); - ok ( p == NULL, "simple_server (%x): test pattern error: %d\n", id, p - mem->sock[0].buf); + pos = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "simple_server (%x): test pattern error: %d\n", id, pos); /* Echo data back */ n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); @@ -463,7 +462,6 @@ int n_expected = gen->n_chunks * gen->chunk_size, tmp, i, id = GetCurrentThreadId(), n_connections = 0, n_sent, n_recvd, n_set, delta, n_ready; - char *p; struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ fd_set fds_recv, fds_send, fds_openrecv, fds_opensend; @@ -531,8 +529,8 @@ mem->sock[i].n_recvd += n_recvd; if ( mem->sock[i].n_recvd == n_expected ) { - p = test_buffer ( mem->sock[i].buf, gen->chunk_size, gen->n_chunks ); - ok ( p == NULL, "select_server (%x): test pattern error: %d\n", id, p - mem->sock[i].buf ); + int pos = test_buffer ( mem->sock[i].buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "select_server (%x): test pattern error: %d\n", id, pos ); FD_CLR ( mem->sock[i].s, &fds_openrecv ); } @@ -593,8 +591,7 @@ { test_params *gen = par->general; client_memory *mem; - int n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; - char *p; + int pos, n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; id = GetCurrentThreadId(); trace ( "simple_client (%x): starting\n", id ); @@ -628,8 +625,8 @@ "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); /* check data */ - p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); - ok ( p == NULL, "simple_client (%x): test pattern error: %d\n", id, p - mem->recv_buf); + pos = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "simple_client (%x): test pattern error: %d\n", id, pos); /* cleanup */ read_zero_bytes ( mem->s ); @@ -644,8 +641,7 @@ { test_params *gen = par->general; client_memory *mem; - int n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; - char *p; + int pos, n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; socklen_t fromLen = sizeof(mem->addr); struct sockaddr test; @@ -698,8 +694,8 @@ "0.0.0.0"), "lpFrom shouldn't be updated on connection oriented sockets\n"); /* check data */ - p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); - ok ( p == NULL, "simple_client (%x): test pattern error: %d\n", id, p - mem->recv_buf); + pos = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( pos == -1, "simple_client (%x): test pattern error: %d\n", id, pos); /* cleanup */ read_zero_bytes ( mem->s ); @@ -821,14 +817,14 @@ } } + n = send_p - mem->send_buf; ok ( send_p == send_last, - "simple_client (%x): sent less data than expected: %d of %d\n", - id, send_p - mem->send_buf, n_expected ); + "simple_client (%x): sent less data than expected: %d of %d\n", id, n, n_expected ); + n = recv_p - mem->recv_buf; ok ( recv_p == recv_last, - "simple_client (%x): received less data than expected: %d of %d\n", - id, recv_p - mem->recv_buf, n_expected ); - recv_p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); - ok ( recv_p == NULL, "event_client (%x): test pattern error: %d\n", id, recv_p - mem->recv_buf); + "simple_client (%x): received less data than expected: %d of %d\n", id, n, n_expected ); + n = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( n == -1, "event_client (%x): test pattern error: %d\n", id, n); out: WSACloseEvent ( event );

1 0

[cwittich] 38846: sync comdlg32_winetest with wine 1.1.13
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 14:15:01 2009 New Revision: 38846 URL: http://svn.reactos.org/svn/reactos?rev=38846&view=rev Log: sync comdlg32_winetest with wine 1.1.13 Modified: trunk/rostests/winetests/comdlg32/filedlg.c Modified: trunk/rostests/winetests/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedl… ============================================================================== --- trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] Sat Jan 17 14:15:01 2009 @@ -74,7 +74,7 @@ ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLEHOOK; ofn.lpstrDefExt = "txt"; - ofn.lpfnHook = (LPOFNHOOKPROC) OFNHookProc; + ofn.lpfnHook = OFNHookProc; ofn.lpstrInitialDir = szInitialDir; PrintDlgA(NULL);

1 0

[cwittich] 38845: sync browseui_winetest with wine 1.1.13
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 14:13:53 2009 New Revision: 38845 URL: http://svn.reactos.org/svn/reactos?rev=38845&view=rev Log: sync browseui_winetest with wine 1.1.13 Modified: trunk/rostests/winetests/browseui/autocomplete.c Modified: trunk/rostests/winetests/browseui/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/autoco… ============================================================================== --- trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] Sat Jan 17 14:13:53 2009 @@ -48,7 +48,7 @@ static LPWSTR strdup_AtoW(LPCSTR str) { int size = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - LPWSTR wstr = (LPWSTR)CoTaskMemAlloc((size + 1)*sizeof(WCHAR)); + LPWSTR wstr = CoTaskMemAlloc((size + 1)*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, str, -1, wstr, size+1); return wstr; }

1 0

[cwittich] 38844: sync advpack_winetest with wine 1.1.13
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 14:12:48 2009 New Revision: 38844 URL: http://svn.reactos.org/svn/reactos?rev=38844&view=rev Log: sync advpack_winetest with wine 1.1.13 Modified: trunk/rostests/winetests/advpack/files.c Modified: trunk/rostests/winetests/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/files.c… ============================================================================== --- trunk/rostests/winetests/advpack/files.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/files.c [iso-8859-1] Sat Jan 17 14:12:48 2009 @@ -174,33 +174,33 @@ /* the FCI callbacks */ -static void *mem_alloc(ULONG cb) +static void * CDECL mem_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); } -static void mem_free(void *memory) +static void CDECL mem_free(void *memory) { HeapFree(GetProcessHeap(), 0, memory); } -static BOOL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) +static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) { return TRUE; } -static long progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) { return 0; } -static int file_placed(PCCAB pccab, char *pszFile, long cbFile, - BOOL fContinuation, void *pv) +static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, + BOOL fContinuation, void *pv) { return 0; } -static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) +static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) { HANDLE handle; DWORD dwAccess = 0; @@ -224,7 +224,7 @@ return (INT_PTR)handle; } -static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD dwRead; @@ -236,7 +236,7 @@ return dwRead; } -static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD dwWritten; @@ -248,7 +248,7 @@ return dwWritten; } -static int fci_close(INT_PTR hf, int *err, void *pv) +static int CDECL fci_close(INT_PTR hf, int *err, void *pv) { HANDLE handle = (HANDLE)hf; ok(CloseHandle(handle), "Failed to CloseHandle\n"); @@ -256,7 +256,7 @@ return 0; } -static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) +static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD ret; @@ -267,7 +267,7 @@ return ret; } -static int fci_delete(char *pszFile, int *err, void *pv) +static int CDECL fci_delete(char *pszFile, int *err, void *pv) { BOOL ret = DeleteFileA(pszFile); ok(ret, "Failed to DeleteFile %s\n", pszFile); @@ -275,7 +275,7 @@ return 0; } -static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) +static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) { LPSTR tempname; @@ -294,8 +294,8 @@ return FALSE; } -static INT_PTR get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) +static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, + USHORT *pattribs, int *err, void *pv) { BY_HANDLE_FILE_INFORMATION finfo; FILETIME filetime;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs