November 2005 - Wine-Commits

wine/dlls/msvcrt locale.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21370 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 07:34:38 Modified files: dlls/msvcrt : locale.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Fix bogus unreal code page messages in _setmbcp(). Patch: http://cvs.winehq.org/patch.py?id=21370 Old revision New revision Changes Path 1.29 1.30 +6 -4 wine/dlls/msvcrt/locale.c Index: wine/dlls/msvcrt/locale.c diff -u -p wine/dlls/msvcrt/locale.c:1.29 wine/dlls/msvcrt/locale.c:1.30 --- wine/dlls/msvcrt/locale.c:1.29 21 Nov 2005 13:34:38 -0000 +++ wine/dlls/msvcrt/locale.c 21 Nov 2005 13:34:38 -0000 @@ -519,10 +519,11 @@ const char* _Strftime(char *out, unsigne int _setmbcp(int cp) { LOCK_LOCALE; - if ((msvcrt_current_lc_all_cp != cp) && (cp > _MB_CP_SBCS)) + if ( cp > _MB_CP_SBCS) { - /* FIXME: set ctype behaviour for this cp */ - msvcrt_current_lc_all_cp = cp; + if( msvcrt_current_lc_all_cp != cp) + /* FIXME: set ctype behaviour for this cp */ + msvcrt_current_lc_all_cp = cp; } else if(cp == _MB_CP_ANSI) { @@ -539,13 +540,14 @@ int _setmbcp(int cp) } else if(cp == _MB_CP_SBCS) { - FIXME ("SBCS codepages (e.g. %d) not implemented\n", cp); + FIXME ("SBCS codepages not implemented\n"); } else { FIXME ("Unreal codepages (e.g. %d) not implemented\n", cp); } UNLOCK_LOCALE; + TRACE("(%d) -> %d\n", cp, msvcrt_current_lc_all_cp); return 0; }

1 0

wine/dlls/msvcrt msvcrt.spec mbcs.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21369 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 07:34:29 Modified files: dlls/msvcrt : msvcrt.spec mbcs.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Do not forward _mbccpy to strcpy. Remove the error message in _mbccpy, it is not an error. Patch: http://cvs.winehq.org/patch.py?id=21369 Old revision New revision Changes Path 1.108 1.109 +1 -1 wine/dlls/msvcrt/msvcrt.spec 1.35 1.36 +2 -4 wine/dlls/msvcrt/mbcs.c Index: wine/dlls/msvcrt/msvcrt.spec diff -u -p wine/dlls/msvcrt/msvcrt.spec:1.108 wine/dlls/msvcrt/msvcrt.spec:1.109 --- wine/dlls/msvcrt/msvcrt.spec:1.108 21 Nov 2005 13:34:29 -0000 +++ wine/dlls/msvcrt/msvcrt.spec 21 Nov 2005 13:34:29 -0000 @@ -335,7 +335,7 @@ @ cdecl _mbbtombc(long) @ stub _mbbtype #(long long) # extern _mbcasemap -@ cdecl _mbccpy (str str) strcpy +@ cdecl _mbccpy (str str) @ stub _mbcjistojms #(long) @ stub _mbcjmstojis #(long) @ cdecl _mbclen(ptr) Index: wine/dlls/msvcrt/mbcs.c diff -u -p wine/dlls/msvcrt/mbcs.c:1.35 wine/dlls/msvcrt/mbcs.c:1.36 --- wine/dlls/msvcrt/mbcs.c:1.35 21 Nov 2005 13:34:29 -0000 +++ wine/dlls/msvcrt/mbcs.c 21 Nov 2005 13:34:29 -0000 @@ -281,11 +281,9 @@ MSVCRT_size_t _mbstrlen(const char* str) */ void _mbccpy(unsigned char* dest, const unsigned char* src) { - *dest++ = *src; + *dest = *src; if(MSVCRT___mb_cur_max > 1 && MSVCRT_isleadbyte(*src)) - *dest = *++src; /* MB char */ - else - ERR("failure.. is this ok?\n"); + *++dest = *++src; /* MB char */ } /*********************************************************************

1 0

wine/dlls/comctl32 syslink.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21368 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 07:34:06 Modified files: dlls/comctl32 : syslink.c Log message: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Improved word wrapping and tab key handling. Patch: http://cvs.winehq.org/patch.py?id=21368 Old revision New revision Changes Path 1.14 1.15 +158 -112 wine/dlls/comctl32/syslink.c

1 0

wine/ include/advpub.h dlls/advpack/advpack.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21367 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 07:33:52 Modified files: include : advpub.h dlls/advpack : advpack.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Add/correct prototypes for some already defined functions in advpack. Patch: http://cvs.winehq.org/patch.py?id=21367 Old revision New revision Changes Path 1.5 1.6 +10 -5 wine/include/advpub.h 1.14 1.15 +7 -4 wine/dlls/advpack/advpack.c Index: wine/include/advpub.h diff -u -p wine/include/advpub.h:1.5 wine/include/advpub.h:1.6 --- wine/include/advpub.h:1.5 21 Nov 2005 13:33:52 -0000 +++ wine/include/advpub.h 21 Nov 2005 13:33:52 -0000 @@ -60,16 +60,21 @@ typedef CSTRTABLE *LPCSTRTABLE; #define ADN_DONT_DEL_SUBDIRS 0x00000002 #define ADN_DONT_DEL_DIR 0x00000004 -HRESULT WINAPI RunSetupCommand(HWND hWnd, - LPCSTR szCmdName, LPCSTR szInfSection, LPCSTR szDir, LPCSTR lpszTitle, - HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved); HRESULT WINAPI DelNode(LPCSTR pszFileOrDirName, DWORD dwFlags); +HRESULT WINAPI DelNodeRunDLL32(HWND,HINSTANCE,LPSTR,INT); HRESULT WINAPI ExecuteCab( HWND hwnd, PCABINFO pCab, LPVOID pReserved ); +HRESULT WINAPI ExtractFiles(LPCSTR,LPCSTR,DWORD,LPCSTR,LPVOID,DWORD); +HRESULT WINAPI GetVersionFromFile(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion); +HRESULT WINAPI GetVersionFromFileEx(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion); +BOOL WINAPI IsNTAdmin(DWORD,LPDWORD); +INT WINAPI LaunchINFSection(HWND,HINSTANCE,LPSTR,INT); +HRESULT WINAPI LaunchINFSectionEx(HWND,HINSTANCE,LPSTR,INT); DWORD WINAPI NeedRebootInit(VOID); BOOL WINAPI NeedReboot(DWORD dwRebootCheck); HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable); -HRESULT WINAPI GetVersionFromFile(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion); -HRESULT WINAPI GetVersionFromFileEx(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion); +HRESULT WINAPI RunSetupCommand(HWND hWnd, + LPCSTR szCmdName, LPCSTR szInfSection, LPCSTR szDir, LPCSTR lpszTitle, + HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved); HRESULT WINAPI TranslateInfString(PCSTR pszInfFilename, PCSTR pszInstallSection, PCSTR pszTranslateSection, PCSTR pszTranslateKey, PSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved); Index: wine/dlls/advpack/advpack.c diff -u -p wine/dlls/advpack/advpack.c:1.14 wine/dlls/advpack/advpack.c:1.15 --- wine/dlls/advpack/advpack.c:1.14 21 Nov 2005 13:33:52 -0000 +++ wine/dlls/advpack/advpack.c 21 Nov 2005 13:33:52 -0000 @@ -93,17 +93,19 @@ HRESULT WINAPI RunSetupCommand( HWND hWn /*********************************************************************** * LaunchINFSection (ADVPACK.@) */ -void WINAPI LaunchINFSection( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show ) +INT WINAPI LaunchINFSection( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) { FIXME("(%p %p %s %d): stub\n", hWnd, hInst, debugstr_a(cmdline), show ); + return 0; } /*********************************************************************** * LaunchINFSectionEx (ADVPACK.@) */ -void WINAPI LaunchINFSectionEx( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show ) +HRESULT WINAPI LaunchINFSectionEx( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) { FIXME("(%p %p %s %d): stub\n", hWnd, hInst, debugstr_a(cmdline), show ); + return E_FAIL; } /* this structure very closely resembles parameters of RunSetupCommand() */ @@ -146,7 +148,7 @@ BOOL WINAPI DoInfInstall(const SETUPCOMM /*********************************************************************** * IsNTAdmin (ADVPACK.@) */ -BOOL WINAPI IsNTAdmin( DWORD reserved, PDWORD pReserved ) +BOOL WINAPI IsNTAdmin( DWORD reserved, LPDWORD pReserved ) { FIXME("(0x%08lx, %p): stub\n", reserved, pReserved); return TRUE; @@ -375,9 +377,10 @@ HRESULT WINAPI DelNode( LPCSTR pszFileOr * BUGS * Unimplemented */ -void WINAPI DelNodeRunDLL32( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show ) +HRESULT WINAPI DelNodeRunDLL32( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) { FIXME("(%s): stub\n", debugstr_a(cmdline)); + return E_FAIL; } /***********************************************************************

1 0

wine/dlls/wldap32 wldap32.spec winldap_private ...
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21366 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 07:33:37 Modified files: dlls/wldap32 : wldap32.spec winldap_private.h control.c Log message: Hans Leidekker <hans(a)it.vu.nl> Implement ldap_create_vlv_control{A,W}, ldap_encode_sort_control{A,W}. Add a stub for ldap_create_page_control{A,W}. Patch: http://cvs.winehq.org/patch.py?id=21366 Old revision New revision Changes Path 1.29 1.30 +7 -7 wine/dlls/wldap32/wldap32.spec 1.30 1.31 +16 -0 wine/dlls/wldap32/winldap_private.h 1.2 1.3 +68 -0 wine/dlls/wldap32/control.c Index: wine/dlls/wldap32/wldap32.spec diff -u -p wine/dlls/wldap32/wldap32.spec:1.29 wine/dlls/wldap32/wldap32.spec:1.30 --- wine/dlls/wldap32/wldap32.spec:1.29 21 Nov 2005 13:33:37 -0000 +++ wine/dlls/wldap32/wldap32.spec 21 Nov 2005 13:33:37 -0000 @@ -85,9 +85,9 @@ 95 cdecl ldap_count_references(ptr ptr) WLDAP32_ldap_count_references 96 cdecl ldap_count_valuesA(ptr) 97 cdecl ldap_count_valuesW(ptr) - 98 stub ldap_create_page_control - 99 stub ldap_create_page_controlA -100 stub ldap_create_page_controlW + 98 cdecl ldap_create_page_control(ptr long ptr long ptr) ldap_create_page_controlA + 99 cdecl ldap_create_page_controlA(ptr long ptr long ptr) +100 cdecl ldap_create_page_controlW(ptr long ptr long ptr) 101 cdecl ldap_create_sort_control(ptr ptr long ptr) ldap_create_sort_controlA 102 cdecl ldap_create_sort_controlA(ptr ptr long ptr) 103 cdecl ldap_create_sort_controlW(ptr ptr long ptr) @@ -102,8 +102,8 @@ 112 cdecl ldap_delete_sA(ptr str) 113 cdecl ldap_delete_sW(ptr wstr) 114 cdecl ldap_dn2ufnW(wstr) -115 stub ldap_encode_sort_controlA -116 stub ldap_encode_sort_controlW +115 cdecl ldap_encode_sort_controlA(ptr ptr ptr long) +116 cdecl ldap_encode_sort_controlW(ptr ptr ptr long) 117 cdecl ldap_err2stringA(long) 118 cdecl ldap_err2stringW(long) 119 cdecl ldap_escape_filter_elementA(str long ptr long) @@ -234,8 +234,8 @@ 316 cdecl ldap_sasl_bind_sA(ptr str str ptr ptr ptr ptr) 317 stub ldap_parse_extended_resultW 318 stub ldap_parse_extended_resultA -319 stub ldap_create_vlv_controlW -320 stub ldap_create_vlv_controlA +319 cdecl ldap_create_vlv_controlW(ptr ptr long ptr) +320 cdecl ldap_create_vlv_controlA(ptr ptr long ptr) 321 stub ldap_parse_vlv_controlW 322 stub ldap_parse_vlv_controlA 329 cdecl ldap_start_tls_sW(ptr ptr ptr ptr ptr) Index: wine/dlls/wldap32/winldap_private.h diff -u -p wine/dlls/wldap32/winldap_private.h:1.30 wine/dlls/wldap32/winldap_private.h:1.31 --- wine/dlls/wldap32/winldap_private.h:1.30 21 Nov 2005 13:33:37 -0000 +++ wine/dlls/wldap32/winldap_private.h 21 Nov 2005 13:33:37 -0000 @@ -187,6 +187,18 @@ typedef struct ldapcontrolW BOOLEAN ldctl_iscritical; } LDAPControlW, *PLDAPControlW; +typedef struct WLDAP32_ldapvlvinfo +{ + int ldvlv_version; + ULONG ldvlv_before_count; + ULONG ldvlv_after_count; + ULONG ldvlv_offset; + ULONG ldvlv_count; + PBERVAL ldvlv_attrvalue; + PBERVAL ldvlv_context; + VOID *ldvlv_extradata; +} WLDAP32_LDAPVLVInfo, *WLDAP32_PLDAPVLVInfo; + typedef struct ldapsearch LDAPSearch, *PLDAPSearch; typedef struct ldapsortkeyA @@ -275,8 +287,12 @@ ULONG WLDAP32_ldap_count_references(WLDA ULONG ldap_count_valuesA(PCHAR*); ULONG ldap_count_valuesW(PWCHAR*); ULONG WLDAP32_ldap_count_values_len(PBERVAL*); +ULONG ldap_create_page_controlA(WLDAP32_PLDAP,ULONG,struct WLDAP32_berval*,UCHAR,PLDAPControlA*); +ULONG ldap_create_page_controlW(WLDAP32_PLDAP,ULONG,struct WLDAP32_berval*,UCHAR,PLDAPControlW*); ULONG ldap_create_sort_controlA(WLDAP32_PLDAP,PLDAPSortKeyA*,UCHAR,PLDAPControlA*); ULONG ldap_create_sort_controlW(WLDAP32_PLDAP,PLDAPSortKeyW*,UCHAR,PLDAPControlW*); +INT ldap_create_vlv_controlA(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,char,LDAPControlA**); +INT ldap_create_vlv_controlW(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,char,LDAPControlW**); ULONG ldap_deleteA(WLDAP32_LDAP*,PCHAR); ULONG ldap_deleteW(WLDAP32_LDAP*,PWCHAR); ULONG ldap_delete_extA(WLDAP32_LDAP*,PCHAR,PLDAPControlA*,PLDAPControlA*,ULONG*); Index: wine/dlls/wldap32/control.c diff -u -p wine/dlls/wldap32/control.c:1.2 wine/dlls/wldap32/control.c:1.3 --- wine/dlls/wldap32/control.c:1.2 21 Nov 2005 13:33:37 -0000 +++ wine/dlls/wldap32/control.c 21 Nov 2005 13:33:37 -0000 @@ -89,6 +89,22 @@ ULONG ldap_controls_freeW( LDAPControlW return ret; } +ULONG ldap_create_page_controlA( WLDAP32_LDAP *ld, ULONG pagesize, + struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlA *control ) +{ + FIXME( "(%p, 0x%08lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie, + critical, control ); + return LDAP_NOT_SUPPORTED; +} + +ULONG ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize, + struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlW *control ) +{ + FIXME( "(%p, 0x%08lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie, + critical, control ); + return LDAP_NOT_SUPPORTED; +} + ULONG ldap_create_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkey, UCHAR critical, PLDAPControlA *control ) { @@ -145,6 +161,58 @@ ULONG ldap_create_sort_controlW( WLDAP32 return ret; } +INT ldap_create_vlv_controlA( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info, + char critical, LDAPControlA **control ) +{ + INT ret = LDAP_NOT_SUPPORTED; +#ifdef HAVE_LDAP + LDAPControlW **controlW = NULL; + + TRACE( "(%p, %p, 0x%02x, %p)\n", ld, info, critical, control ); + + if (!ld) return ~0UL; + + ret = ldap_create_vlv_controlW( ld, info, critical, controlW ); + + *control = controlWtoA( *controlW ); + ldap_control_freeW( *controlW ); + +#endif + return ret; +} + +INT ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info, + char critical, LDAPControlW **control ) +{ + INT ret = LDAP_NOT_SUPPORTED; +#ifdef HAVE_LDAP + LDAPControl **controlU = NULL; + + TRACE( "(%p, %p, 0x%02x, %p)\n", ld, info, critical, control ); + + if (!ld) return ~0UL; + + ret = ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, controlU ); + + *control = controlUtoW( *controlU ); + ldap_control_free( *controlU ); + +#endif + return ret; +} + +ULONG ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys, + PLDAPControlA control, BOOLEAN critical ) +{ + return ldap_create_sort_controlA( ld, sortkeys, critical, &control ); +} + +ULONG ldap_encode_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkeys, + PLDAPControlW control, BOOLEAN critical ) +{ + return ldap_create_sort_controlW( ld, sortkeys, critical, &control ); +} + ULONG ldap_free_controlsA( LDAPControlA **controls ) { return ldap_controls_freeA( controls );

1 0

wine/ tools/winapi/win32.api include/winsvc.h ...
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21365 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 06:06:00 Modified files: tools/winapi : win32.api include : winsvc.h aclapi.h dlls/advapi32 : security.c advapi32.spec Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Add/correct prototypes for some already defined functions in advapi32. Correct spec file entry for GetSecurityInfoExW. Patch: http://cvs.winehq.org/patch.py?id=21365 Old revision New revision Changes Path 1.55 1.56 +0 -4 wine/tools/winapi/win32.api 1.22 1.23 +1 -0 wine/include/winsvc.h 1.8 1.9 +16 -0 wine/include/aclapi.h 1.117 1.118 +18 -18 wine/dlls/advapi32/security.c 1.80 1.81 +1 -1 wine/dlls/advapi32/advapi32.spec Index: wine/tools/winapi/win32.api diff -u -p wine/tools/winapi/win32.api:1.55 wine/tools/winapi/win32.api:1.56 --- wine/tools/winapi/win32.api:1.55 21 Nov 2005 12: 6: 0 -0000 +++ wine/tools/winapi/win32.api 21 Nov 2005 12: 6: 0 -0000 @@ -111,10 +111,8 @@ PBOOL PDWORD PEXPLICIT_ACCESSA PEXPLICIT_ACCESSA * -PEXPLICIT_ACCESS_A PEXPLICIT_ACCESSW PEXPLICIT_ACCESSW * -PEXPLICIT_ACCESS_W PGENERIC_MAPPING PHANDLE PHKEY @@ -144,9 +142,7 @@ PTOKEN_GROUPS PTRACE_GUID_REGISTRATION PTRACEHANDLE PTRUSTEEA -PTRUSTEE_A PTRUSTEEW -PTRUSTEE_W PUCHAR PULONG PVOID Index: wine/include/winsvc.h diff -u -p wine/include/winsvc.h:1.22 wine/include/winsvc.h:1.23 --- wine/include/winsvc.h:1.22 21 Nov 2005 12: 6: 0 -0000 +++ wine/include/winsvc.h 21 Nov 2005 12: 6: 0 -0000 @@ -295,6 +295,7 @@ BOOL WINAPI GetServiceKeyNameA(SC BOOL WINAPI GetServiceKeyNameW(SC_HANDLE,LPCWSTR,LPWSTR,LPDWORD); #define GetServiceKeyName WINELIB_NAME_AW(GetServiceKeyName) SC_LOCK WINAPI LockServiceDatabase(SC_HANDLE); +BOOL WINAPI NotifyBootConfigStatus(BOOL); SC_HANDLE WINAPI OpenSCManagerA(LPCSTR,LPCSTR,DWORD); SC_HANDLE WINAPI OpenSCManagerW(LPCWSTR,LPCWSTR,DWORD); #define OpenSCManager WINELIB_NAME_AW(OpenSCManager) Index: wine/include/aclapi.h diff -u -p wine/include/aclapi.h:1.8 wine/include/aclapi.h:1.9 --- wine/include/aclapi.h:1.8 21 Nov 2005 12: 6: 0 -0000 +++ wine/include/aclapi.h 21 Nov 2005 12: 6: 0 -0000 @@ -35,6 +35,12 @@ DWORD WINAPI GetExplicitEntriesFromAclW( DWORD WINAPI GetSecurityInfo( HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +DWORD WINAPI GetSecurityInfoExA(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, + LPCSTR, LPCSTR, PACTRL_ACCESSA*, PACTRL_AUDITA*, LPSTR*, LPSTR*); +DWORD WINAPI GetSecurityInfoExW(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, + LPCWSTR, LPCWSTR, PACTRL_ACCESSW*, PACTRL_AUDITW*, LPWSTR*, LPWSTR*); +#define GetSecurityInfoEx WINELIB_NAME_AW(GetSecurityInfoEx) + DWORD WINAPI GetNamedSecurityInfoA(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); DWORD WINAPI GetNamedSecurityInfoW(LPWSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, @@ -66,6 +72,16 @@ TRUSTEE_TYPE WINAPI GetTrusteeTypeA( PTR TRUSTEE_TYPE WINAPI GetTrusteeTypeW( PTRUSTEEW ); #define GetTrusteeType WINELIB_NAME_AW(GetTrusteeType) +DWORD WINAPI BuildSecurityDescriptorA( PTRUSTEEA, PTRUSTEEA, ULONG, PEXPLICIT_ACCESS_A, + ULONG, PEXPLICIT_ACCESS_A, + PSECURITY_DESCRIPTOR, PULONG, + PSECURITY_DESCRIPTOR* ); +DWORD WINAPI BuildSecurityDescriptorW( PTRUSTEEW, PTRUSTEEW, ULONG, PEXPLICIT_ACCESS_W, + ULONG, PEXPLICIT_ACCESS_W, + PSECURITY_DESCRIPTOR, PULONG, + PSECURITY_DESCRIPTOR* ); +#define BuildSecurityDescriptor WINELIB_NAME_AW(BuildSecurityDescriptor) + void WINAPI BuildTrusteeWithNameA( PTRUSTEEA, LPSTR ); void WINAPI BuildTrusteeWithNameW( PTRUSTEEW, LPWSTR ); #define BuildTrusteeWithName WINELIB_NAME_AW(BuildTrusteeWithName) Index: wine/dlls/advapi32/security.c diff -u -p wine/dlls/advapi32/security.c:1.117 wine/dlls/advapi32/security.c:1.118 --- wine/dlls/advapi32/security.c:1.117 21 Nov 2005 12: 6: 0 -0000 +++ wine/dlls/advapi32/security.c 21 Nov 2005 12: 6: 0 -0000 @@ -637,15 +637,15 @@ GetLengthSid (PSID pSid) * Failure: nonzero error code from Winerror.h */ DWORD WINAPI BuildSecurityDescriptorA( - IN PTRUSTEE_A pOwner, - IN PTRUSTEE_A pGroup, - IN DWORD cCountOfAccessEntries, - IN PEXPLICIT_ACCESS_A pListOfAccessEntries, - IN DWORD cCountOfAuditEntries, - IN PEXPLICIT_ACCESS_A pListofAuditEntries, + IN PTRUSTEEA pOwner, + IN PTRUSTEEA pGroup, + IN ULONG cCountOfAccessEntries, + IN PEXPLICIT_ACCESSA pListOfAccessEntries, + IN ULONG cCountOfAuditEntries, + IN PEXPLICIT_ACCESSA pListofAuditEntries, IN PSECURITY_DESCRIPTOR pOldSD, - IN OUT PDWORD lpdwBufferLength, - OUT PSECURITY_DESCRIPTOR pNewSD) + IN OUT PULONG lpdwBufferLength, + OUT PSECURITY_DESCRIPTOR* pNewSD) { FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup, cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries, @@ -660,15 +660,15 @@ DWORD WINAPI BuildSecurityDescriptorA( * See BuildSecurityDescriptorA. */ DWORD WINAPI BuildSecurityDescriptorW( - IN PTRUSTEE_W pOwner, - IN PTRUSTEE_W pGroup, - IN DWORD cCountOfAccessEntries, - IN PEXPLICIT_ACCESS_W pListOfAccessEntries, - IN DWORD cCountOfAuditEntries, - IN PEXPLICIT_ACCESS_W pListofAuditEntries, + IN PTRUSTEEW pOwner, + IN PTRUSTEEW pGroup, + IN ULONG cCountOfAccessEntries, + IN PEXPLICIT_ACCESSW pListOfAccessEntries, + IN ULONG cCountOfAuditEntries, + IN PEXPLICIT_ACCESSW pListofAuditEntries, IN PSECURITY_DESCRIPTOR pOldSD, - IN OUT PDWORD lpdwBufferLength, - OUT PSECURITY_DESCRIPTOR pNewSD) + IN OUT PULONG lpdwBufferLength, + OUT PSECURITY_DESCRIPTOR* pNewSD) { FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup, cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries, @@ -1616,9 +1616,9 @@ SynchronizeWindows31FilesAndWindowsNTReg * x1 [] */ BOOL WINAPI -NotifyBootConfigStatus( DWORD x1 ) +NotifyBootConfigStatus( BOOL x1 ) { - FIXME("(0x%08lx):stub\n",x1); + FIXME("(0x%08d):stub\n",x1); return 1; } Index: wine/dlls/advapi32/advapi32.spec diff -u -p wine/dlls/advapi32/advapi32.spec:1.80 wine/dlls/advapi32/advapi32.spec:1.81 --- wine/dlls/advapi32/advapi32.spec:1.80 21 Nov 2005 12: 6: 0 -0000 +++ wine/dlls/advapi32/advapi32.spec 21 Nov 2005 12: 6: 0 -0000 @@ -273,7 +273,7 @@ @ stdcall GetSecurityDescriptorSacl (ptr ptr ptr ptr) @ stdcall GetSecurityInfo (long long long ptr ptr ptr ptr ptr) # @ stub GetSecurityInfoExA -@ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr wstr wstr) +@ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr ptr ptr) @ stdcall GetServiceDisplayNameA(ptr str ptr ptr) @ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr) @ stdcall GetServiceKeyNameA(long str ptr ptr)

1 0

wine/ server/winstation.c server/trace.c serve ...
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21364 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 06:05:38 Modified files: server : winstation.c trace.c protocol.def include/wine : server_protocol.h dlls/user : winstation.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Replace inherit flag with object attributes in winstation and desktop create & open. Use OBJ_OPENIF flag to create winstation & desktop. Patch: http://cvs.winehq.org/patch.py?id=21364 Old revision New revision Changes Path 1.14 1.15 +17 -16 wine/server/winstation.c 1.267 1.268 +4 -4 wine/server/trace.c 1.160 1.161 +4 -4 wine/server/protocol.def 1.161 1.162 +5 -5 wine/include/wine/server_protocol.h 1.2 1.3 +13 -11 wine/dlls/user/winstation.c

1 0

wine/dlls/msvcrt tests/string.c mbcs.c
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21363 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 06:03:18 Modified files: dlls/msvcrt/tests: string.c dlls/msvcrt : mbcs.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Fix _mbsspn() with conformance tests. Patch: http://cvs.winehq.org/patch.py?id=21363 Old revision New revision Changes Path 1.5 1.6 +18 -0 wine/dlls/msvcrt/tests/string.c 1.34 1.35 +22 -20 wine/dlls/msvcrt/mbcs.c Index: wine/dlls/msvcrt/tests/string.c diff -u -p wine/dlls/msvcrt/tests/string.c:1.5 wine/dlls/msvcrt/tests/string.c:1.6 --- wine/dlls/msvcrt/tests/string.c:1.5 21 Nov 2005 12: 3:18 -0000 +++ wine/dlls/msvcrt/tests/string.c 21 Nov 2005 12: 3:18 -0000 @@ -21,6 +21,7 @@ #include "wine/test.h" #include "winbase.h" #include <string.h> +#include <mbstring.h> #include <stdlib.h> #include <mbctype.h> @@ -83,6 +84,21 @@ void test_ismbblead() _setmbcp(1252); } +static void test_mbsspn( void) +{ + unsigned char str1[]="cabernet"; + unsigned char str2[]="shiraz"; + unsigned char set[]="abc"; + unsigned char empty[]=""; + int ret; + ret=_mbsspn( str1, set); + ok( ret==3, "_mbsspn returns %d should be 3\n", ret); + ret=_mbsspn( str2, set); + ok( ret==0, "_mbsspn returns %d should be 0\n", ret); + ret=_mbsspn( str1, empty); + ok( ret==0, "_mbsspn returns %d should be 0\n", ret); +} + START_TEST(string) { void *mem; @@ -107,4 +123,6 @@ START_TEST(string) /* Test ismbblead*/ test_ismbblead(); + /* test _mbsspn */ + test_mbsspn(); } Index: wine/dlls/msvcrt/mbcs.c diff -u -p wine/dlls/msvcrt/mbcs.c:1.34 wine/dlls/msvcrt/mbcs.c:1.35 --- wine/dlls/msvcrt/mbcs.c:1.34 21 Nov 2005 12: 3:18 -0000 +++ wine/dlls/msvcrt/mbcs.c 21 Nov 2005 12: 3:18 -0000 @@ -1154,29 +1154,31 @@ unsigned char* _mbsupr(unsigned char* s) */ MSVCRT_size_t _mbsspn(const unsigned char* string, const unsigned char* set) { - const unsigned char *p, *q; + const unsigned char *p, *q; - for (p = string; *p; p++) + for (p = string; *p; p++) { - if (MSVCRT_isleadbyte(*p)) - { - for (q = set; *q; q++) - { - if (!q[1]) - break; - if ((*p == *q) && (p[1] == q[1])) - break; - q++; - } - if (*++p == '\0') - break; - } - else - for (q = set; *q; q++) - if (*p == *q) - break; + if (MSVCRT_isleadbyte(*p)) + { + for (q = set; *q; q++) + { + if (!q[1]) + break; + if ((*p == *q) && (p[1] == q[1])) + break; + q++; + } + if (!q[0] || !q[1]) break; + } + else + { + for (q = set; *q; q++) + if (*p == *q) + break; + if (!*q) break; + } } - return p - string; + return p - string; } /*********************************************************************

1 0

wine/ programs/taskmgr/taskmgr.rc programs/tas ...
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21362 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 06:02:17 Modified files: programs/taskmgr: taskmgr.rc De.rc dlls/winspool : winspool.rc dlls/mshtml : rsrc.rc dlls/hhctrl.ocx: hhctrl.rc Added files: programs/taskmgr: Nl.rc dlls/winspool : Nl.rc dlls/mshtml : Nl.rc dlls/hhctrl.ocx: Nl.rc Log message: Hans Leidekker <hans(a)it.vu.nl> Added Dutch translations. Patch: http://cvs.winehq.org/patch.py?id=21362 Old revision New revision Changes Path 1.6 1.7 +1 -0 wine/programs/taskmgr/taskmgr.rc 1.2 1.3 +3 -3 wine/programs/taskmgr/De.rc Added 1.1 +0 -0 wine/programs/taskmgr/Nl.rc 1.6 1.7 +1 -0 wine/dlls/winspool/winspool.rc Added 1.1 +0 -0 wine/dlls/winspool/Nl.rc 1.11 1.12 +1 -0 wine/dlls/mshtml/rsrc.rc Added 1.1 +0 -0 wine/dlls/mshtml/Nl.rc 1.7 1.8 +1 -0 wine/dlls/hhctrl.ocx/hhctrl.rc Added 1.1 +0 -0 wine/dlls/hhctrl.ocx/Nl.rc

1 0

wine/ programs/winefile/Ko.rc programs/winecon ...
by Alexandre Julliard Nov. 21, 2005

Nov. 21, 2005

ChangeSet ID: 21361 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/21 06:01:20 Modified files: programs/winefile: Ko.rc programs/wineconsole: wineconsole_Ko.rc programs/winecfg: Ko.rc programs/start : Ko.rc dlls/wldap32 : wldap32_Ko.rc dlls/oledlg : oledlg_Ko.rc dlls/msi : msi_Ko.rc dlls/mshtml : Ko.rc Log message: YunSong Hwang <hys545(a)dreamwiz.com> Update Korean translations. Patch: http://cvs.winehq.org/patch.py?id=21361 Old revision New revision Changes Path 1.2 1.3 +95 -95 wine/programs/winefile/Ko.rc 1.1 1.2 +35 -35 wine/programs/wineconsole/wineconsole_Ko.rc 1.1 1.2 +9 -9 wine/programs/winecfg/Ko.rc 1.1 1.2 +5 -5 wine/programs/start/Ko.rc 1.2 1.3 +44 -44 wine/dlls/wldap32/wldap32_Ko.rc 1.1 1.2 +12 -12 wine/dlls/oledlg/oledlg_Ko.rc 1.1 1.2 +6 -6 wine/dlls/msi/msi_Ko.rc 1.2 1.3 +121 -121 wine/dlls/mshtml/Ko.rc

1 0