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

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

May 11, 2012

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 May 11, 2012

May 11, 2012

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

Józef Kucia : d3dx9/tests: Move tests for texture functions from surface.c to texture.c.
by Alexandre Julliard May 11, 2012

May 11, 2012

Module: wine Branch: master Commit: cf8963868591bc8fe13dfbd4574cf5a93ba7cc3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8963868591bc8fe13dfbd45… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 11 13:18:44 2012 +0200 d3dx9/tests: Move tests for texture functions from surface.c to texture.c. --- dlls/d3dx9_36/tests/surface.c | 86 ----------------------------- dlls/d3dx9_36/tests/texture.c | 122 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf8963868591bc8fe13df…

1 0

Dmitry Timoshkov : gdiplus: Use appropriate accessors to calculate font height instead of accessing GpFont internals directly .
by Alexandre Julliard May 11, 2012

May 11, 2012

Module: wine Branch: master Commit: 915cd7b5b27381b2899b0402458f78e955c86186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915cd7b5b27381b2899b04024… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 19:19:59 2012 +0900 gdiplus: Use appropriate accessors to calculate font height instead of accessing GpFont internals directly. --- dlls/gdiplus/font.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a07333a..5b57ec6 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -504,14 +504,26 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, */ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, REAL *height) { - REAL font_height; + GpStatus stat; + INT style; + UINT16 line_spacing, em_height; + REAL font_height, font_size; + + if (!font || !height) return InvalidParameter; TRACE("%p (%s), %f, %p\n", font, - debugstr_w(font->lfw.lfFaceName), dpi, height); + debugstr_w(font->family->FamilyName), dpi, height); - if (!(font && height)) return InvalidParameter; + stat = GdipGetFontSize((GpFont *)font, &font_size); + if (stat != Ok) return stat; + stat = GdipGetFontStyle((GpFont *)font, &style); + if (stat != Ok) return stat; + stat = GdipGetLineSpacing(font->family, style, &line_spacing); + if (stat != Ok) return stat; + stat = GdipGetEmHeight(font->family, style, &em_height); + if (stat != Ok) return stat; - font_height = font->line_spacing * (font->emSize / font->height); + font_height = (REAL)line_spacing * font_size / (REAL)em_height; switch (font->unit) {

1 0

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

May 11, 2012

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

Christian Costa : dmsynth: Cleanup QueryInterface methods.
by Alexandre Julliard May 11, 2012

May 11, 2012

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

André Hentschel : winspool: Implement SetPrinterW for level 2.
by Alexandre Julliard May 11, 2012

May 11, 2012

Module: wine Branch: master Commit: 7508a5d4b2d5246ea9c19afd734274d12ca4b5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7508a5d4b2d5246ea9c19afd7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 10 20:08:57 2012 +0200 winspool: Implement SetPrinterW for level 2. --- dlls/winspool.drv/info.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 33caaad..614cfa2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -748,6 +748,11 @@ PRINTCAP_LoadPrinters(void) { return hadprinter; } +static inline DWORD set_reg_DWORD(HKEY hkey, LPCSTR keyname, const DWORD value) +{ + return RegSetValueExA(hkey, keyname, 0, REG_DWORD, (const BYTE*)&value, sizeof(value)); +} + static inline DWORD set_reg_szW(HKEY hkey, const WCHAR *keyname, const WCHAR *value) { if (value) @@ -2874,6 +2879,30 @@ BOOL WINAPI SetPrinterA( HANDLE printer, DWORD level, LPBYTE data, DWORD command return ret; } +static void set_printer_2( HKEY key, const PRINTER_INFO_2W *pi ) +{ + set_reg_szW( key, NameW, pi->pPrinterName ); + set_reg_szW( key, Share_NameW, pi->pShareName ); + set_reg_szW( key, PortW, pi->pPortName ); + set_reg_szW( key, Printer_DriverW, pi->pDriverName ); + set_reg_szW( key, DescriptionW, pi->pComment ); + set_reg_szW( key, LocationW, pi->pLocation ); + + if (pi->pDevMode) + set_reg_devmode( key, Default_DevModeW, pi->pDevMode ); + + set_reg_szW( key, Separator_FileW, pi->pSepFile ); + set_reg_szW( key, Print_ProcessorW, pi->pPrintProcessor ); + set_reg_szW( key, DatatypeW, pi->pDatatype ); + set_reg_szW( key, ParametersW, pi->pParameters ); + + set_reg_DWORD( key, "Attributes", pi->Attributes ); + set_reg_DWORD( key, "Priority", pi->Priority ); + set_reg_DWORD( key, "Default Priority", pi->DefaultPriority ); + set_reg_DWORD( key, "StartTime", pi->StartTime ); + set_reg_DWORD( key, "UntilTime", pi->UntilTime ); +} + static BOOL set_printer_9( HKEY key, const PRINTER_INFO_9W *pi ) { if (!pi->pDevMode) return FALSE; @@ -2899,6 +2928,14 @@ BOOL WINAPI SetPrinterW( HANDLE printer, DWORD level, LPBYTE data, DWORD command switch (level) { + case 2: + { + PRINTER_INFO_2W *pi2 = (PRINTER_INFO_2W *)data; + set_printer_2( key, pi2 ); + ret = TRUE; + break; + } + case 9: { PRINTER_INFO_9W *pi = (PRINTER_INFO_9W *)data;

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICPalette methods.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 2fc7cdc93f6dc8ed67498b74193423c44e5bb770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc7cdc93f6dc8ed67498b741… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:49:22 2012 -0500 windowscodecs: Add wrapper functions for IWICPalette methods. --- dlls/windowscodecs/proxy.c | 48 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 16 +++++----- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 011c074..ec3ed9b 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -247,6 +247,54 @@ HRESULT WINAPI IWICImagingFactory_CreateStream_Proxy_W(IWICImagingFactory *pFact return IWICImagingFactory_CreateStream(pFactory, ppIWICStream); } +HRESULT WINAPI IWICPalette_InitializePredefined_Proxy_W(IWICPalette *iface, + WICBitmapPaletteType ePaletteType, BOOL fAddTransparentColor) +{ + return IWICPalette_InitializePredefined(iface, ePaletteType, fAddTransparentColor); +} + +HRESULT WINAPI IWICPalette_InitializeCustom_Proxy_W(IWICPalette *iface, + WICColor *pColors, UINT colorCount) +{ + return IWICPalette_InitializeCustom(iface, pColors, colorCount); +} + +HRESULT WINAPI IWICPalette_InitializeFromBitmap_Proxy_W(IWICPalette *iface, + IWICBitmapSource *pISurface, UINT colorCount, BOOL fAddTransparentColor) +{ + return IWICPalette_InitializeFromBitmap(iface, pISurface, colorCount, fAddTransparentColor); +} + +HRESULT WINAPI IWICPalette_InitializeFromPalette_Proxy_W(IWICPalette *iface, + IWICPalette *pIPalette) +{ + return IWICPalette_InitializeFromPalette(iface, pIPalette); +} + +HRESULT WINAPI IWICPalette_GetType_Proxy_W(IWICPalette *iface, + WICBitmapPaletteType *pePaletteType) +{ + return IWICPalette_GetType(iface, pePaletteType); +} + +HRESULT WINAPI IWICPalette_GetColorCount_Proxy_W(IWICPalette *iface, + UINT *pcCount) +{ + return IWICPalette_GetColorCount(iface, pcCount); +} + +HRESULT WINAPI IWICPalette_GetColors_Proxy_W(IWICPalette *iface, + UINT colorCount, WICColor *pColors, UINT *pcActualColors) +{ + return IWICPalette_GetColors(iface, colorCount, pColors, pcActualColors); +} + +HRESULT WINAPI IWICPalette_HasAlpha_Proxy_W(IWICPalette *iface, + BOOL *pfHasAlpha) +{ + return IWICPalette_HasAlpha(iface, pfHasAlpha); +} + HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT SDKVersion, IWICImagingFactory **ppIImagingFactory) { TRACE("%x, %p\n", SDKVersion, ppIImagingFactory); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 813b7d9..8636343 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -91,14 +91,14 @@ @ stub IWICMetadataQueryReader_GetMetadataByName_Proxy @ stub IWICMetadataQueryWriter_RemoveMetadataByName_Proxy @ stub IWICMetadataQueryWriter_SetMetadataByName_Proxy -@ stub IWICPalette_GetColorCount_Proxy -@ stub IWICPalette_GetColors_Proxy -@ stub IWICPalette_GetType_Proxy -@ stub IWICPalette_HasAlpha_Proxy -@ stub IWICPalette_InitializeCustom_Proxy -@ stub IWICPalette_InitializeFromBitmap_Proxy -@ stub IWICPalette_InitializeFromPalette_Proxy -@ stub IWICPalette_InitializePredefined_Proxy +@ stdcall IWICPalette_GetColorCount_Proxy(ptr ptr) IWICPalette_GetColorCount_Proxy_W +@ stdcall IWICPalette_GetColors_Proxy(ptr long ptr ptr) IWICPalette_GetColors_Proxy_W +@ stdcall IWICPalette_GetType_Proxy(ptr ptr) IWICPalette_GetType_Proxy_W +@ stdcall IWICPalette_HasAlpha_Proxy(ptr ptr) IWICPalette_HasAlpha_Proxy_W +@ stdcall IWICPalette_InitializeCustom_Proxy(ptr ptr long) IWICPalette_InitializeCustom_Proxy_W +@ stdcall IWICPalette_InitializeFromBitmap_Proxy(ptr ptr long long) IWICPalette_InitializeFromBitmap_Proxy_W +@ stdcall IWICPalette_InitializeFromPalette_Proxy(ptr ptr) IWICPalette_InitializeFromPalette_Proxy_W +@ stdcall IWICPalette_InitializePredefined_Proxy(ptr long long) IWICPalette_InitializePredefined_Proxy_W @ stub IWICPixelFormatInfo_GetBitsPerPixel_Proxy @ stub IWICPixelFormatInfo_GetChannelCount_Proxy @ stub IWICPixelFormatInfo_GetChannelMask_Proxy

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICBitmap methods.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 1f0ec3cba5ce6e3089b572ea6ca82cf50e3a9b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f0ec3cba5ce6e3089b572ea6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:41:44 2012 -0500 windowscodecs: Add wrapper functions for IWICBitmap methods. --- dlls/windowscodecs/proxy.c | 18 ++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index b8cfcbc..011c074 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -84,6 +84,24 @@ HRESULT WINAPI IWICBitmapSource_CopyPixels_Proxy_W(IWICBitmapSource *iface, return IWICBitmapSource_CopyPixels(iface, prc, cbStride, cbBufferSize, pbBuffer); } +HRESULT WINAPI IWICBitmap_Lock_Proxy_W(IWICBitmap *iface, + const WICRect *prcLock, DWORD flags, IWICBitmapLock **ppILock) +{ + return IWICBitmap_Lock(iface, prcLock, flags, ppILock); +} + +HRESULT WINAPI IWICBitmap_SetPalette_Proxy_W(IWICBitmap *iface, + IWICPalette *pIPalette) +{ + return IWICBitmap_SetPalette(iface, pIPalette); +} + +HRESULT WINAPI IWICBitmap_SetResolution_Proxy_W(IWICBitmap *iface, + double dpiX, double dpiY) +{ + return IWICBitmap_SetResolution(iface, dpiX, dpiY); +} + HRESULT WINAPI IWICColorContext_InitializeFromMemory_Proxy_W(IWICColorContext *iface, const BYTE *pbBuffer, UINT cbBufferSize) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 65cb54b..813b7d9 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -49,9 +49,9 @@ @ stdcall IWICBitmapSource_GetPixelFormat_Proxy(ptr ptr) IWICBitmapSource_GetPixelFormat_Proxy_W @ stdcall IWICBitmapSource_GetResolution_Proxy(ptr ptr ptr) IWICBitmapSource_GetResolution_Proxy_W @ stdcall IWICBitmapSource_GetSize_Proxy(ptr ptr ptr) IWICBitmapSource_GetSize_Proxy_W -@ stub IWICBitmap_Lock_Proxy -@ stub IWICBitmap_SetPalette_Proxy -@ stub IWICBitmap_SetResolution_Proxy +@ stdcall IWICBitmap_Lock_Proxy(ptr ptr long ptr) IWICBitmap_Lock_Proxy_W +@ stdcall IWICBitmap_SetPalette_Proxy(ptr ptr) IWICBitmap_SetPalette_Proxy_W +@ stdcall IWICBitmap_SetResolution_Proxy(ptr double double) IWICBitmap_SetResolution_Proxy_W @ stdcall IWICColorContext_InitializeFromMemory_Proxy(ptr ptr long) IWICColorContext_InitializeFromMemory_Proxy_W @ stub IWICComponentFactory_CreateMetadataWriterFromReader_Proxy @ stub IWICComponentFactory_CreateQueryWriterFromBlockWriter_Proxy

1 0

Vincent Povirk : windowscodecs: Add wrapper for IWICBitmapFlipRotator_Initialize.
by Alexandre Julliard May 10, 2012

May 10, 2012

Module: wine Branch: master Commit: 9294d4e95f3819dbb5e0ff25272d88e393076c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9294d4e95f3819dbb5e0ff252… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:37:37 2012 -0500 windowscodecs: Add wrapper for IWICBitmapFlipRotator_Initialize. --- dlls/windowscodecs/proxy.c | 6 ++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 5d45167..b8cfcbc 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -36,6 +36,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IWICBitmapFlipRotator_Initialize_Proxy_W(IWICBitmapFlipRotator *iface, + IWICBitmapSource *pISource, WICBitmapTransformOptions options) +{ + return IWICBitmapFlipRotator_Initialize(iface, pISource, options); +} + HRESULT WINAPI IWICBitmapLock_GetDataPointer_Proxy_W(IWICBitmapLock *iface, UINT *pcbBufferSize, BYTE **ppbData) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 4c30c43..65cb54b 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -29,7 +29,7 @@ @ stub IWICBitmapEncoder_Initialize_Proxy @ stub IWICBitmapEncoder_SetPalette_Proxy @ stub IWICBitmapEncoder_SetThumbnail_Proxy -@ stub IWICBitmapFlipRotator_Initialize_Proxy +@ stdcall IWICBitmapFlipRotator_Initialize_Proxy(ptr ptr long) IWICBitmapFlipRotator_Initialize_Proxy_W @ stub IWICBitmapFrameDecode_GetColorContexts_Proxy @ stub IWICBitmapFrameDecode_GetMetadataQueryReader_Proxy @ stub IWICBitmapFrameDecode_GetThumbnail_Proxy

1 0