Replaced swprintf by wsprintfW.

This commit is contained in:
Alexandre Julliard 2002-05-29 19:25:50 +00:00
parent d36c8e9d0c
commit 13b0dc5fde
6 changed files with 6 additions and 10 deletions

View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = comcat.dll MODULE = comcat.dll
IMPORTS = ole32 advapi32 kernel32 IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID) EXTRALIBS = $(LIBUUID)
LDDLLFLAGS = @LDDLLFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@

View File

@ -22,7 +22,6 @@
#include "winbase.h" #include "winbase.h"
#include "winreg.h" #include "winreg.h"
#include "winerror.h" #include "winerror.h"
#include "ntddk.h"
#include "ole2.h" #include "ole2.h"
#include "wine/obj_base.h" #include "wine/obj_base.h"

View File

@ -21,6 +21,7 @@
#include <string.h> #include <string.h>
#include "comcat.h" #include "comcat.h"
#include "winuser.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
@ -389,7 +390,7 @@ static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc,
if (pszDesc == NULL) return E_INVALIDARG; if (pszDesc == NULL) return E_INVALIDARG;
/* FIXME: lcid comparisons are more complex than this! */ /* FIXME: lcid comparisons are more complex than this! */
swprintf(valname, fmt, lcid); wsprintfW(valname, fmt, lcid);
res = RegQueryValueExW(key, valname, 0, &type, (LPBYTE)pszDesc, &size); res = RegQueryValueExW(key, valname, 0, &type, (LPBYTE)pszDesc, &size);
if (res != ERROR_SUCCESS || type != REG_SZ) return CAT_E_NODESCRIPTION; if (res != ERROR_SUCCESS || type != REG_SZ) return CAT_E_NODESCRIPTION;
pszDesc[size / sizeof(WCHAR)] = (WCHAR)0; pszDesc[size / sizeof(WCHAR)] = (WCHAR)0;

View File

@ -28,7 +28,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "ntddk.h"
#include "winbase.h" #include "winbase.h"
#include "commctrl.h" #include "commctrl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
@ -284,7 +283,7 @@ static LRESULT IPADDRESS_SetAddress (IPADDRESS_INFO *infoPtr, DWORD ip_address)
IPPART_INFO* part = &infoPtr->Part[i]; IPPART_INFO* part = &infoPtr->Part[i];
int value = ip_address & 0xff; int value = ip_address & 0xff;
if ( (value >= part->LowerLimit) && (value <= part->UpperLimit) ) { if ( (value >= part->LowerLimit) && (value <= part->UpperLimit) ) {
swprintf (buf, fmt, value); wsprintfW (buf, fmt, value);
SetWindowTextW (part->EditHwnd, buf); SetWindowTextW (part->EditHwnd, buf);
IPADDRESS_Notify (infoPtr, EN_CHANGE); IPADDRESS_Notify (infoPtr, EN_CHANGE);
} }
@ -332,7 +331,7 @@ static BOOL IPADDRESS_ConstrainField (IPADDRESS_INFO *infoPtr, int currentfield)
if (newValue == curValue) return FALSE; if (newValue == curValue) return FALSE;
swprintf (field, fmt, newValue); wsprintfW (field, fmt, newValue);
TRACE(" field='%s'\n", debugstr_w(field)); TRACE(" field='%s'\n", debugstr_w(field));
return SetWindowTextW (part->EditHwnd, field); return SetWindowTextW (part->EditHwnd, field);
} }

View File

@ -29,7 +29,6 @@
#include "winuser.h" #include "winuser.h"
#include "commctrl.h" #include "commctrl.h"
#include "winnls.h" #include "winnls.h"
#include "ntddk.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -310,7 +309,7 @@ static BOOL UPDOWN_SetBuddyInt (UPDOWN_INFO *infoPtr)
/* Regular window, so set caption to the number */ /* Regular window, so set caption to the number */
if (infoPtr->Base == 16) fmt[1] = 'X'; if (infoPtr->Base == 16) fmt[1] = 'X';
len = swprintf(txt, fmt, infoPtr->CurVal); len = wsprintfW(txt, fmt, infoPtr->CurVal);
/* Do thousands seperation if necessary */ /* Do thousands seperation if necessary */

View File

@ -759,8 +759,6 @@ DWORD WINAPI RtlIsTextUnicode(
DWORD len, DWORD len,
DWORD *pf); DWORD *pf);
int __cdecl swprintf(LPWSTR,LPCWSTR,...);
/* resource functions */ /* resource functions */
typedef struct _RTL_RWLOCK { typedef struct _RTL_RWLOCK {