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

Alexandre Julliard : Wine release 1.5.4
by Alexandre Julliard 11 May '12

11 May '12

Module: website Branch: master Commit: 9981c6c5201c5b64c480e2c1c85a2bfc322171f3 URL: http://source.winehq.org/git/website.git/?a=commit;h=9981c6c5201c5b64c480e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 20:18:34 2012 +0200 Wine release 1.5.4 --- news/en/2012051101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012051101.xml b/news/en/2012051101.xml new file mode 100644 index 0000000..7b95af8 --- /dev/null +++ b/news/en/2012051101.xml @@ -0,0 +1,17 @@ +<news> +<date>May 11, 2012</date> +<title>Wine 1.5.4 Released</title> +<body> + The Wine development release 1.5.4 is now available. + <a href="{$root}/announce/1.5.4">What's new</a> in this release: +<ul> + <li>A new DirectSound resampler.</li> + <li>A Negotiate authentication provider.</li> + <li>OpenGL support in the DIB engine.</li> + <li>Beginnings of support for .NET mixed assemblies.</li> + <li>Support routines for Internationalized Domain Names.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.4.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.4 : Alexandre Julliard : Release 1.5.4
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: refs/tags/wine-1.5.4 Tag: 2e4a9be71a3ea5ab447f53839093444e841b9eaf URL: http://source.winehq.org/git/wine.git/?a=tag;h=2e4a9be71a3ea5ab447f53839093… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 20:08:11 2012 +0200 Release 1.5.4

1 0

Alexandre Julliard : Release 1.5.4.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 935418cb3c2732c1fb9733d24bfa18f6d79cec15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935418cb3c2732c1fb9733d24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 20:08:09 2012 +0200 Release 1.5.4. --- ANNOUNCE | 827 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 416 insertions(+), 431 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=935418cb3c2732c1fb973…

1 0

Andrew Eikum : winmm: Don't call MMDevAPI during process exit.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 47332210dd029379f6fe8a1344225e98e8941257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47332210dd029379f6fe8a134… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 10 14:17:34 2012 -0500 winmm: Don't call MMDevAPI during process exit. --- dlls/winmm/waveform.c | 80 ++++++++++++++++++++++++++++++++++++++----------- dlls/winmm/winmm.c | 33 +++++-------------- 2 files changed, 71 insertions(+), 42 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index a985ee8..602eb06 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -139,6 +139,8 @@ static UINT g_inmmdevices_count; static IMMDeviceEnumerator *g_devenum; +#define WINMM_WM_QUIT WM_USER + static CRITICAL_SECTION g_devthread_lock; static CRITICAL_SECTION_DEBUG g_devthread_lock_debug = { @@ -185,25 +187,64 @@ void WINMM_DeleteWaveform(void) { UINT i, j; - for(i = 0; i < g_outmmdevices_count; ++i){ - WINMM_MMDevice *mmdevice = &g_out_mmdevices[i]; - for(j = 0; j < MAX_DEVICES && mmdevice->devices[j]; ++j){ - WINMM_Device *device = mmdevice->devices[j]; - if(device->open) + if(g_devices_hwnd){ + for(i = 0; i < g_outmmdevices_count; ++i){ + WINMM_MMDevice *mmdevice = &g_out_mmdevices[i]; + for(j = 0; j < MAX_DEVICES && mmdevice->devices[j]; ++j){ + WINMM_Device *device = mmdevice->devices[j]; SendMessageW(g_devices_hwnd, WODM_CLOSE, (WPARAM)device->handle, 0); + } } - } - for(i = 0; i < g_inmmdevices_count; ++i){ - WINMM_MMDevice *mmdevice = &g_in_mmdevices[i]; - for(j = 0; j < MAX_DEVICES && mmdevice->devices[j]; ++j){ - WINMM_Device *device = mmdevice->devices[j]; - if(device->open) + for(i = 0; i < g_inmmdevices_count; ++i){ + WINMM_MMDevice *mmdevice = &g_in_mmdevices[i]; + for(j = 0; j < MAX_DEVICES && mmdevice->devices[j]; ++j){ + WINMM_Device *device = mmdevice->devices[j]; SendMessageW(g_devices_hwnd, WIDM_CLOSE, (WPARAM)device->handle, 0); + } + } + + SendMessageW(g_devices_hwnd, WINMM_WM_QUIT, 0, 0); + + for(i = 0; i < g_outmmdevices_count; ++i){ + WINMM_MMDevice *mmdevice = &g_out_mmdevices[i]; + + for(j = 0; j < MAX_DEVICES && mmdevice->devices[j]; ++j){ + WINMM_Device *device = mmdevice->devices[j]; + if(device->handle) + CloseHandle(device->handle); + DeleteCriticalSection(&device->lock); + } + + if(mmdevice->volume) + ISimpleAudioVolume_Release(mmdevice->volume); + CoTaskMemFree(mmdevice->dev_id); + DeleteCriticalSection(&mmdevice->lock); + } + + for(i = 0; i < g_inmmdevices_count; ++i){ + WINMM_MMDevice *mmdevice = &g_in_mmdevices[i]; + + for(j = 0; j < MAX_DEVICES && mmdevice->devices[j]; ++j){ + WINMM_Device *device = mmdevice->devices[j]; + if(device->handle) + CloseHandle(device->handle); + DeleteCriticalSection(&device->lock); + } + + if(mmdevice->volume) + ISimpleAudioVolume_Release(mmdevice->volume); + CoTaskMemFree(mmdevice->dev_id); + DeleteCriticalSection(&mmdevice->lock); } + + HeapFree(GetProcessHeap(), 0, g_out_mmdevices); + HeapFree(GetProcessHeap(), 0, g_in_mmdevices); + + HeapFree(GetProcessHeap(), 0, g_device_handles); + HeapFree(GetProcessHeap(), 0, g_handle_devices); } - /* FIXME: Free g_(in,out)_mmdevices? */ DeleteCriticalSection(&g_devthread_lock); } @@ -2146,6 +2187,13 @@ static LRESULT CALLBACK WINMM_DevicesMsgProc(HWND hwnd, UINT msg, WPARAM wparam, case DRV_QUERYDEVICEINTERFACESIZE: case DRV_QUERYDEVICEINTERFACE: return DRV_QueryDeviceInterface((WINMM_QueryInterfaceInfo*)wparam); + case WINMM_WM_QUIT: + TRACE("QUIT message received\n"); + DestroyWindow(g_devices_hwnd); + g_devices_hwnd = NULL; + IMMDeviceEnumerator_Release(g_devenum); + CoUninitialize(); + return 0; } return DefWindowProcW(hwnd, msg, wparam, lparam); } @@ -2200,6 +2248,8 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) MSG msg; if(PeekMessageW(&msg, g_devices_hwnd, 0, 0, PM_REMOVE)) WARN("Unexpected message: 0x%x\n", msg.message); + if(!g_devices_hwnd) + break; }else if(wait < g_devhandle_count + WAIT_OBJECT_0){ WINMM_Device *device = g_handle_devices[wait - WAIT_OBJECT_0]; if(device->render) @@ -2211,12 +2261,6 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) GetLastError()); } - DestroyWindow(g_devices_hwnd); - - IMMDeviceEnumerator_Release(g_devenum); - - CoUninitialize(); - return 0; } diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 714a84e..26ac410 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -82,18 +82,6 @@ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) return TRUE; } -/************************************************************************** - * WINMM_DeleteIData [internal] - */ -static void WINMM_DeleteIData(void) -{ - TIME_MMTimeStop(); - - WINMM_DeleteWaveform(); - CloseHandle(psLastEvent); - DeleteCriticalSection(&WINMM_cs); -} - /****************************************************************** * WINMM_ErrorToString */ @@ -153,20 +141,17 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) return FALSE; break; case DLL_PROCESS_DETACH: - /* close all opened MCI drivers */ + if(fImpLoad) + break; + MCI_SendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0L); MMDRV_Exit(); - /* There's no guarantee the drivers haven't already been unloaded on - * process shutdown. - */ - if (!fImpLoad) - { - /* now unload all remaining drivers... */ - DRIVER_UnloadAll(); - } - - WINMM_DeleteIData(); - break; + DRIVER_UnloadAll(); + WINMM_DeleteWaveform(); + TIME_MMTimeStop(); + CloseHandle(psLastEvent); + DeleteCriticalSection(&WINMM_cs); + break; } return TRUE; }

1 0

Eric Pouech : winegcc: Try harder to find out whether the compiler is from gcc family.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: b21da1d7018be09cd33c87bea06890447784666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21da1d7018be09cd33c87bea… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 10 22:43:26 2012 +0200 winegcc: Try harder to find out whether the compiler is from gcc family. --- tools/winegcc/winegcc.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7d03119..318c86a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -395,10 +395,10 @@ static char *get_lib_dir( struct options *opts ) static void compile(struct options* opts, const char* lang) { strarray* comp_args = strarray_alloc(); - unsigned int j; + unsigned int i, j; int gcc_defs = 0; - char* gcc; - char* gpp; + strarray* gcc; + strarray* gpp; strarray_addall(comp_args, get_translator(opts)); switch(opts->processor) @@ -409,16 +409,19 @@ static void compile(struct options* opts, const char* lang) /* mixing different C and C++ compilers isn't supported in configure anyway */ case proc_cc: case proc_cxx: - gcc = build_tool_name(opts, "gcc", CC); - gpp = build_tool_name(opts, "g++", CXX); + gcc = strarray_fromstring(build_tool_name(opts, "gcc", CC), " "); + gpp = strarray_fromstring(build_tool_name(opts, "g++", CXX), " "); for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) { const char *cc = comp_args->base[j]; - gcc_defs = strendswith(cc, gcc) || strendswith(cc, gpp); + for (i = 0; !gcc_defs && i < gcc->size; i++) + gcc_defs = gcc->base[i][0] != '-' && strendswith(cc, gcc->base[i]); + for (i = 0; !gcc_defs && i < gpp->size; i++) + gcc_defs = gpp->base[i][0] != '-' && strendswith(cc, gpp->base[i]); } - free(gcc); - free(gpp); + strarray_free(gcc); + strarray_free(gpp); break; }

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 91208527972751cfbb44d0f84ad96bf1dbbf1cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=91208527972751cfbb44d0f84… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 10 23:36:40 2012 +0200 po: Update French translation. --- po/fr.po | 33 +-------------------------------- 1 files changed, 1 insertions(+), 32 deletions(-) diff --git a/po/fr.po b/po/fr.po index 91976bd..d9e7a66 100644 --- a/po/fr.po +++ b/po/fr.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-03-14 22:57+0100\n" +"PO-Revision-Date: 2012-05-10 23:36+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -6670,37 +6670,6 @@ msgid "insert disk %s" msgstr "insérez le disque %s" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n"

1 0

Christian Costa : dmsynth: Cleanup QueryInterface methods.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 6894f384f1085bd94491cb1a724114215fd110bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6894f384f1085bd94491cb1a7… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 11 08:18:42 2012 +0200 dmsynth: Cleanup QueryInterface methods. --- dlls/dmsynth/synth.c | 37 +++++++++++++++++++++---------------- dlls/dmsynth/synthsink.c | 38 ++++++++++++++++++++++---------------- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 657f3bd..e5d5e1c 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -34,27 +34,32 @@ static inline IDirectMusicSynth8Impl *impl_from_IDirectMusicSynth8(IDirectMusicS } /* IDirectMusicSynth8Impl IUnknown part: */ -static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(LPDIRECTMUSICSYNTH8 iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(LPDIRECTMUSICSYNTH8 iface, REFIID riid, LPVOID *ret_iface) { - IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualIID (riid, &IID_IDirectMusicSynth) || - IsEqualIID (riid, &IID_IDirectMusicSynth8)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - else if (IsEqualIID(riid, &IID_IKsControl)) { - IUnknown_AddRef(iface); - *ppobj = &This->IKsControl_iface; - return S_OK; + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualIID (riid, &IID_IDirectMusicSynth) || + IsEqualIID (riid, &IID_IDirectMusicSynth8)) + { + IUnknown_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + else if (IsEqualIID(riid, &IID_IKsControl)) + { + IUnknown_AddRef(iface); + *ret_iface = &This->IKsControl_iface; + return S_OK; } - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; + *ret_iface = NULL; + + WARN("(%p)->(%s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); + + return E_NOINTERFACE; } static ULONG WINAPI IDirectMusicSynth8Impl_AddRef(LPDIRECTMUSICSYNTH8 iface) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 42c2d4c..a63f36c 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -30,25 +30,31 @@ static inline IDirectMusicSynthSinkImpl *impl_from_IDirectMusicSynthSink(IDirect } /* IDirectMusicSynthSinkImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ret_iface) { - IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualIID (riid, &IID_IDirectMusicSynthSink)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - else if (IsEqualIID(riid, &IID_IKsControl)) { - IUnknown_AddRef(iface); - *ppobj = &This->IKsControl_iface; - return S_OK; + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualIID (riid, &IID_IDirectMusicSynthSink)) + { + IUnknown_AddRef(iface); + *ret_iface = iface; + return S_OK; } + else if (IsEqualIID(riid, &IID_IKsControl)) + { + IUnknown_AddRef(iface); + *ret_iface = &This->IKsControl_iface; + return S_OK; + } + + *ret_iface = NULL; + + WARN("(%p)->(%s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; + return E_NOINTERFACE; } static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK iface)

1 0

Christian Costa : dmusic: Variable spelling fix.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 1501d3a49a57b94d6865306fc3dfffa867c2624d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1501d3a49a57b94d6865306fc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 11 08:19:10 2012 +0200 dmusic: Variable spelling fix. --- dlls/dmusic/instrument.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 0578b79..6eaa708 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -132,16 +132,16 @@ HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) { - ULONG readed; + ULONG bytes_read; HRESULT hr; - hr = IStream_Read(stream, data, size, &readed); + hr = IStream_Read(stream, data, size, &bytes_read); if(FAILED(hr)){ TRACE("IStream_Read failed: %08x\n", hr); return hr; } - if(readed < size){ - TRACE("Didn't read full chunk: %u < %u\n", readed, size); + if (bytes_read < size) { + TRACE("Didn't read full chunk: %u < %u\n", bytes_read, size); return E_FAIL; }

1 0

Christian Costa : dmusic: Display new ref in trace for AddRef and Release for IDirectMusicInstrument .
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 5ae4238cea5c3219d6249d40f031291f99003f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae4238cea5c3219d6249d40f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 11 08:19:18 2012 +0200 dmusic: Display new ref in trace for AddRef and Release for IDirectMusicInstrument. --- dlls/dmusic/instrument.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 6eaa708..9c3d3d6 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -57,30 +57,29 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_QueryInterface(LPDIRECTMUSICINS static ULONG WINAPI IDirectMusicInstrumentImpl_AddRef(LPDIRECTMUSICINSTRUMENT iface) { - IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT iface) { - IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) + HeapFree(GetProcessHeap(), 0, This); - DMUSIC_UnlockModule(); - - return refCount; + DMUSIC_UnlockModule(); + + return ref; } /* IDirectMusicInstrumentImpl IDirectMusicInstrument part: */

1 0

Dmitry Timoshkov : gdiplus: Retrieve LOGFONT from a GpFont using GdipGetLogFontW instead of accessing it directly .
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 2c93bf7e4e469b36d3244f5a5f3c3c0ca0e0d897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c93bf7e4e469b36d3244f5a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 19:19:21 2012 +0900 gdiplus: Retrieve LOGFONT from a GpFont using GdipGetLogFontW instead of accessing it directly. --- dlls/gdiplus/graphics.c | 12 +++++++----- dlls/gdiplus/graphicspath.c | 5 ++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a5e3eb2..38335a8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2136,15 +2136,13 @@ void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont) rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); - lfw = font->lfw; - lfw.lfHeight = roundr(-font->pixel_size * rel_height); + GdipGetLogFontW((GpFont *)font, graphics, &lfw); + lfw.lfHeight = roundr(lfw.lfHeight * rel_height); unscaled_font = CreateFontIndirectW(&lfw); SelectObject(hdc, unscaled_font); GetTextMetricsW(hdc, &textmet); - lfw = font->lfw; - lfw.lfHeight = roundr(-font->pixel_size * rel_height); lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width / rel_height); lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); @@ -4919,6 +4917,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, { GpStatus stat; int i; + LOGFONTW lfw; HFONT oldfont; struct measure_ranges_args args; HDC hdc, temp_hdc=NULL; @@ -4932,6 +4931,9 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (regionCount < stringFormat->range_count) return InvalidParameter; + stat = GdipGetLogFontW((GpFont *)font, graphics, &lfw); + if (stat != Ok) return stat; + if(!graphics->hdc) { hdc = temp_hdc = CreateCompatibleDC(0); @@ -4943,7 +4945,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (stringFormat->attr) TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr); - oldfont = SelectObject(hdc, CreateFontIndirectW(&font->lfw)); + oldfont = SelectObject(hdc, CreateFontIndirectW(&lfw)); for (i=0; i<stringFormat->range_count; i++) { diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index d37512e..5da53b2 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -942,6 +942,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT { GpFont *font; GpStatus status; + LOGFONTW lfw; HANDLE hfont; HDC dc; GpPath *backup; @@ -956,7 +957,9 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT if (status != Ok) return status; - hfont = CreateFontIndirectW(&font->lfw); + status = GdipGetLogFontW((GpFont *)font, NULL, &lfw); + if (status != Ok) return status; + hfont = CreateFontIndirectW(&lfw); if (!hfont) { WARN("Failed to create font\n");

1 0