Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 16776: fix errorlevel for type, the r16766 was Brandon Turner patch sorry I forgt menoty his name.
by greatlrd＠svn.reactos.com 27 Jul '05

27 Jul '05

fix errorlevel for type, the r16766 was Brandon Turner patch sorry I forgt menoty his name. Modified: trunk/reactos/subsys/system/cmd/type.c _____ Modified: trunk/reactos/subsys/system/cmd/type.c --- trunk/reactos/subsys/system/cmd/type.c 2005-07-27 01:31:34 UTC (rev 16775) +++ trunk/reactos/subsys/system/cmd/type.c 2005-07-27 01:38:00 UTC (rev 16776) @@ -78,6 +78,8 @@ continue; } + nErrorLevel = 0; + hFile = CreateFile(argv[i], GENERIC_READ, FILE_SHARE_READ,NULL, @@ -97,6 +99,7 @@ NULL); ConErrPrintf (_T("%s - %s"), argv[i], errmsg); LocalFree (errmsg); + nErrorLevel = 1; continue; }

1 0

[weiden] 16775: export these stubs: AddAccessAllowedObjectAce, AddAccessDeniedObjectAce, AddAuditAccessObjectAce, CreatePrivateObjectSecurityEx, CreatePrivateObjectSecurityWithMultipleInheritance, ConvertToAutoInheritPrivateObjectSecurity, EqualDomainSid, GetWindowsAccountDomainSid and CreateWellKnownSid
by weiden＠svn.reactos.com 27 Jul '05

27 Jul '05

export these stubs: AddAccessAllowedObjectAce, AddAccessDeniedObjectAce, AddAuditAccessObjectAce, CreatePrivateObjectSecurityEx, CreatePrivateObjectSecurityWithMultipleInheritance, ConvertToAutoInheritPrivateObjectSecurity, EqualDomainSid, GetWindowsAccountDomainSid and CreateWellKnownSid Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/sec/ac.c Modified: trunk/reactos/lib/advapi32/sec/misc.c Modified: trunk/reactos/lib/advapi32/sec/sec.c Modified: trunk/reactos/lib/advapi32/sec/sid.c Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-07-27 01:26:16 UTC (rev 16774) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-07-27 01:31:34 UTC (rev 16775) @@ -24,14 +24,14 @@ ;AccessCheckByTypeResultListAndAuditAlarmW@64 AddAccessAllowedAce@16 AddAccessAllowedAceEx@20 -;AddAccessAllowedObjectAce@28 +AddAccessAllowedObjectAce@28 AddAccessDeniedAce@16 AddAccessDeniedAceEx@20 -;AddAccessDeniedObjectAce@28 +AddAccessDeniedObjectAce@28 AddAce@20 AddAuditAccessAce@24 AddAuditAccessAceEx@28 -;AddAuditAccessObjectAce@36 +AddAuditAccessObjectAce@36 ;AddUsersToEncryptedFile@8 AdjustTokenGroups@24 AdjustTokenPrivileges@24 @@ -95,12 +95,12 @@ ;ConvertStringSecurityDescriptorToSecurityDescriptorW@20 ;ConvertStringSidToSidA@8 ;ConvertStringSidToSidW@8 -;ConvertToAutoInheritPrivateObjectSecurity@24 +ConvertToAutoInheritPrivateObjectSecurity@24 CopySid@12 ;CreateCodeAuthzLevel@20 CreatePrivateObjectSecurity@24 -;CreatePrivateObjectSecurityEx@32 -;CreatePrivateObjectSecurityWithMultipleInheritance@36 +CreatePrivateObjectSecurityEx@32 +CreatePrivateObjectSecurityWithMultipleInheritance@36 CreateProcessAsUserA@44 ;CreateProcessAsUserSecure CreateProcessAsUserW@44 @@ -109,7 +109,7 @@ CreateServiceA@52 CreateServiceW@52 ;CreateTraceInstanceId@8 -;CreateWellKnownSid@16 +CreateWellKnownSid@16 ;CredDeleteA@12 ;CredDeleteW@12 ;CredEnumerateA@16 @@ -219,7 +219,7 @@ ;EnumServicesStatusExW EnumServicesStatusW@32 ;EnumerateTraceGuids -;EqualDomainSid +EqualDomainSid@12 EqualPrefixSid@8 EqualSid@8 ;FileEncryptionStatusA @@ -298,7 +298,7 @@ GetTrusteeTypeW@4 GetUserNameA@8 GetUserNameW@8 -;GetWindowsAccountDomainSid +GetWindowsAccountDomainSid@12 ;I_ScGetCurrentGroupStateW@12 ;I_ScIsSecurityProcess ;I_ScPnPGetServiceName _____ Modified: trunk/reactos/lib/advapi32/sec/ac.c --- trunk/reactos/lib/advapi32/sec/ac.c 2005-07-27 01:26:16 UTC (rev 16774) +++ trunk/reactos/lib/advapi32/sec/ac.c 2005-07-27 01:31:34 UTC (rev 16775) @@ -166,6 +166,25 @@ /* + * @unimplemented + */ +BOOL +STDCALL +AddAccessAllowedObjectAce( + PACL pAcl, + DWORD dwAceRevision, + DWORD AceFlags, + DWORD AccessMask, + GUID* ObjectTypeGuid, + GUID* InheritedObjectTypeGuid, + PSID pSid) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* * @implemented */ BOOL @@ -221,6 +240,22 @@ /* + * @unimplemented + */ +BOOL +STDCALL +AddAccessDeniedObjectAce( + PACL pAcl, + DWORD dwAceRevision, + DWORD AccessMask, + PSID pSid) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* * @implemented */ BOOL @@ -314,6 +349,27 @@ /* + * @unimplemented + */ +BOOL +STDCALL +AddAuditAccessObjectAce( + PACL pAcl, + DWORD dwAceRevision, + DWORD AceFlags, + DWORD AccessMask, + GUID* ObjectTypeGuid, + GUID* InheritedObjectTypeGuid, + PSID pSid, + BOOL bAuditSuccess, + BOOL bAuditFailure) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* * @implemented */ BOOL _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2005-07-27 01:26:16 UTC (rev 16774) +++ trunk/reactos/lib/advapi32/sec/misc.c 2005-07-27 01:31:34 UTC (rev 16775) @@ -1800,6 +1800,43 @@ /* + * @unimplemented + */ +BOOL STDCALL +CreatePrivateObjectSecurityEx(PSECURITY_DESCRIPTOR ParentDescriptor, + PSECURITY_DESCRIPTOR CreatorDescriptor, + PSECURITY_DESCRIPTOR* NewDescriptor, + GUID* ObjectType, + BOOL IsContainerObject, + ULONG AutoInheritFlags, + HANDLE Token, + PGENERIC_MAPPING GenericMapping) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +CreatePrivateObjectSecurityWithMultipleInheritance(PSECURITY_DESCRIPTOR ParentDescriptor, + PSECURITY_DESCRIPTOR CreatorDescriptor, + PSECURITY_DESCRIPTOR* NewDescriptor, + GUID** ObjectTypes, + ULONG GuidCount, + BOOL IsContainerObject, + ULONG AutoInheritFlags, + HANDLE Token, + PGENERIC_MAPPING GenericMapping) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return FALSE; +} + + +/* * @implemented */ BOOL STDCALL _____ Modified: trunk/reactos/lib/advapi32/sec/sec.c --- trunk/reactos/lib/advapi32/sec/sec.c 2005-07-27 01:26:16 UTC (rev 16774) +++ trunk/reactos/lib/advapi32/sec/sec.c 2005-07-27 01:31:34 UTC (rev 16775) @@ -440,4 +440,21 @@ return TRUE; } + +/* + * @unimplemented + */ +BOOL +STDCALL +ConvertToAutoInheritPrivateObjectSecurity(IN PSECURITY_DESCRIPTOR ParentDescriptor, + IN PSECURITY_DESCRIPTOR CurrentSecurityDescriptor, + OUT PSECURITY_DESCRIPTOR* NewSecurityDescriptor, + IN GUID* ObjectType, + IN BOOLEAN IsDirectoryObject, + IN PGENERIC_MAPPING GenericMapping) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ _____ Modified: trunk/reactos/lib/advapi32/sec/sid.c --- trunk/reactos/lib/advapi32/sec/sid.c 2005-07-27 01:26:16 UTC (rev 16774) +++ trunk/reactos/lib/advapi32/sec/sid.c 2005-07-27 01:31:34 UTC (rev 16775) @@ -303,4 +303,44 @@ return TRUE; } + +/* + * @unimplemented + */ +BOOL STDCALL +EqualDomainSid(IN PSID pSid1, + IN PSID pSid2, + OUT BOOL* pfEqual) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +GetWindowsAccountDomainSid(IN PSID pSid, + OUT PSID ppDomainSid, + IN OUT DWORD* cbSid) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL STDCALL +CreateWellKnownSid(IN WELL_KNOWN_SID_TYPE WellKnownSidType, + IN PSID DomainSid OPTIONAL, + OUT PSID pSid, + IN OUT DWORD* cbSid) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return FALSE; +} + /* EOF */ _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-07-27 01:26:16 UTC (rev 16774) +++ trunk/reactos/w32api/include/winnt.h 2005-07-27 01:31:34 UTC (rev 16775) @@ -444,6 +444,73 @@ #define DOMAIN_ALIAS_RID_PRINT_OPS 0x226L #define DOMAIN_ALIAS_RID_BACKUP_OPS 0x227L #define DOMAIN_ALIAS_RID_REPLICATOR 0x228L + +typedef enum +{ + WinNullSid = 0, + WinWorldSid, + WinLocalSid, + WinCreatorOwnerSid, + WinCreatorGroupSid, + WinCreatorOwnerServerSid, + WinCreatorGroupServerSid, + WinNtAuthoritySid, + WinDialupSid, + WinNetworkSid, + WinBatchSid, + WinInteractiveSid, + WinServiceSid, + WinAnonymousSid, + WinProxySid, + WinEnterpriseControllersSid, + WinSelfSid, + WinAuthenticatedUserSid, + WinRestrictedCodeSid, + WinTerminalServerSid, + WinRemoteLogonIdSid, + WinLogonIdsSid, + WinLocalSystemSid, + WinLocalServiceSid, + WinNetworkServiceSid, + WinBuiltinDomainSid, + WinBuiltinAdministratorsSid, + WinBuiltinUsersSid, + WinBuiltinGuestsSid, + WinBuiltinPowerUsersSid, + WinBuiltinAccountOperatorsSid, + WinBuiltinSystemOperatorsSid, + WinBuiltinPrintOperatorsSid, + WinBuiltinBackupOperatorsSid, + WinBuiltinReplicatorSid, + WinBuiltinPreWindows2000CompatibleAccessSid, + WinBuiltinRemoteDesktopUsersSid, + WinBuiltinNetworkConfigurationOperatorsSid, + WinAccountAdministratorSid, + WinAccountGuestSid, + WinAccountKrbtgtSid, + WinAccountDomainAdminsSid, + WinAccountDomainUsersSid, + WinAccountDomainGuestsSid, + WinAccountComputersSid, + WinAccountControllersSid, + WinAccountCertAdminsSid, + WinAccountSchemaAdminsSid, + WinAccountEnterpriseAdminsSid, + WinAccountPolicyAdminsSid, + WinAccountRasAndIasServersSid, + WinNTLMAuthenticationSid, + WinDigestAuthenticationSid, + WinSChannelAuthenticationSid, + WinThisOrganizationSid, + WinOtherOrganizationSid, + WinBuiltinIncomingForestTrustBuildersSid, + WinBuiltinPerfMonitoringUsersSid, + WinBuiltinPerfLoggingUsersSid, + WinBuiltinAuthorizationAccessSid, + WinBuiltinTerminalServerLicenseServersSid, + WinBuiltinDCOMUsersSid +} WELL_KNOWN_SID_TYPE; + #define SE_CREATE_TOKEN_NAME TEXT("SeCreateTokenPrivilege") #define SE_ASSIGNPRIMARYTOKEN_NAME TEXT("SeAssignPrimaryTokenPrivilege") #define SE_LOCK_MEMORY_NAME TEXT("SeLockMemoryPrivilege")

1 0

[ion] 16774: - Fix warnings
by ion＠svn.reactos.com 27 Jul '05

27 Jul '05

- Fix warnings Modified: trunk/reactos/lib/wininet/ftp.c _____ Modified: trunk/reactos/lib/wininet/ftp.c --- trunk/reactos/lib/wininet/ftp.c 2005-07-27 01:22:46 UTC (rev 16773) +++ trunk/reactos/lib/wininet/ftp.c 2005-07-27 01:26:16 UTC (rev 16774) @@ -34,6 +34,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <ctype.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h>

1 0

[ion] 16773: - Fix warnings
by ion＠svn.reactos.com 27 Jul '05

27 Jul '05

- Fix warnings Modified: trunk/reactos/lib/winmm/mci.c Modified: trunk/reactos/lib/winmm/winmm.c _____ Modified: trunk/reactos/lib/winmm/mci.c --- trunk/reactos/lib/winmm/mci.c 2005-07-27 01:14:00 UTC (rev 16772) +++ trunk/reactos/lib/winmm/mci.c 2005-07-27 01:22:46 UTC (rev 16773) @@ -456,15 +456,15 @@ if (dwParam1 & MCI_OPEN_TYPE) { if (!(dwParam1 & MCI_OPEN_TYPE_ID)) - HeapFree(GetProcessHeap(), 0, mci_openW->lpstrDeviceType); + HeapFree(GetProcessHeap(), 0, (PVOID)mci_openW->lpstrDeviceType); } if (dwParam1 & MCI_OPEN_ELEMENT) { if (!(dwParam1 & MCI_OPEN_ELEMENT_ID)) - HeapFree(GetProcessHeap(), 0, mci_openW->lpstrElementName); + HeapFree(GetProcessHeap(), 0, (PVOID)mci_openW->lpstrElementName); } if (dwParam1 & MCI_OPEN_ALIAS) - HeapFree(GetProcessHeap(), 0, mci_openW->lpstrAlias); + HeapFree(GetProcessHeap(), 0, (PVOID)mci_openW->lpstrAlias); HeapFree(GetProcessHeap(), 0, ptr); } break; _____ Modified: trunk/reactos/lib/winmm/winmm.c --- trunk/reactos/lib/winmm/winmm.c 2005-07-27 01:14:00 UTC (rev 16772) +++ trunk/reactos/lib/winmm/winmm.c 2005-07-27 01:22:46 UTC (rev 16773) @@ -103,8 +103,10 @@ * WINMM_LoadMMSystem * */ +#ifndef __REACTOS__ static HANDLE (WINAPI *pGetModuleHandle16)(LPCSTR); static DWORD (WINAPI *pLoadLibrary16)(LPCSTR); +#endif BOOL WINMM_CheckForMMSystem(void) {

1 0

[ion] 16772: - Fix warnings.
by ion＠svn.reactos.com 27 Jul '05

27 Jul '05

- Fix warnings. Modified: trunk/reactos/lib/winmm/midimap/midimap.c _____ Modified: trunk/reactos/lib/winmm/midimap/midimap.c --- trunk/reactos/lib/winmm/midimap/midimap.c 2005-07-27 01:12:53 UTC (rev 16771) +++ trunk/reactos/lib/winmm/midimap/midimap.c 2005-07-27 01:14:00 UTC (rev 16772) @@ -26,6 +26,7 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> +#include <ctype.h> #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

[ion] 16771: - Add wine_dbgstr_w
by ion＠svn.reactos.com 27 Jul '05

27 Jul '05

- Add wine_dbgstr_w - Revert changes, msiexec is shared. Modified: trunk/reactos/include/wine/debug.h Modified: trunk/reactos/subsys/system/msiexec/msiexec.c _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-07-27 01:09:38 UTC (rev 16770) +++ trunk/reactos/include/wine/debug.h 2005-07-27 01:12:53 UTC (rev 16771) @@ -35,6 +35,7 @@ /* These function return a printable version of a string, including quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ +extern const char *wine_dbgstr_w( const WCHAR *s ); extern const char *wine_dbgstr_an( const char * s, int n ); extern const char *wine_dbgstr_wn( const wchar_t *s, int n ); extern const char *wine_dbgstr_guid( const struct _GUID *id ); _____ Modified: trunk/reactos/subsys/system/msiexec/msiexec.c --- trunk/reactos/subsys/system/msiexec/msiexec.c 2005-07-27 01:09:38 UTC (rev 16770) +++ trunk/reactos/subsys/system/msiexec/msiexec.c 2005-07-27 01:12:53 UTC (rev 16771) @@ -162,7 +162,7 @@ } *p = 0; - WINE_TRACE("properties -> %S\n", ret); + WINE_TRACE("properties -> %s\n", wine_dbgstr_w(ret) ); return ret; } @@ -258,14 +258,14 @@ *DllHandle = LoadLibraryExW(DllName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { - fprintf(stderr, "Unable to load dll %S\n", DllName); + fprintf(stderr, "Unable to load dll %s\n", wine_dbgstr_w(DllName)); ExitProcess(1); } proc = (VOID *) GetProcAddress(*DllHandle, ProcName); if(!proc) { - fprintf(stderr, "Dll %S does not implement function %s\n", - DllName, ProcName); + fprintf(stderr, "Dll %s does not implement function %s\n", + wine_dbgstr_w(DllName), ProcName); FreeLibrary(*DllHandle); ExitProcess(1); } @@ -284,10 +284,10 @@ hr = pfDllRegisterServer(); if(FAILED(hr)) { - fprintf(stderr, "Failed to register dll %S\n", DllName); + fprintf(stderr, "Failed to register dll %s\n", wine_dbgstr_w(DllName)); return 1; } - printf("Successfully registered dll %S\n", DllName); + printf("Successfully registered dll %s\n", wine_dbgstr_w(DllName)); if(DllHandle) FreeLibrary(DllHandle); return 0; @@ -304,10 +304,10 @@ hr = pfDllUnregisterServer(); if(FAILED(hr)) { - fprintf(stderr, "Failed to unregister dll %S\n", DllName); + fprintf(stderr, "Failed to unregister dll %s\n", wine_dbgstr_w(DllName)); return 1; } - printf("Successfully unregistered dll %S\n", DllName); + printf("Successfully unregistered dll %s\n", wine_dbgstr_w(DllName)); if(DllHandle) FreeLibrary(DllHandle); return 0; @@ -485,7 +485,7 @@ for(i = 1; i < argc; i++) { - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); if (!msi_strequal(argvW[i], "/regserver")) { @@ -506,7 +506,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); argvWi = argvW[i]; } PackageName = argvWi; @@ -519,7 +519,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; StringListAppend(&property_list, ActionAdmin); } @@ -588,7 +588,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } else if(!msi_strequal(argvW[i], "/x")) @@ -597,7 +597,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; StringListAppend(&property_list, RemoveAll); } @@ -626,7 +626,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } else if(!msi_strequal(argvW[i], "u")) @@ -636,7 +636,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } else if(!msi_strequal(argvW[i], "m")) @@ -646,7 +646,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } else if(!msi_strequal(argvW[i], "/t")) @@ -654,7 +654,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); StringListAppend(&transform_list, argvW[i]); } else if(!msi_strprefix(argvW[i], "TRANSFORMS=")) @@ -666,7 +666,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); Language = msi_atou(argvW[i]); } else if(!msi_strprefix(argvW[i], "/l")) @@ -751,12 +751,12 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); LogFileName = argvW[i]; if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS) { - fprintf(stderr, "Logging in %S (0x%08lx, %lu) failed\n", - LogFileName, LogMode, LogAttributes); + fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n", + wine_dbgstr_w(LogFileName), LogMode, LogAttributes); ExitProcess(1); } } @@ -766,7 +766,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PatchFileName = argvW[i]; } else if(!msi_strprefix(argvW[i], "/q")) @@ -806,8 +806,8 @@ } else { - fprintf(stderr, "Unknown option \"%S\" for UI level\n", - argvW[i]+2); + fprintf(stderr, "Unknown option \"%s\" for UI level\n", + wine_dbgstr_w(argvW[i]+2)); } } else if(!msi_strequal(argvW[i], "/y")) @@ -816,7 +816,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); DllName = argvW[i]; } else if(!msi_strequal(argvW[i], "/z")) @@ -825,7 +825,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); DllName = argvW[i]; } else if(!msi_strequal(argvW[i], "/h") || !msi_strequal(argvW[i], "/?"))

1 0

[ion] 16770: - Fix warnings
by ion＠svn.reactos.com 27 Jul '05

27 Jul '05

- Fix warnings - Print unicode strings normally with %S instead of wine macro. Modified: trunk/reactos/subsys/system/format/format.c Modified: trunk/reactos/subsys/system/msiexec/msiexec.c _____ Modified: trunk/reactos/subsys/system/format/format.c --- trunk/reactos/subsys/system/format/format.c 2005-07-27 01:02:51 UTC (rev 16769) +++ trunk/reactos/subsys/system/format/format.c 2005-07-27 01:09:38 UTC (rev 16770) @@ -63,7 +63,7 @@ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpMsgBuf, 0, NULL ); - _tprintf(_T("%S: %S\n"), Message, lpMsgBuf ); + _tprintf(_T("%S: %S\n"), (LPWSTR)Message, (LPWSTR)lpMsgBuf ); LocalFree( lpMsgBuf ); } _____ Modified: trunk/reactos/subsys/system/msiexec/msiexec.c --- trunk/reactos/subsys/system/msiexec/msiexec.c 2005-07-27 01:02:51 UTC (rev 16769) +++ trunk/reactos/subsys/system/msiexec/msiexec.c 2005-07-27 01:09:38 UTC (rev 16770) @@ -162,7 +162,7 @@ } *p = 0; - WINE_TRACE("properties -> %s\n", wine_dbgstr_w(ret) ); + WINE_TRACE("properties -> %S\n", ret); return ret; } @@ -258,14 +258,14 @@ *DllHandle = LoadLibraryExW(DllName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { - fprintf(stderr, "Unable to load dll %s\n", wine_dbgstr_w(DllName)); + fprintf(stderr, "Unable to load dll %S\n", DllName); ExitProcess(1); } proc = (VOID *) GetProcAddress(*DllHandle, ProcName); if(!proc) { - fprintf(stderr, "Dll %s does not implement function %s\n", - wine_dbgstr_w(DllName), ProcName); + fprintf(stderr, "Dll %S does not implement function %s\n", + DllName, ProcName); FreeLibrary(*DllHandle); ExitProcess(1); } @@ -284,10 +284,10 @@ hr = pfDllRegisterServer(); if(FAILED(hr)) { - fprintf(stderr, "Failed to register dll %s\n", wine_dbgstr_w(DllName)); + fprintf(stderr, "Failed to register dll %S\n", DllName); return 1; } - printf("Successfully registered dll %s\n", wine_dbgstr_w(DllName)); + printf("Successfully registered dll %S\n", DllName); if(DllHandle) FreeLibrary(DllHandle); return 0; @@ -304,10 +304,10 @@ hr = pfDllUnregisterServer(); if(FAILED(hr)) { - fprintf(stderr, "Failed to unregister dll %s\n", wine_dbgstr_w(DllName)); + fprintf(stderr, "Failed to unregister dll %S\n", DllName); return 1; } - printf("Successfully unregistered dll %s\n", wine_dbgstr_w(DllName)); + printf("Successfully unregistered dll %S\n", DllName); if(DllHandle) FreeLibrary(DllHandle); return 0; @@ -485,7 +485,7 @@ for(i = 1; i < argc; i++) { - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); if (!msi_strequal(argvW[i], "/regserver")) { @@ -506,7 +506,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); argvWi = argvW[i]; } PackageName = argvWi; @@ -519,7 +519,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); PackageName = argvW[i]; StringListAppend(&property_list, ActionAdmin); } @@ -588,7 +588,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); PackageName = argvW[i]; } else if(!msi_strequal(argvW[i], "/x")) @@ -597,7 +597,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); PackageName = argvW[i]; StringListAppend(&property_list, RemoveAll); } @@ -626,7 +626,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); PackageName = argvW[i]; } else if(!msi_strequal(argvW[i], "u")) @@ -636,7 +636,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); PackageName = argvW[i]; } else if(!msi_strequal(argvW[i], "m")) @@ -646,7 +646,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); PackageName = argvW[i]; } else if(!msi_strequal(argvW[i], "/t")) @@ -654,7 +654,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); StringListAppend(&transform_list, argvW[i]); } else if(!msi_strprefix(argvW[i], "TRANSFORMS=")) @@ -666,7 +666,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); Language = msi_atou(argvW[i]); } else if(!msi_strprefix(argvW[i], "/l")) @@ -751,12 +751,12 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); LogFileName = argvW[i]; if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS) { - fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n", - wine_dbgstr_w(LogFileName), LogMode, LogAttributes); + fprintf(stderr, "Logging in %S (0x%08lx, %lu) failed\n", + LogFileName, LogMode, LogAttributes); ExitProcess(1); } } @@ -766,7 +766,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); PatchFileName = argvW[i]; } else if(!msi_strprefix(argvW[i], "/q")) @@ -806,8 +806,8 @@ } else { - fprintf(stderr, "Unknown option \"%s\" for UI level\n", - wine_dbgstr_w(argvW[i]+2)); + fprintf(stderr, "Unknown option \"%S\" for UI level\n", + argvW[i]+2); } } else if(!msi_strequal(argvW[i], "/y")) @@ -816,7 +816,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); DllName = argvW[i]; } else if(!msi_strequal(argvW[i], "/z")) @@ -825,7 +825,7 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]); DllName = argvW[i]; } else if(!msi_strequal(argvW[i], "/h") || !msi_strequal(argvW[i], "/?"))

1 0

[ion] 16769: - Fix warnings
by ion＠svn.reactos.com 27 Jul '05

27 Jul '05

- Fix warnings - Revert to wZ, gcc is being stupid. Modified: trunk/reactos/subsys/system/calc/winecalc.c Modified: trunk/reactos/subsys/system/usetup/partlist.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-07-27 00:55:36 UTC (rev 16768) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-07-27 01:02:51 UTC (rev 16769) @@ -2927,15 +2927,15 @@ switch (calc->numBase) { case NBASE_HEX: real = calc_atof(calc->buffer, calc->numBase); - sprintf(calc->display, "%x", (long)real); + sprintf(calc->display, "%lx", (long)real); break; case NBASE_OCTAL: - sprintf(calc->display, "%o", calc->buffer); + sprintf(calc->display, "%lo", (long)calc->buffer); break; case NBASE_BINARY: - sprintf(calc->display, "%x", calc->buffer); + sprintf(calc->display, "%lx", (long)calc->buffer); break; case NBASE_DECIMAL: @@ -3060,7 +3060,7 @@ // commify the integer part now - while (c = *(s + --n)) { + while ((c = *(s + --n))) { r[i++] = c; if (x++ % 3 == 0) r[i++] = ','; @@ -3258,7 +3258,7 @@ case 'F': { char s22[CALC_BUF_SIZE]; - char w = (char)LOWORD(wParam); + UCHAR w = (UCHAR)LOWORD(wParam); if (!keys[calc.numBase][w]) { MessageBeep(0); _____ Modified: trunk/reactos/subsys/system/usetup/partlist.c --- trunk/reactos/subsys/system/usetup/partlist.c 2005-07-27 00:55:36 UTC (rev 16768) +++ trunk/reactos/subsys/system/usetup/partlist.c 2005-07-27 01:02:51 UTC (rev 16769) @@ -918,14 +918,14 @@ if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S", + "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ", DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DriverName.Buffer); + &DiskEntry->DriverName); } else {

1 0

[ion] 16768: - Fix warnings
by ion＠svn.reactos.com 27 Jul '05

27 Jul '05

- Fix warnings Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-07-27 00:54:07 UTC (rev 16767) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-07-27 00:55:36 UTC (rev 16768) @@ -1821,12 +1821,12 @@ static TCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n',' s','l','a','t','i','o','n','\0'}; static TCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; - DWORD dwVersionDataLen = GetFileVersionInfoSize(strFilename, NULL); + DWORD dwVersionDataLen = GetFileVersionInfoSize((LPWSTR)strFilename, NULL); if (dwVersionDataLen) { dlg->pVersionData = malloc(dwVersionDataLen); - if (GetFileVersionInfo(strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { + if (GetFileVersionInfo((LPWSTR)strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { LPVOID pVal; UINT nValLen;

1 0

[ion] 16767: - Fix warnings
by ion＠svn.reactos.com 27 Jul '05

27 Jul '05

- Fix warnings Modified: trunk/reactos/subsys/system/usetup/partlist.c Modified: trunk/reactos/subsys/system/usetup/usetup.h _____ Modified: trunk/reactos/subsys/system/usetup/partlist.c --- trunk/reactos/subsys/system/usetup/partlist.c 2005-07-27 00:50:24 UTC (rev 16766) +++ trunk/reactos/subsys/system/usetup/partlist.c 2005-07-27 00:54:07 UTC (rev 16767) @@ -918,14 +918,14 @@ if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ", + "%6I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S", DiskSize, Unit, DiskEntry->DiskNumber, DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - &DiskEntry->DriverName); + DiskEntry->DriverName.Buffer); } else { _____ Modified: trunk/reactos/subsys/system/usetup/usetup.h --- trunk/reactos/subsys/system/usetup/usetup.h 2005-07-27 00:50:24 UTC (rev 16766) +++ trunk/reactos/subsys/system/usetup/usetup.h 2005-07-27 00:54:07 UTC (rev 16767) @@ -27,6 +27,10 @@ #ifndef __USETUP_H__ #define __USETUP_H__ +/* C Headers */ +#include <ctype.h> +#include <stdio.h> + /* PSDK/NDK */ #include <windows.h> #include <fmifs/fmifs.h>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs