Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[royce] 13955: set *nix-compatible paths for tools

by royce＠svn.reactos.com

set *nix-compatible paths for tools Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-12 04:32:00 UTC (rev 13954) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-12 04:39:20 UTC (rev 13955) @@ -160,13 +160,14 @@ void MingwBackend::GenerateGlobalVariables () const { - fprintf ( fMakefile, "mkdir = $(Q)tools" SSEP "rmkdir" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "winebuild = $(Q)tools" SSEP "winebuild" SSEP "winebuild" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "bin2res = $(Q)tools" SSEP "bin2res" SSEP "bin2res" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "cabman = $(Q)tools" SSEP "cabman" SSEP "cabman" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "cdmake = $(Q)tools" SSEP "cdmake" SSEP "cdmake" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "rsym = $(Q)tools" SSEP "rsym" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "wrc = $(Q)tools" SSEP "wrc" SSEP "wrc" EXEPOSTFIX "\n" ); +#define TOOL_PREFIX "$(Q)." SSEP "tools" SSEP + fprintf ( fMakefile, "mkdir = " TOOL_PREFIX "rmkdir" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "winebuild = " TOOL_PREFIX "winebuild" SSEP "winebuild" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "bin2res = " TOOL_PREFIX "bin2res" SSEP "bin2res" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "cabman = " TOOL_PREFIX "cabman" SSEP "cabman" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "cdmake = " TOOL_PREFIX "cdmake" SSEP "cdmake" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "rsym = " TOOL_PREFIX "rsym" EXEPOSTFIX "\n" ); + fprintf ( fMakefile, "wrc = " TOOL_PREFIX "wrc" SSEP "wrc" EXEPOSTFIX "\n" ); fprintf ( fMakefile, "\n" ); GenerateGlobalCFlagsAndProperties ( "=",

19 years, 9 months

[sedwards] 13954: added Wine tests for advapi32. (untested)

by sedwards＠svn.reactos.com

added Wine tests for advapi32. (untested) Added: trunk/reactos/lib/advapi32/winetests/ Added: trunk/reactos/lib/advapi32/winetests/crypt.c Added: trunk/reactos/lib/advapi32/winetests/crypt_lmhash.c Added: trunk/reactos/lib/advapi32/winetests/crypt_md4.c Added: trunk/reactos/lib/advapi32/winetests/crypt_md5.c Added: trunk/reactos/lib/advapi32/winetests/crypt_sha.c Added: trunk/reactos/lib/advapi32/winetests/makefile Added: trunk/reactos/lib/advapi32/winetests/registry.c Added: trunk/reactos/lib/advapi32/winetests/security.c Added: trunk/reactos/lib/advapi32/winetests/testlist.c _____ Added: trunk/reactos/lib/advapi32/winetests/crypt.c --- trunk/reactos/lib/advapi32/winetests/crypt.c 2005-03-12 04:20:35 UTC (rev 13953) +++ trunk/reactos/lib/advapi32/winetests/crypt.c 2005-03-12 04:32:00 UTC (rev 13954) @@ -0,0 +1,575 @@ +/* + * Unit tests for crypt functions + * + * Copyright (c) 2004 Michael Jung + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wincrypt.h" +#include "winerror.h" +#include "winreg.h" + +#include "wine/test.h" + +static const char szRsaBaseProv[] = MS_DEF_PROV_A; +static const char szNonExistentProv[] = "Wine Nonexistent Cryptographic Provider v11.2"; +static const char szKeySet[] = "wine_test_keyset"; +static const char szBadKeySet[] = "wine_test_bad_keyset"; +#define NON_DEF_PROV_TYPE 999 + +static HMODULE hadvapi32; +static BOOL (WINAPI *pCryptAcquireContextA)(HCRYPTPROV*,LPCSTR,LPCSTR,DWORD,DWORD); +static BOOL (WINAPI *pCryptEnumProviderTypesA)(DWORD, DWORD*, DWORD, DWORD*, LPSTR, DWORD*); +static BOOL (WINAPI *pCryptEnumProvidersA)(DWORD, DWORD*, DWORD, DWORD*, LPSTR, DWORD*); +static BOOL (WINAPI *pCryptGetDefaultProviderA)(DWORD, DWORD*, DWORD, LPSTR, DWORD*); +static BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV, DWORD); +static BOOL (WINAPI *pCryptSetProviderExA)(LPCSTR, DWORD, DWORD*, DWORD); + +static void init_function_pointers(void) +{ + hadvapi32 = GetModuleHandleA("advapi32.dll"); + + if(hadvapi32) + { + pCryptAcquireContextA = (void*)GetProcAddress(hadvapi32, "CryptAcquireContextA"); + pCryptEnumProviderTypesA = (void*)GetProcAddress(hadvapi32, "CryptEnumProviderTypesA"); + pCryptEnumProvidersA = (void*)GetProcAddress(hadvapi32, "CryptEnumProvidersA"); + pCryptGetDefaultProviderA = (void*)GetProcAddress(hadvapi32, "CryptGetDefaultProviderA"); + pCryptReleaseContext = (void*)GetProcAddress(hadvapi32, "CryptReleaseContext"); + pCryptSetProviderExA = (void*)GetProcAddress(hadvapi32, "CryptSetProviderExA"); + } +} + + +static void init_environment(void) +{ + HCRYPTPROV hProv; + + /* Ensure that container "wine_test_keyset" does exist */ + if (!pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) + { + pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_NEWKEYSET); + } + pCryptReleaseContext(hProv, 0); + + /* Ensure that container "wine_test_keyset" does exist in default PROV_RSA_FULL type provider */ + if (!pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) + { + pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); + } + pCryptReleaseContext(hProv, 0); + + /* Ensure that container "wine_test_bad_keyset" does not exist. */ + if (pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) + { + pCryptReleaseContext(hProv, 0); + pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + } +} + +static void clean_up_environment(void) +{ + HCRYPTPROV hProv; + + /* Remove container "wine_test_keyset" */ + if (pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) + { + pCryptReleaseContext(hProv, 0); + pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + } + + /* Remove container "wine_test_keyset" from default PROV_RSA_FULL type provider */ + if (pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) + { + pCryptReleaseContext(hProv, 0); + pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + } +} + +static void test_acquire_context(void) +{ + BOOL result; + HCRYPTPROV hProv; + + /* Provoke all kinds of error conditions (which are easy to provoke). + * The order of the error tests seems to match Windows XP's rsaenh.dll CSP, + * but since this is likely to change between CSP versions, we don't check + * this. Please don't change the order of tests. */ + result = pCryptAcquireContextA(&hProv, NULL, NULL, 0, 0); + ok(!result && GetLastError()==NTE_BAD_PROV_TYPE, "%ld\n", GetLastError()); + + result = pCryptAcquireContextA(&hProv, NULL, NULL, 1000, 0); + ok(!result && GetLastError()==NTE_BAD_PROV_TYPE, "%ld\n", GetLastError()); + + result = pCryptAcquireContextA(&hProv, NULL, NULL, NON_DEF_PROV_TYPE, 0); + ok(!result && GetLastError()==NTE_PROV_TYPE_NOT_DEF, "%ld\n", GetLastError()); + + result = pCryptAcquireContextA(&hProv, szKeySet, szNonExistentProv, PROV_RSA_FULL, 0); + ok(!result && GetLastError()==NTE_KEYSET_NOT_DEF, "%ld\n", GetLastError()); + + result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, NON_DEF_PROV_TYPE, 0); + ok(!result && GetLastError()==NTE_PROV_TYPE_NO_MATCH, "%ld\n", GetLastError()); + + /* This test fails under Win2k SP4: + result = TRUE, GetLastError() == ERROR_INVALID_PARAMETER + SetLastError(0xdeadbeef); + result = pCryptAcquireContextA(NULL, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); + ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%d/%ld\n", result, GetLastError()); + */ + + /* Last not least, try to really acquire a context. */ + hProv = 0; + SetLastError(0xdeadbeef); + result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); + ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE), "%d/%ld\n", result, GetLastError()); + + if (hProv) + pCryptReleaseContext(hProv, 0); + + /* Try again, witch an empty ("\0") szProvider parameter */ + hProv = 0; + SetLastError(0xdeadbeef); + result = pCryptAcquireContextA(&hProv, szKeySet, "", PROV_RSA_FULL, 0); + ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE), "%d/%ld\n", result, GetLastError()); + + if (hProv) + pCryptReleaseContext(hProv, 0); +} + +static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvName, + DWORD *pcbProvName, DWORD *pdwProvCount) +{ + HKEY hKey; + HKEY subkey; + DWORD size = sizeof(DWORD); + + if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\Defaults\\Provider", &hKey)) + return FALSE; + + RegQueryInfoKey(hKey, NULL, NULL, NULL, pdwProvCount, pcbProvName, + NULL, NULL, NULL, NULL, NULL, NULL); + (*pcbProvName)++; + + if (!(*pszProvName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbProvName)))) + return FALSE; + + RegEnumKeyEx(hKey, dwIndex, *pszProvName, pcbProvName, NULL, NULL, NULL, NULL); + (*pcbProvName)++; + + RegOpenKey(hKey, *pszProvName, &subkey); + RegQueryValueEx(subkey, "Type", NULL, NULL, (BYTE*)pdwProvType, &size); + + RegCloseKey(subkey); + RegCloseKey(hKey); + + return TRUE; +} + +static void test_enum_providers(void) +{ + /* expected results */ + CHAR *pszProvName = NULL; + DWORD cbName; + DWORD dwType; + DWORD provCount; + DWORD dwIndex = 0; + + /* actual results */ + CHAR *provider = NULL; + DWORD providerLen; + DWORD type; + DWORD count; + BOOL result; + DWORD notNull = 5; + DWORD notZeroFlags = 5; + + if(!pCryptEnumProvidersA) + { + trace("skipping CryptEnumProviders tests\n"); + return; + } + + if (!FindProvRegVals(dwIndex, &dwType, &pszProvName, &cbName, &provCount)) + return; + + /* check pdwReserved flag for NULL */ + result = pCryptEnumProvidersA(dwIndex, &notNull, 0, &type, NULL, &providerLen); + ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); + + /* check dwFlags == 0 */ + result = pCryptEnumProvidersA(dwIndex, NULL, notZeroFlags, &type, NULL, &providerLen); + ok(!result && GetLastError()==NTE_BAD_FLAGS, "%ld\n", GetLastError()); + + /* alloc provider to half the size required + * cbName holds the size required */ + providerLen = cbName / 2; + if (!(provider = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, providerLen)))) + return; + + result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); + ok(!result && GetLastError()==ERROR_MORE_DATA, "expected %i, got %ld\n", + ERROR_MORE_DATA, GetLastError()); + + LocalFree(provider); + + /* loop through the providers to get the number of providers + * after loop ends, count should be provCount + 1 so subtract 1 + * to get actual number of providers */ + count = 0; + while(pCryptEnumProvidersA(count++, NULL, 0, &type, NULL, &providerLen)) + ; + count--; + ok(count==provCount, "expected %i, got %i\n", (int)provCount, (int)count); + + /* loop past the actual number of providers to get the error + * ERROR_NO_MORE_ITEMS */ + for (count = 0; count < provCount + 1; count++) + result = pCryptEnumProvidersA(count, NULL, 0, &type, NULL, &providerLen); + ok(!result && GetLastError()==ERROR_NO_MORE_ITEMS, "expected %i, got %ld\n", + ERROR_NO_MORE_ITEMS, GetLastError()); + + /* check expected versus actual values returned */ + result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, NULL, &providerLen); + ok(result && providerLen==cbName, "expected %i, got %i\n", (int)cbName, (int)providerLen); + if (!(provider = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, providerLen)))) + return; + + result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); + ok(result && type==dwType, "expected %ld, got %ld\n", + dwType, type); + ok(result && !strcmp(pszProvName, provider), "expected %s, got %s\n", pszProvName, provider); + ok(result && cbName==providerLen, "expected %ld, got %ld\n", + cbName, providerLen); + + LocalFree(provider); +} + +static BOOL FindProvTypesRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszTypeName, + DWORD *pcbTypeName, DWORD *pdwTypeCount) +{ + HKEY hKey; + HKEY hSubKey; + PSTR ch; + + if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\Defaults\\Provider Types", &hKey)) + return FALSE; + + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, pdwTypeCount, pcbTypeName, NULL, + NULL, NULL, NULL, NULL, NULL)) + return FALSE; + (*pcbTypeName)++; + + if (!(*pszTypeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbTypeName)))) + return FALSE; + + if (RegEnumKeyEx(hKey, dwIndex, *pszTypeName, pcbTypeName, NULL, NULL, NULL, NULL)) + return FALSE; + (*pcbTypeName)++; + ch = *pszTypeName + strlen(*pszTypeName); + /* Convert "Type 000" to 0, etc/ */ + *pdwProvType = *(--ch) - '0'; + *pdwProvType += (*(--ch) - '0') * 10; + *pdwProvType += (*(--ch) - '0') * 100; + + if (RegOpenKey(hKey, *pszTypeName, &hSubKey)) + return FALSE; + + if (RegQueryValueEx(hSubKey, "TypeName", NULL, NULL, NULL, pcbTypeName)) + return FALSE; + + if (!(*pszTypeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbTypeName)))) + return FALSE; + + if (RegQueryValueEx(hSubKey, "TypeName", NULL, NULL, *pszTypeName, pcbTypeName)) + return FALSE; + + RegCloseKey(hSubKey); + RegCloseKey(hKey); + + return TRUE; +} + +static void test_enum_provider_types() +{ + /* expected values */ + DWORD dwProvType; + LPSTR pszTypeName = NULL; + DWORD cbTypeName; + DWORD dwTypeCount; + + /* actual values */ + DWORD index = 0; + DWORD provType; + LPSTR typeName = NULL; + DWORD typeNameSize; + DWORD typeCount; + DWORD result; + DWORD notNull = 5; + DWORD notZeroFlags = 5; + + if(!pCryptEnumProviderTypesA) + { + trace("skipping CryptEnumProviderTypes tests\n"); + return; + } + + if (!FindProvTypesRegVals(index, &dwProvType, &pszTypeName, &cbTypeName, &dwTypeCount)) + { + trace("could not find provider types in registry, skipping the test\n"); + return; + } + + /* check pdwReserved for NULL */ + result = pCryptEnumProviderTypesA(index, &notNull, 0, &provType, typeName, &typeNameSize); + ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %ld\n", + ERROR_INVALID_PARAMETER, GetLastError()); + + /* check dwFlags == zero */ + result = pCryptEnumProviderTypesA(index, NULL, notZeroFlags, &provType, typeName, &typeNameSize); + ok(!result && GetLastError()==NTE_BAD_FLAGS, "expected %i, got %ld\n", + ERROR_INVALID_PARAMETER, GetLastError()); + + /* alloc provider type to half the size required + * cbTypeName holds the size required */ + typeNameSize = cbTypeName / 2; + if (!(typeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, typeNameSize)))) + return; + + /* This test fails under Win2k SP4: + result = TRUE, GetLastError() == 0xdeadbeef + SetLastError(0xdeadbeef); + result = pCryptEnumProviderTypesA(index, NULL, 0, &provType, typeName, &typeNameSize); + ok(!result && GetLastError()==ERROR_MORE_DATA, "expected 0/ERROR_MORE_DATA, got %d/%08lx\n", + result, GetLastError()); + */ + + LocalFree(typeName); + + /* loop through the provider types to get the number of provider types + * after loop ends, count should be dwTypeCount + 1 so subtract 1 + * to get actual number of provider types */ + typeCount = 0; + while(pCryptEnumProviderTypesA(typeCount++, NULL, 0, &provType, NULL, &typeNameSize)) + ; + typeCount--; + ok(typeCount==dwTypeCount, "expected %ld, got %ld\n", dwTypeCount, typeCount); + + /* loop past the actual number of provider types to get the error + * ERROR_NO_MORE_ITEMS */ + for (typeCount = 0; typeCount < dwTypeCount + 1; typeCount++) + result = pCryptEnumProviderTypesA(typeCount, NULL, 0, &provType, NULL, &typeNameSize); + ok(!result && GetLastError()==ERROR_NO_MORE_ITEMS, "expected %i, got %ld\n", + ERROR_NO_MORE_ITEMS, GetLastError()); + + + /* check expected versus actual values returned */ + result = pCryptEnumProviderTypesA(index, NULL, 0, &provType, NULL, &typeNameSize); + ok(result && typeNameSize==cbTypeName, "expected %ld, got %ld\n", cbTypeName, typeNameSize); + if (!(typeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, typeNameSize)))) + return; + + typeNameSize = 0xdeadbeef; + result = pCryptEnumProviderTypesA(index, NULL, 0, &provType, typeName, &typeNameSize); + ok(result, "expected TRUE, got %ld\n", result); + ok(provType==dwProvType, "expected %ld, got %ld\n", dwProvType, provType); + if (pszTypeName) + ok(!strcmp(pszTypeName, typeName), "expected %s, got %s\n", pszTypeName, typeName); + ok(typeNameSize==cbTypeName, "expected %ld, got %ld\n", cbTypeName, typeNameSize); + + LocalFree(typeName); +} + +static BOOL FindDfltProvRegVals(DWORD dwProvType, DWORD dwFlags, LPSTR *pszProvName, DWORD *pcbProvName) +{ + HKEY hKey; + PSTR keyname; + PSTR ptr; + DWORD user = dwFlags & CRYPT_USER_DEFAULT; + + LPSTR MACHINESTR = "Software\\Microsoft\\Cryptography\\Defaults\\Provider Types\\Type XXX"; + LPSTR USERSTR = "Software\\Microsoft\\Cryptography\\Provider Type XXX"; + + keyname = LocalAlloc(LMEM_ZEROINIT, (user ? strlen(USERSTR) : strlen(MACHINESTR)) + 1); + if (keyname) + { + user ? strcpy(keyname, USERSTR) : strcpy(keyname, MACHINESTR); + ptr = keyname + strlen(keyname); + *(--ptr) = (dwProvType % 10) + '0'; + *(--ptr) = ((dwProvType / 10) % 10) + '0'; + *(--ptr) = (dwProvType / 100) + '0'; + } else + return FALSE; + + if (RegOpenKey((dwFlags & CRYPT_USER_DEFAULT) ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE ,keyname, &hKey)) + { + LocalFree(keyname); + return FALSE; + } + LocalFree(keyname); + + if (RegQueryValueEx(hKey, "Name", NULL, NULL, *pszProvName, pcbProvName)) + { + if (GetLastError() != ERROR_MORE_DATA) + SetLastError(NTE_PROV_TYPE_ENTRY_BAD); + return FALSE; + } + + if (!(*pszProvName = LocalAlloc(LMEM_ZEROINIT, *pcbProvName))) + return FALSE; + + if (RegQueryValueEx(hKey, "Name", NULL, NULL, *pszProvName, pcbProvName)) + { + if (GetLastError() != ERROR_MORE_DATA) + SetLastError(NTE_PROV_TYPE_ENTRY_BAD); + return FALSE; + } + + RegCloseKey(hKey); + + return TRUE; +} + +static void test_get_default_provider() +{ + /* expected results */ + DWORD dwProvType = PROV_RSA_FULL; + DWORD dwFlags = CRYPT_MACHINE_DEFAULT; + LPSTR pszProvName = NULL; + DWORD cbProvName; + + /* actual results */ + DWORD provType = PROV_RSA_FULL; + DWORD flags = CRYPT_MACHINE_DEFAULT; + LPSTR provName = NULL; + DWORD provNameSize; + DWORD result; + DWORD notNull = 5; + + if(!pCryptGetDefaultProviderA) + { + trace("skipping CryptGetDefaultProvider tests\n"); + return; + } + + FindDfltProvRegVals(dwProvType, dwFlags, &pszProvName, &cbProvName); + + /* check pdwReserved for NULL */ + result = pCryptGetDefaultProviderA(provType, &notNull, flags, provName, &provNameSize); + ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %ld\n", + ERROR_INVALID_PARAMETER, GetLastError()); + + /* check for invalid flag */ + flags = 0xdeadbeef; + result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize); + ok(!result && GetLastError()==NTE_BAD_FLAGS, "expected %ld, got %ld\n", + NTE_BAD_FLAGS, GetLastError()); + flags = CRYPT_MACHINE_DEFAULT; + + /* check for invalid prov type */ + provType = 0xdeadbeef; + result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize); + ok(!result && (GetLastError() == NTE_BAD_PROV_TYPE || + GetLastError() == ERROR_INVALID_PARAMETER), + "expected NTE_BAD_PROV_TYPE or ERROR_INVALID_PARAMETER, got %ld/%ld\n", + result, GetLastError()); + provType = PROV_RSA_FULL; + + SetLastError(0); + + /* alloc provName to half the size required + * cbProvName holds the size required */ + provNameSize = cbProvName / 2; + if (!(provName = LocalAlloc(LMEM_ZEROINIT, provNameSize))) + return; + + result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize); + ok(!result && GetLastError()==ERROR_MORE_DATA, "expected %i, got %ld\n", + ERROR_MORE_DATA, GetLastError()); + + LocalFree(provName); + + /* check expected versus actual values returned */ + result = pCryptGetDefaultProviderA(provType, NULL, flags, NULL, &provNameSize); + ok(result && provNameSize==cbProvName, "expected %ld, got %ld\n", cbProvName, provNameSize); + provNameSize = cbProvName; + + if (!(provName = LocalAlloc(LMEM_ZEROINIT, provNameSize))) + return; + + result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize); + ok(result && !strcmp(pszProvName, provName), "expected %s, got %s\n", pszProvName, provName); + ok(result && provNameSize==cbProvName, "expected %ld, got %ld\n", cbProvName, provNameSize); + + LocalFree(provName); +} + +static void test_set_provider_ex() +{ + DWORD result; + DWORD notNull = 5; + + /* results */ + LPSTR pszProvName = NULL; + DWORD cbProvName; + + if(!pCryptGetDefaultProviderA || !pCryptSetProviderExA) + { + trace("skipping CryptSetProviderEx tests\n"); + return; + } + + /* check pdwReserved for NULL */ + result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, &notNull, CRYPT_MACHINE_DEFAULT); + ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %ld\n", + ERROR_INVALID_PARAMETER, GetLastError()); + + /* remove the default provider and then set it to MS_DEF_PROV/PROV_RSA_FULL */ + result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT | CRYPT_DELETE_DEFAULT); + ok(result, "%ld\n", GetLastError()); + + result = pCryptSetProviderExA(MS_DEF_PROV, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT); + ok(result, "%ld\n", GetLastError()); + + /* call CryptGetDefaultProvider to see if they match */ + result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, NULL, &cbProvName); + if (!(pszProvName = LocalAlloc(LMEM_ZEROINIT, cbProvName))) + return; + + result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, pszProvName, &cbProvName); + ok(result && !strcmp(MS_DEF_PROV, pszProvName), "expected %s, got %s\n", MS_DEF_PROV, pszProvName); + ok(result && cbProvName==(strlen(MS_DEF_PROV) + 1), "expected %i, got %ld\n", (strlen(MS_DEF_PROV) + 1), cbProvName); + + LocalFree(pszProvName); +} + +START_TEST(crypt) +{ + init_function_pointers(); + if(pCryptAcquireContextA && pCryptReleaseContext) { + init_environment(); + test_acquire_context(); + clean_up_environment(); + } + + test_enum_providers(); + test_enum_provider_types(); + test_get_default_provider(); + test_set_provider_ex(); +} _____ Added: trunk/reactos/lib/advapi32/winetests/crypt_lmhash.c --- trunk/reactos/lib/advapi32/winetests/crypt_lmhash.c 2005-03-12 04:20:35 UTC (rev 13953) +++ trunk/reactos/lib/advapi32/winetests/crypt_lmhash.c 2005-03-12 04:32:00 UTC (rev 13954) @@ -0,0 +1,63 @@ +/* + * Unit tests for SystemFunction006 (LMHash?) + * + * Copyright 2004 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" + +typedef VOID (WINAPI *fnSystemFunction006)( PCSTR passwd, PSTR lmhash ); +fnSystemFunction006 pSystemFunction006; + +static void test_SystemFunction006() +{ + static unsigned char lmhash[16 + 1]; + + unsigned char passwd[] = { 's','e','c','r','e','t', 0, 0, 0, 0, 0, 0, 0, 0 }; + unsigned char expect[] = + { 0x85, 0xf5, 0x28, 0x9f, 0x09, 0xdc, 0xa7, 0xeb, + 0xaa, 0xd3, 0xb4, 0x35, 0xb5, 0x14, 0x04, 0xee }; + + pSystemFunction006( passwd, lmhash ); + + ok( !memcmp( lmhash, expect, sizeof(expect) ), + "lmhash: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", + lmhash[0], lmhash[1], lmhash[2], lmhash[3], lmhash[4], lmhash[5], + lmhash[6], lmhash[7], lmhash[8], lmhash[9], lmhash[10], lmhash[11], + lmhash[12], lmhash[13], lmhash[14], lmhash[15] ); +} + +START_TEST(crypt_lmhash) +{ + HMODULE module; + + if (!(module = LoadLibrary("advapi32.dll"))) return; + + pSystemFunction006 = (fnSystemFunction006)GetProcAddress( module, "SystemFunction006" ); + + if (!pSystemFunction006) goto out; + + if (pSystemFunction006) + test_SystemFunction006(); + +out: + FreeLibrary( module ); +} _____ Added: trunk/reactos/lib/advapi32/winetests/crypt_md4.c --- trunk/reactos/lib/advapi32/winetests/crypt_md4.c 2005-03-12 04:20:35 UTC (rev 13953) +++ trunk/reactos/lib/advapi32/winetests/crypt_md4.c 2005-03-12 04:32:00 UTC (rev 13954) @@ -0,0 +1,109 @@ +/* + * Unit tests for MD4 functions + * + * Copyright 2004 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +typedef struct +{ + unsigned int buf[4]; + unsigned int i[2]; + unsigned char in[64]; + unsigned char digest[16]; +} MD4_CTX; + +typedef VOID (WINAPI *fnMD4Init)( MD4_CTX *ctx ); +typedef VOID (WINAPI *fnMD4Update)( MD4_CTX *ctx, const unsigned char *src, const int len ); +typedef VOID (WINAPI *fnMD4Final)( MD4_CTX *ctx ); + +fnMD4Init pMD4Init; +fnMD4Update pMD4Update; +fnMD4Final pMD4Final; + +#define ctxcmp( a, b ) memcmp( (char*)a, (char*)b, FIELD_OFFSET( MD4_CTX, in ) ) + +void test_md4_ctx() +{ + static unsigned char message[] = + "In our Life there's If" + "In our beliefs there's Lie" + "In our business there is Sin" + "In our bodies, there is Die"; + + int size = strlen( message ); + HMODULE module; + + MD4_CTX ctx; + MD4_CTX ctx_initialized = + { + { 0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476 }, + { 0, 0 } + }; + + MD4_CTX ctx_update1 = + { + { 0x5e592ef7, 0xbdcb1567, 0x2b626d17, 0x7d1198bd }, + { 0x00000338, 0 } + }; + + MD4_CTX ctx_update2 = + { + { 0x05dcfd65, 0xb3711c0d, 0x9e3369c2, 0x903ead11 }, + { 0x00000670, 0 } + }; + + unsigned char expect[16] = + { 0x5f, 0xd3, 0x9b, 0x29, 0x47, 0x53, 0x47, 0xaf, + 0xa5, 0xba, 0x0c, 0x05, 0xff, 0xc0, 0xc7, 0xda }; + + if (!(module = LoadLibrary( "advapi32.dll" ))) return; + + pMD4Init = (fnMD4Init)GetProcAddress( module, "MD4Init" ); + pMD4Update = (fnMD4Update)GetProcAddress( module, "MD4Update" ); + pMD4Final = (fnMD4Final)GetProcAddress( module, "MD4Final" ); + + if (!pMD4Init || !pMD4Update || !pMD4Final) goto out; + + memset( &ctx, 0, sizeof(ctx) ); + pMD4Init( &ctx ); + ok( !ctxcmp( &ctx, &ctx_initialized ), "invalid initialization\n" ); + + pMD4Update( &ctx, message, size ); + ok( !ctxcmp( &ctx, &ctx_update1 ), "update doesn't work correctly\n" ); + + pMD4Update( &ctx, message, size ); + ok( !ctxcmp( &ctx, &ctx_update2 ), "update doesn't work correctly\n" ); + + pMD4Final( &ctx ); + ok( ctxcmp( &ctx, &ctx_initialized ), "context has changed\n" ); + ok( !memcmp( ctx.digest, expect, sizeof(expect) ), "incorrect result\n" ); + +out: + FreeLibrary( module ); +} + +START_TEST(crypt_md4) +{ + test_md4_ctx(); +} _____ Added: trunk/reactos/lib/advapi32/winetests/crypt_md5.c --- trunk/reactos/lib/advapi32/winetests/crypt_md5.c 2005-03-12 04:20:35 UTC (rev 13953) +++ trunk/reactos/lib/advapi32/winetests/crypt_md5.c 2005-03-12 04:32:00 UTC (rev 13954) @@ -0,0 +1,109 @@ +/* + * Unit tests for MD5 functions + * + * Copyright 2004 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +typedef struct +{ + unsigned int i[2]; + unsigned int buf[4]; + unsigned char in[64]; + unsigned char digest[16]; +} MD5_CTX; + +typedef VOID (WINAPI *fnMD5Init)( MD5_CTX *ctx ); +typedef VOID (WINAPI *fnMD5Update)( MD5_CTX *ctx, const unsigned char *src, const int len ); +typedef VOID (WINAPI *fnMD5Final)( MD5_CTX *ctx ); + +fnMD5Init pMD5Init; +fnMD5Update pMD5Update; +fnMD5Final pMD5Final; + +#define ctxcmp( a, b ) memcmp( (char*)a, (char*)b, FIELD_OFFSET( MD5_CTX, in ) ) + +void test_md5_ctx() +{ + static unsigned char message[] = + "In our Life there's If" + "In our beliefs there's Lie" + "In our business there is Sin" + "In our bodies, there is Die"; + + int size = strlen( message ); + HMODULE module; + + MD5_CTX ctx; + MD5_CTX ctx_initialized = + { + { 0, 0 }, + { 0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476 } + }; + + MD5_CTX ctx_update1 = + { + { 0x00000338, 0 }, + { 0x068cb64d, 0xb7a05790, 0x426979ee, 0xed67e221 } + }; + + MD5_CTX ctx_update2 = + { + { 0x00000670, 0 }, + { 0x2f7afe58, 0xcc3e9315, 0x709c465c, 0xbf6414c8 } + }; + + unsigned char expect[16] = + { 0x43, 0x03, 0xdd, 0x8c, 0x60, 0xd9, 0x3a, 0x22, + 0x0b, 0x28, 0xd0, 0xb2, 0x65, 0x93, 0xd0, 0x36 }; + + if (!(module = LoadLibrary( "advapi32.dll" ))) return; + + pMD5Init = (fnMD5Init)GetProcAddress( module, "MD5Init" ); + pMD5Update = (fnMD5Update)GetProcAddress( module, "MD5Update" ); + pMD5Final = (fnMD5Final)GetProcAddress( module, "MD5Final" ); + + if (!pMD5Init || !pMD5Update || !pMD5Final) goto out; + + memset( &ctx, 0, sizeof(ctx) ); + pMD5Init( &ctx ); + ok( !ctxcmp( &ctx, &ctx_initialized ), "invalid initialization\n" ); + + pMD5Update( &ctx, message, size ); + ok( !ctxcmp( &ctx, &ctx_update1 ), "update doesn't work correctly\n" ); + + pMD5Update( &ctx, message, size ); + ok( !ctxcmp( &ctx, &ctx_update2 ), "update doesn't work correctly\n" ); + + pMD5Final( &ctx ); + ok( ctxcmp( &ctx, &ctx_initialized ), "context has changed\n" ); + ok( !memcmp( ctx.digest, expect, sizeof(expect) ), "incorrect result\n" ); + +out: + FreeLibrary( module ); +} + +START_TEST(crypt_md5) +{ + test_md5_ctx(); +} _____ Added: trunk/reactos/lib/advapi32/winetests/crypt_sha.c --- trunk/reactos/lib/advapi32/winetests/crypt_sha.c 2005-03-12 04:20:35 UTC (rev 13953) +++ trunk/reactos/lib/advapi32/winetests/crypt_sha.c 2005-03-12 04:32:00 UTC (rev 13954) @@ -0,0 +1,81 @@ +/* + * Unit tests for SHA functions + * + * Copyright (c) 2004 Filip Navara + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +#include "wine/test.h" + +typedef struct { + ULONG Unknown[6]; + ULONG State[5]; + ULONG Count[2]; + UCHAR Buffer[64]; +} SHA_CTX, *PSHA_CTX; + +#define ctxcmp(a,b) memcmp((char*)a, (char*)b, FIELD_OFFSET(SHA_CTX, Buffer)) + +static void test_sha_ctx(void) +{ + FARPROC pA_SHAInit, pA_SHAUpdate, pA_SHAFinal; + static const char test_buffer[] = "In our Life there's If" + "In our beliefs there's Lie" + "In our business there is Sin" + "In our bodies, there is Die"; + ULONG test_buffer_size = strlen(test_buffer); + HMODULE hmod; + SHA_CTX ctx; + SHA_CTX ctx_initialized = {{0, 0, 0, 0, 0}, {0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476, 0xc3d2e1f0}, {0, 0}}; + SHA_CTX ctx_update1 = {{0, 0, 0, 0, 0}, {0xdbe5eba8, 0x6b4335ca, 0xf7c94abe, 0xc9f34e31, 0x311023f0}, {0, 0x67}}; + SHA_CTX ctx_update2 = {{0, 0, 0, 0, 0}, {0x5ecc818d, 0x52498169, 0xf6758559, 0xd035a164, 0x871dd125}, {0, 0xce}}; + ULONG result[5]; + ULONG result_correct[5] = {0xe014f93, 0xe09791ec, 0x6dcf96c8, 0x8e9385fc, 0x1611c1bb}; + + hmod = LoadLibrary("advapi32.dll"); + pA_SHAInit = GetProcAddress(hmod, "A_SHAInit"); + pA_SHAUpdate = GetProcAddress(hmod, "A_SHAUpdate"); + pA_SHAFinal = GetProcAddress(hmod, "A_SHAFinal"); + + if (!pA_SHAInit || !pA_SHAUpdate || !pA_SHAFinal) return; + + RtlZeroMemory(&ctx, sizeof(ctx)); + pA_SHAInit(&ctx); + ok(!ctxcmp(&ctx, &ctx_initialized), "invalid initialization\n"); + + pA_SHAUpdate(&ctx, test_buffer, test_buffer_size); + ok(!ctxcmp(&ctx, &ctx_update1), "update doesn't work correctly\n"); + + pA_SHAUpdate(&ctx, test_buffer, test_buffer_size); + ok(!ctxcmp(&ctx, &ctx_update2), "update doesn't work correctly\n"); + + pA_SHAFinal(&ctx, result); + ok(!ctxcmp(&ctx, &ctx_initialized), "context hasn't been reinitialized\n"); + ok(!memcmp(result, result_correct, sizeof(result)), "incorrect result\n"); + + FreeLibrary(hmod); +} + +START_TEST(crypt_sha) +{ + test_sha_ctx(); +} _____ Added: trunk/reactos/lib/advapi32/winetests/makefile --- trunk/reactos/lib/advapi32/winetests/makefile 2005-03-12 04:20:35 UTC (rev 13953) +++ trunk/reactos/lib/advapi32/winetests/makefile 2005-03-12 04:32:00 UTC (rev 13954) @@ -0,0 +1,33 @@ +# $Id: Makefile 12745 2005-01-03 02:37:10Z sedwards $ + +PATH_TO_TOP = ../../.. + +TARGET_NORC = yes + +TARGET_TYPE = program + +TARGET_APPTYPE = console + +# require os code to explicitly request A/W version of structs/functions +TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API -D_WIN32_IE=0x0600 \ + -D_WIN32_WINNT=0x0501 -D__REACTOS__ + +TARGET_NAME = advapi32_test + +TARGET_SDKLIBS = advapi32.a ntdll.a wine.a + +TARGET_OBJECTS = \ + testlist.o \ + crypt.o \ + crypt_lmhash.o \ + crypt_md4.o \ + crypt_md5.o \ + crypt_sha.o \ + registry.o \ + security.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +# EOF [truncated at 1000 lines; 819 more skipped]

19 years, 9 months

[royce] 13953: detect windows instead of assuming it

by royce＠svn.reactos.com

detect windows instead of assuming it Modified: trunk/reactos/rules.mak _____ Modified: trunk/reactos/rules.mak --- trunk/reactos/rules.mak 2005-03-12 04:14:09 UTC (rev 13952) +++ trunk/reactos/rules.mak 2005-03-12 04:20:35 UTC (rev 13953) @@ -35,10 +35,14 @@ ifeq ($(VERBOSE),no) endif -# Windows is default host environment +# detect Windows host environment ifeq ($(HOST),) -export HOST = mingw32-windows +ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) +HOST=mingw32-windows +else +HOST=mingw32-linux endif +endif # Default to building map files which includes source and asm code # Other options are: yes

19 years, 9 months

[royce] 13952: put windows-detection code in makefile, don't make proxy.mak silent

by royce＠svn.reactos.com

put windows-detection code in makefile, don't make proxy.mak silent Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/proxy.mak _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-12 04:11:24 UTC (rev 13951) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-12 04:14:09 UTC (rev 13952) @@ -1,3 +1,20 @@ +.PHONY: all +.PHONY: clean +all: makefile.auto + +ifeq ($(HOST),) +OSDETECT=$(word 1,$(shell gcc -dumpmachine)) + +all: detect_os + +detect_os: +ifeq ($(OSDETECT),mingw32) + HOST=mingw32-windows +else + HOST=mingw32-linux +endif +endif + # Default to half-verbose mode ifeq ($(VERBOSE),no) Q = @ @@ -87,11 +104,6 @@ NUL = NUL endif -.PHONY: all -.PHONY: clean - -all: makefile.auto - ifneq ($(ROS_INTERMEDIATE),) $(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE) ${nmkdir} $(ROS_INTERMEDIATE)tools _____ Modified: branches/xmlbuildsystem/reactos/proxy.mak --- branches/xmlbuildsystem/reactos/proxy.mak 2005-03-12 04:11:24 UTC (rev 13951) +++ branches/xmlbuildsystem/reactos/proxy.mak 2005-03-12 04:14:09 UTC (rev 13952) @@ -1,4 +1,4 @@ -MAKEFLAGS += --no-print-directory --silent +MAKEFLAGS += --no-print-directory $(DEFAULT): @$(MAKE) -C $(TOP) $(DEFAULT)

19 years, 9 months

[sedwards] 13951: Should be winetests not winetest.

by sedwards＠svn.reactos.com

Should be winetests not winetest. Deleted: trunk/reactos/lib/comctl32/winetest/ Added: trunk/reactos/lib/comctl32/winetests/ _____ Copied: trunk/reactos/lib/comctl32/winetests (from rev 13950, trunk/reactos/lib/comctl32/winetest)

19 years, 9 months

[sedwards] 13950: Added Wine regression tests for comctl32. (Untested)

by sedwards＠svn.reactos.com

Added Wine regression tests for comctl32. (Untested) Added: trunk/reactos/lib/comctl32/winetest/ Added: trunk/reactos/lib/comctl32/winetest/dpa.c Added: trunk/reactos/lib/comctl32/winetest/imagelist.c Added: trunk/reactos/lib/comctl32/winetest/makefile Added: trunk/reactos/lib/comctl32/winetest/mru.c Added: trunk/reactos/lib/comctl32/winetest/subclass.c Added: trunk/reactos/lib/comctl32/winetest/tab.c Added: trunk/reactos/lib/comctl32/winetest/testlist.c _____ Added: trunk/reactos/lib/comctl32/winetest/dpa.c --- trunk/reactos/lib/comctl32/winetest/dpa.c 2005-03-12 02:04:08 UTC (rev 13949) +++ trunk/reactos/lib/comctl32/winetest/dpa.c 2005-03-12 04:09:57 UTC (rev 13950) @@ -0,0 +1,80 @@ +/* + * Unit tests for DPA functions + * + * Copyright 2003 Uwe Bonnes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "commctrl.h" + +#include "wine/test.h" + +static HDPA (WINAPI *pDPA_Create)(int); +static BOOL (WINAPI *pDPA_Grow)(const HDPA hdpa, INT nGrow); +static BOOL (WINAPI *pDPA_Destroy)(const HDPA hdpa); +static BOOL (WINAPI *pDPA_SetPtr)(const HDPA hdpa, INT i, LPVOID p); + +static INT CALLBACK dpa_strcmp(LPVOID pvstr1, LPVOID pvstr2, LPARAM flags) +{ + LPCSTR str1 = (LPCSTR)pvstr1; + LPCSTR str2 = (LPCSTR)pvstr2; + + return lstrcmpA (str1, str2); +} + +void DPA_test() +{ + HDPA dpa_ret; + INT int_ret; + CHAR test_str0[]="test0"; + + if (!pDPA_Create) + return; + + dpa_ret = pDPA_Create(0); + ok((dpa_ret !=0), "DPA_Create failed\n"); + int_ret = DPA_Search(dpa_ret,test_str0,0, dpa_strcmp,0, DPAS_SORTED); + ok((int_ret == -1), "DPA_Search found invalid item\n"); + int_ret = DPA_Search(dpa_ret,test_str0,0, dpa_strcmp,0, DPAS_SORTED|DPAS_INSERTBEFORE); + ok((int_ret == 0), "DPA_Search proposed bad item\n"); + int_ret = DPA_Search(dpa_ret,test_str0,0, dpa_strcmp,0, DPAS_SORTED|DPAS_INSERTAFTER); + ok((int_ret == 0), "DPA_Search proposed bad item\n"); + int_ret = pDPA_Grow(dpa_ret,0); + ok(int_ret != 0, "DPA_Grow failed\n"); + int_ret = pDPA_SetPtr(dpa_ret, 0, (void*)0xdeadbeef); + ok(int_ret != 0, "DPA_SetPtr failed\n"); + int_ret = pDPA_Destroy(dpa_ret); + ok(int_ret != 0, "DPA_Destory failed\n"); +} + +START_TEST(dpa) +{ + HMODULE hdll; + + hdll=GetModuleHandleA("comctl32.dll"); + pDPA_Create=(void*)GetProcAddress(hdll,(LPCSTR)328); + pDPA_Destroy=(void*)GetProcAddress(hdll,(LPCSTR)329); + pDPA_Grow=(void*)GetProcAddress(hdll,(LPCSTR)330); + pDPA_SetPtr=(void*)GetProcAddress(hdll,(LPCSTR)335); + + DPA_test(); +} _____ Added: trunk/reactos/lib/comctl32/winetest/imagelist.c --- trunk/reactos/lib/comctl32/winetest/imagelist.c 2005-03-12 02:04:08 UTC (rev 13949) +++ trunk/reactos/lib/comctl32/winetest/imagelist.c 2005-03-12 04:09:57 UTC (rev 13950) @@ -0,0 +1,560 @@ +/* Unit test suite for imagelist control. + * + * Copyright 2004 Michael Stefaniuc + * Copyright 2002 Mike McCormack for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <assert.h> +#include <windows.h> +#include <commctrl.h> +#include <stdio.h> + +#include "wine/test.h" + +#undef VISIBLE + +#ifdef VISIBLE +#define WAIT Sleep (1000) +#define REDRAW(hwnd) RedrawWindow (hwnd, NULL, 0, RDW_UPDATENOW) +#else +#define WAIT +#define REDRAW(hwnd) +#endif + + +static BOOL (WINAPI *pImageList_DrawIndirect)(IMAGELISTDRAWPARAMS*) = NULL; + +static HDC desktopDC; +static HINSTANCE hinst; + +/* These macros build cursor/bitmap data in 4x4 pixel blocks */ +#define B(x,y) ((x?0xf0:0)|(y?0xf:0)) +#define ROW1(a,b,c,d,e,f,g,h) B(a,b),B(c,d),B(e,f),B(g,h) +#define ROW32(a,b,c,d,e,f,g,h) ROW1(a,b,c,d,e,f,g,h), ROW1(a,b,c,d,e,f,g,h), \ + ROW1(a,b,c,d,e,f,g,h), ROW1(a,b,c,d,e,f,g,h) +#define ROW2(a,b,c,d,e,f,g,h,i,j,k,l) ROW1(a,b,c,d,e,f,g,h),B(i,j),B(k,l) +#define ROW48(a,b,c,d,e,f,g,h,i,j,k,l) ROW2(a,b,c,d,e,f,g,h,i,j,k,l), \ + ROW2(a,b,c,d,e,f,g,h,i,j,k,l), ROW2(a,b,c,d,e,f,g,h,i,j,k,l), \ + ROW2(a,b,c,d,e,f,g,h,i,j,k,l) + +static const BYTE empty_bits[48*48/8]; + +static const BYTE icon_bits[32*32/8] = +{ + ROW32(0,0,0,0,0,0,0,0), + ROW32(0,0,1,1,1,1,0,0), + ROW32(0,1,1,1,1,1,1,0), + ROW32(0,1,1,0,0,1,1,0), + ROW32(0,1,1,0,0,1,1,0), + ROW32(0,1,1,1,1,1,1,0), + ROW32(0,0,1,1,1,1,0,0), + ROW32(0,0,0,0,0,0,0,0) +}; + +static const BYTE bitmap_bits[48*48/8] = +{ + ROW48(0,0,0,0,0,0,0,0,0,0,0,0), + ROW48(0,1,1,1,1,1,1,1,1,1,1,0), + ROW48(0,1,1,0,0,0,0,0,0,1,1,0), + ROW48(0,1,0,0,0,0,0,0,1,0,1,0), + ROW48(0,1,0,0,0,0,0,1,0,0,1,0), + ROW48(0,1,0,0,0,0,1,0,0,0,1,0), + ROW48(0,1,0,0,0,1,0,0,0,0,1,0), + ROW48(0,1,0,0,1,0,0,0,0,0,1,0), + ROW48(0,1,0,1,0,0,0,0,0,0,1,0), + ROW48(0,1,1,0,0,0,0,0,0,1,1,0), + ROW48(0,1,1,1,1,1,1,1,1,1,1,0), + ROW48(0,0,0,0,0,0,0,0,0,0,0,0) +}; + +static HIMAGELIST createImageList(int cx, int cy) +{ + /* Create an ImageList and put an image into it */ + HIMAGELIST himl = ImageList_Create(cx, cy, ILC_COLOR, 1, 1); + HBITMAP hbm = CreateBitmap(48, 48, 1, 1, bitmap_bits); + ImageList_Add(himl, hbm, NULL); + return himl; +} + +static HWND create_a_window(void) +{ + char className[] = "bmwnd"; + char winName[] = "Test Bitmap"; + HWND hWnd; + static int registered = 0; + + if (!registered) + { + WNDCLASSA cls; + + cls.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = 0; + cls.hIcon = LoadIconA (0, (LPSTR)IDI_APPLICATION); + cls.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); + cls.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH); + cls.lpszMenuName = 0; + cls.lpszClassName = className; + + RegisterClassA (&cls); + registered = 1; + } + + /* Setup window */ + hWnd = CreateWindowA (className, winName, + WS_OVERLAPPEDWINDOW , + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, + 0, hinst, 0); + +#ifdef VISIBLE + ShowWindow (hWnd, SW_SHOW); +#endif + REDRAW(hWnd); + WAIT; + + return hWnd; +} + +static HDC show_image(HWND hwnd, HIMAGELIST himl, int idx, int size, + LPCSTR loc, BOOL clear) +{ + HDC hdc = NULL; +#ifdef VISIBLE + if (!himl) return NULL; + + SetWindowText(hwnd, loc); + hdc = GetDC(hwnd); + ImageList_Draw(himl, idx, hdc, 0, 0, ILD_TRANSPARENT); + + REDRAW(hwnd); + WAIT; + + if (clear) + { + BitBlt(hdc, 0, 0, size, size, hdc, size+1, size+1, SRCCOPY); + ReleaseDC(hwnd, hdc); + hdc = NULL; + } +#endif /* VISIBLE */ + return hdc; +} + +/* Useful for checking differences */ +#if 0 +static void dump_bits(const BYTE *p, const BYTE *q, int size) +{ + int i, j; + + size /= 8; + + for (i = 0; i < size * 2; i++) + { + printf("|"); + for (j = 0; j < size; j++) + printf("%c%c", p[j] & 0xf0 ? 'X' : ' ', p[j] & 0xf ? 'X' : ' '); + printf(" -- "); + for (j = 0; j < size; j++) + printf("%c%c", q[j] & 0xf0 ? 'X' : ' ', q[j] & 0xf ? 'X' : ' '); + printf("|\n"); + p += size * 4; + q += size * 4; + } + printf("\n"); +} +#endif + +static void check_bits(HWND hwnd, HIMAGELIST himl, int idx, int size, + const BYTE *checkbits, LPCSTR loc) +{ +#ifdef VISIBLE + BYTE bits[100*100/8]; + COLORREF c; + HDC hdc; + int x, y, i = -1; + + if (!himl) return; + + memset(bits, 0, sizeof(bits)); + hdc = show_image(hwnd, himl, idx, size, loc, FALSE); + + c = GetPixel(hdc, 0, 0); + + for (y = 0; y < size; y ++) + { + for (x = 0; x < size; x++) + { + if (!(x & 0x7)) i++; + if (GetPixel(hdc, x, y) != c) bits[i] |= (0x80 >> (x & 0x7)); + } + } + + BitBlt(hdc, 0, 0, size, size, hdc, size+1, size+1, SRCCOPY); + ReleaseDC(hwnd, hdc); + + ok (memcmp(bits, checkbits, (size * size)/8) == 0, + "%s: bits different\n", loc); + if (memcmp(bits, checkbits, (size * size)/8)) + dump_bits(bits, checkbits, size); +#endif /* VISIBLE */ +} + +static void testHotspot (void) +{ + struct hotspot { + int dx; + int dy; + }; + +#define SIZEX1 47 +#define SIZEY1 31 +#define SIZEX2 11 +#define SIZEY2 17 +#define HOTSPOTS_MAX 4 /* Number of entries in hotspots */ + static const struct hotspot hotspots[HOTSPOTS_MAX] = { + { 10, 7 }, + { SIZEX1, SIZEY1 }, + { -9, -8 }, + { -7, 35 } + }; + int i, j, ret; + HIMAGELIST himl1 = createImageList(SIZEX1, SIZEY1); + HIMAGELIST himl2 = createImageList(SIZEX2, SIZEY2); + HWND hwnd = create_a_window(); + + + for (i = 0; i < HOTSPOTS_MAX; i++) { + for (j = 0; j < HOTSPOTS_MAX; j++) { + int dx1 = hotspots[i].dx; + int dy1 = hotspots[i].dy; + int dx2 = hotspots[j].dx; + int dy2 = hotspots[j].dy; + int correctx, correcty, newx, newy; + char loc[256]; + HIMAGELIST himlNew; + POINT ppt; + + ret = ImageList_BeginDrag(himl1, 0, dx1, dy1); + ok(ret != 0, "BeginDrag failed for { %d, %d }\n", dx1, dy1); + sprintf(loc, "BeginDrag (%d,%d)\n", i, j); + show_image(hwnd, himl1, 0, max(SIZEX1, SIZEY1), loc, TRUE); + + /* check merging the dragged image with a second image */ + ret = ImageList_SetDragCursorImage(himl2, 0, dx2, dy2); + ok(ret != 0, "SetDragCursorImage failed for {%d, %d}{%d, %d}\n", + dx1, dy1, dx2, dy2); + sprintf(loc, "SetDragCursorImage (%d,%d)\n", i, j); + show_image(hwnd, himl2, 0, max(SIZEX2, SIZEY2), loc, TRUE); + + /* check new hotspot, it should be the same like the old one */ + himlNew = ImageList_GetDragImage(NULL, &ppt); + ok(ppt.x == dx1 && ppt.y == dy1, + "Expected drag hotspot [%d,%d] got [%ld,%ld]\n", + dx1, dy1, ppt.x, ppt.y); + /* check size of new dragged image */ + ImageList_GetIconSize(himlNew, &newx, &newy); + correctx = max(SIZEX1, max(SIZEX2 + dx2, SIZEX1 - dx2)); + correcty = max(SIZEY1, max(SIZEY2 + dy2, SIZEY1 - dy2)); + ok(newx == correctx && newy == correcty, + "Expected drag image size [%d,%d] got [%d,%d]\n", + correctx, correcty, newx, newy); + sprintf(loc, "GetDragImage (%d,%d)\n", i, j); + show_image(hwnd, himlNew, 0, max(correctx, correcty), loc, TRUE); + ImageList_EndDrag(); + } + } +#undef SIZEX1 +#undef SIZEY1 +#undef SIZEX2 +#undef SIZEY2 +#undef HOTSPOTS_MAX + DestroyWindow(hwnd); +} + +static BOOL DoTest1(void) +{ + HIMAGELIST himl ; + + HICON hicon1 ; + HICON hicon2 ; + HICON hicon3 ; + + /* create an imagelist to play with */ + himl = ImageList_Create(84,84,0x10,0,3); + ok(himl!=0,"failed to create imagelist\n"); + + /* load the icons to add to the image list */ + hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon1 != 0, "no hicon1\n"); + hicon2 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon2 != 0, "no hicon2\n"); + hicon3 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon3 != 0, "no hicon3\n"); + + /* remove when nothing exists */ + ok(!ImageList_Remove(himl,0),"removed nonexistent icon\n"); + /* removing everything from an empty imagelist should succeed */ + ok(ImageList_RemoveAll(himl),"removed nonexistent icon\n"); + + /* add three */ + ok(0==ImageList_AddIcon(himl, hicon1),"failed to add icon1\n"); + ok(1==ImageList_AddIcon(himl, hicon2),"failed to add icon2\n"); + ok(2==ImageList_AddIcon(himl, hicon3),"failed to add icon3\n"); + + /* remove an index out of range */ + ok(!ImageList_Remove(himl,4711),"removed nonexistent icon\n"); + + /* remove three */ + ok(ImageList_Remove(himl,0),"can't remove 0\n"); + ok(ImageList_Remove(himl,0),"can't remove 0\n"); + ok(ImageList_Remove(himl,0),"can't remove 0\n"); + + /* remove one extra */ + ok(!ImageList_Remove(himl,0),"removed nonexistent icon\n"); + + /* destroy it */ + ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); + + /* icons should be deleted by the imagelist */ + ok(!DeleteObject(hicon1),"icon 1 wasn't deleted\n"); + ok(!DeleteObject(hicon2),"icon 2 wasn't deleted\n"); + ok(!DeleteObject(hicon3),"icon 3 wasn't deleted\n"); + + return TRUE; +} + +static BOOL DoTest2(void) +{ + HIMAGELIST himl ; + + HICON hicon1 ; + HICON hicon2 ; + HICON hicon3 ; + + /* create an imagelist to play with */ + himl = ImageList_Create(84,84,0x10,0,3); + ok(himl!=0,"failed to create imagelist\n"); + + /* load the icons to add to the image list */ + hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon1 != 0, "no hicon1\n"); + hicon2 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon2 != 0, "no hicon2\n"); + hicon3 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon3 != 0, "no hicon3\n"); + + /* add three */ + ok(0==ImageList_AddIcon(himl, hicon1),"failed to add icon1\n"); + ok(1==ImageList_AddIcon(himl, hicon2),"failed to add icon2\n"); + ok(2==ImageList_AddIcon(himl, hicon3),"failed to add icon3\n"); + + /* destroy it */ + ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); + + /* icons should be deleted by the imagelist */ + ok(!DeleteObject(hicon1),"icon 1 wasn't deleted\n"); + ok(!DeleteObject(hicon2),"icon 2 wasn't deleted\n"); + ok(!DeleteObject(hicon3),"icon 3 wasn't deleted\n"); + + return TRUE; +} + +static BOOL DoTest3(void) +{ + HIMAGELIST himl; + + HBITMAP hbm1; + HBITMAP hbm2; + HBITMAP hbm3; + + IMAGELISTDRAWPARAMS imldp; + HDC hdc; + HWND hwndfortest; + + if (!pImageList_DrawIndirect) + { + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); + if (!pImageList_DrawIndirect) + { + trace("ImageList_DrawIndirect not available, skipping test\n"); + return TRUE; + } + } + + hwndfortest = create_a_window(); + hdc = GetDC(hwndfortest); + ok(hdc!=NULL, "couldn't get DC\n"); + + /* create an imagelist to play with */ + himl = ImageList_Create(48,48,0x10,0,3); + ok(himl!=0,"failed to create imagelist\n"); + + /* load the icons to add to the image list */ + hbm1 = CreateBitmap(48, 48, 1, 1, bitmap_bits); + ok(hbm1 != 0, "no bitmap 1\n"); + hbm2 = CreateBitmap(48, 48, 1, 1, bitmap_bits); + ok(hbm2 != 0, "no bitmap 2\n"); + hbm3 = CreateBitmap(48, 48, 1, 1, bitmap_bits); + ok(hbm3 != 0, "no bitmap 3\n"); + + /* add three */ + ok(0==ImageList_Add(himl, hbm1, 0),"failed to add bitmap 1\n"); + ok(1==ImageList_Add(himl, hbm2, 0),"failed to add bitmap 2\n"); + + ok(ImageList_SetImageCount(himl,3),"Setimage count failed\n"); + /*ok(2==ImageList_Add(himl, hbm3, NULL),"failed to add bitmap 3\n"); */ + ok(ImageList_Replace(himl, 2, hbm3, 0),"failed to replace bitmap 3\n"); + + memset(&imldp, 0, sizeof (imldp)); + ok(!pImageList_DrawIndirect(&imldp), "zero data succeeded!\n"); + imldp.cbSize = sizeof (imldp); + ok(!pImageList_DrawIndirect(&imldp), "zero hdc succeeded!\n"); + imldp.hdcDst = hdc; + ok(!pImageList_DrawIndirect(&imldp),"zero himl succeeded!\n"); + imldp.himl = himl; + if (!pImageList_DrawIndirect(&imldp)) + { + /* Earlier versions of native comctl32 use a smaller structure */ + imldp.cbSize -= 3 * sizeof(DWORD); + ok(pImageList_DrawIndirect(&imldp),"DrawIndirect should succeed\n"); + } + REDRAW(hwndfortest); + WAIT; + + imldp.fStyle = SRCCOPY; + imldp.rgbBk = CLR_DEFAULT; + imldp.rgbFg = CLR_DEFAULT; + imldp.y = 100; + imldp.x = 100; + ok(pImageList_DrawIndirect(&imldp),"should succeed\n"); + imldp.i ++; + ok(pImageList_DrawIndirect(&imldp),"should succeed\n"); + imldp.i ++; + ok(pImageList_DrawIndirect(&imldp),"should succeed\n"); + imldp.i ++; + ok(!pImageList_DrawIndirect(&imldp),"should fail\n"); + + /* remove three */ + ok(ImageList_Remove(himl, 0), "removing 1st bitmap\n"); + ok(ImageList_Remove(himl, 0), "removing 2nd bitmap\n"); + ok(ImageList_Remove(himl, 0), "removing 3rd bitmap\n"); + + /* destroy it */ + ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); + + /* bitmaps should not be deleted by the imagelist */ + ok(DeleteObject(hbm1),"bitmap 1 can't be deleted\n"); + ok(DeleteObject(hbm2),"bitmap 2 can't be deleted\n"); + ok(DeleteObject(hbm3),"bitmap 3 can't be deleted\n"); + + ReleaseDC(hwndfortest, hdc); + DestroyWindow(hwndfortest); + + return TRUE; +} + +static void testMerge() +{ + HIMAGELIST himl1, himl2, hmerge; + HICON hicon1; + HWND hwnd = create_a_window(); + + himl1 = ImageList_Create(32,32,0,0,3); + ok(himl1 != NULL,"failed to create himl1\n"); + + himl2 = ImageList_Create(32,32,0,0,3); + ok(himl2 != NULL,"failed to create himl2\n"); + + hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon1 != NULL, "failed to create hicon1\n"); + + if (!himl1 || !himl2 || !hicon1) + return; + + ok(0==ImageList_AddIcon(himl2, hicon1),"add icon1 to himl2 failed\n"); + check_bits(hwnd, himl2, 0, 32, icon_bits, "add icon1 to himl2"); + + /* If himl1 has no images, merge still succeeds */ + hmerge = ImageList_Merge(himl1, -1, himl2, 0, 0, 0); + ok(hmerge != NULL, "merge himl1,-1 failed\n"); + check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl1,-1"); + if (hmerge) ImageList_Destroy(hmerge); + + hmerge = ImageList_Merge(himl1, 0, himl2, 0, 0, 0); + ok(hmerge != NULL,"merge himl1,0 failed\n"); + check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl1,0"); + if (hmerge) ImageList_Destroy(hmerge); + + /* Same happens if himl2 is empty */ + ImageList_Destroy(himl2); + himl2 = ImageList_Create(32,32,0,0,3); + ok(himl2 != NULL,"failed to recreate himl2\n"); + if (!himl2) + return; + + hmerge = ImageList_Merge(himl1, -1, himl2, -1, 0, 0); + ok(hmerge != NULL, "merge himl2,-1 failed\n"); + check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl2,-1"); + if (hmerge) ImageList_Destroy(hmerge); + + hmerge = ImageList_Merge(himl1, -1, himl2, 0, 0, 0); + ok(hmerge != NULL, "merge himl2,0 failed\n"); + check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl2,0"); + if (hmerge) ImageList_Destroy(hmerge); + + /* Now try merging an image with itself */ + ok(0==ImageList_AddIcon(himl2, hicon1),"re-add icon1 to himl2 failed\n"); + + hmerge = ImageList_Merge(himl2, 0, himl2, 0, 0, 0); + ok(hmerge != NULL, "merge himl2 with itself failed\n"); + check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl2 with itself"); + if (hmerge) ImageList_Destroy(hmerge); + + /* Try merging 2 different image lists */ + ok(0==ImageList_AddIcon(himl1, hicon1),"add icon1 to himl1 failed\n"); + + hmerge = ImageList_Merge(himl1, 0, himl2, 0, 0, 0); + ok(hmerge != NULL, "merge himl1 with himl2 failed\n"); + check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl1 with himl2"); + if (hmerge) ImageList_Destroy(hmerge); + + hmerge = ImageList_Merge(himl1, 0, himl2, 0, 8, 16); + ok(hmerge != NULL, "merge himl1 with himl2 8,16 failed\n"); + check_bits(hwnd, hmerge, 0, 32, empty_bits, "merge himl1 with himl2, 8,16"); + if (hmerge) ImageList_Destroy(hmerge); + + ImageList_Destroy(himl1); + ImageList_Destroy(himl2); + DeleteObject(hicon1); + DestroyWindow(hwnd); +} + +START_TEST(imagelist) +{ + desktopDC=GetDC(NULL); + hinst = GetModuleHandleA(NULL); + + InitCommonControls(); + + testHotspot(); + DoTest1(); + DoTest2(); + DoTest3(); + testMerge(); +} _____ Added: trunk/reactos/lib/comctl32/winetest/makefile --- trunk/reactos/lib/comctl32/winetest/makefile 2005-03-12 02:04:08 UTC (rev 13949) +++ trunk/reactos/lib/comctl32/winetest/makefile 2005-03-12 04:09:57 UTC (rev 13950) @@ -0,0 +1,31 @@ +# $Id: Makefile 12745 2005-01-03 02:37:10Z sedwards $ + +PATH_TO_TOP = ../../.. + +TARGET_NORC = yes + +TARGET_TYPE = program + +TARGET_APPTYPE = console + +# require os code to explicitly request A/W version of structs/functions +TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API -D_WIN32_IE=0x0600 \ + -D_WIN32_WINNT=0x0501 -D__REACTOS__ + +TARGET_NAME = comctl32_test + +TARGET_SDKLIBS = shlwapi.a gdi32.a comctl32.a ntdll.a wine.a + +TARGET_OBJECTS = \ + testlist.o \ + dpa.o \ + imagelist.o \ + mru.o \ + subclass.o \ + tab.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +# EOF \ No newline at end of file _____ Added: trunk/reactos/lib/comctl32/winetest/mru.c --- trunk/reactos/lib/comctl32/winetest/mru.c 2005-03-12 02:04:08 UTC (rev 13949) +++ trunk/reactos/lib/comctl32/winetest/mru.c 2005-03-12 04:09:57 UTC (rev 13950) @@ -0,0 +1,295 @@ +/* + * comctl32 MRU unit tests + * + * Copyright (C) 2004 Jon Griffiths <jon_p_griffiths(a)yahoo.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "winreg.h" +#include "commctrl.h" +#include "shlwapi.h" + +#include "wine/test.h" + +/* Keys for testing MRU functions */ +#define REG_TEST_BASEKEYA "Software\\Wine" +#define REG_TEST_BASESUBKEYA "Test" +#define REG_TEST_KEYA REG_TEST_BASEKEYA "\\" REG_TEST_BASESUBKEYA +#define REG_TEST_SUBKEYA "MRUTest" +#define REG_TEST_FULLKEY REG_TEST_KEYA "\\" REG_TEST_SUBKEYA + +/* Undocumented MRU structures & functions */ +typedef struct tagCREATEMRULISTA +{ + DWORD cbSize; + DWORD nMaxItems; + DWORD dwFlags; + HKEY hKey; + LPCSTR lpszSubKey; + PROC lpfnCompare; +} CREATEMRULISTA, *LPCREATEMRULISTA; + +#define MRUF_STRING_LIST 0 +#define MRUF_BINARY_LIST 1 +#define MRUF_DELAYED_SAVE 2 + +#define LIST_SIZE 3 /* Max entries for each mru */ + +static CREATEMRULISTA mruA = +{ + sizeof(CREATEMRULISTA), + LIST_SIZE, + 0, + NULL, + REG_TEST_SUBKEYA, + NULL +}; + +static HMODULE hComctl32; +static HANDLE (WINAPI *pCreateMRUListA)(LPCREATEMRULISTA); +static void (WINAPI *pFreeMRUList)(HANDLE); +static INT (WINAPI *pAddMRUStringA)(HANDLE,LPCSTR); +/* +static INT (WINAPI *pFindMRUStringA)(HANDLE,LPCSTR,LPINT); +static INT (WINAPI *pEnumMRUList)(HANDLE,INT,LPVOID,DWORD); +*/ + +static BOOL create_reg_entries(void) +{ + HKEY hKey = NULL; + + ok(!RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_FULLKEY, &hKey), + "Couldn't create test key \"%s\"\n", REG_TEST_KEYA); + if (!hKey) return FALSE; + RegCloseKey(hKey); + return TRUE; +} + +static void delete_reg_entries(void) +{ + HKEY hKey; + + if (RegOpenKeyExA(HKEY_CURRENT_USER, REG_TEST_BASEKEYA, 0, KEY_ALL_ACCESS, + &hKey)) + return; + SHDeleteKeyA(hKey, REG_TEST_BASESUBKEYA); + RegCloseKey(hKey); +} + +static void check_reg_entries(const char *mrulist, const char**items) +{ + char buff[128]; + HKEY hKey = NULL; + DWORD type, size, ret; + size_t i; + + ok(!RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_FULLKEY, &hKey), + "Couldn't open test key \"%s\"\n", REG_TEST_FULLKEY); + if (!hKey) return; + + type = REG_SZ; + size = sizeof(buff); + buff[0] = '\0'; + ret = RegQueryValueExA(hKey, "MRUList", NULL, &type, (LPBYTE)buff, &size); + + ok(!ret && buff[0], "Checking MRU: got %ld from RegQueryValueExW\n", ret); + if(ret || !buff[0]) return; + + ok(strcmp(buff, mrulist) == 0, "Checking MRU: Expected list %s, got %s\n", + mrulist, buff); + if(strcmp(buff, mrulist)) return; + + for (i = 0; i < strlen(mrulist); i++) + { + char name[2]; + name[0] = mrulist[i]; + name[1] = '\0'; + type = REG_SZ; + size = sizeof(buff); + buff[0] = '\0'; + ret = RegQueryValueExA(hKey, name, NULL, &type, (LPBYTE)buff, &size); + ok(!ret && buff[0], + "Checking MRU item %d ('%c'): got %ld from RegQueryValueExW\n", + i, mrulist[i], ret); + if(ret || !buff[0]) return; + ok(!strcmp(buff, items[mrulist[i]-'a']), + "Checking MRU item %d ('%c'): expected \"%s\", got \"%s\"\n", + i, mrulist[i], buff, items[mrulist[i] - 'a']); + } +} + +static INT CALLBACK cmp_mru_strA(LPCVOID data1, LPCVOID data2) +{ + return lstrcmpiA(data1, data2); +} + +static HANDLE create_mruA(HKEY hKey, DWORD flags, PROC cmp) +{ + mruA.dwFlags = flags; + mruA.lpfnCompare = cmp; + mruA.hKey = hKey; + + SetLastError(0); + return pCreateMRUListA(&mruA); +} + +static void test_MRUListA(void) +{ + const char *checks[LIST_SIZE+1]; + HANDLE hMRU; + HKEY hKey; + INT iRet; + + pCreateMRUListA = (void*)GetProcAddress(hComctl32,(LPCSTR)151); + pFreeMRUList = (void*)GetProcAddress(hComctl32,(LPCSTR)152); + pAddMRUStringA = (void*)GetProcAddress(hComctl32,(LPCSTR)153); + if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA) + return; + +#if 0 /* Create (NULL) - crashes native */ + hMRU = pCreateMRUListA(NULL); +#endif + + /* Create (size too small) */ + mruA.cbSize = sizeof(mruA) - 2; + hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA); + ok (!hMRU && !GetLastError(), + "CreateMRUListA(too small) expected NULL,0 got %p,%ld\n", + hMRU, GetLastError()); + mruA.cbSize = sizeof(mruA); + + /* Create (size too big) */ + mruA.cbSize = sizeof(mruA) + 2; + hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA); + ok (!hMRU && !GetLastError(), + "CreateMRUListA(too big) expected NULL,0 got %p,%ld\n", + hMRU, GetLastError()); + mruA.cbSize = sizeof(mruA); + + /* Create (NULL hKey) */ + hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA); + ok (!hMRU && !GetLastError(), + "CreateMRUListA(NULL key) expected NULL,0 got %p,%ld\n", + hMRU, GetLastError()); + + /* Create (NULL name) */ + mruA.lpszSubKey = NULL; + hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA); + ok (!hMRU && !GetLastError(), + "CreateMRUListA(NULL name) expected NULL,0 got %p,%ld\n", + hMRU, GetLastError()); + mruA.lpszSubKey = REG_TEST_SUBKEYA; + + /* Create a string MRU */ + ok(!RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEYA, &hKey), + "Couldn't create test key \"%s\"\n", REG_TEST_KEYA); + if (!hKey) + return; + hMRU = create_mruA(hKey, MRUF_STRING_LIST, cmp_mru_strA); + ok(hMRU && !GetLastError(), + "CreateMRUListA(string) expected non-NULL,0 got %p,%ld\n", + hMRU, GetLastError()); + + if (hMRU) + { + checks[0] = "Test 1"; + checks[1] = "Test 2"; + checks[2] = "Test 3"; + checks[3] = "Test 4"; + + /* Add (NULL list) */ + SetLastError(0); + iRet = pAddMRUStringA(NULL, checks[0]); + ok(iRet == -1 && !GetLastError(), + "AddMRUStringA(NULL list) expected -1,0 got %d,%ld\n", + iRet, GetLastError()); + + /* Add (NULL string) */ + SetLastError(0); + iRet = pAddMRUStringA(hMRU, NULL); + ok(iRet == 0 && GetLastError() == ERROR_INVALID_PARAMETER, + "AddMRUStringA(NULL str) expected 0,ERROR_INVALID_PARAMETER got %d,%ld\n", + iRet, GetLastError()); + + /* Add 3 strings. Check the registry is correct after each add */ + SetLastError(0); + iRet = pAddMRUStringA(hMRU, checks[0]); + ok(iRet == 0 && !GetLastError(), + "AddMRUStringA(1) expected 0,0 got %d,%ld\n", + iRet, GetLastError()); + check_reg_entries("a", checks); + + SetLastError(0); + iRet = pAddMRUStringA(hMRU, checks[1]); + ok(iRet == 1 && !GetLastError(), + "AddMRUStringA(2) expected 1,0 got %d,%ld\n", + iRet, GetLastError()); + check_reg_entries("ba", checks); + + SetLastError(0); + iRet = pAddMRUStringA(hMRU, checks[2]); + ok(iRet == 2 && !GetLastError(), + "AddMRUStringA(2) expected 2,0 got %d,%ld\n", + iRet, GetLastError()); + check_reg_entries("cba", checks); + + /* Add a duplicate of the 2nd string - it should move to the front, + * but keep the same index in the registry. + */ + SetLastError(0); + iRet = pAddMRUStringA(hMRU, checks[1]); + ok(iRet == 1 && !GetLastError(), + "AddMRUStringA(re-add 1) expected 1,0 got %d,%ld\n", + iRet, GetLastError()); + check_reg_entries("bca", checks); + + /* Add a new string - replaces the oldest string + moves to the front */ + SetLastError(0); + iRet = pAddMRUStringA(hMRU, checks[3]); + ok(iRet == 0 && !GetLastError(), + "AddMRUStringA(add new) expected 0,0 got %d,%ld\n", + iRet, GetLastError()); + checks[0] = checks[3]; + check_reg_entries("abc", checks); + + /* Finished with this MRU */ + pFreeMRUList(hMRU); + } + + /* Free (NULL list) - Doesn't crash */ + pFreeMRUList(NULL); +} + +START_TEST(mru) +{ + hComctl32 = GetModuleHandleA("comctl32.dll"); + if (!hComctl32) + return; + + delete_reg_entries(); + if (!create_reg_entries()) + return; + + test_MRUListA(); + + delete_reg_entries(); +} _____ Added: trunk/reactos/lib/comctl32/winetest/subclass.c --- trunk/reactos/lib/comctl32/winetest/subclass.c 2005-03-12 02:04:08 UTC (rev 13949) +++ trunk/reactos/lib/comctl32/winetest/subclass.c 2005-03-12 04:09:57 UTC (rev 13950) @@ -0,0 +1,298 @@ +/* Unit tests for subclassed windows. + * + * Copyright 2004 Kevin Koltzau + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. [truncated at 1000 lines; 530 more skipped]

19 years, 9 months

[navaraf] 13949: Minor touch ups to the tools version check to get it working on Linux.

by navaraf＠svn.reactos.com

Minor touch ups to the tools version check to get it working on Linux. Modified: trunk/reactos/tools/tools-check.c Modified: trunk/reactos/tools/tools-check.mak _____ Modified: trunk/reactos/tools/tools-check.c --- trunk/reactos/tools/tools-check.c 2005-03-12 01:11:06 UTC (rev 13948) +++ trunk/reactos/tools/tools-check.c 2005-03-12 02:04:08 UTC (rev 13949) @@ -11,7 +11,7 @@ (BINUTILS_VERSION_DATE < 20031001) #error Due to technical reasons your binutils version can't be used to \ build ReactOS. Please consider upgrading to newer version. See \ - www.mingw.org for details.) + www.mingw.org for details. #endif /* @@ -23,7 +23,7 @@ (__GNUC__ < 3) #error Due to technical reasons your GCC version can't be used to \ build ReactOS. Please consider upgrading to newer version. See \ - www.mingw.org for details.) + www.mingw.org for details. #endif /* _____ Modified: trunk/reactos/tools/tools-check.mak --- trunk/reactos/tools/tools-check.mak 2005-03-12 01:11:06 UTC (rev 13948) +++ trunk/reactos/tools/tools-check.mak 2005-03-12 02:04:08 UTC (rev 13949) @@ -12,7 +12,12 @@ BINUTILS_VERSION_DATE=$(word 5,$(shell $(PREFIX)ld -v)) all: +ifeq ($(HOST),mingw32-linux) + @echo "#define BINUTILS_VERSION_DATE $(BINUTILS_VERSION_DATE)" > tools-check.h +endif +ifeq ($(HOST),mingw32-windows) @echo #define BINUTILS_VERSION_DATE $(BINUTILS_VERSION_DATE) > tools-check.h +endif $(HOST_CC) -c tools-check.c -o tools-check.temp $(RM) tools-check.temp $(RM) tools-check.h

19 years, 9 months

[navaraf] 13948: Steven Edwards <steven_ed4153@yahoo.com>

by navaraf＠svn.reactos.com

Steven Edwards <steven_ed4153(a)yahoo.com> Revert incorrect change - KD_DEBUG_BOOTLOG => KD_DEBUG_FILELOG, /DEBUGPORT=BOOTLOG => /DEBUGPORT=FILE. Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/ntoskrnl/kd/dlog.c Modified: trunk/reactos/ntoskrnl/kd/kdebug.c Modified: trunk/reactos/ntoskrnl/ke/main.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h --- trunk/reactos/ntoskrnl/include/internal/kd.h 2005-03-12 00:54:06 UTC (rev 13947) +++ trunk/reactos/ntoskrnl/include/internal/kd.h 2005-03-12 01:11:06 UTC (rev 13948) @@ -16,7 +16,7 @@ #define KD_DEBUG_SCREEN 0x04 #define KD_DEBUG_SERIAL 0x08 #define KD_DEBUG_BOCHS 0x10 -#define KD_DEBUG_BOOTLOG 0x20 +#define KD_DEBUG_FILELOG 0x20 #define KD_DEBUG_MDA 0x40 #define KD_DEBUG_KDB 0x80 #define KD_DEBUG_KDSERIAL 0x100 _____ Modified: trunk/reactos/ntoskrnl/kd/dlog.c --- trunk/reactos/ntoskrnl/kd/dlog.c 2005-03-12 00:54:06 UTC (rev 13947) +++ trunk/reactos/ntoskrnl/kd/dlog.c 2005-03-12 01:11:06 UTC (rev 13948) @@ -36,11 +36,11 @@ ULONG Offset; ULONG Length; - if (!(KdDebugState & KD_DEBUG_BOOTLOG)) + if (!(KdDebugState & KD_DEBUG_FILELOG)) { return; } - KdDebugState &= ~KD_DEBUG_BOOTLOG; + KdDebugState &= ~KD_DEBUG_FILELOG; Offset = (DebugLogEnd + 1) % DEBUGLOG_SIZE; do _____ Modified: trunk/reactos/ntoskrnl/kd/kdebug.c --- trunk/reactos/ntoskrnl/kd/kdebug.c 2005-03-12 00:54:06 UTC (rev 13947) +++ trunk/reactos/ntoskrnl/kd/kdebug.c 2005-03-12 01:11:06 UTC (rev 13948) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -151,15 +151,15 @@ if (Value > 0 && Value < 5) { KdDebuggerEnabled = TRUE; - KdDebugState |= KD_DEBUG_SERIAL; + KdDebugState |= KD_DEBUG_SERIAL; LogPortInfo.ComPort = Value; } } - else if (!_strnicmp(p2, "BOOTLOG", 4) && BootPhase > 0) + else if (!_strnicmp(p2, "FILE", 4) && BootPhase > 0) { p2 += 4; KdDebuggerEnabled = TRUE; - KdDebugState |= KD_DEBUG_BOOTLOG; + KdDebugState |= KD_DEBUG_FILELOG; } else if (!_strnicmp(p2, "MDA", 3) && BootPhase > 0) { @@ -261,7 +261,7 @@ if (KdDebugState & KD_DEBUG_SERIAL && BootPhase == 0) KdPortInitializeEx(&LogPortInfo, 0, 0); - if (KdDebugState & KD_DEBUG_BOOTLOG && BootPhase > 0) + if (KdDebugState & KD_DEBUG_FILELOG && BootPhase > 0) DebugLogInit(); if (KdDebugState & KD_DEBUG_MDA && BootPhase > 0) @@ -317,7 +317,7 @@ PrintString("\n Serial debugging enabled. COM%ld %ld Baud\n\n", LogPortInfo.ComPort, LogPortInfo.BaudRate); - if (KdDebugState & KD_DEBUG_BOOTLOG) + if (KdDebugState & KD_DEBUG_FILELOG) PrintString("\n File log debugging enabled\n\n"); if (KdDebugState & KD_DEBUG_MDA) PrintString("\n MDA debugging enabled\n\n"); @@ -374,7 +374,7 @@ if (KdDebugState & KD_DEBUG_BOCHS) KdBochsDebugPrint(pch); - if (KdDebugState & KD_DEBUG_BOOTLOG) + if (KdDebugState & KD_DEBUG_FILELOG) DebugLogWrite(pch); if (KdDebugState & KD_DEBUG_MDA) _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-03-12 00:54:06 UTC (rev 13947) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-03-12 01:11:06 UTC (rev 13948) @@ -705,7 +705,7 @@ /* On the assumption that we can now access disks start up the debug * logger thread */ - if ((KdDebuggerEnabled == TRUE) && (KdDebugState & KD_DEBUG_BOOTLOG)) + if ((KdDebuggerEnabled == TRUE) && (KdDebugState & KD_DEBUG_FILELOG)) { DebugLogInit2(); }

19 years, 9 months

[navaraf] 13947: Don't use intermediate objects linked with "ld -r". There's a bug in binutils that causes the data section relocations to be stripped.

by navaraf＠svn.reactos.com

Don't use intermediate objects linked with "ld -r". There's a bug in binutils that causes the data section relocations to be stripped. Modified: trunk/reactos/ntoskrnl/Makefile _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-03-12 00:51:55 UTC (rev 13946) +++ trunk/reactos/ntoskrnl/Makefile 2005-03-12 00:54:06 UTC (rev 13947) @@ -376,134 +376,26 @@ $(OBJECTS_RESOURCE): $(TARGET_NAME).rc bugcodes.rc $(PATH_TO_TOP)/include/reactos/resource.h -# -# Build subsystem intermediate objects -# -$(OBJECTS_PATH)/arch.o: $(OBJECTS_ARCH) - $(LD) -r -o $(OBJECTS_PATH)/arch.o $(OBJECTS_ARCH) - -$(OBJECTS_PATH)/io.o: $(OBJECTS_IO) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/io.o \ - $(OBJECTS_IO) - -$(OBJECTS_PATH)/ke.o: $(OBJECTS_KE) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/ke.o \ - $(OBJECTS_KE) - -$(OBJECTS_PATH)/rtl.o: $(OBJECTS_RTL) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/rtl.o \ - $(OBJECTS_RTL) - -$(OBJECTS_PATH)/mm.o: $(OBJECTS_MM) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/mm.o \ - $(OBJECTS_MM) - -$(OBJECTS_PATH)/ob.o: $(OBJECTS_OB) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/ob.o \ - $(OBJECTS_OB) - -$(OBJECTS_PATH)/ps.o: $(OBJECTS_PS) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/ps.o \ - $(OBJECTS_PS) - -$(OBJECTS_PATH)/ex.o: $(OBJECTS_EX) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/ex.o \ - $(OBJECTS_EX) - -$(OBJECTS_PATH)/fs.o: $(OBJECTS_FS) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/fs.o \ - $(OBJECTS_FS) - -$(OBJECTS_PATH)/se.o: $(OBJECTS_SE) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/se.o \ - $(OBJECTS_SE) - -$(OBJECTS_PATH)/cm.o: $(OBJECTS_CM) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/cm.o \ - $(OBJECTS_CM) - -$(OBJECTS_PATH)/dbg.o: $(OBJECTS_DBG) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/dbg.o \ - $(OBJECTS_DBG) - -$(OBJECTS_PATH)/ldr.o: $(OBJECTS_LDR) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/ldr.o \ - $(OBJECTS_LDR) - -$(OBJECTS_PATH)/lpc.o: $(OBJECTS_LPC) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/lpc.o \ - $(OBJECTS_LPC) - -$(OBJECTS_PATH)/po.o: $(OBJECTS_PO) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/po.o \ - $(OBJECTS_PO) - -$(OBJECTS_PATH)/cc.o: $(OBJECTS_CC) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/cc.o \ - $(OBJECTS_CC) - -$(OBJECTS_PATH)/kd.o: $(OBJECTS_KD) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/kd.o \ - $(OBJECTS_KD) - -$(OBJECTS_PATH)/inbv.o: $(OBJECTS_INBV) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/inbv.o \ - $(OBJECTS_INBV) - # Note: arch.o MUST be the first file!!! OBJECTS := \ - $(OBJECTS_PATH)/arch.o \ - $(OBJECTS_PATH)/ke.o \ - $(OBJECTS_PATH)/cc.o \ - $(OBJECTS_PATH)/cm.o \ - $(OBJECTS_PATH)/dbg.o \ - $(OBJECTS_PATH)/ex.o \ - $(OBJECTS_PATH)/lpc.o \ - $(OBJECTS_PATH)/fs.o \ - $(OBJECTS_PATH)/io.o \ - $(OBJECTS_PATH)/kd.o \ - $(OBJECTS_PATH)/ldr.o \ - $(OBJECTS_PATH)/mm.o \ - $(OBJECTS_PATH)/ob.o \ - $(OBJECTS_PATH)/po.o \ - $(OBJECTS_PATH)/ps.o \ - $(OBJECTS_PATH)/rtl.o \ - $(OBJECTS_PATH)/se.o \ - $(OBJECTS_PATH)/inbv.o \ + $(OBJECTS_ARCH) \ + $(OBJECTS_KE) \ + $(OBJECTS_CC) \ + $(OBJECTS_CM) \ + $(OBJECTS_DBG) \ + $(OBJECTS_EX) \ + $(OBJECTS_LPC) \ + $(OBJECTS_FS) \ + $(OBJECTS_IO) \ + $(OBJECTS_KD) \ + $(OBJECTS_LDR) \ + $(OBJECTS_MM) \ + $(OBJECTS_OB) \ + $(OBJECTS_PO) \ + $(OBJECTS_PS) \ + $(OBJECTS_RTL) \ + $(OBJECTS_SE) \ + $(OBJECTS_INBV) \ $(OBJECTS_RESOURCE) EXTRA_OBJECTS = $(PATH_TO_TOP)/include/reactos/bugcodes.h

19 years, 9 months

[navaraf] 13946: Alex Ionescu <ionucu@videotron.ca>

by navaraf＠svn.reactos.com

Alex Ionescu <ionucu(a)videotron.ca> Add definitions for WORKER_THREAD_RETURNED_AT_BAD_IRQL, MANUALLY_INITIATED_CRASH and IMPERSONATING_WORKER_THREAD bug check codes. Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc --- trunk/reactos/ntoskrnl/ntoskrnl.mc 2005-03-12 00:49:18 UTC (rev 13945) +++ trunk/reactos/ntoskrnl/ntoskrnl.mc 2005-03-12 00:51:55 UTC (rev 13946) @@ -987,6 +987,30 @@ INVALID_WORK_QUEUE_ITEM . +MessageId=0xE1 +Severity=Success +Facility=System +SymbolicName=WORKER_THREAD_RETURNED_AT_BAD_IRQL +Language=English +WORKER_THREAD_RETURNED_AT_BAD_IRQL +. + +MessageId=0xE2 +Severity=Success +Facility=System +SymbolicName=MANUALLY_INITIATED_CRASH +Language=English +MANUALLY_INITIATED_CRASH +. + +MessageId=0xFA +Severity=Success +Facility=System +SymbolicName=IMPERSONATING_WORKER_THREAD +Language=English +IMPERSONATING_WORKER_THREAD +. + MessageId=0x9A Severity=Informational Facility=System

19 years, 9 months

← Newer
1
...
42
43
44
45
46
47
48
...
61
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 March 2005