Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 38380: - Fix build.
by fireball＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: fireball Date: Sat Dec 27 05:44:18 2008 New Revision: 38380 URL: http://svn.reactos.org/svn/reactos?rev=38380&view=rev Log: - Fix build. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Dec 27 05:44:18 2008 @@ -153,6 +153,7 @@ extern UCHAR KiDebugRegisterTrapOffsets[9]; extern UCHAR KiDebugRegisterContextOffsets[9]; extern ULONG KeTimeIncrement; +extern ULONG KeTimeAdjustment; extern ULONG_PTR KiBugCheckData[5]; extern ULONG KiFreezeFlag; extern ULONG KiDPCTimeout;

1 0

[cwittich] 38379: sync cryptnet with wine 1.1.11
by cwittich＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: cwittich Date: Sat Dec 27 05:43:39 2008 New Revision: 38379 URL: http://svn.reactos.org/svn/reactos?rev=38379&view=rev Log: sync cryptnet with wine 1.1.11 Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Sat Dec 27 05:43:39 2008 @@ -20,20 +20,23 @@ #include "config.h" #include "wine/port.h" -#include <stdio.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT +#define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS + +#include <stdio.h> +#include <stdarg.h> #include "windef.h" -#include "wine/debug.h" #include "winbase.h" #include "winnt.h" #include "winnls.h" #include "wininet.h" #include "objbase.h" -#define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #include "wincrypt.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); @@ -397,57 +400,61 @@ return ret; } -/* FIXME: should make wininet cache all downloads instead */ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo) { BOOL ret = FALSE; - INTERNET_CACHE_ENTRY_INFOW cacheInfo = { sizeof(cacheInfo), 0 }; - DWORD size = sizeof(cacheInfo); + INTERNET_CACHE_ENTRY_INFOW *pCacheInfo = NULL; + DWORD size = 0; TRACE("(%s, %p, %p)\n", debugstr_w(pszURL), pObject, pAuxInfo); - if (GetUrlCacheEntryInfoW(pszURL, &cacheInfo, &size) || - GetLastError() == ERROR_INSUFFICIENT_BUFFER) + ret = GetUrlCacheEntryInfoW(pszURL, NULL, &size); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + pCacheInfo = CryptMemAlloc(size); + if (pCacheInfo) + ret = TRUE; + else + SetLastError(ERROR_OUTOFMEMORY); + } + if (ret && (ret = GetUrlCacheEntryInfoW(pszURL, pCacheInfo, &size))) { FILETIME ft; GetSystemTimeAsFileTime(&ft); - if (CompareFileTime(&cacheInfo.ExpireTime, &ft) >= 0) - { - LPINTERNET_CACHE_ENTRY_INFOW pCacheInfo = CryptMemAlloc(size); - - if (pCacheInfo) - { - if (GetUrlCacheEntryInfoW(pszURL, pCacheInfo, &size)) - { - HANDLE hFile = CreateFileW(pCacheInfo->lpszLocalFileName, - GENERIC_READ, 0, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); - - if (hFile != INVALID_HANDLE_VALUE) - { - if ((ret = CRYPT_GetObjectFromFile(hFile, pObject))) - { - if (pAuxInfo && pAuxInfo->cbSize >= - offsetof(CRYPT_RETRIEVE_AUX_INFO, - pLastSyncTime) + sizeof(PFILETIME) && - pAuxInfo->pLastSyncTime) - memcpy(pAuxInfo->pLastSyncTime, - &pCacheInfo->LastSyncTime, - sizeof(FILETIME)); - } - CloseHandle(hFile); - } - } - CryptMemFree(pCacheInfo); + if (CompareFileTime(&pCacheInfo->ExpireTime, &ft) >= 0) + { + HANDLE hFile = CreateFileW(pCacheInfo->lpszLocalFileName, + GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + + if (hFile != INVALID_HANDLE_VALUE) + { + if ((ret = CRYPT_GetObjectFromFile(hFile, pObject))) + { + if (pAuxInfo && pAuxInfo->cbSize >= + offsetof(CRYPT_RETRIEVE_AUX_INFO, + pLastSyncTime) + sizeof(PFILETIME) && + pAuxInfo->pLastSyncTime) + memcpy(pAuxInfo->pLastSyncTime, + &pCacheInfo->LastSyncTime, + sizeof(FILETIME)); + } + CloseHandle(hFile); } else - SetLastError(ERROR_OUTOFMEMORY); + { + DeleteUrlCacheEntryW(pszURL); + ret = FALSE; + } } else + { DeleteUrlCacheEntryW(pszURL); - } + ret = FALSE; + } + } + CryptMemFree(pCacheInfo); TRACE("returning %d\n", ret); return ret; } @@ -597,30 +604,73 @@ return ret; } +/* Finds the object specified by pszURL in the cache. If it's not found, + * creates a new cache entry for the object and writes the object to it. + * Sets the expiration time of the cache entry to expires. + */ static void CRYPT_CacheURL(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, DWORD dwRetrievalFlags, FILETIME expires) { WCHAR cacheFileName[MAX_PATH]; - - /* FIXME: let wininet directly cache instead */ - if (CreateUrlCacheEntryW(pszURL, pObject->rgBlob[0].cbData, NULL, - cacheFileName, 0)) - { - HANDLE hCacheFile = CreateFileW(cacheFileName, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - - if (hCacheFile != INVALID_HANDLE_VALUE) - { - DWORD bytesWritten, entryType; - FILETIME ft = { 0 }; - + DWORD size = 0; + BOOL ret, create = FALSE; + + GetUrlCacheEntryInfoW(pszURL, NULL, &size); + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + INTERNET_CACHE_ENTRY_INFOW *info = CryptMemAlloc(size); + + if (info) + { + FILETIME ft; + + ret = GetUrlCacheEntryInfoW(pszURL, info, &size); + if (ret) + lstrcpyW(cacheFileName, info->lpszLocalFileName); + /* Check if the existing cache entry is up to date. If it isn't, + * overwite it with the new value. + */ + GetSystemTimeAsFileTime(&ft); + if (CompareFileTime(&info->ExpireTime, &ft) < 0) + create = TRUE; + CryptMemFree(info); + } + else + ret = FALSE; + } + else + { + ret = CreateUrlCacheEntryW(pszURL, pObject->rgBlob[0].cbData, NULL, + cacheFileName, 0); + create = TRUE; + } + if (ret) + { + DWORD entryType; + FILETIME ft = { 0 }; + + if (create) + { + HANDLE hCacheFile = CreateFileW(cacheFileName, GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + if (hCacheFile != INVALID_HANDLE_VALUE) + { + DWORD bytesWritten; + + WriteFile(hCacheFile, pObject->rgBlob[0].pbData, + pObject->rgBlob[0].cbData, &bytesWritten, NULL); + CloseHandle(hCacheFile); + } + else + ret = FALSE; + } + if (ret) + { if (!(dwRetrievalFlags & CRYPT_STICKY_CACHE_RETRIEVAL)) entryType = NORMAL_CACHE_ENTRY; else entryType = STICKY_CACHE_ENTRY; - WriteFile(hCacheFile, pObject->rgBlob[0].pbData, - pObject->rgBlob[0].cbData, &bytesWritten, NULL); - CloseHandle(hCacheFile); CommitUrlCacheEntryW(pszURL, cacheFileName, expires, ft, entryType, NULL, 0, NULL, NULL); } @@ -1272,6 +1322,63 @@ return ret; } +typedef BOOL (*get_object_expiration_func)(void *pvContext, + FILETIME *expiration); + +static BOOL CRYPT_GetExpirationFromCert(void *pvObject, FILETIME *expiration) +{ + PCCERT_CONTEXT cert = (PCCERT_CONTEXT)pvObject; + + *expiration = cert->pCertInfo->NotAfter; + return TRUE; +} + +static BOOL CRYPT_GetExpirationFromCRL(void *pvObject, FILETIME *expiration) +{ + PCCRL_CONTEXT cert = (PCCRL_CONTEXT)pvObject; + + *expiration = cert->pCrlInfo->NextUpdate; + return TRUE; +} + +static BOOL CRYPT_GetExpirationFromCTL(void *pvObject, FILETIME *expiration) +{ + PCCTL_CONTEXT cert = (PCCTL_CONTEXT)pvObject; + + *expiration = cert->pCtlInfo->NextUpdate; + return TRUE; +} + +static BOOL CRYPT_GetExpirationFunction(LPCSTR pszObjectOid, + get_object_expiration_func *getExpiration) +{ + BOOL ret; + + if (!HIWORD(pszObjectOid)) + { + switch (LOWORD(pszObjectOid)) + { + case LOWORD(CONTEXT_OID_CERTIFICATE): + *getExpiration = CRYPT_GetExpirationFromCert; + ret = TRUE; + break; + case LOWORD(CONTEXT_OID_CRL): + *getExpiration = CRYPT_GetExpirationFromCRL; + ret = TRUE; + break; + case LOWORD(CONTEXT_OID_CTL): + *getExpiration = CRYPT_GetExpirationFromCTL; + ret = TRUE; + break; + default: + ret = FALSE; + } + } + else + ret = FALSE; + return ret; +} + /*********************************************************************** * CryptRetrieveObjectByUrlW (CRYPTNET.@) */ @@ -1308,7 +1415,17 @@ pAuxInfo); if (ret) { + get_object_expiration_func getExpiration; + ret = create(pszObjectOid, dwRetrievalFlags, &object, ppvObject); + if (ret && !(dwRetrievalFlags & CRYPT_DONT_CACHE_RESULT) && + CRYPT_GetExpirationFunction(pszObjectOid, &getExpiration)) + { + FILETIME expires; + + if (getExpiration(*ppvObject, &expires)) + CRYPT_CacheURL(pszURL, &object, dwRetrievalFlags, expires); + } freeObject(pszObjectOid, &object, freeContext); } }

1 0

[cwittich] 38378: sync oleacc with wine 1.1.11
by cwittich＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: cwittich Date: Sat Dec 27 05:08:40 2008 New Revision: 38378 URL: http://svn.reactos.org/svn/reactos?rev=38378&view=rev Log: sync oleacc with wine 1.1.11 Added: trunk/reactos/dll/win32/oleacc/oleacc.rc (with props) trunk/reactos/dll/win32/oleacc/oleacc_En.rc (with props) trunk/reactos/dll/win32/oleacc/oleacc_Fr.rc (with props) trunk/reactos/dll/win32/oleacc/oleacc_Ko.rc (with props) trunk/reactos/dll/win32/oleacc/oleacc_Nl.rc (with props) Modified: trunk/reactos/dll/win32/oleacc/main.c trunk/reactos/dll/win32/oleacc/oleacc.rbuild trunk/reactos/dll/win32/oleacc/oleacc.spec Modified: trunk/reactos/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] Sat Dec 27 05:08:40 2008 @@ -24,9 +24,12 @@ #include "winuser.h" #include "ole2.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(oleacc); + +static HINSTANCE oleacc_handle = 0; HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) @@ -50,6 +53,21 @@ return E_NOTIMPL; } +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, + LPVOID lpvReserved) +{ + TRACE("%p, %d, %p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + oleacc_handle = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); + break; + } + return TRUE; +} + HRESULT WINAPI DllRegisterServer(void) { FIXME("\n"); @@ -67,3 +85,59 @@ *pVersion = MAKELONG(2,4); /* Windows XP version of oleacc: 4.2.5406.0 */ *pBuild = MAKELONG(0,5406); } + +UINT WINAPI GetRoleTextW(DWORD role, LPWSTR lpRole, UINT rolemax) +{ + INT ret; + WCHAR *resptr; + + TRACE("%u %p %u\n", role, lpRole, rolemax); + + /* return role text length */ + if(!lpRole) + return LoadStringW(oleacc_handle, role, (LPWSTR)&resptr, 0); + + ret = LoadStringW(oleacc_handle, role, lpRole, rolemax); + if(!(ret > 0)){ + if(rolemax > 0) lpRole[0] = '\0'; + return 0; + } + + return ret; +} + +UINT WINAPI GetRoleTextA(DWORD role, LPSTR lpRole, UINT rolemax) +{ + UINT length; + WCHAR *roletextW; + + TRACE("%u %p %u\n", role, lpRole, rolemax); + + length = GetRoleTextW(role, NULL, 0); + if((length == 0) || (lpRole && !rolemax)) + return 0; + + roletextW = HeapAlloc(GetProcessHeap(), 0, (length + 1)*sizeof(WCHAR)); + if(!roletextW) + return 0; + + GetRoleTextW(role, roletextW, length + 1); + + length = WideCharToMultiByte( CP_ACP, 0, roletextW, -1, NULL, 0, NULL, NULL ); + + if(!lpRole){ + HeapFree(GetProcessHeap(), 0, roletextW); + return length - 1; + } + + WideCharToMultiByte( CP_ACP, 0, roletextW, -1, lpRole, rolemax, NULL, NULL ); + + if(rolemax < length){ + lpRole[rolemax-1] = '\0'; + length = rolemax; + } + + HeapFree(GetProcessHeap(), 0, roletextW); + + return length - 1; +} Modified: trunk/reactos/dll/win32/oleacc/oleacc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rb… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.rbuild [iso-8859-1] Sat Dec 27 05:08:40 2008 @@ -8,8 +8,10 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <file>main.c</file> + <file>oleacc.rc</file> <library>wine</library> <library>kernel32</library> + <library>user32</library> <library>ntdll</library> </module> </group> Added: trunk/reactos/dll/win32/oleacc/oleacc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rc… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.rc (added) +++ trunk/reactos/dll/win32/oleacc/oleacc.rc [iso-8859-1] Sat Dec 27 05:08:40 2008 @@ -1,0 +1,27 @@ +/* + * Top level resource file for oleacc + * + * Copyright 2008 Nikolay Sivov + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "oleacc.h" + +#include "oleacc_En.rc" +#include "oleacc_Fr.rc" +#include "oleacc_Ko.rc" +#include "oleacc_Nl.rc" Propchange: trunk/reactos/dll/win32/oleacc/oleacc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oleacc/oleacc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.sp… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] Sat Dec 27 05:08:40 2008 @@ -8,8 +8,8 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall GetOleaccVersionInfo(ptr ptr) -@ stub GetRoleTextA -@ stub GetRoleTextW +@ stdcall GetRoleTextA(long ptr long) +@ stdcall GetRoleTextW(long ptr long) @ stub GetStateTextA @ stub GetStateTextW @ stub IID_IAccessible Added: trunk/reactos/dll/win32/oleacc/oleacc_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_En… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_En.rc (added) +++ trunk/reactos/dll/win32/oleacc/oleacc_En.rc [iso-8859-1] Sat Dec 27 05:08:40 2008 @@ -1,0 +1,90 @@ +/* + * English resources for oleacc + * + * Copyright 2008 Nikolay Sivov + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 0 "unknown object" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "title bar" + ROLE_SYSTEM_MENUBAR "menu bar" + ROLE_SYSTEM_SCROLLBAR "scroll bar" + ROLE_SYSTEM_GRIP "grip" + ROLE_SYSTEM_SOUND "sound" + ROLE_SYSTEM_CURSOR "cursor" + ROLE_SYSTEM_CARET "caret" + ROLE_SYSTEM_ALERT "alert" + ROLE_SYSTEM_WINDOW "window" + ROLE_SYSTEM_CLIENT "client" + ROLE_SYSTEM_MENUPOPUP "popup menu" + ROLE_SYSTEM_MENUITEM "menu item" + ROLE_SYSTEM_TOOLTIP "tool tip" + ROLE_SYSTEM_APPLICATION "application" + ROLE_SYSTEM_DOCUMENT "document" + ROLE_SYSTEM_PANE "pane" + ROLE_SYSTEM_CHART "chart" + ROLE_SYSTEM_DIALOG "dialog" + ROLE_SYSTEM_BORDER "border" + ROLE_SYSTEM_GROUPING "grouping" + ROLE_SYSTEM_SEPARATOR "separator" + ROLE_SYSTEM_TOOLBAR "tool bar" + ROLE_SYSTEM_STATUSBAR "status bar" + ROLE_SYSTEM_TABLE "table" + ROLE_SYSTEM_COLUMNHEADER "column header" + ROLE_SYSTEM_ROWHEADER "row header" + ROLE_SYSTEM_COLUMN "column" + ROLE_SYSTEM_ROW "row" + ROLE_SYSTEM_CELL "cell" + ROLE_SYSTEM_LINK "link" + ROLE_SYSTEM_HELPBALLOON "help balloon" + ROLE_SYSTEM_CHARACTER "character" + ROLE_SYSTEM_LIST "list" + ROLE_SYSTEM_LISTITEM "list item" + ROLE_SYSTEM_OUTLINE "outline" + ROLE_SYSTEM_OUTLINEITEM "outline item" + ROLE_SYSTEM_PAGETAB "page tab" + ROLE_SYSTEM_PROPERTYPAGE "property page" + ROLE_SYSTEM_INDICATOR "indicator" + ROLE_SYSTEM_GRAPHIC "graphic" + ROLE_SYSTEM_STATICTEXT "static text" + ROLE_SYSTEM_TEXT "text" + ROLE_SYSTEM_PUSHBUTTON "push button" + ROLE_SYSTEM_CHECKBUTTON "check button" + ROLE_SYSTEM_RADIOBUTTON "radio button" + ROLE_SYSTEM_COMBOBOX "combo box" + ROLE_SYSTEM_DROPLIST "drop down" + ROLE_SYSTEM_PROGRESSBAR "progress bar" + ROLE_SYSTEM_DIAL "dial" + ROLE_SYSTEM_HOTKEYFIELD "hot key field" + ROLE_SYSTEM_SLIDER "slider" + ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_DIAGRAM "diagram" + ROLE_SYSTEM_ANIMATION "animation" + ROLE_SYSTEM_EQUATION "equation" + ROLE_SYSTEM_BUTTONDROPDOWN "drop down button" + ROLE_SYSTEM_BUTTONMENU "menu button" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "grid drop down button" + ROLE_SYSTEM_WHITESPACE "white space" + ROLE_SYSTEM_PAGETABLIST "page tab list" + ROLE_SYSTEM_CLOCK "clock" + ROLE_SYSTEM_SPLITBUTTON "split button" + ROLE_SYSTEM_IPADDRESS "IP address" + ROLE_SYSTEM_OUTLINEBUTTON "outline button" +} Propchange: trunk/reactos/dll/win32/oleacc/oleacc_En.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/oleacc/oleacc_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_Fr… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_Fr.rc (added) +++ trunk/reactos/dll/win32/oleacc/oleacc_Fr.rc [iso-8859-1] Sat Dec 27 05:08:40 2008 @@ -1,0 +1,90 @@ +/* + * French resources for oleacc + * + * Copyright 2008 Jonathan Ernst + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "objet inconnu" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "barre de titre" + ROLE_SYSTEM_MENUBAR "barre de menu" + ROLE_SYSTEM_SCROLLBAR "barre de dÃ©filement" + ROLE_SYSTEM_GRIP "grip" + ROLE_SYSTEM_SOUND "son" + ROLE_SYSTEM_CURSOR "curseur" + ROLE_SYSTEM_CARET "caret" + ROLE_SYSTEM_ALERT "alerte" + ROLE_SYSTEM_WINDOW "fenÃªtre" + ROLE_SYSTEM_CLIENT "client" + ROLE_SYSTEM_MENUPOPUP "menu popup" + ROLE_SYSTEM_MENUITEM "Ã©lÃ©ment de menu" + ROLE_SYSTEM_TOOLTIP "infobulle" + ROLE_SYSTEM_APPLICATION "application" + ROLE_SYSTEM_DOCUMENT "document" + ROLE_SYSTEM_PANE "pane" + ROLE_SYSTEM_CHART "chart" + ROLE_SYSTEM_DIALOG "boÃ®te de dialogue" + ROLE_SYSTEM_BORDER "bordure" + ROLE_SYSTEM_GROUPING "grouping" + ROLE_SYSTEM_SEPARATOR "separateur" + ROLE_SYSTEM_TOOLBAR "barre d'outils" + ROLE_SYSTEM_STATUSBAR "barre d'Ã©tat" + ROLE_SYSTEM_TABLE "table" + ROLE_SYSTEM_COLUMNHEADER "en-tÃªte de colonne" + ROLE_SYSTEM_ROWHEADER "en-tÃªte de ligne" + ROLE_SYSTEM_COLUMN "colonne" + ROLE_SYSTEM_ROW "ligne" + ROLE_SYSTEM_CELL "cellule" + ROLE_SYSTEM_LINK "lien" + ROLE_SYSTEM_HELPBALLOON "bulle d'aide" + ROLE_SYSTEM_CHARACTER "caractÃ¨re" + ROLE_SYSTEM_LIST "liste" + ROLE_SYSTEM_LISTITEM "Ã©lÃ©ment de liste" + ROLE_SYSTEM_OUTLINE "outline" + ROLE_SYSTEM_OUTLINEITEM "outline item" + ROLE_SYSTEM_PAGETAB "onglet de page" + ROLE_SYSTEM_PROPERTYPAGE "page de propriÃ©tÃ©s" + ROLE_SYSTEM_INDICATOR "indicateur" + ROLE_SYSTEM_GRAPHIC "image" + ROLE_SYSTEM_STATICTEXT "texte statique" + ROLE_SYSTEM_TEXT "texte" + ROLE_SYSTEM_PUSHBUTTON "bouton pressoir" + ROLE_SYSTEM_CHECKBUTTON "case Ã cocher" + ROLE_SYSTEM_RADIOBUTTON "bouton radio" + ROLE_SYSTEM_COMBOBOX "combo box" + ROLE_SYSTEM_DROPLIST "drop down" + ROLE_SYSTEM_PROGRESSBAR "barre de progression" + ROLE_SYSTEM_DIAL "dial" + ROLE_SYSTEM_HOTKEYFIELD "hot key field" + ROLE_SYSTEM_SLIDER "slider" + ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_DIAGRAM "diagramme" + ROLE_SYSTEM_ANIMATION "animation" + ROLE_SYSTEM_EQUATION "Ã©quation" + ROLE_SYSTEM_BUTTONDROPDOWN "drop down button" + ROLE_SYSTEM_BUTTONMENU "bouton de menu" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "grid drop down button" + ROLE_SYSTEM_WHITESPACE "espace blanc" + ROLE_SYSTEM_PAGETABLIST "page tab list" + ROLE_SYSTEM_CLOCK "horloge" + ROLE_SYSTEM_SPLITBUTTON "split button" + ROLE_SYSTEM_IPADDRESS "Adresse IP" + ROLE_SYSTEM_OUTLINEBUTTON "outline button" +} Propchange: trunk/reactos/dll/win32/oleacc/oleacc_Fr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/oleacc/oleacc_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_Ko… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_Ko.rc (added) +++ trunk/reactos/dll/win32/oleacc/oleacc_Ko.rc [iso-8859-1] Sat Dec 27 05:08:40 2008 @@ -1,0 +1,91 @@ +/* + * English resources for oleacc + * + * Copyright 2008 Nikolay Sivov + * Copyright 2008 YunSong Hwang + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 0 "¾Ë ¼ö ¾ø´Â °´Ã¼" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "Á¦¸ñ¹Ù" + ROLE_SYSTEM_MENUBAR "¸Þ´º¹Ù" + ROLE_SYSTEM_SCROLLBAR "½ºÅ©·Ñ¹Ù" + ROLE_SYSTEM_GRIP "±×¸³" + ROLE_SYSTEM_SOUND "»ç¿îµå" + ROLE_SYSTEM_CURSOR "Ä¿¼" + ROLE_SYSTEM_CARET "»ðÀÔ±âÈ£" + ROLE_SYSTEM_ALERT "°æ°í" + ROLE_SYSTEM_WINDOW "Ã¢" + ROLE_SYSTEM_CLIENT "Å¬¶óÀÌ¾ðÆ®" + ROLE_SYSTEM_MENUPOPUP "ÆË¾÷ ¸Þ´º" + ROLE_SYSTEM_MENUITEM "¸Þ´º ¾ÆÀÌÅÛ" + ROLE_SYSTEM_TOOLTIP "µµ±¸ ÆÁ" + ROLE_SYSTEM_APPLICATION "ÇÁ·Î±×·¥" + ROLE_SYSTEM_DOCUMENT "¹®¼" + ROLE_SYSTEM_PANE "Æ²(pane)" + ROLE_SYSTEM_CHART "Â÷Æ®" + ROLE_SYSTEM_DIALOG "´ëÈ»óÀÚ" + ROLE_SYSTEM_BORDER "°¡ÀåÀÚ¸®" + ROLE_SYSTEM_GROUPING "Áý´ÜÈ" + ROLE_SYSTEM_SEPARATOR "ºÐ¸®ÀÚ" + ROLE_SYSTEM_TOOLBAR "µµ±¸¹Ù" + ROLE_SYSTEM_STATUSBAR "»óÅÂ¹Ù" + ROLE_SYSTEM_TABLE "Å×ÀÌºí" + ROLE_SYSTEM_COLUMNHEADER "¼¼·ÎÁÙ Çì´õ" + ROLE_SYSTEM_ROWHEADER "°¡·ÎÁÙ Çì´õ" + ROLE_SYSTEM_COLUMN "¿" + ROLE_SYSTEM_ROW "°¡·ÎÁÙ" + ROLE_SYSTEM_CELL "¼¿" + ROLE_SYSTEM_LINK "¸µÅ©" + ROLE_SYSTEM_HELPBALLOON "Ç³¼± µµ¿ò¸»" + ROLE_SYSTEM_CHARACTER "¹®ÀÚ" + ROLE_SYSTEM_LIST "¸ñ·Ï" + ROLE_SYSTEM_LISTITEM "¸ñ·Ï ¾ÆÀÌÅÛ" + ROLE_SYSTEM_OUTLINE "¿Ü°û¼±" + ROLE_SYSTEM_OUTLINEITEM "¿Ü°û¼± ¾ÆÀÌÅÛ" + ROLE_SYSTEM_PAGETAB "ÆäÀÌÁö ÅÇ" + ROLE_SYSTEM_PROPERTYPAGE "¼Ó¼º ÆäÀÌÁö" + ROLE_SYSTEM_INDICATOR "Áö½ÃÀÚ" + ROLE_SYSTEM_GRAPHIC "±×¸²" + ROLE_SYSTEM_STATICTEXT "Á¤Àû ¹®ÀÚ" + ROLE_SYSTEM_TEXT "¹®ÀÚ" + ROLE_SYSTEM_PUSHBUTTON "´©¸£±â ¹öÆ°" + ROLE_SYSTEM_CHECKBUTTON "Ã¼Å© ¹öÆ°" + ROLE_SYSTEM_RADIOBUTTON "¶óµð¿À ¹öÆ°" + ROLE_SYSTEM_COMBOBOX "ÄÞº¸ »óÀÚ" + ROLE_SYSTEM_DROPLIST "µå·ì ´Ù¿î" + ROLE_SYSTEM_PROGRESSBAR "ÁøÇà¹Ù" + ROLE_SYSTEM_DIAL "´ÙÀÌ¾ó" + ROLE_SYSTEM_HOTKEYFIELD "´ÜÃàÅ° ¸ðÀ½" + ROLE_SYSTEM_SLIDER "½½¶óÀÌ´õ" + ROLE_SYSTEM_SPINBUTTON "½ºÇÉ »óÀÚ" + ROLE_SYSTEM_DIAGRAM "µµÇü" + ROLE_SYSTEM_ANIMATION "¾Ö´Ï¸ÅÀÌ¼Ç" + ROLE_SYSTEM_EQUATION "¼ö½Ä" + ROLE_SYSTEM_BUTTONDROPDOWN "µå·ì ´Ù¿î ¹öÆ°" + ROLE_SYSTEM_BUTTONMENU "¸Þ´º ¹öÆ°" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "±×¸³ µå·ì ´Ù¿î ´ÜÃß" + ROLE_SYSTEM_WHITESPACE "ºó °ø°£" + ROLE_SYSTEM_PAGETABLIST "ÆäÀÌÁö ÅÇ ¸ñ·Ï" + ROLE_SYSTEM_CLOCK "½Ã°è" + ROLE_SYSTEM_SPLITBUTTON "³ª´©±â ´ÜÃß" + ROLE_SYSTEM_IPADDRESS "IP ÁÖ¼Ò" + ROLE_SYSTEM_OUTLINEBUTTON "¿Ü°û¼± ´ÜÃß" +} Propchange: trunk/reactos/dll/win32/oleacc/oleacc_Ko.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/oleacc/oleacc_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_Nl… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_Nl.rc (added) +++ trunk/reactos/dll/win32/oleacc/oleacc_Nl.rc [iso-8859-1] Sat Dec 27 05:08:40 2008 @@ -1,0 +1,90 @@ +/* + * Dutch resources for oleacc + * + * Copyright 2008 Frans Kool + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "onbekend object" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "titel balk" + ROLE_SYSTEM_MENUBAR "menu balk" + ROLE_SYSTEM_SCROLLBAR "scroll balk" + ROLE_SYSTEM_GRIP "handvat" + ROLE_SYSTEM_SOUND "geluid" + ROLE_SYSTEM_CURSOR "cursor" + ROLE_SYSTEM_CARET "tekst cursor" + ROLE_SYSTEM_ALERT "alarm" + ROLE_SYSTEM_WINDOW "venster" + ROLE_SYSTEM_CLIENT "client" + ROLE_SYSTEM_MENUPOPUP "popup menu" + ROLE_SYSTEM_MENUITEM "menu item" + ROLE_SYSTEM_TOOLTIP "tool tip" + ROLE_SYSTEM_APPLICATION "programma" + ROLE_SYSTEM_DOCUMENT "document" + ROLE_SYSTEM_PANE "sectie" + ROLE_SYSTEM_CHART "diagram" + ROLE_SYSTEM_DIALOG "keuze" + ROLE_SYSTEM_BORDER "randen" + ROLE_SYSTEM_GROUPING "groepering" + ROLE_SYSTEM_SEPARATOR "separator" + ROLE_SYSTEM_TOOLBAR "knoppen balk" + ROLE_SYSTEM_STATUSBAR "status balk" + ROLE_SYSTEM_TABLE "tabel" + ROLE_SYSTEM_COLUMNHEADER "kolom hoofd" + ROLE_SYSTEM_ROWHEADER "rij hoofd" + ROLE_SYSTEM_COLUMN "kolom" + ROLE_SYSTEM_ROW "rij" + ROLE_SYSTEM_CELL "cel" + ROLE_SYSTEM_LINK "link" + ROLE_SYSTEM_HELPBALLOON "help ballon" + ROLE_SYSTEM_CHARACTER "karakter" + ROLE_SYSTEM_LIST "lijst" + ROLE_SYSTEM_LISTITEM "lijst onderdeel" + ROLE_SYSTEM_OUTLINE "outline" + ROLE_SYSTEM_OUTLINEITEM "outline onderdeel" + ROLE_SYSTEM_PAGETAB "pagina tab" + ROLE_SYSTEM_PROPERTYPAGE "eigenschappen pagina" + ROLE_SYSTEM_INDICATOR "indicator" + ROLE_SYSTEM_GRAPHIC "grafisch" + ROLE_SYSTEM_STATICTEXT "vaste tekst" + ROLE_SYSTEM_TEXT "tekst" + ROLE_SYSTEM_PUSHBUTTON "drukknop" + ROLE_SYSTEM_CHECKBUTTON "aankruisvakje" + ROLE_SYSTEM_RADIOBUTTON "radioknop" + ROLE_SYSTEM_COMBOBOX "combo box" + ROLE_SYSTEM_DROPLIST "selectie box" + ROLE_SYSTEM_PROGRESSBAR "voortgangsbalk" + ROLE_SYSTEM_DIAL "draaiknop" + ROLE_SYSTEM_HOTKEYFIELD "hotkey veld" + ROLE_SYSTEM_SLIDER "schuifknop" + ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_DIAGRAM "diagram" + ROLE_SYSTEM_ANIMATION "animation" + ROLE_SYSTEM_EQUATION "formula" + ROLE_SYSTEM_BUTTONDROPDOWN "dropdown knop" + ROLE_SYSTEM_BUTTONMENU "menu knop" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "dropdown grid knop" + ROLE_SYSTEM_WHITESPACE "lege ruimte" + ROLE_SYSTEM_PAGETABLIST "pagina tab lijst" + ROLE_SYSTEM_CLOCK "klok" + ROLE_SYSTEM_SPLITBUTTON "splits knop" + ROLE_SYSTEM_IPADDRESS "IP adres" + ROLE_SYSTEM_OUTLINEBUTTON "outline knop" +} Propchange: trunk/reactos/dll/win32/oleacc/oleacc_Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 38377: get rid of oleacc.h - it is autogenerated from the idl
by cwittich＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: cwittich Date: Sat Dec 27 05:05:08 2008 New Revision: 38377 URL: http://svn.reactos.org/svn/reactos?rev=38377&view=rev Log: get rid of oleacc.h - it is autogenerated from the idl Removed: trunk/reactos/include/psdk/oleacc.h Removed: trunk/reactos/include/psdk/oleacc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oleacc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/oleacc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/oleacc.h (removed) @@ -1,219 +1,0 @@ -#ifndef _OLEACC_H -#define _OLEACC_H - -#ifdef __cplusplus -extern "C" { -#endif - -#define DISPID_ACC_PARENT (-5000) -#define DISPID_ACC_CHILDCOUNT (-5001) -#define DISPID_ACC_CHILD (-5002) - -#define DISPID_ACC_NAME (-5003) -#define DISPID_ACC_VALUE (-5004) -#define DISPID_ACC_DESCRIPTION (-5005) -#define DISPID_ACC_ROLE (-5006) -#define DISPID_ACC_STATE (-5007) -#define DISPID_ACC_HELP (-5008) -#define DISPID_ACC_HELPTOPIC (-5009) -#define DISPID_ACC_KEYBOARDSHORTCUT (-5010) -#define DISPID_ACC_FOCUS (-5011) -#define DISPID_ACC_SELECTION (-5012) -#define DISPID_ACC_DEFAULTACTION (-5013) - -#define DISPID_ACC_SELECT (-5014) -#define DISPID_ACC_LOCATION (-5015) -#define DISPID_ACC_NAVIGATE (-5016) -#define DISPID_ACC_HITTEST (-5017) -#define DISPID_ACC_DODEFAULTACTION (-5018) - -#define NAVDIR_DOWN 2 -#define NAVDIR_FIRSTCHILD 7 -#define NAVDIR_LASTCHILD 8 -#define NAVDIR_LEFT 3 -#define NAVDIR_NEXT 5 -#define NAVDIR_PREVIOUS 6 -#define NAVDIR_RIGHT 4 -#define NAVDIR_UP 1 - -#define ROLE_SYSTEM_ALERT 8 -#define ROLE_SYSTEM_ANIMATION 54 -#define ROLE_SYSTEM_APPLICATION 14 -#define ROLE_SYSTEM_BORDER 19 -#define ROLE_SYSTEM_BUTTONDROPDOWN 56 -#define ROLE_SYSTEM_BUTTONDROPDOWNGRID 58 -#define ROLE_SYSTEM_BUTTONMENU 57 -#define ROLE_SYSTEM_CARET 7 -#define ROLE_SYSTEM_CELL 29 -#define ROLE_SYSTEM_CHARACTER 32 -#define ROLE_SYSTEM_CHART 17 -#define ROLE_SYSTEM_CHECKBUTTON 44 -#define ROLE_SYSTEM_CLIENT 10 -#define ROLE_SYSTEM_CLOCK 61 -#define ROLE_SYSTEM_COLUMN 27 -#define ROLE_SYSTEM_COLUMNHEADER 25 -#define ROLE_SYSTEM_COMBOBOX 46 -#define ROLE_SYSTEM_CURSOR 6 -#define ROLE_SYSTEM_DIAGRAM 53 -#define ROLE_SYSTEM_DIAL 49 -#define ROLE_SYSTEM_DIALOG 18 -#define ROLE_SYSTEM_DOCUMENT 15 -#define ROLE_SYSTEM_DROPLIST 47 -#define ROLE_SYSTEM_EQUATION 55 -#define ROLE_SYSTEM_GRAPHIC 40 -#define ROLE_SYSTEM_GRIP 4 -#define ROLE_SYSTEM_GROUPING 20 -#define ROLE_SYSTEM_HELPBALLOON 31 -#define ROLE_SYSTEM_HOTKEYFIELD 50 -#define ROLE_SYSTEM_INDICATOR 39 -#define ROLE_SYSTEM_LINK 30 -#define ROLE_SYSTEM_LIST 33 -#define ROLE_SYSTEM_LISTITEM 34 -#define ROLE_SYSTEM_MENUBAR 2 -#define ROLE_SYSTEM_MENUITEM 12 -#define ROLE_SYSTEM_MENUPOPUP 11 -#define ROLE_SYSTEM_OUTLINE 35 -#define ROLE_SYSTEM_OUTLINEITEM 36 -#define ROLE_SYSTEM_PAGETAB 37 -#define ROLE_SYSTEM_PAGETABLIST 60 -#define ROLE_SYSTEM_PANE 16 -#define ROLE_SYSTEM_PROGRESSBAR 48 -#define ROLE_SYSTEM_PROPERTYPAGE 38 -#define ROLE_SYSTEM_PUSHBUTTON 43 -#define ROLE_SYSTEM_RADIOBUTTON 45 -#define ROLE_SYSTEM_ROW 28 -#define ROLE_SYSTEM_ROWHEADER 26 -#define ROLE_SYSTEM_SCROLLBAR 3 -#define ROLE_SYSTEM_SEPARATOR 21 -#define ROLE_SYSTEM_SLIDER 51 -#define ROLE_SYSTEM_SOUND 5 -#define ROLE_SYSTEM_SPINBUTTON 52 -#define ROLE_SYSTEM_STATICTEXT 41 -#define ROLE_SYSTEM_STATUSBAR 23 -#define ROLE_SYSTEM_TABLE 24 -#define ROLE_SYSTEM_TEXT 42 -#define ROLE_SYSTEM_TITLEBAR 1 -#define ROLE_SYSTEM_TOOLBAR 22 -#define ROLE_SYSTEM_TOOLTIP 13 -#define ROLE_SYSTEM_WHITESPACE 59 -#define ROLE_SYSTEM_WINDOW 9 - -#ifndef STATE_SYSTEM_UNAVAILABLE -#define STATE_SYSTEM_UNAVAILABLE 0x00000001 -#define STATE_SYSTEM_SELECTED 0x00000002 -#define STATE_SYSTEM_FOCUSED 0x00000004 -#define STATE_SYSTEM_PRESSED 0x00000008 -#define STATE_SYSTEM_CHECKED 0x00000010 -#define STATE_SYSTEM_MIXED 0x00000020 -#define STATE_SYSTEM_INDETERMINATE STATE_SYSTEM_MIXED -#define STATE_SYSTEM_READONLY 0x00000040 -#define STATE_SYSTEM_HOTTRACKED 0x00000080 -#define STATE_SYSTEM_DEFAULT 0x00000100 -#define STATE_SYSTEM_EXPANDED 0x00000200 -#define STATE_SYSTEM_COLLAPSED 0x00000400 -#define STATE_SYSTEM_BUSY 0x00000800 -#define STATE_SYSTEM_FLOATING 0x00001000 -#define STATE_SYSTEM_MARQUEED 0x00002000 -#define STATE_SYSTEM_ANIMATED 0x00004000 -#define STATE_SYSTEM_INVISIBLE 0x00008000 -#define STATE_SYSTEM_OFFSCREEN 0x00010000 -#define STATE_SYSTEM_SIZEABLE 0x00020000 -#define STATE_SYSTEM_MOVEABLE 0x00040000 -#define STATE_SYSTEM_SELFVOICING 0x00080000 -#define STATE_SYSTEM_FOCUSABLE 0x00100000 -#define STATE_SYSTEM_SELECTABLE 0x00200000 -#define STATE_SYSTEM_LINKED 0x00400000 -#define STATE_SYSTEM_TRAVERSED 0x00800000 -#define STATE_SYSTEM_MULTISELECTABLE 0x01000000 -#define STATE_SYSTEM_EXTSELECTABLE 0x02000000 -#define STATE_SYSTEM_ALERT_LOW 0x04000000 -#define STATE_SYSTEM_ALERT_MEDIUM 0x08000000 -#define STATE_SYSTEM_ALERT_HIGH 0x10000000 -#define STATE_SYSTEM_VALID 0x1fffffff -#endif - -typedef enum tagSELFLAG -{ - SELFLAG_NONE = 0, - SELFLAG_TAKEFOCUS = 1, - SELFLAG_TAKESELECTION = 2, - SELFLAG_EXTENDSELECTION = 4, - SELFLAG_ADDSELECTION = 8, - SELFLAG_REMOVESELECTION = 16 -} SELFLAG; - -#define SELFLAG_VALID 0x0000001F - -/* DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b,0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); */ -/* DEFINE_GUID(IID_IAccessible, 0x618736e0, 0x3c3d,0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); */ -EXTERN_C const IID LIBID_Accessibility; -EXTERN_C const IID IID_IAccessible; - -#define INTERFACE IAccessible -DECLARE_INTERFACE_(IAccessible, IDispatch) -{ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE; - STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE; - STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE; - STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; - - STDMETHOD(get_accParent)(THIS_ IDispatch**) PURE; - STDMETHOD(get_accChildCount)(THIS_ long*) PURE; - STDMETHOD(get_accChild)(THIS_ VARIANT, IDispatch **) PURE; - STDMETHOD(get_accName)(THIS_ VARIANT, BSTR*) PURE; - STDMETHOD(get_accValue)(THIS_ VARIANT, BSTR*) PURE; - STDMETHOD(get_accDescription)(THIS_ VARIANT, BSTR*) PURE; - STDMETHOD(get_accRole)(THIS_ VARIANT, VARIANT*) PURE; - STDMETHOD(get_accState)(THIS_ VARIANT, VARIANT*) PURE; - STDMETHOD(get_accHelp)(THIS_ VARIANT, BSTR*) PURE; - STDMETHOD(get_accHelpTopic)(THIS_ BSTR*, VARIANT, long*) PURE; - STDMETHOD(get_accKeyboardShortcut)(THIS_ VARIANT, BSTR*) PURE; - STDMETHOD(get_accFocus)(THIS_ VARIANT*) PURE; - STDMETHOD(get_accSelection)(THIS_ VARIANT*) PURE; - STDMETHOD(get_accDefaultAction)(THIS_ VARIANT, BSTR*) PURE; - - STDMETHOD(accSelect)(THIS_ long, VARIANT) PURE; - STDMETHOD(accLocation)(THIS_ long*, long*, long*, long*, VARIANT) PURE; - STDMETHOD(accNavigate)(THIS_ long, VARIANT, VARIANT*) PURE; - STDMETHOD(accHitTest)(THIS_ long, long, VARIANT*) PURE; - STDMETHOD(accDoDefaultAction)(THIS_ VARIANT) PURE; - - STDMETHOD(put_accName)(THIS_ VARIANT, BSTR) PURE; - STDMETHOD(put_accValue)(THIS_ VARIANT, BSTR) PURE; -}; -#undef INTERFACE -typedef IAccessible* LPACCESSIBLE; - -STDAPI AccessibleChildren(IAccessible*,LONG,LONG,VARIANT*,LONG*); -STDAPI AccessibleObjectFromEvent(HWND,DWORD,DWORD,IAccessible*,VARIANT*); -STDAPI AccessibleObjectFromPoint(POINT,IAccessible**,VARIANT*); -STDAPI AccessibleObjectFromWindow(HWND,DWORD,REFIID,void**); -STDAPI CreateStdAccessibleObject(HWND,LONG,REFIID,void**); -STDAPI CreateStdAccessibleProxyA(HWND,LPCSTR,LONG,REFIID,void**); -STDAPI CreateStdAccessibleProxyW(HWND,LPCWSTR,LONG,REFIID,void**); -void WINAPI GetOleaccVersionInfo(DWORD*,DWORD*); -UINT WINAPI GetRoleTextA(DWORD,LPSTR,UINT); -UINT WINAPI GetRoleTextW(DWORD,LPWSTR,UINT); -UINT WINAPI GetStateTextA(DWORD,LPSTR,UINT); -UINT WINAPI GetStateTextW(DWORD,LPWSTR,UINT); -LRESULT WINAPI LresultFromObject(REFIID,WPARAM,LPUNKNOWN); -STDAPI ObjectFromLresult(LRESULT,REFIID,WPARAM,void**); -STDAPI WindowFromAccessibleObject(IAccessible*,HWND*); - -#ifdef UNICODE -#define CreateStdAccessibleProxy CreateStdAccessibleProxyW -#define GetRoleText GetRoleTextW -#define GetStateText GetStateTextW -#else -#define CreateStdAccessibleProxy CreateStdAccessibleProxyA -#define GetRoleText GetRoleTextA -#define GetStateText GetStateTextA -#endif - -#ifdef __cplusplus -} -#endif -#endif /* _OLEACC_H */

1 0

[cwittich] 38376: sync crypt32 with wine 1.1.11
by cwittich＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: cwittich Date: Sat Dec 27 05:03:19 2008 New Revision: 38376 URL: http://svn.reactos.org/svn/reactos?rev=38376&view=rev Log: sync crypt32 with wine 1.1.11 Added: trunk/reactos/dll/win32/crypt32/crypt32_Pt.rc (with props) Removed: trunk/reactos/dll/win32/crypt32/crypt32_ros.diff Modified: trunk/reactos/dll/win32/crypt32/base64.c trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/context.c trunk/reactos/dll/win32/crypt32/crl.c trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/crypt32/crypt32.spec trunk/reactos/dll/win32/crypt32/crypt32_En.rc trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc trunk/reactos/dll/win32/crypt32/crypt32_Ko.rc trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/cryptres.h trunk/reactos/dll/win32/crypt32/ctl.c trunk/reactos/dll/win32/crypt32/decode.c trunk/reactos/dll/win32/crypt32/encode.c trunk/reactos/dll/win32/crypt32/filestore.c trunk/reactos/dll/win32/crypt32/main.c trunk/reactos/dll/win32/crypt32/message.c trunk/reactos/dll/win32/crypt32/msg.c trunk/reactos/dll/win32/crypt32/object.c trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/crypt32/provstore.c trunk/reactos/dll/win32/crypt32/regstore.c trunk/reactos/dll/win32/crypt32/rootstore.c trunk/reactos/dll/win32/crypt32/sip.c trunk/reactos/dll/win32/crypt32/store.c trunk/reactos/dll/win32/crypt32/str.c trunk/reactos/include/psdk/wincrypt.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/base64.c… Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?… Modified: trunk/reactos/dll/win32/crypt32/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.… Modified: trunk/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?re… Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… Modified: trunk/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… Modified: trunk/reactos/dll/win32/crypt32/crypt32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/crypt32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Added: trunk/reactos/dll/win32/crypt32/crypt32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Removed: trunk/reactos/dll/win32/crypt32/crypt32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… Modified: trunk/reactos/dll/win32/crypt32/cryptres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cryptres… Modified: trunk/reactos/dll/win32/crypt32/ctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/ctl.c?re… Modified: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c… Modified: trunk/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c… Modified: trunk/reactos/dll/win32/crypt32/filestore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/filestor… Modified: trunk/reactos/dll/win32/crypt32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/main.c?r… Modified: trunk/reactos/dll/win32/crypt32/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/message.… Modified: trunk/reactos/dll/win32/crypt32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/msg.c?re… Modified: trunk/reactos/dll/win32/crypt32/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/object.c… Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… Modified: trunk/reactos/dll/win32/crypt32/provstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/provstor… Modified: trunk/reactos/dll/win32/crypt32/regstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/regstore… Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor… Modified: trunk/reactos/dll/win32/crypt32/sip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/sip.c?re… Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?… Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?re… Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re…

1 0

[fireball] 38375: - Implement query case of SystemTimeAdjustmentInformation. - Implement a better stub for setting case of SystemTimeAdjustmentInformation.
by fireball＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: fireball Date: Sat Dec 27 04:58:46 2008 New Revision: 38375 URL: http://svn.reactos.org/svn/reactos?rev=38375&view=rev Log: - Implement query case of SystemTimeAdjustmentInformation. - Implement a better stub for setting case of SystemTimeAdjustmentInformation. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Dec 27 04:58:46 2008 @@ -1368,25 +1368,38 @@ /* Class 28 - Time Adjustment Information */ QSI_DEF(SystemTimeAdjustmentInformation) { - if (sizeof (SYSTEM_SET_TIME_ADJUST_INFORMATION) > Size) - { - * ReqSize = sizeof (SYSTEM_SET_TIME_ADJUST_INFORMATION); - return (STATUS_INFO_LENGTH_MISMATCH); - } - /* FIXME: */ - DPRINT1("NtQuerySystemInformation - SystemTimeAdjustmentInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + PSYSTEM_QUERY_TIME_ADJUST_INFORMATION TimeInfo = + (PSYSTEM_QUERY_TIME_ADJUST_INFORMATION)Buffer; + + /* Check if enough storage was provided */ + if (sizeof(SYSTEM_QUERY_TIME_ADJUST_INFORMATION) > Size) + { + * ReqSize = sizeof(SYSTEM_SET_TIME_ADJUST_INFORMATION); + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Give time values to our caller */ + TimeInfo->TimeIncrement = KeMaximumIncrement; + TimeInfo->TimeAdjustment = KeTimeAdjustment; + TimeInfo->Enable = TRUE; + + return STATUS_SUCCESS; } SSI_DEF(SystemTimeAdjustmentInformation) { - if (sizeof (SYSTEM_SET_TIME_ADJUST_INFORMATION) > Size) - { - return (STATUS_INFO_LENGTH_MISMATCH); - } - /* FIXME: */ - DPRINT1("NtSetSystemInformation - SystemTimeAdjustmentInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /*PSYSTEM_SET_TIME_ADJUST_INFORMATION TimeInfo = + (PSYSTEM_SET_TIME_ADJUST_INFORMATION)Buffer;*/ + + /* Check size of a buffer, it must match our expectations */ + if (sizeof(SYSTEM_SET_TIME_ADJUST_INFORMATION) != Size) + return STATUS_INFO_LENGTH_MISMATCH; + + /* TODO: Check privileges */ + + /* TODO: Set time adjustment information */ + DPRINT1("Setting of SystemTimeAdjustmentInformation is not implemented yet!\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 29 - Summary Memory Information */

1 0

[dchapyshev] 38374: - Fix 11 tests for OpenFile
by dchapyshev＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: dchapyshev Date: Sat Dec 27 04:31:53 2008 New Revision: 38374 URL: http://svn.reactos.org/svn/reactos?rev=38374&view=rev Log: - Fix 11 tests for OpenFile Modified: trunk/reactos/dll/win32/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Sat Dec 27 04:31:53 2008 @@ -236,8 +236,34 @@ if (lpReOpenBuff == NULL) { - return FALSE; + return HFILE_ERROR; } + + lpReOpenBuff->cBytes = sizeof(OFSTRUCT); + lpReOpenBuff->nErrCode = 0; + + if (uStyle & OF_REOPEN) lpFileName = lpReOpenBuff->szPathName; + + if (!lpFileName) + { + return HFILE_ERROR; + } + + if (!GetFullPathNameA(lpFileName, + sizeof(lpReOpenBuff->szPathName), + lpReOpenBuff->szPathName, + NULL)) + { + lpReOpenBuff->nErrCode = GetLastError(); + return HFILE_ERROR; + } + + if (uStyle & OF_PARSE) + { + lpReOpenBuff->fFixedDisk = (GetDriveTypeA(lpReOpenBuff->szPathName) != DRIVE_REMOVABLE); + TRACE("(%s): OF_PARSE, res = '%s'\n", lpFileName, lpReOpenBuff->szPathName); + return 0; + } if ((uStyle & OF_CREATE) == OF_CREATE) { @@ -280,8 +306,20 @@ if (Len == 0 || Len > OFS_MAXPATHNAME) { + lpReOpenBuff->nErrCode = GetLastError(); return (HFILE)INVALID_HANDLE_VALUE; } + + if (uStyle & OF_DELETE) + { + if (!DeleteFileW(PathNameW)) + { + lpReOpenBuff->nErrCode = GetLastError(); + return HFILE_ERROR; + } + TRACE("(%s): OF_DELETE return = OK\n", lpFileName); + return TRUE; + } FileName.Buffer = lpReOpenBuff->szPathName; FileName.Length = 0; @@ -306,14 +344,6 @@ // FILE_SHARE_READ // FILE_NO_INTERMEDIATE_BUFFERING - if ((uStyle & OF_PARSE) == OF_PARSE) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - FileNameString.Buffer); - return (HFILE)NULL; - } - ObjectAttributes.Length = sizeof(OBJECT_ATTRIBUTES); ObjectAttributes.RootDirectory = NULL; ObjectAttributes.ObjectName = &FileNameString; @@ -328,16 +358,20 @@ FILE_SHARE_READ, FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT); - RtlFreeHeap(RtlGetProcessHeap(), - 0, - FileNameString.Buffer); - - lpReOpenBuff->nErrCode = (WORD)RtlNtStatusToDosError(errCode); + RtlFreeHeap(RtlGetProcessHeap(), 0, FileNameString.Buffer); + + lpReOpenBuff->nErrCode = RtlNtStatusToDosError(errCode); if (!NT_SUCCESS(errCode)) { SetLastErrorByStatus (errCode); return (HFILE)INVALID_HANDLE_VALUE; + } + + if (uStyle & OF_EXIST) + { + NtClose(FileHandle); + return TRUE; } return (HFILE)FileHandle;

1 0

[cwittich] 38373: sync rsaenh to wine 1.1.11
by cwittich＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: cwittich Date: Sat Dec 27 04:11:34 2008 New Revision: 38373 URL: http://svn.reactos.org/svn/reactos?rev=38373&view=rev Log: sync rsaenh to wine 1.1.11 Modified: trunk/reactos/dll/win32/rsaenh/md2.c trunk/reactos/dll/win32/rsaenh/mpi.c trunk/reactos/dll/win32/rsaenh/rc2.c trunk/reactos/dll/win32/rsaenh/rsaenh.c trunk/reactos/dll/win32/rsaenh/tomcrypt.h Modified: trunk/reactos/dll/win32/rsaenh/md2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/md2.c?rev… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/md2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/md2.c [iso-8859-1] Sat Dec 27 04:11:34 2008 @@ -77,7 +77,7 @@ md2->X[32+j] = md2->X[j] ^ md2->X[16+j]; } - t = (unsigned char)0; + t = 0; /* do 18 rounds */ for (j = 0; j < 18; j++) { Modified: trunk/reactos/dll/win32/rsaenh/mpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/mpi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] Sat Dec 27 04:11:34 2008 @@ -39,13 +39,26 @@ static const int KARATSUBA_MUL_CUTOFF = 88, /* Min. number of digits before Karatsuba multiplication is used. */ KARATSUBA_SQR_CUTOFF = 128; /* Min. number of digits before Karatsuba squaring is used. */ +static void bn_reverse(unsigned char *s, int len); +static int s_mp_add(mp_int *a, mp_int *b, mp_int *c); +static int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y); +#define s_mp_mul(a, b, c) s_mp_mul_digs(a, b, c, (a)->used + (b)->used + 1) +static int s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); +static int s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); +static int s_mp_sqr(const mp_int *a, mp_int *b); +static int s_mp_sub(const mp_int *a, const mp_int *b, mp_int *c); +static int mp_exptmod_fast(const mp_int *G, const mp_int *X, mp_int *P, mp_int *Y, int mode); +static int mp_invmod_slow (const mp_int * a, mp_int * b, mp_int * c); +static int mp_karatsuba_mul(const mp_int *a, const mp_int *b, mp_int *c); +static int mp_karatsuba_sqr(const mp_int *a, mp_int *b); + /* computes the modular inverse via binary extended euclidean algorithm, * that is c = 1/a mod b * * Based on slow invmod except this is optimized for the case where b is * odd as per HAC Note 14.64 on pp. 610 */ -int +static int fast_mp_invmod (const mp_int * a, mp_int * b, mp_int * c) { mp_int x, y, u, v, B, D; @@ -175,7 +188,7 @@ * * Based on Algorithm 14.32 on pp.601 of HAC. */ -int +static int fast_mp_montgomery_reduce (mp_int * x, const mp_int * n, mp_digit rho) { int ix, res, olduse; @@ -335,7 +348,7 @@ * Based on Algorithm 14.12 on pp.595 of HAC. * */ -int +static int fast_s_mp_mul_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) { int olduse, res, pa, ix, iz; @@ -414,7 +427,7 @@ * * Based on Algorithm 14.12 on pp.595 of HAC. */ -int +static int fast_s_mp_mul_high_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) { int olduse, res, pa, ix, iz; @@ -512,7 +525,7 @@ */ -int fast_s_mp_sqr (const mp_int * a, mp_int * b) +static int fast_s_mp_sqr (const mp_int * a, mp_int * b) { int olduse, res, pa, ix, iz; mp_digit W[MP_WARRAY], *tmpx; @@ -996,7 +1009,7 @@ /* take the last digit and count the bits in it */ q = a->dp[a->used - 1]; - while (q > ((mp_digit) 0)) { + while (q > 0) { ++r; q >>= ((mp_digit) 1); } @@ -3847,7 +3860,7 @@ } /* reverse an array, used for radix code */ -void +static void bn_reverse (unsigned char *s, int len) { int ix, iy; @@ -3865,7 +3878,7 @@ } /* low level addition, based on HAC pp.594, Algorithm 14.7 */ -int +static int s_mp_add (mp_int * a, mp_int * b, mp_int * c) { mp_int *x; @@ -3952,7 +3965,7 @@ return MP_OKAY; } -int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y) +static int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y) { mp_int M[256], res, mu; mp_digit buf; @@ -4163,7 +4176,7 @@ * HAC pp. 595, Algorithm 14.12 Modified so you can control how * many digits of output are created. */ -int +static int s_mp_mul_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) { mp_int t; @@ -4232,7 +4245,7 @@ /* multiplies |a| * |b| and does not compute the lower digs digits * [meant to get the higher part of the product] */ -int +static int s_mp_mul_high_digs (const mp_int * a, const mp_int * b, mp_int * c, int digs) { mp_int t; @@ -4288,7 +4301,7 @@ } /* low level squaring, b = a*a, HAC pp.596-597, Algorithm 14.16 */ -int +static int s_mp_sqr (const mp_int * a, mp_int * b) { mp_int t; @@ -4338,7 +4351,7 @@ u = (mp_digit)(r >> ((mp_word) DIGIT_BIT)); } /* propagate upwards */ - while (u != ((mp_digit) 0)) { + while (u != 0) { r = ((mp_word) *tmpt) + ((mp_word) u); *tmpt++ = (mp_digit) (r & ((mp_word) MP_MASK)); u = (mp_digit)(r >> ((mp_word) DIGIT_BIT)); Modified: trunk/reactos/dll/win32/rsaenh/rc2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rc2.c?rev… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rc2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rc2.c [iso-8859-1] Sat Dec 27 04:11:34 2008 @@ -70,7 +70,7 @@ * key schedule. One which is normal, and anther which has a hook to * use a reduced key length. * BSAFE uses the 'retarded' version. What I previously shipped is - * the same as specifying 1024 for the 'bits' parameter. Bsafe uses + * the same as specifying 1024 for the 'bits' parameter. BSAFE uses * a version where the bits parameter is the same as len*8 */ /* Seems like MS uses the 'retarded' version, too. * Adjust effective keylen bits */ Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] Sat Dec 27 04:11:34 2008 @@ -657,7 +657,7 @@ pbTemp = HeapAlloc(GetProcessHeap(), 0, dwDataLen); if (!pbTemp) return; memcpy(pbTemp, pbData, dwDataLen); - RSAENH_CPEncrypt(pCryptHash->hProv, pCryptHash->hKey, (HCRYPTHASH)NULL, FALSE, 0, + RSAENH_CPEncrypt(pCryptHash->hProv, pCryptHash->hKey, 0, FALSE, 0, pbTemp, &dwDataLen, dwDataLen); HeapFree(GetProcessHeap(), 0, pbTemp); break; @@ -701,7 +701,7 @@ case CALG_MAC: dwDataLen = 0; - RSAENH_CPEncrypt(pCryptHash->hProv, pCryptHash->hKey, (HCRYPTHASH)NULL, TRUE, 0, + RSAENH_CPEncrypt(pCryptHash->hProv, pCryptHash->hKey, 0, TRUE, 0, pCryptHash->abHashValue, &dwDataLen, pCryptHash->dwHashSize); break; @@ -1259,7 +1259,7 @@ 0x86, 0xf7, 0x0d, 0x02, 0x05, 0x05, 0x00, 0x04, 0x10 } }, { CALG_SHA, 15, { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14 } }, - { 0, 0, {} } + { 0, 0, { 0 } } }; DWORD dwIdxOID, i, j; @@ -1677,7 +1677,7 @@ pCryptHash->hKey = hKey; pCryptHash->hProv = hProv; pCryptHash->dwState = RSAENH_HASHSTATE_HASHING; - pCryptHash->pHMACInfo = (PHMAC_INFO)NULL; + pCryptHash->pHMACInfo = NULL; pCryptHash->dwHashSize = peaAlgidInfo->dwDefaultLen >> 3; init_data_blob(&pCryptHash->tpPRFParams.blobLabel); init_data_blob(&pCryptHash->tpPRFParams.blobSeed); @@ -2826,10 +2826,10 @@ { CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)pbData; - /* salt length can't be greater than 128 bits = 16 bytes */ - if (blob->cbData > 16) + /* salt length can't be greater than 184 bits = 24 bytes */ + if (blob->cbData > 24) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(NTE_BAD_DATA); return FALSE; } memcpy(pCryptKey->abKeyValue + pCryptKey->dwKeyLen, blob->pbData, @@ -3557,7 +3557,7 @@ { CRYPTHASH *pCryptHash; CRYPTKEY *pCryptKey; - int i; + DWORD i; TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, hHash, dwParam, pbData, dwFlags); Modified: trunk/reactos/dll/win32/rsaenh/tomcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/tomcrypt.… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/tomcrypt.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/tomcrypt.h [iso-8859-1] Sat Dec 27 04:11:34 2008 @@ -574,27 +574,6 @@ #define mp_todecimal(M, S) mp_toradix((M), (S), 10) #define mp_tohex(M, S) mp_toradix((M), (S), 16) -/* lowlevel functions, do not call! */ -int s_mp_add(mp_int *a, mp_int *b, mp_int *c); -int s_mp_sub(const mp_int *a, const mp_int *b, mp_int *c); -#define s_mp_mul(a, b, c) s_mp_mul_digs(a, b, c, (a)->used + (b)->used + 1) -int fast_s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); -int s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); -int fast_s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); -int s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs); -int fast_s_mp_sqr(const mp_int *a, mp_int *b); -int s_mp_sqr(const mp_int *a, mp_int *b); -int mp_karatsuba_mul(const mp_int *a, const mp_int *b, mp_int *c); -int mp_toom_mul(mp_int *a, mp_int *b, mp_int *c); -int mp_karatsuba_sqr(const mp_int *a, mp_int *b); -int mp_toom_sqr(mp_int *a, mp_int *b); -int fast_mp_invmod(const mp_int *a, mp_int *b, mp_int *c); -int mp_invmod_slow (const mp_int * a, mp_int * b, mp_int * c); -int fast_mp_montgomery_reduce(mp_int *a, const mp_int *m, mp_digit mp); -int mp_exptmod_fast(const mp_int *G, const mp_int *X, mp_int *P, mp_int *Y, int mode); -int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y); -void bn_reverse(unsigned char *s, int len); - extern const char *mp_s_rmap; #define PK_PRIVATE 0 /* PK private keys */

1 0

[cwittich] 38372: sync cabinet to wine 1.1.11
by cwittich＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: cwittich Date: Sat Dec 27 04:00:27 2008 New Revision: 38372 URL: http://svn.reactos.org/svn/reactos?rev=38372&view=rev Log: sync cabinet to wine 1.1.11 Modified: trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] Sat Dec 27 04:00:27 2008 @@ -462,7 +462,7 @@ case 2: ul |= (((ULONG)(*pb++)) << 8); case 1: - ul |= *pb++; + ul |= *pb; default: break; } Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Sat Dec 27 04:00:27 2008 @@ -911,6 +911,7 @@ static int NONEfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) { if (inlen != outlen) return DECR_ILLEGALDATA; + if (outlen > CAB_BLOCKMAX) return DECR_DATAFORMAT; memcpy(CAB(outbuf), CAB(inbuf), (size_t) inlen); return DECR_OK; } @@ -924,7 +925,7 @@ /* Go through linked list, freeing from the allocated (t[-1]) address. */ p = t; - while (p != (struct Ziphuft *)NULL) + while (p != NULL) { q = (--p)->v.t; PFDI_FREE(hfdi, p); @@ -969,7 +970,7 @@ } while (--i); if (ZIP(c)[0] == n) /* null input--all zero length codes */ { - *t = (struct Ziphuft *)NULL; + *t = NULL; *m = 0; return 0; } @@ -1017,8 +1018,8 @@ p = ZIP(v); /* grab values in bit order */ h = -1; /* no tables yet--level -1 */ w = l[-1] = 0; /* no bits decoded yet */ - ZIP(u)[0] = (struct Ziphuft *)NULL; /* just to keep compilers happy */ - q = (struct Ziphuft *)NULL; /* ditto */ + ZIP(u)[0] = NULL; /* just to keep compilers happy */ + q = NULL; /* ditto */ z = 0; /* ditto */ /* go through the bit lengths (k already is bits in shortest code) */ @@ -1060,7 +1061,7 @@ return 3; /* not enough memory */ } *t = q + 1; /* link to list for Ziphuft_free() */ - *(t = &(q->v.t)) = (struct Ziphuft *)NULL; + *(t = &(q->v.t)) = NULL; ZIP(u)[h] = ++q; /* table starts after link */ /* connect to last table, if there is one */ @@ -2258,6 +2259,56 @@ return DECR_OK; } +static void free_decompression_temps(HFDI hfdi, struct fdi_folder *fol, + fdi_decomp_state *decomp_state) +{ + switch (fol->comp_type & cffoldCOMPTYPE_MASK) { + case cffoldCOMPTYPE_LZX: + if (LZX(window)) { + PFDI_FREE(hfdi, LZX(window)); + LZX(window) = NULL; + } + break; + case cffoldCOMPTYPE_QUANTUM: + if (QTM(window)) { + PFDI_FREE(hfdi, QTM(window)); + QTM(window) = NULL; + } + break; + } +} + +static void free_decompression_mem(HFDI hfdi, struct fdi_folder *fol, + fdi_decomp_state *decomp_state, struct fdi_file *file) +{ + while (decomp_state) { + fdi_decomp_state *prev_fds; + + PFDI_CLOSE(hfdi, CAB(cabhf)); + + /* free the storage remembered by mii */ + if (CAB(mii).nextname) PFDI_FREE(hfdi, CAB(mii).nextname); + if (CAB(mii).nextinfo) PFDI_FREE(hfdi, CAB(mii).nextinfo); + if (CAB(mii).prevname) PFDI_FREE(hfdi, CAB(mii).prevname); + if (CAB(mii).previnfo) PFDI_FREE(hfdi, CAB(mii).previnfo); + + while (CAB(firstfol)) { + fol = CAB(firstfol); + CAB(firstfol) = CAB(firstfol)->next; + PFDI_FREE(hfdi, fol); + } + while (CAB(firstfile)) { + file = CAB(firstfile); + if (file->filename) PFDI_FREE(hfdi, (void *)file->filename); + CAB(firstfile) = CAB(firstfile)->next; + PFDI_FREE(hfdi, file); + } + prev_fds = decomp_state; + decomp_state = CAB(next); + PFDI_FREE(hfdi, prev_fds); + } +} + /*********************************************************************** * FDICopy (CABINET.22) * @@ -2442,8 +2493,7 @@ cab_UBYTE buf[64]; struct fdi_folder *fol = NULL, *linkfol = NULL; struct fdi_file *file = NULL, *linkfile = NULL; - fdi_decomp_state _decomp_state; - fdi_decomp_state *decomp_state = &_decomp_state; + fdi_decomp_state *decomp_state; TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, " "pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n", @@ -2454,6 +2504,11 @@ return FALSE; } + if (!(decomp_state = PFDI_ALLOC(hfdi, sizeof(fdi_decomp_state)))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } ZeroMemory(decomp_state, sizeof(fdi_decomp_state)); pathlen = (pszCabPath) ? strlen(pszCabPath) : 0; @@ -2777,7 +2832,7 @@ if (file->offset > CAB(offset)) { /* decode bytes and send them to /dev/null */ - switch ((err = fdi_decomp(file, 0, decomp_state, pszCabPath, pfnfdin, pvUser))) { + switch (fdi_decomp(file, 0, decomp_state, pszCabPath, pfnfdin, pvUser)) { case DECR_OK: break; case DECR_USERABORT: @@ -2839,99 +2894,18 @@ } } - /* free decompression temps */ - switch (fol->comp_type & cffoldCOMPTYPE_MASK) { - case cffoldCOMPTYPE_LZX: - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; - } - break; - case cffoldCOMPTYPE_QUANTUM: - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } - break; - } - - while (decomp_state) { - fdi_decomp_state *prev_fds; - - PFDI_CLOSE(hfdi, CAB(cabhf)); - - /* free the storage remembered by mii */ - if (CAB(mii).nextname) PFDI_FREE(hfdi, CAB(mii).nextname); - if (CAB(mii).nextinfo) PFDI_FREE(hfdi, CAB(mii).nextinfo); - if (CAB(mii).prevname) PFDI_FREE(hfdi, CAB(mii).prevname); - if (CAB(mii).previnfo) PFDI_FREE(hfdi, CAB(mii).previnfo); - - while (CAB(firstfol)) { - fol = CAB(firstfol); - CAB(firstfol) = CAB(firstfol)->next; - PFDI_FREE(hfdi, fol); - } - while (CAB(firstfile)) { - file = CAB(firstfile); - if (file->filename) PFDI_FREE(hfdi, (void *)file->filename); - CAB(firstfile) = CAB(firstfile)->next; - PFDI_FREE(hfdi, file); - } - prev_fds = decomp_state; - decomp_state = CAB(next); - if (prev_fds != &_decomp_state) - PFDI_FREE(hfdi, prev_fds); - } + free_decompression_temps(hfdi, fol, decomp_state); + free_decompression_mem(hfdi, fol, decomp_state, file); return TRUE; bail_and_fail: /* here we free ram before error returns */ - /* free decompression temps */ - switch (fol->comp_type & cffoldCOMPTYPE_MASK) { - case cffoldCOMPTYPE_LZX: - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; - } - break; - case cffoldCOMPTYPE_QUANTUM: - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } - break; - } + free_decompression_temps(hfdi, fol, decomp_state); if (filehf) PFDI_CLOSE(hfdi, filehf); - while (decomp_state) { - fdi_decomp_state *prev_fds; - - PFDI_CLOSE(hfdi, CAB(cabhf)); - - /* free the storage remembered by mii */ - if (CAB(mii).nextname) PFDI_FREE(hfdi, CAB(mii).nextname); - if (CAB(mii).nextinfo) PFDI_FREE(hfdi, CAB(mii).nextinfo); - if (CAB(mii).prevname) PFDI_FREE(hfdi, CAB(mii).prevname); - if (CAB(mii).previnfo) PFDI_FREE(hfdi, CAB(mii).previnfo); - - while (CAB(firstfol)) { - fol = CAB(firstfol); - CAB(firstfol) = CAB(firstfol)->next; - PFDI_FREE(hfdi, fol); - } - while (CAB(firstfile)) { - file = CAB(firstfile); - if (file->filename) PFDI_FREE(hfdi, (void *)file->filename); - CAB(firstfile) = CAB(firstfile)->next; - PFDI_FREE(hfdi, file); - } - prev_fds = decomp_state; - decomp_state = CAB(next); - if (prev_fds != &_decomp_state) - PFDI_FREE(hfdi, prev_fds); - } + free_decompression_mem(hfdi, fol, decomp_state, file); return FALSE; }

1 0

[amunger] 38371: Remove the i8042prt entry from the static hive, it was correctly installed by PnP all all tested cases.
by amunger＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: amunger Date: Sat Dec 27 03:04:15 2008 New Revision: 38371 URL: http://svn.reactos.org/svn/reactos?rev=38371&view=rev Log: Remove the i8042prt entry from the static hive, it was correctly installed by PnP all all tested cases. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Dec 27 03:04:15 2008 @@ -890,14 +890,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 -; i8042 port driver -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Keyboard Port" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ImagePath",0x00020000,"system32\drivers\i8042prt.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001 - ; Kernel-Mode Tests ;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ErrorControl",0x00010001,0x00000000 ;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Group",0x00000000,"Base"

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