Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[dreimer] 36681: Bug 3752: Translate files by Lars Martin Hambro Bug 3768: Bulgarian translation update for ReactOS by CCTAHEB
by dreimer＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: dreimer Date: Tue Oct 7 15:56:48 2008 New Revision: 36681 URL: http://svn.reactos.org/svn/reactos?rev=36681&view=rev Log: Bug 3752: Translate files by Lars Martin Hambro Bug 3768: Bulgarian translation update for ReactOS by CCTAHEB Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/charmap/lang/no-NO.rc trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/msconfig/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc trunk/reactos/base/applications/notepad/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer/explorer-bg.rc trunk/reactos/base/shell/explorer/explorer-no.rc trunk/reactos/base/system/winlogon/lang/bg-BG.rc trunk/reactos/boot/freeldr/fdebug/lang/no-NO.rc trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/win32/kernel32/lang/bg-BG.mc trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc trunk/reactos/dll/win32/netid/lang/no-NO.rc trunk/reactos/dll/win32/netshell/lang/bg-BG.rc trunk/reactos/dll/win32/netshell/lang/no-NO.rc trunk/reactos/dll/win32/newdev/lang/bg-BG.rc trunk/reactos/dll/win32/rasdlg/lang/no-NO.rc trunk/reactos/dll/win32/serialui/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/tapiui/lang/no-NO.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… Modified: trunk/reactos/base/applications/msconfig/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/notepad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/system/winlogon/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/boot/freeldr/fdebug/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/n… Modified: trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/bg-BG.rc… Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… Modified: trunk/reactos/dll/win32/kernel32/lang/bg-BG.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/bg… Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/bg-… Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-… Modified: trunk/reactos/dll/win32/netid/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/no-NO… Modified: trunk/reactos/dll/win32/netshell/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/bg… Modified: trunk/reactos/dll/win32/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/no… Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/bg-B… Modified: trunk/reactos/dll/win32/rasdlg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/no-N… Modified: trunk/reactos/dll/win32/serialui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/no… Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… Modified: trunk/reactos/dll/win32/tapiui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/no-N…

1 0

[sginsberg] 36679: - Fix PKIPI_WORKER definition - Add missing KeQueryActiveProcessors prototype
by sginsberg＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: sginsberg Date: Tue Oct 7 13:07:31 2008 New Revision: 36679 URL: http://svn.reactos.org/svn/reactos?rev=36679&view=rev Log: - Fix PKIPI_WORKER definition - Add missing KeQueryActiveProcessors prototype Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Tue Oct 7 13:07:31 2008 @@ -1292,7 +1292,7 @@ typedef VOID -(*PKIPI_WORKER)( +(NTAPI *PKIPI_WORKER)( IN PKIPI_CONTEXT PacketContext, IN PVOID Parameter1, IN PVOID Parameter2, @@ -9655,6 +9655,13 @@ IN KPRIORITY Increment, IN BOOLEAN Wait); +NTKERNELAPI +KAFFINITY +NTAPI +KeQueryActiveProcessors( + VOID +); + NTHALAPI LARGE_INTEGER NTAPI

1 0

[sginsberg] 36678: - Add missing KiIdleSchedule and KiProcessDeferredReadyList
by sginsberg＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: sginsberg Date: Tue Oct 7 12:55:32 2008 New Revision: 36678 URL: http://svn.reactos.org/svn/reactos?rev=36678&view=rev Log: - Add missing KiIdleSchedule and KiProcessDeferredReadyList Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/thrdschd.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Oct 7 12:55:32 2008 @@ -247,6 +247,18 @@ NTAPI KiDeferredReadyThread(IN PKTHREAD Thread); +PKTHREAD +FASTCALL +KiIdleSchedule( + IN PKPRCB Prcb +); + +VOID +FASTCALL +KiProcessDeferredReadyList( + IN PKPRCB Prcb +); + KAFFINITY FASTCALL KiSetAffinityThread( Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Tue Oct 7 12:55:32 2008 @@ -18,6 +18,23 @@ ULONG KiIdleSMTSummary; /* FUNCTIONS *****************************************************************/ + +PKTHREAD +FASTCALL +KiIdleSchedule(IN PKPRCB Prcb) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); + return NULL; +} + +VOID +FASTCALL +KiProcessDeferredReadyList(IN PKPRCB Prcb) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} VOID FASTCALL

1 0

[sginsberg] 36677: - Add missing jump label to ExpInterlockedCompareExchange64
by sginsberg＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: sginsberg Date: Tue Oct 7 12:42:54 2008 New Revision: 36677 URL: http://svn.reactos.org/svn/reactos?rev=36677&view=rev Log: - Add missing jump label to ExpInterlockedCompareExchange64 Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fastinter… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] Tue Oct 7 12:42:54 2008 @@ -745,6 +745,7 @@ /* Save flags and lock, and disable interrupts */ pushfd mov esi, [esp+24] +.startc: cli /* Acquire the spinlock */

1 0

[fireball] 36676: Daniel Zimmerman <netzimme@aim.com> - Sync the sfc_os.dll with Wine and implement SfcIsFileProtected and SfcIsKeyProtected. The installer will work better with this two function. See issue #3719 for more details.
by fireball＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: fireball Date: Tue Oct 7 06:23:36 2008 New Revision: 36676 URL: http://svn.reactos.org/svn/reactos?rev=36676&view=rev Log: Daniel Zimmerman <netzimme(a)aim.com> - Sync the sfc_os.dll with Wine and implement SfcIsFileProtected and SfcIsKeyProtected. The installer will work better with this two function. See issue #3719 for more details. Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.c trunk/reactos/dll/win32/sfc_os/sfc_os.spec Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.c?… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] Tue Oct 7 06:23:36 2008 @@ -19,6 +19,7 @@ */ #include "precomp.h" +#include "debug.h" HINSTANCE hLibModule; @@ -40,3 +41,81 @@ return TRUE; } + + +/****************************************************************** + * SfcIsFileProtected [sfc_os.@] + * + * Check, if the given File is protected by the System + * + * PARAMS + * RpcHandle [I] This must be NULL + * ProtFileName [I] Filename with Path to check + * + * RETURNS + * Failure: FALSE with GetLastError() != ERROR_FILE_NOT_FOUND + * Success: TRUE, when the File is Protected + * FALSE with GetLastError() == ERROR_FILE_NOT_FOUND, + * when the File is not Protected + * + * + * BUGS + * We return always the Result for: "File is not Protected" + * + */ +BOOL WINAPI SfcIsFileProtected(HANDLE RpcHandle, LPCWSTR ProtFileName) +{ + static BOOL reported = FALSE; + + if (reported) { + DPRINT("(%p, %S) stub\n", RpcHandle, ProtFileName); + } + else + { + DPRINT1("(%p, %S) stub\n", RpcHandle, ProtFileName); + reported = TRUE; + } + + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +/****************************************************************** + * SfcIsKeyProtected [sfc_os.@] + * + * Check, if the given Registry Key is protected by the System + * + * PARAMS + * hKey [I] Handle to the root registry key + * lpSubKey [I] Name of the subkey to check + * samDesired [I] The Registry View to Examine (32 or 64 bit) + * + * RETURNS + * Failure: FALSE with GetLastError() != ERROR_FILE_NOT_FOUND + * Success: TRUE, when the Key is Protected + * FALSE with GetLastError() == ERROR_FILE_NOT_FOUND, + * when the Key is not Protected + * + */ +BOOL WINAPI SfcIsKeyProtected(HKEY hKey, LPCWSTR lpSubKey, REGSAM samDesired) +{ + static BOOL reported = FALSE; + + if (reported) { + DPRINT("(%p, %S) stub\n", hKey, lpSubKey); + } + else + { + DPRINT1("(%p, %S) stub\n", hKey, lpSubKey); + reported = TRUE; + } + + if( !hKey ) { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.sp… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] Tue Oct 7 06:23:36 2008 @@ -6,6 +6,7 @@ @ stub sfc_os_6 @ stub sfc_os_7 @ stub SfcGetNextProtectedFile -@ stub SfcIsFileProtected +@ stdcall SfcIsFileProtected(ptr wstr) +@ stdcall SfcIsKeyProtected(long wstr long) @ stub SfcWLEventLogoff -@ stub SfcWLEventLogon +@ stub SfcWLEventLogon

1 0

[dchapyshev] 36675: - Add stubs for CredReadDomainCredentialsA/W, CredWriteDomainCredentialsA/W, CredUnmarshalCredentialA/W - Add prototypes to header
by dchapyshev＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: dchapyshev Date: Tue Oct 7 05:55:57 2008 New Revision: 36675 URL: http://svn.reactos.org/svn/reactos?rev=36675&view=rev Log: - Add stubs for CredReadDomainCredentialsA/W, CredWriteDomainCredentialsA/W, CredUnmarshalCredentialA/W - Add prototypes to header Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/sec/cred.c trunk/reactos/include/psdk/wincred.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] Tue Oct 7 05:55:57 2008 @@ -127,16 +127,16 @@ ;CredMarshalCredentialW@12 ;CredProfileLoaded CredReadA@16 -;CredReadDomainCredentialsA -;CredReadDomainCredentialsW +CredReadDomainCredentialsA@16 +CredReadDomainCredentialsW@16 CredReadW@16 ;CredRenameA ;CredRenameW -;CredUnmarshalCredentialA -;CredUnmarshalCredentialW +CredUnmarshalCredentialA@12 +CredUnmarshalCredentialW@12 CredWriteA@8 -;CredWriteDomainCredentialsA -;CredWriteDomainCredentialsW +CredWriteDomainCredentialsA@12 +CredWriteDomainCredentialsW@12 CredWriteW@8 ;CredpConvertCredential ;CredpConvertTargetInfo Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/cre… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] Tue Oct 7 05:55:57 2008 @@ -1699,3 +1699,65 @@ } return TRUE; } + +BOOL +WINAPI +CredReadDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, + DWORD Flags, + DWORD *Count, + PCREDENTIALW **Credential) +{ + WARN("Not implemented\n"); + return FALSE; +} + +BOOL +WINAPI +CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, + DWORD Flags, + DWORD *Count, + PCREDENTIALA **Credential) +{ + WARN("Not implemented\n"); + return FALSE; +} + +BOOL +WINAPI +CredWriteDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, + PCREDENTIALW Credential, + DWORD Flags) +{ + WARN("Not implemented\n"); + return FALSE; +} + +BOOL +WINAPI +CredWriteDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, + PCREDENTIALA Credential, + DWORD Flags) +{ + WARN("Not implemented\n"); + return FALSE; +} + +BOOL +WINAPI +CredUnmarshalCredentialW(LPCWSTR MarshaledCredential, + PCRED_MARSHAL_TYPE CredType, + PVOID *Credential) +{ + WARN("Not implemented\n"); + return FALSE; +} + +BOOL +WINAPI +CredUnmarshalCredentialA(LPCSTR MarshaledCredential, + PCRED_MARSHAL_TYPE CredType, + PVOID *Credential) +{ + WARN("Not implemented\n"); + return FALSE; +} Modified: trunk/reactos/include/psdk/wincred.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincred.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wincred.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincred.h [iso-8859-1] Tue Oct 7 05:55:57 2008 @@ -107,6 +107,45 @@ HBITMAP hbmBanner; } CREDUI_INFOW, *PCREDUI_INFOW; +typedef enum _CRED_MARSHAL_TYPE { + CertCredential = 1, + UsernameTargetCredential +} CRED_MARSHAL_TYPE, *PCRED_MARSHAL_TYPE; + +typedef struct _CREDENTIAL_TARGET_INFORMATIONA { + LPSTR TargetName; + LPSTR NetbiosServerName; + LPSTR DnsServerName; + LPSTR NetbiosDomainName; + LPSTR DnsDomainName; + LPSTR DnsTreeName; + LPSTR PackageName; + ULONG Flags; + DWORD CredTypeCount; + LPDWORD CredTypes; +} CREDENTIAL_TARGET_INFORMATIONA, *PCREDENTIAL_TARGET_INFORMATIONA; + +typedef struct _CREDENTIAL_TARGET_INFORMATIONW { + LPWSTR TargetName; + LPWSTR NetbiosServerName; + LPWSTR DnsServerName; + LPWSTR NetbiosDomainName; + LPWSTR DnsDomainName; + LPWSTR DnsTreeName; + LPWSTR PackageName; + ULONG Flags; + DWORD CredTypeCount; + LPDWORD CredTypes; +} CREDENTIAL_TARGET_INFORMATIONW, *PCREDENTIAL_TARGET_INFORMATIONW; + +#ifdef UNICODE +typedef CREDENTIAL_TARGET_INFORMATIONW CREDENTIAL_TARGET_INFORMATION; +typedef PCREDENTIAL_TARGET_INFORMATIONW PCREDENTIAL_TARGET_INFORMATION; +#else +typedef CREDENTIAL_TARGET_INFORMATIONA CREDENTIAL_TARGET_INFORMATION; +typedef PCREDENTIAL_TARGET_INFORMATIONA PCREDENTIAL_TARGET_INFORMATION; +#endif /* UNICODE */ + DECL_WINELIB_TYPE_AW(CREDUI_INFO) DECL_WINELIB_TYPE_AW(PCREDUI_INFO) @@ -201,6 +240,23 @@ DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*); /* Note: no CredUIReadSSOCredA in PSDK header */ +BOOL WINAPI CredReadDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, DWORD Flags, DWORD *Count, PCREDENTIALW **Credential); +BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, DWORD Flags, DWORD *Count, PCREDENTIALA **Credential); +BOOL WINAPI CredWriteDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, PCREDENTIALW Credential, DWORD Flags); +BOOL WINAPI CredWriteDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, PCREDENTIALA Credential, DWORD Flags); +BOOL WINAPI CredUnmarshalCredentialW(LPCWSTR MarshaledCredential, PCRED_MARSHAL_TYPE CredType, PVOID *Credential); +BOOL WINAPI CredUnmarshalCredentialA(LPCSTR MarshaledCredential, PCRED_MARSHAL_TYPE CredType, PVOID *Credential); + +#ifdef UNICODE +#define CredReadDomainCredentials CredReadDomainCredentialsW +#define CredWriteDomainCredentials CredWriteDomainCredentialsW +#define CredUnmarshalCredential CredUnmarshalCredentialW +#else +#define CredReadDomainCredentials CredReadDomainCredentialsA +#define CredWriteDomainCredentials CredWriteDomainCredentialsA +#define CredUnmarshalCredential CredUnmarshalCredentialA +#endif /* UNICODE */ + #ifdef __cplusplus } #endif

1 0

[dchapyshev] 36674: - Import credui from wine
by dchapyshev＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: dchapyshev Date: Tue Oct 7 05:51:36 2008 New Revision: 36674 URL: http://svn.reactos.org/svn/reactos?rev=36674&view=rev Log: - Import credui from wine Added: trunk/reactos/dll/win32/credui/ (with props) trunk/reactos/dll/win32/credui/banner.bmp (with props) trunk/reactos/dll/win32/credui/credui.rbuild (with props) trunk/reactos/dll/win32/credui/credui.rc (with props) trunk/reactos/dll/win32/credui/credui.spec (with props) trunk/reactos/dll/win32/credui/credui_Da.rc (with props) trunk/reactos/dll/win32/credui/credui_De.rc (with props) trunk/reactos/dll/win32/credui/credui_En.rc (with props) trunk/reactos/dll/win32/credui/credui_Es.rc (with props) trunk/reactos/dll/win32/credui/credui_Fr.rc (with props) trunk/reactos/dll/win32/credui/credui_Ko.rc (with props) trunk/reactos/dll/win32/credui/credui_Nl.rc (with props) trunk/reactos/dll/win32/credui/credui_No.rc (with props) trunk/reactos/dll/win32/credui/credui_Pl.rc (with props) trunk/reactos/dll/win32/credui/credui_Ru.rc (with props) trunk/reactos/dll/win32/credui/credui_Si.rc (with props) trunk/reactos/dll/win32/credui/credui_Sv.rc (with props) trunk/reactos/dll/win32/credui/credui_Zh.rc (with props) trunk/reactos/dll/win32/credui/credui_main.c (with props) trunk/reactos/dll/win32/credui/credui_resources.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=366… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -153,6 +153,7 @@ <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> <property name="BASEADDRESS_ATL" value="0x76a80000" /> <property name="BASEADDRESS_SFC" value="0x76b50000" /> + <property name="BASEADDRESS_CREDUI" value="0x76bf0000" /> <property name="BASEADDRESS_SFC_OS" value="0x76c10000" /> <property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -241,6 +241,7 @@ dll\win32\comctl32\comctl32.dll 1 dll\win32\comdlg32\comdlg32.dll 1 dll\win32\compstui\compstui.dll 1 +dll\win32\credui\credui.dll 1 dll\win32\crtdll\crtdll.dll 1 dll\win32\crypt32\crypt32.dll 1 dll\win32\cryptdll\cryptdll.dll 1 Propchange: trunk/reactos/dll/win32/credui/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Oct 7 05:51:36 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/credui/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/credui/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/credui/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/credui/banner.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/banner.bm… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/credui/banner.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/credui/credui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.rb… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.rbuild (added) +++ trunk/reactos/dll/win32/credui/credui.rbuild [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,21 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="credui" type="win32dll" baseaddress="${BASEADDRESS_CREDUI}" installbase="system32" installname="credui.dll" allowwarnings="true"> + <importlibrary definition="credui.spec.def" /> + <include base="credui">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <file>credui_main.c</file> + <file>credui.rc</file> + <file>credui.spec</file> + <library>wine</library> + <library>advapi32</library> + <library>user32</library> + <library>comctl32</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/credui/credui.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.rc… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.rc (added) +++ trunk/reactos/dll/win32/credui/credui.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,42 @@ +/* + * Top level resource file for Credentials UI + * + * Copyright 2007 Robert Shearman (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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" +#include "credui_resources.h" + +/* @makedep: banner.bmp */ +IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp + +#include "credui_Da.rc" +#include "credui_De.rc" +#include "credui_En.rc" +#include "credui_Es.rc" +#include "credui_Fr.rc" +#include "credui_Ko.rc" +#include "credui_Nl.rc" +#include "credui_No.rc" +#include "credui_Pl.rc" +#include "credui_Ru.rc" +#include "credui_Si.rc" +#include "credui_Sv.rc" +#include "credui_Zh.rc" Propchange: trunk/reactos/dll/win32/credui/credui.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.sp… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.spec (added) +++ trunk/reactos/dll/win32/credui/credui.spec [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,17 @@ +@ stub CredUICmdLinePromptForCredentialsA +@ stub CredUICmdLinePromptForCredentialsW +@ stub CredUIConfirmCredentialsA +@ stdcall CredUIConfirmCredentialsW(wstr long) +@ stub CredUIInitControls +@ stub CredUIParseUserNameA +@ stdcall CredUIParseUserNameW(wstr ptr long ptr long) +@ stub CredUIPromptForCredentialsA +@ stdcall CredUIPromptForCredentialsW(ptr wstr ptr long ptr long ptr long ptr long) +@ stdcall CredUIReadSSOCredA(str ptr) +@ stdcall CredUIReadSSOCredW(wstr ptr) +@ stdcall CredUIStoreSSOCredA(str str str long) +@ stdcall CredUIStoreSSOCredW(wstr wstr wstr long) +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer Propchange: trunk/reactos/dll/win32/credui/credui.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Da… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Da.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Da.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,50 @@ +/* + * Danish language resource file for Credentials UI + * + * Copyright 2008 Jens Albretsen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Brugernavn:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Kodeord:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Husk mit kodeord",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Annuller",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Tilslut til %s" + IDS_MESSAGEFORMAT "Tilslutter til %s" + IDS_INCORRECTPASSWORDTITLE "Tilslutning fejlede" + IDS_INCORRECTPASSWORD "Vær sikker på at dit brugernavn\nog kodeord er korrekt." + IDS_CAPSLOCKONTITLE "Caps Lock er på" + IDS_CAPSLOCKON "Caps Lock kan være skyld i at taster dit kodeord forkert.\n\nTryk på Caps Lock tasten for at slå det fra\nfør du indtaster dit kodeord." +} Propchange: trunk/reactos/dll/win32/credui/credui_Da.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_De… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_De.rc (added) +++ trunk/reactos/dll/win32/credui/credui_De.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,50 @@ +/* + * German language resource file for Credentials UI + * + * Copyright 2007 Frank Richter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Benutzername:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Kennwort:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "Kennwort &merken",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Mit %s verbinden" + IDS_MESSAGEFORMAT "Verbindung mit %s wird hergestellt" + IDS_INCORRECTPASSWORDTITLE "Anmeldung fehlgeschlagen" + IDS_INCORRECTPASSWORD "Bitte überprüfen Sie Ihren Benutzernamen\nund geben Sie das Kennwort neu ein." + IDS_CAPSLOCKONTITLE "Die Feststelltaste ist aktiviert" + IDS_CAPSLOCKON "Mit aktivierter Feststelltaste könnte das Kennwort falsch eingeben werden.\n\nVor der Eingabe des Kennworts sollten Sie die Feststelltaste deaktivieren." +} Propchange: trunk/reactos/dll/win32/credui/credui_De.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_En… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_En.rc (added) +++ trunk/reactos/dll/win32/credui/credui_En.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,50 @@ +/* + * English language resource file for Credentials UI + * + * Copyright 2007 Robert Shearman (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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&User name:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Password:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Remember my password",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Cancel",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Connect to %s" + IDS_MESSAGEFORMAT "Connecting to %s" + IDS_INCORRECTPASSWORDTITLE "Logon unsuccessful" + IDS_INCORRECTPASSWORD "Make sure that your user name\nand password are correct." + IDS_CAPSLOCKONTITLE "Caps Lock is On" + IDS_CAPSLOCKON "Having Caps Lock on may cause you to enter your password incorrectly.\n\nPress the Caps Lock key on your keyboard to turn off Caps Lock before\nentering your password." +} Propchange: trunk/reactos/dll/win32/credui/credui_En.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Es… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Es.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Es.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,54 @@ +/* + * Spanish language resource file for Credentials UI + * + * Copyright 2007 Luis Carlos Busquets PÃ©rez + * Copyright 2008 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Usuario:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&ContraseÃ±a:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Recordar mi contraseÃ±a",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "Aceptar",IDOK,97,128,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Conectar a %s" + IDS_MESSAGEFORMAT "Conectando to %s" + IDS_INCORRECTPASSWORDTITLE "IdentificaciÃ³n incorrecta" + IDS_INCORRECTPASSWORD "AsegÃºrese que su nombre de usuario\ny contraseÃ±a son correctos." + IDS_CAPSLOCKONTITLE "Bloq Mayus estÃ¡ activado" + IDS_CAPSLOCKON "El Bloq Mayus activado puede hacer que entre su contraseÃ±a incorrectamente.\n\nPulse la tecla Bloq Mayus de su teclado para desactivar Bloq Mayus antes\n de introducir su contraseÃ±a." +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/credui/credui_Es.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Fr… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Fr.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Fr.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,53 @@ +/* + * French language resource file for Credentials UI + * + * Copyright 2007 JonathanÂ Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Nom d'utilisateurÂ :",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,12 + LTEXT "&Mot de passeÂ :",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Se souvenir de mon mot de passe",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Annuler",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Se connecter Ã %s" + IDS_MESSAGEFORMAT "Connexion Ã %s" + IDS_INCORRECTPASSWORDTITLE "Ãchec lors de la connexion" + IDS_INCORRECTPASSWORD "Assurez-vous que votre nom d'utilisateur\net votre mot de passe sont corrects." + IDS_CAPSLOCKONTITLE "VERR.MAJ est activÃ©" + IDS_CAPSLOCKON "Le verrouillage majuscule Ã©tant activÃ©, cela pourrait provoquer une erreur lors de la saisie de votre mot de passe.\n\nAppuyez sur la touche VERR.MAJ de votre clavier afin de dÃ©sactiver le verrouilage majuscule avant\nde saisir votre mot de passe." +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/credui/credui_Fr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ko… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ko.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Ko.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,52 @@ +/* + * Korean language resource file for Credentials UI + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * Copyright 2007 YunSong Hwang-È²À±¼º(hys545(a)dreamwiz.com) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "»ç¿ëÀÚ ÀÌ¸§(&U):",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "¾ÏÈ£(&P):",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "³» ¾ÏÈ£ ±â¾ï(&R)",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "È®ÀÎ",IDOK,97,128,50,14 + PUSHBUTTON "Ãë¼Ò",IDCANCEL,156,128,50,14 +END + + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT " %s ¿¬°á" + IDS_MESSAGEFORMAT " %s ¿¬°áÁß" + IDS_INCORRECTPASSWORDTITLE "·Î±×¿Â ½ÇÆÐ" + IDS_INCORRECTPASSWORD "´ç½ÅÀÇ »ç¿ëÀÚ ÀÌ¸§°ú ¾ÏÈ£°¡\n¿Ã¹Ù¸¥Áö È®ÀÎÇÏ½Ê½Ã¿À" + IDS_CAPSLOCKONTITLE "Caps Lock Ä¿Áü" + IDS_CAPSLOCKON "Caps Lock ÀÌ Ä¿Á® ÀÖÀ¸¸é ¾ÏÈ£°¡ Àß¸øÀÔ·ÂµÉ ¼ö ÀÖ½À´Ï´Ù.\n\n ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ±â Àü¿¡\nÅ°º¸µåÀÇ Caps Lock Å°¸¦ ²ô½Ã±â ¹Ù¶ø´Ï´Ù." +} Propchange: trunk/reactos/dll/win32/credui/credui_Ko.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Nl… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Nl.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Nl.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,50 @@ +/* + * Dutch language resource file for Credentials UI + * + * Copyright 2008 Frans Kool + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Gebruikers naam:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Wachtwoord:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Onthoudt mijn wachtwoord",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Annuleren",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Verbind met %s" + IDS_MESSAGEFORMAT "Verbinden met %s" + IDS_INCORRECTPASSWORDTITLE "Aanloggen mislukt" + IDS_INCORRECTPASSWORD "Controleer of uw gebruikersnaam\nen wachtwoord correct zijn." + IDS_CAPSLOCKONTITLE "Caps Lock staat Aan" + IDS_CAPSLOCKON "Met Caps Lock aan kan uw wachtwoord verkeerd worden ingevoerd.\n\nDruk op de Caps Lock toets op uw toetsenbord om Caps Lock uit\nte zetten voor invoer van uw wachtwoord." +} Propchange: trunk/reactos/dll/win32/credui/credui_Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_No… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_No.rc (added) +++ trunk/reactos/dll/win32/credui/credui_No.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,50 @@ +/* + * Norwegian Bokmål language resource file for Credentials UI + * + * Copyright 2007 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "Br&ukernavn:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Passord:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Remember my password",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Koble til %s" + IDS_MESSAGEFORMAT "Kobler til %s" + IDS_INCORRECTPASSWORDTITLE "Klarte ikke logge på" + IDS_INCORRECTPASSWORD "Sørg for at du oppga riktig\nbrukernavn og passord." + IDS_CAPSLOCKONTITLE "Caps Lock er på" + IDS_CAPSLOCKON "Å ha Caps Lock på kan føre til at du skriver inn passordet på feil måte.\n\nTrykk på Caps Lock-knappen på tastaturet for å slå av Caps Lock før du\nskriver inn passordet på nytt." +} Propchange: trunk/reactos/dll/win32/credui/credui_No.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Pl… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Pl.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Pl.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,51 @@ +/* + * Polish language resource file for Credentials UI + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&U¿ytkownik:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Has³o:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Zapamiêtaj has³o",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "&OK",IDOK,97,128,50,14 + PUSHBUTTON "&Anuluj",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Po³¹cz z %s" + IDS_MESSAGEFORMAT "£¹czenie z %s" + IDS_INCORRECTPASSWORDTITLE "Logowanie nie powiod³o siê" + IDS_INCORRECTPASSWORD "Upewnij siê, ¿e nazwa u¿ytkownika\ni has³o s¹ poprawne." + IDS_CAPSLOCKONTITLE "Caps Lock jest w³¹czony" + IDS_CAPSLOCKON "W³¹czony tryb Caps Lock mo¿e spowodowaæ, ¿e wpiszesz has³o niepoprawnie.\n\nNacinik klawisz Caps Lock key na klawiaturze, aby go wy³¹czyæ\nprzed wprowadzeniem has³a." +} Propchange: trunk/reactos/dll/win32/credui/credui_Pl.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ru… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ru.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Ru.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,50 @@ +/* + * Russian language resource file for Credentials UI + * + * Copyright 2008 Andrey Esin <andrey(a)esin.name> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "Ïî&ëüçîâàòåëü:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Ïàðîëü:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "Ñî&õðàíèòü ïàðîëü",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "ÎÊ",IDOK,97,128,50,14 + PUSHBUTTON "Îòìåíà",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Ïîäêëþ÷åíèå ê %s" + IDS_MESSAGEFORMAT "Ïîäêëþ÷åíèå ê %s" + IDS_INCORRECTPASSWORDTITLE "Âõîä íå áûë ïðîèçâåä¸í" + IDS_INCORRECTPASSWORD "Óáåäèòåñü, ÷òî èìÿ ïîëüçîâàòåëÿ\nè ïàðîëü âåðíû." + IDS_CAPSLOCKONTITLE "Caps Lock âêëþ÷åí" + IDS_CAPSLOCKON "Ïàðîëü ìîæåò áûòü ââåä¸í íåïðàâèëüíî èç-çà íàæàòîé êëàâèøè Caps Lock.\n\nÎòêëþ÷èòå Caps Lock ïåðåä òåì, êàê ââîäèòü ïàðîëü." +} Propchange: trunk/reactos/dll/win32/credui/credui_Ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Si… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Si.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Si.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,54 @@ +/* + * Slovenian language resource file for Credentials UI + * + * Copyright 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&UporabniÅ¡ko ime:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Geslo:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Zapomni si geslo",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "V redu",IDOK,97,128,50,14 + PUSHBUTTON "PrekliÄi",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "PoveÅ¾i se na %s" + IDS_MESSAGEFORMAT "Povezovanje na %s" + IDS_INCORRECTPASSWORDTITLE "Prijava ni uspela" + IDS_INCORRECTPASSWORD "Preverite, ali ste vnesli pravilno uporabniÅ¡ko ime in/ali geslo." + IDS_CAPSLOCKONTITLE "Caps Lock je vkljuÄen" + IDS_CAPSLOCKON "VkljuÄen Caps Lock je lahko vzrok nepravilnega vnosa gesla.\n\nPritisnite tipko Caps Lock, s Äimer ga izklopite\nin ponovno vnesite geslo." +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/credui/credui_Si.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Sv… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Sv.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Sv.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,40 @@ +/* + * Swedish language resource file for Credentials UI + * + * Copyright 2007 Daniel Nylander + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "A&nvändarnamn:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Lösenord:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Remember my password",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,156,128,50,14 +END Propchange: trunk/reactos/dll/win32/credui/credui_Sv.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Zh… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Zh.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Zh.rc [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,86 @@ +/* + * Credentials UI (Simplified and Traditional Chinese Resource) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 9, "MS Song" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "ç¨æ·å(&U):",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "å¯ç (&P):",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "è®°ä½æçå¯ç (&R)",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "ç¡®å®",IDOK,97,128,50,14 + PUSHBUTTON "åæ¶",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "è¿æ¥å° %s" + IDS_MESSAGEFORMAT "æ£å¨è¿æ¥å° %s" + IDS_INCORRECTPASSWORDTITLE "ç»å½å¤±è´¥" + IDS_INCORRECTPASSWORD "è¯·ç¡®è®¤ä½ è¾å¥çç¨æ·ååå¯ç \næ¯å¦æ£ç¡®." + IDS_CAPSLOCKONTITLE "å¤§åéå®å¼ç" + IDS_CAPSLOCKON "å¼çå¤§åéå®å¯è½å¯¼è´ä½ è¾å¥éè¯¯çå¯ç ." +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "PMingLiu" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "ç¨æ¶å(&U):",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "å¯ç¢¼(&P):",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "è¨ä½æçå¯ç¢¼(&R)",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "ç¢ºå®",IDOK,97,128,50,14 + PUSHBUTTON "åæ¶",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "é£æ¥å° %s" + IDS_MESSAGEFORMAT "æ£å¨é£æ¥å° %s" + IDS_INCORRECTPASSWORDTITLE "ç»éå¤±æ" + IDS_INCORRECTPASSWORD "è«ç¢ºèªä½ è¼¸å¥çç¨æ¶ååå¯ç¢¼\næ¯å¦æ£ç¢º." + IDS_CAPSLOCKONTITLE "å¤§å¯«éå®éè" + IDS_CAPSLOCKON "éèå¤§å¯«éå®å¯è½å°è´ä½ è¼¸å¥é¯èª¤çå¯ç¢¼." +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/credui/credui_Zh.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_ma… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_main.c (added) +++ trunk/reactos/dll/win32/credui/credui_main.c [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,798 @@ +/* + * Credentials User Interface + * + * Copyright 2006 Robert Shearman (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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winuser.h" +#include "wincred.h" +#include "commctrl.h" + +#include "credui_resources.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(credui); + +#define TOOLID_INCORRECTPASSWORD 1 +#define TOOLID_CAPSLOCKON 2 + +#define ID_CAPSLOCKPOP 1 + +struct pending_credentials +{ + struct list entry; + PWSTR pszTargetName; + PWSTR pszUsername; + PWSTR pszPassword; + BOOL generic; +}; + +static HINSTANCE hinstCredUI; + +static struct list pending_credentials_list = LIST_INIT(pending_credentials_list); + +static CRITICAL_SECTION csPendingCredentials; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &csPendingCredentials, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": csPendingCredentials") } +}; +static CRITICAL_SECTION csPendingCredentials = { &critsect_debug, -1, 0, 0, 0, 0 }; + + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ + + if (fdwReason == DLL_PROCESS_ATTACH) + { + DisableThreadLibraryCalls(hinstDLL); + hinstCredUI = hinstDLL; + InitCommonControls(); + } + else if (fdwReason == DLL_PROCESS_DETACH) + { + struct pending_credentials *entry, *cursor2; + LIST_FOR_EACH_ENTRY_SAFE(entry, cursor2, &pending_credentials_list, struct pending_credentials, entry) + { + list_remove(&entry->entry); + + HeapFree(GetProcessHeap(), 0, entry->pszTargetName); + HeapFree(GetProcessHeap(), 0, entry->pszUsername); + ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + HeapFree(GetProcessHeap(), 0, entry->pszPassword); + HeapFree(GetProcessHeap(), 0, entry); + } + } + + return TRUE; +} + +static DWORD save_credentials(PCWSTR pszTargetName, PCWSTR pszUsername, + PCWSTR pszPassword, BOOL generic) +{ + CREDENTIALW cred; + + TRACE("saving servername %s with username %s\n", debugstr_w(pszTargetName), debugstr_w(pszUsername)); + + cred.Flags = 0; + cred.Type = generic ? CRED_TYPE_GENERIC : CRED_TYPE_DOMAIN_PASSWORD; + cred.TargetName = (LPWSTR)pszTargetName; + cred.Comment = NULL; + cred.CredentialBlobSize = strlenW(pszPassword) * sizeof(WCHAR); + cred.CredentialBlob = (LPBYTE)pszPassword; + cred.Persist = CRED_PERSIST_ENTERPRISE; + cred.AttributeCount = 0; + cred.Attributes = NULL; + cred.TargetAlias = NULL; + cred.UserName = (LPWSTR)pszUsername; + + if (CredWriteW(&cred, 0)) + return ERROR_SUCCESS; + else + { + DWORD ret = GetLastError(); + ERR("CredWriteW failed with error %d\n", ret); + return ret; + } +} + +struct cred_dialog_params +{ + PCWSTR pszTargetName; + PCWSTR pszMessageText; + PCWSTR pszCaptionText; + HBITMAP hbmBanner; + PWSTR pszUsername; + ULONG ulUsernameMaxChars; + PWSTR pszPassword; + ULONG ulPasswordMaxChars; + BOOL fSave; + DWORD dwFlags; + HWND hwndBalloonTip; + BOOL fBalloonTipActive; +}; + +static void CredDialogFillUsernameCombo(HWND hwndUsername, struct cred_dialog_params *params) +{ + DWORD count; + DWORD i; + PCREDENTIALW *credentials; + + if (!CredEnumerateW(NULL, 0, &count, &credentials)) + return; + + for (i = 0; i < count; i++) + { + COMBOBOXEXITEMW comboitem; + DWORD j; + BOOL duplicate = FALSE; + + if (params->dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS) + { + if ((credentials[i]->Type != CRED_TYPE_GENERIC) || !credentials[i]->UserName) + continue; + } + else + { + if (credentials[i]->Type == CRED_TYPE_GENERIC) + continue; + } + + /* don't add another item with the same name if we've already added it */ + for (j = 0; j < i; j++) + if (!strcmpW(credentials[i]->UserName, credentials[j]->UserName)) + { + duplicate = TRUE; + break; + } + + if (duplicate) + continue; + + comboitem.mask = CBEIF_TEXT; + comboitem.iItem = -1; + comboitem.pszText = credentials[i]->UserName; + SendMessageW(hwndUsername, CBEM_INSERTITEMW, 0, (LPARAM)&comboitem); + } + + CredFree(credentials); +} + +static void CredDialogCreateBalloonTip(HWND hwndDlg, struct cred_dialog_params *params) +{ + TTTOOLINFOW toolinfo; + WCHAR wszText[256]; + + if (params->hwndBalloonTip) + return; + + params->hwndBalloonTip = CreateWindowExW(WS_EX_TOOLWINDOW, TOOLTIPS_CLASSW, + NULL, WS_POPUP | TTS_NOPREFIX | TTS_BALLOON, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hwndDlg, NULL, + hinstCredUI, NULL); + SetWindowPos(params->hwndBalloonTip, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORD, wszText, sizeof(wszText)/sizeof(wszText[0]))) + { + ERR("failed to load IDS_INCORRECTPASSWORD\n"); + return; + } + + toolinfo.cbSize = sizeof(toolinfo); + toolinfo.uFlags = TTF_TRACK; + toolinfo.hwnd = hwndDlg; + toolinfo.uId = TOOLID_INCORRECTPASSWORD; + memset(&toolinfo.rect, 0, sizeof(toolinfo.rect)); + toolinfo.hinst = NULL; + toolinfo.lpszText = wszText; + toolinfo.lParam = 0; + toolinfo.lpReserved = NULL; + SendMessageW(params->hwndBalloonTip, TTM_ADDTOOLW, 0, (LPARAM)&toolinfo); + + if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKON, wszText, sizeof(wszText)/sizeof(wszText[0]))) + { + ERR("failed to load IDS_CAPSLOCKON\n"); + return; + } + + toolinfo.uId = TOOLID_CAPSLOCKON; + SendMessageW(params->hwndBalloonTip, TTM_ADDTOOLW, 0, (LPARAM)&toolinfo); +} + +static void CredDialogShowIncorrectPasswordBalloon(HWND hwndDlg, struct cred_dialog_params *params) +{ + TTTOOLINFOW toolinfo; + RECT rcPassword; + INT x; + INT y; + WCHAR wszTitle[256]; + + /* user name likely wrong so balloon would be confusing. focus is also + * not set to the password edit box, so more notification would need to be + * handled */ + if (!params->pszUsername[0]) + return; + + /* don't show two balloon tips at once */ + if (params->fBalloonTipActive) + return; + + if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORDTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0]))) + { + ERR("failed to load IDS_INCORRECTPASSWORDTITLE\n"); + return; + } + + CredDialogCreateBalloonTip(hwndDlg, params); + + memset(&toolinfo, 0, sizeof(toolinfo)); + toolinfo.cbSize = sizeof(toolinfo); + toolinfo.hwnd = hwndDlg; + toolinfo.uId = TOOLID_INCORRECTPASSWORD; + + SendMessageW(params->hwndBalloonTip, TTM_SETTITLEW, TTI_ERROR, (LPARAM)wszTitle); + + GetWindowRect(GetDlgItem(hwndDlg, IDC_PASSWORD), &rcPassword); + /* centred vertically and in the right side of the password edit control */ + x = rcPassword.right - 12; + y = (rcPassword.top + rcPassword.bottom) / 2; + SendMessageW(params->hwndBalloonTip, TTM_TRACKPOSITION, 0, MAKELONG(x, y)); + + SendMessageW(params->hwndBalloonTip, TTM_TRACKACTIVATE, TRUE, (LPARAM)&toolinfo); + + params->fBalloonTipActive = TRUE; +} + +static void CredDialogShowCapsLockBalloon(HWND hwndDlg, struct cred_dialog_params *params) +{ + TTTOOLINFOW toolinfo; + RECT rcPassword; + INT x; + INT y; + WCHAR wszTitle[256]; + + /* don't show two balloon tips at once */ + if (params->fBalloonTipActive) + return; + + if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKONTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0]))) + { + ERR("failed to load IDS_IDSCAPSLOCKONTITLE\n"); + return; + } + + CredDialogCreateBalloonTip(hwndDlg, params); + + memset(&toolinfo, 0, sizeof(toolinfo)); + toolinfo.cbSize = sizeof(toolinfo); + toolinfo.hwnd = hwndDlg; + toolinfo.uId = TOOLID_CAPSLOCKON; + + SendMessageW(params->hwndBalloonTip, TTM_SETTITLEW, TTI_WARNING, (LPARAM)wszTitle); + + GetWindowRect(GetDlgItem(hwndDlg, IDC_PASSWORD), &rcPassword); + /* just inside the left side of the password edit control */ + x = rcPassword.left + 12; + y = rcPassword.bottom - 3; + SendMessageW(params->hwndBalloonTip, TTM_TRACKPOSITION, 0, MAKELONG(x, y)); + + SendMessageW(params->hwndBalloonTip, TTM_TRACKACTIVATE, TRUE, (LPARAM)&toolinfo); + + SetTimer(hwndDlg, ID_CAPSLOCKPOP, + SendMessageW(params->hwndBalloonTip, TTM_GETDELAYTIME, TTDT_AUTOPOP, 0), + NULL); + + params->fBalloonTipActive = TRUE; +} + +static void CredDialogHideBalloonTip(HWND hwndDlg, struct cred_dialog_params *params) +{ + TTTOOLINFOW toolinfo; + + if (!params->hwndBalloonTip) + return; + + memset(&toolinfo, 0, sizeof(toolinfo)); + + toolinfo.cbSize = sizeof(toolinfo); + toolinfo.hwnd = hwndDlg; + toolinfo.uId = 0; + SendMessageW(params->hwndBalloonTip, TTM_TRACKACTIVATE, FALSE, (LPARAM)&toolinfo); + toolinfo.uId = 1; + SendMessageW(params->hwndBalloonTip, TTM_TRACKACTIVATE, FALSE, (LPARAM)&toolinfo); + + params->fBalloonTipActive = FALSE; +} + +static inline BOOL CredDialogCapsLockOn(void) +{ + return GetKeyState(VK_CAPITAL) & 0x1 ? TRUE : FALSE; +} + +static LRESULT CALLBACK CredDialogPasswordSubclassProc(HWND hwnd, UINT uMsg, + WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) +{ + struct cred_dialog_params *params = (struct cred_dialog_params *)dwRefData; + switch (uMsg) + { + case WM_KEYDOWN: + if (wParam == VK_CAPITAL) + { + HWND hwndDlg = GetParent(hwnd); + if (CredDialogCapsLockOn()) + CredDialogShowCapsLockBalloon(hwndDlg, params); + else + CredDialogHideBalloonTip(hwndDlg, params); + } + break; + case WM_DESTROY: + RemoveWindowSubclass(hwnd, CredDialogPasswordSubclassProc, uIdSubclass); + break; + } + return DefSubclassProc(hwnd, uMsg, wParam, lParam); +} + +static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) +{ + HWND hwndUsername = GetDlgItem(hwndDlg, IDC_USERNAME); + HWND hwndPassword = GetDlgItem(hwndDlg, IDC_PASSWORD); + + SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)params); + + if (params->hbmBanner) + SendMessageW(GetDlgItem(hwndDlg, IDB_BANNER), STM_SETIMAGE, + IMAGE_BITMAP, (LPARAM)params->hbmBanner); + + if (params->pszMessageText) + SetDlgItemTextW(hwndDlg, IDC_MESSAGE, params->pszMessageText); + else + { + WCHAR format[256]; + WCHAR message[256]; + LoadStringW(hinstCredUI, IDS_MESSAGEFORMAT, format, sizeof(format)/sizeof(format[0])); + snprintfW(message, sizeof(message)/sizeof(message[0]), format, params->pszTargetName); + SetDlgItemTextW(hwndDlg, IDC_MESSAGE, message); + } + SetWindowTextW(hwndUsername, params->pszUsername); + SetWindowTextW(hwndPassword, params->pszPassword); + + CredDialogFillUsernameCombo(hwndUsername, params); + + if (params->pszUsername[0]) + { + /* prevent showing a balloon tip here */ + params->fBalloonTipActive = TRUE; + SetFocus(hwndPassword); + params->fBalloonTipActive = FALSE; + } + else + SetFocus(hwndUsername); + + if (params->pszCaptionText) + SetWindowTextW(hwndDlg, params->pszCaptionText); + else + { + WCHAR format[256]; + WCHAR title[256]; + LoadStringW(hinstCredUI, IDS_TITLEFORMAT, format, sizeof(format)/sizeof(format[0])); + snprintfW(title, sizeof(title)/sizeof(title[0]), format, params->pszTargetName); + SetWindowTextW(hwndDlg, title); + } + + if (params->dwFlags & (CREDUI_FLAGS_DO_NOT_PERSIST|CREDUI_FLAGS_PERSIST)) + ShowWindow(GetDlgItem(hwndDlg, IDC_SAVE), SW_HIDE); + else if (params->fSave) + CheckDlgButton(hwndDlg, IDC_SAVE, BST_CHECKED); + + /* setup subclassing for Caps Lock detection */ + SetWindowSubclass(hwndPassword, CredDialogPasswordSubclassProc, 1, (DWORD_PTR)params); + + if (params->dwFlags & CREDUI_FLAGS_INCORRECT_PASSWORD) + CredDialogShowIncorrectPasswordBalloon(hwndDlg, params); + else if ((GetFocus() == hwndPassword) && CredDialogCapsLockOn()) + CredDialogShowCapsLockBalloon(hwndDlg, params); + + return FALSE; +} + +static void CredDialogCommandOk(HWND hwndDlg, struct cred_dialog_params *params) +{ + HWND hwndUsername = GetDlgItem(hwndDlg, IDC_USERNAME); + LPWSTR user; + INT len; + INT len2; + + len = GetWindowTextLengthW(hwndUsername); + user = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + GetWindowTextW(hwndUsername, user, len + 1); + + if (!user[0]) + { + HeapFree(GetProcessHeap(), 0, user); + return; + } + + if (!strchrW(user, '\\') && !strchrW(user, '@')) + { + ULONG len_target = strlenW(params->pszTargetName); + memcpy(params->pszUsername, params->pszTargetName, + min(len_target, params->ulUsernameMaxChars) * sizeof(WCHAR)); + if (len_target + 1 < params->ulUsernameMaxChars) + params->pszUsername[len_target] = '\\'; + if (len_target + 2 < params->ulUsernameMaxChars) + params->pszUsername[len_target + 1] = '\0'; + } + else if (params->ulUsernameMaxChars > 0) + params->pszUsername[0] = '\0'; + + len2 = strlenW(params->pszUsername); + memcpy(params->pszUsername + len2, user, min(len, params->ulUsernameMaxChars - len2) * sizeof(WCHAR)); + if (params->ulUsernameMaxChars) + params->pszUsername[len2 + min(len, params->ulUsernameMaxChars - len2 - 1)] = '\0'; + + HeapFree(GetProcessHeap(), 0, user); + + GetDlgItemTextW(hwndDlg, IDC_PASSWORD, params->pszPassword, + params->ulPasswordMaxChars); + + params->fSave = IsDlgButtonChecked(hwndDlg, IDC_SAVE) == BST_CHECKED; + + EndDialog(hwndDlg, IDOK); +} + +static INT_PTR CALLBACK CredDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + struct cred_dialog_params *params = (struct cred_dialog_params *)lParam; + + return CredDialogInit(hwndDlg, params); + } + case WM_COMMAND: + switch (wParam) + { + case MAKELONG(IDOK, BN_CLICKED): + { + struct cred_dialog_params *params = + (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + CredDialogCommandOk(hwndDlg, params); + return TRUE; + } + case MAKELONG(IDCANCEL, BN_CLICKED): + EndDialog(hwndDlg, IDCANCEL); + return TRUE; + case MAKELONG(IDC_PASSWORD, EN_SETFOCUS): + if (CredDialogCapsLockOn()) + { + struct cred_dialog_params *params = + (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + CredDialogShowCapsLockBalloon(hwndDlg, params); + } + /* don't allow another window to steal focus while the + * user is typing their password */ + LockSetForegroundWindow(LSFW_LOCK); + return TRUE; + case MAKELONG(IDC_PASSWORD, EN_KILLFOCUS): + { + struct cred_dialog_params *params = + (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + /* the user is no longer typing their password, so allow + * other windows to become foreground ones */ + LockSetForegroundWindow(LSFW_UNLOCK); + CredDialogHideBalloonTip(hwndDlg, params); + return TRUE; + } + case MAKELONG(IDC_PASSWORD, EN_CHANGE): + { + struct cred_dialog_params *params = + (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + CredDialogHideBalloonTip(hwndDlg, params); + return TRUE; + } + } + return FALSE; + case WM_TIMER: + if (wParam == ID_CAPSLOCKPOP) + { + struct cred_dialog_params *params = + (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + CredDialogHideBalloonTip(hwndDlg, params); + return TRUE; + } + return FALSE; + case WM_DESTROY: + { + struct cred_dialog_params *params = + (struct cred_dialog_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + if (params->hwndBalloonTip) DestroyWindow(params->hwndBalloonTip); + return TRUE; + } + default: + return FALSE; + } +} + +/****************************************************************************** + * CredUIPromptForCredentialsW [CREDUI.@] + */ +DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, + PCWSTR pszTargetName, + PCtxtHandle Reserved, + DWORD dwAuthError, + PWSTR pszUsername, + ULONG ulUsernameMaxChars, + PWSTR pszPassword, + ULONG ulPasswordMaxChars, PBOOL pfSave, + DWORD dwFlags) +{ + INT_PTR ret; + struct cred_dialog_params params; + DWORD result = ERROR_SUCCESS; + + TRACE("(%p, %s, %p, %d, %s, %d, %p, %d, %p, 0x%08x)\n", pUIInfo, + debugstr_w(pszTargetName), Reserved, dwAuthError, debugstr_w(pszUsername), + ulUsernameMaxChars, pszPassword, ulPasswordMaxChars, pfSave, dwFlags); + + if ((dwFlags & (CREDUI_FLAGS_ALWAYS_SHOW_UI|CREDUI_FLAGS_GENERIC_CREDENTIALS)) == CREDUI_FLAGS_ALWAYS_SHOW_UI) + return ERROR_INVALID_FLAGS; + + if (!pszTargetName) + return ERROR_INVALID_PARAMETER; + + if ((dwFlags & CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX) && !pfSave) + return ERROR_INVALID_PARAMETER; + + params.pszTargetName = pszTargetName; + if (pUIInfo) + { + params.pszMessageText = pUIInfo->pszMessageText; + params.pszCaptionText = pUIInfo->pszCaptionText; + params.hbmBanner = pUIInfo->hbmBanner; + } + else + { + params.pszMessageText = NULL; + params.pszCaptionText = NULL; + params.hbmBanner = NULL; + } + params.pszUsername = pszUsername; + params.ulUsernameMaxChars = ulUsernameMaxChars; + params.pszPassword = pszPassword; + params.ulPasswordMaxChars = ulPasswordMaxChars; + params.fSave = pfSave ? *pfSave : FALSE; + params.dwFlags = dwFlags; + params.hwndBalloonTip = NULL; + params.fBalloonTipActive = FALSE; + + ret = DialogBoxParamW(hinstCredUI, MAKEINTRESOURCEW(IDD_CREDDIALOG), + pUIInfo ? pUIInfo->hwndParent : NULL, + CredDialogProc, (LPARAM)&params); + if (ret <= 0) + return GetLastError(); + + if (ret == IDCANCEL) + { + TRACE("dialog cancelled\n"); + return ERROR_CANCELLED; + } + + if (pfSave) + *pfSave = params.fSave; + + if (params.fSave) + { + if (dwFlags & CREDUI_FLAGS_EXPECT_CONFIRMATION) + { + BOOL found = FALSE; + struct pending_credentials *entry; + int len; + + EnterCriticalSection(&csPendingCredentials); + + /* find existing pending credentials for the same target and overwrite */ + /* FIXME: is this correct? */ + LIST_FOR_EACH_ENTRY(entry, &pending_credentials_list, struct pending_credentials, entry) + if (!strcmpW(pszTargetName, entry->pszTargetName)) + { + found = TRUE; + HeapFree(GetProcessHeap(), 0, entry->pszUsername); + ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + HeapFree(GetProcessHeap(), 0, entry->pszPassword); + } + + if (!found) + { + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + len = strlenW(pszTargetName); + entry->pszTargetName = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); + memcpy(entry->pszTargetName, pszTargetName, (len + 1)*sizeof(WCHAR)); + list_add_tail(&pending_credentials_list, &entry->entry); + } + + len = strlenW(params.pszUsername); + entry->pszUsername = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); + memcpy(entry->pszUsername, params.pszUsername, (len + 1)*sizeof(WCHAR)); + len = strlenW(params.pszPassword); + entry->pszPassword = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); + memcpy(entry->pszPassword, params.pszPassword, (len + 1)*sizeof(WCHAR)); + entry->generic = dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS ? TRUE : FALSE; + + LeaveCriticalSection(&csPendingCredentials); + } + else + result = save_credentials(pszTargetName, pszUsername, pszPassword, + dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS ? TRUE : FALSE); + } + + return result; +} + +/****************************************************************************** + * CredUIConfirmCredentialsW [CREDUI.@] + */ +DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR pszTargetName, BOOL bConfirm) +{ + struct pending_credentials *entry; + DWORD result = ERROR_NOT_FOUND; + + TRACE("(%s, %s)\n", debugstr_w(pszTargetName), bConfirm ? "TRUE" : "FALSE"); + + if (!pszTargetName) + return ERROR_INVALID_PARAMETER; + + EnterCriticalSection(&csPendingCredentials); + + LIST_FOR_EACH_ENTRY(entry, &pending_credentials_list, struct pending_credentials, entry) + { + if (!strcmpW(pszTargetName, entry->pszTargetName)) + { + if (bConfirm) + result = save_credentials(entry->pszTargetName, entry->pszUsername, + entry->pszPassword, entry->generic); + else + result = ERROR_SUCCESS; + + list_remove(&entry->entry); + + HeapFree(GetProcessHeap(), 0, entry->pszTargetName); + HeapFree(GetProcessHeap(), 0, entry->pszUsername); + ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + HeapFree(GetProcessHeap(), 0, entry->pszPassword); + HeapFree(GetProcessHeap(), 0, entry); + + break; + } + } + + LeaveCriticalSection(&csPendingCredentials); + + return result; +} + +/****************************************************************************** + * CredUIParseUserNameW [CREDUI.@] + */ +DWORD WINAPI CredUIParseUserNameW(PCWSTR pszUserName, PWSTR pszUser, + ULONG ulMaxUserChars, PWSTR pszDomain, + ULONG ulMaxDomainChars) +{ + PWSTR p; + + TRACE("(%s, %p, %d, %p, %d)\n", debugstr_w(pszUserName), pszUser, + ulMaxUserChars, pszDomain, ulMaxDomainChars); + + if (!pszUserName || !pszUser || !ulMaxUserChars || !pszDomain || + !ulMaxDomainChars) + return ERROR_INVALID_PARAMETER; + + /* FIXME: handle marshaled credentials */ + + p = strchrW(pszUserName, '\\'); + if (p) + { + if (p - pszUserName > ulMaxDomainChars - 1) + return ERROR_INSUFFICIENT_BUFFER; + if (strlenW(p + 1) > ulMaxUserChars - 1) + return ERROR_INSUFFICIENT_BUFFER; + strcpyW(pszUser, p + 1); + memcpy(pszDomain, pszUserName, (p - pszUserName)*sizeof(WCHAR)); + pszDomain[p - pszUserName] = '\0'; + + return ERROR_SUCCESS; + } + + p = strrchrW(pszUserName, '@'); + if (p) + { + if (p + 1 - pszUserName > ulMaxUserChars - 1) + return ERROR_INSUFFICIENT_BUFFER; + if (strlenW(p + 1) > ulMaxDomainChars - 1) + return ERROR_INSUFFICIENT_BUFFER; + strcpyW(pszDomain, p + 1); + memcpy(pszUser, pszUserName, (p - pszUserName)*sizeof(WCHAR)); + pszUser[p - pszUserName] = '\0'; + + return ERROR_SUCCESS; + } + + if (strlenW(pszUserName) > ulMaxUserChars - 1) + return ERROR_INSUFFICIENT_BUFFER; + strcpyW(pszUser, pszUserName); + pszDomain[0] = '\0'; + + return ERROR_SUCCESS; +} + +/****************************************************************************** + * CredUIStoreSSOCredA [CREDUI.@] + */ +DWORD WINAPI CredUIStoreSSOCredA(PCSTR pszRealm, PCSTR pszUsername, + PCSTR pszPassword, BOOL bPersist) +{ + FIXME("(%s, %s, %p, %d)\n", debugstr_a(pszRealm), debugstr_a(pszUsername), + pszPassword, bPersist); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * CredUIStoreSSOCredW [CREDUI.@] + */ +DWORD WINAPI CredUIStoreSSOCredW(PCWSTR pszRealm, PCWSTR pszUsername, + PCWSTR pszPassword, BOOL bPersist) +{ + FIXME("(%s, %s, %p, %d)\n", debugstr_w(pszRealm), debugstr_w(pszUsername), + pszPassword, bPersist); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * CredUIReadSSOCredA [CREDUI.@] + */ +DWORD WINAPI CredUIReadSSOCredA(PCSTR pszRealm, PSTR *ppszUsername) +{ + FIXME("(%s, %p)\n", debugstr_a(pszRealm), ppszUsername); + if (ppszUsername) + *ppszUsername = NULL; + return ERROR_NOT_FOUND; +} + +/****************************************************************************** + * CredUIReadSSOCredW [CREDUI.@] + */ +DWORD WINAPI CredUIReadSSOCredW(PCWSTR pszRealm, PWSTR *ppszUsername) +{ + FIXME("(%s, %p)\n", debugstr_w(pszRealm), ppszUsername); + if (ppszUsername) + *ppszUsername = NULL; + return ERROR_NOT_FOUND; +} Propchange: trunk/reactos/dll/win32/credui/credui_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_re… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_resources.h (added) +++ trunk/reactos/dll/win32/credui/credui_resources.h [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -1,0 +1,33 @@ +/* + * Copyright 2007 Robert Shearman (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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define IDD_CREDDIALOG 100 +#define IDC_USERNAME 101 +#define IDC_PASSWORD 102 +#define IDC_MESSAGE 103 +#define IDC_STATIC 104 +#define IDC_SAVE 105 + +#define IDB_BANNER 200 + +#define IDS_TITLEFORMAT 300 +#define IDS_MESSAGEFORMAT 301 +#define IDS_INCORRECTPASSWORDTITLE 302 +#define IDS_INCORRECTPASSWORD 303 +#define IDS_CAPSLOCKON 304 +#define IDS_CAPSLOCKONTITLE 305 Propchange: trunk/reactos/dll/win32/credui/credui_resources.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -52,6 +52,9 @@ <directory name="compstui"> <xi:include href="compstui/compstui.rbuild" /> </directory> +<directory name="credui"> + <xi:include href="credui/credui.rbuild" /> +</directory> <directory name="crtdll"> <xi:include href="crtdll/crtdll.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Oct 7 05:51:36 2008 @@ -40,6 +40,7 @@ reactos/dll/win32/comctl32 # Autosync reactos/dll/win32/comdlg32 # Autosync reactos/dll/win32/compstui # Autosync +reactos/dll/win32/credui # Autosync reactos/dll/win32/crypt32 # Synced to Wine-1_0-rc1 reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/cryptnet # Autosync

1 0

[sserapion] 36673: Finally convert gdi32 to spec file.
by sserapion＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: sserapion Date: Mon Oct 6 23:05:18 2008 New Revision: 36673 URL: http://svn.reactos.org/svn/reactos?rev=36673&view=rev Log: Finally convert gdi32 to spec file. Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Mon Oct 6 23:05:18 2008 @@ -1,5 +1,5 @@ <module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" allowwarnings="true"> - <importlibrary definition="gdi32.def" /> + <importlibrary definition="gdi32.spec.def" /> <include base="gdi32">include</include> <define name="_DISABLE_TIDENTS" /> <define name="WINVER">0x0600</define> @@ -51,4 +51,5 @@ <file>path.c</file> </directory> <file>gdi32.rc</file> + <file>gdi32.spec</file> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Mon Oct 6 23:05:18 2008 @@ -1,10 +1,3 @@ -# ordinal exports -100 stdcall @(long long str str str) GDI_CallDevInstall16 -101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16 -102 stdcall @(long ptr str str ptr str long) GDI_CallExtDeviceMode16 -103 stdcall @(long str ptr ptr) GDI_CallAdvancedSetupDialog16 -104 stdcall @(str str long ptr ptr) GDI_CallDeviceCapabilities16 - @ stdcall AbortDoc(long) @ stdcall AbortPath(long) @ stdcall AddFontMemResourceEx(ptr long ptr ptr) @@ -15,25 +8,35 @@ @ stdcall AddFontResourceW(wstr) @ stdcall AngleArc(long long long long long long) @ stdcall AnimatePalette(long long long ptr) -# @ stub AnyLinkedFonts +@ stdcall AnyLinkedFonts() NtGdiAnyLinkedFonts @ stdcall Arc(long long long long long long long long long) @ stdcall ArcTo(long long long long long long long long long) @ stdcall BeginPath(long) +@ stdcall bInitSystemAndFontsDirectoriesW(wstr wstr) @ stdcall BitBlt(long long long long long long long long long) +@ stdcall bMakePathNameW(wstr wstr wstr long) +@ stdcall BRUSHOBJ_hGetColorTransform(ptr) NtGdiBRUSHOBJ_hGetColorTransform +@ stdcall BRUSHOBJ_pvAllocRbrush(ptr long) NtGdiBRUSHOBJ_pvAllocRbrush +@ stdcall BRUSHOBJ_pvGetRbrush(ptr) NtGdiBRUSHOBJ_pvGetRbrush +@ stdcall BRUSHOBJ_ulGetBrushColor(ptr) NtGdiBRUSHOBJ_ulGetBrushColor @ stub ByeByeGDI @ stdcall CancelDC(long) -@ stub CheckColorsInGamut +@ stdcall cGetTTFFromFOT(long long long long long long long) +@ stdcall CheckColorsInGamut(ptr ptr ptr long) @ stdcall ChoosePixelFormat(long ptr) @ stdcall Chord(long long long long long long long long long) -# @ stub ClearBitmapAttributes -# @ stub ClearBrushAttributes +@ stdcall ClearBitmapAttributes(ptr long) +@ stdcall ClearBrushAttributes(ptr long) +@ stdcall CLIPOBJ_bEnum(ptr long long) NtGdiCLIPOBJ_bEnum +@ stdcall CLIPOBJ_cEnumStart(ptr long long long long) NtGdiCLIPOBJ_cEnumStart +@ stdcall CLIPOBJ_ppoGetPath(ptr) NtGdiCLIPOBJ_ppoGetPath @ stdcall CloseEnhMetaFile(long) @ stdcall CloseFigure(long) @ stdcall CloseMetaFile(long) -@ stub ColorCorrectPalette -@ stub ColorMatchToTarget +@ stdcall ColorCorrectPalette(ptr ptr long long) +@ stdcall ColorMatchToTarget(ptr ptr long) @ stdcall CombineRgn(long long long long) -@ stdcall CombineTransform(ptr ptr ptr) +@ stdcall CombineTransform(ptr ptr ptr) NtGdiCombineTransform @ stdcall CopyEnhMetaFileA(long str) @ stdcall CopyEnhMetaFileW(long wstr) @ stdcall CopyMetaFileA(long str) @@ -47,12 +50,12 @@ @ stdcall CreateCompatibleDC(long) @ stdcall CreateDCA(str str str ptr) @ stdcall CreateDCW(wstr wstr wstr ptr) +@ stdcall CreateDIBitmap(long ptr long ptr ptr long) @ stdcall CreateDIBPatternBrush(long long) @ stdcall CreateDIBPatternBrushPt(long long) @ stdcall CreateDIBSection(long ptr long ptr long long) -@ stdcall CreateDIBitmap(long ptr long ptr ptr long) @ stdcall CreateDiscardableBitmap(long long long) -@ stdcall CreateEllipticRgn(long long long long) +@ stdcall CreateEllipticRgn(long long long long) NtGdiCreateEllipticRgn @ stdcall CreateEllipticRgnIndirect(ptr) @ stdcall CreateEnhMetaFileA(long str ptr str) @ stdcall CreateEnhMetaFileW(long wstr ptr wstr) @@ -62,7 +65,7 @@ # @ stub CreateFontIndirectExW @ stdcall CreateFontIndirectW(ptr) @ stdcall CreateFontW(long long long long long long long long long long long long long wstr) -@ stdcall CreateHalftonePalette(long) +@ stdcall CreateHalftonePalette(long) NtGdiCreateHalftonePalette @ stdcall CreateHatchBrush(long long) @ stdcall CreateICA(str str str ptr) @ stdcall CreateICW(wstr wstr wstr ptr) @@ -76,27 +79,130 @@ @ stdcall CreatePolygonRgn(ptr long long) @ stdcall CreateRectRgn(long long long long) @ stdcall CreateRectRgnIndirect(ptr) -@ stdcall CreateRoundRectRgn(long long long long long long) +@ stdcall CreateRoundRectRgn(long long long long long long) NtGdiCreateRoundRectRgn @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) -@ stdcall DPtoLP(long ptr long) -@ stdcall DeleteColorSpace(long) +@ stdcall DdEntry0(ptr ptr ptr ptr ptr ptr) NtGdiDxgGenericThunk +@ stdcall DdEntry10(ptr ptr) NtGdiDdBeginMoCompFrame +@ stdcall DdEntry11(ptr ptr ptr) NtGdiDdBlt +@ stdcall DdEntry12(ptr ptr) NtGdiDdCanCreateSurface +@ stdcall DdEntry13(ptr ptr) NtGdiDdCanCreateD3DBuffer +@ stdcall DdEntry14(ptr ptr) NtGdiDdColorControl +@ stdcall DdEntry15(ptr) NtGdiDdCreateDirectDrawObject +@ stdcall DdEntry16(ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiDdCreateSurface +@ stdcall DdEntry17(ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiDdCreateD3DBuffer +@ stdcall DdEntry18(ptr ptr) NtGdiDdCreateMoComp +@ stdcall DdEntry19(ptr ptr ptr ptr ptr long) NtGdiDdCreateSurfaceObject +@ stdcall DdEntry1(ptr ptr ptr ptr) NtGdiD3dContextCreate +@ stdcall DdEntry20(ptr) NtGdiDdDeleteDirectDrawObject +@ stdcall DdEntry21(ptr) NtGdiDdDeleteSurfaceObject +@ stdcall DdEntry22(ptr ptr) NtGdiDdDestroyMoComp +@ stdcall DdEntry23(ptr long) NtGdiDdDestroySurface +@ stdcall DdEntry24(ptr) NtGdiDdDestroyD3DBuffer +@ stdcall DdEntry25(ptr ptr) NtGdiDdEndMoCompFrame +@ stdcall DdEntry26(ptr ptr ptr ptr ptr) NtGdiDdFlip +@ stdcall DdEntry27(ptr long) NtGdiDdFlipToGDISurface +@ stdcall DdEntry28(ptr ptr) NtGdiDdGetAvailDriverMemory +@ stdcall DdEntry29(ptr ptr) NtGdiDdGetBltStatus +@ stdcall DdEntry2(ptr)NtGdiD3dContextDestroy +@ stdcall DdEntry30(ptr ptr) NtGdiDdGetDC +@ stdcall DdEntry31(ptr ptr) NtGdiDdGetDriverInfo +@ stdcall DdEntry32(ptr ptr long) NtGdiDdGetDxHandle +@ stdcall DdEntry33(ptr ptr) NtGdiDdGetFlipStatus +@ stdcall DdEntry34(ptr ptr) NtGdiDdGetInternalMoCompInfo +@ stdcall DdEntry35(ptr ptr) NtGdiDdGetMoCompBuffInfo +@ stdcall DdEntry36(ptr ptr) NtGdiDdGetMoCompGuids +@ stdcall DdEntry37(ptr ptr) NtGdiDdGetMoCompFormats +@ stdcall DdEntry38(ptr ptr) NtGdiDdGetScanLine +@ stdcall DdEntry39(ptr ptr ptr) NtGdiDdLock +@ stdcall DdEntry3(ptr) NtGdiD3dContextDestroyAll +@ stdcall DdEntry40(ptr ptr) NtGdiDdLockD3D +@ stdcall DdEntry41(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiDdQueryDirectDrawObject +@ stdcall DdEntry42(ptr ptr) NtGdiDdQueryMoCompStatus +@ stdcall DdEntry43(ptr ptr) NtGdiDdReenableDirectDrawObject +@ stdcall DdEntry44(ptr) NtGdiDdReleaseDC +@ stdcall DdEntry45(ptr ptr) NtGdiDdRenderMoComp +@ stdcall DdEntry46(ptr ptr) NtGdiDdResetVisrgn +@ stdcall DdEntry47(ptr ptr) NtGdiDdSetColorKey +@ stdcall DdEntry48(ptr ptr) NtGdiDdSetExclusiveMode +@ stdcall DdEntry49(ptr ptr ptr) NtGdiDdSetGammaRamp +@ stdcall DdEntry4(ptr) NtGdiD3dValidateTextureStageState +@ stdcall DdEntry50(ptr ptr long)NtGdiDdCreateSurfaceEx +@ stdcall DdEntry51(ptr ptr ptr) NtGdiDdSetOverlayPosition +@ stdcall DdEntry52(ptr ptr) NtGdiDdUnattachSurface +@ stdcall DdEntry53(ptr ptr) NtGdiDdUnlock +@ stdcall DdEntry54(ptr ptr) NtGdiDdUnlockD3D +@ stdcall DdEntry55(ptr ptr long) NtGdiDdUpdateOverlay +@ stdcall DdEntry56(ptr ptr) NtGdiDdWaitForVerticalBlank +@ stdcall DdEntry5(ptr ptr ptr ptr ptr ptr ptr) NtGdiD3dDrawPrimitives2 +@ stdcall DdEntry6(ptr) NtGdiDdGetDriverState +@ stdcall DdEntry7(ptr ptr ptr) NtGdiDdAddAttachedSurface +@ stdcall DdEntry8(ptr ptr ptr) NtGdiDdAlphaBlt +@ stdcall DdEntry9(ptr ptr) NtGdiDdAttachSurface +@ stdcall DeleteColorSpace(long) NtGdiDeleteColorSpace @ stdcall DeleteDC(long) @ stdcall DeleteEnhMetaFile(long) @ stdcall DeleteMetaFile(long) @ stdcall DeleteObject(long) @ stdcall DescribePixelFormat(long long long ptr) @ stub DeviceCapabilitiesEx -@ stub DeviceCapabilitiesExA -@ stub DeviceCapabilitiesExW +@ stdcall DeviceCapabilitiesExA(str str long str ptr) +@ stdcall DeviceCapabilitiesExW(wstr wstr long wstr ptr) +@ stdcall DPtoLP(long ptr long) @ stdcall DrawEscape(long long long ptr) @ stdcall Ellipse(long long long long long) -@ stdcall EnableEUDC(long) +@ stdcall EnableEUDC(long) NtGdiEnableEudc @ stdcall EndDoc(long) -# @ stub EndFormPage +@ stdcall EndFormPage(ptr) @ stdcall EndPage(long) @ stdcall EndPath(long) +@ stdcall EngAcquireSemaphore(ptr) +@ stdcall EngAlphaBlend(ptr ptr ptr ptr ptr ptr ptr) NtGdiEngAlphaBlend +@ stdcall EngAssociateSurface(ptr ptr long) NtGdiEngAssociateSurface +@ stdcall EngBitBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiEngBitBlt +@ stdcall EngCheckAbort(ptr) NtGdiEngCheckAbort +@ stdcall EngComputeGlyphSet(ptr ptr ptr) +@ stdcall EngCopyBits(ptr ptr ptr ptr ptr ptr) NtGdiEngCopyBits +@ stdcall EngCreateBitmap(ptr long long ptr ptr) NtGdiEngCreateBitmap +@ stdcall EngCreateClip() NtGdiEngCreateClip +@ stdcall EngCreateDeviceBitmap(ptr ptr long) NtGdiEngCreateDeviceBitmap +@ stdcall EngCreateDeviceSurface(ptr ptr long) NtGdiEngCreateDeviceSurface +@ stdcall EngCreatePalette(long long ptr long long long) NtGdiEngCreatePalette +@ stdcall EngCreateSemaphore() +@ stdcall EngDeleteClip(ptr) NtGdiEngDeleteClip +@ stdcall EngDeletePalette(ptr) NtGdiEngDeletePalette +@ stdcall EngDeletePath(ptr) NtGdiEngDeletePath +@ stdcall EngDeleteSemaphore(ptr) +@ stdcall EngDeleteSurface(ptr) NtGdiEngDeleteSurface +@ stdcall EngEraseSurface(ptr ptr long) NtGdiEngEraseSurface +@ stdcall EngFillPath(ptr ptr ptr ptr ptr ptr ptr) NtGdiEngFillPath +@ stdcall EngFindResource(ptr long long ptr) +@ stdcall EngFreeModule(ptr) +@ stdcall EngGetCurrentCodePage(ptr ptr) +@ stdcall EngGetDriverName(ptr) +@ stdcall EngGetPrinterDataFileName(ptr) +@ stdcall EngGradientFill(ptr ptr ptr ptr long ptr long ptr ptr long) NtGdiEngGradientFill +@ stdcall EngLineTo(ptr ptr ptr long long long long ptr ptr) NtGdiEngLineTo +@ stdcall EngLoadModule(ptr) +@ stdcall EngLockSurface(ptr) NtGdiEngLockSurface +@ stdcall EngMarkBandingSurface(ptr) NtGdiEngMarkBandingSurface +@ stdcall EngMultiByteToUnicodeN(wstr long ptr str long) RtlMultiByteToUnicodeN +@ stdcall EngMultiByteToWideChar(long wstr long str long) +@ stdcall EngPaint(ptr ptr ptr ptr ptr) NtGdiEngPaint +@ stdcall EngPlgBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) NtGdiEngPlgBlt +@ stdcall EngQueryEMFInfo(ptr ptr) +@ stdcall EngQueryLocalTime(ptr) +@ stdcall EngReleaseSemaphore(ptr) +@ stdcall EngStretchBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) NtGdiEngStretchBlt +@ stdcall EngStretchBltROP(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long ptr long) NtGdiEngStretchBltROP +@ stdcall EngStrokeAndFillPath(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiEngStrokeAndFillPath +@ stdcall EngStrokePath(ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiEngStrokePath +@ stdcall EngTextOut(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiEngTextOut +@ stdcall EngTransparentBlt(ptr ptr ptr ptr ptr ptr long long) NtGdiEngTransparentBlt +@ stdcall EngUnicodeToMultiByteN(str long long wstr long) RtlUnicodeToMultiByteN +@ stdcall EngUnlockSurface(ptr) NtGdiEngUnlockSurface +@ stdcall EngWideCharToMultiByte(long wstr long str long) @ stdcall EnumEnhMetaFile(long long ptr ptr ptr) @ stdcall EnumFontFamiliesA(long str ptr long) @ stdcall EnumFontFamiliesExA(long ptr ptr long long) @@ -108,10 +214,10 @@ @ stdcall EnumICMProfilesW(long ptr long) @ stdcall EnumMetaFile(long long ptr ptr) @ stdcall EnumObjects(long long ptr long) -@ stdcall EqualRgn(long long) +@ stdcall EqualRgn(long long) NtGdiEqualRgn @ stdcall Escape(long long long ptr ptr) -# @ stub EudcLoadLinkW -# @ stub EudcUnloadLinkW +@ stdcall EudcLoadLinkW(wstr wstr long long) +@ stdcall EudcUnloadLinkW(wstr wstr) @ stdcall ExcludeClipRect(long long long long long) @ stdcall ExtCreatePen(long long ptr long ptr) @ stdcall ExtCreateRegion(ptr long ptr) @@ -125,28 +231,36 @@ @ stdcall FixBrushOrgEx(long long long ptr) @ stdcall FlattenPath(long) @ stdcall FloodFill(long long long long) -@ stdcall FontIsLinked(long) +@ stdcall FontIsLinked(long) NtGdiFontIsLinked +@ stdcall FONTOBJ_cGetAllGlyphHandles(ptr ptr) NtGdiFONTOBJ_cGetAllGlyphHandles +@ stdcall FONTOBJ_cGetGlyphs(ptr long long ptr ptr) NtGdiFONTOBJ_cGetGlyphs +@ stdcall FONTOBJ_pfdg(ptr) NtGdiFONTOBJ_pfdg +@ stdcall FONTOBJ_pifi(ptr) NtGdiFONTOBJ_pifi +@ stdcall FONTOBJ_pQueryGlyphAttrs(ptr long) NtGdiFONTOBJ_pQueryGlyphAttrs +@ stdcall FONTOBJ_pvTrueTypeFontFile(ptr ptr) NtGdiFONTOBJ_pvTrueTypeFontFile +@ stdcall FONTOBJ_pxoGetXform(ptr) NtGdiFONTOBJ_pxoGetXform +@ stdcall FONTOBJ_vGetInfo(ptr long ptr) NtGdiFONTOBJ_vGetInfo @ stdcall FrameRgn(long long long long long) @ stub FreeImageColorMatcher -# @ stub GdiAddFontResourceW -# @ stub GdiAddGlsBounds -# @ stub GdiAddGlsRecord +@ stdcall GdiAddFontResourceW(ptr ptr ptr) +@ stdcall GdiAddGlsBounds(ptr ptr) +@ stdcall GdiAddGlsRecord(ptr long ptr ptr) @ stdcall GdiAlphaBlend(long long long long long long long long long long long) -# @ stub GdiArtificialDecrementDriver +@ stdcall GdiArtificialDecrementDriver(wstr long) @ stub GdiAssociateObject -@ stub GdiCleanCacheDC +@ stdcall GdiCleanCacheDC(ptr) @ stdcall GdiComment(long long ptr) -# @ stub GdiConsoleTextOut +@ stdcall GdiConsoleTextOut(ptr ptr long ptr) NtGdiConsoleTextOut @ stub GdiConvertAndCheckDC @ stub GdiConvertBitmap -# @ stub GdiConvertBitmapV5 -@ stub GdiConvertBrush -@ stub GdiConvertDC -@ stub GdiConvertEnhMetaFile -@ stub GdiConvertFont -@ stub GdiConvertMetaFilePict -@ stub GdiConvertPalette -@ stub GdiConvertRegion +@ stdcall GdiConvertBitmapV5(ptr ptr long long) +@ stdcall GdiConvertBrush(ptr) +@ stdcall GdiConvertDC(ptr) +@ stdcall GdiConvertEnhMetaFile(ptr) +@ stdcall GdiConvertFont(ptr) +@ stdcall GdiConvertMetaFilePict(ptr) +@ stdcall GdiConvertPalette(ptr) +@ stdcall GdiConvertRegion(ptr) @ stdcall GdiConvertToDevmodeW(ptr) @ stub GdiCreateLocalBitmap @ stub GdiCreateLocalBrush @@ -168,126 +282,143 @@ @ stub GdiDciSetDestination @ stub GdiDeleteLocalDC @ stub GdiDeleteLocalObject -# @ stub GdiDeleteSpoolFileHandle -# @ stub GdiDescribePixelFormat -@ stub GdiDllInitialize -# @ stub GdiDrawStream -# @ stub GdiEndDocEMF -# @ stub GdiEndPageEMF -# @ stub GdiFixUpHandle +@ stdcall GdiDeleteSpoolFileHandle(ptr) +@ stdcall GdiDescribePixelFormat(ptr long long ptr) NtGdiDescribePixelFormat +@ stdcall GdiDllInitialize(ptr long ptr) +@ stdcall GdiDrawStream(ptr long ptr) +@ stdcall GdiEndDocEMF(ptr) +@ stdcall GdiEndPageEMF(ptr long) +#@ stdcall GdiEntry1 +#@ stdcall GdiEntry10 +#@ stdcall GdiEntry11 +#@ stdcall GdiEntry12 +#@ stdcall GdiEntry13 +#@ stdcall GdiEntry14 +#@ stdcall GdiEntry15 +#@ stdcall GdiEntry16 +#@ stdcall GdiEntry2 +#@ stdcall GdiEntry3 +#@ stdcall GdiEntry4 +#@ stdcall GdiEntry5 +#@ stdcall GdiEntry6 +#@ stdcall GdiEntry7 +#@ stdcall GdiEntry8 +#@ stdcall GdiEntry9 +@ stdcall GdiFixUpHandle(ptr) @ stdcall GdiFlush() -# @ stub GdiFullscreenControl +@ stdcall GdiFullscreenControl(ptr ptr long ptr ptr) NtGdiFullscreenControl @ stdcall GdiGetBatchLimit() @ stdcall GdiGetCharDimensions(long ptr ptr) @ stdcall GdiGetCodePage(long) -# @ stub GdiGetDC -# @ stub GdiGetDevmodeForPage +@ stdcall GdiGetDC(ptr) +@ stdcall GdiGetDevmodeForPage(ptr long ptr ptr) @ stub GdiGetLocalBitmap @ stub GdiGetLocalBrush @ stub GdiGetLocalDC @ stub GdiGetLocalFont -# @ stub GdiGetPageCount -# @ stub GdiGetPageHandle -# @ stub GdiGetSpoolFileHandle -@ stdcall GdiGetSpoolMessage(ptr long ptr long) +@ stdcall GdiGetPageCount(ptr) +@ stdcall GdiGetPageHandle(ptr long ptr) +@ stdcall GdiGetSpoolFileHandle(wstr ptr wstr) +@ stdcall GdiGetSpoolMessage(ptr long ptr long) NtGdiGetSpoolMessage @ stdcall GdiGradientFill(long ptr long ptr long long) -@ stdcall GdiInitSpool() -# @ stub GdiInitializeLanguagePack +@ stdcall GdiInitializeLanguagePack(long) +@ stdcall GdiInitSpool() NtGdiInitSpool @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) @ stdcall GdiIsPlayMetafileDC(long) -@ stub GdiPlayDCScript -# @ stub GdiPlayEMF -@ stub GdiPlayJournal -# @ stub GdiPlayPageEMF -# @ stub GdiPlayPrivatePageEMF -@ stub GdiPlayScript -# @ stub GdiPrinterThunk -# @ stub GdiProcessSetup -# @ stub GdiQueryFonts -# @ stub GdiQueryTable +@ stdcall GdiPlayDCScript(long long long long long long) +@ stdcall GdiPlayEMF(wstr ptr wstr ptr ptr) +@ stdcall GdiPlayJournal(long long long long long) +@ stdcall GdiPlayPageEMF(ptr ptr ptr ptr ptr) +@ stdcall GdiPlayPrivatePageEMF(ptr long ptr) +@ stdcall GdiPlayScript(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall GdiPlaySpoolStream(long long long long long long) +@ stdcall GdiPrinterThunk(ptr ptr long) +@ stdcall GdiProcessSetup() +@ stdcall GdiQueryFonts(ptr long ptr) NtGdiQueryFonts +@ stdcall GdiQueryTable() @ stdcall GdiRealizationInfo(long ptr) -# @ stub GdiReleaseDC -@ stub GdiReleaseLocalDC -# @ stub GdiResetDCEMF -@ stub GdiSetAttrs +@ stdcall GdiReleaseDC(ptr) +@ stdcall GdiReleaseLocalDC(ptr) +@ stdcall GdiResetDCEMF(ptr ptr) +@ stdcall GdiSetAttrs(ptr) @ stdcall GdiSetBatchLimit(long) -# @ stub GdiSetLastError -# @ stub GdiSetPixelFormat -@ stub GdiSetServerAttr -# @ stub GdiStartDocEMF -# @ stub GdiStartPageEMF -# @ stub GdiSwapBuffers +@ stdcall GdiSetLastError(long) +@ stdcall GdiSetPixelFormat(ptr long) NtGdiSetPixelFormat +@ stdcall GdiSetServerAttr(ptr long) +@ stdcall GdiStartDocEMF(ptr ptr) +@ stdcall GdiStartPageEMF(ptr) +@ stub GdiSwapBuffers @ stdcall GdiTransparentBlt(long long long long long long long long long long long) -# @ stub GdiValidateHandle +@ stdcall GdiValidateHandle(ptr) @ stub GdiWinWatchClose @ stub GdiWinWatchDidStatusChange @ stub GdiWinWatchGetClipList @ stub GdiWinWatchOpen @ stdcall GetArcDirection(long) @ stdcall GetAspectRatioFilterEx(long ptr) -# @ stub GetBitmapAttributes -@ stdcall GetBitmapBits(long long ptr) -@ stdcall GetBitmapDimensionEx(long ptr) +@ stdcall GetBitmapAttributes(ptr) +@ stdcall GetBitmapBits(long long ptr) NtGdiGetBitmapBits +@ stdcall GetBitmapDimensionEx(long ptr) NtGdiGetBitmapDimension @ stdcall GetBkColor(long) @ stdcall GetBkMode(long) @ stdcall GetBoundsRect(long ptr long) -# @ stub GetBrushAttributes +@ stdcall GetBrushAttributes(ptr) @ stdcall GetBrushOrgEx(long ptr) @ stdcall GetCharABCWidthsA(long long long ptr) @ stdcall GetCharABCWidthsFloatA(long long long ptr) @ stdcall GetCharABCWidthsFloatW(long long long ptr) @ stdcall GetCharABCWidthsI(long long long ptr ptr) @ stdcall GetCharABCWidthsW(long long long ptr) +@ stdcall GetCharacterPlacementA(long str long long ptr long) +@ stdcall GetCharacterPlacementW(long wstr long long ptr long) @ stdcall GetCharWidth32A(long long long long) @ stdcall GetCharWidth32W(long long long long) @ stdcall GetCharWidthA(long long long long) GetCharWidth32A @ stdcall GetCharWidthFloatA(long long long ptr) @ stdcall GetCharWidthFloatW(long long long ptr) @ stdcall GetCharWidthI(ptr long long ptr ptr) -# @ stub GetCharWidthInfo -@ stdcall GetCharWidthW(long long long long) GetCharWidth32W +@ stdcall GetCharWidthInfo(ptr ptr) NtGdiGetCharWidthInfo +@ stdcall GetCharWidthW(long long long long) @ stub GetCharWidthWOW -@ stdcall GetCharacterPlacementA(long str long long ptr long) -@ stdcall GetCharacterPlacementW(long wstr long long ptr long) @ stdcall GetClipBox(long ptr) @ stdcall GetClipRgn(long long) -@ stdcall GetColorAdjustment(long ptr) +@ stdcall GetColorAdjustment(long ptr) NtGdiGetColorAdjustment @ stdcall GetColorSpace(long) @ stdcall GetCurrentObject(long long) @ stdcall GetCurrentPositionEx(long ptr) @ stdcall GetDCBrushColor(long) @ stdcall GetDCOrgEx(long ptr) @ stdcall GetDCPenColor(long) +@ stdcall GetDeviceCaps(long long) +@ stdcall GetDeviceGammaRamp(long ptr) @ stdcall GetDIBColorTable(long long long ptr) @ stdcall GetDIBits(long long long long ptr ptr long) -@ stdcall GetDeviceCaps(long long) -@ stdcall GetDeviceGammaRamp(long ptr) -@ stub GetETM -# @ stub GetEUDCTimeStamp -# @ stub GetEUDCTimeStampExW @ stdcall GetEnhMetaFileA(str) @ stdcall GetEnhMetaFileBits(long long ptr) @ stdcall GetEnhMetaFileDescriptionA(long long ptr) @ stdcall GetEnhMetaFileDescriptionW(long long ptr) @ stdcall GetEnhMetaFileHeader(long long ptr) @ stdcall GetEnhMetaFilePaletteEntries (long long ptr) -# @ stub GetEnhMetaFilePixelFormat +@ stdcall GetEnhMetaFilePixelFormat(ptr long ptr) @ stdcall GetEnhMetaFileW(wstr) +@ stub GetETM +# @ stub GetEUDCTimeStamp +# @ stub GetEUDCTimeStampExW # @ stub GetFontAssocStatus @ stdcall GetFontData(long long long ptr long) @ stdcall GetFontLanguageInfo(long) @ stub GetFontResourceInfo @ stub GetFontResourceInfoW -@ stdcall GetFontUnicodeRanges(ptr ptr) +@ stdcall GetFontUnicodeRanges(ptr ptr) NtGdiGetFontUnicodeRanges @ stdcall GetGlyphIndicesA(long ptr long ptr long) -@ stdcall GetGlyphIndicesW(long ptr long ptr long) +@ stdcall GetGlyphIndicesW(long ptr long ptr long) NtGdiGetGlyphIndicesW @ stdcall GetGlyphOutline(long long long ptr long ptr ptr) GetGlyphOutlineA @ stdcall GetGlyphOutlineA(long long long ptr long ptr ptr) @ stdcall GetGlyphOutlineW(long long long ptr long ptr ptr) -@ stub GetGlyphOutlineWow +@ stdcall GetGlyphOutlineWow(long long long long long long long) @ stdcall GetGraphicsMode(long) -# @ stub GetHFONT +@ stdcall GetHFONT(ptr) @ stdcall GetICMProfileA(long ptr ptr) @ stdcall GetICMProfileW(long ptr ptr) @ stdcall GetKerningPairs(long long ptr) GetKerningPairsA @@ -301,9 +432,9 @@ @ stdcall GetMetaFileBitsEx(long long ptr) @ stdcall GetMetaFileW(wstr) @ stdcall GetMetaRgn(long long) -@ stdcall GetMiterLimit(long ptr) -@ stdcall GetNearestColor(long long) -@ stdcall GetNearestPaletteIndex(long long) +@ stdcall GetMiterLimit(long ptr) NtGdiGetMiterLimit +@ stdcall GetNearestColor(long long) NtGdiGetNearestColor +@ stdcall GetNearestPaletteIndex(long long) NtGdiGetNearestPaletteIndex @ stdcall GetObjectA(long long ptr) @ stdcall GetObjectType(long) @ stdcall GetObjectW(long long ptr) @@ -314,64 +445,71 @@ @ stdcall GetPixel(long long long) @ stdcall GetPixelFormat(long) @ stdcall GetPolyFillMode(long) -@ stdcall GetROP2(long) -@ stdcall GetRandomRgn(long long long) -@ stdcall GetRasterizerCaps(ptr long) +@ stdcall GetRandomRgn(long long long) NtGdiGetRandomRgn +@ stdcall GetRasterizerCaps(ptr long) NtGdiGetRasterizerCaps @ stdcall GetRegionData(long long ptr) @ stdcall GetRelAbs(long long) @ stdcall GetRgnBox(long ptr) +@ stdcall GetROP2(long) @ stdcall GetStockObject(long) @ stdcall GetStretchBltMode(long) -# @ stub GetStringBitmapA -# @ stub GetStringBitmapW +@ stdcall GetStringBitmapA(ptr str long long ptr) +@ stdcall GetStringBitmapW(ptr wstr long long ptr) @ stdcall GetSystemPaletteEntries(long long long ptr) -@ stdcall GetSystemPaletteUse(long) +@ stdcall GetSystemPaletteUse(long) NtGdiGetSystemPaletteUse @ stdcall GetTextAlign(long) @ stdcall GetTextCharacterExtra(long) @ stdcall GetTextCharset(long) -@ stdcall GetTextCharsetInfo(long ptr long) +@ stdcall GetTextCharsetInfo(long ptr long) NtGdiGetTextCharsetInfo @ stdcall GetTextColor(long) @ stdcall GetTextExtentExPointA(long str long long ptr ptr ptr) @ stdcall GetTextExtentExPointI(long ptr long long ptr ptr ptr) @ stdcall GetTextExtentExPointW(long wstr long long ptr ptr ptr) -# @ stub GetTextExtentExPointWPri +@ stdcall GetTextExtentExPointWPri(ptr wstr long long long ptr ptr) @ stdcall GetTextExtentPoint32A(long str long ptr) @ stdcall GetTextExtentPoint32W(long wstr long ptr) @ stdcall GetTextExtentPointA(long str long ptr) @ stdcall GetTextExtentPointI(long ptr long ptr) @ stdcall GetTextExtentPointW(long wstr long ptr) @ stdcall GetTextFaceA(long long ptr) -# @ stub GetTextFaceAliasW +@ stdcall GetTextFaceAliasW(ptr long wstr) @ stdcall GetTextFaceW(long long ptr) @ stdcall GetTextMetricsA(long ptr) @ stdcall GetTextMetricsW(long ptr) -@ stdcall GetTransform(long long ptr) +@ stdcall GetTransform(long long ptr) NtGdiGetTransform @ stdcall GetViewportExtEx(long ptr) @ stdcall GetViewportOrgEx(long ptr) -@ stdcall GetWinMetaFileBits(long long ptr long long) @ stdcall GetWindowExtEx(long ptr) @ stdcall GetWindowOrgEx(long ptr) +@ stdcall GetWinMetaFileBits(long long ptr long long) @ stdcall GetWorldTransform(long ptr) +@ stdcall HT_Get8BPPFormatPalette(ptr long long long) NtGdiHT_Get8BPPFormatPalette +@ stdcall HT_Get8BPPMaskPalette(ptr long long long long long) NtGdiHT_Get8BPPMaskPalette @ stdcall IntersectClipRect(long long long long long) @ stdcall InvertRgn(long long) -# @ stub IsValidEnhMetaRecord -# @ stub IsValidEnhMetaRecordOffExt -@ stdcall LPtoDP(long ptr long) +@ stdcall IsValidEnhMetaRecord(long long) +@ stdcall IsValidEnhMetaRecordOffExt(long long long long) @ stdcall LineDDA(long long long long ptr long) @ stdcall LineTo(long long long) +@ stdcall LPtoDP(long ptr long) @ stub LoadImageColorMatcherA @ stub LoadImageColorMatcherW @ stdcall MaskBlt(long long long long long long long long long long long long) -# @ stub MirrorRgn +@ stdcall MirrorRgn(ptr ptr) @ stdcall ModifyWorldTransform(long ptr long) @ stdcall MoveToEx(long long long ptr) -# @ stub NamedEscape +@ stdcall NamedEscape(ptr wstr long long str long str) @ stdcall OffsetClipRgn(long long long) @ stdcall OffsetRgn(long long long) @ stdcall OffsetViewportOrgEx(long long long ptr) @ stdcall OffsetWindowOrgEx(long long long ptr) @ stdcall PaintRgn(long long) @ stdcall PatBlt(long long long long long long) +@ stdcall PATHOBJ_bEnum(ptr ptr) NtGdiPATHOBJ_bEnum +@ stdcall PATHOBJ_bEnumClipLines(ptr long ptr) NtGdiPATHOBJ_bEnumClipLines +@ stdcall PATHOBJ_vEnumStart(ptr) NtGdiPATHOBJ_vEnumStart +@ stdcall PATHOBJ_vEnumStartClipLines(ptr ptr ptr ptr) NtGdiPATHOBJ_vEnumStartClipLines +@ stdcall PATHOBJ_vGetBounds(ptr ptr) NtGdiPATHOBJ_vGetBounds @ stdcall PathToRegion(long) @ stdcall Pie(long long long long long long long long long) @ stdcall PlayEnhMetaFile(long long ptr) @@ -382,26 +520,26 @@ @ stdcall PolyBezier(long ptr long) @ stdcall PolyBezierTo(long ptr long) @ stdcall PolyDraw(long ptr ptr long) -# @ stub PolyPatBlt +@ stdcall Polygon(long ptr long) +@ stdcall Polyline(long ptr long) +@ stdcall PolylineTo(long ptr long) +@ stdcall PolyPatBlt(ptr long ptr long long) @ stdcall PolyPolygon(long ptr ptr long) @ stdcall PolyPolyline(long ptr ptr long) @ stdcall PolyTextOutA(long ptr long) @ stdcall PolyTextOutW(long ptr long) -@ stdcall Polygon(long ptr long) -@ stdcall Polyline(long ptr long) -@ stdcall PolylineTo(long ptr long) @ stdcall PtInRegion(long long long) -@ stdcall PtVisible(long long long) -# @ stub QueryFontAssocStatus +@ stdcall PtVisible(long long long) NtGdiPtVisible +@ stdcall QueryFontAssocStatus() @ stdcall RealizePalette(long) +@ stdcall Rectangle(long long long long long) @ stdcall RectInRegion(long ptr) -@ stdcall RectVisible(long ptr) -@ stdcall Rectangle(long long long long long) +@ stdcall RectVisible(long ptr) NtGdiRectVisible @ stdcall RemoveFontMemResourceEx(ptr) @ stdcall RemoveFontResourceA(str) @ stdcall RemoveFontResourceExA(str long ptr) @ stdcall RemoveFontResourceExW(wstr long ptr) -@ stub RemoveFontResourceTracking +@ stdcall RemoveFontResourceTracking(ptr long) @ stdcall RemoveFontResourceW(wstr) @ stdcall ResetDCA(long ptr) @ stdcall ResetDCW(long ptr) @@ -411,122 +549,96 @@ @ stdcall SaveDC(long) @ stdcall ScaleViewportExtEx(long long long long long ptr) @ stdcall ScaleWindowExtEx(long long long long long ptr) -@ stub SelectBrushLocal +@ stdcall SelectBrushLocal(ptr ptr) @ stdcall SelectClipPath(long long) @ stdcall SelectClipRgn(long long) -@ stub SelectFontLocal +@ stdcall SelectFontLocal(ptr ptr) @ stdcall SelectObject(long long) @ stdcall SelectPalette(long long long) @ stdcall SetAbortProc(long ptr) @ stdcall SetArcDirection(long long) -# @ stub SetBitmapAttributes -@ stdcall SetBitmapBits(long long ptr) -@ stdcall SetBitmapDimensionEx(long long long ptr) +@ stdcall SetBitmapAttributes(ptr long) +@ stdcall SetBitmapBits(long long ptr) NtGdiSetBitmapBits +@ stdcall SetBitmapDimensionEx(long long long ptr) NtGdiSetBitmapDimension @ stdcall SetBkColor(long long) @ stdcall SetBkMode(long long) @ stdcall SetBoundsRect(long ptr long) -# @ stub SetBrushAttributes +@ stdcall SetBrushAttributes(ptr long) @ stdcall SetBrushOrgEx(long long long ptr) @ stdcall SetColorAdjustment(long ptr) @ stdcall SetColorSpace(long long) @ stdcall SetDCBrushColor(long long) @ stdcall SetDCPenColor(long long) +@ stdcall SetDeviceGammaRamp(long ptr) @ stdcall SetDIBColorTable(long long long ptr) @ stdcall SetDIBits(long long long long ptr ptr long) @ stdcall SetDIBitsToDevice(long long long long long long long long long ptr ptr long) -@ stdcall SetDeviceGammaRamp(long ptr) @ stdcall SetEnhMetaFileBits(long ptr) -@ stub SetFontEnumeration +@ stdcall SetFontEnumeration(ptr) NtGdiSetFontEnumeration @ stdcall SetGraphicsMode(long long) @ stdcall SetICMMode(long long) @ stdcall SetICMProfileA(long str) @ stdcall SetICMProfileW(long wstr) @ stdcall SetLayout(long long) -# @ stub SetLayoutWidth -@ stdcall SetMagicColors(ptr long long) +@ stdcall SetLayoutWidth(ptr long long) +@ stdcall SetMagicColors(ptr long long) NtGdiSetMagicColors @ stdcall SetMapMode(long long) @ stdcall SetMapperFlags(long long) @ stdcall SetMetaFileBitsEx(long ptr) @ stdcall SetMetaRgn(long) @ stdcall SetMiterLimit(long long ptr) -@ stdcall SetObjectOwner(long long) +#@ stdcall SetObjectOwner(long long) @ stdcall SetPaletteEntries(long long long ptr) @ stdcall SetPixel(long long long long) @ stdcall SetPixelFormat(long long ptr) @ stdcall SetPixelV(long long long long) @ stdcall SetPolyFillMode(long long) -@ stdcall SetROP2(long long) @ stdcall SetRectRgn(long long long long long) @ stdcall SetRelAbs(long long) +@ stdcall SetROP2(long long) @ stdcall SetStretchBltMode(long long) -@ stdcall SetSystemPaletteUse(long long) +@ stdcall SetSystemPaletteUse(long long) NtGdiSetSystemPaletteUse @ stdcall SetTextAlign(long long) @ stdcall SetTextCharacterExtra(long long) @ stdcall SetTextColor(long long) @ stdcall SetTextJustification(long long long) @ stdcall SetViewportExtEx(long long long ptr) @ stdcall SetViewportOrgEx(long long long ptr) -@ stdcall SetVirtualResolution(long long long long long) -@ stdcall SetWinMetaFileBits(long ptr long ptr) +@ stdcall SetVirtualResolution(long long long long long) NtGdiSetVirtualResolution @ stdcall SetWindowExtEx(long long long ptr) @ stdcall SetWindowOrgEx(long long long ptr) +@ stdcall SetWinMetaFileBits(long ptr long ptr) @ stdcall SetWorldTransform(long ptr) @ stdcall StartDocA(long ptr) @ stdcall StartDocW(long ptr) -# @ stub StartFormPage +@ stdcall StartFormPage(ptr) @ stdcall StartPage(long) @ stdcall StretchBlt(long long long long long long long long long long long) @ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) +@ stdcall STROBJ_bEnum(ptr ptr ptr) NtGdiSTROBJ_bEnum +@ stdcall STROBJ_bEnumPositionsOnly(ptr ptr ptr) NtGdiSTROBJ_bEnumPositionsOnly +@ stdcall STROBJ_bGetAdvanceWidths(ptr long long ptr) NtGdiSTROBJ_bGetAdvanceWidths +@ stdcall STROBJ_dwGetCodePage(ptr) NtGdiSTROBJ_dwGetCodePage +@ stdcall STROBJ_vEnumStart(ptr) NtGdiSTROBJ_vEnumStart @ stdcall StrokeAndFillPath(long) @ stdcall StrokePath(long) @ stdcall SwapBuffers(long) @ stdcall TextOutA(long long long str long) @ stdcall TextOutW(long long long wstr long) @ stdcall TranslateCharsetInfo(ptr ptr long) -@ stub UnloadNetworkFonts +@ stdcall UnloadNetworkFonts(long) @ stdcall UnrealizeObject(long) @ stdcall UpdateColors(long) @ stdcall UpdateICMRegKey(long str str long) UpdateICMRegKeyA @ stdcall UpdateICMRegKeyA(long str str long) @ stdcall UpdateICMRegKeyW(long wstr wstr long) @ stdcall WidenPath(long) -@ stub gdiPlaySpoolStream -@ extern pfnRealizePalette -@ extern pfnSelectPalette -@ stub pstackConnect - -################################################################ -# Wine extensions: OpenGL support -# -@ stdcall wglCopyContext(long long long) -@ stdcall wglCreateContext(long) -@ stdcall wglDeleteContext(long) -@ stdcall wglGetCurrentContext() -@ stdcall wglGetCurrentDC() -@ stdcall -private wglGetProcAddress(str) -@ stdcall wglMakeCurrent(long long) -@ stdcall wglShareLists(long long) -@ stdcall wglUseFontBitmapsA(long long long long) -@ stdcall wglUseFontBitmapsW(long long long long) - -################################################################ -# Wine extensions: Win16 functions that are needed by other dlls -# -@ stdcall CloseJob16(long) -@ stdcall DrvGetPrinterData16(str str ptr ptr long ptr) -@ stdcall DrvSetPrinterData16(str str long ptr long) -@ stdcall GetDCHook(long ptr) -@ stdcall OpenJob16(str str long) -@ stdcall SelectVisRgn(long long) -@ stdcall SetDCHook(long ptr long) -@ stdcall SetHookFlags(long long) -@ stdcall WriteSpool16(long ptr long) - -################################################################ -# Wine internal extensions -# -# All functions must be prefixed with '__wine_' (for internal functions) -# or 'wine_' (for user-visible functions) to avoid namespace conflicts. - -# GDI objects -@ cdecl __wine_make_gdi_object_system(long long) +@ stdcall XFORMOBJ_bApplyXform(ptr long long ptr ptr) NtGdiXFORMOBJ_bApplyXform +@ stdcall XFORMOBJ_iGetXform(ptr ptr) NtGdiXFORMOBJ_iGetXform +@ stdcall XLATEOBJ_cGetPalette(ptr long long ptr) NtGdiXLATEOBJ_cGetPalette +@ stdcall XLATEOBJ_hGetColorTransform(ptr) NtGdiXLATEOBJ_hGetColorTransform +@ stdcall XLATEOBJ_iXlate(ptr long) +@ stdcall XLATEOBJ_piVector(ptr) +#@ extern pfnRealizePalette +#@ extern pfnSelectPalette +#@ stub pstackConnect Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon Oct 6 23:05:18 2008 @@ -968,7 +968,7 @@ */ DWORD STDCALL -gdiPlaySpoolStream( +GdiPlaySpoolStream( DWORD a0, DWORD a1, DWORD a2,

1 0

[sserapion] 36672: Fix incorrect parameter counts for NtGdiEngCreateBitmap, NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap. Don't worry these were just stubs.
by sserapion＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: sserapion Date: Mon Oct 6 23:03:36 2008 New Revision: 36672 URL: http://svn.reactos.org/svn/reactos?rev=36672&view=rev Log: Fix incorrect parameter counts for NtGdiEngCreateBitmap, NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap. Don't worry these were just stubs. Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Mon Oct 6 23:03:36 2008 @@ -604,9 +604,9 @@ NtUserRemoteStopScreenUpdates 0 NtUserCtxDisplayIOCtl 3 NtGdiEngAssociateSurface 3 -NtGdiEngCreateBitmap 6 -NtGdiEngCreateDeviceSurface 4 -NtGdiEngCreateDeviceBitmap 4 +NtGdiEngCreateBitmap 5 +NtGdiEngCreateDeviceSurface 3 +NtGdiEngCreateDeviceBitmap 3 NtGdiEngCreatePalette 6 NtGdiEngComputeGlyphSet 3 NtGdiEngCopyBits 6

1 0

[dreimer] 36671: - Finally the one and only splitup of GCC Host and Target in different folders and a fix for the Header Usage Problem in one. This cures the MESS in our GCC Folder and simplifies the inclusion of new Arches, too. Great work, done By Samuel Serapion - Updated charch and chdefgcc to support the new way of accessing the different GCCs and some cleanup by me. chdefgcc got a new Param to choose if the Host of Target GCC will be edited. - Fixed MingW.cmd to use Host GCC again. - Sorta
by dreimer＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: dreimer Date: Mon Oct 6 20:14:09 2008 New Revision: 36671 URL: http://svn.reactos.org/svn/reactos?rev=36671&view=rev Log: - Finally the one and only splitup of GCC Host and Target in different folders and a fix for the Header Usage Problem in one. This cures the MESS in our GCC Folder and simplifies the inclusion of new Arches, too. Great work, done By Samuel Serapion - Updated charch and chdefgcc to support the new way of accessing the different GCCs and some cleanup by me. chdefgcc got a new Param to choose if the Host of Target GCC will be edited. - Fixed MingW.cmd to use Host GCC again. - Sorta updated the install script for the 64 bit GCC Addon. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -111,6 +111,11 @@ set CCACHE_DIR=%APPDATA%\RosBE\.ccache set HOST_CC=ccache gcc set HOST_CPP=ccache g++ + + :: + ::Target defaults to host(i386) + :: + set TARGET_CC=ccache gcc set TARGET_CPP=ccache g++ if .%ROS_ARCH%. == .arm. ( @@ -128,6 +133,11 @@ ) else ( set HOST_CC=gcc set HOST_CPP=g++ + + :: + ::Target defaults to host(i386) + :: + set TARGET_CC=gcc set TARGET_CPP=g++ if .%ROS_ARCH%. == .arm. ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -38,7 +38,7 @@ ) if exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( - echo chdefgcc [PATH] - Change the MinGW/GCC directory for the + echo chdefgcc [OPTIONS] - Change the MinGW/GCC directory for the echo current RosBE session. ) @@ -125,9 +125,11 @@ ) if exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( if /i "%1" == "chdefgcc" ( - echo Usage: chdefgcc [PATH] - echo Change the MinGW/GCC directory for the current RosBE session. - echo. + echo Usage: chdefgcc [OPTIONS] + echo Change the MinGW/GCC Target/Host directory for the current RosBE session. + echo. + echo Path - Path to set the Host of Target GCC to. + echo Type - Set it to "target" or "host" goto :EOC ) ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -25,7 +25,8 @@ set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_MODE=MinGW set _ROSBE_ORIGINALPATH=%PATH% -set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 +set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 +set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 echo. echo. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -33,7 +33,8 @@ set _ROSBE_STRIP=0 set _ROSBE_NOSTRIP=0 set _ROSBE_MODULES=0 -set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 +set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 +set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 set _ROSBE_LOGDIR=%CD%\RosBE-Logs set _ROSBE_OBJPATH= set _ROSBE_OUTPATH= Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -15,9 +15,7 @@ :: :: Parse the command line arguments. -:: ROS_ARCH: Default is i386, can be set to amd64, ppc or arm. -:: ROS_PREFIX: Default is mingw32. ppc could be ppc-pc-mingw32, -:: arm arm-pc-mingw32, x64 x86_64-pc-mingw32. +:: ROSBE_ARCH: Default is i386, can be set to amd64, ppc or arm. :: if "%1" == "" ( @@ -26,29 +24,32 @@ set _1=%1 ) if /i "%_1%" == "i386" ( - set ROS_ARCH= - set ROS_PREFIX= - goto :EOC + set _ROSBE_ARCH= + goto :EOA ) if /i "%_1%" == "arm" ( - set ROS_ARCH=arm - set ROS_PREFIX=arm-pc-mingw32 - goto :EOC + set _ROSBE_ARCH=1 + goto :EOA ) if /i "%_1%" == "ppc" ( - set ROS_ARCH=ppc - set ROS_PREFIX=ppc-pc-mingw32 - goto :EOC + set _ROSBE_ARCH=2 + goto :EOA ) if /i "%_1%" == "amd64" ( - set ROS_ARCH=amd64 - set ROS_PREFIX=x86_64-pc-mingw32 - goto :EOC + set _ROSBE_ARCH=3 + goto :EOA ) if not "%_1%" == "" ( echo Unknown parameter specified. Try 'help [COMMAND]'. goto :EOC ) + +:EOA + +:: +:: Refresh all needed Params by recalling the main Path setting CMD File. +:: +call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" goto :EOC :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -13,14 +13,18 @@ ) if "%_ROSBE_MODE%" == "RosBE" ( - title Change the current MinGW/GCC directory... + title Change the current MinGW/GCC Host/Target directory... ) :: :: Parse the command line arguments. :: for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\rquote.exe" %1"`) do set _1=%%i +set _2=%2 if "%_1%" == "" ( + call :INTERACTIVE +) +if "%_2%" == "" ( call :INTERACTIVE ) @@ -31,21 +35,38 @@ goto :EOC ) -if not exist "%_1%\bin\gcc.exe" ( +if not exist "%_1%\bin\*gcc.exe" ( echo ERROR: No MinGW/GCC found in the specified path. goto :EOC ) -set _ROSBE_MINGWPATH=%_1% -echo Location: %_ROSBE_MINGWPATH% -call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" +if /i "%_2%" == "target" ( + set _ROSBE_TARGET_MINGWPATH=%_1% + echo Target Location: %_ROSBE_TARGET_MINGWPATH% + goto :EOA +) +if /i "%_2%" == "host" ( + set _ROSBE_HOST_MINGWPATH=%_1% + echo Host Location: %_ROSBE_HOST_MINGWPATH% + goto :EOA +) else ( + echo ERROR: You specified wrong parameters. + goto :EOC +) +:EOA +call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" chdefgcc goto :EOC :INTERACTIVE set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " if "%_1%" == "" ( echo ERROR: You must enter a MinGW/GCC directory. + goto :EOC + ) + set /p _2="Please specify, if this will be the Target or Host GCC: " + if "%_2%" == "" ( + echo ERROR: You must enter "target" or "host". goto :EOC ) goto :EOF @@ -59,3 +80,4 @@ :: Unload all used Vars. :: set _1= +set _2= Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -17,9 +17,9 @@ :: Check if we are running within the RosBE, and if not :: initialize GCC for the current directory. :: -if not defined _ROSBE_MINGWPATH ( +if not defined _ROSBE_HOST_MINGWPATH ( set _ROSBE_MODE=MinGW - set _ROSBE_MINGWPATH=%CD% + set _ROSBE_HOST_MINGWPATH=%CD% set _ROSBE_ORIGINALPATH=%PATH% ) @@ -30,49 +30,66 @@ set ROS_ARCH= set ROS_PREFIX= +if "%1" == "chdefgcc" ( + goto :main +) + if .%_ROSBE_ARCH%. == .1. ( set ROS_ARCH=arm set ROS_PREFIX=arm-pc-mingw32 + REM set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 ) if .%_ROSBE_ARCH%. == .2. ( set ROS_ARCH=ppc set ROS_PREFIX=ppc-pc-mingw32 + REM set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 ) if .%_ROSBE_ARCH%. == .3. ( set ROS_ARCH=amd64 set ROS_PREFIX=x86_64-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 ) + +:main :: :: Set up the GCC 4.x.x build environment. :: -set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% -set _ROSBE_GCCVERSION= -set _ROSBE_GCCTARGET= +set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% +set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe + +if not .%ROS_ARCH%. == .. ( +for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i +for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +) else ( for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% -set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe +) + +for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_HOST_GCCVERSION=%%i +for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_HOST_GCCTARGET=%%i + if "%_ROSBE_MODE%" == "MinGW" ( - set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include - set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include + set C_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include + set CPLUS_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include ) else ( - set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" - set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" + set HOST_CPPFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" + set TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set TARGET_CPPFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" ) -set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION% :: :: Display the current version of GCC, NASM, ld and make. :: if not .%ROS_ARCH%. == .. ( - %ROS_PREFIX%-gcc -v 2>&1 | find "gcc version" + "%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%-gcc" -v 2>&1 | find "gcc version" if .%ROS_PREFIX%. == .. ( echo gcc target^: %_ROSBE_GCCTARGET% ) else ( echo gcc target^: %ROS_PREFIX:~0,-11% ) - %ROS_PREFIX%-ld -v + "%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%-ld" -v ) else ( gcc -v 2>&1 | find "gcc version" if .%ROS_PREFIX%. == .. ( @@ -83,10 +100,10 @@ ld -v ) -if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" ( +if exist "%_ROSBE_HOST_MINGWPATH%\bin\nasm.exe" ( nasm -v ) else ( - if exist "%_ROSBE_MINGWPATH%\bin\yasm.exe" ( + if exist "%_ROSBE_HOST_MINGWPATH%\bin\yasm.exe" ( yasm --version | find "yasm 0" ) else ( if "%_ROSBE_MODE%" == "RosBE" ( @@ -94,14 +111,14 @@ ) ) ) -if exist "%_ROSBE_MINGWPATH%\bin\bison.exe" ( +if exist "%_ROSBE_HOST_MINGWPATH%\bin\bison.exe" ( bison --version | find "GNU Bison" ) else ( if "%_ROSBE_MODE%" == "RosBE" ( echo WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC. ) ) -if exist "%_ROSBE_MINGWPATH%\bin\flex.exe" ( +if exist "%_ROSBE_HOST_MINGWPATH%\bin\flex.exe" ( flex --version ) else ( if "%_ROSBE_MODE%" == "RosBE" ( Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -116,7 +116,7 @@ SectionEnd Section -MinGWGCCNASM SEC02 - SetOutPath "$INSTDIR\4.1.3" + SetOutPath "$INSTDIR\4.4.0" SetOverwrite try File /r Components\4.4.0\*.* SectionEnd @@ -185,7 +185,7 @@ ;; ;; Clean up installed files. ;; - RMDir /r /REBOOTOK "$INSTDIR\4.1.3" + RMDir /r /REBOOTOK "$INSTDIR\4.4.0" Delete /REBOOTOK "$INSTDIR\charch.cmd" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!!

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008