ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move the implementation of GetDefaultCommConfig from A to W.

Browse Source 
Get rid of a W->A cross call at the same time.
This commit is contained in:
Vincent Béron 2004-01-16 02:21:01 +00:00 committed by Alexandre Julliard
parent b370abab45
commit 14263ab0c4
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/kernel/comm.c
View File

@ -2190,7 +2190,7 @@ BOOL WINAPI SetDefaultCommConfigW(
/*********************************************************************** /***********************************************************************
* GetDefaultCommConfigA (KERNEL32.@) * GetDefaultCommConfigW (KERNEL32.@)
* *
* Acquires the default configuration of the specified communication device. (unicode) * Acquires the default configuration of the specified communication device. (unicode)
* *
@ -2199,22 +2199,24 @@ BOOL WINAPI SetDefaultCommConfigW(
* True on successful reading of the default configuration, * True on successful reading of the default configuration,
* if the device is not found or the buffer is too small. * if the device is not found or the buffer is too small.
*/ */
BOOL WINAPI GetDefaultCommConfigA( BOOL WINAPI GetDefaultCommConfigW(
LPCSTR lpszName, /* [in] The ascii name of the device targeted for configuration. */ LPCWSTR lpszName, /* [in] The unicode name of the device targeted for configuration. */
LPCOMMCONFIG lpCC, /* [out] The default configuration for the device. */ LPCOMMCONFIG lpCC, /* [out] The default configuration for the device. */
LPDWORD lpdwSize) /* [in/out] Initially the size of the default configuration buffer, LPDWORD lpdwSize) /* [in/out] Initially the size of the default configuration buffer,
afterwards the number of bytes copied to the buffer or afterwards the number of bytes copied to the buffer or
the needed size of the buffer. */ the needed size of the buffer. */
{ {
LPDCB lpdcb = &(lpCC->dcb); LPDCB lpdcb = &(lpCC->dcb);
char temp[40]; WCHAR temp[40];
const WCHAR comW[] = {'C','O','M',0};
const WCHAR formatW[] = {'C','O','M','%','c',':','3','8','4','0','0',',','n',',','8',',','1',0};
if (strncasecmp(lpszName,"COM",3)) { if (strncmpiW(lpszName,comW,3)) {
ERR("not implemented for <%s>\n", lpszName); ERR("not implemented for <%s>\n", debugstr_w(lpszName));
return FALSE; return FALSE;
} }
TRACE("(%s %p %ld)\n", lpszName, lpCC, *lpdwSize ); TRACE("(%s %p %ld)\n", debugstr_w(lpszName), lpCC, *lpdwSize );
if (*lpdwSize < sizeof(COMMCONFIG)) { if (*lpdwSize < sizeof(COMMCONFIG)) {
*lpdwSize = sizeof(COMMCONFIG); *lpdwSize = sizeof(COMMCONFIG);
return FALSE; return FALSE;
@ -2228,38 +2230,38 @@ BOOL WINAPI GetDefaultCommConfigA(
lpCC->dwProviderOffset = 0L; lpCC->dwProviderOffset = 0L;
lpCC->dwProviderSize = 0L; lpCC->dwProviderSize = 0L;
sprintf( temp, "COM%c:38400,n,8,1", lpszName[3]); sprintfW( temp, formatW, lpszName[3]);
FIXME("setting %s as default\n", temp); FIXME("setting %s as default\n", debugstr_w(temp));
return BuildCommDCBA( temp, lpdcb); return BuildCommDCBW( temp, lpdcb);
} }
/************************************************************************** /**************************************************************************
* GetDefaultCommConfigW (KERNEL32.@) * GetDefaultCommConfigA (KERNEL32.@)
* *
* Acquires the default configuration of the specified communication device. (unicode) * Acquires the default configuration of the specified communication device. (ascii)
* *
* RETURNS * RETURNS
* *
* True on successful reading of the default configuration, * True on successful reading of the default configuration,
* if the device is not found or the buffer is too small. * if the device is not found or the buffer is too small.
*/ */
BOOL WINAPI GetDefaultCommConfigW( BOOL WINAPI GetDefaultCommConfigA(
LPCWSTR lpszName, /* [in] The unicode name of the device targeted for configuration. */ LPCSTR lpszName, /* [in] The ascii name of the device targeted for configuration. */
LPCOMMCONFIG lpCC, /* [out] The default configuration for the device. */ LPCOMMCONFIG lpCC, /* [out] The default configuration for the device. */
LPDWORD lpdwSize) /* [in/out] Initially the size of the default configuration buffer, LPDWORD lpdwSize) /* [in/out] Initially the size of the default configuration buffer,
afterwards the number of bytes copied to the buffer or afterwards the number of bytes copied to the buffer or
the needed size of the buffer. */ the needed size of the buffer. */
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
LPSTR lpszNameA; UNICODE_STRING lpszNameW;
TRACE("(%p,%p,%ld)\n",lpszName,lpCC,*lpdwSize); TRACE("(%s,%p,%ld)\n",lpszName,lpCC,*lpdwSize);
lpszNameA = HEAP_strdupWtoA( GetProcessHeap(), 0, lpszName ); if(lpszName) RtlCreateUnicodeStringFromAsciiz(&lpszNameW,lpszName);
if (lpszNameA) else lpszNameW.Buffer = NULL;
{
ret=GetDefaultCommConfigA(lpszNameA,lpCC,lpdwSize); if(lpszNameW.Buffer) ret = GetDefaultCommConfigW(lpszNameW.Buffer,lpCC,lpdwSize);
HeapFree( GetProcessHeap(), 0, lpszNameA );
} RtlFreeUnicodeString(&lpszNameW);
return ret; return ret;
} }