Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[weiden] 17068: #include "advapi32.h" -> #include <advapi32.h>

by weiden＠svn.reactos.com

#include "advapi32.h" -> #include <advapi32.h> Modified: trunk/reactos/lib/advapi32/advapi32.h Modified: trunk/reactos/lib/advapi32/crypt/crypt.c Modified: trunk/reactos/lib/advapi32/crypt/crypt_des.c Modified: trunk/reactos/lib/advapi32/crypt/crypt_lmhash.c Modified: trunk/reactos/lib/advapi32/crypt/crypt_md4.c Modified: trunk/reactos/lib/advapi32/crypt/crypt_md5.c Modified: trunk/reactos/lib/advapi32/crypt/crypt_sha.c Modified: trunk/reactos/lib/advapi32/misc/dllmain.c Modified: trunk/reactos/lib/advapi32/misc/hwprofiles.c Modified: trunk/reactos/lib/advapi32/misc/logon.c Modified: trunk/reactos/lib/advapi32/misc/shutdown.c Modified: trunk/reactos/lib/advapi32/misc/sysfunc.c Modified: trunk/reactos/lib/advapi32/reg/reg.c Modified: trunk/reactos/lib/advapi32/sec/ac.c Modified: trunk/reactos/lib/advapi32/sec/audit.c Modified: trunk/reactos/lib/advapi32/sec/lsa.c Modified: trunk/reactos/lib/advapi32/sec/misc.c Modified: trunk/reactos/lib/advapi32/sec/sec.c Modified: trunk/reactos/lib/advapi32/sec/sid.c Modified: trunk/reactos/lib/advapi32/sec/trustee.c Modified: trunk/reactos/lib/advapi32/service/eventlog.c Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/lib/advapi32/service/sctrl.c Modified: trunk/reactos/lib/advapi32/service/undoc.c Modified: trunk/reactos/lib/advapi32/token/privilege.c Modified: trunk/reactos/lib/advapi32/token/token.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.h --- trunk/reactos/lib/advapi32/advapi32.h 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/advapi32.h 2005-08-05 10:31:28 UTC (rev 17068) @@ -31,16 +31,16 @@ { HINSTANCE hDllInstance; - PVOID LookupAccountTrustee; - PVOID LookupAccountName; - PVOID LookupAccountSid; - PVOID SetEntriesInAList; - PVOID ConvertAccessToSecurityDescriptor; - PVOID ConvertSDToAccess; - PVOID ConvertAclToAccess; - PVOID GetAccessForTrustee; - PVOID GetExplicitEntries; - + /* 2CC */PVOID LookupAccountTrustee; + /* 2D0 */PVOID LookupAccountName; + /* 2D4 */PVOID LookupAccountSid; + /* 2D8 */PVOID SetEntriesInAList; + /* 2DC */PVOID ConvertAccessToSecurityDescriptor; + /* 2E0 */PVOID ConvertSDToAccess; + /* 2E4 */PVOID ConvertAclToAccess; + /* 2E8 */PVOID GetAccessForTrustee; + /* 2EC */PVOID GetExplicitEntries; + /* 2F0 */ DWORD (STDCALL *RewriteGetNamedRights)(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, @@ -50,11 +50,13 @@ PACL* ppSacl, PSECURITY_DESCRIPTOR* ppSecurityDescriptor); + /* 2F4 */ DWORD (STDCALL *RewriteSetNamedRights)(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSECURITY_DESCRIPTOR pSecurityDescriptor); + /*2F8*/ DWORD (STDCALL *RewriteGetHandleRights)(HANDLE handle, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, @@ -64,20 +66,24 @@ PACL* ppSacl, PSECURITY_DESCRIPTOR* ppSecurityDescriptor); + /* 2FC */ DWORD (STDCALL *RewriteSetHandleRights)(HANDLE handle, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSECURITY_DESCRIPTOR pSecurityDescriptor); + /* 300 */ DWORD (STDCALL *RewriteSetEntriesInAcl)(ULONG cCountOfExplicitEntries, PEXPLICIT_ACCESS_W pListOfExplicitEntries, PACL OldAcl, PACL* NewAcl); + /* 304 */ DWORD (STDCALL *RewriteGetExplicitEntriesFromAcl)(PACL pacl, PULONG pcCountOfExplicitEntries, PEXPLICIT_ACCESS_W* pListOfExplicitEntries); + /* 308 */ DWORD (STDCALL *TreeResetNamedSecurityInfo)(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, @@ -89,7 +95,7 @@ FN_PROGRESSW fnProgress, PROG_INVOKE_SETTING ProgressInvokeSetting, PVOID Args); - + /* 30C */ DWORD (STDCALL *GetInheritanceSource)(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, @@ -101,6 +107,7 @@ PGENERIC_MAPPING pGenericMapping, PINHERITED_FROMW pInheritArray); + /* 310 */ DWORD (STDCALL *FreeIndexArray)(PINHERITED_FROMW pInheritArray, USHORT AceCnt, PFN_OBJECT_MGR_FUNCTS pfnArray OPTIONAL); _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt.c --- trunk/reactos/lib/advapi32/crypt/crypt.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/crypt/crypt.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -25,7 +25,7 @@ * - Signature checking */ -#include "advapi32.h" +#include <advapi32.h> #include "crypt.h" #define NDEBUG _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt_des.c --- trunk/reactos/lib/advapi32/crypt/crypt_des.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/crypt/crypt_des.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "advapi32.h" +#include <advapi32.h> #include "crypt.h" static const unsigned char InitialPermuteMap[64] = _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt_lmhash.c --- trunk/reactos/lib/advapi32/crypt/crypt_lmhash.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/crypt/crypt_lmhash.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "advapi32.h" +#include <advapi32.h> #include "crypt.h" _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt_md4.c --- trunk/reactos/lib/advapi32/crypt/crypt_md4.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/crypt/crypt_md4.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -33,7 +33,7 @@ * will fill a supplied 16-byte array with the digest. */ -#include "advapi32.h" +#include <advapi32.h> #include "crypt.h" _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt_md5.c --- trunk/reactos/lib/advapi32/crypt/crypt_md5.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/crypt/crypt_md5.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -33,7 +33,7 @@ * will fill a supplied 16-byte array with the digest. */ -#include "advapi32.h" +#include <advapi32.h> #include "crypt.h" _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt_sha.c --- trunk/reactos/lib/advapi32/crypt/crypt_sha.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/crypt/crypt_sha.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "advapi32.h" +#include <advapi32.h> #include "crypt.h" _____ Modified: trunk/reactos/lib/advapi32/misc/dllmain.c --- trunk/reactos/lib/advapi32/misc/dllmain.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/misc/dllmain.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -9,7 +9,7 @@ * Created ??? */ -#include "advapi32.h" +#include <advapi32.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/advapi32/misc/hwprofiles.c --- trunk/reactos/lib/advapi32/misc/hwprofiles.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/misc/hwprofiles.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -9,7 +9,7 @@ * 20042502 */ -#include "advapi32.h" +#include <advapi32.h> #include <debug.h> /*********************************************************************** ******* _____ Modified: trunk/reactos/lib/advapi32/misc/logon.c --- trunk/reactos/lib/advapi32/misc/logon.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/misc/logon.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -7,7 +7,7 @@ * PROGRAMMER: Eric Kohl */ -#include "advapi32.h" +#include <advapi32.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/advapi32/misc/shutdown.c --- trunk/reactos/lib/advapi32/misc/shutdown.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/misc/shutdown.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -10,7 +10,7 @@ * 19990515 EA */ -#include "advapi32.h" +#include <advapi32.h> #define USZ {0,0,0} _____ Modified: trunk/reactos/lib/advapi32/misc/sysfunc.c --- trunk/reactos/lib/advapi32/misc/sysfunc.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/misc/sysfunc.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -10,7 +10,7 @@ * 19990415 EA */ -#include "advapi32.h" +#include <advapi32.h> /********************************************************************** * SystemFunction001 _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -13,7 +13,7 @@ /* INCLUDES *****************************************************************/ -#include "advapi32.h" +#include <advapi32.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/advapi32/sec/ac.c --- trunk/reactos/lib/advapi32/sec/ac.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/sec/ac.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -6,7 +6,7 @@ * PURPOSE: ACL/ACE functions */ -#include "advapi32.h" +#include <advapi32.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/advapi32/sec/audit.c --- trunk/reactos/lib/advapi32/sec/audit.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/sec/audit.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ -#include "advapi32.h" +#include <advapi32.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/lib/advapi32/sec/lsa.c --- trunk/reactos/lib/advapi32/sec/lsa.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/sec/lsa.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -11,7 +11,7 @@ * */ -#include "advapi32.h" +#include <advapi32.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/sec/misc.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -5,7 +5,7 @@ * PURPOSE: Miscellaneous security functions */ -#include "advapi32.h" +#include <advapi32.h> #include <accctrl.h> #include <malloc.h> #include <ntsecapi.h> _____ Modified: trunk/reactos/lib/advapi32/sec/sec.c --- trunk/reactos/lib/advapi32/sec/sec.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/sec/sec.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -11,7 +11,7 @@ * Created 01/11/98 */ -#include "advapi32.h" +#include <advapi32.h> #include <debug.h> /* _____ Modified: trunk/reactos/lib/advapi32/sec/sid.c --- trunk/reactos/lib/advapi32/sec/sid.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/sec/sid.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -6,7 +6,7 @@ * PURPOSE: Security ID functions */ -#include "advapi32.h" +#include <advapi32.h> #include <debug.h> _____ Modified: trunk/reactos/lib/advapi32/sec/trustee.c --- trunk/reactos/lib/advapi32/sec/trustee.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/sec/trustee.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -6,7 +6,7 @@ * PURPOSE: Trustee functions */ -#include "advapi32.h" +#include <advapi32.h> #define NDEBUG #include "debug.h" _____ Modified: trunk/reactos/lib/advapi32/service/eventlog.c --- trunk/reactos/lib/advapi32/service/eventlog.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/service/eventlog.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "advapi32.h" +#include <advapi32.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -12,7 +12,7 @@ /* INCLUDES ******************************************************************/ -#include "advapi32.h" +#include <advapi32.h> #include "svcctl_c.h" #define NDEBUG _____ Modified: trunk/reactos/lib/advapi32/service/sctrl.c --- trunk/reactos/lib/advapi32/service/sctrl.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/service/sctrl.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -12,7 +12,7 @@ /* INCLUDES ******************************************************************/ -#include "advapi32.h" +#include <advapi32.h> #include <services/services.h> #define NDEBUG _____ Modified: trunk/reactos/lib/advapi32/service/undoc.c --- trunk/reactos/lib/advapi32/service/undoc.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/service/undoc.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -12,7 +12,7 @@ /* INCLUDES ******************************************************************/ -#include "advapi32.h" +#include <advapi32.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/lib/advapi32/token/privilege.c --- trunk/reactos/lib/advapi32/token/privilege.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/token/privilege.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -9,7 +9,7 @@ * 20010317 ea stubs */ -#include "advapi32.h" +#include <advapi32.h> /********************************************************************** _____ Modified: trunk/reactos/lib/advapi32/token/token.c --- trunk/reactos/lib/advapi32/token/token.c 2005-08-05 10:27:32 UTC (rev 17067) +++ trunk/reactos/lib/advapi32/token/token.c 2005-08-05 10:31:28 UTC (rev 17068) @@ -8,7 +8,7 @@ * Created 01/11/98 */ -#include "advapi32.h" +#include <advapi32.h> #define NDEBUG #include <debug.h>

19 years, 1 month

[weiden] 17067: #include "acluilib.h" -> #include <precomp.h>

by weiden＠svn.reactos.com

#include "acluilib.h" -> #include <precomp.h> Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/aclui.xml Deleted: trunk/reactos/lib/aclui/acluilib.h Modified: trunk/reactos/lib/aclui/checklist.c Modified: trunk/reactos/lib/aclui/misc.c Added: trunk/reactos/lib/aclui/precomp.h _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-08-05 10:23:56 UTC (rev 17066) +++ trunk/reactos/lib/aclui/aclui.c 2005-08-05 10:27:32 UTC (rev 17067) @@ -26,7 +26,7 @@ * UPDATE HISTORY: * 08/10/2004 Created */ -#include "acluilib.h" +#include <precomp.h> HINSTANCE hDllInstance; _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2005-08-05 10:23:56 UTC (rev 17066) +++ trunk/reactos/lib/aclui/aclui.xml 2005-08-05 10:27:32 UTC (rev 17067) @@ -18,5 +18,5 @@ <file>checklist.c</file> <file>misc.c</file> <file>aclui.rc</file> - <pch>acluilib.h</pch> + <pch>precomp.h</pch> </module> _____ Deleted: trunk/reactos/lib/aclui/acluilib.h --- trunk/reactos/lib/aclui/acluilib.h 2005-08-05 10:23:56 UTC (rev 17066) +++ trunk/reactos/lib/aclui/acluilib.h 2005-08-05 10:27:32 UTC (rev 17067) @@ -1,127 +0,0 @@ -#include <windows.h> -#include <commctrl.h> -#include <objsel.h> -#include <prsht.h> -#include <aclui.h> -#include <sddl.h> -#include <ntsecapi.h> -#if SUPPORT_UXTHEME -#include <uxtheme.h> -#include <tmschema.h> -#endif -#include "resource.h" - -ULONG DbgPrint(PCH Format,...); -#define DPRINT DbgPrint - -#ifndef NT_SUCCESS -#define NT_SUCCESS(status) ((LONG)(status) >= 0) -#endif - -#define EnableRedrawWindow(hwnd) \ - SendMessage((hwnd), WM_SETREDRAW, TRUE, 0) - -#define DisableRedrawWindow(hwnd) \ - SendMessage((hwnd), WM_SETREDRAW, FALSE, 0) - -extern HINSTANCE hDllInstance; - -typedef struct _ACE_LISTITEM -{ - struct _ACE_LISTITEM *Next; - SID_NAME_USE SidNameUse; - WCHAR *DisplayString; - WCHAR *AccountName; - WCHAR *DomainName; -} ACE_LISTITEM, *PACE_LISTITEM; - -typedef struct _SECURITY_PAGE -{ - HWND hWnd; - HWND hBtnRemove; - HWND hBtnAdvanced; - HWND hAceCheckList; - HWND hPermissionsForLabel; - - /* Main ACE List */ - HWND hWndAceList; - PACE_LISTITEM AceListHead; - - INT SpecialPermCheckIndex; - - HIMAGELIST hiUsrs; - - LPSECURITYINFO psi; - SI_OBJECT_INFO ObjectInfo; - - SI_ACCESS DefaultAccess; - - LPWSTR ServerName; -} SECURITY_PAGE, *PSECURITY_PAGE; - -/* MISC ***********************************************************************/ - -BOOL -OpenLSAPolicyHandle(IN LPWSTR SystemName, - IN ACCESS_MASK DesiredAccess, - OUT PLSA_HANDLE PolicyHandle); - -DWORD -LoadAndFormatString(IN HINSTANCE hInstance, - IN UINT uID, - OUT LPWSTR *lpTarget, - ...); - -LPARAM -ListViewGetSelectedItemData(IN HWND hwnd); - -BOOL -ListViewSelectItem(IN HWND hwnd, - IN INT Index); - -/* CHECKLIST CONTROL **********************************************************/ - -#define CIS_DENYDISABLED (0x8) -#define CIS_DENYENABLED (0x0) -#define CIS_ALLOWDISABLED (0x4) -#define CIS_ALLOWENABLED (0x0) -#define CIS_ALLOW (0x2) -#define CIS_DENY (0x1) -#define CIS_NONE (0x0) -#define CIS_DISABLED (CIS_ALLOWDISABLED | CIS_DENYDISABLED) - -#define CLB_ALLOW (0x1) -#define CLB_DENY (0x0) - -#define CIS_MASK (CIS_DISABLED | CIS_ALLOW | CIS_DENY) - -#define CLM_ADDITEM (WM_USER + 1) -#define CLM_DELITEM (WM_USER + 2) -#define CLM_GETITEMCOUNT (WM_USER + 3) -#define CLM_CLEAR (WM_USER + 4) -#define CLM_SETCHECKBOXCOLUMN (WM_USER + 5) -#define CLM_GETCHECKBOXCOLUMN (WM_USER + 6) -#define CLM_CLEARCHECKBOXES (WM_USER + 7) -#define CLM_SETITEMSTATE (WM_USER + 8) -#define CLM_ENABLEQUICKSEARCH (WM_USER + 9) -#define CLM_SETQUICKSEARCH_TIMEOUT_RESET (WM_USER + 10) -#define CLM_SETQUICKSEARCH_TIMEOUT_SETFOCUS (WM_USER + 11) - -#define CLN_CHANGINGITEMCHECKBOX (101) - -typedef struct _NMCHANGEITEMCHECKBOX -{ - NMHDR nmhdr; - DWORD OldState; - DWORD NewState; - DWORD CheckBox; - BOOL Checked; -} NMCHANGEITEMCHECKBOX, *PNMCHANGEITEMCHECKBOX; - -BOOL -RegisterCheckListControl(HINSTANCE hInstance); - -VOID -UnregisterCheckListControl(VOID); - -/* EOF */ _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-08-05 10:23:56 UTC (rev 17066) +++ trunk/reactos/lib/aclui/checklist.c 2005-08-05 10:27:32 UTC (rev 17067) @@ -26,7 +26,7 @@ * UPDATE HISTORY: * 07/01/2005 Created */ -#include "acluilib.h" +#include <precomp.h> #define CI_TEXT_MARGIN_WIDTH (8) #define CI_TEXT_MARGIN_HEIGHT (3) _____ Modified: trunk/reactos/lib/aclui/misc.c --- trunk/reactos/lib/aclui/misc.c 2005-08-05 10:23:56 UTC (rev 17066) +++ trunk/reactos/lib/aclui/misc.c 2005-08-05 10:27:32 UTC (rev 17067) @@ -30,7 +30,7 @@ #include <windows.h> #include <aclui.h> -#include "acluilib.h" +#include <precomp.h> static INT LengthOfStrResource(IN HINSTANCE hInst, _____ Copied: trunk/reactos/lib/aclui/precomp.h (from rev 17065, trunk/reactos/lib/aclui/acluilib.h)

19 years, 1 month

[weiden] 17066: #include "precomp.h" -> #include <precomp.h>

by weiden＠svn.reactos.com

#include "precomp.h" -> #include <precomp.h> Modified: trunk/reactos/subsys/system/ibrowser/favorites.cpp Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp Modified: trunk/reactos/subsys/system/ibrowser/utility/utility.cpp Modified: trunk/reactos/subsys/system/ibrowser/utility/window.cpp Modified: trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp Modified: trunk/reactos/subsys/system/ibrowser/webchild.cpp _____ Modified: trunk/reactos/subsys/system/ibrowser/favorites.cpp --- trunk/reactos/subsys/system/ibrowser/favorites.cpp 2005-08-05 10:11:21 UTC (rev 17065) +++ trunk/reactos/subsys/system/ibrowser/favorites.cpp 2005-08-05 10:23:56 UTC (rev 17066) @@ -26,7 +26,7 @@ // -#include "precomp.h" +#include <precomp.h> String DecodeURLString(const char* s) _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp --- trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-08-05 10:11:21 UTC (rev 17065) +++ trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-08-05 10:23:56 UTC (rev 17066) @@ -26,7 +26,7 @@ // -#include "precomp.h" +#include <precomp.h> #include "ibrowser_intres.h" _____ Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp --- trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-08-05 10:11:21 UTC (rev 17065) +++ trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-08-05 10:23:56 UTC (rev 17066) @@ -26,7 +26,7 @@ // -#include "precomp.h" +#include <precomp.h> /* We can't include webchild.h here - otherwise MinGW produces errors like: "multiple definition of `QACONTAINERFLAGS'" #include "webchild.h" _____ Modified: trunk/reactos/subsys/system/ibrowser/utility/utility.cpp --- trunk/reactos/subsys/system/ibrowser/utility/utility.cpp 2005-08-05 10:11:21 UTC (rev 17065) +++ trunk/reactos/subsys/system/ibrowser/utility/utility.cpp 2005-08-05 10:23:56 UTC (rev 17066) @@ -26,7 +26,7 @@ // -#include "precomp.h" +#include <precomp.h> //#include <shellapi.h> _____ Modified: trunk/reactos/subsys/system/ibrowser/utility/window.cpp --- trunk/reactos/subsys/system/ibrowser/utility/window.cpp 2005-08-05 10:11:21 UTC (rev 17065) +++ trunk/reactos/subsys/system/ibrowser/utility/window.cpp 2005-08-05 10:23:56 UTC (rev 17066) @@ -26,7 +26,7 @@ // -#include "precomp.h" +#include <precomp.h> #include "../ibrowser_intres.h" // for ID_GO_BACK, ... _____ Modified: trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp --- trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp 2005-08-05 10:11:21 UTC (rev 17065) +++ trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp 2005-08-05 10:23:56 UTC (rev 17066) @@ -37,7 +37,7 @@ */ //#include "xmlstorage.h" -#include "precomp.h" +#include <precomp.h> // work around GCC's wide string constant bug _____ Modified: trunk/reactos/subsys/system/ibrowser/webchild.cpp --- trunk/reactos/subsys/system/ibrowser/webchild.cpp 2005-08-05 10:11:21 UTC (rev 17065) +++ trunk/reactos/subsys/system/ibrowser/webchild.cpp 2005-08-05 10:23:56 UTC (rev 17066) @@ -26,7 +26,7 @@ // -#include "precomp.h" +#include <precomp.h> #include "ibrowser_intres.h"

19 years, 1 month

[navaraf] 17065: Comment out the ACPI enumeration entries for i8042prt driver. It's set as system load driver, so it's loaded anyway.

by navaraf＠svn.reactos.com

Comment out the ACPI enumeration entries for i8042prt driver. It's set as system load driver, so it's loaded anyway. Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-08-05 10:01:51 UTC (rev 17064) +++ trunk/reactos/bootdata/hivesys.inf 2005-08-05 10:11:21 UTC (rev 17065) @@ -488,10 +488,10 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x0000 0000,"i8042prt" -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","ClassGUID",0x00 000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","Service",0x0000 0000,"i8042prt" -HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","ClassGUID",0x00 000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" +;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x000 00000,"i8042prt" +;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","ClassGUID",0x0 0000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" +;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","Service",0x000 00000,"i8042prt" +;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","ClassGUID",0x0 0000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010 001,0x00000000

19 years, 1 month

[navaraf] 17064: Fix shell32 build.

by navaraf＠svn.reactos.com

Fix shell32 build. Modified: trunk/reactos/include/wine/shlguid.h Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/w32api/include/shlguid.h Modified: trunk/reactos/w32api/include/shlobj.h _____ Modified: trunk/reactos/include/wine/shlguid.h --- trunk/reactos/include/wine/shlguid.h 2005-08-05 09:38:12 UTC (rev 17063) +++ trunk/reactos/include/wine/shlguid.h 2005-08-05 10:01:51 UTC (rev 17064) @@ -56,4 +56,6 @@ DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); +DEFINE_GUID(IID_IShellLinkDataList, 0x45e2b4ae, 0xb1c3, 0x11d0, 0xb9, 0x2f, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); + #endif /* __WINE_SHLGUID_H */ _____ Modified: trunk/reactos/lib/shell32/shfldr_desktop.c --- trunk/reactos/lib/shell32/shfldr_desktop.c 2005-08-05 09:38:12 UTC (rev 17063) +++ trunk/reactos/lib/shell32/shfldr_desktop.c 2005-08-05 10:01:51 UTC (rev 17064) @@ -428,7 +428,7 @@ IGenericSFImpl *This = (IGenericSFImpl *)iface; HRESULT hr = S_OK; const static DWORD dwDesktopAttributes = - SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGE_ANCESTOR | + SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", _____ Modified: trunk/reactos/w32api/include/shlguid.h --- trunk/reactos/w32api/include/shlguid.h 2005-08-05 09:38:12 UTC (rev 17063) +++ trunk/reactos/w32api/include/shlguid.h 2005-08-05 10:01:51 UTC (rev 17064) @@ -38,6 +38,7 @@ extern const GUID IID_IPersistFolder; extern const GUID IID_IExtractIconA; extern const GUID IID_IShellLinkA; +extern const GUID IID_IShellLinkDataList; extern const GUID IID_IShellCopyHookA; extern const GUID IID_IFileViewerA; extern const GUID IID_ICommDlgBrowser; _____ Modified: trunk/reactos/w32api/include/shlobj.h --- trunk/reactos/w32api/include/shlobj.h 2005-08-05 09:38:12 UTC (rev 17063) +++ trunk/reactos/w32api/include/shlobj.h 2005-08-05 10:01:51 UTC (rev 17064) @@ -95,6 +95,7 @@ #define SFGAO_CANCOPY DROPEFFECT_COPY #define SFGAO_CANMOVE DROPEFFECT_MOVE #define SFGAO_CANLINK DROPEFFECT_LINK +#define SFGAO_STORAGE 0x00000008L #define SFGAO_CANRENAME 0x00000010L #define SFGAO_CANDELETE 0x00000020L #define SFGAO_HASPROPSHEET 0x00000040L @@ -114,6 +115,7 @@ #define SFGAO_VALIDATE 0x01000000L #define SFGAO_REMOVABLE 0x02000000L #define SFGAO_COMPRESSED 0x04000000L +#define SFGAO_STORAGEANCESTOR 0x00800000L #define STRRET_WSTR 0 #define STRRET_OFFSET 1 #define STRRET_CSTR 2 @@ -1117,6 +1119,31 @@ #define IShellLinkW_SetPath(T,a) (T)->lpVtbl->SetPath(T,a) #endif +#define INTERFACE IShellLinkDataList +DECLARE_INTERFACE_(IShellLinkDataList, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(AddDataBlock)(THIS_ PVOID) PURE; + STDMETHOD(CopyDataBlock)(THIS_ DWORD,PVOID*) PURE; + STDMETHOD(RemoveDataBlock)(THIS_ DWORD) PURE; + STDMETHOD(GetFlags)(THIS_ PDWORD) PURE; + STDMETHOD(SetFlags)(THIS_ DWORD) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IShellLinkDataList_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IShellLinkDataList_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IShellLinkDataList_Release(T) (T)->lpVtbl->Release(T) +#define IShellLinkDataList_AddDataBlock(T,a) (T)->lpVtbl->AddDataBlock(T,a) +#define IShellLinkDataList_CopyDataBlock(T,a,b) (T)->lpVtbl->CopyDataBlock(T,a,b) +#define IShellLinkDataList_RemoveDataBlock(T,a) (T)->lpVtbl->RemoveDataBlock(T,a) +#define IShellLinkDataList_GetFlags(T,a) (T)->lpVtbl->GetFlags(T,a) +#define IShellLinkDataList_SetFlags(T,a) (T)->lpVtbl->SetFlags(T,a) +#endif + #define INTERFACE IShellFolder DECLARE_INTERFACE_(IShellFolder, IUnknown) {

19 years, 1 month

[ion] 17063: - Removed all 3rd-party drivers due to popular request. Information on how to make the drivers work is now available on http://www.reactos.com/wiki/index.php/ReactOS_Drivers. .reg files could be created by volunteers to simplify the process, perhaps.

by ion＠svn.reactos.com

- Removed all 3rd-party drivers due to popular request. Information on how to make the drivers work is now available on http://www.reactos.com/wiki/index.php/ReactOS_Drivers. .reg files could be created by volunteers to simplify the process, perhaps. Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-08-05 09:16:38 UTC (rev 17062) +++ trunk/reactos/bootdata/hivesys.inf 2005-08-05 09:38:12 UTC (rev 17063) @@ -371,35 +371,6 @@ ; PNP Root device HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" -; 3Com 3c905 Driver -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","ErrorControl",0x0001000 1,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","Group",0x00000000,"NDIS " -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","ImagePath",0x00020000," system32\drivers\el90Xbc5.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","Start",0x00010001,0x000 00004 -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","Type",0x00010001,0x0000 0001 -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x\Linkage","Bind",0x0001000 0,"\Device\3c90x1" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x\Linkage","Export",0x00010 000,"\Device\3c90x1" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x\Linkage","Route",0x000100 00,"3c90x1" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x\Enum","0",0x00000000,"PCI \VEN_1022&DEV_2000\0000" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x\Enum","Count",0x00010001, 0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x\Enum","NextInstance",0x00 010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_200010 22&REV_10\0000","Service",0x00000000,"3c90x" -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_200010 22&REV_10\0000","Class",0x00000000,"Net" -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_200010 22&REV_10\0000","ClassGUID",0x00000000,"{4D36E972-E325-11CE-BFC1-08002BE 10318}" - -; 3Com Adapter 1 -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1","ErrorControl",0x000100 01,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1","Start",0x00010001,0x00 000003 -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1","Type",0x00010001,0x000 00004 -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Linkage","Bind",0x000100 00,"\Device\3c90x1" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Linkage","Export",0x0001 0000,"\Device\3c90x1" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Linkage","Route",0x00010 000,"3c90x1" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters","SlotNumber" ,0x00000000,"10" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters","BusNumber", 0x00000000,"0" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters\Tcpip","Defau ltGateway",0x00010000,"0.0.0.0" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters\Tcpip","IPAdd ress",0x00010000,"0.0.0.0" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters\Tcpip","Subne tMask",0x00010000,"0.0.0.0" - ; Afd driver HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0 x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI" @@ -415,70 +386,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Type",0x00010001,0x00000 001 HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x000000 10 -; Promise Ultra100TX miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\ultra","ErrorControl",0x0001000 1,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\ultra","Group",0x00000000,"SCSI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\ultra","ImagePath",0x00020000," system32\drivers\ultra.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\ultra","Start",0x00010001,0x000 00004 -HKLM,"SYSTEM\CurrentControlSet\Services\ultra","Type",0x00010001,0x0000 0001 -HKLM,"SYSTEM\CurrentControlSet\Services\ultra","Tag",0x00010001,0x00000 020 - -; Initio A100 U2W Controller -HKLM,"SYSTEM\CurrentControlSet\Services\inia100","ErrorControl",0x00010 001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\inia100","Group",0x00000000,"SC SI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\inia100","ImagePath",0x00020000 ,"system32\drivers\inia100.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\inia100","Start",0x00010001,0x0 000004 -HKLM,"SYSTEM\CurrentControlSet\Services\inia100","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\inia100","Tag",0x00010001,0x000 00030 - -; Initio INI 910 -HKLM,"SYSTEM\CurrentControlSet\Services\ini910U","ErrorControl",0x00010 001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\ini910U","Group",0x00000000,"SC SI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\ini910U","ImagePath",0x00020000 ,"system32\drivers\ini910u.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\ini910U","Start",0x00010001,0x0 000004 -HKLM,"SYSTEM\CurrentControlSet\Services\ini910U","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\ini910U","Tag",0x00010001,0x000 00040 - -; Adaptec SCSI Controller 2940UW miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\aic78xx","ErrorControl",0x00010 001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\aic78xx","Group",0x00000000,"SC SI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\aic78xx","ImagePath",0x00020000 ,"system32\drivers\aic78xx.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\aic78xx","Start",0x00010001,0x0 0000004 -HKLM,"SYSTEM\CurrentControlSet\Services\aic78xx","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\aic78xx","Tag",0x00010001,0x000 00050 - -; LSI Logic SCSI Controller 53C8xx miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\symc8xx","ErrorControl",0x00010 001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\symc8xx","Group",0x00000000,"SC SI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\symc8xx","ImagePath",0x00020000 ,"system32\drivers\symc8xx.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\symc8xx","Start",0x00010001,0x0 0000004 -HKLM,"SYSTEM\CurrentControlSet\Services\symc8xx","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\symc8xx","Tag",0x00010001,0x000 00060 - -; Diamond Multimedia Fireport 40 -HKLM,"SYSTEM\CurrentControlSet\Services\fireport","ErrorControl",0x0001 0001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\fireport","Group",0x00000000,"S CSI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\fireport","ImagePath",0x0002000 0,"system32\drivers\fireport.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\fireport","Start",0x00010001,0x 00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\fireport","Type",0x00010001,0x0 0000001 -HKLM,"SYSTEM\CurrentControlSet\Services\fireport","Tag",0x00010001,0x00 000070 - -; Tekram DC-390F SCSI Controller miniport driver (based on 53C857) -HKLM,"SYSTEM\CurrentControlSet\Services\trm390w","ErrorControl",0x00010 001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\trm390w","Group",0x00000000,"SC SI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\trm390w","ImagePath",0x00020000 ,"system32\drivers\trm390w.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\trm390w","Start",0x00010001,0x0 000004 -HKLM,"SYSTEM\CurrentControlSet\Services\trm390w","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\trm390w","Tag",0x00010001,0x000 00080 - -; HighPoint HPT3xx miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\hpt3xxPCI","ErrorControl",0x000 10001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\hpt3xxPCI","Group",0x00000000," SCSI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\hpt3xxPCI","ImagePath",0x000200 00,"system32\drivers\hpt3xx.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\hpt3xxPCI","Start",0x00010001,0 x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\hpt3xxPCI","Type",0x00010001,0x 00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\hpt3xxPCI","Tag",0x00010001,0x0 0000090 - ; ACPI driver HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","ErrorControl",0x00010001, 0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\ACPI","Group",0x00000000,"Boot Bus Extender" @@ -609,26 +516,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0\Devic es","SBWaveIn0",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0\Devic es","SBWaveOut0",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140","Group",0x00000000,"B ase" -HKLM,"SYSTEM\CurrentControlSet\Services\es137140","ServiceType",0x00010 001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140","Type",0x00010001,0x0 0000001 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140","Start",0x00010001,0x 00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140","ErrorControl",0x0001 0001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140","ImagePath",0x0002000 0,"system32\drivers\es137140.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\es137140","DisplayName",0x00020 000,"ENSONIQ AudioPCI" -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0","C onfiguration Error",0x00010001,0xffffffff -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0","J oystick",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0","P ort",0x00010001,0x00001080 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0","I nterrupt",0x00010001,0x00000044 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0","R equestedSystemResources",0x00000001,88,00,00,00,05,00,00,00,00,00,00,00, 11,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,01,00, 03,00,00,00,00,02,03,00,00,00,00,00,44,00,00,00,44,00,00,00,00,00,00,00, 00,00,00,00,00,00,00,00,00,00,00,00,01,01,01,00,01,00,00,00,40,00,00,00, 40,00,00,00,80,10,00,00,00,00,00,00,bf,10,00,00,00,00,00,00,08,01,01,00, 01,00,00,00,40,00,00,00,40,00,00,00,80,10,00,00,00,00,00,00,bf,10,00,00, 00,00,00,00 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0\Dev ices","EAPWaveIn0",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0\Dev ices","EAPWaveOut0",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0\Dev ices","EAPMidiIn0",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0\Dev ices","EAPMidiOut0",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0\Dev ices","EAPMidiOut1",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0\Dev ices","EAPMixer0",0x00010001,0x00000006 -HKLM,"SYSTEM\CurrentControlSet\Services\es137140\Parameters\Device0\Dev ices","EAPAux0",0x00010001,0x00000005 - ; MPU-401 MIDI driver HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Group",0x00000000,"Base " HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ServiceType",0x00010001 ,0x00000001 @@ -827,20 +714,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet\Linkage","Bind",0x0001000 0,"\Device\Ne20001" HKLM,"SYSTEM\CurrentControlSet\Services\Packet\Linkage","Export",0x00010 000,"\Device\packet" -; Private ICE driver -HKLM,"SYSTEM\CurrentControlSet\Services\Pice","ErrorControl",0x00010001 ,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Pice","Group",0x00000000,"Debug " -HKLM,"SYSTEM\CurrentControlSet\Services\Pice","ImagePath",0x00020000,"s ystem32\drivers\pice.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Pice","Start",0x00010001,0x0000 0004 -HKLM,"SYSTEM\CurrentControlSet\Services\Pice","Type",0x00010001,0x00000 001 - -; SoftICE -;HKLM,"SYSTEM\CurrentControlSet\Services\ntice","ErrorControl",0x000100 01,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\ntice","Group",0x00000000,"Deb ug" -;HKLM,"SYSTEM\CurrentControlSet\Services\ntice","ImagePath",0x00020000, "system32\drivers\ntice.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\ntice","Start",0x00010001,0x00 000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\ntice","Type",0x00010001,0x000 00001 - ; Plug and Play manager HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Group",0x00000000,"Pl ugPlay" @@ -932,23 +805,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Default Settings.YResolution",0x00010001,480 -; QEMU SVGA Driver - -HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","ErrorControl",0x000100 01,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","Group",0x00000000,"Vid eo Save SVGA" -HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","ImagePath",0x00020000, "system32\drivers\cl54xx.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","Start",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","Type",0x00010001,0x000 00001 -HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX","Tag",0x00010001,0x0000 000C -HKLM,"SYSTEM\CurrentControlSet\Services\CL54XX\Device0","InstalledDispl ayDrivers",0x00010000,"CL54XX" - -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.VgaCompatible",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.VRefresh",0x00010001,60 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.BitsPerPel",0x00010001,16 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.Interlaced",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.XResolution",0x00010001,800 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\CL54XX\Device0","Defa ultSettings.YResolution",0x00010001,600 - ; VGA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0 x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save" @@ -957,38 +813,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x0000000 1 HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDr ivers",0x00010000,"vgaddi" - -; VMware SVGA driver -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","ErrorControl",0x0001 0001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Group",0x00000000,"V ideo" -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","ImagePath",0x0002000 0,"system32\drivers\vmx_svga.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Start",0x00010001,0x 00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga","Type",0x00010001,0x0 0000001 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","InstalledDis playDrivers",0x00010000,"vmx_fb" -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.0 ",0x00000001,36,34,30,78,34,38,30,00 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.1 ",0x00000001,38,30,30,78,36,30,30,00 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.2 ",0x00000001,31,30,32,34,78,37,36,38,00 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.3 ",0x00000001,31,31,35,32,78,38,36,34,00 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.4 ",0x00000001,31,32,38,30,78,39,36,30,00 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.5 ",0x00000001,31,32,38,30,78,31,30,32,34,00 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.6 ",0x00000001,31,34,30,30,78,31,30,35,30,00 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.7 ",0x00000001,31,36,30,30,78,31,32,30,30,00 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.8 ",0x00000001,31,37,39,32,78,31,33,34,34,00 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.9 ",0x00000001,31,38,35,36,78,31,33,39,32,00 -HKLM,"SYSTEM\CurrentControlSet\Services\vmx_svga\Device0","Resolution.1 0",0x00000001,31,39,32,30,78,31,34,34,30,00 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.Flags",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.VRefresh",0x00010001,85 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.XPanning",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.YPanning",0x00010001,0 -; Select the resolution and depth below -; Available resolutions (Resolution.0 - Resolution.10 above): -; 640x480, 800x600, 1024x768, 1152x864, 1280x960, 1280x1024, 1400x1050, 1600x1200, -; 1792x1344, 1856x1392, 1920x1440, with 8, 16 or 32 bits per pixel -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.BitsPerPel",0x00010001,16 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.XResolution",0x00010001,800 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vmx_svga\Device0","De faultSettings.YResolution",0x00010001,600 -HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_15AD&DEV_0405&SUBSYS_040515 AD&REV_00\0000","Service",0x00000000,"vmx_svga" - ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001

19 years, 1 month

[weiden] 17062: set eol-style to native and allow warnings (so it compiles with GCC4)

by weiden＠svn.reactos.com

set eol-style to native and allow warnings (so it compiles with GCC4) Modified: trunk/reactos/lib/oledlg/Makefile.in Modified: trunk/reactos/lib/oledlg/oledlg.spec Modified: trunk/reactos/lib/oledlg/oledlg.xml Modified: trunk/reactos/lib/oledlg/oledlg_Cs.rc Modified: trunk/reactos/lib/oledlg/oledlg_De.rc Modified: trunk/reactos/lib/oledlg/oledlg_En.rc Modified: trunk/reactos/lib/oledlg/oledlg_Es.rc Modified: trunk/reactos/lib/oledlg/oledlg_Fr.rc Modified: trunk/reactos/lib/oledlg/oledlg_It.rc Modified: trunk/reactos/lib/oledlg/oledlg_Ja.rc Modified: trunk/reactos/lib/oledlg/oledlg_Nl.rc Modified: trunk/reactos/lib/oledlg/oledlg_Pt.rc Modified: trunk/reactos/lib/oledlg/oledlg_Ru.rc Modified: trunk/reactos/lib/oledlg/rsrc.rc Property changes on: trunk/reactos/lib/oledlg ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c *.ico *.bmp *.cur + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp makefile *.spec.def *.stubs.c *.ico *.bmp *.cur _____ Modified: trunk/reactos/lib/oledlg/Makefile.in --- trunk/reactos/lib/oledlg/Makefile.in 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/Makefile.in 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,17 +1,17 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = oledlg.dll -IMPORTLIB = liboledlg.$(IMPLIBEXT) -IMPORTS = ole32 comdlg32 user32 advapi32 kernel32 ntdll - -C_SRCS = \ - insobjdlg.c \ - oledlg_main.c - -RC_SRCS = rsrc.rc - -@MAKE_DLL_RULES@ - -### Dependencies: +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = oledlg.dll +IMPORTLIB = liboledlg.$(IMPLIBEXT) +IMPORTS = ole32 comdlg32 user32 advapi32 kernel32 ntdll + +C_SRCS = \ + insobjdlg.c \ + oledlg_main.c + +RC_SRCS = rsrc.rc + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: trunk/reactos/lib/oledlg/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/oledlg.spec --- trunk/reactos/lib/oledlg/oledlg.spec 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/oledlg.spec 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,23 +1,23 @@ - 1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) - 2 stdcall OleUICanConvertOrActivateAs(ptr long long) - 3 stdcall OleUIInsertObjectA(ptr) - 4 stdcall OleUIPasteSpecialA(ptr) - 5 stdcall OleUIEditLinksA(ptr) - 6 stdcall OleUIChangeIconA(ptr) - 7 stdcall OleUIConvertA(ptr) - 8 stdcall OleUIBusyA(ptr) - 9 stdcall OleUIUpdateLinksA(ptr long str long) - 10 varargs OleUIPromptUserA(long long) - 11 stdcall OleUIObjectPropertiesA(ptr) - 12 stdcall OleUIChangeSourceA(ptr) - 13 varargs OleUIPromptUserW(long long) - 14 stdcall OleUIAddVerbMenuW(ptr wstr long long long long long long ptr) - 15 stdcall OleUIBusyW(ptr) - 16 stdcall OleUIChangeIconW(ptr) - 17 stdcall OleUIChangeSourceW(ptr) - 18 stdcall OleUIConvertW(ptr) - 19 stdcall OleUIEditLinksW(ptr) - 20 stdcall OleUIInsertObjectW(ptr) - 21 stdcall OleUIObjectPropertiesW(ptr) - 22 stdcall OleUIPasteSpecialW(ptr) - 23 stdcall OleUIUpdateLinksW(ptr long wstr long) + 1 stdcall OleUIAddVerbMenuA(ptr str long long long long long long ptr) + 2 stdcall OleUICanConvertOrActivateAs(ptr long long) + 3 stdcall OleUIInsertObjectA(ptr) + 4 stdcall OleUIPasteSpecialA(ptr) + 5 stdcall OleUIEditLinksA(ptr) + 6 stdcall OleUIChangeIconA(ptr) + 7 stdcall OleUIConvertA(ptr) + 8 stdcall OleUIBusyA(ptr) + 9 stdcall OleUIUpdateLinksA(ptr long str long) + 10 varargs OleUIPromptUserA(long long) + 11 stdcall OleUIObjectPropertiesA(ptr) + 12 stdcall OleUIChangeSourceA(ptr) + 13 varargs OleUIPromptUserW(long long) + 14 stdcall OleUIAddVerbMenuW(ptr wstr long long long long long long ptr) + 15 stdcall OleUIBusyW(ptr) + 16 stdcall OleUIChangeIconW(ptr) + 17 stdcall OleUIChangeSourceW(ptr) + 18 stdcall OleUIConvertW(ptr) + 19 stdcall OleUIEditLinksW(ptr) + 20 stdcall OleUIInsertObjectW(ptr) + 21 stdcall OleUIObjectPropertiesW(ptr) + 22 stdcall OleUIPasteSpecialW(ptr) + 23 stdcall OleUIUpdateLinksW(ptr long wstr long) Property changes on: trunk/reactos/lib/oledlg/oledlg.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/oledlg.xml --- trunk/reactos/lib/oledlg/oledlg.xml 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/oledlg.xml 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,4 +1,4 @@ -<module name="oledlg" type="win32dll" baseaddress="${BASEADDRESS_OLEDLG}" installbase="system32" installname="oledlg.dll"> +<module name="oledlg" type="win32dll" baseaddress="${BASEADDRESS_OLEDLG}" installbase="system32" installname="oledlg.dll" warnings="true"> <importlibrary definition="oledlg.spec.def" /> <include base="oledlg">.</include> <include base="ReactOS">include/wine</include> Property changes on: trunk/reactos/lib/oledlg/oledlg.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/oledlg_Cs.rc --- trunk/reactos/lib/oledlg/oledlg_Cs.rc 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/oledlg_Cs.rc 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,57 +1,57 @@ -/* - * Czech resources or oledlg - * Copyright 2003 Ulrich Czekalla for CodeWeavers - * Copyright 2004 David Kredba - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Vlo¥it objekt" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "Typ objektu:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Storno",IDCANCEL,221,24,66,14 - GROUPBOX "V²sledek",IDC_RESULT,7,103,208,41 - CONTROL "Vytvo°it nov²",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "Vytvo°it propojenÝ",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Vytvo°it ze souboru",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "P°id&at propojenÝ...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Zobrazit jako ikonu",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Prochßzet...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Soubor:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "Vlo¥en nov² %s objekt do Va?eho dokumentu" - IDS_RESULTFILEOBJDESC "Vlo¥en obsah souboru jako objekt do Va?eho dokumentu, tak¥e ho m¨¥ete upravit programem, kter²m byl vytvo°en." - IDS_BROWSE "Prochßzet" - IDS_NOTOLEMOD "Soubor nenÝ platn²m OLE modulem. Nelze registrovat OLE propojenÝ." - IDS_NOTOLEMODCAPTION "P°idat propojenÝ" -} +/* + * Czech resources or oledlg + * Copyright 2003 Ulrich Czekalla for CodeWeavers + * Copyright 2004 David Kredba + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Vlo¥it objekt" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Typ objektu:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Storno",IDCANCEL,221,24,66,14 + GROUPBOX "V²sledek",IDC_RESULT,7,103,208,41 + CONTROL "Vytvo°it nov²",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Vytvo°it propojenÝ",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Vytvo°it ze souboru",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "P°id&at propojenÝ...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Zobrazit jako ikonu",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Prochßzet...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Soubor:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Vlo¥en nov² %s objekt do Va?eho dokumentu" + IDS_RESULTFILEOBJDESC "Vlo¥en obsah souboru jako objekt do Va?eho dokumentu, tak¥e ho m¨¥ete upravit programem, kter²m byl vytvo°en." + IDS_BROWSE "Prochßzet" + IDS_NOTOLEMOD "Soubor nenÝ platn²m OLE modulem. Nelze registrovat OLE propojenÝ." + IDS_NOTOLEMODCAPTION "P°idat propojenÝ" +} Property changes on: trunk/reactos/lib/oledlg/oledlg_Cs.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/oledlg_De.rc --- trunk/reactos/lib/oledlg/oledlg_De.rc 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/oledlg_De.rc 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,55 +1,55 @@ -/* - * Copyright 2004 Henning Gerhardt - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Objekt einf³gen" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "Objekttyp:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Abbrechen",IDCANCEL,221,24,66,14 - GROUPBOX "Ergebnis",IDC_RESULT,7,103,208,41 - CONTROL "&Neu erstellen",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "S&teuerung erstellen",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "A&us Datei erstellen",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "Steuerung hin&zuf³gen",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Als &Symbol anzeigen",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "D&urchsuchen...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Datei:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "F³gt ein neues %s - Objekt in Ihr Dokument ein." - IDS_RESULTFILEOBJDESC "F³gt den Inhalt der Datei als Objekt so in Ihr Dokument ein, dass Sie es mit dem Programm aktivieren k÷nnen, mit dem es erstellt wurde." - IDS_BROWSE "Durchsuchen" - IDS_NOTOLEMOD "Die Datei ist offenbar kein g³ltiges OLE - Steuermodul. Die OLE - Steuerung konnte nicht registiert werden." - IDS_NOTOLEMODCAPTION "Steuerung hinzuf³gen" -} +/* + * Copyright 2004 Henning Gerhardt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Objekt einf³gen" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Objekttyp:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Abbrechen",IDCANCEL,221,24,66,14 + GROUPBOX "Ergebnis",IDC_RESULT,7,103,208,41 + CONTROL "&Neu erstellen",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "S&teuerung erstellen",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "A&us Datei erstellen",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "Steuerung hin&zuf³gen",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Als &Symbol anzeigen",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "D&urchsuchen...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Datei:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "F³gt ein neues %s - Objekt in Ihr Dokument ein." + IDS_RESULTFILEOBJDESC "F³gt den Inhalt der Datei als Objekt so in Ihr Dokument ein, dass Sie es mit dem Programm aktivieren k÷nnen, mit dem es erstellt wurde." + IDS_BROWSE "Durchsuchen" + IDS_NOTOLEMOD "Die Datei ist offenbar kein g³ltiges OLE - Steuermodul. Die OLE - Steuerung konnte nicht registiert werden." + IDS_NOTOLEMODCAPTION "Steuerung hinzuf³gen" +} Property changes on: trunk/reactos/lib/oledlg/oledlg_De.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/oledlg_En.rc --- trunk/reactos/lib/oledlg/oledlg_En.rc 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/oledlg_En.rc 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,55 +1,55 @@ -/* - * Copyright 2003 Ulrich Czekalla for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Insert Object" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "Object Type:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Cancel",IDCANCEL,221,24,66,14 - GROUPBOX "Result",IDC_RESULT,7,103,208,41 - CONTROL "Create New",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "Create Control",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Create From File",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "&Add Control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Display As Icon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Browse...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "File:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "Insert a new %s object into your document" - IDS_RESULTFILEOBJDESC "Insert the contents of the file as an object into your document so that you may activate it using the program which created it." - IDS_BROWSE "Browse" - IDS_NOTOLEMOD "File does not appear to be a valid OLE module. Unable to register OLE control." - IDS_NOTOLEMODCAPTION "Add Control" -} +/* + * Copyright 2003 Ulrich Czekalla for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Insert Object" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Object Type:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Cancel",IDCANCEL,221,24,66,14 + GROUPBOX "Result",IDC_RESULT,7,103,208,41 + CONTROL "Create New",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Create Control",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Create From File",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Add Control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Display As Icon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Browse...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "File:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Insert a new %s object into your document" + IDS_RESULTFILEOBJDESC "Insert the contents of the file as an object into your document so that you may activate it using the program which created it." + IDS_BROWSE "Browse" + IDS_NOTOLEMOD "File does not appear to be a valid OLE module. Unable to register OLE control." + IDS_NOTOLEMODCAPTION "Add Control" +} Property changes on: trunk/reactos/lib/oledlg/oledlg_En.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/oledlg_Es.rc --- trunk/reactos/lib/oledlg/oledlg_Es.rc 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/oledlg_Es.rc 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,55 +1,55 @@ -/* - * Copyright 2004 JosÚ Manuel Ferrer Ortiz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Insertar objeto" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "Tipo de objeto:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "Aceptar",IDOK,221,7,66,14 - PUSHBUTTON "Cancelar",IDCANCEL,221,24,66,14 - GROUPBOX "Resultado",IDC_RESULT,7,103,208,41 - CONTROL "Crear nuevo",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "Crear control",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Crear desde archivo",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "&A±adir control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Mostrar como icono",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Explorar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Archivo:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "Inserta un nuevo objeto %s en su documento" - IDS_RESULTFILEOBJDESC "Inserta el contenido del archivo como un objeto en su documento, con lo que podrß activarlo utilizando el programa que lo cre¾." - IDS_BROWSE "Explorar" - IDS_NOTOLEMOD "El archivo no parece ser un m¾dulo OLE vßlido. Incapaz de registrar el control OLE." - IDS_NOTOLEMODCAPTION "A±adir control" -} +/* + * Copyright 2004 JosÚ Manuel Ferrer Ortiz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Insertar objeto" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Tipo de objeto:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "Aceptar",IDOK,221,7,66,14 + PUSHBUTTON "Cancelar",IDCANCEL,221,24,66,14 + GROUPBOX "Resultado",IDC_RESULT,7,103,208,41 + CONTROL "Crear nuevo",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Crear control",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Crear desde archivo",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&A±adir control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Mostrar como icono",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Explorar...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Archivo:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Inserta un nuevo objeto %s en su documento" + IDS_RESULTFILEOBJDESC "Inserta el contenido del archivo como un objeto en su documento, con lo que podrß activarlo utilizando el programa que lo cre¾." + IDS_BROWSE "Explorar" + IDS_NOTOLEMOD "El archivo no parece ser un m¾dulo OLE vßlido. Incapaz de registrar el control OLE." + IDS_NOTOLEMODCAPTION "A±adir control" +} Property changes on: trunk/reactos/lib/oledlg/oledlg_Es.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/oledlg_Fr.rc --- trunk/reactos/lib/oledlg/oledlg_Fr.rc 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/oledlg_Fr.rc 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,59 +1,59 @@ -/* - * oledlg dll resources - * French language support - * - * Copyright (C) 2005 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "InsÚrer Objet" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "Type d'objet:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Annuler",IDCANCEL,221,24,66,14 - GROUPBOX "RÚsultat",IDC_RESULT,7,103,208,41 - CONTROL "CrÚer Nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "CrÚer Contr¶le",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "CrÚer Depuis Fichier",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "&Ajoute Contr¶le...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Afficher Comme Ic¶ne",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Parcourir...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Fichier:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "InsÚrer un nouvel object %s dans votre document" - IDS_RESULTFILEOBJDESC "InsÞre le contenu du fichier comme un objet dans votre document afin que vous puissiez l'activer en utilisant le programme avec lequel vous l'avez crÚÚ." - IDS_BROWSE "Parcourir" - IDS_NOTOLEMOD "Le fichier ne semble pas Ûtre un module OLE valide. Impossible d'enregistrer le contr¶le OLE." - IDS_NOTOLEMODCAPTION "Ajouter Contr¶le" -} +/* + * oledlg dll resources + * French language support + * + * Copyright (C) 2005 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "InsÚrer Objet" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Type d'objet:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Annuler",IDCANCEL,221,24,66,14 + GROUPBOX "RÚsultat",IDC_RESULT,7,103,208,41 + CONTROL "CrÚer Nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "CrÚer Contr¶le",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "CrÚer Depuis Fichier",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Ajoute Contr¶le...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Afficher Comme Ic¶ne",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Parcourir...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Fichier:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "InsÚrer un nouvel object %s dans votre document" + IDS_RESULTFILEOBJDESC "InsÞre le contenu du fichier comme un objet dans votre document afin que vous puissiez l'activer en utilisant le programme avec lequel vous l'avez crÚÚ." + IDS_BROWSE "Parcourir" + IDS_NOTOLEMOD "Le fichier ne semble pas Ûtre un module OLE valide. Impossible d'enregistrer le contr¶le OLE." + IDS_NOTOLEMODCAPTION "Ajouter Contr¶le" +} Property changes on: trunk/reactos/lib/oledlg/oledlg_Fr.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/oledlg_It.rc --- trunk/reactos/lib/oledlg/oledlg_It.rc 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/oledlg_It.rc 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,56 +1,56 @@ -/* - * Copyright 2003 Ulrich Czekalla for CodeWeavers - * Copyright 2003 Ivan Leo Puoti - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Insersci oggetto" -FONT 8, "MS Shell Dlg" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "Tipo di oggetto:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "Annulla",IDCANCEL,221,24,66,14 - GROUPBOX "Risultato",IDC_RESULT,7,103,208,41 - CONTROL "Crea Nuovo",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "Crea Controllo",IDC_CREATECONTROL,"Tasto", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Crea da File",IDC_CREATEFROMFILE,"Tasto", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "&Aggiungi Controllo...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Visualizza come Icona",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "Esplora...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "File:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "Inserisci un nuovo oggetto %s nel documento" - IDS_RESULTFILEOBJDESC "Inserisci i contenuti del file come un oggetto nel documento in modo da poterlo attivare usando il programma che lo ha creato." - IDS_BROWSE "Esplora" - IDS_NOTOLEMOD "Il file non sembra essere un module OLE valido. Impossibile registrare il controllo OLE." - IDS_NOTOLEMODCAPTION "Aggiungi Controllo" -} +/* + * Copyright 2003 Ulrich Czekalla for CodeWeavers + * Copyright 2003 Ivan Leo Puoti + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Insersci oggetto" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Tipo di oggetto:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Annulla",IDCANCEL,221,24,66,14 + GROUPBOX "Risultato",IDC_RESULT,7,103,208,41 + CONTROL "Crea Nuovo",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Crea Controllo",IDC_CREATECONTROL,"Tasto", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Crea da File",IDC_CREATEFROMFILE,"Tasto", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Aggiungi Controllo...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Visualizza come Icona",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Esplora...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "File:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Inserisci un nuovo oggetto %s nel documento" + IDS_RESULTFILEOBJDESC "Inserisci i contenuti del file come un oggetto nel documento in modo da poterlo attivare usando il programma che lo ha creato." + IDS_BROWSE "Esplora" + IDS_NOTOLEMOD "Il file non sembra essere un module OLE valido. Impossibile registrare il controllo OLE." + IDS_NOTOLEMODCAPTION "Aggiungi Controllo" +} Property changes on: trunk/reactos/lib/oledlg/oledlg_It.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/oledlg_Ja.rc --- trunk/reactos/lib/oledlg/oledlg_Ja.rc 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/oledlg_Ja.rc 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,55 +1,55 @@ -/* - * Copyright 2004 Hajime Segawa - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "âIâuâWâFâNâgé?æ}ô³" -FONT 9, "MS UI Gothic" -BEGIN - LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - LTEXT "âIâuâWâFâNâgé? ÄÝùÌ:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "OK",IDOK,221,7,66,14 - PUSHBUTTON "âLâââôâZâï",IDCANCEL,221,24,66,14 - GROUPBOX "îïë?",IDC_RESULT,7,103,208,41 - CONTROL "ÉVïKìýÉ¼",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,20,62,10 - CONTROL "âRâôâgâìü[âïéìýÉ¼",IDC_CREATECONTROL,"Button", - BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "âtâ@âCâïé®éþìýÉ¼",IDC_CREATEFROMFILE,"Button", - BS_AUTORADIOBUTTON,7,37,67,10 - LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "âRâôâgâìü[âïéÆÃë ?(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "âAâCâRâôéãéÁé? ò\Äª",IDC_ASICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "ÄQÅã...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "âtâ@âCâï:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE - EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE -END - -STRINGTABLE DISCARDABLE -{ - IDS_RESULTOBJDESC "âhâLâàâüâôâgé?ÉVéÁéó %s âIâuâWâFâNâgéæ}ô³éÁé? éÀ" - IDS_RESULTFILEOBJDESC "âtâ@âCâïé?ôÓùeéâIâuâWâFâNâgéãéÁé? âhâLâàâüâôâgé?æ}ô³éÁé?éÀüBâIâuâWâFâNâgé?ìýÉ¼éÁé¢âvâìâOâëâÇé®éþùLî°é?é?é½ é?éÀüB" - IDS_BROWSE "ÄQÅã" - IDS_NOTOLEMOD "âtâ@âCâïé?ùLî°é?OLEâéâWâàü[âïé?é?é?éóéµéñé? éÀüBOLEâRâôâgâìü[âïéôoÿ^é?é½é?é?é±üB" - IDS_NOTOLEMODCAPTION "âRâôâgâìü[âïéÆÃë?" -} +/* + * Copyright 2004 Hajime Segawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "âIâuâWâFâNâgé?æ}ô³" +FONT 9, "MS UI Gothic" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "âIâuâWâFâNâgé? ÄÝùÌ:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "âLâââôâZâï",IDCANCEL,221,24,66,14 + GROUPBOX "îïë?",IDC_RESULT,7,103,208,41 + CONTROL "ÉVïKìýÉ¼",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "âRâôâgâìü[âïéìýÉ¼",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "âtâ@âCâïé®éþìýÉ¼",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "âRâôâgâìü[âïéÆÃë ?(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "âAâCâRâôéãéÁé? ò\Äª",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "ÄQÅã...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "âtâ@âCâï:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "âhâLâàâüâôâgé?ÉVéÁéó %s âIâuâWâFâNâgéæ}ô³éÁé? éÀ" + IDS_RESULTFILEOBJDESC "âtâ@âCâïé?ôÓùeéâIâuâWâFâNâgéãéÁé? âhâLâàâüâôâgé?æ}ô³éÁé?éÀüBâIâuâWâFâNâgé?ìýÉ¼éÁé¢âvâìâOâëâÇé®éþùLî°é?é?é½ é?éÀüB" + IDS_BROWSE "ÄQÅã" + IDS_NOTOLEMOD "âtâ@âCâïé?ùLî°é?OLEâéâWâàü[âïé?é?é?éóéµéñé? éÀüBOLEâRâôâgâìü[âïéôoÿ^é?é½é?é?é±üB" + IDS_NOTOLEMODCAPTION "âRâôâgâìü[âïéÆÃë?" +} Property changes on: trunk/reactos/lib/oledlg/oledlg_Ja.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/oledlg_Nl.rc --- trunk/reactos/lib/oledlg/oledlg_Nl.rc 2005-08-05 08:02:09 UTC (rev 17061) +++ trunk/reactos/lib/oledlg/oledlg_Nl.rc 2005-08-05 09:16:38 UTC (rev 17062) @@ -1,56 +1,56 @@ -/* - * Copyright 2003 Ulrich Czekalla for CodeWeavers - * Copyright 2003 Hans Leidekker - * - * This library is free software; you can redistribute it and/or [truncated at 1000 lines; 446 more skipped]

19 years, 1 month

[gvg] 17061: Sync to Wine-20050628:

by gvg＠svn.reactos.com

Sync to Wine-20050628: Marcus Meissner <marcus(a)jet.franken.de> - Move static variables out of header file, also the local interface implementations. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Make remaining OLE interface vtables const. cjacek <cjacek(a)gmail.com> - Fix typo in comment about Wine registry key. Alexandre Julliard <julliard(a)winehq.org> - Moved a few registry keys from HKLM\Software\Wine to HKCU\Software\Wine for consistency. - Added magic comments to all Wine-specific registry accesses to make them easier to grep. - Sort entry points in the same order as Windows. Stefan Huehner <stefan(a)huehner.org> - Fix more -Wstrict-prototypes warnings. Modified: trunk/reactos/lib/shdocvw/classinfo.c Modified: trunk/reactos/lib/shdocvw/events.c Modified: trunk/reactos/lib/shdocvw/factory.c Modified: trunk/reactos/lib/shdocvw/misc.c Modified: trunk/reactos/lib/shdocvw/oleobject.c Modified: trunk/reactos/lib/shdocvw/persist.c Modified: trunk/reactos/lib/shdocvw/shdocvw.h Modified: trunk/reactos/lib/shdocvw/shdocvw.spec Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c Modified: trunk/reactos/lib/shdocvw/webbrowser.c _____ Modified: trunk/reactos/lib/shdocvw/classinfo.c --- trunk/reactos/lib/shdocvw/classinfo.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/classinfo.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -72,7 +72,7 @@ * IProvideClassInfo virtual function table for IE Web Browser component */ -static IProvideClassInfoVtbl WBPCI_Vtbl = +static const IProvideClassInfoVtbl WBPCI_Vtbl = { WBPCI_QueryInterface, WBPCI_AddRef, @@ -154,7 +154,7 @@ * IProvideClassInfo virtual function table for IE Web Browser component */ -static IProvideClassInfo2Vtbl WBPCI2_Vtbl = +static const IProvideClassInfo2Vtbl WBPCI2_Vtbl = { WBPCI2_QueryInterface, WBPCI2_AddRef, _____ Modified: trunk/reactos/lib/shdocvw/events.c --- trunk/reactos/lib/shdocvw/events.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/events.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +static IConnectionPointImpl SHDOCVW_ConnectionPoint; static const GUID IID_INotifyDBEvents = { 0xdb526cc0, 0xd188, 0x11cd, { 0xad, 0x48, 0x00, 0xaa, 0x00, 0x3c, 0x9c, 0xb6 } }; @@ -101,7 +102,7 @@ * IConnectionPointContainer virtual function table for IE Web Browser component */ -static IConnectionPointContainerVtbl WBCPC_Vtbl = +static const IConnectionPointContainerVtbl WBCPC_Vtbl = { WBCPC_QueryInterface, WBCPC_AddRef, @@ -193,7 +194,7 @@ * IConnectionPoint virtual function table for IE Web Browser component */ -static IConnectionPointVtbl WBCP_Vtbl = +static const IConnectionPointVtbl WBCP_Vtbl = { WBCP_QueryInterface, WBCP_AddRef, @@ -205,4 +206,4 @@ WBCP_EnumConnections }; -IConnectionPointImpl SHDOCVW_ConnectionPoint = {&WBCP_Vtbl}; +static IConnectionPointImpl SHDOCVW_ConnectionPoint = {&WBCP_Vtbl}; _____ Modified: trunk/reactos/lib/shdocvw/factory.c --- trunk/reactos/lib/shdocvw/factory.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/factory.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -105,7 +105,7 @@ return S_OK; } -static IClassFactoryVtbl WBCF_Vtbl = +static const IClassFactoryVtbl WBCF_Vtbl = { WBCF_QueryInterface, WBCF_AddRef, _____ Modified: trunk/reactos/lib/shdocvw/misc.c --- trunk/reactos/lib/shdocvw/misc.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/misc.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -78,7 +78,7 @@ * IQuickActivate virtual function table for IE Web Browser component */ -static IQuickActivateVtbl WBQA_Vtbl = +static const IQuickActivateVtbl WBQA_Vtbl = { WBQA_QueryInterface, WBQA_AddRef, _____ Modified: trunk/reactos/lib/shdocvw/oleobject.c --- trunk/reactos/lib/shdocvw/oleobject.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/oleobject.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -30,6 +30,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); /********************************************************************** + * IOleControl declaration for SHDOCVW.DLL + */ +typedef struct +{ + /* IUnknown fields */ + const IOleControlVtbl *lpVtbl; + DWORD ref; +} IOleControlImpl; + +static IOleControlImpl SHDOCVW_OleControl; + +/********************************************************************** + * IOleInPlaceObject declaration for SHDOCVW.DLL + */ +typedef struct +{ + /* IUnknown fields */ + const IOleInPlaceObjectVtbl *lpVtbl; + DWORD ref; +} IOleInPlaceObjectImpl; + +static IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject; + +/********************************************************************** * Implement the IOleObject interface for the web browser component * * Based on DefaultHandler code in dlls/ole32/defaulthandler.c. @@ -407,7 +431,7 @@ * IOleObject virtual function table for IE Web Browser component */ -static IOleObjectVtbl WBOOBJ_Vtbl = +static const IOleObjectVtbl WBOOBJ_Vtbl = { WBOOBJ_QueryInterface, WBOOBJ_AddRef, @@ -522,7 +546,7 @@ * IOleInPlaceObject virtual function table for IE Web Browser component */ -static IOleInPlaceObjectVtbl WBOIPO_Vtbl = +static const IOleInPlaceObjectVtbl WBOIPO_Vtbl = { WBOIPO_QueryInterface, WBOIPO_AddRef, @@ -535,7 +559,7 @@ WBOIPO_ReactivateAndUndo }; -IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject = {&WBOIPO_Vtbl}; +static IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject = {&WBOIPO_Vtbl}; /********************************************************************** @@ -594,7 +618,7 @@ * IOleControl virtual function table for IE Web Browser component */ -static IOleControlVtbl WBOC_Vtbl = +static const IOleControlVtbl WBOC_Vtbl = { WBOC_QueryInterface, WBOC_AddRef, @@ -605,4 +629,4 @@ WBOC_FreezeEvents }; -IOleControlImpl SHDOCVW_OleControl = {&WBOC_Vtbl}; +static IOleControlImpl SHDOCVW_OleControl = {&WBOC_Vtbl}; _____ Modified: trunk/reactos/lib/shdocvw/persist.c --- trunk/reactos/lib/shdocvw/persist.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/persist.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -92,7 +92,7 @@ * IPersistStorage virtual function table for IE Web Browser component */ -static IPersistStorageVtbl WBPS_Vtbl = +static const IPersistStorageVtbl WBPS_Vtbl = { WBPS_QueryInterface, WBPS_AddRef, @@ -178,7 +178,7 @@ * IPersistStreamInit virtual function table for IE Web Browser component */ -static IPersistStreamInitVtbl WBPSI_Vtbl = +static const IPersistStreamInitVtbl WBPSI_Vtbl = { WBPSI_QueryInterface, WBPSI_AddRef, _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.h --- trunk/reactos/lib/shdocvw/shdocvw.h 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/shdocvw.h 2005-08-05 08:02:09 UTC (rev 17061) @@ -41,7 +41,7 @@ typedef struct { /* IUnknown fields */ - IClassFactoryVtbl *lpVtbl; + const IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; @@ -54,46 +54,19 @@ typedef struct { /* IUnknown fields */ - IOleObjectVtbl *lpVtbl; + const IOleObjectVtbl *lpVtbl; DWORD ref; } IOleObjectImpl; extern IOleObjectImpl SHDOCVW_OleObject; - /********************************************************************** - * IOleInPlaceObject declaration for SHDOCVW.DLL - */ -typedef struct -{ - /* IUnknown fields */ - IOleInPlaceObjectVtbl *lpVtbl; - DWORD ref; -} IOleInPlaceObjectImpl; - -extern IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject; - - -/********************************************************************** - * IOleControl declaration for SHDOCVW.DLL - */ -typedef struct -{ - /* IUnknown fields */ - IOleControlVtbl *lpVtbl; - DWORD ref; -} IOleControlImpl; - -extern IOleControlImpl SHDOCVW_OleControl; - - -/********************************************************************** * IWebBrowser declaration for SHDOCVW.DLL */ typedef struct { /* IUnknown fields */ - IWebBrowserVtbl *lpVtbl; + const IWebBrowserVtbl *lpVtbl; DWORD ref; } IWebBrowserImpl; @@ -106,7 +79,7 @@ typedef struct { /* IUnknown fields */ - IProvideClassInfoVtbl *lpVtbl; + const IProvideClassInfoVtbl *lpVtbl; DWORD ref; } IProvideClassInfoImpl; @@ -119,7 +92,7 @@ typedef struct { /* IUnknown fields */ - IProvideClassInfo2Vtbl *lpVtbl; + const IProvideClassInfo2Vtbl *lpVtbl; DWORD ref; } IProvideClassInfo2Impl; @@ -132,7 +105,7 @@ typedef struct { /* IUnknown fields */ - IPersistStorageVtbl *lpVtbl; + const IPersistStorageVtbl *lpVtbl; DWORD ref; } IPersistStorageImpl; @@ -145,7 +118,7 @@ typedef struct { /* IUnknown fields */ - IPersistStreamInitVtbl *lpVtbl; + const IPersistStreamInitVtbl *lpVtbl; DWORD ref; } IPersistStreamInitImpl; @@ -158,7 +131,7 @@ typedef struct { /* IUnknown fields */ - IQuickActivateVtbl *lpVtbl; + const IQuickActivateVtbl *lpVtbl; DWORD ref; } IQuickActivateImpl; @@ -171,7 +144,7 @@ typedef struct { /* IUnknown fields */ - IConnectionPointContainerVtbl *lpVtbl; + const IConnectionPointContainerVtbl *lpVtbl; DWORD ref; } IConnectionPointContainerImpl; @@ -184,17 +157,15 @@ typedef struct { /* IUnknown fields */ - IConnectionPointVtbl *lpVtbl; + const IConnectionPointVtbl *lpVtbl; DWORD ref; } IConnectionPointImpl; -extern IConnectionPointImpl SHDOCVW_ConnectionPoint; - /********************************************************************** * Dll lifetime tracking declaration for shdocvw.dll */ extern LONG SHDOCVW_refCount; -static inline void SHDOCVW_LockModule() { InterlockedIncrement( &SHDOCVW_refCount ); } -static inline void SHDOCVW_UnlockModule() { InterlockedDecrement( &SHDOCVW_refCount ); } +static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } +static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } #endif /* __WINE_SHDOCVW_H */ _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.spec --- trunk/reactos/lib/shdocvw/shdocvw.spec 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/shdocvw.spec 2005-08-05 08:02:09 UTC (rev 17061) @@ -1,129 +1,129 @@ -# ordinal exports -101 stub -noname IEWinMain -102 stub -noname CreateShortcutInDirA -103 stub -noname CreateShortcutInDirW -104 stub -noname WhichPlatformFORWARD -105 stub -noname CreateShortcutInDirEx -106 stub HlinkFindFrame -107 stub SetShellOfflineState -108 stub AddUrlToFavorites -110 stdcall -noname WinList_Init() -111 stub -noname WinList_Terminate -115 stub -noname CreateFromDesktop -116 stub -noname DDECreatePostNotify -117 stub -noname DDEHandleViewFolderNotify -@ stub IEAboutBox -118 stdcall -noname ShellDDEInit(long) -119 stub -noname SHCreateDesktop -120 stub -noname SHDesktopMessageLoop -121 stub -noname StopWatchModeFORWARD -122 stub -noname StopWatchFlushFORWARD -123 stub -noname StopWatchFORWARD -125 stdcall -noname RunInstallUninstallStubs() -130 stub -noname RunInstallUninstallStubs2 -131 stub -noname SHCreateSplashScreen -135 stub -noname IsFileUrl -136 stub -noname IsFileUrlW -137 stub -noname PathIsFilePath -138 stub -noname URLSubLoadString -139 stub -noname OpenPidlOrderStream -140 stub -noname DragDrop -141 stub -noname IEInvalidateImageList -142 stub -noname IEMapPIDLToSystemImageListIndex -143 stub -noname ILIsWeb -145 stub -noname IEGetAttributesOf -146 stub -noname IEBindToObject -147 stub -noname IEGetNameAndFlags -148 stub -noname IEGetDisplayName -149 stub -noname IEBindToObjectEx -150 stub -noname _GetStdLocation -151 stub -noname URLSubRegQueryA -152 stub -noname CShellUIHelper_CreateInstance2 -153 stub -noname IsURLChild -158 stub -noname SHRestricted2A -159 stub -noname SHRestricted2W -160 stub -noname SHIsRestricted2W -161 stub @ # CSearchAssistantOC::OnDraw -162 stub -noname CDDEAuto_Navigate -163 stub SHAddSubscribeFavorite -164 stub -noname ResetProfileSharing -165 stub -noname URLSubstitution -167 stub -noname IsIEDefaultBrowser -169 stub -noname ParseURLFromOutsideSourceA -170 stub -noname ParseURLFromOutsideSourceW -171 stub -noname _DeletePidlDPA -172 stub -noname IURLQualify -173 stub -noname SHIsRestricted -174 stub -noname SHIsGlobalOffline -175 stub -noname DetectAndFixAssociations -176 stub -noname EnsureWebViewRegSettings -177 stub -noname WinList_NotifyNewLocation -178 stub -noname WinList_FindFolderWindow -179 stub -noname WinList_GetShellWindows -180 stub -noname WinList_RegisterPending -181 stub -noname WinList_Revoke -183 stub -noname SHMapNbspToSp -185 stub -noname FireEvent_Quit -187 stub -noname SHDGetPageLocation -188 stub -noname SHIEErrorMsgBox -189 stub -noname IEGetDisplayName -190 stub -noname SHRunIndirectRegClientCommandForward -191 stub -noname SHIsRegisteredClient -192 stub -noname SHGetHistoryPIDL -194 stub -noname IECleanUpAutomationObject -195 stub -noname IEOnFirstBrowserCreation -196 stub -noname IEDDE_WindowDestroyed -197 stub -noname IEDDE_NewWindow -198 stub -noname IsErrorUrl -199 stub @ -200 stub -noname SHGetViewStream -203 stub -noname NavToUrlUsingIEA -204 stub -noname NavToUrlUsingIEW -208 stub -noname SearchForElementInHead -209 stub -noname JITCoCreateInstance -210 stub -noname UrlHitsNetW -211 stub -noname ClearAutoSuggestForForms -212 stub -noname GetLinkInfo -213 stub -noname UseCustomInternetSearch -214 stub -noname GetSearchAssistantUrlW -215 stub -noname GetSearchAssistantUrlA -216 stub -noname GetDefaultInternetSearchUrlW -217 stub -noname GetDefaultInternetSearchUrlA -218 stub -noname IEParseDisplayNameWithBCW -219 stub -noname IEILIsEqual -220 stub @ -221 stub -noname IECreateFromPathCPWithBCA -222 stub -noname IECreateFromPathCPWithBCW -223 stub -noname ResetWebSettings -224 stub -noname IsResetWebSettingsRequired -225 stub -noname PrepareURLForDisplayUTF8W -226 stub -noname IEIsLinkSafe -227 stub -noname SHUseClassicToolbarGlyphs -228 stub -noname SafeOpenPromptForShellExec -229 stub -noname SafeOpenPromptForPackager - -@ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(long long ptr) -@ stdcall -private DllGetVersion(ptr) -@ stdcall -private DllInstall(long wstr) -@ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() -@ stub DllRegisterWindowClasses -@ stub DoAddToFavDlg -@ stub DoAddToFavDlgW -@ stub DoFileDownload -@ stub DoFileDownloadEx -@ stub DoOrganizeFavDlg -@ stub DoOrganizeFavDlgW -@ stub DoPrivacyDlg -@ stub HlinkFrameNavigate -@ stub HlinkFrameNavigateNHL -@ stub ImportPrivacySettings -@ stub InstallReg_RunDLL -@ stub IEWriteErrorLog -@ stdcall OpenURL(long long str long) -@ stub SHGetIDispatchForFolder -@ stdcall SetQueryNetSessionCount(long) -@ stub SoftwareUpdateMessageBox -@ stub URLQualifyA -@ stub URLQualifyW +# ordinal exports +101 stub -noname IEWinMain +102 stub -noname CreateShortcutInDirA +103 stub -noname CreateShortcutInDirW +104 stub -noname WhichPlatformFORWARD +105 stub -noname CreateShortcutInDirEx +106 stub HlinkFindFrame +107 stub SetShellOfflineState +108 stub AddUrlToFavorites +110 stdcall -noname WinList_Init() +111 stub -noname WinList_Terminate +115 stub -noname CreateFromDesktop +116 stub -noname DDECreatePostNotify +117 stub -noname DDEHandleViewFolderNotify +118 stdcall -noname ShellDDEInit(long) +119 stub -noname SHCreateDesktop +120 stub -noname SHDesktopMessageLoop +121 stub -noname StopWatchModeFORWARD +122 stub -noname StopWatchFlushFORWARD +123 stub -noname StopWatchFORWARD +125 stdcall -noname RunInstallUninstallStubs() +130 stub -noname RunInstallUninstallStubs2 +131 stub -noname SHCreateSplashScreen +135 stub -noname IsFileUrl +136 stub -noname IsFileUrlW +137 stub -noname PathIsFilePath +138 stub -noname URLSubLoadString +139 stub -noname OpenPidlOrderStream +140 stub -noname DragDrop +141 stub -noname IEInvalidateImageList +142 stub -noname IEMapPIDLToSystemImageListIndex +143 stub -noname ILIsWeb +145 stub -noname IEGetAttributesOf +146 stub -noname IEBindToObject +147 stub -noname IEGetNameAndFlags +148 stub -noname IEGetDisplayName +149 stub -noname IEBindToObjectEx +150 stub -noname _GetStdLocation +151 stub -noname URLSubRegQueryA +152 stub -noname CShellUIHelper_CreateInstance2 +153 stub -noname IsURLChild +158 stub -noname SHRestricted2A +159 stub -noname SHRestricted2W +160 stub -noname SHIsRestricted2W +161 stub @ # CSearchAssistantOC::OnDraw +162 stub -noname CDDEAuto_Navigate +163 stub SHAddSubscribeFavorite +164 stub -noname ResetProfileSharing +165 stub -noname URLSubstitution +167 stub -noname IsIEDefaultBrowser +169 stub -noname ParseURLFromOutsideSourceA +170 stub -noname ParseURLFromOutsideSourceW +171 stub -noname _DeletePidlDPA +172 stub -noname IURLQualify +173 stub -noname SHIsRestricted +174 stub -noname SHIsGlobalOffline +175 stub -noname DetectAndFixAssociations +176 stub -noname EnsureWebViewRegSettings +177 stub -noname WinList_NotifyNewLocation +178 stub -noname WinList_FindFolderWindow +179 stub -noname WinList_GetShellWindows +180 stub -noname WinList_RegisterPending +181 stub -noname WinList_Revoke +183 stub -noname SHMapNbspToSp +185 stub -noname FireEvent_Quit +187 stub -noname SHDGetPageLocation +188 stub -noname SHIEErrorMsgBox +189 stub -noname IEGetDisplayName +190 stub -noname SHRunIndirectRegClientCommandForward +191 stub -noname SHIsRegisteredClient +192 stub -noname SHGetHistoryPIDL +194 stub -noname IECleanUpAutomationObject +195 stub -noname IEOnFirstBrowserCreation +196 stub -noname IEDDE_WindowDestroyed +197 stub -noname IEDDE_NewWindow +198 stub -noname IsErrorUrl +199 stub @ +200 stub -noname SHGetViewStream +203 stub -noname NavToUrlUsingIEA +204 stub -noname NavToUrlUsingIEW +208 stub -noname SearchForElementInHead +209 stub -noname JITCoCreateInstance +210 stub -noname UrlHitsNetW +211 stub -noname ClearAutoSuggestForForms +212 stub -noname GetLinkInfo +213 stub -noname UseCustomInternetSearch +214 stub -noname GetSearchAssistantUrlW +215 stub -noname GetSearchAssistantUrlA +216 stub -noname GetDefaultInternetSearchUrlW +217 stub -noname GetDefaultInternetSearchUrlA +218 stub -noname IEParseDisplayNameWithBCW +219 stub -noname IEILIsEqual +220 stub @ +221 stub -noname IECreateFromPathCPWithBCA +222 stub -noname IECreateFromPathCPWithBCW +223 stub -noname ResetWebSettings +224 stub -noname IsResetWebSettingsRequired +225 stub -noname PrepareURLForDisplayUTF8W +226 stub -noname IEIsLinkSafe +227 stub -noname SHUseClassicToolbarGlyphs +228 stub -noname SafeOpenPromptForShellExec +229 stub -noname SafeOpenPromptForPackager + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(long long ptr) +@ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() +@ stub DllRegisterWindowClasses +@ stdcall -private DllUnregisterServer() +@ stub DoAddToFavDlg +@ stub DoAddToFavDlgW +@ stub DoFileDownload +@ stub DoFileDownloadEx +@ stub DoOrganizeFavDlg +@ stub DoOrganizeFavDlgW +@ stub DoPrivacyDlg +@ stub HlinkFrameNavigate +@ stub HlinkFrameNavigateNHL +@ stub IEAboutBox +@ stub IEWriteErrorLog +@ stub ImportPrivacySettings +@ stub InstallReg_RunDLL +@ stdcall OpenURL(long long str long) +@ stub SHGetIDispatchForFolder +@ stdcall SetQueryNetSessionCount(long) +@ stub SoftwareUpdateMessageBox +@ stub URLQualifyA +@ stub URLQualifyW Property changes on: trunk/reactos/lib/shdocvw/shdocvw.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c --- trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -151,7 +151,7 @@ * SHDOCVW_TryDownloadMozillaControl */ typedef struct _IBindStatusCallbackImpl { - IBindStatusCallbackVtbl *vtbl; + const IBindStatusCallbackVtbl *vtbl; DWORD ref; HWND hDialog; BOOL *pbCancelled; @@ -275,7 +275,7 @@ return S_OK; } -struct IBindStatusCallbackVtbl dlVtbl = +static const IBindStatusCallbackVtbl dlVtbl = { dlQueryInterface, dlAddRef, @@ -318,7 +318,8 @@ /* find the name of the thing to download */ szUrl[0] = 0; - r = RegOpenKeyW( HKEY_LOCAL_MACHINE, szMozDlPath, &hkey ); + /* @@ Wine registry key: HKCU\Software\Wine\shdocvw */ + r = RegOpenKeyW( HKEY_CURRENT_USER, szMozDlPath, &hkey ); if( r == ERROR_SUCCESS ) { sz = MAX_PATH; @@ -387,7 +388,7 @@ } } -static BOOL SHDOCVW_TryDownloadMozillaControl() +static BOOL SHDOCVW_TryDownloadMozillaControl(void) { DWORD r; WCHAR buf[0x100]; @@ -413,7 +414,7 @@ return TRUE; } -static BOOL SHDOCVW_TryLoadMozillaControl() +static BOOL SHDOCVW_TryLoadMozillaControl(void) { WCHAR szPath[MAX_PATH]; BOOL bTried = FALSE; _____ Modified: trunk/reactos/lib/shdocvw/webbrowser.c --- trunk/reactos/lib/shdocvw/webbrowser.c 2005-08-05 07:48:18 UTC (rev 17060) +++ trunk/reactos/lib/shdocvw/webbrowser.c 2005-08-05 08:02:09 UTC (rev 17061) @@ -239,7 +239,7 @@ * IWebBrowser virtual function table for IE Web Browser component */ -static IWebBrowserVtbl WB_Vtbl = +static const IWebBrowserVtbl WB_Vtbl = { WB_QueryInterface, WB_AddRef,

19 years, 1 month

[gvg] 17060: Sync to Wine-20050628:

by gvg＠svn.reactos.com

Sync to Wine-20050628: Dmitry Timoshkov <dmitry(a)codeweavers.com> - Make remaining OLE interface vtables const. Mike McCormack <mike(a)codeweavers.com> - SHCreateStreamOnFileW is implemented in shlwapi, so we don't need another implementation in shell32. - Add a cast to get rid of a warning. - Warning fixes for -Wmissing-declarations and -Wwrite-strings. - Make functions static. - -Wpointer-sign fixes. - forward AddRef, Release, QueryInterface and GetClassID to internal implementations - implement GetClassID properly - Switch IShellLink to use shlwapi.SHCreateStreamOnFileW. - Remove some uses of wine/unicode.h functions. - Add the IContextMenu interface to the ShellLink object. - Implement ShellLink's IShellExtInit::Initialize() method. - add the IShellExtInit interface to the ShellLink object - use inline functions rather than macros to resolve the implementation pointer from an interface pointer - Add the IShellLinkDataList interface to the ShellLink object. Michael Jung <mjung(a)iss.tu-darmstadt.de> - Use the CallForAttributes registry value, instead of promoting the root folder's SFGAO_FILESYSTEM flag to the registry. - Return the correct attributes for the desktop folder. - Corresponding tests. - Support for shellfolder's CallForAttributes registry value. - Let BindToObject fail, if called with empty relative pidl. - Tests to show that it should do so. - Fix SHBrowseForFolder to not pass an empty pidl to BindToObject. - Fix a lurking infinite loop in SHGetPathFromIDList. - Support for shellfolder's CallForAttributes registry value. - Use SHGetPathFromIDList instead of SHELL32_GetPathFromIDList. - Implement SHGetPathFromIDList based on GetDisplayNameOf. Stefan Doesinger <stefandoesinger(a)gmx.at> - Handle cidl==0 in shfldr_desktop, shfldr_fs and shfldr_mycomp. - Remove the dwAttributes member from the IGenericSFImpl class, it's not needed and can't be initialised in Initialize and InitializeEx. Vitaly Lipatov <lav(a)etersoft.ru> - Realize DoEnvironmentSubstA via ExpandEnvironmentStringsA. - Fix types and return values. - Add prototype into shellapi.h. Aric Stewart <aric(a)codeweavers.com> - Fix the BrowseForFolder dialog so that when it does the callbacks it uses the correct message instead of always sending BEFM_INITIALIZED. Juan Lang <juan_lang(a)yahoo.com> - Const-ify a mask. - Set default for "My Documents" to $HOME, and "Desktop" to ~/Desktop. Alexandre Julliard <julliard(a)winehq.org> - Sort entry points in the same order as Windows. Francois Gouget <fgouget(a)free.fr> - Fix winapi_check documentation warnings. Marcus Meissner <marcus(a)jet.franken.de> - ExtractAssociatedIconA needs to allocate enough space to have EAIW fill in lpIconPathW. Huw Davies <huw(a)codeweavers.com> - Unquote the icon file path if it's quoted. Modified: trunk/reactos/lib/shell32/Makefile.in Modified: trunk/reactos/lib/shell32/autocomplete.c Modified: trunk/reactos/lib/shell32/brsfolder.c Modified: trunk/reactos/lib/shell32/classes.c Modified: trunk/reactos/lib/shell32/clipboard.c Modified: trunk/reactos/lib/shell32/cpanelfolder.c Modified: trunk/reactos/lib/shell32/dataobject.c Modified: trunk/reactos/lib/shell32/debughlp.c Modified: trunk/reactos/lib/shell32/dragdrophelper.c Modified: trunk/reactos/lib/shell32/enumidlist.c Modified: trunk/reactos/lib/shell32/folders.c Modified: trunk/reactos/lib/shell32/iconcache.c Deleted: trunk/reactos/lib/shell32/memorystream.c Modified: trunk/reactos/lib/shell32/pidl.c Modified: trunk/reactos/lib/shell32/pidl.h Modified: trunk/reactos/lib/shell32/regsvr.c Modified: trunk/reactos/lib/shell32/shell32.spec Modified: trunk/reactos/lib/shell32/shell32.xml Modified: trunk/reactos/lib/shell32/shell32_main.h Modified: trunk/reactos/lib/shell32/shelllink.c Modified: trunk/reactos/lib/shell32/shellole.c Modified: trunk/reactos/lib/shell32/shellord.c Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/lib/shell32/shfldr_fs.c Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c Modified: trunk/reactos/lib/shell32/shlexec.c Modified: trunk/reactos/lib/shell32/shlfolder.c Modified: trunk/reactos/lib/shell32/shlfsbind.c Modified: trunk/reactos/lib/shell32/shlmenu.c Modified: trunk/reactos/lib/shell32/shlview.c Modified: trunk/reactos/lib/shell32/shv_bg_cmenu.c Modified: trunk/reactos/lib/shell32/shv_item_cmenu.c Modified: trunk/reactos/lib/shell32/systray.c _____ Modified: trunk/reactos/lib/shell32/Makefile.in --- trunk/reactos/lib/shell32/Makefile.in 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/Makefile.in 2005-08-05 07:48:18 UTC (rev 17060) @@ -25,7 +25,6 @@ enumidlist.c \ folders.c \ iconcache.c \ - memorystream.c \ pidl.c \ regsvr.c \ shell32_main.c \ _____ Modified: trunk/reactos/lib/shell32/autocomplete.c --- trunk/reactos/lib/shell32/autocomplete.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/autocomplete.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -62,8 +62,8 @@ typedef struct { - IAutoCompleteVtbl *lpVtbl; - IAutoComplete2Vtbl *lpvtblAutoComplete2; + const IAutoCompleteVtbl *lpVtbl; + const IAutoComplete2Vtbl *lpvtblAutoComplete2; DWORD ref; BOOL enabled; HWND hwndEdit; @@ -76,8 +76,8 @@ AUTOCOMPLETEOPTIONS options; } IAutoCompleteImpl; -static struct IAutoCompleteVtbl acvt; -static struct IAutoComplete2Vtbl ac2vt; +static const IAutoCompleteVtbl acvt; +static const IAutoComplete2Vtbl ac2vt; #define _IAutoComplete2_Offset ((int)(&(((IAutoCompleteImpl*)0)->lpvtblAutoComplete2))) #define _ICOM_THIS_From_IAutoComplete2(class, name) class* This = (class*)(((char*)name)-_IAutoComplete2_Offset); @@ -312,7 +312,7 @@ /*********************************************************************** *** * IAutoComplete_fnVTable */ -static IAutoCompleteVtbl acvt = +static const IAutoCompleteVtbl acvt = { IAutoComplete_fnQueryInterface, IAutoComplete_fnAddRef, @@ -432,7 +432,7 @@ /*********************************************************************** *** * IAutoComplete2_fnVTable */ -static IAutoComplete2Vtbl ac2vt = +static const IAutoComplete2Vtbl ac2vt = { IAutoComplete2_fnQueryInterface, IAutoComplete2_fnAddRef, _____ Modified: trunk/reactos/lib/shell32/brsfolder.c --- trunk/reactos/lib/shell32/brsfolder.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/brsfolder.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -80,7 +80,7 @@ { if (!lpBrowseInfo->lpfn) return; - lpBrowseInfo->lpfn( hWnd, BFFM_INITIALIZED, param, lpBrowseInfo->lParam ); + lpBrowseInfo->lpfn( hWnd, msg, param, lpBrowseInfo->lParam ); } /*********************************************************************** ******* @@ -428,8 +428,14 @@ if ((pnmtv->itemNew.state & TVIS_EXPANDEDONCE)) return 0; - r = IShellFolder_BindToObject( lptvid->lpsfParent, lptvid->lpi, 0, - (REFIID)&IID_IShellFolder, (LPVOID *)&lpsf2 ); + if (lptvid->lpi && lptvid->lpi->mkid.cb) { + r = IShellFolder_BindToObject( lptvid->lpsfParent, lptvid->lpi, 0, + (REFIID)&IID_IShellFolder, (LPVOID *)&lpsf2 ); + } else { + lpsf2 = lptvid->lpsfParent; + r = IShellFolder_AddRef(lpsf2); + } + if (SUCCEEDED(r)) FillTreeView( info, lpsf2, lptvid->lpifq, pnmtv->itemNew.hItem, lptvid->pEnumIL); _____ Modified: trunk/reactos/lib/shell32/classes.c --- trunk/reactos/lib/shell32/classes.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/classes.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -26,6 +26,9 @@ #include <string.h> #include <stdarg.h> #include <stdio.h> + +#define COBJMACROS + #include "wine/debug.h" #include "winerror.h" #include "windef.h" @@ -39,6 +42,7 @@ #include "shlguid.h" #include "shresdef.h" #include "shlwapi.h" +#include "pidl.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -178,6 +182,7 @@ else *dwNr=0; /* sometimes the icon number is missing */ ParseFieldW (szDest, 1, szDest, len); + PathUnquoteSpacesW(szDest); return TRUE; } return FALSE; @@ -201,6 +206,7 @@ else *dwNr=0; /* sometimes the icon number is missing */ ParseFieldA (szDest, 1, szDest, len); + PathUnquoteSpacesA(szDest); return TRUE; } return FALSE; @@ -339,47 +345,81 @@ return ret; } -/********************************************************************** ***************** -* HCR_GetFolderAttributes [internal] -* -* gets the folder attributes of a class -* -* FIXME -* verify the defaultvalue for *szDest -*/ -BOOL HCR_GetFolderAttributes (REFIID riid, LPDWORD szDest) -{ HKEY hkey; - char xriid[60]; - DWORD attributes; - DWORD len = 4; +/********************************************************************** ******** + * HCR_GetFolderAttributes [Internal] + * + * Query the registry for a shell folders' attributes + * + * PARAMS + * pidlFolder [I] A simple pidl of type PT_GUID. + * pdwAttributes [IO] In: Attributes to be queried, OUT: Resulting attributes. + * + * RETURNS + * TRUE: Found information for the attributes in the registry + * FALSE: No attribute information found + * + * NOTES + * If queried for an attribute, which is set in the CallForAttributes registry + * value, the function binds to the shellfolder objects and queries it. + */ +BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes) +{ + HKEY hSFKey; + LPOLESTR pwszCLSID; + LONG lResult; + DWORD dwTemp, dwLen; + static const WCHAR wszAttributes[] = { 'A','t','t','r','i','b','u','t','e','s',0 }; + static const WCHAR wszCallForAttributes[] = { + 'C','a','l','l','F','o','r','A','t','t','r','i','b','u','t','e','s',0 }; + WCHAR wszShellFolderKey[] = { 'C','L','S','I','D','\\','{','0','0','0','2','1','4','0','0','-', + '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-','0','0','0', '0','0','0','0', + '0','0','0','4','6','}','\\','S','h','e','l','l','F','o','l','d','e','r' ,0 }; - sprintf( xriid, "CLSID\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, - riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], - riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] ); - TRACE("%s\n",xriid ); + TRACE("(pidlFolder=%p, pdwAttributes=%p)\n", pidlFolder, pdwAttributes); + + if (!_ILIsPidlSimple(pidlFolder)) { + ERR("HCR_GetFolderAttributes should be called for simple PIDL's only!\n"); + return FALSE; + } + + if (!_ILIsDesktop(pidlFolder)) { + if (FAILED(StringFromCLSID(_ILGetGUIDPointer(pidlFolder), &pwszCLSID))) return FALSE; + memcpy(&wszShellFolderKey[6], pwszCLSID, 38 * sizeof(WCHAR)); + CoTaskMemFree(pwszCLSID); + } + + lResult = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszShellFolderKey, 0, KEY_READ, &hSFKey); + if (lResult != ERROR_SUCCESS) return FALSE; + + dwLen = sizeof(DWORD); + lResult = RegQueryValueExW(hSFKey, wszCallForAttributes, 0, NULL, (LPBYTE)&dwTemp, &dwLen); + if ((lResult == ERROR_SUCCESS) && (dwTemp & *pdwAttributes)) { + LPSHELLFOLDER psfDesktop, psfFolder; + HRESULT hr; - if (!szDest) return FALSE; - *szDest = SFGAO_FOLDER|SFGAO_FILESYSTEM; + RegCloseKey(hSFKey); + hr = SHGetDesktopFolder(&psfDesktop); + if (SUCCEEDED(hr)) { + hr = IShellFolder_BindToObject(psfDesktop, pidlFolder, NULL, &IID_IShellFolder, + (LPVOID*)&psfFolder); + if (SUCCEEDED(hr)) { + hr = IShellFolder_GetAttributesOf(psfFolder, 0, NULL, pdwAttributes); + } + } + IShellFolder_Release(psfFolder); + IShellFolder_Release(psfDesktop); + if (FAILED(hr)) return FALSE; + } else { + lResult = RegQueryValueExW(hSFKey, wszAttributes, 0, NULL, (LPBYTE)&dwTemp, &dwLen); + RegCloseKey(hSFKey); + if (lResult == ERROR_SUCCESS) { + *pdwAttributes &= dwTemp; + } else { + return FALSE; + } + } - strcat (xriid, "\\ShellFolder"); + TRACE("-- *pdwAttributes == 0x%08lx\n", *pdwAttributes); - if (RegOpenKeyExA(HKEY_CLASSES_ROOT,xriid,0,KEY_READ,&hkey)) - { - return FALSE; - } - - if (RegQueryValueExA(hkey,"Attributes",0,NULL,(LPBYTE)&attributes,&len)) - { - RegCloseKey(hkey); - return FALSE; - } - - RegCloseKey(hkey); - - TRACE("-- 0x%08lx\n", attributes); - - *szDest = attributes; - - return TRUE; + return TRUE; } _____ Modified: trunk/reactos/lib/shell32/clipboard.c --- trunk/reactos/lib/shell32/clipboard.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/clipboard.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -176,7 +176,7 @@ char szTemp[MAX_PATH], *szFileName; LPITEMIDLIST pidl; HGLOBAL hGlobal; - HRESULT hr; + BOOL bSuccess; TRACE("(%p,%p,%u)\n", pidlRoot, apidl, cidl); @@ -185,9 +185,9 @@ if (!pidl) return 0; - hr = SHELL_GetPathFromIDListA(pidl, szTemp, MAX_PATH); + bSuccess = SHGetPathFromIDListA(pidl, szTemp); SHFree(pidl); - if (FAILED(hr)) + if (!bSuccess) return 0; size = strlen(szTemp) + 1; @@ -208,7 +208,7 @@ WCHAR szTemp[MAX_PATH], *szFileName; LPITEMIDLIST pidl; HGLOBAL hGlobal; - HRESULT hr; + BOOL bSuccess; TRACE("(%p,%p,%u)\n", pidlRoot, apidl, cidl); @@ -217,9 +217,9 @@ if (!pidl) return 0; - hr = SHELL_GetPathFromIDListW(pidl, szTemp, MAX_PATH); + bSuccess = SHGetPathFromIDListW(pidl, szTemp); SHFree(pidl); - if (FAILED(hr)) + if (!bSuccess) return 0; size = (strlenW(szTemp)+1) * sizeof(WCHAR); _____ Modified: trunk/reactos/lib/shell32/cpanelfolder.c --- trunk/reactos/lib/shell32/cpanelfolder.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/cpanelfolder.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -58,11 +58,11 @@ */ typedef struct { - IShellFolder2Vtbl *lpVtbl; + const IShellFolder2Vtbl *lpVtbl; DWORD ref; - IPersistFolder2Vtbl *lpVtblPersistFolder2; - IShellExecuteHookWVtbl *lpVtblShellExecuteHookW; - IShellExecuteHookAVtbl *lpVtblShellExecuteHookA; + const IPersistFolder2Vtbl *lpVtblPersistFolder2; + const IShellExecuteHookWVtbl *lpVtblShellExecuteHookW; + const IShellExecuteHookAVtbl *lpVtblShellExecuteHookA; IUnknown *pUnkOuter; /* used for aggregation */ @@ -71,10 +71,10 @@ int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ } ICPanelImpl; -static IShellFolder2Vtbl vt_ShellFolder2; -static IPersistFolder2Vtbl vt_PersistFolder2; -static IShellExecuteHookWVtbl vt_ShellExecuteHookW; -static IShellExecuteHookAVtbl vt_ShellExecuteHookA; +static const IShellFolder2Vtbl vt_ShellFolder2; +static const IPersistFolder2Vtbl vt_PersistFolder2; +static const IShellExecuteHookWVtbl vt_ShellExecuteHookW; +static const IShellExecuteHookAVtbl vt_ShellExecuteHookA; #define _IPersistFolder2_Offset ((int)(&(((ICPanelImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); @@ -792,7 +792,7 @@ return E_NOTIMPL; } -static IShellFolder2Vtbl vt_ShellFolder2 = +static const IShellFolder2Vtbl vt_ShellFolder2 = { ISF_ControlPanel_fnQueryInterface, @@ -898,7 +898,7 @@ return S_OK; } -static IPersistFolder2Vtbl vt_PersistFolder2 = +static const IPersistFolder2Vtbl vt_PersistFolder2 = { ICPanel_PersistFolder2_QueryInterface, @@ -1000,7 +1000,7 @@ return S_FALSE; } -static IShellExecuteHookWVtbl vt_ShellExecuteHookW = +static const IShellExecuteHookWVtbl vt_ShellExecuteHookW = { IShellExecuteHookW_fnQueryInterface, @@ -1079,7 +1079,7 @@ return S_FALSE; } -static IShellExecuteHookAVtbl vt_ShellExecuteHookA = +static const IShellExecuteHookAVtbl vt_ShellExecuteHookA = { IShellExecuteHookA_fnQueryInterface, IShellExecuteHookA_fnAddRef, _____ Modified: trunk/reactos/lib/shell32/dataobject.c --- trunk/reactos/lib/shell32/dataobject.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/dataobject.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -42,7 +42,7 @@ typedef struct { /* IUnknown fields */ - IEnumFORMATETCVtbl *lpVtbl; + const IEnumFORMATETCVtbl *lpVtbl; DWORD ref; /* IEnumFORMATETC fields */ UINT posFmt; @@ -159,7 +159,7 @@ return S_OK; } -static struct IEnumFORMATETCVtbl efvt = +static const IEnumFORMATETCVtbl efvt = { IEnumFORMATETC_fnQueryInterface, IEnumFORMATETC_fnAddRef, @@ -204,7 +204,7 @@ typedef struct { /* IUnknown fields */ - IDataObjectVtbl *lpVtbl; + const IDataObjectVtbl *lpVtbl; DWORD ref; /* IDataObject fields */ @@ -408,7 +408,7 @@ return E_NOTIMPL; } -static struct IDataObjectVtbl dtovt = +static const IDataObjectVtbl dtovt = { IDataObject_fnQueryInterface, IDataObject_fnAddRef, _____ Modified: trunk/reactos/lib/shell32/debughlp.c --- trunk/reactos/lib/shell32/debughlp.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/debughlp.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -295,8 +295,8 @@ static char * shdebugstr_buf = shdebugstr_buf1; static struct { - REFIID riid; - char *name; + REFIID riid; + const char *name; } InterfaceDesc[] = { {&IID_IUnknown, "IID_IUnknown"}, {&IID_IClassFactory, "IID_IClassFactory"}, @@ -325,7 +325,7 @@ const char * shdebugstr_guid( const struct _GUID *id ) { int i; - char* name = NULL; + const char* name = NULL; char clsidbuf[100]; shdebugstr_buf = (shdebugstr_buf == shdebugstr_buf1) ? shdebugstr_buf2 : shdebugstr_buf1; _____ Modified: trunk/reactos/lib/shell32/dragdrophelper.c --- trunk/reactos/lib/shell32/dragdrophelper.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/dragdrophelper.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -48,11 +48,11 @@ */ typedef struct { - IDropTargetHelperVtbl *lpVtbl; + const IDropTargetHelperVtbl *lpVtbl; DWORD ref; } IDropTargetHelperImpl; -static struct IDropTargetHelperVtbl vt_IDropTargetHelper; +static const IDropTargetHelperVtbl vt_IDropTargetHelper; #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) #define _IDropTargetHelper_(This) (IDropTargetHelper*)&(This->lpVtbl) @@ -175,7 +175,7 @@ return E_NOTIMPL; } -static IDropTargetHelperVtbl vt_IDropTargetHelper = +static const IDropTargetHelperVtbl vt_IDropTargetHelper = { IDropTargetHelper_fnQueryInterface, IDropTargetHelper_fnAddRef, _____ Modified: trunk/reactos/lib/shell32/enumidlist.c --- trunk/reactos/lib/shell32/enumidlist.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/enumidlist.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -45,7 +45,7 @@ typedef struct { - IEnumIDListVtbl *lpVtbl; + const IEnumIDListVtbl *lpVtbl; DWORD ref; LPENUMLIST mpFirst; LPENUMLIST mpLast; @@ -53,7 +53,7 @@ } IEnumIDListImpl; -static struct IEnumIDListVtbl eidlvt; +static const IEnumIDListVtbl eidlvt; /*********************************************************************** *** * AddToEnumList() @@ -367,7 +367,7 @@ /*********************************************************************** *** * IEnumIDList_fnVTable */ -static IEnumIDListVtbl eidlvt = +static const IEnumIDListVtbl eidlvt = { IEnumIDList_fnQueryInterface, IEnumIDList_fnAddRef, _____ Modified: trunk/reactos/lib/shell32/folders.c --- trunk/reactos/lib/shell32/folders.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/folders.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -49,16 +49,16 @@ */ typedef struct { - IExtractIconWVtbl *lpVtbl; + const IExtractIconWVtbl *lpVtbl; DWORD ref; - IPersistFileVtbl *lpvtblPersistFile; - IExtractIconAVtbl *lpvtblExtractIconA; + const IPersistFileVtbl *lpvtblPersistFile; + const IExtractIconAVtbl *lpvtblExtractIconA; LPITEMIDLIST pidl; } IExtractIconWImpl; -static struct IExtractIconAVtbl eiavt; -static struct IExtractIconWVtbl eivt; -static struct IPersistFileVtbl pfvt; +static const IExtractIconAVtbl eiavt; +static const IExtractIconWVtbl eivt; +static const IPersistFileVtbl pfvt; #define _IPersistFile_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblPersistFile))) #define _ICOM_THIS_From_IPersistFile(class, name) class* This = (class*)(((char*)name)-_IPersistFile_Offset); @@ -394,7 +394,7 @@ return S_OK; } -static struct IExtractIconWVtbl eivt = +static const IExtractIconWVtbl eivt = { IExtractIconW_fnQueryInterface, IExtractIconW_fnAddRef, @@ -486,7 +486,7 @@ return ret; } -static struct IExtractIconAVtbl eiavt = +static const IExtractIconAVtbl eiavt = { IExtractIconA_fnQueryInterface, IExtractIconA_fnAddRef, @@ -558,7 +558,7 @@ } -static struct IPersistFileVtbl pfvt = +static const IPersistFileVtbl pfvt = { IEIPersistFile_fnQueryInterface, IEIPersistFile_fnAddRef, _____ Modified: trunk/reactos/lib/shell32/iconcache.c --- trunk/reactos/lib/shell32/iconcache.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/iconcache.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -670,7 +670,12 @@ { HICON hIcon = NULL; INT len = MultiByteToWideChar(CP_ACP, 0, lpIconPath, -1, NULL, 0); - LPWSTR lpIconPathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + /* Note that we need to allocate MAX_PATH, since we are supposed to fill + * the correct executable if there is no icon in lpIconPath directly. + * lpIconPath itself is supposed to be large enough, so make sure lpIconPathW + * is large enough too. Yes, I am puking too. + */ + LPWSTR lpIconPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); TRACE("%p %s %p\n", hInst, debugstr_a(lpIconPath), lpiIcon); @@ -678,11 +683,18 @@ { MultiByteToWideChar(CP_ACP, 0, lpIconPath, -1, lpIconPathW, len); hIcon = ExtractAssociatedIconW(hInst, lpIconPathW, lpiIcon); + WideCharToMultiByte(CP_ACP, 0, lpIconPathW, -1, lpIconPath, MAX_PATH , NULL, NULL); HeapFree(GetProcessHeap(), 0, lpIconPathW); } return hIcon; } +/********************************************************************** *** + * ExtractAssociatedIconW (SHELL32.@) + * + * Return icon for given file (either from file itself or from associated + * executable) and patch parameters if needed. + */ HICON WINAPI ExtractAssociatedIconW(HINSTANCE hInst, LPWSTR lpIconPath, LPWORD lpiIcon) { HICON hIcon = NULL; _____ Deleted: trunk/reactos/lib/shell32/memorystream.c --- trunk/reactos/lib/shell32/memorystream.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/memorystream.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -1,309 +0,0 @@ -/* - * This class implements a pure IStream object - * and can be used for many purposes. - * - * The main reason for implementing this was - * a cleaner implementation of IShellLink which - * needs to be able to load lnks from an IStream - * interface so it was obvious to capsule the file - * access in an IStream to. - * - * Copyright 1999 Juergen Schmied - * Copyright 2003 Mike McCormack for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <stdarg.h> -#include <string.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "wingdi.h" -#include "shlobj.h" -#include "wine/debug.h" -#include "shell32_main.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); - -#define STGM_ACCESS_MODE(stgm) ((stgm)&0x0000f) -#define STGM_SHARE_MODE(stgm) ((stgm)&0x000f0) -#define STGM_CREATE_MODE(stgm) ((stgm)&0x0f000) - -typedef struct -{ - const IStreamVtbl *lpvtst; - DWORD ref; - HANDLE handle; -} ISHFileStream; - -/********************************************************************** **** -* IStream_fnQueryInterface -*/ -static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVOID *ppvObj) -{ - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); - - *ppvObj = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) - *ppvObj = This; - - if(*ppvObj) - { - IStream_AddRef((IStream*)*ppvObj); - TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); - return S_OK; - } - TRACE("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -/********************************************************************** **** -* IStream_fnAddRef -*/ -static ULONG WINAPI IStream_fnAddRef(IStream *iface) -{ - ISHFileStream *This = (ISHFileStream *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); - - return refCount; -} - -/********************************************************************** **** -* IStream_fnRelease -*/ -static ULONG WINAPI IStream_fnRelease(IStream *iface) -{ - ISHFileStream *This = (ISHFileStream *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(count=%lu)\n", This, refCount + 1); - - if (!refCount) - { - TRACE(" destroying SHFileStream (%p)\n",This); - CloseHandle(This->handle); - HeapFree(GetProcessHeap(),0,This); - } - return refCount; -} - -static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG* pcbRead) -{ - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead); - - if ( !pv ) - return STG_E_INVALIDPOINTER; - - if ( ! ReadFile( This->handle, pv, cb, pcbRead, NULL ) ) - return S_FALSE; - - return S_OK; -} - -static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb, ULONG* pcbWritten) -{ - DWORD dummy_count; - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)\n",This); - - if( !pv ) - return STG_E_INVALIDPOINTER; - - /* WriteFile() doesn't allow to specify NULL as write count pointer */ - if (!pcbWritten) - pcbWritten = &dummy_count; - - if( ! WriteFile( This->handle, pv, cb, pcbWritten, NULL ) ) - return E_FAIL; - - return S_OK; -} - -static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) -{ - DWORD pos, newposlo, newposhi; - - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)\n",This); - - pos = dlibMove.QuadPart; /* FIXME: truncates */ - newposhi = 0; - newposlo = SetFilePointer( This->handle, pos, &newposhi, dwOrigin ); - if( newposlo == INVALID_SET_FILE_POINTER ) - return E_FAIL; - - plibNewPosition->QuadPart = newposlo | ( (LONGLONG)newposhi<<32); - - return S_OK; -} - -static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewSize) -{ - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)\n",This); - - if( ! SetFilePointer( This->handle, libNewSize.QuadPart, NULL, FILE_BEGIN ) ) - return E_FAIL; - - if( ! SetEndOfFile( This->handle ) ) - return E_FAIL; - - return S_OK; -} -static HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, ULARGE_INTEGER* pcbWritten) -{ - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)\n",This); - - return E_NOTIMPL; -} -static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags) -{ - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)\n",This); - - return E_NOTIMPL; -} -static HRESULT WINAPI IStream_fnRevert (IStream * iface) -{ - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)\n",This); - - return E_NOTIMPL; -} -static HRESULT WINAPI IStream_fnLockRegion (IStream * iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) -{ - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)\n",This); - - return E_NOTIMPL; -} -static HRESULT WINAPI IStream_fnUnlockRegion (IStream * iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) -{ - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)\n",This); - - return E_NOTIMPL; -} -static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag) -{ - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)\n",This); - - return E_NOTIMPL; -} -static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm) -{ - ISHFileStream *This = (ISHFileStream *)iface; - - TRACE("(%p)\n",This); - - return E_NOTIMPL; -} - -static const IStreamVtbl stvt = -{ - IStream_fnQueryInterface, - IStream_fnAddRef, - IStream_fnRelease, - IStream_fnRead, - IStream_fnWrite, - IStream_fnSeek, - IStream_fnSetSize, - IStream_fnCopyTo, - IStream_fnCommit, - IStream_fnRevert, - IStream_fnLockRegion, - IStream_fnUnlockRegion, - IStream_fnStat, - IStream_fnClone -}; - -/********************************************************************** **** - * CreateStreamOnFile() - * - * similar to CreateStreamOnHGlobal - */ -HRESULT CreateStreamOnFile (LPCWSTR pszFilename, DWORD grfMode, IStream ** ppstm) -{ - ISHFileStream* fstr; - HANDLE handle; - DWORD access = GENERIC_READ, creat; - - if( grfMode & STGM_TRANSACTED ) - return E_INVALIDARG; - - switch( STGM_ACCESS_MODE( grfMode ) ) - { - case STGM_READ: - access = GENERIC_READ; - break; - case STGM_WRITE: - case STGM_READWRITE: - access = GENERIC_WRITE | GENERIC_READ; - break; - default: - return STG_E_INVALIDFLAG; - } - - switch( STGM_CREATE_MODE( grfMode ) ) - { - case STGM_CREATE: - creat = CREATE_ALWAYS; - break; - case STGM_FAILIFTHERE: - creat = OPEN_EXISTING; - break; - default: - return STG_E_INVALIDFLAG; - } - - handle = CreateFileW( pszFilename, access, - FILE_SHARE_READ, NULL, creat, 0, NULL ); - if( handle == INVALID_HANDLE_VALUE ) - return HRESULT_FROM_WIN32(GetLastError()); - - fstr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ISHFileStream)); - if( !fstr ) - return E_OUTOFMEMORY; - fstr->lpvtst = &stvt; - fstr->ref = 1; - fstr->handle = handle; - - (*ppstm) = (IStream*)fstr; - - return S_OK; -} _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2005-08-05 06:56:17 UTC (rev 17059) +++ trunk/reactos/lib/shell32/pidl.c 2005-08-05 07:48:18 UTC (rev 17060) @@ -1210,87 +1210,6 @@ } /*********************************************************************** ** - * SHELL_GetPathFromIDListA - */ -HRESULT SHELL_GetPathFromIDListA(LPCITEMIDLIST pidl, LPSTR pszPath, UINT uOutSize) -{ - HRESULT hr = S_OK; - - pszPath[0]=0; - - /* One case is a PIDL rooted at desktop level */ - if (_ILIsDesktop(pidl) || _ILIsValue(pidl) || _ILIsFolder(pidl)) - { - hr = SHGetSpecialFolderPathA(0, pszPath, CSIDL_DESKTOP, FALSE); - - if (SUCCEEDED(hr)) - PathAddBackslashA(pszPath); - } - /* The only other valid case is an item ID list beginning at "My Computer" */ - else if (_ILIsMyComputer(pidl)) - pidl = ILGetNext(pidl); - - if (SUCCEEDED(hr)) - { - LPSTR txt; - - while(pidl && pidl->mkid.cb) - { - if (_ILIsSpecialFolder(pidl)) - { - hr = E_INVALIDARG; - break; - } - - txt = _ILGetTextPointer(pidl); - if (!txt) - { - hr = E_INVALIDARG; - break; - } - - if (lstrlenA(txt) > pidl->mkid.cb) - ERR("pidl %p is borked\n",pidl); - - /* make sure there's enough space for the next segment */ - if ((lstrlenA(txt) + lstrlenA(pszPath)) > uOutSize) - { - hr = E_INVALIDARG; - break; - } - lstrcatA( pszPath, txt ); - - pidl = ILGetNext(pidl); - if (!pidl) - { - hr = E_INVALIDARG; - break; - } - - /* Are we at the end and successfully converted the complete PIDL? */ - if (!pidl->mkid.cb) - break; - - if ((lstrlenA(pszPath) + 1) > uOutSize) - { - hr = E_INVALIDARG; - break; - } - if (!PathAddBackslashA(pszPath)) - { - hr = E_INVALIDARG; - break; - } - } - } - else - hr = E_INVALIDARG; - - TRACE_(shell)("-- %s, 0x%08lx\n", pszPath, hr); - return hr; -} - -/********************************************************************** *** * SHGetPathFromIDListA [SHELL32.@][NT 4.0: SHELL32.220] * * PARAMETERS @@ -1307,108 +1226,26 @@ */ BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST pidl, LPSTR pszPath) { - HRESULT hr; + WCHAR wszPath[MAX_PATH]; + BOOL bSuccess; - TRACE_(shell)("(pidl=%p,%p)\n",pidl,pszPath); - pdump(pidl); + bSuccess = SHGetPathFromIDListW(pidl, wszPath); + if (bSuccess) + WideCharToMultiByte(CP_ACP, 0, wszPath, -1, pszPath, MAX_PATH, NULL, NULL); - if (!pidl) - return FALSE; - - hr = SHELL_GetPathFromIDListA(pidl, pszPath, MAX_PATH); - [truncated at 1000 lines; 2333 more skipped]

19 years, 1 month

[ion] 17059: - Protect semaphore release with SEH, since it can cause an exception

by ion＠svn.reactos.com

- Protect semaphore release with SEH, since it can cause an exception - Correct object type initializer - Correct incorrect PreviousMode checks - Correct MaximumCount and ReleaseCount checks since they can't be negative either - Harmonize formatting Modified: trunk/reactos/ntoskrnl/ex/sem.c _____ Modified: trunk/reactos/ntoskrnl/ex/sem.c --- trunk/reactos/ntoskrnl/ex/sem.c 2005-08-05 06:54:15 UTC (rev 17058) +++ trunk/reactos/ntoskrnl/ex/sem.c 2005-08-05 06:56:17 UTC (rev 17059) @@ -2,9 +2,9 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/sem.c - * PURPOSE: Synchronization primitives + * PURPOSE: Semaphore Implementation * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net)- Reformatting, bug fixes. + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)mcmail.com) */ @@ -18,14 +18,16 @@ POBJECT_TYPE ExSemaphoreObjectType; -static GENERIC_MAPPING ExSemaphoreMapping = { +static GENERIC_MAPPING ExSemaphoreMapping = +{ STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE, STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | SEMAPHORE_QUERY_STATE, - SEMAPHORE_ALL_ACCESS}; + SEMAPHORE_ALL_ACCESS +}; -static const INFORMATION_CLASS_INFO ExSemaphoreInfoClass[] = { - +static const INFORMATION_CLASS_INFO ExSemaphoreInfoClass[] = +{ /* SemaphoreBasicInformation */ ICI_SQ_SAME( sizeof(SEMAPHORE_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), }; @@ -47,8 +49,8 @@ ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(KSEMAPHORE); ObjectTypeInitializer.GenericMapping = ExSemaphoreMapping; ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObjectTypeInitializer.ValidAccessMask = SEMAPHORE_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = TRUE; ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExSemaphoreObjectType); } @@ -67,29 +69,29 @@ HANDLE hSemaphore; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); /* Check Output Safety */ - if(PreviousMode != KernelMode) { - - _SEH_TRY { - + if(PreviousMode != KernelMode) + { + _SEH_TRY + { ProbeForWrite(SemaphoreHandle, sizeof(HANDLE), sizeof(ULONG)); - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); + } + _SEH_END; - } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; } /* Make sure the counts make sense */ - if (!MaximumCount || InitialCount < 0 || InitialCount > MaximumCount) { - + if (MaximumCount <= 0 || InitialCount < 0 || InitialCount > MaximumCount) + { DPRINT("Invalid Count Data!\n"); return STATUS_INVALID_PARAMETER; } @@ -106,8 +108,8 @@ (PVOID*)&Semaphore); /* Check for Success */ - if (NT_SUCCESS(Status)) { - + if (NT_SUCCESS(Status)) + { /* Initialize it */ KeInitializeSemaphore(Semaphore, InitialCount, @@ -123,17 +125,17 @@ ObDereferenceObject(Semaphore); /* Check for success and return handle */ - if(NT_SUCCESS(Status)) { - - _SEH_TRY { - + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { *SemaphoreHandle = hSemaphore; - - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); - - } _SEH_END; + } + _SEH_END; } } @@ -153,23 +155,23 @@ HANDLE hSemaphore; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); /* Check Output Safety */ - if(PreviousMode == UserMode) { - - _SEH_TRY { - + if(PreviousMode != KernelMode) + { + _SEH_TRY + { ProbeForWrite(SemaphoreHandle, sizeof(HANDLE), sizeof(ULONG)); - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); + } + _SEH_END; - } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; } @@ -183,16 +185,15 @@ &hSemaphore); /* Check for success and return handle */ - if(NT_SUCCESS(Status)) { - - _SEH_TRY { - + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { *SemaphoreHandle = hSemaphore; - - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); - } _SEH_END; } @@ -225,8 +226,8 @@ ReturnLength, PreviousMode, &Status); - if(!NT_SUCCESS(Status)) { - + if(!NT_SUCCESS(Status)) + { /* Invalid buffers */ DPRINT("NtQuerySemaphore() failed, Status: 0x%x\n", Status); return Status; @@ -241,10 +242,10 @@ NULL); /* Check for success */ - if(NT_SUCCESS(Status)) { - - _SEH_TRY { - + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { PSEMAPHORE_BASIC_INFORMATION BasicInfo = (PSEMAPHORE_BASIC_INFORMATION)SemaphoreInformation; /* Return the basic information */ @@ -254,10 +255,10 @@ /* Return length */ if(ReturnLength) *ReturnLength = sizeof(SEMAPHORE_BASIC_INFORMATION); - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); - } _SEH_END; /* Dereference the Object */ @@ -284,25 +285,26 @@ PAGED_CODE(); /* Check buffer validity */ - if(PreviousCount != NULL && PreviousMode == UserMode) { - - _SEH_TRY { - + if(PreviousCount && PreviousMode != KernelMode) + { + _SEH_TRY + { ProbeForWrite(PreviousCount, sizeof(LONG), sizeof(ULONG)); - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); + } + _SEH_END; - } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; } /* Make sure count makes sense */ - if (!ReleaseCount) { - + if (ReleaseCount <= 0) + { DPRINT("Invalid Release Count\n"); return STATUS_INVALID_PARAMETER; } @@ -316,28 +318,28 @@ NULL); /* Check for success */ - if (NT_SUCCESS(Status)) { - + if (NT_SUCCESS(Status)) + { /* Release the semaphore */ - LONG PrevCount = KeReleaseSemaphore(Semaphore, - IO_NO_INCREMENT, - ReleaseCount, - FALSE); - ObDereferenceObject(Semaphore); + _SEH_TRY + { + LONG PrevCount = KeReleaseSemaphore(Semaphore, + IO_NO_INCREMENT, + ReleaseCount, + FALSE); + ObDereferenceObject(Semaphore); - /* Return it */ - if(PreviousCount) { - - _SEH_TRY { - + /* Return the old count if requested */ + if(PreviousCount) + { *PreviousCount = PrevCount; - - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; + } } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } /* Return Status */

19 years, 1 month

← Newer
1
...
51
52
53
54
55
56
57
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005