wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Christian Costa : dmusic: Implement SynthPortImpl_IDirectMusicPort_DownloadInstrument.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: c6694e6dec9c9010d10ed7fe37526218b3a99302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6694e6dec9c9010d10ed7fe3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 24 09:46:18 2012 +0100 dmusic: Implement SynthPortImpl_IDirectMusicPort_DownloadInstrument. --- dlls/dmusic/dmusic_private.h | 2 + dlls/dmusic/port.c | 108 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 105 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 1872177..286b48b 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -140,6 +140,8 @@ struct IDirectMusicDownloadedInstrumentImpl { LONG ref; /* IDirectMusicDownloadedInstrumentImpl fields */ + BOOL downloaded; + void *data; }; /***************************************************************************** diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index eb139ca..55d0dad 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include "dmusic_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); @@ -82,7 +83,10 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release(LPDIRECTMUSICDO TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) + { + HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); + } DMUSIC_UnlockModule(); @@ -95,11 +99,20 @@ static const IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrumen IDirectMusicDownloadedInstrumentImpl_Release }; +static inline IDirectMusicDownloadedInstrumentImpl* unsafe_impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &DirectMusicDownloadedInstrument_Vtbl); + + return impl_from_IDirectMusicDownloadedInstrument(iface); +} + HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument **instrument) { IDirectMusicDownloadedInstrumentImpl *object; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { *instrument = NULL; @@ -227,20 +240,105 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Read(LPDIRECTMUSICPORT ifac static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicInstrument* instrument, IDirectMusicDownloadedInstrument** downloaded_instrument, DMUS_NOTERANGE* note_ranges, DWORD num_note_ranges) { SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); - - FIXME("(%p/%p)->(%p, %p, %p, %d): stub\n", iface, This, instrument, downloaded_instrument, note_ranges, num_note_ranges); + IDirectMusicInstrumentImpl *instrument_object; + HRESULT ret; + BOOL free; + HANDLE download; + DMUS_DOWNLOADINFO *info; + DMUS_OFFSETTABLE *offset_table; + DMUS_INSTRUMENT *instrument_info; + BYTE *data; + ULONG offset; + ULONG nb_regions; + ULONG size; + int i; + + TRACE("(%p/%p)->(%p, %p, %p, %d)\n", iface, This, instrument, downloaded_instrument, note_ranges, num_note_ranges); if (!instrument || !downloaded_instrument || (num_note_ranges && !note_ranges)) return E_POINTER; - return DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(downloaded_instrument); + instrument_object = impl_from_IDirectMusicInstrument(instrument); + + nb_regions = instrument_object->header.cRegions; + size = sizeof(DMUS_DOWNLOADINFO) + sizeof(ULONG) * (1 + nb_regions) + sizeof(DMUS_INSTRUMENT) + sizeof(DMUS_REGION) * nb_regions; + + data = (BYTE*)HeapAlloc(GetProcessHeap(), 0, size); + if (!data) + return E_OUTOFMEMORY; + + info = (DMUS_DOWNLOADINFO*)data; + offset_table = (DMUS_OFFSETTABLE*)(data + sizeof(DMUS_DOWNLOADINFO)); + offset = sizeof(DMUS_DOWNLOADINFO) + sizeof(ULONG) * (1 + nb_regions); + + info->dwDLType = DMUS_DOWNLOADINFO_INSTRUMENT2; + info->dwDLId = 0; + info->dwNumOffsetTableEntries = 1 + instrument_object->header.cRegions; + info->cbSize = size; + + offset_table->ulOffsetTable[0] = offset; + instrument_info = (DMUS_INSTRUMENT*)(data + offset); + offset += sizeof(DMUS_INSTRUMENT); + instrument_info->ulPatch = MIDILOCALE2Patch(&instrument_object->header.Locale); + instrument_info->ulFirstRegionIdx = 1; + instrument_info->ulGlobalArtIdx = 0; /* FIXME */ + instrument_info->ulFirstExtCkIdx = 0; /* FIXME */ + instrument_info->ulCopyrightIdx = 0; /* FIXME */ + instrument_info->ulFlags = 0; /* FIXME */ + + for (i = 0; i < nb_regions; i++) + { + DMUS_REGION *region = (DMUS_REGION*)(data + offset); + + offset_table->ulOffsetTable[1 + i] = offset; + offset += sizeof(DMUS_REGION); + region->RangeKey = instrument_object->regions[i].header.RangeKey; + region->RangeVelocity = instrument_object->regions[i].header.RangeVelocity; + region->fusOptions = instrument_object->regions[i].header.fusOptions; + region->usKeyGroup = instrument_object->regions[i].header.usKeyGroup; + region->ulRegionArtIdx = 0; /* FIXME */ + region->ulNextRegionIdx = i != (nb_regions - 1) ? (i + 2) : 0; + region->ulFirstExtCkIdx = 0; /* FIXME */ + region->WaveLink = instrument_object->regions[i].wave_link; + region->WSMP = instrument_object->regions[i].wave_sample; + region->WLOOP[0] = instrument_object->regions[i].wave_loop; + } + + ret = IDirectMusicSynth8_Download(This->synth, &download, (VOID*)data, &free); + + if (SUCCEEDED(ret)) + ret = DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(downloaded_instrument); + + if (SUCCEEDED(ret)) + { + IDirectMusicDownloadedInstrumentImpl *downloaded_object = impl_from_IDirectMusicDownloadedInstrument(*downloaded_instrument); + + downloaded_object->data = data; + downloaded_object->downloaded = TRUE; + } + + *downloaded_instrument = NULL; + HeapFree(GetProcessHeap(), 0, data); + + return E_FAIL; } static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *downloaded_instrument) { SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + IDirectMusicDownloadedInstrumentImpl *downloaded_object = unsafe_impl_from_IDirectMusicDownloadedInstrument(downloaded_instrument); + + TRACE("(%p/%p)->(%p)\n", iface, This, downloaded_instrument); + + if (!downloaded_instrument) + return E_POINTER; + + if (!downloaded_object->downloaded) + return DMUS_E_NOT_DOWNLOADED_TO_PORT; - FIXME("(%p/%p)->(%p): stub\n", iface, This, downloaded_instrument); + HeapFree(GetProcessHeap(), 0, downloaded_object->data); + downloaded_object->data = NULL; + downloaded_object->downloaded = FALSE; return S_OK; }

1 0

Christian Costa : dmusic: Move IDirectMusicDownloadedInstrument to port. c since it is port dependant and perform COM cleanup.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: 494fbc69cad43fe799efe18092859010d9aee698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494fbc69cad43fe799efe1809… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 24 09:46:10 2012 +0100 dmusic: Move IDirectMusicDownloadedInstrument to port.c since it is port dependant and perform COM cleanup. --- dlls/dmusic/Makefile.in | 1 - dlls/dmusic/dmusic_private.h | 9 ++-- dlls/dmusic/downloadedinstrument.c | 88 ------------------------------------ dlls/dmusic/port.c | 78 +++++++++++++++++++++++++++++++- 4 files changed, 81 insertions(+), 95 deletions(-) diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index 7522194..46aed59 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -8,7 +8,6 @@ C_SRCS = \ dmusic.c \ dmusic_main.c \ download.c \ - downloadedinstrument.c \ instrument.c \ port.c diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 3e5c6c2..1872177 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -95,7 +95,6 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LP /* Internal */ extern HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) DECLSPEC_HIDDEN; -extern HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; @@ -136,11 +135,11 @@ struct IDirectMusicBufferImpl { * IDirectMusicDownloadedInstrumentImpl implementation structure */ struct IDirectMusicDownloadedInstrumentImpl { - /* IUnknown fields */ - const IDirectMusicDownloadedInstrumentVtbl *lpVtbl; - LONG ref; + /* IUnknown fields */ + IDirectMusicDownloadedInstrument IDirectMusicDownloadedInstrument_iface; + LONG ref; - /* IDirectMusicDownloadedInstrumentImpl fields */ + /* IDirectMusicDownloadedInstrumentImpl fields */ }; /***************************************************************************** diff --git a/dlls/dmusic/downloadedinstrument.c b/dlls/dmusic/downloadedinstrument.c deleted file mode 100644 index b64d8ac..0000000 --- a/dlls/dmusic/downloadedinstrument.c +++ /dev/null @@ -1,88 +0,0 @@ -/* IDirectMusicDownloadedInstrument Implementation - * - * Copyright (C) 2003-2004 Rok Mandeljc - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "dmusic_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); - -/* IDirectMusicDownloadedInstrumentImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface, REFIID riid, LPVOID *ppobj) { - IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface; - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown) - || IsEqualIID (riid, &IID_IDirectMusicDownloadedInstrument) - || IsEqualIID (riid, &IID_IDirectMusicDownloadedInstrument8)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) { - IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); - - DMUSIC_LockModule(); - - return refCount; -} - -static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) { - IDirectMusicDownloadedInstrumentImpl *This = (IDirectMusicDownloadedInstrumentImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); - - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMUSIC_UnlockModule(); - - return refCount; -} - -/* IDirectMusicDownloadedInstrumentImpl IDirectMusicDownloadedInstrument part: */ -/* none at this time */ - -static const IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrument_Vtbl = { - IDirectMusicDownloadedInstrumentImpl_QueryInterface, - IDirectMusicDownloadedInstrumentImpl_AddRef, - IDirectMusicDownloadedInstrumentImpl_Release -}; - -/* for ClassFactory */ -HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusicDownloadedInstrumentImpl* dmdlinst; - - dmdlinst = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadedInstrumentImpl)); - if (NULL == dmdlinst) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - dmdlinst->lpVtbl = &DirectMusicDownloadedInstrument_Vtbl; - dmdlinst->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicDownloadedInstrumentImpl_QueryInterface ((LPDIRECTMUSICDOWNLOADEDINSTRUMENT)dmdlinst, lpcGUID, ppobj); -} diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index b6489a7..eb139ca 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicDownloadedInstrumentImpl, IDirectMusicDownloadedInstrument_iface); +} + static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicPort(IDirectMusicPort *iface) { return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicPort_iface); @@ -38,6 +43,77 @@ static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicThru(IDirectMus return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicThru_iface); } +/* IDirectMusicDownloadedInstrument IUnknown part follows: */ +static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirectMusicDownloadedInstrument *iface, REFIID riid, VOID **ret_iface) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument) || + IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument8)) + { + IDirectMusicDownloadedInstrument_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); + + return E_NOINTERFACE; +} + +static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef(LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) +{ + IDirectMusicDownloadedInstrumentImpl *This = impl_from_IDirectMusicDownloadedInstrument(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + DMUSIC_LockModule(); + + return ref; +} + +static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release(LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface) +{ + IDirectMusicDownloadedInstrumentImpl *This = impl_from_IDirectMusicDownloadedInstrument(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + DMUSIC_UnlockModule(); + + return ref; +} + +static const IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrument_Vtbl = { + IDirectMusicDownloadedInstrumentImpl_QueryInterface, + IDirectMusicDownloadedInstrumentImpl_AddRef, + IDirectMusicDownloadedInstrumentImpl_Release +}; + +HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument **instrument) +{ + IDirectMusicDownloadedInstrumentImpl *object; + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + { + *instrument = NULL; + return E_OUTOFMEMORY; + } + + object->IDirectMusicDownloadedInstrument_iface.lpVtbl = &DirectMusicDownloadedInstrument_Vtbl; + object->ref = 1; + + *instrument = &object->IDirectMusicDownloadedInstrument_iface; + + return S_OK; +} + /* SynthPortImpl IDirectMusicPort IUnknown part follows: */ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ret_iface) { @@ -157,7 +233,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECT if (!instrument || !downloaded_instrument || (num_note_ranges && !note_ranges)) return E_POINTER; - return DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(&IID_IDirectMusicDownloadedInstrument, (LPVOID*)downloaded_instrument, NULL); + return DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(downloaded_instrument); } static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *downloaded_instrument)

1 0

Dmitry Timoshkov : wineps.drv: Update dmFormName when merging DEVMODE structures.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: 0f7ed96fda2e9c97f1b3b087a54d1a88fed13e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f7ed96fda2e9c97f1b3b087a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 24 14:56:30 2012 +0800 wineps.drv: Update dmFormName when merging DEVMODE structures. --- dlls/wineps.drv/driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 8cc1b1c..c1e49d7 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -117,6 +117,12 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *p TRACE("Changing page to %s %d x %d\n", page->FullName, dm1->dmPublic.u1.s1.dmPaperWidth, dm1->dmPublic.u1.s1.dmPaperLength ); + + if (dm1->dmPublic.dmSize >= FIELD_OFFSET(DEVMODEW, dmFormName) + CCHFORMNAME * sizeof(WCHAR)) + { + MultiByteToWideChar(CP_ACP, 0, page->FullName, -1, dm1->dmPublic.dmFormName, CCHFORMNAME); + dm1->dmPublic.dmFields |= DM_FORMNAME; + } } else TRACE("Trying to change to unsupported pagesize %d\n", dm2->dmPublic.u1.s1.dmPaperSize);

1 0

Dmitry Timoshkov : wineps.drv: Properly handle dmFormName in unicode DEVMODE structure.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: 383318bc0292f84fd8e070b33ec2ed3e69e115bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=383318bc0292f84fd8e070b33… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 24 14:56:23 2012 +0800 wineps.drv: Properly handle dmFormName in unicode DEVMODE structure. --- dlls/wineps.drv/driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 2ad8925..8cc1b1c 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -178,7 +178,7 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *p if (dm2->dmPublic.dmFields & DM_COLLATE ) dm1->dmPublic.dmCollate = dm2->dmPublic.dmCollate; if (dm2->dmPublic.dmFields & DM_FORMNAME ) - lstrcpynA((LPSTR)dm1->dmPublic.dmFormName, (LPCSTR)dm2->dmPublic.dmFormName, CCHFORMNAME); + lstrcpynW(dm1->dmPublic.dmFormName, dm2->dmPublic.dmFormName, CCHFORMNAME); if (dm2->dmPublic.dmFields & DM_BITSPERPEL ) dm1->dmPublic.dmBitsPerPel = dm2->dmPublic.dmBitsPerPel; if (dm2->dmPublic.dmFields & DM_PELSWIDTH )

1 0

Dmitry Timoshkov : wineps.drv: Update dmFormName when dmPaperSize is being changed through UI.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: ef489d647a29ad8dc0ac9b30102e64feaae7a6bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef489d647a29ad8dc0ac9b301… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 24 14:56:13 2012 +0800 wineps.drv: Update dmFormName when dmPaperSize is being changed through UI. --- dlls/wineps.drv/driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index a086e46..2ad8925 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -337,6 +337,12 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, TRACE("Setting pagesize to item %d Winpage = %d\n", Cursel, ps->WinPage); di->dlgdm->dmPublic.u1.s1.dmPaperSize = ps->WinPage; di->dlgdm->dmPublic.dmFields |= DM_PAPERSIZE; + + if (di->dlgdm->dmPublic.dmSize >= FIELD_OFFSET(DEVMODEW, dmFormName) + CCHFORMNAME * sizeof(WCHAR)) + { + MultiByteToWideChar(CP_ACP, 0, ps->FullName, -1, di->dlgdm->dmPublic.dmFormName, CCHFORMNAME); + di->dlgdm->dmPublic.dmFields |= DM_FORMNAME; + } SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); } break;

1 0

Dmitry Timoshkov : wineps.drv: Add an ability to select device resolution from UI.
by Alexandre Julliard 24 Dec '12

24 Dec '12

1 0

Dmitry Timoshkov : wineps.drv: Make sure that DEVMODE fields changed through UI are marked as set.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: c374201be11e1f6a01a0f8fe22d41aea512b9799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c374201be11e1f6a01a0f8fe2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 24 14:59:42 2012 +0800 wineps.drv: Make sure that DEVMODE fields changed through UI are marked as set. --- dlls/wineps.drv/driver.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 790ed43..a086e46 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -336,6 +336,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, } TRACE("Setting pagesize to item %d Winpage = %d\n", Cursel, ps->WinPage); di->dlgdm->dmPublic.u1.s1.dmPaperSize = ps->WinPage; + di->dlgdm->dmPublic.dmFields |= DM_PAPERSIZE; SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); } break; @@ -345,6 +346,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, "portrait" : "landscape"); di->dlgdm->dmPublic.u1.s1.dmOrientation = wParam == IDD_ORIENT_PORTRAIT ? DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE; + di->dlgdm->dmPublic.dmFields |= DM_ORIENTATION; SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); break; case IDD_DUPLEX: @@ -358,6 +360,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, } TRACE("Setting duplex to item %d Winduplex = %d\n", Cursel, duplex->WinDuplex); di->dlgdm->dmPublic.dmDuplex = duplex->WinDuplex; + di->dlgdm->dmPublic.dmFields |= DM_DUPLEX; SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); } break;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: 2b2dac7f0d6099a31a852de993b5ebadfbfaf1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2dac7f0d6099a31a852de99… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Dec 21 19:26:01 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1ecd6e9..acb28c6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-12-13 21:48+0300\n" +"PO-Revision-Date: 2012-12-21 19:24+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10129,27 +10129,27 @@ msgstr "" #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "Dalybos iš nulio klaida.\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "Tikėtasi operando.\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "Netikėta tinklo klaida.\n" +msgstr "Tikėtasi operacijos ženklo.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "Skliaustų neatitiktis.\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"Blogai sudarytas skaičius – privalo būti dešimtainis (12),\n" +" šešioliktainis (0x34) arba aštuntainis (056).\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Piotr Caban : msvcrt: Added _stricmp_l implementation.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: dbec250635d6bef389dbbf3296e949f4653b1276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbec250635d6bef389dbbf329… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 24 12:10:21 2012 +0100 msvcrt: Added _stricmp_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/string.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 7 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a09b142..64b4105 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1331,7 +1331,7 @@ @ stub _strerror_s @ stub _strftime_l @ cdecl _stricmp(str str) msvcrt._stricmp -@ stub _stricmp_l +@ cdecl _stricmp_l(str str ptr) msvcrt._stricmp_l @ cdecl _stricoll(str str) msvcrt._stricoll @ cdecl _stricoll_l(str str ptr) msvcrt._stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4457c2c..91147cf 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -993,7 +993,7 @@ @ stub _strerror_s @ stub _strftime_l @ cdecl _stricmp(str str) msvcrt._stricmp -@ stub _stricmp_l +@ cdecl _stricmp_l(str str ptr) msvcrt._stricmp_l @ cdecl _stricoll(str str) msvcrt._stricoll @ cdecl _stricoll_l(str str ptr) msvcrt._stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c20c5fd..abde141 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -986,7 +986,7 @@ @ stub _strerror_s @ stub _strftime_l @ cdecl _stricmp(str str) msvcrt._stricmp -@ stub _stricmp_l +@ cdecl _stricmp_l(str str ptr) msvcrt._stricmp_l @ cdecl _stricoll(str str) msvcrt._stricoll @ cdecl _stricoll_l(str str ptr) msvcrt._stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0d0886f..096f77a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -863,6 +863,8 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); /* _get_output_format return code */ #define MSVCRT__TWO_DIGIT_EXPONENT 0x1 +#define MSVCRT__NLSCMPERROR ((unsigned int)0x7fffffff) + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6802104..3d15a21 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -918,7 +918,7 @@ @ cdecl _stat64(str ptr) MSVCRT_stat64 @ cdecl _stati64(str ptr) MSVCRT_stati64 @ cdecl _statusfp() -@ cdecl _strcmpi(str str) ntdll._strcmpi +@ cdecl _strcmpi(str str) MSVCRT__stricmp @ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l @ cdecl _strdate(ptr) MSVCRT__strdate @ cdecl _strdate_s(ptr long) @@ -926,8 +926,8 @@ # stub _strdup_dbg(str long str long) @ cdecl _strerror(long) MSVCRT__strerror # stub _strerror_s(ptr long long) -@ cdecl _stricmp(str str) ntdll._stricmp -# stub _stricmp_l(str str ptr) +@ cdecl _stricmp(str str) MSVCRT__stricmp +@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll @ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l @ cdecl _strlwr(str) MSVCRT__strlwr diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a254158..b457510 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1551,9 +1551,46 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 #undef I10_OUTPUT_MAX_PREC /********************************************************************* - * memcpy (NTDLL.@) + * memcpy (MSVCRT.@) */ void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n ) { return memmove( dst, src, n ); } + +/********************************************************************* + * _stricmp_l (MSVCRT.@) + */ +int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + char c1, c2; + + if(!MSVCRT_CHECK_PMT(s1!=NULL && s2!=NULL)) + return MSVCRT__NLSCMPERROR; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) + return strcasecmp(s1, s2); + + do { + c1 = MSVCRT__tolower_l(*s1++, locale); + c2 = MSVCRT__tolower_l(*s2++, locale); + if(c1 != c2) + break; + }while(c1 && c1==c2); + + return c1-c2; +} + +/********************************************************************* + * _stricmp (MSVCRT.@) + */ +int __cdecl MSVCRT__stricmp(const char *s1, const char *s2) +{ + return MSVCRT__stricmp_l(s1, s2, NULL); +} diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index bbaeda0..f2fd8f9 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2438,6 +2438,36 @@ static void test__atodbl(void) ok(ret == _OVERFLOW, "_atodbl(&d, \"1e309\") returned %d, expected _OVERFLOW\n", ret); } +static void test__stricmp(void) +{ + int ret; + + ret = _stricmp("test", "test"); + ok(ret == 0, "_stricmp returned %d\n", ret); + ret = _stricmp("a", "z"); + ok(ret < 0, "_stricmp returned %d\n", ret); + ret = _stricmp("z", "a"); + ok(ret > 0, "_stricmp returned %d\n", ret); + ret = _stricmp("\xa5", "\xb9"); + ok(ret < 0, "_stricmp returned %d\n", ret); + + if(!setlocale(LC_ALL, "polish")) { + win_skip("stricmp tests"); + return; + } + + ret = _stricmp("test", "test"); + ok(ret == 0, "_stricmp returned %d\n", ret); + ret = _stricmp("a", "z"); + ok(ret < 0, "_stricmp returned %d\n", ret); + ret = _stricmp("z", "a"); + ok(ret > 0, "_stricmp returned %d\n", ret); + ret = _stricmp("\xa5", "\xb9"); + ok(ret == 0, "_stricmp returned %d\n", ret); + + setlocale(LC_ALL, "C"); +} + START_TEST(string) { char mem[100]; @@ -2533,4 +2563,5 @@ START_TEST(string) test_wctomb(); test_tolower(); test__atodbl(); + test__stricmp(); }

1 0

Jacek Caban : jscript: Don't pass 'this' argument to DISPID_VALUE of pure IDispatch interfaces.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: 7726e018442b9e4e1501239277529560982e5391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7726e018442b9e4e150123927… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 11:38:28 2012 +0100 jscript: Don't pass 'this' argument to DISPID_VALUE of pure IDispatch interfaces. --- dlls/jscript/dispex.c | 17 ++++- dlls/jscript/tests/run.c | 156 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 155 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7726e018442b9e4e15012…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
55
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 December 2012