wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Huw Davies : wineps: Add the ability to override the ppd file' s default pagesize and duplex settings.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 5b71f7bbbcde36955e0d2f0d49c66cce09f9bb4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b71f7bbbcde36955e0d2f0d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 21 12:59:00 2012 +0100 wineps: Add the ability to override the ppd file's default pagesize and duplex settings. --- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/ppd.c | 32 +++++++++++++++++++++++++++++--- dlls/wineps.drv/psdrv.h | 2 +- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 64a3c74..4beb45a 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -612,7 +612,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) ppd_filename = get_ppd_filename( hPrinter ); if (!ppd_filename) goto fail; - pi->ppd = PSDRV_ParsePPD( ppd_filename ); + pi->ppd = PSDRV_ParsePPD( ppd_filename, hPrinter ); if (!pi->ppd) { WARN( "Couldn't parse PPD file '%s'\n", ppd_filename ); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index dc598e8..1cba1b8 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -611,18 +611,36 @@ static BOOL PSDRV_AddSlot(PPD *ppd, LPCSTR szName, LPCSTR szFullName, return TRUE; } +static char *get_ppd_override( HANDLE printer, const char *value ) +{ + DWORD err, type, needed; + char *data; + + err = GetPrinterDataExA( printer, "PPD Overrides", value, &type, NULL, 0, &needed ); + if (err != ERROR_MORE_DATA || type != REG_SZ || needed == 0) return NULL; + + data = HeapAlloc( PSDRV_Heap, 0, needed ); + if (data) + { + GetPrinterDataExA( printer, "PPD Overrides", value, &type, (BYTE*)data, needed, &needed ); + TRACE( "got override %s: %s\n", value, data ); + } + return data; +} + /*********************************************************************** * * PSDRV_ParsePPD * * */ -PPD *PSDRV_ParsePPD(char *fname) +PPD *PSDRV_ParsePPD( char *fname, HANDLE printer ) { FILE *fp; PPD *ppd; PPDTuple tuple; char *default_pagesize = NULL, *default_duplex = NULL; + char *def_pagesize_override = NULL, *def_duplex_override = NULL; PAGESIZE *page, *page_cursor2; TRACE("file '%s'\n", fname); @@ -944,7 +962,10 @@ PPD *PSDRV_ParsePPD(char *fname) } ppd->DefaultPageSize = NULL; - if (default_pagesize) + def_pagesize_override = get_ppd_override( printer, "DefaultPageSize" ); + if (def_pagesize_override) + ppd->DefaultPageSize = get_pagesize( ppd, def_pagesize_override, FALSE ); + if (!ppd->DefaultPageSize && default_pagesize) ppd->DefaultPageSize = get_pagesize( ppd, default_pagesize, FALSE ); if (!ppd->DefaultPageSize) @@ -955,10 +976,14 @@ PPD *PSDRV_ParsePPD(char *fname) } TRACE( "DefaultPageSize: %s\n", ppd->DefaultPageSize ? ppd->DefaultPageSize->Name : "<not set>" ); + HeapFree( PSDRV_Heap, 0, def_pagesize_override ); HeapFree( PSDRV_Heap, 0, default_pagesize ); ppd->DefaultDuplex = NULL; - if (default_duplex) + def_duplex_override = get_ppd_override( printer, "DefaultDuplex" ); + if (def_duplex_override) + ppd->DefaultDuplex = get_duplex( ppd, def_duplex_override ); + if (!ppd->DefaultDuplex && default_duplex) ppd->DefaultDuplex = get_duplex( ppd, default_duplex ); if (!ppd->DefaultDuplex) @@ -969,6 +994,7 @@ PPD *PSDRV_ParsePPD(char *fname) } TRACE( "DefaultDuplex: %s\n", ppd->DefaultDuplex ? ppd->DefaultDuplex->Name : "<not set>" ); + HeapFree( PSDRV_Heap, 0, def_duplex_override ); HeapFree( PSDRV_Heap, 0, default_duplex ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 309cfee..42ace2d 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -458,7 +458,7 @@ extern BOOL PSDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern void PSDRV_MergeDevmodes(PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *pi) DECLSPEC_HIDDEN; extern BOOL PSDRV_GetFontMetrics(void) DECLSPEC_HIDDEN; -extern PPD *PSDRV_ParsePPD(char *fname) DECLSPEC_HIDDEN; +extern PPD *PSDRV_ParsePPD(char *fname, HANDLE printer) DECLSPEC_HIDDEN; extern PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) DECLSPEC_HIDDEN; extern const AFM *PSDRV_FindAFMinList(FONTFAMILY *head, LPCSTR name) DECLSPEC_HIDDEN; extern BOOL PSDRV_AddAFMtoList(FONTFAMILY **head, const AFM *afm,

1 0

Michael Stefaniuc : avifil32: Drop the 'register' storage-class specifier.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: a2a8a613bed03ae7b5aa42e407f360e807f7235a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a8a613bed03ae7b5aa42e40… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 13:17:51 2012 +0200 avifil32: Drop the 'register' storage-class specifier. --- dlls/avifil32/acmstream.c | 2 +- dlls/avifil32/getframe.c | 2 +- dlls/avifil32/tmpfile.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 50e868b..845ea16 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -224,7 +224,7 @@ static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, /* check for swapped parameters */ if ((LPVOID)lParam1 != NULL && ((LPAVICOMPRESSOPTIONS)lParam1)->fccType == streamtypeAUDIO) { - register LPARAM tmp = lParam1; + LPARAM tmp = lParam1; lParam1 = lParam2; lParam2 = tmp; diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 547f340..c5b2bd4 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -430,7 +430,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, } if (lpBits == NULL) { - register DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); + DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 3bdd50a..62d283b 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -258,7 +258,7 @@ PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) tmpFile->fInfo.dwSuggestedBufferSize = sInfo.dwSuggestedBufferSize; { - register DWORD tmp; + DWORD tmp; tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), tmpFile->fInfo.dwScale, tmpFile->fInfo.dwRate * 1000);

1 0

Piotr Caban : msvcp90: Added istream>>(base type) implementation.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 1c7f54bfa64d7e9fbbabad0be17f7008ee4a7041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7f54bfa64d7e9fbbabad0be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:27:21 2012 +0200 msvcp90: Added istream>>(base type) implementation. --- dlls/msvcp90/ios.c | 279 +++++++++++++++++++++++++++++++++++++++++------- dlls/msvcp90/locale.c | 38 +++++-- dlls/msvcp90/msvcp90.h | 36 ++++++ 3 files changed, 302 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c7f54bfa64d7e9fbbaba…

1 0

Piotr Caban : msvcp90: Added num_get<char>::get functions implementation.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: ba0908d9b3bcd1df5d2304164ab3d1cbf10c8f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0908d9b3bcd1df5d2304164… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:27:06 2012 +0200 msvcp90: Added num_get<char>::get functions implementation. --- dlls/msvcp90/locale.c | 286 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 254 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba0908d9b3bcd1df5d230…

1 0

Piotr Caban : msvcp90: Added num_get<char>::_Getifld implementation.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 98f6028c1e60d9e9c354d3de90f7b94d773d5ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f6028c1e60d9e9c354d3de9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:26:47 2012 +0200 msvcp90: Added num_get<char>::_Getifld implementation. --- dlls/msvcp90/locale.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c051618..914637a 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4718,11 +4718,123 @@ int __cdecl num_get_char__Getffldx(num_get *this, char *dest, istreambuf_iterato /* ?_Getifld@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@1HABVlocale@2@@Z */ /* ?_Getifld@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@AEBAHPEADAEAV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@1HAEBVlocale@2@@Z */ -int __cdecl num_get_char__Getifld(num_get *this, char *dest, istreambuf_iterator_char *first, - istreambuf_iterator_char *last, int fmtflags, const locale *loc) +/* Copies number to dest buffer, validates grouping and skips separators. + * Updates first so it points past the number, all digits are skipped. + * Returns number base (8, 10 or 16). + * Size of dest buffer is not specified, assuming it's not smaller then 25: + * 22(8^22>2^64)+1(detect overflows)+1(sign)+1(nullbyte) = 25 + */ +int __cdecl num_get_char__Getifld(const num_get *this, char *dest, istreambuf_iterator_char *first, + istreambuf_iterator_char *last, int fmtflags, const locale *loc) { - FIXME("(%p %p %p %04x %p) stub\n", dest, first, last, fmtflags, loc); - return -1; + static const char digits[] = "0123456789abcdefABCDEF"; + + numpunct_char *numpunct = numpunct_char_use_facet(loc); + basic_string_char grouping_bstr; + int basefield, base, groups_no = 0, cur_group = 0; + char *dest_beg = dest, *dest_end = dest+24, *groups = NULL, sep; + const char *grouping; + BOOL error = TRUE, dest_empty = TRUE; + + TRACE("(%p %p %p %04x %p)\n", dest, first, last, fmtflags, loc); + + numpunct_char_grouping(numpunct, &grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + + basefield = fmtflags & FMTFLAG_basefield; + if(basefield == FMTFLAG_oct) + base = 8; + else if(basefield == FMTFLAG_hex) + base = 22; /* equal to the size of digits buffer */ + else if(!basefield) + base = 0; + else + base = 10; + + istreambuf_iterator_char_val(first); + if(first->strbuf && (first->val=='-' || first->val=='+')) { + *dest++ = first->val; + istreambuf_iterator_char_inc(first); + } + + if(!base && first->strbuf && first->val=='0') { + istreambuf_iterator_char_inc(first); + if(first->strbuf && (first->val=='x' || first->val=='X')) { + istreambuf_iterator_char_inc(first); + base = 22; + }else { + error = FALSE; + base = 8; + } + }else { + base = 10; + } + + if(sep) { + groups_no = strlen(grouping)+2; + groups = calloc(groups_no, sizeof(char)); + } + + for(; first->strbuf; istreambuf_iterator_char_inc(first)) { + if(!memchr(digits, first->val, base)) { + if(sep && first->val==sep) { + if(cur_group == groups_no+1) { + if(groups[1] != groups[2]) { + error = TRUE; + break; + }else { + memmove(groups+1, groups+2, groups_no); + groups[cur_group] = 0; + } + }else { + cur_group++; + } + }else { + break; + } + }else { + error = FALSE; + if(dest_empty && first->val == '0') + continue; + dest_empty = FALSE; + /* skip digits that can't be copied to dest buffer, other + * functions are responsible for detecting overflows */ + if(dest < dest_end) + *dest++ = first->val; + if(sep && groups[cur_group]<CHAR_MAX) + groups[cur_group]++; + } + } + + if(cur_group && !groups[cur_group]) + error = TRUE; + else if(!cur_group) + cur_group--; + + for(; cur_group>=0 && !error; cur_group--) { + if(*grouping == CHAR_MAX) { + if(cur_group) + error = TRUE; + break; + }else if((cur_group && *grouping!=groups[cur_group]) + || (!cur_group && *grouping<groups[cur_group])) { + error = TRUE; + break; + }else if(grouping[1]) { + grouping++; + } + } + MSVCP_basic_string_char_dtor(&grouping_bstr); + free(groups); + + if(error) + dest = dest_beg; + else if(dest_empty) + *dest++ = '0'; + *dest = '\0'; + + return (base==22 ? 16 : base); } /* ?_Hexdig@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABEHD000@Z */

1 0

Piotr Caban : msvcp90: Added num_get<char>::_Getffld implementation.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 1507d715cc606437c13d8d1a1b20525370cb38a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1507d715cc606437c13d8d1a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:26:20 2012 +0200 msvcp90: Added num_get<char>::_Getffld implementation. --- dlls/msvcp90/locale.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.h | 3 + 2 files changed, 198 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 103b084..c051618 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -25,6 +25,7 @@ #include "errno.h" #include "limits.h" #include "math.h" +#include "stdio.h" #include "wine/list.h" @@ -126,6 +127,31 @@ static locale classic_locale; /* ?_Clocptr@_Locimp@locale@std@@0PEAV123@EA */ locale__Locimp *locale__Locimp__Clocptr = NULL; +static char istreambuf_iterator_char_val(istreambuf_iterator_char *this) +{ + if(this->strbuf && !this->got) { + int c = basic_streambuf_char_sgetc(this->strbuf); + if(c == EOF) + this->strbuf = NULL; + else + this->val = c; + } + + this->got = TRUE; + return this->val; +} + +static void istreambuf_iterator_char_inc(istreambuf_iterator_char *this) +{ + if(!this->strbuf || basic_streambuf_char_sbumpc(this->strbuf)==EOF) { + this->strbuf = NULL; + this->got = TRUE; + }else { + this->got = FALSE; + istreambuf_iterator_char_val(this); + } +} + /* ??1facet@locale@std@@UAE@XZ */ /* ??1facet@locale@std@@UEAA@XZ */ DEFINE_THISCALL_WRAPPER(locale_facet_dtor, 4) @@ -3401,6 +3427,32 @@ MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const loc return LC_NUMERIC; } +numpunct_char* numpunct_char_use_facet(const locale *loc) +{ + static numpunct_char *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, numpunct_char_id.id); + if(fac) { + _Lockit_dtor(&lock); + return (numpunct_char*)fac; + } + + if(obj) + return obj; + + numpunct_char__Getcat(&fac, loc); + obj = (numpunct_char*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?do_decimal_point@?$numpunct@D@std@@MBEDXZ */ /* ?do_decimal_point@?$numpunct@D@std@@MEBADXZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_decimal_point, 4) @@ -4509,11 +4561,150 @@ MSVCP_size_t __cdecl num_get_char__Getcat(const locale_facet **facet, const loca /* ?_Getffld@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@1ABVlocale@2@@Z */ /* ?_Getffld@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@AEBAHPEADAEAV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@1AEBVlocale@2@@Z */ -int __cdecl num_get_char__Getffld(num_get *this, char *dest, istreambuf_iterator_char *first, - istreambuf_iterator_char *last, const locale *loc) +/* Copies number to dest buffer, validates grouping and skips separators. + * Updates first so it points past the number, all digits are skipped. + * Returns how exponent needs to changed. + * Size of dest buffer is not specified, assuming it's not smaller then 32: + * strlen(+0.e+) + 22(digits) + 4(expontent) + 1(nullbyte) + */ +int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_iterator_char *first, + istreambuf_iterator_char *last, const locale *loc) { - FIXME("(%p %p %p %p) stub\n", dest, first, last, loc); - return -1; + numpunct_char *numpunct = numpunct_char_use_facet(loc); + basic_string_char grouping_bstr; + int groups_no = 0, cur_group = 0, exp = 0; + char *dest_beg = dest, *num_end = dest+25, *exp_end = dest+31, *groups = NULL, sep; + const char *grouping; + BOOL error = TRUE, dest_empty = TRUE; + + TRACE("(%p %p %p %p)\n", dest, first, last, loc); + + numpunct_char_grouping(numpunct, &grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + + istreambuf_iterator_char_val(first); + if(first->strbuf && (first->val=='-' || first->val=='+')) { + *dest++ = first->val; + istreambuf_iterator_char_inc(first); + } + + if(sep) { + groups_no = strlen(grouping)+2; + groups = calloc(groups_no, sizeof(char)); + } + + for(; first->strbuf; istreambuf_iterator_char_inc(first)) { + if(first->val<'0' || first->val>'9') { + if(sep && first->val==sep) { + if(cur_group == groups_no+1) { + if(groups[1] != groups[2]) { + error = TRUE; + break; + }else { + memmove(groups+1, groups+2, groups_no); + groups[cur_group] = 0; + } + }else { + cur_group++; + } + }else { + break; + } + }else { + error = FALSE; + if(dest_empty && first->val == '0') + continue; + dest_empty = FALSE; + if(dest < num_end) + *dest++ = first->val; + else + exp++; + if(sep && groups[cur_group]<CHAR_MAX) + groups[cur_group]++; + } + } + + if(cur_group && !groups[cur_group]) + error = TRUE; + else if(!cur_group) + cur_group--; + + for(; cur_group>=0 && !error; cur_group--) { + if(*grouping == CHAR_MAX) { + if(cur_group) + error = TRUE; + break; + }else if((cur_group && *grouping!=groups[cur_group]) + || (!cur_group && *grouping<groups[cur_group])) { + error = TRUE; + break; + }else if(grouping[1]) { + grouping++; + } + } + MSVCP_basic_string_char_dtor(&grouping_bstr); + free(groups); + + if(error) { + *dest_beg = '\0'; + return 0; + }else if(dest_empty) { + *dest++ = '0'; + } + + if(first->strbuf && first->val==numpunct_char_decimal_point(numpunct)) { + if(dest < num_end) + *dest++ = *localeconv()->decimal_point; + istreambuf_iterator_char_inc(first); + + if(dest_empty) { + for(; first->strbuf && first->val=='0'; istreambuf_iterator_char_inc(first)) + exp--; + + if(!first->strbuf || first->val<'1' || first->val>'9') + dest--; + } + } + + for(; first->strbuf; istreambuf_iterator_char_inc(first)) { + if(first->val<'0' || first->val>'9') + break; + else if(dest<num_end) + *dest++ = first->val; + else + exp--; + } + + if(first->strbuf && (first->val=='e' || first->val=='E')) { + *dest++ = first->val; + istreambuf_iterator_char_inc(first); + + if(first->strbuf && (first->val=='-' || first->val=='+')) { + *dest++ = first->val; + istreambuf_iterator_char_inc(first); + } + + error = dest_empty = TRUE; + for(; first->strbuf && first->val=='0'; istreambuf_iterator_char_inc(first)) + error = FALSE; + + for(; first->strbuf && first->val>='0' && first->val<='9'; istreambuf_iterator_char_inc(first)) { + error = dest_empty = FALSE; + if(dest<exp_end) + *dest++ = first->val; + } + + if(error) { + *dest_beg = '\0'; + return 0; + }else if(dest_empty) { + *dest++ = '0'; + } + } + + *dest++ = '\0'; + return exp; } /* ?_Getffldx@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@1AAVios_base@2@PAH@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index e6cffc7..6ac7c08 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -503,6 +503,9 @@ typedef struct { locale *loc; } basic_streambuf_char; +int __thiscall basic_streambuf_char_sgetc(basic_streambuf_char*); +int __thiscall basic_streambuf_char_sbumpc(basic_streambuf_char*); + /* class basic_streambuf<wchar> */ typedef struct { const vtable_ptr *vtable;

1 0

Piotr Caban : msvcp90: Added num_get<char> constructors implementation.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 47b7880dc309aa25880e2621d3c704c79980c639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b7880dc309aa25880e2621d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:26:02 2012 +0200 msvcp90: Added num_get<char> constructors implementation. --- dlls/msvcp90/locale.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 94b3384..103b084 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4412,7 +4412,8 @@ extern const vtable_ptr MSVCP_num_get_char_vtable; DEFINE_THISCALL_WRAPPER(num_get_char__Init, 8) void __thiscall num_get_char__Init(num_get *this, const _Locinfo *locinfo) { - FIXME("(%p %p) stub\n", this, locinfo); + TRACE("(%p %p)\n", this, locinfo); + _Locinfo__Getcvt(locinfo, &this->cvt); } /* ??0?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAE@ABV_Locinfo@1@I@Z */ @@ -4421,8 +4422,13 @@ DEFINE_THISCALL_WRAPPER(num_get_char_ctor_locinfo, 12) num_get* __thiscall num_get_char_ctor_locinfo(num_get *this, _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %lu) stub\n", this, locinfo, refs); - return NULL; + TRACE("(%p %p %lu)\n", this, locinfo, refs); + + locale_facet_ctor_refs(&this->facet, refs); + this->facet.vtable = &MSVCP_num_get_char_vtable; + + num_get_char__Init(this, locinfo); + return this; } /* ??0?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAE@I@Z */ @@ -4430,8 +4436,14 @@ num_get* __thiscall num_get_char_ctor_locinfo(num_get *this, DEFINE_THISCALL_WRAPPER(num_get_char_ctor_refs, 8) num_get* __thiscall num_get_char_ctor_refs(num_get *this, MSVCP_size_t refs) { - FIXME("(%p %lu) stub\n", this, refs); - return NULL; + _Locinfo locinfo; + + TRACE("(%p %lu)\n", this, refs); + + _Locinfo_ctor(&locinfo); + num_get_char_ctor_locinfo(this, &locinfo, refs); + _Locinfo_dtor(&locinfo); + return this; } /* ??_F?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAEXXZ */ @@ -4439,8 +4451,7 @@ num_get* __thiscall num_get_char_ctor_refs(num_get *this, MSVCP_size_t refs) DEFINE_THISCALL_WRAPPER(num_get_char_ctor, 4) num_get* __thiscall num_get_char_ctor(num_get *this) { - FIXME("(%p) stub\n", this); - return NULL; + return num_get_char_ctor_refs(this, 0); } /* ??1?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MAE@XZ */ @@ -4448,7 +4459,8 @@ num_get* __thiscall num_get_char_ctor(num_get *this) DEFINE_THISCALL_WRAPPER(num_get_char_dtor, 4) void __thiscall num_get_char_dtor(num_get *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + locale_facet_dtor(&this->facet); } DEFINE_THISCALL_WRAPPER(MSVCP_num_get_char_vector_dtor, 8) @@ -4475,8 +4487,24 @@ num_get* __thiscall MSVCP_num_get_char_vector_dtor(num_get *this, unsigned int f /* ?_Getcat@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ MSVCP_size_t __cdecl num_get_char__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return -1; + TRACE("(%p %p)\n", facet, loc); + + if(facet && !*facet) { + _Locinfo locinfo; + + *facet = MSVCRT_operator_new(sizeof(num_get)); + if(!*facet) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return 0; + } + + _Locinfo_ctor_cstr(&locinfo, MSVCP_basic_string_char_c_str(&loc->ptr->name)); + num_get_char_ctor_locinfo((num_get*)*facet, &locinfo, 0); + _Locinfo_dtor(&locinfo); + } + + return LC_NUMERIC; } /* ?_Getffld@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@1ABVlocale@2@@Z */

1 0

Piotr Caban : msvcp90: Define basic_streambuf structure globally.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 237cc9506f72c9e9d174f25875a7492023ff12e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=237cc9506f72c9e9d174f2587… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:25:44 2012 +0200 msvcp90: Define basic_streambuf structure globally. --- dlls/msvcp90/ios.c | 36 ------------------------------------ dlls/msvcp90/locale.c | 4 ++-- dlls/msvcp90/msvcp90.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9062760..5bfc4e6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -50,42 +50,6 @@ typedef struct { streamsize arg; } manip_streamsize; -typedef struct { - const vtable_ptr *vtable; - mutex lock; - char *rbuf; - char *wbuf; - char **prbuf; - char **pwbuf; - char *rpos; - char *wpos; - char **prpos; - char **pwpos; - int rsize; - int wsize; - int *prsize; - int *pwsize; - locale *loc; -} basic_streambuf_char; - -typedef struct { - const vtable_ptr *vtable; - mutex lock; - wchar_t *rbuf; - wchar_t *wbuf; - wchar_t **prbuf; - wchar_t **pwbuf; - wchar_t *rpos; - wchar_t *wpos; - wchar_t **prpos; - wchar_t **pwpos; - int rsize; - int wsize; - int *prsize; - int *pwsize; - locale *loc; -} basic_streambuf_wchar; - typedef enum { INITFL_new = 0, INITFL_open = 1, diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ca26378..94b3384 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -104,14 +104,14 @@ typedef struct { typedef struct _istreambuf_iterator_char { - struct _basic_streambuf_char *strbuf; + basic_streambuf_char *strbuf; MSVCP_bool got; char val; } istreambuf_iterator_char; typedef struct _istreambuf_iterator_wchar { - struct _basic_streambuf_wchar *strbuf; + basic_streambuf_wchar *strbuf; MSVCP_bool got; wchar_t val; } istreambuf_iterator_wchar; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 2dde330..e6cffc7 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -484,5 +484,43 @@ typedef struct _ios_base { locale *loc; } ios_base; +/* class basic_streambuf<char> */ +typedef struct { + const vtable_ptr *vtable; + mutex lock; + char *rbuf; + char *wbuf; + char **prbuf; + char **pwbuf; + char *rpos; + char *wpos; + char **prpos; + char **pwpos; + int rsize; + int wsize; + int *prsize; + int *pwsize; + locale *loc; +} basic_streambuf_char; + +/* class basic_streambuf<wchar> */ +typedef struct { + const vtable_ptr *vtable; + mutex lock; + wchar_t *rbuf; + wchar_t *wbuf; + wchar_t **prbuf; + wchar_t **pwbuf; + wchar_t *rpos; + wchar_t *wpos; + wchar_t **prpos; + wchar_t **pwpos; + int rsize; + int wsize; + int *prsize; + int *pwsize; + locale *loc; +} basic_streambuf_wchar; + void init_io(void); void free_io(void);

1 0

Piotr Caban : msvcp90: Define ios_base structure globally.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 05a70c3d19a7fc4b4da13abebf6c98f0895d7ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a70c3d19a7fc4b4da13abeb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:25:23 2012 +0200 msvcp90: Define ios_base structure globally. --- dlls/msvcp90/ios.c | 86 ---------------------------------------------- dlls/msvcp90/locale.c | 89 +++++++++++++++++++++++------------------------ dlls/msvcp90/msvcp90.h | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05a70c3d19a7fc4b4da13…

1 0

Piotr Caban : msvcp90: Separate num_get::get(long double) and num_get::get( double) functions.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 95ec1f07fcc43b75ec2979056f3c05ee7ba7f09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ec1f07fcc43b75ec2979056… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:25:09 2012 +0200 msvcp90: Separate num_get::get(long double) and num_get::get(double) functions. --- dlls/msvcp90/locale.c | 20 ++++++++++++++++++-- dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95ec1f07fcc43b75ec297…

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012