Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 38390: fix undo after insert date/time
by cwittich＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: cwittich Date: Sat Dec 27 08:26:03 2008 New Revision: 38390 URL: http://svn.reactos.org/svn/reactos?rev=38390&view=rev Log: fix undo after insert date/time Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sat Dec 27 08:26:03 2008 @@ -676,16 +676,15 @@ { SYSTEMTIME st; TCHAR szDate[MAX_STRING_LEN]; - static const TCHAR space[] = _T(" "); + TCHAR szText[MAX_STRING_LEN * 2 + 2]; GetLocalTime(&st); GetTimeFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, szDate, MAX_STRING_LEN); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); - - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)space); - + _tcscpy(szText, szDate); + _tcscat(szText, _T(" ")); GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, szDate, MAX_STRING_LEN); + _tcscat(szText, szDate); SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); }

1 0

[cwittich] 38389: rename "New..." to "New" and "Open" to "Open..." (for german and english only)
by cwittich＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: cwittich Date: Sat Dec 27 08:18:11 2008 New Revision: 38389 URL: http://svn.reactos.org/svn/reactos?rev=38389&view=rev Log: rename "New..." to "New" and "Open" to "Open..." (for german and english only) Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/en-US.rc Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/de-DE.rc [iso-8859-1] Sat Dec 27 08:18:11 2008 @@ -42,7 +42,7 @@ BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Neu...", CMD_NEW + MENUITEM "&Neu", CMD_NEW MENUITEM "Ö&ffnen...", CMD_OPEN MENUITEM "&Speichern", CMD_SAVE MENUITEM "Speichern &unter...", CMD_SAVE_AS Modified: trunk/reactos/base/applications/notepad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] Sat Dec 27 08:18:11 2008 @@ -42,8 +42,8 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&New...", CMD_NEW - MENUITEM "&Open\tCtrl+O", CMD_OPEN + MENUITEM "&New", CMD_NEW + MENUITEM "&Open...\tCtrl+O", CMD_OPEN MENUITEM "&Save\tCtrl+S", CMD_SAVE MENUITEM "Save &as...", CMD_SAVE_AS MENUITEM SEPARATOR

1 0

[khornicek] 38388: update PSDK - patch by encoded
by khornicek＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: khornicek Date: Sat Dec 27 07:28:36 2008 New Revision: 38388 URL: http://svn.reactos.org/svn/reactos?rev=38388&view=rev Log: update PSDK - patch by encoded Added: trunk/reactos/include/psdk/scarderr.h (with props) Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winscard.h trunk/reactos/include/psdk/winsmcrd.h Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sat Dec 27 07:28:36 2008 @@ -26,7 +26,6 @@ #include <advapi32.h> #include "crypt.h" -#include <winefs.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(crypt); Added: trunk/reactos/include/psdk/scarderr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/scarderr.h?re… ============================================================================== --- trunk/reactos/include/psdk/scarderr.h (added) +++ trunk/reactos/include/psdk/scarderr.h [iso-8859-1] Sat Dec 27 07:28:36 2008 @@ -1,0 +1,96 @@ +/* + * Winscard definitions + * + * 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 + */ + +/* Note that if you included winerror.h directly or indirectly, + * none of these definitions will be used! + */ +#ifndef SCARD_S_SUCCESS + +#define FACILITY_SYSTEM 0 +#define FACILITY_SCARD 16 + +#define STATUS_SEVERITY_INFORMATIONAL ((NTSTATUS) 0x00000001) +#define STATUS_SEVERITY_WARNING ((NTSTATUS) 0x00000002) +#define STATUS_SEVERITY_ERROR ((NTSTATUS) 0x00000003) + +#define SCARD_S_SUCCESS NO_ERROR +#define SCARD_F_INTERNAL_ERROR ((DWORD)0x80100001) +#define SCARD_E_CANCELLED ((DWORD)0x80100002) +#define SCARD_E_INVALID_HANDLE ((DWORD)0x80100003) +#define SCARD_E_INVALID_PARAMETER ((DWORD)0x80100004) +#define SCARD_E_INVALID_TARGET ((DWORD)0x80100005) +#define SCARD_E_NO_MEMORY ((DWORD)0x80100006) +#define SCARD_F_WAITED_TOO_LONG ((DWORD)0x80100007) +#define SCARD_E_INSUFFICIENT_BUFFER ((DWORD)0x80100008) +#define SCARD_E_UNKNOWN_READER ((DWORD)0x80100009) +#define SCARD_E_TIMEOUT ((DWORD)0x8010000A) +#define SCARD_E_SHARING_VIOLATION ((DWORD)0x8010000B) +#define SCARD_E_NO_SMARTCARD ((DWORD)0x8010000C) +#define SCARD_E_UNKNOWN_CARD ((DWORD)0x8010000D) +#define SCARD_E_CANT_DISPOSE ((DWORD)0x8010000E) +#define SCARD_E_PROTO_MISMATCH ((DWORD)0x8010000F) +#define SCARD_E_NOT_READY ((DWORD)0x80100010) +#define SCARD_E_INVALID_VALUE ((DWORD)0x80100011) +#define SCARD_E_SYSTEM_CANCELLED ((DWORD)0x80100012) +#define SCARD_F_COMM_ERROR ((DWORD)0x80100013) +#define SCARD_F_UNKNOWN_ERROR ((DWORD)0x80100014) +#define SCARD_E_INVALID_ATR ((DWORD)0x80100015) +#define SCARD_E_NOT_TRANSACTED ((DWORD)0x80100016) +#define SCARD_E_READER_UNAVAILABLE ((DWORD)0x80100017) +#define SCARD_P_SHUTDOWN ((DWORD)0x80100018) +#define SCARD_E_PCI_TOO_SMALL ((DWORD)0x80100019) +#define SCARD_E_READER_UNSUPPORTED ((DWORD)0x8010001A) +#define SCARD_E_DUPLICATE_READER ((DWORD)0x8010001B) +#define SCARD_E_CARD_UNSUPPORTED ((DWORD)0x8010001C) +#define SCARD_E_NO_SERVICE ((DWORD)0x8010001D) +#define SCARD_E_SERVICE_STOPPED ((DWORD)0x8010001E) +#define SCARD_E_UNEXPECTED ((DWORD)0x8010001F) +#define SCARD_E_ICC_INSTALLATION ((DWORD)0x80100020) +#define SCARD_E_ICC_CREATEORDER ((DWORD)0x80100021) +#define SCARD_E_UNSUPPORTED_FEATURE ((DWORD)0x80100022) +#define SCARD_E_DIR_NOT_FOUND ((DWORD)0x80100023) +#define SCARD_E_FILE_NOT_FOUND ((DWORD)0x80100024) +#define SCARD_E_NO_DIR ((DWORD)0x80100025) +#define SCARD_E_NO_FILE ((DWORD)0x80100026) +#define SCARD_E_NO_ACCESS ((DWORD)0x80100027) +#define SCARD_E_WRITE_TOO_MANY ((DWORD)0x80100028) +#define SCARD_E_BAD_SEEK ((DWORD)0x80100029) +#define SCARD_E_INVALID_CHV ((DWORD)0x8010002A) +#define SCARD_E_UNKNOWN_RES_MNG ((DWORD)0x8010002B) +#define SCARD_E_NO_SUCH_CERTIFICATE ((DWORD)0x8010002C) +#define SCARD_E_CERTIFICATE_UNAVAILABLE ((DWORD)0x8010002D) +#define SCARD_E_NO_READERS_AVAILABLE ((DWORD)0x8010002E) +#define SCARD_E_COMM_DATA_LOST ((DWORD)0x8010002F) +#define SCARD_E_NO_KEY_CONTAINER ((DWORD)0x80100030) +#define SCARD_E_SERVER_TOO_BUSY ((DWORD)0x80100031) +#define SCARD_W_UNSUPPORTED_CARD ((DWORD)0x80100065) +#define SCARD_W_UNRESPONSIVE_CARD ((DWORD)0x80100066) +#define SCARD_W_UNPOWERED_CARD ((DWORD)0x80100067) +#define SCARD_W_RESET_CARD ((DWORD)0x80100068) +#define SCARD_W_REMOVED_CARD ((DWORD)0x80100069) +#define SCARD_W_SECURITY_VIOLATION ((DWORD)0x8010006A) +#define SCARD_W_WRONG_CHV ((DWORD)0x8010006B) +#define SCARD_W_CHV_BLOCKED ((DWORD)0x8010006C) +#define SCARD_W_EOF ((DWORD)0x8010006D) +#define SCARD_W_CANCELLED_BY_USER ((DWORD)0x8010006E) +#define SCARD_W_CARD_NOT_AUTHENTICATED ((DWORD)0x8010006F) +#define SCARD_W_CACHE_ITEM_NOT_FOUND ((DWORD)0x80100070) +#define SCARD_W_CACHE_ITEM_STALE ((DWORD)0x80100071) +#define SCARD_W_CACHE_ITEM_TOO_BIG ((DWORD)0x80100072) + +#endif /* SCARD_S_SUCCESS */ Propchange: trunk/reactos/include/psdk/scarderr.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Sat Dec 27 07:28:36 2008 @@ -75,6 +75,11 @@ #include <rpc.h> #include <shellapi.h> #include <winperf.h> +#ifndef NOCRYPT +#include <wincrypt.h> +#include <winefs.h> +#include <winscard.h> +#endif #ifndef NOGDI #include <commdlg.h> #include <winspool.h> Modified: trunk/reactos/include/psdk/winscard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winscard.h?re… ============================================================================== --- trunk/reactos/include/psdk/winscard.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winscard.h [iso-8859-1] Sat Dec 27 07:28:36 2008 @@ -1,253 +1,150 @@ /* - * WinSCard.h + * Winscard definitions * - * SmartCard API + * 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 SOFTWARE IS NOT COPYRIGHTED + * 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. * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * 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 */ -#ifndef __WINSCARD_H -#define __WINSCARD_H +#ifndef __WINE_WINSCARD_H +#define __WINE_WINSCARD_H -#include <WinSmCrd.h> +#include <wtypes.h> +#include <winioctl.h> +#include <winsmcrd.h> +#include <scarderr.h> + +#ifndef _LPCBYTE_DEFINED +#define _LPCBYTE_DEFINED +typedef const BYTE *LPCBYTE; +#endif + +typedef ULONG_PTR SCARDCONTEXT, *PSCARDCONTEXT, *LPSCARDCONTEXT; +typedef ULONG_PTR SCARDHANDLE, *PSCARDHANDLE, *LPSCARDHANDLE; + +typedef struct _SCARD_ATRMASK +{ + DWORD cbAtr; + BYTE rgbAtr[36]; + BYTE rgbMask[36]; +} SCARD_ATRMASK, *PSCARD_ATRMASK, *LPSCARD_ATRMASK; + +typedef struct +{ + LPCSTR szReader; + LPVOID pvUserData; + DWORD dwCurrentState; + DWORD dwEventState; + DWORD cbAtr; + BYTE rgbAtr[36]; +} SCARD_READERSTATEA, *PSCARD_READERSTATEA, *LPSCARD_READERSTATEA; +typedef struct +{ + LPCWSTR szReader; + LPVOID pvUserData; + DWORD dwCurrentState; + DWORD dwEventState; + DWORD cbAtr; + BYTE rgbAtr[36]; +} SCARD_READERSTATEW, *PSCARD_READERSTATEW, *LPSCARD_READERSTATEW; +DECL_WINELIB_TYPE_AW(SCARD_READERSTATE) +DECL_WINELIB_TYPE_AW(PSCARD_READERSTATE) +DECL_WINELIB_TYPE_AW(LPSCARD_READERSTATE) + #ifdef __cplusplus extern "C" { #endif -#define SCARD_S_SUCCESS NO_ERROR - -#define SCARD_F_INTERNAL_ERROR ((DWORD)0x80100001) -#define SCARD_E_CANCELLED ((DWORD)0x80100002) -#define SCARD_E_INVALID_HANDLE ((DWORD)0x80100003) -#define SCARD_E_INVALID_PARAMETER ((DWORD)0x80100004) -#define SCARD_E_INVALID_TARGET ((DWORD)0x80100005) -#define SCARD_E_NO_MEMORY ((DWORD)0x80100006) -#define SCARD_F_WAITED_TOO_LONG ((DWORD)0x80100007) -#define SCARD_E_INSUFFICIENT_BUFFER ((DWORD)0x80100008) -#define SCARD_E_UNKNOWN_READER ((DWORD)0x80100009) -#define SCARD_E_TIMEOUT ((DWORD)0x8010000A) -#define SCARD_E_SHARING_VIOLATION ((DWORD)0x8010000B) -#define SCARD_E_NO_SMARTCARD ((DWORD)0x8010000C) -#define SCARD_E_UNKNOWN_CARD ((DWORD)0x8010000D) -#define SCARD_E_CANT_DISPOSE ((DWORD)0x8010000E) -#define SCARD_E_PROTO_MISMATCH ((DWORD)0x8010000F) -#define SCARD_E_NOT_READY ((DWORD)0x80100010) -#define SCARD_E_INVALID_VALUE ((DWORD)0x80100011) -#define SCARD_E_SYSTEM_CANCELLED ((DWORD)0x80100012) -#define SCARD_F_COMM_ERROR ((DWORD)0x80100013) -#define SCARD_F_UNKNOWN_ERROR ((DWORD)0x80100014) -#define SCARD_E_INVALID_ATR ((DWORD)0x80100015) -#define SCARD_E_NOT_TRANSACTED ((DWORD)0x80100016) -#define SCARD_E_READER_UNAVAILABLE ((DWORD)0x80100017) -#define SCARD_P_SHUTDOWN ((DWORD)0x80100018) -#define SCARD_E_PCI_TOO_SMALL ((DWORD)0x80100019) -#define SCARD_E_READER_UNSUPPORTED ((DWORD)0x8010001A) -#define SCARD_E_DUPLICATE_READER ((DWORD)0x8010001B) -#define SCARD_E_CARD_UNSUPPORTED ((DWORD)0x8010001C) -#define SCARD_E_NO_SERVICE ((DWORD)0x8010001D) -#define SCARD_E_SERVICE_STOPPED ((DWORD)0x8010001E) -#define SCARD_E_UNEXPECTED ((DWORD)0x8010001F) -#define SCARD_E_ICC_INSTALLATION ((DWORD)0x80100020) -#define SCARD_E_ICC_CREATEORDER ((DWORD)0x80100021) -#define SCARD_E_UNSUPPORTED_FEATURE ((DWORD)0x80100022) -#define SCARD_E_DIR_NOT_FOUND ((DWORD)0x80100023) -#define SCARD_E_FILE_NOT_FOUND ((DWORD)0x80100024) -#define SCARD_E_NO_DIR ((DWORD)0x80100025) -#define SCARD_E_NO_FILE ((DWORD)0x80100026) -#define SCARD_E_NO_ACCESS ((DWORD)0x80100027) -#define SCARD_E_WRITE_TOO_MANY ((DWORD)0x80100028) -#define SCARD_E_BAD_SEEK ((DWORD)0x80100029) -#define SCARD_E_INVALID_CHV ((DWORD)0x8010002A) -#define SCARD_E_UNKNOWN_RES_MNG ((DWORD)0x8010002B) -#define SCARD_E_NO_SUCH_CERTIFICATE ((DWORD)0x8010002C) -#define SCARD_E_CERTIFICATE_UNAVAILABLE ((DWORD)0x8010002D) -#define SCARD_E_NO_READERS_AVAILABLE ((DWORD)0x8010002E) -#define SCARD_E_COMM_DATA_LOST ((DWORD)0x8010002F) -#define SCARD_E_NO_KEY_CONTAINER ((DWORD)0x80100030) -#define SCARD_W_UNSUPPORTED_CARD ((DWORD)0x80100065) -#define SCARD_W_UNRESPONSIVE_CARD ((DWORD)0x80100066) -#define SCARD_W_UNPOWERED_CARD ((DWORD)0x80100067) -#define SCARD_W_RESET_CARD ((DWORD)0x80100068) -#define SCARD_W_REMOVED_CARD ((DWORD)0x80100069) -#define SCARD_W_SECURITY_VIOLATION ((DWORD)0x8010006A) -#define SCARD_W_WRONG_CHV ((DWORD)0x8010006B) -#define SCARD_W_CHV_BLOCKED ((DWORD)0x8010006C) -#define SCARD_W_EOF ((DWORD)0x8010006D) -#define SCARD_W_CANCELLED_BY_USER ((DWORD)0x8010006E) -#define SCARD_W_CARD_NOT_AUTHENTICATED ((DWORD)0x8010006F) - -#define SCARD_SHARE_EXCLUSIVE (0x1) -#define SCARD_SHARE_SHARED (0x2) -#define SCARD_SHARE_DIRECT (0x3) - -#define SCARD_LEAVE_CARD (0x0) -#define SCARD_RESET_CARD (0x1) -#define SCARD_UNPOWER_CARD (0x2) -#define SCARD_EJECT_CARD (0x3) - -#define SCARD_AUTOALLOCATE ((DWORD)-1) -#define SCARD_SCOPE_USER (0x0) -#define SCARD_SCOPE_TERMINAL (0x1) -#define SCARD_SCOPE_SYSTEM (0x2) - -#define SCARD_PROVIDER_PRIMARY (0x1) -#define SCARD_PROVIDER_CSP (0x2) - -typedef ULONG_PTR SCARDCONTEXT, *PSCARDCONTEXT, *LPSCARDCONTEXT; -typedef ULONG_PTR SCARDHANDLE, *PSCARDHANDLE, *LPSCARDHANDLE; -typedef const BYTE *LPCBYTE; - -typedef struct _SCARD_READERSTATEA -{ - LPCSTR szReader; - LPVOID pvUserData; - DWORD dwCurrentState; - DWORD dwEventState; - DWORD cbAtr; - BYTE rgbAtr[36]; -} SCARD_READERSTATEA, *PSCARD_READERSTATEA, *LPSCARD_READERSTATEA; - -typedef struct _SCARD_READERSTATEW -{ - LPCWSTR szReader; - LPVOID pvUserData; - DWORD dwCurrentState; - DWORD dwEventState; - DWORD cbAtr; - BYTE rgbAtr[36]; -} SCARD_READERSTATEW, *PSCARD_READERSTATEW, *LPSCARD_READERSTATEW; - -typedef struct _SCARD_ATRMASK -{ - DWORD cbAtr; - BYTE rgbAtr[36]; - BYTE rgbMask[36]; -} SCARD_ATRMASK, *PSCARD_ATRMASK, *LPSCARD_ATRMASK; - -HANDLE WINAPI SCardAccessStartedEvent(VOID); -LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT, LPCSTR, LPCSTR); -LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR); -LONG WINAPI SCardBeginTransaction(SCARDHANDLE); -LONG WINAPI SCardCancel(SCARDCONTEXT); -LONG WINAPI SCardConnectA(SCARDCONTEXT, LPCSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD); -LONG WINAPI SCardConnectW(SCARDCONTEXT, LPCWSTR, DWORD, DWORD, LPSCARDHANDLE, LPDWORD); -LONG WINAPI SCardControl(SCARDHANDLE, DWORD, LPCVOID, DWORD, LPVOID, DWORD, LPDWORD); -LONG WINAPI SCardDisconnect(SCARDHANDLE, DWORD); -LONG WINAPI SCardEndTransaction(SCARDHANDLE, DWORD); -LONG WINAPI SCardEstablishContext(DWORD, LPCVOID, LPCVOID, LPSCARDCONTEXT); -LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT, LPCSTR); -LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT, LPCWSTR); -LONG WINAPI SCardForgetReaderA(SCARDCONTEXT, LPCSTR); -LONG WINAPI SCardForgetReaderW(SCARDCONTEXT, LPCWSTR); -LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT, LPCSTR); -LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT, LPCWSTR); -LONG WINAPI SCardFreeMemory(SCARDCONTEXT, LPCVOID); -LONG WINAPI SCardGetAttrib(SCARDHANDLE, DWORD, LPBYTE, LPDWORD); -LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPSTR, LPDWORD); -LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPWSTR, LPDWORD); -LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT, LPCSTR, LPGUID); -LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT, LPCWSTR, LPGUID); -LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEA, DWORD); -LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT, DWORD, LPSCARD_READERSTATEW, DWORD); -LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT, LPCSTR, LPCGUID, LPCGUID, DWORD, LPCBYTE, LPCBYTE, DWORD); -LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT, LPCWSTR, LPCGUID, LPCGUID, DWORD, LPCBYTE, LPCBYTE, DWORD); -LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT, LPCSTR, LPCSTR); -LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT, LPCWSTR, LPCWSTR); -LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT, LPCSTR); -LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT, LPCWSTR); -LONG WINAPI SCardIsValidContext(SCARDCONTEXT); -LONG WINAPI SCardListCardsA(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCSTR, LPDWORD); -LONG WINAPI SCardListCardsW(SCARDCONTEXT, LPCBYTE, LPCGUID, DWORD, LPCWSTR, LPDWORD); -LONG WINAPI SCardListInterfacesA(SCARDCONTEXT, LPCSTR, LPGUID, LPDWORD); -LONG WINAPI SCardListInterfacesW(SCARDCONTEXT, LPCWSTR, LPGUID, LPDWORD); -LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT, LPSTR, LPDWORD); -LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT, LPWSTR, LPDWORD); -LONG WINAPI SCardListReadersA(SCARDCONTEXT, LPCSTR, LPSTR, LPDWORD); -LONG WINAPI SCardListReadersW(SCARDCONTEXT, LPCWSTR, LPWSTR, LPDWORD); -LONG WINAPI SCardLocateCardsA(SCARDCONTEXT, LPCSTR, LPSCARD_READERSTATEA, DWORD); -LONG WINAPI SCardLocateCardsW(SCARDCONTEXT, LPCWSTR, LPSCARD_READERSTATEW, DWORD); -LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD, LPSCARD_READERSTATEA, DWORD); -LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT, LPSCARD_ATRMASK, DWORD, LPSCARD_READERSTATEW, DWORD); -LONG WINAPI SCardReconnect(SCARDHANDLE, DWORD, DWORD, DWORD, LPDWORD); -LONG WINAPI SCardReleaseContext(SCARDCONTEXT); -VOID WINAPI SCardReleaseStartedEvent(HANDLE); -LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT, LPCSTR, LPCSTR); -LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT, LPCWSTR, LPCWSTR); -LONG WINAPI SCardSetAttrib(SCARDHANDLE, DWORD, LPCBYTE, DWORD); -LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT, LPCSTR, DWORD, LPCSTR); -LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT, LPCWSTR, DWORD, LPCWSTR); -LONG WINAPI SCardState(SCARDHANDLE, LPDWORD, LPDWORD, LPBYTE, LPDWORD); -LONG WINAPI SCardStatusA(SCARDHANDLE, LPSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE, LPDWORD); -LONG WINAPI SCardStatusW(SCARDHANDLE, LPWSTR, LPDWORD, LPDWORD, LPDWORD, LPBYTE, LPDWORD); -LONG WINAPI SCardTransmit(SCARDHANDLE, LPCSCARD_IO_REQUEST, LPCBYTE, DWORD, LPSCARD_IO_REQUEST, LPBYTE, LPDWORD); - -#ifndef _DISABLE_TIDENTS - -#ifdef UNICODE -typedef struct SCARD_READERSTATEW SCARD_READERSTATE, *PSCARD_READERSTATE, *LPSCARD_READERSTATE; -#define SCardAddReaderToGroup SCardAddReaderToGroupW -#define SCardConnect SCardConnectW -#define SCardForgetCardType SCardForgetCardTypeW -#define SCardForgetReader SCardForgetReaderW -#define SCardForgetReaderGroup SCardForgetReaderGroupW -#define SCardGetCardTypeProviderName SCardGetCardTypeProviderNameW -#define SCardGetProviderId SCardGetProviderIdW -#define SCardGetStatusChange SCardGetStatusChangeW -#define SCardIntroduceCardType SCardIntroduceCardTypeW -#define SCardIntroduceReader SCardIntroduceReaderW -#define SCardIntroduceReaderGroup SCardIntroduceReaderGroupW -#define SCardListCards SCardListCardsW -#define SCardListInterfaces SCardListInterfacesW -#define SCardListReaderGroups SCardListReaderGroupsW -#define SCardListReaders SCardListReadersW -#define SCardLocateCards SCardLocateCardsW -#define SCardLocateCardsByATR SCardLocateCardsByATRW -#define SCardRemoveReaderFromGroup SCardRemoveReaderFromGroupW -#define SCardSetCardTypeProviderName SCardSetCardTypeProviderNameW -#define SCardStatus SCardStatusW -#else /* !UNICODE */ -typedef struct SCARD_READERSTATEA SCARD_READERSTATE, *PSCARD_READERSTATE, *LPSCARD_READERSTATE; -#define SCardAddReaderToGroup SCardAddReaderToGroupA -#define SCardConnect SCardConnectA -#define SCardForgetCardType SCardForgetCardTypeA -#define SCardForgetReader SCardForgetReaderA -#define SCardForgetReaderGroup SCardForgetReaderGroupA -#define SCardGetCardTypeProviderName SCardGetCardTypeProviderNameA -#define SCardGetProviderId SCardGetProviderIdA -#define SCardGetStatusChange SCardGetStatusChangeA -#define SCardIntroduceCardType SCardIntroduceCardTypeA -#define SCardIntroduceReader SCardIntroduceReaderA -#define SCardIntroduceReaderGroup SCardIntroduceReaderGroupA -#define SCardListCards SCardListCardsA -#define SCardListInterfaces SCardListInterfacesA -#define SCardListReaderGroups SCardListReaderGroupsA -#define SCardListReaders SCardListReadersA -#define SCardLocateCards SCardLocateCardsA -#define SCardLocateCardsByATR SCardLocateCardsByATRA -#define SCardRemoveReaderFromGroup SCardRemoveReaderFromGroupA -#define SCardSetCardTypeProviderName SCardSetCardTypeProviderNameA -#define SCardStatus SCardStatusA -#endif /* UNICODE */ - -#endif /* _DISABLE_TIDENTS */ - -extern const SCARD_IO_REQUEST g_rgSCardT0Pci; -extern const SCARD_IO_REQUEST g_rgSCardT1Pci; -extern const SCARD_IO_REQUEST g_rgSCardRawPci; +HANDLE WINAPI SCardAccessStartedEvent(void); +LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); +LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardAddReaderToGroup WINELIB_NAME_AW(SCardAddReaderToGroup) +LONG WINAPI SCardBeginTransaction(SCARDHANDLE); +LONG WINAPI SCardCancel(SCARDCONTEXT); +LONG WINAPI SCardConnectA(SCARDCONTEXT,LPCSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); +LONG WINAPI SCardConnectW(SCARDCONTEXT,LPCWSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); +#define SCardConnect WINELIB_NAME_AW(SCardConnect) +LONG WINAPI SCardControl(SCARDHANDLE,DWORD,LPCVOID,DWORD,LPVOID,DWORD,LPDWORD); +LONG WINAPI SCardDisconnect(SCARDHANDLE,DWORD); +LONG WINAPI SCardEndTransaction(SCARDHANDLE,DWORD); +LONG WINAPI SCardEstablishContext(DWORD,LPCVOID,LPCVOID,LPSCARDCONTEXT); +LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetCardType WINELIB_NAME_AW(SCardForgetCardType) +LONG WINAPI SCardForgetReaderA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardForgetReaderW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetReader WINELIB_NAME_AW(SCardForgetReader) +LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetReaderGroup WINELIB_NAME_AW(SCardForgetReaderGroup) +LONG WINAPI SCardFreeMemory(SCARDCONTEXT,LPCVOID); +LONG WINAPI SCardGetAttrib(SCARDHANDLE,DWORD,LPBYTE,LPDWORD); +LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPSTR,LPDWORD); +LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPWSTR,LPDWORD); +#define SCardGetCardTypeProviderName WINELIB_NAME_AW(SCardGetCardTypeProviderName) +LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT,LPCSTR,LPGUID); +LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT,LPCWSTR,LPGUID); +#define SCardGetProviderId WINELIB_NAME_AW(SCardGetProviderId) +LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEA,DWORD); +LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEW,DWORD); +#define SCardGetStatusChange WINELIB_NAME_AW(SCardGetStatusChange) +LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT,LPCSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); +LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT,LPCWSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); +#define SCardIntroduceCardType WINELIB_NAME_AW(SCardIntroduceCardType) +LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT,LPCSTR,LPCSTR); +LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardIntroduceReader WINELIB_NAME_AW(SCardIntroduceReader) +LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT,LPCWSTR); +#define SCardIntroduceReaderGroup WINELIB_NAME_AW(SCardIntroduceReaderGroup) +LONG WINAPI SCardIsValidContext(SCARDCONTEXT); +LONG WINAPI SCardListCardsA(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPSTR,LPDWORD); +LONG WINAPI SCardListCardsW(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPWSTR,LPDWORD); +#define SCardListCards WINELIB_NAME_AW(SCardListCards) +LONG WINAPI SCardListInterfacesA(SCARDCONTEXT,LPCSTR,LPGUID,LPDWORD); +LONG WINAPI SCardListInterfacesW(SCARDCONTEXT,LPCWSTR,LPGUID,LPDWORD); +#define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces) +LONG WINAPI SCardListReadersA(SCARDCONTEXT,LPCSTR,LPSTR,LPDWORD); +LONG WINAPI SCardListReadersW(SCARDCONTEXT,LPCWSTR,LPWSTR,LPDWORD); +#define SCardListReaders WINELIB_NAME_AW(SCardListReaders) +LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT,LPSTR,LPDWORD); +LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT,LPWSTR,LPDWORD); +#define SCardListReaderGroups WINELIB_NAME_AW(SCardListReaderGroups) +LONG WINAPI SCardLocateCardsA(SCARDCONTEXT,LPCSTR,LPSCARD_READERSTATEA,DWORD); +LONG WINAPI SCardLocateCardsW(SCARDCONTEXT,LPCWSTR,LPSCARD_READERSTATEW,DWORD); +#define SCardLocateCards WINELIB_NAME_AW(SCardLocateCards) +LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEA,DWORD); +LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEW,DWORD); +#define SCardLocateCardsByATR WINELIB_NAME_AW(SCardLocateCardsByATR) +LONG WINAPI SCardReconnect(SCARDHANDLE,DWORD,DWORD,DWORD,LPDWORD); +LONG WINAPI SCardReleaseContext(SCARDCONTEXT); +void WINAPI SCardReleaseStartedEvent(HANDLE); +LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); +LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardRemoveReaderFromGroup WINELIB_NAME_AW(SCardRemoveReaderFromGroup) +LONG WINAPI SCardSetAttrib(SCARDHANDLE,DWORD,LPCBYTE,DWORD); +LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPCSTR); +LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPCWSTR); +#define SCardSetCardTypeProviderName WINELIB_NAME_AW(SCardSetCardTypeProviderName) +LONG WINAPI SCardState(SCARDHANDLE,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +LONG WINAPI SCardStatusA(SCARDHANDLE,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +LONG WINAPI SCardStatusW(SCARDHANDLE,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +#define SCardStatus WINELIB_NAME_AW(SCardStatus) +LONG WINAPI SCardTransmit(SCARDHANDLE,LPCSCARD_IO_REQUEST,LPCBYTE,DWORD,LPSCARD_IO_REQUEST,LPBYTE,LPDWORD); #ifdef __cplusplus } #endif -#endif /* __WINSCARD_H */ -/* EOF */ +#endif /* __WINE_WINSCARD_H */ Modified: trunk/reactos/include/psdk/winsmcrd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsmcrd.h?re… ============================================================================== --- trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] Sat Dec 27 07:28:36 2008 @@ -35,7 +35,7 @@ BYTE bIns; BYTE P1; BYTE P2; - BYTE P3 + BYTE P3; } SCARD_T0_COMMAND, *PSCARD_T0_COMMAND, *LPSCARD_T0_COMMAND; typedef struct _SCARD_T0_REQUEST @@ -55,7 +55,7 @@ SCARD_IO_REQUEST ioRequest; } SCARD_T1_REQUEST, *PSCARD_T1_REQUEST, *LPSCARD_T1_REQUEST; -#define FILE_DEVICE_SMARTCARD (0x00000031) +#define FILE_DEVICE_SMARTCARD 49 #define SCARD_ATR_LENGTH (0x21)

1 0

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

27 Dec '08

Author: cwittich Date: Sat Dec 27 07:09:48 2008 New Revision: 38387 URL: http://svn.reactos.org/svn/reactos?rev=38387&view=rev Log: sync hlink with wine 1.1.11 Modified: trunk/reactos/dll/win32/hlink/link.c Modified: trunk/reactos/dll/win32/hlink/link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev… ============================================================================== --- trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] Sat Dec 27 07:09:48 2008 @@ -441,14 +441,14 @@ static HRESULT WINAPI IHlink_fnSetAdditonalParams(IHlink* iface, LPCWSTR pwzAdditionalParams) { - FIXME("\n"); + TRACE("Not implemented in native IHlink\n"); return E_NOTIMPL; } static HRESULT WINAPI IHlink_fnGetAdditionalParams(IHlink* iface, LPWSTR* ppwzAdditionalParams) { - FIXME("\n"); + TRACE("Not implemented in native IHlink\n"); return E_NOTIMPL; }

1 0

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

27 Dec '08

Author: cwittich Date: Sat Dec 27 07:08:23 2008 New Revision: 38386 URL: http://svn.reactos.org/svn/reactos?rev=38386&view=rev Log: sync fusion with wine 1.1.11 Modified: trunk/reactos/dll/win32/fusion/assembly.c Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Sat Dec 27 07:08:23 2008 @@ -502,7 +502,7 @@ ULONG currofs; currofs = offset; - assembly->tableshdr = (METADATATABLESHDR *)assembly_data_offset(assembly, currofs); + assembly->tableshdr = assembly_data_offset(assembly, currofs); if (!assembly->tableshdr) return E_FAIL; @@ -514,7 +514,7 @@ sizeof(DWORD) : sizeof(WORD); currofs += sizeof(METADATATABLESHDR); - assembly->numrows = (DWORD *)assembly_data_offset(assembly, currofs); + assembly->numrows = assembly_data_offset(assembly, currofs); if (!assembly->numrows) return E_FAIL; @@ -628,9 +628,9 @@ return hr; } else if (!lstrcmpA(stream, "#Strings") || !lstrcmpA(stream, "Strings")) - assembly->strings = (BYTE *)assembly_data_offset(assembly, ofs); + assembly->strings = assembly_data_offset(assembly, ofs); else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) - assembly->blobs = (BYTE *)assembly_data_offset(assembly, ofs); + assembly->blobs = assembly_data_offset(assembly, ofs); ptr += lstrlenA(stream) + 1; ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */ @@ -883,7 +883,7 @@ if (offset == -1) return E_FAIL; - asmtbl = (ASSEMBLYTABLE *)assembly_data_offset(assembly, offset); + asmtbl = assembly_data_offset(assembly, offset); if (!asmtbl) return E_FAIL;

1 0

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

27 Dec '08

Author: cwittich Date: Sat Dec 27 07:06:42 2008 New Revision: 38385 URL: http://svn.reactos.org/svn/reactos?rev=38385&view=rev Log: sync atl with wine 1.1.11 Modified: trunk/reactos/dll/win32/atl/atl_ax.c trunk/reactos/dll/win32/atl/registrar.c Modified: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ax.c [iso-8859-1] Sat Dec 27 07:06:42 2008 @@ -117,7 +117,7 @@ */ -static ULONG WINAPI IOCS_AddRef(IOCS *This) +static ULONG IOCS_AddRef(IOCS *This) { ULONG ref = InterlockedIncrement(&This->ref); @@ -132,7 +132,7 @@ #define THIS2IOLEINPLACEFRAME(This) ((IOleInPlaceFrame*)&This->lpOleInPlaceFrameVtbl) #define THIS2IOLECONTROLSITE(This) ((IOleControlSite*)&This->lpOleControlSiteVtbl) -static HRESULT WINAPI IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) +static HRESULT IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -166,7 +166,7 @@ } static HRESULT IOCS_Detach( IOCS *This ); -static ULONG WINAPI IOCS_Release(IOCS *This) +static ULONG IOCS_Release(IOCS *This) { ULONG ref = InterlockedDecrement(&This->ref); @@ -752,7 +752,7 @@ if ( This->hWnd ) { SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc ); - SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, (LONG_PTR) NULL ); + SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, 0 ); This->hWnd = NULL; } if ( This->control ) @@ -1244,7 +1244,7 @@ hgl = LoadResource (hInst, hrsrc); if ( !hgl ) return NULL; - ptr = (LPCDLGTEMPLATEW)LockResource ( hgl ); + ptr = LockResource ( hgl ); if (!ptr) { FreeResource( hgl ); Modified: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… ============================================================================== --- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] Sat Dec 27 07:06:42 2008 @@ -242,7 +242,7 @@ strbuf_write(buf->str, &name, -1); }else if(key_type == DO_DELETE) { TRACE("Deleting %s\n", debugstr_w(buf->str)); - lres = RegDeleteTreeW(parent_key, buf->str); + RegDeleteTreeW(parent_key, buf->str); }else { if(key_type == FORCE_REMOVE) RegDeleteTreeW(parent_key, buf->str); @@ -439,7 +439,7 @@ if(hins) { src = FindResourceW(hins, szID, szType); if(src) { - regstra = (LPSTR)LoadResource(hins, src); + regstra = LoadResource(hins, src); reslen = SizeofResource(hins, src); if(regstra) { len = MultiByteToWideChar(CP_ACP, 0, regstra, reslen, NULL, 0)+1;

1 0

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

27 Dec '08

Author: cwittich Date: Sat Dec 27 07:04:52 2008 New Revision: 38384 URL: http://svn.reactos.org/svn/reactos?rev=38384&view=rev Log: sync advpack with wine 1.1.11 Modified: trunk/reactos/dll/win32/advpack/files.c trunk/reactos/dll/win32/advpack/install.c trunk/reactos/dll/win32/advpack/reg.c Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Sat Dec 27 07:04:52 2008 @@ -627,7 +627,7 @@ struct FILELIST *pNode; session->Operation |= EXTRACT_FILLFILELIST; - if (pExtract(session, szCabName)) + if (pExtract(session, szCabName) != S_OK) { session->Operation &= ~EXTRACT_FILLFILELIST; return -1; Modified: trunk/reactos/dll/win32/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.… ============================================================================== --- trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] Sat Dec 27 07:04:52 2008 @@ -91,7 +91,7 @@ MAX_INF_STRING_LENGTH, &size)) continue; - if (DelNodeW(directory, ADN_DEL_IF_EMPTY)) + if (DelNodeW(directory, ADN_DEL_IF_EMPTY) != S_OK) hr = E_FAIL; } @@ -161,7 +161,7 @@ hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (hm) { - if (do_ocx_reg(hm, TRUE)) + if (do_ocx_reg(hm, TRUE) != S_OK) hr = E_FAIL; FreeLibrary(hm); @@ -196,7 +196,7 @@ MAX_INF_STRING_LENGTH, &size)) continue; - if (launch_exe(buffer, info->working_dir, NULL)) + if (launch_exe(buffer, info->working_dir, NULL) != S_OK) hr = E_FAIL; } Modified: trunk/reactos/dll/win32/advpack/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/reg.c?re… ============================================================================== --- trunk/reactos/dll/win32/advpack/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/reg.c [iso-8859-1] Sat Dec 27 07:04:52 2008 @@ -230,7 +230,7 @@ if(!create_tmp_ini_file(hm, tmp_ini_path)) return E_FAIL; - if (write_predefined_strings(hm, tmp_ini_path)) + if (write_predefined_strings(hm, tmp_ini_path) != S_OK) goto done; /* Write the additional string table */

1 0

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

27 Dec '08

Author: cwittich Date: Sat Dec 27 06:31:20 2008 New Revision: 38383 URL: http://svn.reactos.org/svn/reactos?rev=38383&view=rev Log: sync comdlg32 with wine 1.1.11 Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h trunk/reactos/dll/win32/comdlg32/cdlg32.c trunk/reactos/dll/win32/comdlg32/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc trunk/reactos/dll/win32/comdlg32/colordlg.c trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlg16.c trunk/reactos/dll/win32/comdlg32/filedlg31.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h trunk/reactos/dll/win32/comdlg32/finddlg32.c trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/fontdlg16.c trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/dll/win32/comdlg32/printdlg16.c trunk/reactos/dll/win32/comdlg32/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?… Modified: trunk/reactos/dll/win32/comdlg32/cdlg32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg32.… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_De… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ja… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Si… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Zh… Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl… Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/filedlg16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/filedlg31.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/finddlg32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/finddlg… Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… Modified: trunk/reactos/dll/win32/comdlg32/fontdlg16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… Modified: trunk/reactos/dll/win32/comdlg32/printdlg16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc…

1 0

[amunger] 38382: Clarify comment.
by amunger＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: amunger Date: Sat Dec 27 05:55:43 2008 New Revision: 38382 URL: http://svn.reactos.org/svn/reactos?rev=38382&view=rev Log: Clarify comment. 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 05:55:43 2008 @@ -1159,8 +1159,8 @@ MiMemoryConsumers[MC_CACHE].PagesUsed * PAGE_SIZE; /* FIXME */ /* Taskmgr multiplies this one by page size right away */ Sci->CurrentSizeIncludingTransitionInPages = - MiMemoryConsumers[MC_CACHE].PagesUsed; /* FIXME: Should include */ - /* stanby and free pages, which I don't think we track right now */ + MiMemoryConsumers[MC_CACHE].PagesUsed; /* FIXME: Should be */ + /* system working set and standby pages. */ Sci->PageFaultCount = 0; /* FIXME */ Sci->MinimumWorkingSet = 0; /* FIXME */ Sci->MaximumWorkingSet = 0; /* FIXME */

1 0

[amunger] 38381: Return mostly correct information so taskmgr doesn't just report zero for "System Cache".
by amunger＠svn.reactos.org 27 Dec '08

27 Dec '08

Author: amunger Date: Sat Dec 27 05:44:21 2008 New Revision: 38381 URL: http://svn.reactos.org/svn/reactos?rev=38381&view=rev Log: Return mostly correct information so taskmgr doesn't just report zero for "System Cache". 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 05:44:21 2008 @@ -1157,7 +1157,10 @@ MiMemoryConsumers[MC_CACHE].PagesUsed * PAGE_SIZE; Sci->PeakSize = MiMemoryConsumers[MC_CACHE].PagesUsed * PAGE_SIZE; /* FIXME */ - + /* Taskmgr multiplies this one by page size right away */ + Sci->CurrentSizeIncludingTransitionInPages = + MiMemoryConsumers[MC_CACHE].PagesUsed; /* FIXME: Should include */ + /* stanby and free pages, which I don't think we track right now */ Sci->PageFaultCount = 0; /* FIXME */ Sci->MinimumWorkingSet = 0; /* FIXME */ Sci->MaximumWorkingSet = 0; /* FIXME */

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