- Revert 49927 "Update to trunk" as it breaks KsStudio (again)

svn path=/branches/audio-bringup/; revision=49979
This commit is contained in:
Johannes Anderwald 2010-12-07 21:46:43 +00:00
parent 2b777abf96
commit 64a772037e
708 changed files with 18899 additions and 37154 deletions

View file

@ -1,6 +1,6 @@
/* $Id$
*/
#include "tcscat.inc"
#include "tcscat.h"
/* EOF */

View file

@ -1,6 +1,6 @@
/* $Id$
*/
#include "tcschr.inc"
#include "tcschr.h"
/* EOF */

View file

@ -1,6 +1,6 @@
/* $Id$
*/
#include "tcscmp.inc"
#include "tcscmp.h"
/* EOF */

View file

@ -1,6 +1,6 @@
/* $Id$
*/
#include "tcscpy.inc"
#include "tcscpy.h"
/* EOF */

View file

@ -1,6 +1,6 @@
/* $Id$
*/
#include "tcslen.inc"
#include "tcslen.h"
/* EOF */

View file

@ -1,6 +1,6 @@
/* $Id$
*/
#include "tcsncat.inc"
#include "tcsncat.h"
/* EOF */

View file

@ -1,6 +1,6 @@
/* $Id$
*/
#include "tcsncmp.inc"
#include "tcsncmp.h"
/* EOF */

View file

@ -1,6 +1,6 @@
/* $Id$
*/
#include "tcsncpy.inc"
#include "tcsncpy.h"
/* EOF */

View file

@ -1,6 +1,6 @@
/* $Id$
*/
#include "tcsnlen.inc"
#include "tcsnlen.h"
/* EOF */

View file

@ -1,6 +1,6 @@
/* $Id$
*/
#include "tcsrchr.inc"
#include "tcsrchr.h"
/* EOF */

View file

@ -21,12 +21,12 @@
#define _tlods lodsw
#define _tstos stosw
#define _tsize 2
#define _tsize $2
#define _treg(_O_) _O_ ## x
#define _tdec(_O_) sub _O_, 2
#define _tinc(_O_) add _O_, 2
#define _tdec(_O_) sub $2, _O_
#define _tinc(_O_) add $2, _O_
#else
@ -45,7 +45,7 @@
#define _tlods lodsb
#define _tstos stosb
#define _tsize 1
#define _tsize $1
#define _treg(_O_) _O_ ## l

View file

@ -0,0 +1,32 @@
/* $Id$
*/
#include "tchar.h"
.globl _tcscat
_tcscat:
push %esi
push %edi
mov 0x0C(%esp), %edi
mov 0x10(%esp), %esi
xor %eax, %eax
mov $-1, %ecx
cld
repne _tscas
_tdec(%edi)
.L1:
_tlods
_tstos
test %_treg(a), %_treg(a)
jnz .L1
mov 0x0C(%esp), %eax
pop %edi
pop %esi
ret
/* EOF */

View file

@ -1,35 +0,0 @@
/* $Id: tcscat.inc 49591 2010-11-15 01:29:12Z tkreuzer $
*/
#include "tchar.h"
#include <asm.inc>
PUBLIC _tcscat
.code
_tcscat:
push esi
push edi
mov edi, [esp + 12]
mov esi, [esp + 16]
xor eax, eax
mov ecx, -1
cld
repne _tscas
_tdec(edi)
.L1:
_tlods
_tstos
test _treg(a), _treg(a)
jnz .L1
mov eax, [esp + 12]
pop edi
pop esi
ret
END
/* EOF */

View file

@ -0,0 +1,30 @@
/* $Id$
*/
#include "tchar.h"
.globl _tcschr
_tcschr:
push %esi
mov 0x8(%esp), %esi
mov 0xC(%esp), %edx
cld
.L1:
_tlods
cmp %_treg(a), %_treg(d)
je .L2
test %_treg(a), %_treg(a)
jnz .L1
mov _tsize, %esi
.L2:
mov %esi, %eax
_tdec(%eax)
pop %esi
ret
/* EOF */

View file

@ -1,32 +0,0 @@
/* $Id: tcschr.inc 49591 2010-11-15 01:29:12Z tkreuzer $
*/
#include "tchar.h"
#include <asm.inc>
PUBLIC _tcschr
.code
_tcschr:
push esi
mov esi, [esp + 8]
mov edx, [esp + 12]
cld
.L1:
_tlods
cmp _treg(d), _treg(a)
je .L2
test _treg(a), _treg(a)
jnz .L1
mov esi, _tsize
.L2:
mov eax, esi
_tdec(eax)
pop esi
ret
END
/* EOF */

View file

@ -0,0 +1,34 @@
/* $Id$
*/
#include "tchar.h"
.globl _tcscmp
_tcscmp:
push %esi
push %edi
mov 0x0C(%esp), %esi
mov 0x10(%esp), %edi
xor %eax, %eax
cld
.L1:
_tlods
_tscas
jne .L2
test %eax, %eax
jne .L1
xor %eax, %eax
jmp .L3
.L2:
sbb %eax, %eax
or $1, %al
.L3:
pop %edi
pop %esi
ret
/* EOF */

View file

@ -1,37 +0,0 @@
/* $Id: tcscmp.inc 49591 2010-11-15 01:29:12Z tkreuzer $
*/
#include "tchar.h"
#include <asm.inc>
PUBLIC _tcscmp
.code
_tcscmp:
push esi
push edi
mov esi, [esp + 12]
mov edi, [esp + 16]
xor eax, eax
cld
.L1:
_tlods
_tscas
jne .L2
test eax, eax
jne .L1
xor eax, eax
jmp .L3
.L2:
sbb eax, eax
or al, 1
.L3:
pop edi
pop esi
ret
END
/* EOF */

View file

@ -0,0 +1,27 @@
/* $Id$
*/
#include "tchar.h"
.globl _tcscpy
_tcscpy:
push %esi
push %edi
mov 0x0C(%esp), %edi
mov 0x10(%esp), %esi
cld
.L1:
_tlods
_tstos
test %_treg(a), %_treg(a)
jnz .L1
mov 0x0C(%esp), %eax
pop %edi
pop %esi
ret
/* EOF */

View file

@ -1,30 +0,0 @@
/* $Id: tcscpy.inc 49591 2010-11-15 01:29:12Z tkreuzer $
*/
#include "tchar.h"
#include <asm.inc>
PUBLIC _tcscpy
.code
_tcscpy:
push esi
push edi
mov edi, [esp + 12]
mov esi, [esp + 16]
cld
.L1:
_tlods
_tstos
test _treg(a), _treg(a)
jnz .L1
mov eax, [esp + 12]
pop edi
pop esi
ret
END
/* EOF */

View file

@ -0,0 +1,29 @@
/* $Id$
*/
#include "tchar.h"
.globl _tcslen
_tcslen:
push %edi
mov 0x8(%esp), %edi
xor %eax, %eax
test %edi,%edi
jz _tcslen_end
mov $-1, %ecx
cld
repne _tscas
not %ecx
dec %ecx
mov %ecx, %eax
_tcslen_end:
pop %edi
ret
/* EOF */

View file

@ -1,32 +0,0 @@
/* $Id: tcslen.inc 49591 2010-11-15 01:29:12Z tkreuzer $
*/
#include "tchar.h"
#include <asm.inc>
PUBLIC _tcslen
.code
_tcslen:
push edi
mov edi, [esp + 8]
xor eax, eax
test edi, edi
jz _tcslen_end
mov ecx, -1
cld
repne _tscas
not ecx
dec ecx
mov eax, ecx
_tcslen_end:
pop edi
ret
END
/* EOF */

View file

@ -0,0 +1,42 @@
/* $Id$
*/
#include "tchar.h"
.globl _tcsncat
_tcsncat:
push %esi
push %edi
mov 0x0C(%esp), %edi
mov 0x10(%esp), %esi
cld
xor %eax, %eax
mov $-1, %ecx
repne _tscas
_tdec(%edi)
mov 0x14(%esp),%ecx
.L1:
dec %ecx
js .L2
_tlods
_tstos
test %_treg(a), %_treg(a)
jne .L1
jmp .L3
.L2:
xor %eax, %eax
_tstos
.L3:
mov 0x0C(%esp), %eax
pop %edi
pop %esi
ret
/* EOF */

View file

@ -1,45 +0,0 @@
/* $Id: tcsncat.inc 49591 2010-11-15 01:29:12Z tkreuzer $
*/
#include "tchar.h"
#include <asm.inc>
PUBLIC _tcsncat
.code
_tcsncat:
push esi
push edi
mov edi, [esp + 12]
mov esi, [esp + 16]
cld
xor eax, eax
mov ecx, -1
repne _tscas
_tdec(edi)
mov ecx, [esp + 20]
.L1:
dec ecx
js .L2
_tlods
_tstos
test _treg(a), _treg(a)
jne .L1
jmp .L3
.L2:
xor eax, eax
_tstos
.L3:
mov eax, [esp + 12]
pop edi
pop esi
ret
END
/* EOF */

View file

@ -0,0 +1,40 @@
/* $Id$
*/
#include "tchar.h"
.globl _tcsncmp
_tcsncmp:
push %esi
push %edi
mov 0x0C(%esp), %esi /* s1 */
mov 0x10(%esp), %edi /* s2 */
mov 0x14(%esp), %ecx /* n */
xor %eax,%eax
cld
.L1:
dec %ecx
js .L2
_tlods
_tscas
jne .L3
test %eax, %eax
jne .L1
.L2:
xor %eax, %eax
jmp .L4
.L3:
sbb %eax, %eax
or $1, %al
.L4:
pop %edi
pop %esi
ret
/* EOF */

View file

@ -1,43 +0,0 @@
/* $Id: tcsncmp.inc 49591 2010-11-15 01:29:12Z tkreuzer $
*/
#include "tchar.h"
#include <asm.inc>
PUBLIC _tcsncmp
.code
_tcsncmp:
push esi
push edi
mov esi, [esp + 12] /* s1 */
mov edi, [esp + 16] /* s2 */
mov ecx, [esp + 20] /* n */
xor eax, eax
cld
.L1:
dec ecx
js .L2
_tlods
_tscas
jne .L3
test eax, eax
jne .L1
.L2:
xor eax, eax
jmp .L4
.L3:
sbb eax, eax
or al, 1
.L4:
pop edi
pop esi
ret
END
/* EOF */

View file

@ -0,0 +1,34 @@
/* $Id$
*/
#include "tchar.h"
.globl _tcsncpy
_tcsncpy:
push %esi
push %edi
mov 0x0C(%esp), %edi /* s1 */
mov 0x10(%esp), %esi /* s2 */
mov 0x14(%esp), %ecx /* n */
xor %eax, %eax
cld
.L1:
dec %ecx
js .L2
_tlods
_tstos
test %_treg(a), %_treg(a)
jnz .L1
rep _tstos
.L2:
mov 0x0C(%esp), %eax
pop %edi
pop %esi
ret
/* EOF */

View file

@ -1,37 +0,0 @@
/* $Id: tcsncpy.inc 49591 2010-11-15 01:29:12Z tkreuzer $
*/
#include "tchar.h"
#include <asm.inc>
PUBLIC _tcsncpy
.code
_tcsncpy:
push esi
push edi
mov edi, [esp + 12] /* s1 */
mov esi, [esp + 16] /* s2 */
mov ecx, [esp + 20] /* n */
xor eax, eax
cld
.L1:
dec ecx
js .L2
_tlods
_tstos
test _treg(a), _treg(a)
jnz .L1
rep _tstos
.L2:
mov eax, [esp + 12]
pop edi
pop esi
ret
END
/* EOF */

View file

@ -0,0 +1,30 @@
/* $Id$
*/
#include "tchar.h"
.globl _tcsnlen
_tcsnlen:
push %edi
mov 0x8(%esp), %edi
mov 0xC(%esp), %ecx
xor %eax, %eax
test %ecx, %ecx
jz .L1
mov %ecx, %edx
cld
repne _tscas
sete %al
sub %ecx, %edx
sub %eax, %edx
mov %edx, %eax
.L1:
pop %edi
ret
/* EOF */

View file

@ -1,33 +0,0 @@
/* $Id: tcsnlen.inc 49591 2010-11-15 01:29:12Z tkreuzer $
*/
#include "tchar.h"
#include <asm.inc>
PUBLIC _tcsnlen
.code
_tcsnlen:
push edi
mov edi, [esp + 8]
mov ecx, [esp + 12]
xor eax, eax
test ecx, ecx
jz .L1
mov edx, ecx
cld
repne _tscas
sete al
sub edx, ecx
sub edx, eax
mov eax, edx
.L1:
pop edi
ret
END
/* EOF */

View file

@ -0,0 +1,31 @@
/* $Id$
*/
#include "tchar.h"
.globl _tcsrchr
_tcsrchr:
push %esi
mov 0x8(%esp), %esi
mov 0xC(%esp), %edx
cld
mov _tsize, %ecx
.L1:
_tlods
cmp %_treg(a), %_treg(d)
jne .L2
mov %esi, %ecx
.L2:
test %_treg(a), %_treg(a)
jnz .L1
mov %ecx, %eax
_tdec(%eax)
pop %esi
ret
/* EOF */

View file

@ -1,34 +0,0 @@
/* $Id: tcsrchr.inc 49591 2010-11-15 01:29:12Z tkreuzer $
*/
#include "tchar.h"
#include <asm.inc>
PUBLIC _tcsrchr
.code
_tcsrchr:
push esi
mov esi, [esp + 8]
mov edx, [esp + 12]
cld
mov ecx, _tsize
.L1:
_tlods
cmp _treg(d), _treg(a)
jne .L2
mov ecx, esi
.L2:
test _treg(a), _treg(a)
jnz .L1
mov eax, ecx
_tdec(eax)
pop esi
ret
END
/* EOF */

View file

@ -2,6 +2,6 @@
*/
#define _UNICODE
#include "tcscat.inc"
#include "tcscat.h"
/* EOF */

View file

@ -2,6 +2,6 @@
*/
#define _UNICODE
#include "tcschr.inc"
#include "tcschr.h"
/* EOF */

View file

@ -2,6 +2,6 @@
*/
#define _UNICODE
#include "tcscmp.inc"
#include "tcscmp.h"
/* EOF */

View file

@ -2,6 +2,6 @@
*/
#define _UNICODE
#include "tcscpy.inc"
#include "tcscpy.h"
/* EOF */

View file

@ -2,6 +2,6 @@
*/
#define _UNICODE
#include "tcslen.inc"
#include "tcslen.h"
/* EOF */

View file

@ -2,6 +2,6 @@
*/
#define _UNICODE
#include "tcsncat.inc"
#include "tcsncat.h"
/* EOF */

View file

@ -2,6 +2,6 @@
*/
#define _UNICODE
#include "tcsncmp.inc"
#include "tcsncmp.h"
/* EOF */

View file

@ -2,6 +2,6 @@
*/
#define _UNICODE
#include "tcsncpy.inc"
#include "tcsncpy.h"
/* EOF */

View file

@ -2,6 +2,6 @@
*/
#define _UNICODE
#include "tcsnlen.inc"
#include "tcsnlen.h"
/* EOF */

View file

@ -2,6 +2,6 @@
*/
#define _UNICODE
#include "tcsrchr.inc"
#include "tcsrchr.h"
/* EOF */

View file

@ -388,7 +388,6 @@ static inline int pf_output_format_A( pf_output *out, LPCSTR str,
return r;
}
#ifndef USE_NEW_SPRINTF
static int pf_handle_string_format( pf_output *out, const void* str, int len,
pf_flags *flags, BOOL capital_letter)
{
@ -880,7 +879,6 @@ int CDECL vswprintf( wchar_t* str, const wchar_t* format, va_list args )
return _vsnwprintf( str, INT_MAX, format, args );
}
#endif
#endif
/*********************************************************************
* wcscoll (MSVCRT.@)