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

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

11 May '12

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

Dmitry Timoshkov : gdiplus: Use OUTLINETEXTMETRIC instead of LOGFONT to store GpFont metrics.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: c626528a91505292487a4a3b72721122dd68f951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c626528a91505292487a4a3b7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 19:20:31 2012 +0900 gdiplus: Use OUTLINETEXTMETRIC instead of LOGFONT to store GpFont metrics. --- dlls/gdiplus/font.c | 203 +++++++++++++++++++--------------------- dlls/gdiplus/gdiplus_private.h | 7 +- 2 files changed, 97 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c626528a91505292487a4…

1 0

Dmitry Timoshkov : gdiplus: Fetch font family metrics from truetype font data.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 83e88af325c993fad3052cb9e29fd137c332bb87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e88af325c993fad3052cb9e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 19:21:00 2012 +0900 gdiplus: Fetch font family metrics from truetype font data. --- dlls/gdiplus/font.c | 213 ++++++++++++++++++++++++++++++++-------- dlls/gdiplus/gdiplus_private.h | 3 +- 2 files changed, 173 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83e88af325c993fad3052…

1 0

Dmitry Timoshkov : gdiplus: Add a bunch of tests for internal font metrics.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: a90fcbff00b3c53189588b63b66d15e58eb7a79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90fcbff00b3c53189588b63b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 19:21:36 2012 +0900 gdiplus: Add a bunch of tests for internal font metrics. --- dlls/gdiplus/tests/font.c | 319 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 319 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a90fcbff00b3c53189588…

1 0

Józef Kucia : d3dx9: Print a real pixel format in a FIXME message.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 685be772518f9a7755bd47d8e3ff3b718326d2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=685be772518f9a7755bd47d8e… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 11 13:18:43 2012 +0200 d3dx9: Print a real pixel format in a FIXME message. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a78d8cf..43b58e3 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1541,7 +1541,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileW(const WCHAR *dst_filename, D3DXIMAGE_FILEF if (src_format_desc->format == D3DFMT_UNKNOWN || dst_format_desc->format == D3DFMT_UNKNOWN) { FIXME("Unsupported pixel format conversion %#x -> %#x\n", - src_format_desc->format, dst_format_desc->format); + src_surface_desc.Format, d3d_pixel_format); hr = E_NOTIMPL; goto cleanup; }

1 0

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

11 May '12

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

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

11 May '12

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

Hans Leidekker : secur32/tests: Add tests for the Negotiate provider.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: cb90e6b1a643f35ba31c6e2790986dfcf0ac3c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb90e6b1a643f35ba31c6e279… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:06:46 2012 +0200 secur32/tests: Add tests for the Negotiate provider. --- dlls/secur32/tests/Makefile.in | 1 + dlls/secur32/tests/negotiate.c | 383 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 384 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb90e6b1a643f35ba31c6…

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICBitmapLock methods.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: f745f48bdfecdb2ed265a3f65720443d0965a363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f745f48bdfecdb2ed265a3f65… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:35:20 2012 -0500 windowscodecs: Add wrapper functions for IWICBitmapLock methods. --- dlls/windowscodecs/proxy.c | 12 ++++++++++++ dlls/windowscodecs/windowscodecs.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index f6d9649..5d45167 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -36,6 +36,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IWICBitmapLock_GetDataPointer_Proxy_W(IWICBitmapLock *iface, + UINT *pcbBufferSize, BYTE **ppbData) +{ + return IWICBitmapLock_GetDataPointer(iface, pcbBufferSize, ppbData); +} + +HRESULT WINAPI IWICBitmapLock_GetStride_Proxy_W(IWICBitmapLock *iface, + UINT *pcbStride) +{ + return IWICBitmapLock_GetStride(iface, pcbStride); +} + HRESULT WINAPI IWICBitmapSource_GetSize_Proxy_W(IWICBitmapSource *iface, UINT *puiWidth, UINT *puiHeight) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index c4b8873..4c30c43 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -41,8 +41,8 @@ @ stub IWICBitmapFrameEncode_SetSize_Proxy @ stub IWICBitmapFrameEncode_SetThumbnail_Proxy @ stub IWICBitmapFrameEncode_WriteSource_Proxy -@ stub IWICBitmapLock_GetDataPointer_STA_Proxy -@ stub IWICBitmapLock_GetStride_Proxy +@ stdcall IWICBitmapLock_GetDataPointer_STA_Proxy(ptr ptr ptr) IWICBitmapLock_GetDataPointer_Proxy_W +@ stdcall IWICBitmapLock_GetStride_Proxy(ptr ptr) IWICBitmapLock_GetStride_Proxy_W @ stub IWICBitmapScaler_Initialize_Proxy @ stdcall IWICBitmapSource_CopyPalette_Proxy(ptr ptr) IWICBitmapSource_CopyPalette_Proxy_W @ stdcall IWICBitmapSource_CopyPixels_Proxy(ptr ptr long long ptr) IWICBitmapSource_CopyPixels_Proxy_W

1 0

Vincent Povirk : windowscodecs: Add wrapper for IWICBitmapFlipRotator_Initialize.
by Alexandre Julliard 10 May '12

10 May '12

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