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

Removed a W->A cross-call (CopyMetaFileW->CopyMetaFileA).

This commit is contained in:
Vincent Béron 2004-01-13 04:54:45 +00:00 committed by Alexandre Julliard
parent 9d79df901a
commit 506ab8bcb0
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
objects/metafile.c
View File

@ -52,6 +52,8 @@
#include "wine/wingdi16.h" #include "wine/wingdi16.h"
#include "bitmap.h" #include "bitmap.h"
#include "wownt32.h" #include "wownt32.h"
#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(metafile); WINE_DEFAULT_DEBUG_CHANNEL(metafile);
@ -418,7 +420,7 @@ HMETAFILE16 WINAPI CopyMetaFile16( HMETAFILE16 hSrcMetaFile, LPCSTR lpFilename)
/****************************************************************** /******************************************************************
* CopyMetaFileA (GDI32.@) * CopyMetaFileW (GDI32.@)
* *
* Copies the metafile corresponding to hSrcMetaFile to either * Copies the metafile corresponding to hSrcMetaFile to either
* a disk file, if a filename is given, or to a new memory based * a disk file, if a filename is given, or to a new memory based
@ -432,15 +434,15 @@ HMETAFILE16 WINAPI CopyMetaFile16( HMETAFILE16 hSrcMetaFile, LPCSTR lpFilename)
* *
* Copying to disk returns NULL even if successful. * Copying to disk returns NULL even if successful.
*/ */
HMETAFILE WINAPI CopyMetaFileA( HMETAFILE WINAPI CopyMetaFileW(
HMETAFILE hSrcMetaFile, /* [in] handle of metafile to copy */ HMETAFILE hSrcMetaFile, /* [in] handle of metafile to copy */
LPCSTR lpFilename /* [in] filename if copying to a file */ LPCWSTR lpFilename /* [in] filename if copying to a file */
) { ) {
METAHEADER *mh = MF_GetMetaHeader( hSrcMetaFile ); METAHEADER *mh = MF_GetMetaHeader( hSrcMetaFile );
METAHEADER *mh2 = NULL; METAHEADER *mh2 = NULL;
HANDLE hFile; HANDLE hFile;
TRACE("(%p,%s)\n", hSrcMetaFile, lpFilename); TRACE("(%p,%s)\n", hSrcMetaFile, debugstr_w(lpFilename));
if(!mh) return 0; if(!mh) return 0;
@ -452,14 +454,20 @@ HMETAFILE WINAPI CopyMetaFileA(
} }
if(lpFilename) { /* disk based metafile */ if(lpFilename) { /* disk based metafile */
if((hFile = CreateFileA(lpFilename, GENERIC_WRITE, 0, NULL, DWORD len;
LPSTR lpFilenameA;
if((hFile = CreateFileW(lpFilename, GENERIC_WRITE, 0, NULL,
CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) {
HeapFree( GetProcessHeap(), 0, mh2 ); HeapFree( GetProcessHeap(), 0, mh2 );
return 0; return 0;
} }
WriteFile(hFile, mh2, mh2->mtSize * 2, NULL, NULL); WriteFile(hFile, mh2, mh2->mtSize * 2, NULL, NULL);
CloseHandle(hFile); CloseHandle(hFile);
mh2 = MF_CreateMetaHeaderDisk(mh2, lpFilename); len = WideCharToMultiByte(CP_ACP, 0, lpFilename, -1, NULL, 0, NULL, NULL);
lpFilenameA = HeapAlloc(GetProcessHeap(), 0, len);
WideCharToMultiByte(CP_ACP, 0, lpFilename, -1, lpFilenameA, len, NULL, NULL);
mh2 = MF_CreateMetaHeaderDisk(mh2, lpFilenameA);
HeapFree(GetProcessHeap(), 0, lpFilenameA);
} }
return MF_Create_HMETAFILE( mh2 ); return MF_Create_HMETAFILE( mh2 );
@ -467,21 +475,21 @@ HMETAFILE WINAPI CopyMetaFileA(
/****************************************************************** /******************************************************************
* CopyMetaFileW (GDI32.@) * CopyMetaFileA (GDI32.@)
*/ */
HMETAFILE WINAPI CopyMetaFileW( HMETAFILE hSrcMetaFile, HMETAFILE WINAPI CopyMetaFileA( HMETAFILE hSrcMetaFile,
LPCWSTR lpFilename ) LPCSTR lpFilename )
{ {
UNICODE_STRING lpFilenameW;
HMETAFILE ret = 0; HMETAFILE ret = 0;
DWORD len = WideCharToMultiByte( CP_ACP, 0, lpFilename, -1, NULL, 0, NULL, NULL );
LPSTR p = HeapAlloc( GetProcessHeap(), 0, len );
if (p) if (lpFilename) RtlCreateUnicodeStringFromAsciiz(&lpFilenameW, lpFilename);
{ else lpFilenameW.Buffer = NULL;
WideCharToMultiByte( CP_ACP, 0, lpFilename, -1, p, len, NULL, NULL );
ret = CopyMetaFileA( hSrcMetaFile, p ); if (lpFilenameW.Buffer) {
HeapFree( GetProcessHeap(), 0, p ); ret = CopyMetaFileW( hSrcMetaFile, lpFilenameW.Buffer );
} }
RtlFreeUnicodeString(&lpFilenameW);
return ret; return ret;
} }