November 2012 - Wine-commits

Detlef Riekenberg : ktmw32: Add a stub for CreateTransaction.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: e3df9043e9e8921110ea4e0aeb30a68b6c0b053b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3df9043e9e8921110ea4e0ae… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 16 01:07:56 2012 +0100 ktmw32: Add a stub for CreateTransaction. --- dlls/ktmw32/ktmw32.spec | 2 +- dlls/ktmw32/ktmw32_main.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/ktmw32/ktmw32.spec b/dlls/ktmw32/ktmw32.spec index 062f1f2..cda7bbd 100644 --- a/dlls/ktmw32/ktmw32.spec +++ b/dlls/ktmw32/ktmw32.spec @@ -4,7 +4,7 @@ @ stub CommitTransactionAsync @ stub CreateEnlistment @ stub CreateResourceManager -@ stub CreateTransaction +@ stdcall CreateTransaction(ptr ptr long long long long wstr) @ stub CreateTransactionManager @ stub GetCurrentClockTransactionManager @ stub GetEnlistmentId diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 738b11d..0650b09 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -23,6 +23,9 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ktmw32); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -39,3 +42,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/*********************************************************************** + * CreateTransaction (ktmw32.@) + */ +HANDLE WINAPI CreateTransaction(LPSECURITY_ATTRIBUTES pattr, LPGUID pguid, DWORD options, + DWORD level, DWORD flags, DWORD timeout, LPWSTR description) +{ + + FIXME("(%p %p 0x%x 0x%x 0x%x, %u, %s): stub\n", + pattr, pguid, options, level, flags, timeout, debugstr_w(description)); + + return (HANDLE) 1; +}

1 0

Marcus Meissner : wininet: Move freeing netconn into create_netconn_socket (Coverity).
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 02a80554f833a86851bccd80b0ca21246d4cba05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a80554f833a86851bccd80b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Nov 14 19:59:31 2012 +0100 wininet: Move freeing netconn into create_netconn_socket (Coverity). --- dlls/wininet/netconnection.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index b746b54..2abb676 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -655,7 +655,6 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t if (!res) { closesocket(netconn->socketFD); - heap_free(netconn); return ERROR_INTERNET_CANNOT_CONNECT; } else if (res > 0) @@ -674,10 +673,8 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t ioctlsocket(netconn->socketFD, FIONBIO, &flag); } } - if(result == -1) { - heap_free(netconn); + if(result == -1) return sock_get_error(errno); - } #ifdef TCP_NODELAY flag = 1; @@ -717,9 +714,13 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m list_init(&netconn->pool_entry); result = create_netconn_socket(server, netconn, timeout); + if (result != ERROR_SUCCESS) { + heap_free(netconn); + return result; + } + server_addref(server); netconn->server = server; - *ret = netconn; return result; }

1 0

Christian Inci : wined3d: Add support for nVidia GT 640M.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 83ed5efb31ea142a44d5649c81c6dec63aa0fa96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ed5efb31ea142a44d5649c8… Author: Christian Inci <chris.pcguy.inci(a)gmail.com> Date: Wed Nov 14 03:46:46 2012 +0100 wined3d: Add support for nVidia GT 640M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6060a48..58dc0da 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1110,6 +1110,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1512,6 +1513,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ + {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e026f74..ec7c3bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1434,6 +1434,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, + CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180,

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext:: GetExifColorSpace.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: da7c8c6331b93dc2b6ed5ec27f520fbf0099e027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7c8c6331b93dc2b6ed5ec27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:08:47 2012 +0100 windowscodecs: Implement IWICColorContext::GetExifColorSpace. --- dlls/windowscodecs/colorcontext.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 5c8e4db..ba23387 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -158,8 +158,11 @@ static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface, UINT *pValue) { - FIXME("(%p,%p)\n", iface, pValue); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%p)\n", iface, pValue); + + *pValue = This->exif_color_space; + return S_OK; } static const IWICColorContextVtbl ColorContext_Vtbl = {

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext::GetProfileBytes .
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: ffa558bbaa3f28dd9c50222fadcdeaadbf9a3902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa558bbaa3f28dd9c50222fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:09:15 2012 +0100 windowscodecs: Implement IWICColorContext::GetProfileBytes. --- dlls/windowscodecs/colorcontext.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index ba23387..5434fc6 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -151,8 +151,18 @@ static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, UINT cbBuffer, BYTE *pbBuffer, UINT *pcbActual) { - FIXME("(%p,%u,%p,%p)\n", iface, cbBuffer, pbBuffer, pcbActual); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%u,%p,%p)\n", iface, cbBuffer, pbBuffer, pcbActual); + + if (This->type != WICColorContextProfile) + return WINCODEC_ERR_NOTINITIALIZED; + + if (cbBuffer >= This->profile_len && pbBuffer) + memcpy(pbBuffer, This->profile, This->profile_len); + + *pcbActual = This->profile_len; + + return S_OK; } static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface,

1 0

Hans Leidekker : windowscodecs: Add tests for IWICColorContext.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: b671f2573e265e63fd68212f0113dde0af43ab99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b671f2573e265e63fd68212f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:09:48 2012 +0100 windowscodecs: Add tests for IWICColorContext. --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/pngformat.c | 469 ++++++++++++++++++++++++++++++++++ 2 files changed, 470 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b671f2573e265e63fd682…

1 0

Hans Leidekker : windowscodecs: GetThumbnail should be supported for ICO frames.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 6395af1ae7b0cc5f2f1f82796502e2a605bc5a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6395af1ae7b0cc5f2f1f82796… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:10:31 2012 +0100 windowscodecs: GetThumbnail should be supported for ICO frames. --- dlls/windowscodecs/icoformat.c | 4 ++-- dlls/windowscodecs/tests/icoformat.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 6cccc3e..4e83ec0 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -200,8 +200,8 @@ static HRESULT WINAPI IcoFrameDecode_GetColorContexts(IWICBitmapFrameDecode *ifa static HRESULT WINAPI IcoFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - TRACE("(%p,%p)\n", iface, ppIThumbnail); - return WINCODEC_ERR_CODECNOTHUMBNAIL; + FIXME("(%p,%p)\n", iface, ppIThumbnail); + return E_NOTIMPL; } static const IWICBitmapFrameDecodeVtbl IcoFrameDecode_Vtbl = { diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index 3974dfc..e9c0a48 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -134,9 +134,16 @@ static void test_bad_icondirentry_size(void) if (SUCCEEDED(hr)) { UINT width = 0, height = 0; + IWICBitmapSource *thumbnail = NULL; + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); + + hr = IWICBitmapFrameDecode_GetThumbnail(framedecode, &thumbnail); + todo_wine ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); + + if (thumbnail) IWICBitmapSource_Release(thumbnail); IWICBitmapFrameDecode_Release(framedecode); }

1 0

Hans Leidekker : advapi32: Avoid a buffer overflow in CredUnmarshalCredentialW.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: bff64e8578d54fa27ee9667d70812c72b8db4d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff64e8578d54fa27ee9667d7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:12:22 2012 +0100 advapi32: Avoid a buffer overflow in CredUnmarshalCredentialW. Spotted by Stefan Leichter. --- dlls/advapi32/cred.c | 7 +++++-- dlls/advapi32/tests/cred.c | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index b2597b6..b735821 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <time.h> +#include <limits.h> #ifdef __APPLE__ # include <Security/SecKeychain.h> @@ -2102,7 +2103,7 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) */ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVOID *out ) { - unsigned int len, buflen, size; + unsigned int len, buflen; TRACE("%s, %p, %p\n", debugstr_w(cred), type, out); @@ -2134,8 +2135,10 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO case UsernameTargetCredential: { USERNAME_TARGET_CREDENTIAL_INFO *target; + ULONGLONG size = 0; - if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR)) + if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || + !size || size % sizeof(WCHAR) || size > INT_MAX) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 3d37a3c..83212c5 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -670,6 +670,14 @@ static void test_CredUnmarshalCredentialA(void) ok( username->UserName != NULL, "UserName is NULL\n" ); ok( !lstrcmpW( username->UserName, testW ), "got %s\n", wine_dbgstr_w(username->UserName) ); pCredFree( username ); + + type = 0; + username = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@CA-----0BQZAMHA0BA", &type, (void **)&username ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); } static void test_CredIsMarshaledCredentialA(void)

1 0

Alexandre Julliard : gdi32: Don' t load bitmap glyphs when using subpixel rendering in GetGlyphOutline.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: ebaf5ea17623268fb1c0f68b1cf9a5984bd4e46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebaf5ea17623268fb1c0f68b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 13:29:21 2012 +0100 gdi32: Don't load bitmap glyphs when using subpixel rendering in GetGlyphOutline. --- dlls/gdi32/freetype.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 79a0975..98c66a0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5997,12 +5997,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, needsTransform = TRUE; } - if (needsTransform || (format == GGO_NATIVE || format == GGO_BEZIER || - format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP || - format == GGO_GRAY8_BITMAP)) - { - load_flags |= FT_LOAD_NO_BITMAP; - } + if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags);

1 0

Alexandre Julliard : user32: Use the default GUI font for unspecified font parameters.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: bfc8bc4d27e5abee5e483ef6dca518a49aab6c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc8bc4d27e5abee5e483ef6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 13:28:22 2012 +0100 user32: Use the default GUI font for unspecified font parameters. --- dlls/user32/sysparams.c | 52 ++++++++++------------------------------------- 1 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index fa97815..8519142 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -361,6 +361,7 @@ struct sysparam_binary_entry struct sysparam_font_entry { struct sysparam_entry hdr; + UINT weight; LOGFONTW val; }; @@ -1193,7 +1194,12 @@ static BOOL get_font_entry( union sysparam_all_entry *entry, UINT int_param, voi { LOGFONTW font; - if (!reg_get_logfont( entry->hdr.regkey, entry->hdr.regval, &font )) return FALSE; + if (!reg_get_logfont( entry->hdr.regkey, entry->hdr.regval, &font )) + { + /* use the default GUI font */ + GetObjectW( GetStockObject( DEFAULT_GUI_FONT ), sizeof(font), &font ); + font.lfWeight = entry->font.weight; + } entry->font.val = font; entry->hdr.loaded = TRUE; } @@ -1331,9 +1337,9 @@ static BOOL set_entry( void *ptr, UINT int_param, void *ptr_param, UINT flags ) struct sysparam_binary_entry entry_##name = { { get_binary_entry, set_binary_entry, \ SPI_SET ## name ##_REGKEY, SPI_SET ## name ##_VALNAME }, &(data), sizeof(data) } -#define FONT_ENTRY(name) \ +#define FONT_ENTRY(name,weight) \ struct sysparam_font_entry entry_##name = { { get_font_entry, set_font_entry, \ - SPI_SET ## name ##_REGKEY, SPI_SET ## name ##_VALNAME } } + SPI_SET ## name ##_REGKEY, SPI_SET ## name ##_VALNAME }, (weight) } #define USERPREF_ENTRY(name,offset,mask) \ struct sysparam_pref_entry entry_##name = { { get_userpref_entry, set_userpref_entry }, \ @@ -1400,7 +1406,7 @@ static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); static BYTE user_prefs[8] = { 0x30, 0x00, 0x02, 0x80, 0x10, 0x00, 0x00, 0x00 }; static BINARY_ENTRY( USERPREFERENCESMASK, user_prefs ); -static FONT_ENTRY( ICONTITLELOGFONT ); +static FONT_ENTRY( ICONTITLELOGFONT, FW_NORMAL ); static USERPREF_ENTRY( MENUANIMATION, 0, 0x02 ); static USERPREF_ENTRY( COMBOBOXANIMATION, 0, 0x04 ); @@ -1599,43 +1605,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = set_entry( &entry_DOUBLECLKHEIGHT, uiParam, pvParam, fWinIni ); break; case SPI_GETICONTITLELOGFONT: - if (!pvParam) return FALSE; - if (!get_entry( &entry_ICONTITLELOGFONT, uiParam, pvParam )) - { - LOGFONTW lfDefault, *font = &entry_ICONTITLELOGFONT.val; - INT r; - - /* - * The 'default GDI fonts' seems to be returned. - * If a returned font is not a correct font in your environment, - * please try to fix objects/gdiobj.c at first. - */ - GetObjectW( GetStockObject( DEFAULT_GUI_FONT ), sizeof(LOGFONTW), &lfDefault ); - - GetProfileStringW( Desktop, IconTitleFaceName, lfDefault.lfFaceName, - font->lfFaceName, LF_FACESIZE ); - - r = GetProfileIntW( Desktop, IconTitleSize, 0 ); - if (r) - font->lfHeight = -r; - else - font->lfHeight = lfDefault.lfHeight; - - font->lfWidth = 0; - font->lfEscapement = 0; - font->lfOrientation = 0; - font->lfWeight = FW_NORMAL; - font->lfItalic = FALSE; - font->lfStrikeOut = FALSE; - font->lfUnderline = FALSE; - font->lfCharSet = lfDefault.lfCharSet; /* at least 'charset' should not be hard-coded */ - font->lfOutPrecision = OUT_DEFAULT_PRECIS; - font->lfClipPrecision = CLIP_DEFAULT_PRECIS; - font->lfQuality = DEFAULT_QUALITY; - font->lfPitchAndFamily = DEFAULT_PITCH; - entry_ICONTITLELOGFONT.hdr.loaded = TRUE; - *(LOGFONTW *)pvParam = *font; - } + ret = get_entry( &entry_ICONTITLELOGFONT, uiParam, pvParam ); break; case SPI_SETDOUBLECLICKTIME: ret = set_entry( &entry_DOUBLECLICKTIME, uiParam, pvParam, fWinIni );

1 0