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

Christian Costa : dmusic: Check wrong params when creating a port + tests.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: c05c04952e5c283e6149bd3bf71ac3c3875f928d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05c04952e5c283e6149bd3bf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 10 22:30:38 2012 +0200 dmusic: Check wrong params when creating a port + tests. --- dlls/dmusic/dmusic.c | 14 ++++++++++++-- dlls/dmusic/tests/dmusic.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index eab3770..253ef1a 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -167,7 +167,8 @@ static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer (LPDIRECTMUSIC8 iface, return DMUSIC_CreateDirectMusicBufferImpl(&IID_IDirectMusicBuffer, (LPVOID)ppBuffer, NULL); } -static HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter) { +static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter) +{ IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; int i; DMUS_PORTCAPS PortCaps; @@ -181,8 +182,17 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLS if (TRACE_ON(dmusic)) dump_DMUS_PORTPARAMS(pPortParams); - if(!rclsidPort) + if (!rclsidPort) + return E_POINTER; + if (!pPortParams) + return E_INVALIDARG; + if (!ppPort) return E_POINTER; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + if (TRACE_ON(dmusic)) + dump_DMUS_PORTPARAMS(pPortParams); ZeroMemory(&PortCaps, sizeof(DMUS_PORTCAPS)); PortCaps.dwSize = sizeof(DMUS_PORTCAPS); diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 6853ad9..29ad642 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -66,6 +66,16 @@ static void test_dmusic(void) hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); ok(hr == S_OK, "IDirectMusic_SetDirectSound returned: %x\n", hr); + /* Check wrong params */ + hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, (IUnknown*)dmusic); + ok(hr == CLASS_E_NOAGGREGATION, "IDirectMusic_CreatePort returned: %x\n", hr); + hr = IDirectMusic_CreatePort(dmusic, NULL, &port_params, &port, NULL); + ok(hr == E_POINTER, "IDirectMusic_CreatePort returned: %x\n", hr); + hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, NULL, &port, NULL); + ok(hr == E_INVALIDARG, "IDirectMusic_CreatePort returned: %x\n", hr); + hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, NULL, NULL); + ok(hr == E_POINTER, "IDirectMusic_CreatePort returned: %x\n", hr); + /* Test creation of default port with GUID_NULL */ hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, NULL); ok(hr == S_OK, "IDirectMusic_CreatePort returned: %x\n", hr);

1 0

Christian Costa : dmusic: Add trace to DMUSIC_CreateReferenceClockImpl and rename some variables.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: eb03e83348122a9100403a850a7665b42100f249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb03e83348122a9100403a850… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 10 22:30:45 2012 +0200 dmusic: Add trace to DMUSIC_CreateReferenceClockImpl and rename some variables. --- dlls/dmusic/clock.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 53f7715..4505876 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -99,18 +99,22 @@ static const IReferenceClockVtbl ReferenceClock_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IReferenceClockImpl* clock; +HRESULT WINAPI DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) +{ + IReferenceClockImpl* clock; - clock = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IReferenceClockImpl)); - if (NULL == clock) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - clock->lpVtbl = &ReferenceClock_Vtbl; - clock->ref = 0; /* will be inited by QueryInterface */ - clock->rtTime = 0; - clock->pClockInfo.dwSize = sizeof (DMUS_CLOCKINFO); - - return IReferenceClockImpl_QueryInterface ((IReferenceClock *)clock, lpcGUID, ppobj); + TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + + clock = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IReferenceClockImpl)); + if (!clock) { + *ret_iface = NULL; + return E_OUTOFMEMORY; + } + + clock->lpVtbl = &ReferenceClock_Vtbl; + clock->ref = 0; /* will be inited by QueryInterface */ + clock->rtTime = 0; + clock->pClockInfo.dwSize = sizeof (DMUS_CLOCKINFO); + + return IReferenceClockImpl_QueryInterface((IReferenceClock*)clock, riid, ret_iface); }

1 0

Huw Davies : wineps: Move the input slot list to a standard list.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: e6e42c8610edb9603d7054ad216087ce6b096d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e42c8610edb9603d7054ad2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:16 2012 +0100 wineps: Move the input slot list to a standard list. --- dlls/wineps.drv/driver.c | 38 +++++++++++++++++++++++--------------- dlls/wineps.drv/ppd.c | 20 ++++++++------------ dlls/wineps.drv/ps.c | 2 +- dlls/wineps.drv/psdrv.h | 7 ++++--- 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 50fb59f..7ff117f 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -116,20 +116,21 @@ void PSDRV_MergeDevmodes(PSDRV_DEVMODEA *dm1, PSDRV_DEVMODEA *dm2, TRACE("Changing Copies to %d\n", dm2->dmPublic.u1.s1.dmCopies); } - if(dm2->dmPublic.dmFields & DM_DEFAULTSOURCE) { + if (dm2->dmPublic.dmFields & DM_DEFAULTSOURCE) + { INPUTSLOT *slot; - for(slot = pi->ppd->InputSlots; slot; slot = slot->next) { + LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) if(slot->WinBin == dm2->dmPublic.u1.s1.dmDefaultSource) break; - } - if(slot) { + + if (&slot->entry != &pi->ppd->InputSlots) + { dm1->dmPublic.u1.s1.dmDefaultSource = dm2->dmPublic.u1.s1.dmDefaultSource; TRACE("Changing bin to '%s'\n", slot->FullName); - } else { - TRACE("Trying to change to unsupported bin %d\n", - dm2->dmPublic.u1.s1.dmDefaultSource); } + else + TRACE("Trying to change to unsupported bin %d\n", dm2->dmPublic.u1.s1.dmDefaultSource); } if (dm2->dmPublic.dmFields & DM_DEFAULTSOURCE ) @@ -512,9 +513,12 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP WORD *wp = (WORD *)lpszOutput; int i = 0; - for(slot = pi->ppd->InputSlots; slot; slot = slot->next, i++) - if(lpszOutput != NULL) - *wp++ = slot->WinBin; + LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) + { + i++; + if (lpszOutput != NULL) + *wp++ = slot->WinBin; + } return i; } @@ -524,11 +528,15 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP char *cp = lpszOutput; int i = 0; - for(slot = pi->ppd->InputSlots; slot; slot = slot->next, i++) - if(lpszOutput != NULL) { - lstrcpynA(cp, slot->FullName, 24); - cp += 24; - } + LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) + { + i++; + if (lpszOutput != NULL) + { + lstrcpynA( cp, slot->FullName, 24 ); + cp += 24; + } + } return i; } diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 37c6094..508f141 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -583,23 +583,19 @@ static BOOL parse_resolution(const char *str, SIZE *sz) * PSDRV_AddSlot * */ -static INT PSDRV_AddSlot(PPD *ppd, LPCSTR szName, LPCSTR szFullName, +static BOOL PSDRV_AddSlot(PPD *ppd, LPCSTR szName, LPCSTR szFullName, LPSTR szInvocationString, WORD wWinBin) { - INPUTSLOT *slot, **insert = &ppd->InputSlots; - - while (*insert) - insert = &((*insert)->next); - - slot = *insert = HeapAlloc(PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(INPUTSLOT)); - if (!slot) return 1; + INPUTSLOT *slot = HeapAlloc( PSDRV_Heap, 0, sizeof(INPUTSLOT) ); + if (!slot) return FALSE; slot->Name = szName; slot->FullName = szFullName; slot->InvocationString = szInvocationString; slot->WinBin = wWinBin; - return 0; + list_add_tail( &ppd->InputSlots, &slot->entry ); + return TRUE; } /*********************************************************************** @@ -635,13 +631,13 @@ PPD *PSDRV_ParsePPD(char *fname) list_init( &ppd->InstalledFonts ); list_init( &ppd->PageSizes ); list_init( &ppd->Constraints ); + list_init( &ppd->InputSlots ); /* * The Windows PostScript drivers create the following "virtual bin" for * every PostScript printer */ - if (PSDRV_AddSlot(ppd, NULL, "Automatically Select", NULL, - DMBIN_FORMSOURCE)) + if (!PSDRV_AddSlot( ppd, NULL, "Automatically Select", NULL, DMBIN_FORMSOURCE )) { HeapFree (PSDRV_Heap, 0, ppd); fclose(fp); @@ -1002,7 +998,7 @@ PPD *PSDRV_ParsePPD(char *fname) optionEntry->FullName, optionEntry->InvocationString); } - for(slot = ppd->InputSlots; slot; slot = slot->next) + LIST_FOR_EACH_ENTRY( slot, &ppd->InputSlots, INPUTSLOT, entry ) TRACE("INPUTSLOTS '%s' Name '%s' (%d) Invocation '%s'\n", debugstr_a(slot->Name), slot->FullName, slot->WinBin, debugstr_a(slot->InvocationString)); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 27a2cc1..5db80f1 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -350,7 +350,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) write_spool(dev, copies_buf, strlen(copies_buf)); } - for(slot = physDev->pi->ppd->InputSlots; slot; slot = slot->next) { + LIST_FOR_EACH_ENTRY( slot, &physDev->pi->ppd->InputSlots, INPUTSLOT, entry ) { if(slot->WinBin == physDev->Devmode->dmPublic.u1.s1.dmDefaultSource) { if(slot->InvocationString) { PSDRV_WriteFeature(dev, "*InputSlot", slot->Name, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index a240f4f..e2d3c84 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -177,12 +177,13 @@ typedef struct char *Value2; } CONSTRAINT; -typedef struct _tagINPUTSLOT { +typedef struct +{ + struct list entry; const char *Name; const char *FullName; char *InvocationString; WORD WinBin; /* eg DMBIN_LOWER */ - struct _tagINPUTSLOT *next; } INPUTSLOT; typedef enum _RASTERIZEROPTION @@ -220,7 +221,7 @@ typedef struct { PAGESIZE *DefaultPageSize; OPTION *InstalledOptions; struct list Constraints; - INPUTSLOT *InputSlots; + struct list InputSlots; RASTERIZEROPTION TTRasterizer; DUPLEX *Duplexes; DUPLEX *DefaultDuplex;

1 0

Huw Davies : wineps: Move the duplex list to a standard list.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 5a0129c0d24122db0b2bc549c30dccb592ac15fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a0129c0d24122db0b2bc549c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:17 2012 +0100 wineps: Move the duplex list to a standard list. --- dlls/wineps.drv/driver.c | 25 +++++++++++++++++-------- dlls/wineps.drv/ppd.c | 40 +++++++++++++++++++++------------------- dlls/wineps.drv/ps.c | 3 ++- dlls/wineps.drv/psdrv.h | 7 ++++--- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 7ff117f..83597c3 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -195,7 +195,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { PSDRV_DLGINFO *di; - int i, Cursel = 0; + int i, Cursel; PAGESIZE *ps; DUPLEX *duplex; @@ -204,7 +204,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, di = (PSDRV_DLGINFO*)((PROPSHEETPAGEA*)lParam)->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)di); - i = 0; + i = Cursel = 0; LIST_FOR_EACH_ENTRY(ps, &di->pi->ppd->PageSizes, PAGESIZE, entry) { SendDlgItemMessageA(hwnd, IDD_PAPERS, LB_INSERTSTRING, i, (LPARAM)ps->FullName); @@ -219,16 +219,21 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, DMORIENT_PORTRAIT ? IDD_ORIENT_PORTRAIT : IDD_ORIENT_LANDSCAPE); - if(!di->pi->ppd->Duplexes) { + if (list_empty( &di->pi->ppd->Duplexes )) + { ShowWindow(GetDlgItem(hwnd, IDD_DUPLEX), SW_HIDE); ShowWindow(GetDlgItem(hwnd, IDD_DUPLEX_NAME), SW_HIDE); - } else { - Cursel = 0; - for(duplex = di->pi->ppd->Duplexes, i = 0; duplex; duplex = duplex->next, i++) { + } + else + { + i = Cursel = 0; + LIST_FOR_EACH_ENTRY( duplex, &di->pi->ppd->Duplexes, DUPLEX, entry ) + { SendDlgItemMessageA(hwnd, IDD_DUPLEX, CB_INSERTSTRING, i, (LPARAM)(duplex->FullName ? duplex->FullName : duplex->Name)); if(di->pi->Devmode->dmPublic.dmDuplex == duplex->WinDuplex) Cursel = i; + i++; } SendDlgItemMessageA(hwnd, IDD_DUPLEX, CB_SETCURSEL, Cursel, 0); } @@ -261,8 +266,12 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, case IDD_DUPLEX: if(HIWORD(wParam) == CBN_SELCHANGE) { Cursel = SendDlgItemMessageA(hwnd, LOWORD(wParam), CB_GETCURSEL, 0, 0); - for(i = 0, duplex = di->pi->ppd->Duplexes; i < Cursel; i++, duplex = duplex->next) - ; + i = 0; + LIST_FOR_EACH_ENTRY( duplex, &di->pi->ppd->Duplexes, DUPLEX, entry ) + { + if (i >= Cursel) break; + i++; + } TRACE("Setting duplex to item %d Winduplex = %d\n", Cursel, duplex->WinDuplex); di->dlgdm->dmPublic.dmDuplex = duplex->WinDuplex; SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 508f141..e84f46f 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -632,6 +632,7 @@ PPD *PSDRV_ParsePPD(char *fname) list_init( &ppd->PageSizes ); list_init( &ppd->Constraints ); list_init( &ppd->InputSlots ); + list_init( &ppd->Duplexes ); /* * The Windows PostScript drivers create the following "virtual bin" for @@ -869,27 +870,24 @@ PPD *PSDRV_ParsePPD(char *fname) TRACE("*TTRasterizer = %d\n", ppd->TTRasterizer); } - else if(!strcmp("*Duplex", tuple.key)) { - DUPLEX **duplex; - for(duplex = &ppd->Duplexes; *duplex; duplex = &(*duplex)->next) - ; - *duplex = HeapAlloc(GetProcessHeap(), 0, sizeof(**duplex)); - (*duplex)->Name = tuple.option; - (*duplex)->FullName = tuple.opttrans; - (*duplex)->InvocationString = tuple.value; - (*duplex)->next = NULL; + else if(!strcmp("*Duplex", tuple.key)) + { + DUPLEX *duplex = HeapAlloc( GetProcessHeap(), 0, sizeof(*duplex) ); + duplex->Name = tuple.option; + duplex->FullName = tuple.opttrans; + duplex->InvocationString = tuple.value; if(!strcasecmp("None", tuple.option) || !strcasecmp("False", tuple.option) || !strcasecmp("Simplex", tuple.option)) - (*duplex)->WinDuplex = DMDUP_SIMPLEX; + duplex->WinDuplex = DMDUP_SIMPLEX; else if(!strcasecmp("DuplexNoTumble", tuple.option)) - (*duplex)->WinDuplex = DMDUP_VERTICAL; + duplex->WinDuplex = DMDUP_VERTICAL; else if(!strcasecmp("DuplexTumble", tuple.option)) - (*duplex)->WinDuplex = DMDUP_HORIZONTAL; + duplex->WinDuplex = DMDUP_HORIZONTAL; else if(!strcasecmp("Notcapable", tuple.option)) - (*duplex)->WinDuplex = 0; + duplex->WinDuplex = 0; else { FIXME("Unknown option %s for *Duplex defaulting to simplex\n", tuple.option); - (*duplex)->WinDuplex = DMDUP_SIMPLEX; + duplex->WinDuplex = DMDUP_SIMPLEX; } tuple.option = tuple.opttrans = tuple.value = NULL; } @@ -945,10 +943,13 @@ PPD *PSDRV_ParsePPD(char *fname) } ppd->DefaultDuplex = NULL; - if(default_duplex) { + if (default_duplex) + { DUPLEX *duplex; - for(duplex = ppd->Duplexes; duplex; duplex = duplex->next) { - if(!strcmp(duplex->Name, default_duplex)) { + LIST_FOR_EACH_ENTRY( duplex, &ppd->Duplexes, DUPLEX, entry ) + { + if (!strcmp(duplex->Name, default_duplex)) + { ppd->DefaultDuplex = duplex; TRACE("DefaultDuplex: %s\n", duplex->Name); break; @@ -956,8 +957,9 @@ PPD *PSDRV_ParsePPD(char *fname) } HeapFree(PSDRV_Heap, 0, default_duplex); } - if(!ppd->DefaultDuplex) { - ppd->DefaultDuplex = ppd->Duplexes; + if (!ppd->DefaultDuplex) + { + ppd->DefaultDuplex = LIST_ENTRY( list_head( &ppd->Duplexes ), DUPLEX, entry ); TRACE("Setting DefaultDuplex to first in list\n"); } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 5db80f1..1e30736 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -372,7 +372,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) win_duplex = physDev->Devmode->dmPublic.dmFields & DM_DUPLEX ? physDev->Devmode->dmPublic.dmDuplex : 0; - for(duplex = physDev->pi->ppd->Duplexes; duplex; duplex = duplex->next) { + LIST_FOR_EACH_ENTRY( duplex, &physDev->pi->ppd->Duplexes, DUPLEX, entry ) + { if(duplex->WinDuplex == win_duplex) { if(duplex->InvocationString) { PSDRV_WriteFeature(dev, "*Duplex", duplex->Name, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index e2d3c84..05545dd 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -189,12 +189,13 @@ typedef struct typedef enum _RASTERIZEROPTION {RO_None, RO_Accept68K, RO_Type42, RO_TrueImage} RASTERIZEROPTION; -typedef struct _tagDUPLEX { +typedef struct +{ + struct list entry; char *Name; char *FullName; char *InvocationString; WORD WinDuplex; /* eg DMDUP_SIMPLEX */ - struct _tagDUPLEX *next; } DUPLEX; /* Many Mac OS X based ppd files don't include a *ColorDevice line, so @@ -223,7 +224,7 @@ typedef struct { struct list Constraints; struct list InputSlots; RASTERIZEROPTION TTRasterizer; - DUPLEX *Duplexes; + struct list Duplexes; DUPLEX *DefaultDuplex; } PPD;

1 0

Huw Davies : wineps: Remove the installed options list as it' s never populated.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 7b3ae93578602c90be2c6df26468707942cf3ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3ae93578602c90be2c6df26… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:18 2012 +0100 wineps: Remove the installed options list as it's never populated. --- dlls/wineps.drv/ppd.c | 11 ----------- dlls/wineps.drv/psdrv.h | 16 ---------------- 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index e84f46f..c4dff21 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -969,8 +969,6 @@ PPD *PSDRV_ParsePPD(char *fname) PAGESIZE *page; CONSTRAINT *con; INPUTSLOT *slot; - OPTION *option; - OPTIONENTRY *optionEntry; LIST_FOR_EACH_ENTRY( fn, &ppd->InstalledFonts, FONTNAME, entry ) TRACE("'%s'\n", fn->Name); @@ -991,15 +989,6 @@ PPD *PSDRV_ParsePPD(char *fname) TRACE("CONSTRAINTS@ %s %s %s %s\n", con->Feature1, con->Value1, con->Feature2, con->Value2); - for(option = ppd->InstalledOptions; option; option = option->next) { - TRACE("OPTION: %s %s %s\n", option->OptionName, - option->FullName, option->DefaultOption); - for(optionEntry = option->Options; optionEntry; - optionEntry = optionEntry->next) - TRACE("\tOPTIONENTRY: %s %s %s\n", optionEntry->Name, - optionEntry->FullName, optionEntry->InvocationString); - } - LIST_FOR_EACH_ENTRY( slot, &ppd->InputSlots, INPUTSLOT, entry ) TRACE("INPUTSLOTS '%s' Name '%s' (%d) Invocation '%s'\n", debugstr_a(slot->Name), slot->FullName, slot->WinBin, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 05545dd..23fb28e 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -153,21 +153,6 @@ typedef struct _BANDINFOSTRUCT RECT GraphicsRect; } BANDINFOSTRUCT, *PBANDINFOSTRUCT; -typedef struct _tagOPTIONENTRY { - char *Name; /* eg "True" */ - char *FullName; /* eg "Installed" */ - char *InvocationString; /* Often NULL */ - struct _tagOPTIONENTRY *next; -} OPTIONENTRY; - -typedef struct _tagOPTION { /* Treat bool as a special case of pickone */ - char *OptionName; /* eg "*Option1" */ - char *FullName; /* eg "Envelope Feeder" */ - char *DefaultOption; /* eg "False" */ - OPTIONENTRY *Options; - struct _tagOPTION *next; -} OPTION; - typedef struct { struct list entry; @@ -220,7 +205,6 @@ typedef struct { struct list InstalledFonts; struct list PageSizes; PAGESIZE *DefaultPageSize; - OPTION *InstalledOptions; struct list Constraints; struct list InputSlots; RASTERIZEROPTION TTRasterizer;

1 0

Huw Davies : wineps: Retrieve the printer's devmode using GetPrinter.
by Alexandre Julliard 11 Apr '12

11 Apr '12

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

Huw Davies : wineps: Set the printer's devmode using SetPrinter.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 43cffa0888d643d77f11eedfd14ad4ebeae8a642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43cffa0888d643d77f11eedfd… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:20 2012 +0100 wineps: Set the printer's devmode using SetPrinter. --- dlls/wineps.drv/init.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index cc950e3..4af6ca9 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -113,7 +113,6 @@ static const LOGFONTA DefaultLogFont = { DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" }; -static const CHAR default_devmodeA[] = "Default DevMode"; static const struct gdi_dc_funcs psdrv_funcs; /********************************************************************* @@ -610,6 +609,14 @@ static PSDRV_DEVMODEA *get_devmode( HANDLE printer, const char *nameA, BOOL *is_ return dm; } +static BOOL set_devmode( HANDLE printer, PSDRV_DEVMODEA *dm ) +{ + PRINTER_INFO_9A info; + info.pDevMode = &dm->dmPublic; + + return SetPrinterA( printer, 9, (BYTE *)&info, 0 ); +} + static struct list printer_list = LIST_INIT( printer_list ); /********************************************************************** @@ -761,8 +768,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) PSDRV_MergeDevmodes(pi->Devmode, &dm, pi); } - SetPrinterDataExA(hPrinter, NULL, default_devmodeA, REG_BINARY, - (LPBYTE)pi->Devmode, sizeof(DefaultDevmode)); + set_devmode( hPrinter, pi->Devmode ); } if(pi->ppd->DefaultPageSize) { /* We'll let the ppd override the devmode */

1 0

Huw Davies : wordpad: Don' t quit if the user cancels the save-as dialog when being prompted to save changes .
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 965388465d7d358a4cf08d5470485ac370c2f840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965388465d7d358a4cf08d547… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 13:50:57 2012 +0100 wordpad: Don't quit if the user cancels the save-as dialog when being prompted to save changes. --- programs/wordpad/wordpad.c | 30 +++++++++++------------------- 1 files changed, 11 insertions(+), 19 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index f47aedd..24d956a 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -835,7 +835,7 @@ static void ShowWriteError(DWORD Code) MessageBoxW(hMainWnd, Message, wszAppTitle, MB_ICONEXCLAMATION | MB_OK); } -static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) +static BOOL DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) { HANDLE hFile; EDITSTREAM stream; @@ -847,7 +847,7 @@ static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) if(hFile == INVALID_HANDLE_VALUE) { ShowWriteError(GetLastError()); - return; + return FALSE; } if(format == (SF_TEXT | SF_UNICODE)) @@ -859,7 +859,7 @@ static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) if(writeOut != sizeof(unicode)) { CloseHandle(hFile); - return; + return FALSE; } } @@ -879,16 +879,18 @@ static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) gt.codepage = 1200; if(SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0)) - return; + return FALSE; } lstrcpyW(wszFileName, wszSaveFileName); set_caption(wszFileName); SendMessageW(hEditorWnd, EM_SETMODIFY, FALSE, 0); set_fileformat(format); + + return TRUE; } -static void DialogSaveFile(void) +static BOOL DialogSaveFile(void) { OPENFILENAMEW sfn; @@ -912,19 +914,11 @@ static void DialogSaveFile(void) { if(MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SAVE_LOSEFORMATTING), wszAppTitle, MB_YESNO | MB_ICONEXCLAMATION) != IDYES) - { continue; - } else - { - DoSaveFile(sfn.lpstrFile, fileformat_flags(sfn.nFilterIndex-1)); - break; - } - } else - { - DoSaveFile(sfn.lpstrFile, fileformat_flags(sfn.nFilterIndex-1)); - break; } + return DoSaveFile(sfn.lpstrFile, fileformat_flags(sfn.nFilterIndex-1)); } + return FALSE; } static BOOL prompt_save_changes(void) @@ -971,10 +965,8 @@ static BOOL prompt_save_changes(void) case IDYES: if(wszFileName[0]) - DoSaveFile(wszFileName, fileFormat); - else - DialogSaveFile(); - return TRUE; + return DoSaveFile(wszFileName, fileFormat); + return DialogSaveFile(); default: return FALSE;

1 0

Piotr Caban : msvcrt: Rewrite asctime function.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 0f7c834bd1cad6cf568d1fa758e956615ac68ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f7c834bd1cad6cf568d1fa75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:21:32 2012 +0200 msvcrt: Rewrite asctime function. --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/time.c | 68 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/time.c | 74 +++++++++++++++++++++++++++++----------------- 3 files changed, 116 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6103c1e..26a1177 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -895,6 +895,7 @@ int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); int __cdecl MSVCRT__snwprintf(MSVCRT_wchar_t*, unsigned int, const MSVCRT_wchar_t*, ...); int __cdecl MSVCRT_sprintf(char*,const char*,...); +int __cdecl MSVCRT__snprintf(char*,unsigned int,const char*,...); int __cdecl MSVCRT__scprintf(const char*,...); int __cdecl MSVCRT_raise(int sig); diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index a7790d5..16f8b9c 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -48,6 +48,7 @@ static int* (__cdecl *p__daylight)(void); static int* (__cdecl *p___p__daylight)(void); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); static size_t (__cdecl *p_wcsftime)(wchar_t *, size_t, const wchar_t *, const struct tm *); +static char* (__cdecl *p_asctime)(const struct tm *); static void init(void) { @@ -65,6 +66,7 @@ static void init(void) p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); p_strftime = (void*)GetProcAddress(hmod, "strftime"); p_wcsftime = (void*)GetProcAddress(hmod, "wcsftime"); + p_asctime = (void*)GetProcAddress(hmod, "asctime"); } static int get_test_year(time_t *start) @@ -612,6 +614,71 @@ todo_wine ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); } +static void test_asctime(void) +{ + struct tm* gmt_tm; + time_t gmt; + char *ret; + + if(!p_asctime || !p_gmtime) + { + win_skip("asctime or gmtime is not available\n"); + return; + } + + gmt = 0; + gmt_tm = p_gmtime(&gmt); + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Thu Jan 01 00:00:00 1970\n"), "asctime retunred %s\n", ret); + + gmt = 312433121; + gmt_tm = p_gmtime(&gmt); + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Mon Nov 26 02:58:41 1979\n"), "asctime retunred %s\n", ret); + + /* Week day is only checked if it's in 0..6 range */ + gmt_tm->tm_wday = 3; + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Wed Nov 26 02:58:41 1979\n"), "asctime returned %s\n", ret); + + errno = 0xdeadbeef; + gmt_tm->tm_wday = 7; + ret = p_asctime(gmt_tm); + ok(!ret || broken(!ret[0]), "asctime returned %s\n", ret); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + + /* Year day is ignored */ + gmt_tm->tm_wday = 3; + gmt_tm->tm_yday = 1300; + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Wed Nov 26 02:58:41 1979\n"), "asctime returned %s\n", ret); + + /* Dates that can't be displayed using 26 characters are broken */ + gmt_tm->tm_mday = 28; + gmt_tm->tm_year = 8100; + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Wed Nov 28 02:58:41 :000\n"), "asctime returned %s\n", ret); + + gmt_tm->tm_year = 264100; + ret = p_asctime(gmt_tm); + ok(!strcmp(ret, "Wed Nov 28 02:58:41 :000\n"), "asctime returned %s\n", ret); + + /* asctime works from year 1900 */ + errno = 0xdeadbeef; + gmt_tm->tm_year = -1; + ret = p_asctime(gmt_tm); + ok(!ret || broken(!strcmp(ret, "Wed Nov 28 02:58:41 190/\n")), "asctime returned %s\n", ret); + ok(errno==EINVAL || broken(errno == 0xdeadbeef), "errno = %d\n", errno); + + errno = 0xdeadbeef; + gmt_tm->tm_mon = 1; + gmt_tm->tm_mday = 30; + gmt_tm->tm_year = 79; + ret = p_asctime(gmt_tm); + ok(!ret || broken(!strcmp(ret, "Wed Feb 30 02:58:41 1979\n")), "asctime returned %s\n", ret); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); +} + START_TEST(time) { init(); @@ -628,4 +695,5 @@ START_TEST(time) test_localtime32_s(); test_localtime64_s(); test_daylight(); + test_asctime(); } diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index f9de5c5..90dc790 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -877,30 +877,46 @@ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, return len; } +static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) +{ + static const char wday[7][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + static const char month[12][4] = {"Jan", "Feb", "Mar", "Apr", "May", + "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + + if (mstm->tm_sec<0 || mstm->tm_sec>59 + || mstm->tm_min<0 || mstm->tm_min>59 + || mstm->tm_hour<0 || mstm->tm_hour>23 + || mstm->tm_mon<0 || mstm->tm_mon>11 + || mstm->tm_wday<0 || mstm->tm_wday>6 + || mstm->tm_year<0 || mstm->tm_mday<0 + || mstm->tm_mday>MonthLengths[IsLeapYear(1900+mstm->tm_year)][mstm->tm_mon]) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return NULL; + } + + MSVCRT__snprintf(buf, 26, "%s %s %02d %02d:%02d:%02d %c%03d\n", wday[mstm->tm_wday], + month[mstm->tm_mon], mstm->tm_mday, mstm->tm_hour, mstm->tm_min, + mstm->tm_sec, '1'+(mstm->tm_year+900)/1000, (900+mstm->tm_year)%1000); + return buf; +} + /********************************************************************* * asctime (MSVCRT.@) */ char * CDECL MSVCRT_asctime(const struct MSVCRT_tm *mstm) { - char bufferA[30]; - WCHAR bufferW[30]; - thread_data_t *data = msvcrt_get_thread_data(); - struct tm tm; - - msvcrt_tm_to_unix( &tm, mstm ); - if (!data->asctime_buffer) - data->asctime_buffer = MSVCRT_malloc( 30 ); /* ought to be enough */ + /* asctime returns date in format that always has exactly 26 characters */ + if (!data->asctime_buffer) { + data->asctime_buffer = MSVCRT_malloc(26); + if (!data->asctime_buffer) { + *MSVCRT__errno() = MSVCRT_ENOMEM; + return NULL; + } + } -#ifdef HAVE_ASCTIME_R - asctime_r( &tm, bufferA ); -#else - strcpy( bufferA, asctime(&tm) ); -#endif - MultiByteToWideChar( CP_UNIXCP, 0, bufferA, -1, bufferW, 30 ); - WideCharToMultiByte( CP_ACP, 0, bufferW, -1, data->asctime_buffer, 30, NULL, NULL ); - return data->asctime_buffer; + return asctime_buf(data->asctime_buffer, mstm); } /********************************************************************* @@ -908,23 +924,27 @@ char * CDECL MSVCRT_asctime(const struct MSVCRT_tm *mstm) */ int CDECL MSVCRT_asctime_s(char* time, MSVCRT_size_t size, const struct MSVCRT_tm *mstm) { - char* asc; - unsigned int len; - - if (!MSVCRT_CHECK_PMT(time != NULL) || !MSVCRT_CHECK_PMT(mstm != NULL)) { + if (!MSVCRT_CHECK_PMT(time != NULL) + || !MSVCRT_CHECK_PMT(mstm != NULL) + || !MSVCRT_CHECK_PMT(size >= 26)) { + if (time && size) + time[0] = 0; *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } - asc = MSVCRT_asctime(mstm); - len = strlen(asc) + 1; - - if(!MSVCRT_CHECK_PMT(size >= len)) { - *MSVCRT__errno() = MSVCRT_ERANGE; - return MSVCRT_ERANGE; + if (!MSVCRT_CHECK_PMT(mstm->tm_sec>=0) || !MSVCRT_CHECK_PMT(mstm->tm_sec<60) + || !MSVCRT_CHECK_PMT(mstm->tm_min>=0) || !MSVCRT_CHECK_PMT(mstm->tm_min<60) + || !MSVCRT_CHECK_PMT(mstm->tm_hour>=0) || !MSVCRT_CHECK_PMT(mstm->tm_hour<24) + || !MSVCRT_CHECK_PMT(mstm->tm_mon>=0) || !MSVCRT_CHECK_PMT(mstm->tm_mon<12) + || !MSVCRT_CHECK_PMT(mstm->tm_wday>=0) || !MSVCRT_CHECK_PMT(mstm->tm_wday<7) + || !MSVCRT_CHECK_PMT(mstm->tm_year>=0) || !MSVCRT_CHECK_PMT(mstm->tm_mday>=0) + || !MSVCRT_CHECK_PMT(mstm->tm_mday <= MonthLengths[IsLeapYear(1900+mstm->tm_year)][mstm->tm_mon])) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; } - strcpy(time, asc); + asctime_buf(time, mstm); return 0; }

1 0

Piotr Caban : msvcrt: Rewrite wasctime function.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 2ca9a73a319585f71d8b09657ffd8d0affeeac0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca9a73a319585f71d8b09657… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:21:48 2012 +0200 msvcrt: Rewrite wasctime function. --- dlls/msvcrt/time.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 90dc790..882b7bb 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -954,19 +954,20 @@ int CDECL MSVCRT_asctime_s(char* time, MSVCRT_size_t size, const struct MSVCRT_t MSVCRT_wchar_t * CDECL MSVCRT__wasctime(const struct MSVCRT_tm *mstm) { thread_data_t *data = msvcrt_get_thread_data(); - struct tm tm; - char buffer[30]; + char buffer[26]; - msvcrt_tm_to_unix( &tm, mstm ); + if(!data->wasctime_buffer) { + data->wasctime_buffer = MSVCRT_malloc(26*sizeof(MSVCRT_wchar_t)); + if(!data->wasctime_buffer) { + *MSVCRT__errno() = MSVCRT_ENOMEM; + return NULL; + } + } - if (!data->wasctime_buffer) - data->wasctime_buffer = MSVCRT_malloc( 30*sizeof(MSVCRT_wchar_t) ); /* ought to be enough */ -#ifdef HAVE_ASCTIME_R - asctime_r( &tm, buffer ); -#else - strcpy( buffer, asctime(&tm) ); -#endif - MultiByteToWideChar( CP_UNIXCP, 0, buffer, -1, data->wasctime_buffer, 30 ); + if(!asctime_buf(buffer, mstm)) + return NULL; + + MultiByteToWideChar(CP_ACP, 0, buffer, -1, data->wasctime_buffer, 26); return data->wasctime_buffer; } @@ -975,23 +976,22 @@ MSVCRT_wchar_t * CDECL MSVCRT__wasctime(const struct MSVCRT_tm *mstm) */ int CDECL MSVCRT__wasctime_s(MSVCRT_wchar_t* time, MSVCRT_size_t size, const struct MSVCRT_tm *mstm) { - WCHAR* asc; - unsigned int len; + char buffer[26]; + int ret; - if (!MSVCRT_CHECK_PMT(time != NULL) || !MSVCRT_CHECK_PMT(mstm != NULL)) { + if(!MSVCRT_CHECK_PMT(time != NULL) + || !MSVCRT_CHECK_PMT(mstm != NULL) + || !MSVCRT_CHECK_PMT(size >= 26)) { + if(time && size) + time[0] = 0; *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } - asc = MSVCRT__wasctime(mstm); - len = (strlenW(asc) + 1) * sizeof(WCHAR); - - if(!MSVCRT_CHECK_PMT(size >= len)) { - *MSVCRT__errno() = MSVCRT_ERANGE; - return MSVCRT_ERANGE; - } - - strcpyW(time, asc); + ret = MSVCRT_asctime_s(buffer, sizeof(buffer), mstm); + if(!ret) + return ret; + MultiByteToWideChar(CP_ACP, 0, buffer, -1, time, size); return 0; }

1 0