April 2012 - Wine-Commits - list.winehq.org

Huw Davies : wineps: Retrieve the printer's devmode using GetPrinter.
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: a7f42d32810d7720b9a451daad070bdebac3792c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f42d32810d7720b9a451daa… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:19 2012 +0100 wineps: Retrieve the printer's devmode using GetPrinter. --- dlls/wineps.drv/init.c | 80 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index affbcbc..cc950e3 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -555,6 +555,61 @@ static PRINTER_ENUM_VALUESA *load_font_sub_table( HANDLE printer, DWORD *num_ent return table; } +static PSDRV_DEVMODEA *get_printer_devmode( HANDLE printer ) +{ + DWORD needed, dm_size; + BOOL res; + PRINTER_INFO_9A *info; + PSDRV_DEVMODEA *dm; + + GetPrinterA( printer, 9, NULL, 0, &needed ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; + + info = HeapAlloc( PSDRV_Heap, 0, needed ); + res = GetPrinterA( printer, 9, (BYTE *)info, needed, &needed ); + if (!res || !info->pDevMode) + { + HeapFree( PSDRV_Heap, 0, info ); + return NULL; + } + + /* sanity check the sizes */ + dm_size = info->pDevMode->dmSize + info->pDevMode->dmDriverExtra; + if ((char *)info->pDevMode - (char *)info + dm_size > needed) + { + HeapFree( PSDRV_Heap, 0, info ); + return NULL; + } + + dm = (PSDRV_DEVMODEA*)info; + memmove( dm, info->pDevMode, dm_size ); + return dm; +} + +static PSDRV_DEVMODEA *get_devmode( HANDLE printer, const char *nameA, BOOL *is_default ) +{ + PSDRV_DEVMODEA *dm = get_printer_devmode( printer ); + + *is_default = FALSE; + + if (dm && dm->dmPublic.dmSize + dm->dmPublic.dmDriverExtra >= sizeof(DefaultDevmode)) + { + TRACE( "Retrieved devmode from winspool\n" ); + return dm; + } + HeapFree( PSDRV_Heap, 0, dm ); + + TRACE( "Using default devmode\n" ); + dm = HeapAlloc( PSDRV_Heap, 0, sizeof(DefaultDevmode) ); + if (dm) + { + *dm = DefaultDevmode; + lstrcpynA((LPSTR)dm->dmPublic.dmDeviceName, nameA, CCHDEVICENAME); + *is_default = TRUE; + } + return dm; +} + static struct list printer_list = LIST_INIT( printer_list ); /********************************************************************** @@ -562,7 +617,7 @@ static struct list printer_list = LIST_INIT( printer_list ); */ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) { - DWORD type = REG_BINARY, needed, res, dwPaperSize; + DWORD needed, res, dwPaperSize; PRINTERINFO *pi; FONTNAME *font; const AFM *afm; @@ -597,27 +652,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) nameA = HeapAlloc( GetProcessHeap(), 0, len ); WideCharToMultiByte( CP_ACP, 0, name, -1, nameA, len, NULL, NULL ); - needed = 0; - res = GetPrinterDataExA(hPrinter, NULL, default_devmodeA, &type, NULL, 0, &needed); - - if (needed < sizeof(DefaultDevmode)) { - pi->Devmode = HeapAlloc( PSDRV_Heap, 0, sizeof(DefaultDevmode) ); - if (pi->Devmode == NULL) - goto closeprinter; - - *pi->Devmode = DefaultDevmode; - lstrcpynA((LPSTR)pi->Devmode->dmPublic.dmDeviceName, nameA, CCHDEVICENAME); - using_default_devmode = TRUE; - } - else { - pi->Devmode = HeapAlloc( PSDRV_Heap, 0, needed ); - if (pi->Devmode == NULL) - goto closeprinter; - - GetPrinterDataExA(hPrinter, NULL, default_devmodeA, &type, (LPBYTE)pi->Devmode, needed, &needed); - } - - + pi->Devmode = get_devmode( hPrinter, nameA, &using_default_devmode ); + if (!pi->Devmode) goto closeprinter; #ifdef SONAME_LIBCUPS if (cupshandle != (void*)-1) {

1 0

Piotr Caban : msvcrt: Set correct date and time format for C locale.
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: 426e58be698e818ee06ae2b1eebaf51a9aa83245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426e58be698e818ee06ae2b1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:22:02 2012 +0200 msvcrt: Set correct date and time format for C locale. --- dlls/msvcrt/locale.c | 70 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 53 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 699b028..678550a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -761,6 +761,12 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) static const char monetary[] = "MONETARY="; static const char numeric[] = "NUMERIC="; static const char time[] = "TIME="; + static const char cloc_short_date[] = "MM/dd/yy"; + static const MSVCRT_wchar_t cloc_short_dateW[] = {'M','M','/','d','d','/','y','y',0}; + static const char cloc_long_date[] = "dddd, MMMM dd, yyyy"; + static const MSVCRT_wchar_t cloc_long_dateW[] = {'d','d','d','d',',',' ','M','M','M','M',' ','d','d',',',' ','y','y','y','y',0}; + static const char cloc_time[] = "HH:mm:ss"; + static const MSVCRT_wchar_t cloc_timeW[] = {'H','H',':','m','m',':','s','s',0}; MSVCRT__locale_t loc; LCID lcid[6] = { 0 }; @@ -1205,21 +1211,29 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) size = sizeof(MSVCRT___lc_time_data); for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { - ret = GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i] - |LOCALE_NOUSEROVERRIDE, NULL, 0); - if(!ret) { - MSVCRT__free_locale(loc); - return NULL; - } - size += ret; + if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + size += sizeof(cloc_short_date) + sizeof(cloc_short_dateW); + }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW); + }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { + size += sizeof(cloc_time) + sizeof(cloc_timeW); + }else { + ret = GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i] + |LOCALE_NOUSEROVERRIDE, NULL, 0); + if(!ret) { + MSVCRT__free_locale(loc); + return NULL; + } + size += ret; - ret = GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i] - |LOCALE_NOUSEROVERRIDE, NULL, 0); - if(!ret) { - MSVCRT__free_locale(loc); - return NULL; + ret = GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i] + |LOCALE_NOUSEROVERRIDE, NULL, 0); + if(!ret) { + MSVCRT__free_locale(loc); + return NULL; + } + size += ret*sizeof(MSVCRT_wchar_t); } - size += ret*sizeof(MSVCRT_wchar_t); } loc->locinfo->lc_time_curr = MSVCRT_malloc(size); @@ -1231,13 +1245,35 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) ret = 0; for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { loc->locinfo->lc_time_curr->str[i] = &loc->locinfo->lc_time_curr->data[ret]; - ret += GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, - &loc->locinfo->lc_time_curr->data[ret], size-ret); + if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_date, sizeof(cloc_short_date)); + ret += sizeof(cloc_short_date); + }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_long_date, sizeof(cloc_long_date)); + ret += sizeof(cloc_long_date); + }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_time, sizeof(cloc_time)); + ret += sizeof(cloc_time); + }else { + ret += GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, + &loc->locinfo->lc_time_curr->data[ret], size-ret); + } } for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { loc->locinfo->lc_time_curr->wstr[i] = (MSVCRT_wchar_t*)&loc->locinfo->lc_time_curr->data[ret]; - ret += GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, - (MSVCRT_wchar_t*)&loc->locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); + if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_dateW, sizeof(cloc_short_dateW)); + ret += sizeof(cloc_short_dateW); + }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_long_dateW, sizeof(cloc_long_dateW)); + ret += sizeof(cloc_long_dateW); + }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_timeW, sizeof(cloc_timeW)); + ret += sizeof(cloc_timeW); + }else { + ret += GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, + (MSVCRT_wchar_t*)&loc->locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); + } } loc->locinfo->lc_time_curr->lcid = lcid[MSVCRT_LC_TIME];

1 0

Piotr Caban : msvcrt: Added field names to MSVCRT___lc_time_data structure.
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: b58cfb40b9ca4dccac459d2a184ff5cd2e1d3895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b58cfb40b9ca4dccac459d2a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:22:12 2012 +0200 msvcrt: Added field names to MSVCRT___lc_time_data structure. --- dlls/msvcrt/locale.c | 32 +++++++++++++++----------------- dlls/msvcrt/msvcrt.h | 26 ++++++++++++++------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 678550a..a24a5b9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -427,7 +427,7 @@ char* CDECL _Getdays(void) TRACE("\n"); - size = cur->str[2*7]-cur->str[0]; + size = cur->str.names.short_mon[0]-cur->str.names.short_wday[0]; out = MSVCRT_malloc(size+1); if(!out) return NULL; @@ -435,13 +435,13 @@ char* CDECL _Getdays(void) size = 0; for(i=0; i<7; i++) { out[size++] = ':'; - len = strlen(cur->str[i]); - memcpy(&out[size], cur->str[i], len); + len = strlen(cur->str.names.short_wday[i]); + memcpy(&out[size], cur->str.names.short_wday[i], len); size += len; out[size++] = ':'; - len = strlen(cur->str[7+i]); - memcpy(&out[size], cur->str[7+i], len); + len = strlen(cur->str.names.wday[i]); + memcpy(&out[size], cur->str.names.wday[i], len); size += len; } out[size] = '\0'; @@ -454,15 +454,13 @@ char* CDECL _Getdays(void) */ char* CDECL _Getmonths(void) { - static const int months_offset = 14; - MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; int i, len, size; char *out; TRACE("\n"); - size = cur->str[months_offset+2*12]-cur->str[months_offset]; + size = cur->str.names.am-cur->str.names.short_mon[0]; out = MSVCRT_malloc(size+1); if(!out) return NULL; @@ -470,13 +468,13 @@ char* CDECL _Getmonths(void) size = 0; for(i=0; i<12; i++) { out[size++] = ':'; - len = strlen(cur->str[months_offset+i]); - memcpy(&out[size], cur->str[months_offset+i], len); + len = strlen(cur->str.names.short_mon[i]); + memcpy(&out[size], cur->str.names.short_mon[i], len); size += len; out[size++] = ':'; - len = strlen(cur->str[months_offset+12+i]); - memcpy(&out[size], cur->str[months_offset+12+i], len); + len = strlen(cur->str.names.mon[i]); + memcpy(&out[size], cur->str.names.mon[i], len); size += len; } out[size] = '\0'; @@ -494,8 +492,8 @@ void* CDECL _Gettnames(void) TRACE("\n"); - for(i=0; i<sizeof(cur->str)/sizeof(cur->str[0]); i++) - size += strlen(cur->str[i])+1; + for(i=0; i<sizeof(cur->str.str)/sizeof(cur->str.str[0]); i++) + size += strlen(cur->str.str[i])+1; ret = MSVCRT_malloc(size); if(!ret) @@ -503,8 +501,8 @@ void* CDECL _Gettnames(void) memcpy(ret, cur, size); size = 0; - for(i=0; i<sizeof(cur->str)/sizeof(cur->str[0]); i++) { - ret->str[i] = &ret->data[size]; + for(i=0; i<sizeof(cur->str.str)/sizeof(cur->str.str[0]); i++) { + ret->str.str[i] = &ret->data[size]; size += strlen(&ret->data[size])+1; } @@ -1244,7 +1242,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) ret = 0; for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { - loc->locinfo->lc_time_curr->str[i] = &loc->locinfo->lc_time_curr->data[ret]; + loc->locinfo->lc_time_curr->str.str[i] = &loc->locinfo->lc_time_curr->data[ret]; if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_date, sizeof(cloc_short_date)); ret += sizeof(cloc_short_date); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 26a1177..0fd3410 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -109,18 +109,20 @@ typedef struct MSVCRT_tagLC_ID { } MSVCRT_LC_ID, *MSVCRT_LPLC_ID; typedef struct { - /* str table contains following strings: - * short weekday names [7]; - * weekday names [7]; - * short month names [12]; - * month names [12]; - * s1159 (AM); - * s2359 (PM); - * short date format; - * date format; - * time format; - */ - char *str[43]; + union { + char *str[43]; + struct { + char *short_wday[7]; + char *wday[7]; + char *short_mon[12]; + char *mon[12]; + char *am; + char *pm; + char *short_date; + char *date; + char *time; + } names; + } str; LCID lcid; int unk[2]; MSVCRT_wchar_t *wstr[43];

1 0

Piotr Caban : msvcrt: Added _Strftime implementation.
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: ef08e807651bcb7687e1a68660fc83e3931dc30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef08e807651bcb7687e1a6866… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:22:25 2012 +0200 msvcrt: Added _Strftime implementation. --- dlls/msvcrt/locale.c | 11 -- dlls/msvcrt/tests/time.c | 3 - dlls/msvcrt/time.c | 279 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 272 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef08e807651bcb7687e1a…

1 0

Piotr Caban : msvcrt/tests: Added more strftime tests.
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: 43d208d215fa1a344fddbd7d9c4eebd9b716f23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d208d215fa1a344fddbd7d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:22:44 2012 +0200 msvcrt/tests: Added more strftime tests. --- dlls/msvcrt/tests/time.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 36ef8eb..6fb7491 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -599,9 +599,47 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = strftime(NULL, 0, "copy", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + + retA = strftime(bufA, 256, "copy", NULL); + ok(retA == 4, "expected 4, got %ld\n", retA); + ok(!strcmp(bufA, "copy"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "copy it", gmt_tm); + ok(retA == 7, "expected 7, got %ld\n", retA); + ok(!strcmp(bufA, "copy it"), "got %s\n", bufA); + + errno = 0xdeadbeef; + retA = strftime(bufA, 2, "copy", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(!strcmp(bufA, "") || broken(!strcmp(bufA, "copy it")), "got %s\n", bufA); + ok(errno==ERANGE || errno==0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + retA = strftime(bufA, 256, "a%e", gmt_tm); + ok(retA==0 || broken(retA==1), "expected 0, got %ld\n", retA); + ok(!strcmp(bufA, "") || broken(!strcmp(bufA, "a")), "got %s\n", bufA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + + if(0) { /* crashes on Win2k */ + errno = 0xdeadbeef; + retA = strftime(bufA, 256, "%c", NULL); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(!strcmp(bufA, ""), "got %s\n", bufA); + ok(errno == EINVAL, "errno = %d\n", errno); + } + + retA = strftime(bufA, 256, "e%#%e", gmt_tm); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "e%e"), "got %s\n", bufA); + retA = strftime(bufA, 256, "%c", gmt_tm); ok(retA == 17, "expected 17, got %ld\n", retA); ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA); + retW = wcsftime(bufW, 256, cW, gmt_tm); ok(retW == 17, "expected 17, got %ld\n", retW); ok(retA == retW, "expected %ld, got %ld\n", retA, retW); @@ -609,6 +647,70 @@ static void test_strftime(void) retA = WideCharToMultiByte(CP_ACP, 0, bufW, retW, buf, 256, NULL, NULL); buf[retA] = 0; ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); + + retA = strftime(bufA, 256, "%x", gmt_tm); + ok(retA == 8, "expected 8, got %ld\n", retA); + ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%X", gmt_tm); + ok(retA == 8, "expected 8, got %ld\n", retA); + ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%a", gmt_tm); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "Thu"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%A", gmt_tm); + ok(retA == 8, "expected 8, got %ld\n", retA); + ok(!strcmp(bufA, "Thursday"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%b", gmt_tm); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%B", gmt_tm); + ok(retA == 7, "expected 7, got %ld\n", retA); + ok(!strcmp(bufA, "January"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%d", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%#d", gmt_tm); + ok(retA == 1, "expected 1, got %ld\n", retA); + ok(!strcmp(bufA, "1"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%H", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%I", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "12"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%j", gmt_tm); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "001"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%m", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%#M", gmt_tm); + ok(retA == 1, "expected 1, got %ld\n", retA); + ok(!strcmp(bufA, "0"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%p", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "AM"), "got %s\n", bufA); + + gmt_tm->tm_mon = 1; + gmt_tm->tm_mday = 30; + retA = strftime(bufA, 256, "%c", gmt_tm); + todo_wine { + ok(retA == 17, "expected 17, got %ld\n", retA); + ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA); + } } static void test_asctime(void)

1 0

Christian Costa : dmusic: Replace debugstr_DMUS_OBJECTDESC by a specific dump function to avoid debug buffer overflow .
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: 7a772ed83a99c5b516e6500d544885dda6deedbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a772ed83a99c5b516e6500d5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 10 22:30:21 2012 +0200 dmusic: Replace debugstr_DMUS_OBJECTDESC by a specific dump function to avoid debug buffer overflow. --- dlls/dmusic/collection.c | 30 +++++++++++++++++++++++------- dlls/dmusic/dmusic_main.c | 39 ++++++++++++++++----------------------- dlls/dmusic/dmusic_private.h | 6 +++--- 3 files changed, 42 insertions(+), 33 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index faafd64..3d9dc18 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -189,9 +189,20 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { +static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor(LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) +{ ICOM_THIS_MULTI(IDirectMusicCollectionImpl, ObjectVtbl, iface); - TRACE("(%p, %p): setting descriptor:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC (pDesc)); + + TRACE("(%p, %p)\n", iface, pDesc); + + if (!pDesc) + return E_POINTER; + + if (TRACE_ON(dmusic)) + { + TRACE("Setting descriptor:\n"); + dump_DMUS_OBJECTDESC(pDesc); + } /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) @@ -223,7 +234,8 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor (LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) { +static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor(LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) +{ ICOM_THIS_MULTI(IDirectMusicCollectionImpl, ObjectVtbl, iface); DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; @@ -384,10 +396,14 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ return DMUS_E_INVALIDFILE; } - } - - TRACE(": returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (pDesc)); - + } + + if (TRACE_ON(dmusic)) + { + TRACE("Returning descriptor:\n"); + dump_DMUS_OBJECTDESC(pDesc); + } + return S_OK; } diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 723b90a..be6fb56 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -446,27 +446,20 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); } -/* dump whole DMUS_OBJECTDESC struct */ -const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = %d\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = FIXME\n"); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return wine_dbg_sprintf("(NULL)"); - } +/* Dump whole DMUS_OBJECTDESC struct */ +void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) +{ + TRACE("DMUS_OBJECTDESC (%p):\n", desc); + TRACE(" - dwSize = %d\n", desc->dwSize); + TRACE(" - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (desc->dwValidData)); + if (desc->dwValidData & DMUS_OBJ_CLASS) TRACE(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + if (desc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = FIXME\n"); + if (desc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&desc->vVersion)); + if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index c05adf0..498df9e 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -274,7 +274,7 @@ extern int even_or_odd (DWORD number) DECLSPEC_HIDDEN; extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; -/* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +/* Dump whole DMUS_OBJECTDESC struct */ +extern void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) DECLSPEC_HIDDEN; -#endif /* __WINE_DMUSIC_PRIVATE_H */ +#endif /* __WINE_DMUSIC_PRIVATE_H */

1 0

Christian Costa : kernel32: Limit dwTotalPageFile in GlobalMemoryStatus to 4Gb minus 512kb for apps that do not expect so much memory .
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: d8822cf3d2708dccb3e04d72ddf73662e7992f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8822cf3d2708dccb3e04d72d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 10 22:04:30 2012 +0200 kernel32: Limit dwTotalPageFile in GlobalMemoryStatus to 4Gb minus 512kb for apps that do not expect so much memory. --- dlls/kernel32/heap.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index db21b7a..d730a8a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1305,7 +1305,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) * roughly how much they are able to allocate * * RETURNS - * None + * None */ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) { @@ -1333,13 +1333,14 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) { lpBuffer->dwTotalPhys = min( memstatus.ullTotalPhys, MAXDWORD ); lpBuffer->dwAvailPhys = min( memstatus.ullAvailPhys, MAXDWORD ); - lpBuffer->dwTotalPageFile = min( memstatus.ullTotalPageFile, MAXDWORD ); + /* Limit value for apps that do not expect so much memory. Remove last 512 kb to make Sacrifice demo happy. */ + lpBuffer->dwTotalPageFile = min( memstatus.ullTotalPageFile, 0xfff7ffff ); lpBuffer->dwAvailPageFile = min( memstatus.ullAvailPageFile, MAXDWORD ); lpBuffer->dwTotalVirtual = min( memstatus.ullTotalVirtual, MAXDWORD ); lpBuffer->dwAvailVirtual = min( memstatus.ullAvailVirtual, MAXDWORD ); } - else /* duplicate NT bug */ + else /* duplicate NT bug */ { lpBuffer->dwTotalPhys = memstatus.ullTotalPhys; lpBuffer->dwAvailPhys = memstatus.ullAvailPhys;

1 0

Huw Davies : wineps: Move the constraints list to a standard list.
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: 4dfef2ef2d1743e3f47d59f4ed83c1b41d3d1db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfef2ef2d1743e3f47d59f4e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:15 2012 +0100 wineps: Move the constraints list to a standard list. --- dlls/wineps.drv/ppd.c | 19 ++++++++----------- dlls/wineps.drv/psdrv.h | 7 ++++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 3f2c473..37c6094 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -634,6 +634,7 @@ PPD *PSDRV_ParsePPD(char *fname) list_init( &ppd->InstalledFonts ); list_init( &ppd->PageSizes ); + list_init( &ppd->Constraints ); /* * The Windows PostScript drivers create the following "virtual bin" for @@ -812,23 +813,19 @@ PPD *PSDRV_ParsePPD(char *fname) ppd->LandscapeOrientation); } - else if(!strcmp("*UIConstraints", tuple.key)) { + else if(!strcmp("*UIConstraints", tuple.key)) + { char *start; - CONSTRAINT *con, **insert = &ppd->Constraints; - - while(*insert) - insert = &((*insert)->next); - - con = *insert = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, - sizeof(*con) ); + CONSTRAINT *con = HeapAlloc( PSDRV_Heap, 0, sizeof(*con) ); start = tuple.value; - con->Feature1 = PSDRV_PPDGetWord(start, &start); con->Value1 = PSDRV_PPDGetWord(start, &start); con->Feature2 = PSDRV_PPDGetWord(start, &start); con->Value2 = PSDRV_PPDGetWord(start, &start); - } + + list_add_tail( &ppd->Constraints, &con->entry ); + } else if (!strcmp("*InputSlot", tuple.key)) { @@ -992,7 +989,7 @@ PPD *PSDRV_ParsePPD(char *fname) page->PaperDimension->x, page->PaperDimension->y); } - for(con = ppd->Constraints; con; con = con->next) + LIST_FOR_EACH_ENTRY( con, &ppd->Constraints, CONSTRAINT, entry ) TRACE("CONSTRAINTS@ %s %s %s %s\n", con->Feature1, con->Value1, con->Feature2, con->Value2); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index a4ac759..a240f4f 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -168,12 +168,13 @@ typedef struct _tagOPTION { /* Treat bool as a special case of pickone */ struct _tagOPTION *next; } OPTION; -typedef struct _tagCONSTRAINT { +typedef struct +{ + struct list entry; char *Feature1; char *Value1; char *Feature2; char *Value2; - struct _tagCONSTRAINT *next; } CONSTRAINT; typedef struct _tagINPUTSLOT { @@ -218,7 +219,7 @@ typedef struct { struct list PageSizes; PAGESIZE *DefaultPageSize; OPTION *InstalledOptions; - CONSTRAINT *Constraints; + struct list Constraints; INPUTSLOT *InputSlots; RASTERIZEROPTION TTRasterizer; DUPLEX *Duplexes;

1 0

Huw Davies : wineps: Move the installed font list to a standard list.
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: 4ff9b7f11a92091c0485504f1a750e9b37844064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff9b7f11a92091c0485504f1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:14 2012 +0100 wineps: Move the installed font list to a standard list. --- dlls/wineps.drv/init.c | 3 ++- dlls/wineps.drv/ppd.c | 32 ++++++++++++-------------------- dlls/wineps.drv/psdrv.h | 7 ++++--- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0c06ecb..affbcbc 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -773,7 +773,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Fonts = NULL; - for(font = pi->ppd->InstalledFonts; font; font = font->next) { + LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry ) + { afm = PSDRV_FindAFMinList(PSDRV_AFMFontList, font->Name); if(!afm) { TRACE( "Couldn't find AFM file for installed printer font '%s' - " diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index c2c422d..3f2c473 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -631,7 +631,9 @@ PPD *PSDRV_ParsePPD(char *fname) } ppd->ColorDevice = CD_NotSpecified; - list_init(&ppd->PageSizes); + + list_init( &ppd->InstalledFonts ); + list_init( &ppd->PageSizes ); /* * The Windows PostScript drivers create the following "virtual bin" for @@ -678,23 +680,13 @@ PPD *PSDRV_ParsePPD(char *fname) WARN("failed to parse DefaultResolution %s\n", debugstr_a(tuple.value)); } - else if(!strcmp("*Font", tuple.key)) { - FONTNAME *fn; - - for(fn = ppd->InstalledFonts; fn && fn->next; fn = fn->next) - ; - if(!fn) { - ppd->InstalledFonts = HeapAlloc(PSDRV_Heap, - HEAP_ZERO_MEMORY, sizeof(*fn)); - fn = ppd->InstalledFonts; - } else { - fn->next = HeapAlloc(PSDRV_Heap, - HEAP_ZERO_MEMORY, sizeof(*fn)); - fn = fn->next; - } - fn->Name = tuple.option; - tuple.option = NULL; - } + else if(!strcmp("*Font", tuple.key)) + { + FONTNAME *fn = HeapAlloc( PSDRV_Heap, 0, sizeof(*fn) ); + fn->Name = tuple.option; + tuple.option = NULL; + list_add_tail( &ppd->InstalledFonts, &fn->entry ); + } else if(!strcmp("*DefaultFont", tuple.key)) { ppd->DefaultFont = tuple.value; @@ -985,8 +977,8 @@ PPD *PSDRV_ParsePPD(char *fname) OPTION *option; OPTIONENTRY *optionEntry; - for(fn = ppd->InstalledFonts; fn; fn = fn->next) - TRACE("'%s'\n", fn->Name); + LIST_FOR_EACH_ENTRY( fn, &ppd->InstalledFonts, FONTNAME, entry ) + TRACE("'%s'\n", fn->Name); LIST_FOR_EACH_ENTRY(page, &ppd->PageSizes, PAGESIZE, entry) { TRACE("'%s' aka '%s' (%d) invoked by '%s'\n", page->Name, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index df86c70..a4ac759 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -118,9 +118,10 @@ typedef struct _tagFONTFAMILY { extern FONTFAMILY *PSDRV_AFMFontList DECLSPEC_HIDDEN; extern const AFM *const PSDRV_BuiltinAFMs[] DECLSPEC_HIDDEN; /* last element is NULL */ -typedef struct _tagFONTNAME { +typedef struct +{ + struct list entry; char *Name; - struct _tagFONTNAME *next; } FONTNAME; typedef struct { @@ -213,7 +214,7 @@ typedef struct { char *JCLToPSInterpreter; char *JCLEnd; char *DefaultFont; - FONTNAME *InstalledFonts; /* ptr to a list of FontNames */ + struct list InstalledFonts; struct list PageSizes; PAGESIZE *DefaultPageSize; OPTION *InstalledOptions;

1 0

Dmitry Timoshkov : fonts: Update cyrillic bitmap glyphs in Tahoma Bold.
by Alexandre Julliard April 11, 2012

April 11, 2012

Module: wine Branch: master Commit: 4f819f8efcd08e29a1a7650300e204839b43af2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f819f8efcd08e29a1a765030… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 11 19:09:53 2012 +0900 fonts: Update cyrillic bitmap glyphs in Tahoma Bold. --- fonts/tahomabd.sfd | 274 ++++++++++++++++++++++++++-------------------------- fonts/tahomabd.ttf | Bin 86440 -> 86520 bytes 2 files changed, 137 insertions(+), 137 deletions(-) diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index bdb7651..d3b6cbe 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -95,7 +95,7 @@ NameList: Adobe Glyph List DisplaySize: 9 AntiAlias: 1 FitToEm: 1 -WinInfo: 56 56 19 +WinInfo: 0 53 17 BeginPrivate: 10 BlueValues 27 [-30 0 1120 1177 1522 1522] OtherBlues 11 [-426 -426] @@ -10883,142 +10883,142 @@ BDFChar: 336 370 7 0 5 -2 6 bfn;Tbfk;c2uipY BDFChar: 337 371 6 0 4 -2 4 f\"j/GRt\l -BDFChar: 338 1040 6 0 4 0 6 -+Abm2G_h.U -BDFChar: 339 1041 6 1 5 0 6 -n:6&YOGNB+ -BDFChar: 340 1042 6 1 5 0 6 -n;raiOGNB+ -BDFChar: 341 1043 5 1 4 0 6 -n:6%>J:N.M -BDFChar: 342 1044 7 0 5 -1 6 -3(QS284`Z3 -BDFChar: 343 1045 6 1 4 0 6 -n:6&YJ:R+h -BDFChar: 344 1046 9 0 7 0 6 -JPn<e1fAl) -BDFChar: 345 1047 6 1 4 0 6 -i"-IX&.mb" -BDFChar: 346 1048 7 0 4 0 6 -#ah!XW5q4( -BDFChar: 347 1049 7 0 4 0 8 -5VN0DR&Ht)5QCca -BDFChar: 348 1050 6 1 5 0 6 -Lle:FTTGN@ +BDFChar: 338 1040 8 0 6 0 6 +3&k_jI)a/+ +BDFChar: 339 1041 7 0 5 0 6 +pqX]?bfoh^ +BDFChar: 340 1042 7 0 5 0 6 +prptWbfoh^ +BDFChar: 341 1043 6 0 4 0 6 +pqX\\^qd_c +BDFChar: 342 1044 8 0 6 -1 6 +4D\hMCi'*j +BDFChar: 343 1045 6 0 4 0 6 +pqX]?^qf^F +BDFChar: 344 1046 11 0 9 0 6 +beS(GD1FhND1HJRbeO2Y +BDFChar: 345 1047 7 0 5 0 6 +Gg$S@%*Wqr +BDFChar: 346 1048 7 0 5 0 6 +bhV"Om-Mpr +BDFChar: 347 1049 7 0 5 0 8 +82/9Ch#-O*bQ%VC +BDFChar: 348 1050 7 0 5 0 6 +bfn`/fZ_P> BDFChar: 349 1051 7 0 5 0 6 -4<u0t,XfQN -BDFChar: 350 1052 8 1 5 0 6 -LtLADW/-60 -BDFChar: 351 1053 7 1 4 0 6 -OH>RnOH>P( -BDFChar: 352 1054 7 0 5 0 6 -GfYPkKS4RM -BDFChar: 353 1055 7 1 4 0 6 -n;r`nOH>P( -BDFChar: 354 1056 6 1 4 0 6 -i/j%^i.-=X -BDFChar: 355 1057 6 0 4 0 6 -Geei[J:MkE -BDFChar: 356 1058 6 0 4 0 6 -p`L\%+<Vd, -BDFChar: 357 1059 6 0 4 0 6 -Le(?=+<WoL -BDFChar: 358 1060 8 0 5 0 6 -&:B_,PZ0UB -BDFChar: 359 1061 6 0 4 0 6 -Le(>b:f)rJ -BDFChar: 360 1062 7 1 5 -2 6 -J<5kSOHB5C#QOi) -BDFChar: 361 1063 6 1 4 0 6 -OH>QcE"EQ\ -BDFChar: 362 1064 10 1 7 0 6 -P*1ukP*5eE -BDFChar: 363 1065 10 1 8 -2 6 -P*1ukP*5hG!<<*" -BDFChar: 364 1066 7 0 5 0 6 -i#j.),U>JP -BDFChar: 365 1067 9 0 5 0 6 -KS5$NPa(e? -BDFChar: 366 1068 6 1 4 0 6 -J:N1.OHAB# -BDFChar: 367 1069 6 0 4 0 6 -@$h4E#RKo" -BDFChar: 368 1070 10 1 7 0 6 -]]?rH_SWqc -BDFChar: 369 1071 6 0 4 0 6 -3(SirGY!Vj -BDFChar: 370 1072 5 0 3 0 4 -?k@:=n,NFg -BDFChar: 371 1073 6 0 4 0 6 -0L.mBLkp!M -BDFChar: 372 1074 5 0 3 0 4 -n;uRin,NFg -BDFChar: 373 1075 4 0 2 0 4 -i.-?.J,fQL -BDFChar: 374 1076 6 0 4 -1 4 -E)9A-pkSnM -BDFChar: 375 1077 5 0 4 0 4 -E/=:>GQ7^D -BDFChar: 376 1078 8 0 5 0 4 -<*2+^PQ1[` -BDFChar: 377 1079 5 0 3 0 4 -E"HCgn,NFg -BDFChar: 378 1080 6 0 3 0 4 -&?rCc5QCca -BDFChar: 379 1081 6 0 3 0 6 -:gaj=Yg>W8 -BDFChar: 380 1082 5 1 4 0 4 -TV0)nO8o7\ -BDFChar: 381 1083 6 -1 3 0 4 -3(QS2a8c2? -BDFChar: 382 1084 7 0 4 0 4 -8D(G.#QOi) -BDFChar: 383 1085 6 0 3 1 3 -ODp9] +Hu*V8Ci%;q +BDFChar: 350 1052 9 0 7 0 6 +_rp4_gV^o/ +BDFChar: 351 1053 7 0 5 0 6 +bfn</bfn92 +BDFChar: 352 1054 8 0 6 0 6 +I)a1G`l<B+ +BDFChar: 353 1055 7 0 5 0 6 +r63C/bfn92 +BDFChar: 354 1056 7 0 5 0 6 +prpt+pqXZF +BDFChar: 355 1057 7 0 5 0 6 +Gg*t=^s%$' +BDFChar: 356 1058 7 0 5 0 6 +r%KfY0JG0\ +BDFChar: 357 1059 7 0 5 0 6 +bfjm:3&'7j +BDFChar: 358 1060 9 0 7 0 6 +(k15ogO9t> +BDFChar: 359 1061 7 0 5 0 6 +bfk;cGg+A3 +BDFChar: 360 1062 8 0 6 -2 6 +bfn;Tbfp%j"onW' +BDFChar: 361 1063 7 0 5 0 6 +bfn;THjgD` +BDFChar: 362 1064 11 0 9 0 6 +beVH<beVH<beVH<s1eU7 +BDFChar: 363 1065 11 0 10 -2 6 +beVH<beVH<beVH<s53lb!+5d, +BDFChar: 364 1066 8 0 6 0 6 +i*^qEAnHDj +BDFChar: 365 1067 10 0 8 0 6 +_19(a)Pq1-_?c%+&hq1&GF +BDFChar: 366 1068 7 0 5 0 6 +^qf`hbfoh^ +BDFChar: 367 1069 7 0 5 0 6 +Gg$SD%*Wqr +BDFChar: 368 1070 10 0 8 0 6 +cN)XKfmrmKfmqb+cN!qF +BDFChar: 369 1071 6 0 5 0 6 +I*BgYHu.", +BDFChar: 370 1072 6 0 4 0 4 +E#<iPGQ7^D +BDFChar: 371 1073 7 0 5 0 6 +(i[:cbfk;3 +BDFChar: 372 1074 6 0 4 0 4 +nC[6_n,NFg +BDFChar: 373 1075 5 0 3 0 4 +nA)iT^]4?7 +BDFChar: 374 1076 7 0 6 -1 4 +Hu*V8rl+p< +BDFChar: 375 1077 6 0 4 0 4 +E7js$GQ7^D +BDFChar: 376 1078 8 0 6 0 4 +epKH)ec5[M +BDFChar: 377 1079 6 0 4 0 4 +n/-*]n,NFg +BDFChar: 378 1080 7 0 5 0 4 +bhW-_bQ%VC +BDFChar: 379 1081 7 0 5 0 6 +82/9Cr9VW- +BDFChar: 380 1082 5 0 4 0 4 +f^RhgfDkmO +BDFChar: 381 1083 7 0 5 0 4 +4D\hMbQ%VC +BDFChar: 382 1084 8 0 6 0 4 +`pWiW`W,u= +BDFChar: 383 1085 7 0 5 0 4 +bfp"/bQ%VC BDFChar: 384 1086 6 0 4 0 4 -E/9=+Du]k< -BDFChar: 385 1087 6 0 3 1 4 -E0-0C +E7igqDu]k< +BDFChar: 385 1087 7 0 5 0 4 +r63C/bQ%VC BDFChar: 386 1088 6 0 4 -2 4 -n;)mVn:6#h +nCZCGnA)g> BDFChar: 387 1089 5 0 3 0 4 -E.EIhDu]k< -BDFChar: 388 1090 5 0 4 0 4 -p`L\%+92BA +E599)Du]k< +BDFChar: 388 1090 6 0 5 0 4 +r%KfY0E;(Q BDFChar: 389 1091 5 0 4 -2 4 -LlbG(a)+<\H" -BDFChar: 390 1092 8 0 6 -2 6 -&.j5PP*12(&-)\1 -BDFChar: 391 1093 5 0 3 0 4 -OC02=O8o7\ -BDFChar: 392 1094 6 0 4 -1 3 -OH>QK#QOi) -BDFChar: 393 1095 6 0 3 0 4 -OHArC&-)\1 -BDFChar: 394 1096 8 1 6 0 4 -Unjf^qu?]s -BDFChar: 395 1097 8 0 6 -1 4 -&<rEDIKBKL -BDFChar: 396 1098 6 0 4 0 4 -^d*-8GQ7^D -BDFChar: 397 1099 8 0 5 0 4 -KS8u^oDejk -BDFChar: 398 1100 5 0 3 0 4 -J:R-Nn,NFg -BDFChar: 399 1101 5 0 3 0 4 -i"0i=huE`W -BDFChar: 400 1102 8 0 6 0 4 -S>,#;S,`Nh -BDFChar: 401 1103 5 0 3 0 4 -n;qTcO8o7\ -BDFChar: 402 1104 5 0 4 0 6 -+96A:pjdSh -BDFChar: 403 1105 5 0 4 0 6 -:]PHjpjdSh -BDFChar: 404 1024 6 1 4 0 8 -5QL;(JFJ)>n,NFg -BDFChar: 405 1025 6 1 4 0 7 -T^[J^n:6&Y +f\#t<0OVZr +BDFChar: 390 1092 9 0 7 -2 6 +(`7_VgY7/o(]XO9 +BDFChar: 391 1093 5 0 4 0 4 +f_BF\fDkmO +BDFChar: 392 1094 7 0 6 -1 4 +bfn;TrWW?& +BDFChar: 393 1095 6 0 5 0 4 +bfkGC$ig8- +BDFChar: 394 1096 9 0 7 0 4 +gY:K;rr<$! +BDFChar: 395 1097 9 0 8 -1 4 +gAot.gAot.s*t-# +BDFChar: 396 1098 7 0 5 0 4 +i*^eGGQ7^D +BDFChar: 397 1099 9 0 7 0 4 +_o)*#o)Jaj +BDFChar: 398 1100 6 0 4 0 4 +^qfHln,NFg +BDFChar: 399 1101 5 0 4 0 4 +n/-Ben,NFg +BDFChar: 400 1102 9 0 7 0 4 +cJ/6Nc2[hE +BDFChar: 401 1103 5 0 4 0 4 +Gh(a)7CQiI*d +BDFChar: 402 1104 6 0 4 0 6 ++96B5pqV+S +BDFChar: 403 1105 6 0 4 0 6 +:]PIepqV+S +BDFChar: 404 1024 6 0 4 0 8 ++9;2P_"b^\p](9o +BDFChar: 405 1025 6 0 4 0 7 +;#%iApqX]? BDFChar: 406 1029 6 0 4 0 6 G^t<`#RKo" BDFChar: 407 1030 4 0 2 0 6 @@ -11032,15 +11032,15 @@ T]"b$TV)8b BDFChar: 411 1118 5 0 4 -2 7 :`oaoOAK=-+M[sW BDFChar: 412 1038 6 0 4 0 8 -:`tRM:f&8W^]4?7 +:a"ECpi%op^]4?7 BDFChar: 413 1111 3 0 2 0 6 TE%5B5X7R7 BDFChar: 414 1110 3 0 0 0 6 J,k+MJ:N.M -BDFChar: 415 1169 4 1 3 0 4 -i.-?.J,fQL -BDFChar: 416 1168 5 1 4 0 6 -n:6%>J:N.M +BDFChar: 415 1169 5 0 3 0 4 +nA)iT^]4?7 +BDFChar: 416 1168 6 0 4 0 6 +pqX\\^qd_c BDFChar: 417 1170 5 0 4 0 6 GX1a`5X7R7 BDFChar: 418 1171 4 1 3 0 4 diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index afa2d39..82ce9fa 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ

1 0