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

winspool.drv: Use CP_UNIXCP instead of CP_ACP for data that is going to or coming from system library functions.

This commit is contained in:
Rob Shearman 2008-12-03 18:24:50 +00:00 committed by Alexandre Julliard
parent 209fe1ec55
commit e47495c6e2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/winspool.drv/info.c
View File

@ -7603,24 +7603,24 @@ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR docume
#ifdef SONAME_LIBCUPS #ifdef SONAME_LIBCUPS
if(pcupsPrintFile) if(pcupsPrintFile)
{ {
char *unixname, *queue, *doc_titleA; char *unixname, *queue, *unix_doc_title;
DWORD len; DWORD len;
BOOL ret; BOOL ret;
if(!(unixname = wine_get_unix_file_name(filename))) if(!(unixname = wine_get_unix_file_name(filename)))
return FALSE; return FALSE;
len = WideCharToMultiByte(CP_ACP, 0, printer_name, -1, NULL, 0, NULL, NULL); len = WideCharToMultiByte(CP_UNIXCP, 0, printer_name, -1, NULL, 0, NULL, NULL);
queue = HeapAlloc(GetProcessHeap(), 0, len); queue = HeapAlloc(GetProcessHeap(), 0, len);
WideCharToMultiByte(CP_ACP, 0, printer_name, -1, queue, len, NULL, NULL); WideCharToMultiByte(CP_UNIXCP, 0, printer_name, -1, queue, len, NULL, NULL);
len = WideCharToMultiByte(CP_ACP, 0, document_title, -1, NULL, 0, NULL, NULL); len = WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, NULL, 0, NULL, NULL);
doc_titleA = HeapAlloc(GetProcessHeap(), 0, len); unix_doc_title = HeapAlloc(GetProcessHeap(), 0, len);
WideCharToMultiByte(CP_ACP, 0, document_title, -1, doc_titleA, len, NULL, NULL); WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, unix_doc_title, len, NULL, NULL);
TRACE("printing via cups\n"); TRACE("printing via cups\n");
ret = pcupsPrintFile(queue, unixname, doc_titleA, 0, NULL); ret = pcupsPrintFile(queue, unixname, unix_doc_title, 0, NULL);
HeapFree(GetProcessHeap(), 0, doc_titleA); HeapFree(GetProcessHeap(), 0, unix_doc_title);
HeapFree(GetProcessHeap(), 0, queue); HeapFree(GetProcessHeap(), 0, queue);
HeapFree(GetProcessHeap(), 0, unixname); HeapFree(GetProcessHeap(), 0, unixname);
return ret; return ret;
@ -7739,9 +7739,9 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename)
if(!(unixname = wine_get_unix_file_name(filename))) if(!(unixname = wine_get_unix_file_name(filename)))
return FALSE; return FALSE;
len = WideCharToMultiByte(CP_ACP, 0, cmd, -1, NULL, 0, NULL, NULL); len = WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, NULL, 0, NULL, NULL);
cmdA = HeapAlloc(GetProcessHeap(), 0, len); cmdA = HeapAlloc(GetProcessHeap(), 0, len);
WideCharToMultiByte(CP_ACP, 0, cmd, -1, cmdA, len, NULL, NULL); WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, cmdA, len, NULL, NULL);
TRACE("printing with: %s\n", cmdA); TRACE("printing with: %s\n", cmdA);
@ -7800,9 +7800,9 @@ static BOOL schedule_unixfile(LPCWSTR output, LPCWSTR filename)
if(!(unixname = wine_get_unix_file_name(filename))) if(!(unixname = wine_get_unix_file_name(filename)))
return FALSE; return FALSE;
len = WideCharToMultiByte(CP_ACP, 0, output, -1, NULL, 0, NULL, NULL); len = WideCharToMultiByte(CP_UNIXCP, 0, output, -1, NULL, 0, NULL, NULL);
outputA = HeapAlloc(GetProcessHeap(), 0, len); outputA = HeapAlloc(GetProcessHeap(), 0, len);
WideCharToMultiByte(CP_ACP, 0, output, -1, outputA, len, NULL, NULL); WideCharToMultiByte(CP_UNIXCP, 0, output, -1, outputA, len, NULL, NULL);
out_fd = open(outputA, O_CREAT | O_TRUNC | O_WRONLY, 0666); out_fd = open(outputA, O_CREAT | O_TRUNC | O_WRONLY, 0666);
in_fd = open(unixname, O_RDONLY); in_fd = open(unixname, O_RDONLY);