Commit a96a700c authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

Protect sscanfs with a "C" locale so that they still work with new

glibcs in a locale doesn't use a '.' as a decimal separator.
parent e04da6bb
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <locale.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wine/debug.h" #include "wine/debug.h"
...@@ -710,8 +711,10 @@ PPD *PSDRV_ParsePPD(char *fname) ...@@ -710,8 +711,10 @@ PPD *PSDRV_ParsePPD(char *fname)
#define PIA page->ImageableArea #define PIA page->ImageableArea
if(!PIA) { if(!PIA) {
PIA = HeapAlloc( PSDRV_Heap, 0, sizeof(*PIA) ); PIA = HeapAlloc( PSDRV_Heap, 0, sizeof(*PIA) );
push_lc_numeric("C");
sscanf(tuple.value, "%f%f%f%f", &PIA->llx, &PIA->lly, sscanf(tuple.value, "%f%f%f%f", &PIA->llx, &PIA->lly,
&PIA->urx, &PIA->ury); &PIA->urx, &PIA->ury);
pop_lc_numeric();
} }
#undef PIA #undef PIA
} }
...@@ -733,7 +736,9 @@ PPD *PSDRV_ParsePPD(char *fname) ...@@ -733,7 +736,9 @@ PPD *PSDRV_ParsePPD(char *fname)
#define PD page->PaperDimension #define PD page->PaperDimension
if(!PD) { if(!PD) {
PD = HeapAlloc( PSDRV_Heap, 0, sizeof(*PD) ); PD = HeapAlloc( PSDRV_Heap, 0, sizeof(*PD) );
push_lc_numeric("C");
sscanf(tuple.value, "%f%f", &PD->x, &PD->y); sscanf(tuple.value, "%f%f", &PD->x, &PD->y);
pop_lc_numeric();
} }
#undef PD #undef PD
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment