April 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Use the same test for resizable windows when setting size and mwm hints.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 4d14adfea37f31970294d75b981025a9b4e90ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d14adfea37f31970294d75b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 11:25:48 2008 +0200 winex11: Use the same test for resizable windows when setting size and mwm hints. --- dlls/winex11.drv/window.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4d1148b..2953337 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -131,6 +131,20 @@ BOOL X11DRV_is_window_rect_mapped( const RECT *rect ) /*********************************************************************** + * is_window_resizable + * + * Check if window should be made resizable by the window manager + */ +static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD style ) +{ + if (style & WS_THICKFRAME) return TRUE; + /* Metacity needs the window to be resizable to make it fullscreen */ + return (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && + data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height); +} + + +/*********************************************************************** * get_mwm_decorations */ static unsigned long get_mwm_decorations( DWORD style, DWORD ex_style ) @@ -798,20 +812,13 @@ static void set_size_hints( Display *display, struct x11drv_win_data *data, DWOR size_hints->flags |= PWinGravity | PPosition; } - if ( !(style & WS_THICKFRAME) ) + if (!is_window_resizable( data, style )) { - /* If we restrict window resizing Metacity decides that it should - * disable fullscreen support for this window as well. - */ - if (!(data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && - data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height)) - { - size_hints->max_width = data->whole_rect.right - data->whole_rect.left; - size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; - size_hints->min_width = size_hints->max_width; - size_hints->min_height = size_hints->max_height; - size_hints->flags |= PMinSize | PMaxSize; - } + size_hints->max_width = data->whole_rect.right - data->whole_rect.left; + size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; + size_hints->min_width = size_hints->max_width; + size_hints->min_height = size_hints->max_height; + size_hints->flags |= PMinSize | PMaxSize; } XSetWMNormalHints( display, data->whole_window, size_hints ); XFree( size_hints ); @@ -958,7 +965,7 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; mwm_hints.decorations = get_mwm_decorations( style, ex_style ); mwm_hints.functions = MWM_FUNC_MOVE; - if (style & WS_THICKFRAME) mwm_hints.functions |= MWM_FUNC_RESIZE; + if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE;

1 0

Reece Dunn : shlwapi/tests: Fixed the wide-character strings.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 33f788f7cbe125c863821169381ff80158796c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f788f7cbe125c8638211693… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Thu Apr 3 00:13:28 2008 +0100 shlwapi/tests: Fixed the wide-character strings. --- dlls/shlwapi/tests/istream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 8eac740..7172e31 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -285,7 +285,7 @@ static void test_SHCreateStreamOnFileW(DWORD mode) IStream * stream; HRESULT ret; ULONG refcount; - static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't' }; + static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't', '\0' }; trace("SHCreateStreamOnFileW: testing mode %d\n", mode); @@ -382,7 +382,7 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) IStream * template = NULL; HRESULT ret; ULONG refcount; - static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't' }; + static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't', '\0' }; trace("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm);

1 0

Stefan Dösinger : wined3d: Advertize postpixelshader blending for surfaces.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: ffbc96b43c8888dc9a5c07370a8f1ebd09241f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbc96b43c8888dc9a5c07370… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 3 16:14:57 2008 +0200 wined3d: Advertize postpixelshader blending for surfaces. --- dlls/wined3d/directx.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8e14309..7450f3c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2416,6 +2416,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + + /* Check QUERY_POSTPIXELSHADER_BLENDING support */ + if(Usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) { + if(CheckPostPixelShaderBlendingCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; + } else { + TRACE_(d3d_caps)("[FAILED] - No query post pixelshader blending support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else if(RType == WINED3DRTYPE_TEXTURE) { /* Texture allows: * - D3DUSAGE_AUTOGENMIPMAP

1 0

Stefan Dösinger : wined3d: Advertise shader emulation of bumpmap formats.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 03bacf72479a3775380e832933cfe59abdb343f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03bacf72479a3775380e83293… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 3 17:15:47 2008 +0200 wined3d: Advertise shader emulation of bumpmap formats. --- dlls/wined3d/directx.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7450f3c..cbbb043 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2126,11 +2126,19 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) GL_SUPPORT(ATI_FRAGMENT_SHADER)) { return TRUE; } + if(GL_SUPPORT(ARB_FRAGMENT_SHADER) || GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + /* Shader emulated */ + return TRUE; + } TRACE_(d3d_caps)("[FAILED] - No converted formats on volumes\n"); return FALSE; case WINED3DFMT_X8L8V8U8: case WINED3DFMT_L6V5U5: + if(GL_SUPPORT(ARB_FRAGMENT_SHADER) || GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + /* Shader emulated */ + return TRUE; + } WARN_(d3d_caps)("[FAILED]\n"); return FALSE; @@ -2140,6 +2148,10 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) WARN_(d3d_caps)("[Not supported, but pretended to do]\n"); return TRUE; } + if(GL_SUPPORT(ARB_FRAGMENT_SHADER) || GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + /* Shader emulated */ + return TRUE; + } TRACE_(d3d_caps)("[FAILED] - No converted formats on volumes\n"); return FALSE;

1 0

Andrew Talbot : rsaenh: Remove tentative declaration of static array with no size specifier.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 722b659064afbf40caa843d0bf272e4ae68b1695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722b659064afbf40caa843d0b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Apr 3 14:50:33 2008 +0100 rsaenh: Remove tentative declaration of static array with no size specifier. --- dlls/rsaenh/mpi.c | 80 ++++++++++++++++++++++++++--------------------------- 1 files changed, 39 insertions(+), 41 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index e06d2ee..45c3b94 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -31,9 +31,6 @@ #include <stdarg.h> #include "tomcrypt.h" -/* table of first PRIME_SIZE primes */ -static const mp_digit __prime_tab[]; - /* Known optimal configurations CPU /Compiler /MUL CUTOFF/SQR CUTOFF ------------------------------------------------------------- @@ -3034,6 +3031,45 @@ mp_mulmod (const mp_int * a, const mp_int * b, mp_int * c, mp_int * d) return res; } +/* table of first PRIME_SIZE primes */ +static const mp_digit __prime_tab[] = { + 0x0002, 0x0003, 0x0005, 0x0007, 0x000B, 0x000D, 0x0011, 0x0013, + 0x0017, 0x001D, 0x001F, 0x0025, 0x0029, 0x002B, 0x002F, 0x0035, + 0x003B, 0x003D, 0x0043, 0x0047, 0x0049, 0x004F, 0x0053, 0x0059, + 0x0061, 0x0065, 0x0067, 0x006B, 0x006D, 0x0071, 0x007F, 0x0083, + 0x0089, 0x008B, 0x0095, 0x0097, 0x009D, 0x00A3, 0x00A7, 0x00AD, + 0x00B3, 0x00B5, 0x00BF, 0x00C1, 0x00C5, 0x00C7, 0x00D3, 0x00DF, + 0x00E3, 0x00E5, 0x00E9, 0x00EF, 0x00F1, 0x00FB, 0x0101, 0x0107, + 0x010D, 0x010F, 0x0115, 0x0119, 0x011B, 0x0125, 0x0133, 0x0137, + + 0x0139, 0x013D, 0x014B, 0x0151, 0x015B, 0x015D, 0x0161, 0x0167, + 0x016F, 0x0175, 0x017B, 0x017F, 0x0185, 0x018D, 0x0191, 0x0199, + 0x01A3, 0x01A5, 0x01AF, 0x01B1, 0x01B7, 0x01BB, 0x01C1, 0x01C9, + 0x01CD, 0x01CF, 0x01D3, 0x01DF, 0x01E7, 0x01EB, 0x01F3, 0x01F7, + 0x01FD, 0x0209, 0x020B, 0x021D, 0x0223, 0x022D, 0x0233, 0x0239, + 0x023B, 0x0241, 0x024B, 0x0251, 0x0257, 0x0259, 0x025F, 0x0265, + 0x0269, 0x026B, 0x0277, 0x0281, 0x0283, 0x0287, 0x028D, 0x0293, + 0x0295, 0x02A1, 0x02A5, 0x02AB, 0x02B3, 0x02BD, 0x02C5, 0x02CF, + + 0x02D7, 0x02DD, 0x02E3, 0x02E7, 0x02EF, 0x02F5, 0x02F9, 0x0301, + 0x0305, 0x0313, 0x031D, 0x0329, 0x032B, 0x0335, 0x0337, 0x033B, + 0x033D, 0x0347, 0x0355, 0x0359, 0x035B, 0x035F, 0x036D, 0x0371, + 0x0373, 0x0377, 0x038B, 0x038F, 0x0397, 0x03A1, 0x03A9, 0x03AD, + 0x03B3, 0x03B9, 0x03C7, 0x03CB, 0x03D1, 0x03D7, 0x03DF, 0x03E5, + 0x03F1, 0x03F5, 0x03FB, 0x03FD, 0x0407, 0x0409, 0x040F, 0x0419, + 0x041B, 0x0425, 0x0427, 0x042D, 0x043F, 0x0443, 0x0445, 0x0449, + 0x044F, 0x0455, 0x045D, 0x0463, 0x0469, 0x047F, 0x0481, 0x048B, + + 0x0493, 0x049D, 0x04A3, 0x04A9, 0x04B1, 0x04BD, 0x04C1, 0x04C7, + 0x04CD, 0x04CF, 0x04D5, 0x04E1, 0x04EB, 0x04FD, 0x04FF, 0x0503, + 0x0509, 0x050B, 0x0511, 0x0515, 0x0517, 0x051B, 0x0527, 0x0529, + 0x052F, 0x0551, 0x0557, 0x055D, 0x0565, 0x0577, 0x0581, 0x058F, + 0x0593, 0x0595, 0x0599, 0x059F, 0x05A7, 0x05AB, 0x05AD, 0x05B3, + 0x05BF, 0x05C9, 0x05CB, 0x05CF, 0x05D1, 0x05D5, 0x05DB, 0x05E7, + 0x05F3, 0x05FB, 0x0607, 0x060D, 0x0611, 0x0617, 0x061F, 0x0623, + 0x062B, 0x062F, 0x063D, 0x0641, 0x0647, 0x0649, 0x064D, 0x0653 +}; + /* determines if an integers is divisible by one * of the first PRIME_SIZE primes or not * @@ -3810,44 +3846,6 @@ mp_zero (mp_int * a) memset (a->dp, 0, sizeof (mp_digit) * a->alloc); } -static const mp_digit __prime_tab[] = { - 0x0002, 0x0003, 0x0005, 0x0007, 0x000B, 0x000D, 0x0011, 0x0013, - 0x0017, 0x001D, 0x001F, 0x0025, 0x0029, 0x002B, 0x002F, 0x0035, - 0x003B, 0x003D, 0x0043, 0x0047, 0x0049, 0x004F, 0x0053, 0x0059, - 0x0061, 0x0065, 0x0067, 0x006B, 0x006D, 0x0071, 0x007F, 0x0083, - 0x0089, 0x008B, 0x0095, 0x0097, 0x009D, 0x00A3, 0x00A7, 0x00AD, - 0x00B3, 0x00B5, 0x00BF, 0x00C1, 0x00C5, 0x00C7, 0x00D3, 0x00DF, - 0x00E3, 0x00E5, 0x00E9, 0x00EF, 0x00F1, 0x00FB, 0x0101, 0x0107, - 0x010D, 0x010F, 0x0115, 0x0119, 0x011B, 0x0125, 0x0133, 0x0137, - - 0x0139, 0x013D, 0x014B, 0x0151, 0x015B, 0x015D, 0x0161, 0x0167, - 0x016F, 0x0175, 0x017B, 0x017F, 0x0185, 0x018D, 0x0191, 0x0199, - 0x01A3, 0x01A5, 0x01AF, 0x01B1, 0x01B7, 0x01BB, 0x01C1, 0x01C9, - 0x01CD, 0x01CF, 0x01D3, 0x01DF, 0x01E7, 0x01EB, 0x01F3, 0x01F7, - 0x01FD, 0x0209, 0x020B, 0x021D, 0x0223, 0x022D, 0x0233, 0x0239, - 0x023B, 0x0241, 0x024B, 0x0251, 0x0257, 0x0259, 0x025F, 0x0265, - 0x0269, 0x026B, 0x0277, 0x0281, 0x0283, 0x0287, 0x028D, 0x0293, - 0x0295, 0x02A1, 0x02A5, 0x02AB, 0x02B3, 0x02BD, 0x02C5, 0x02CF, - - 0x02D7, 0x02DD, 0x02E3, 0x02E7, 0x02EF, 0x02F5, 0x02F9, 0x0301, - 0x0305, 0x0313, 0x031D, 0x0329, 0x032B, 0x0335, 0x0337, 0x033B, - 0x033D, 0x0347, 0x0355, 0x0359, 0x035B, 0x035F, 0x036D, 0x0371, - 0x0373, 0x0377, 0x038B, 0x038F, 0x0397, 0x03A1, 0x03A9, 0x03AD, - 0x03B3, 0x03B9, 0x03C7, 0x03CB, 0x03D1, 0x03D7, 0x03DF, 0x03E5, - 0x03F1, 0x03F5, 0x03FB, 0x03FD, 0x0407, 0x0409, 0x040F, 0x0419, - 0x041B, 0x0425, 0x0427, 0x042D, 0x043F, 0x0443, 0x0445, 0x0449, - 0x044F, 0x0455, 0x045D, 0x0463, 0x0469, 0x047F, 0x0481, 0x048B, - - 0x0493, 0x049D, 0x04A3, 0x04A9, 0x04B1, 0x04BD, 0x04C1, 0x04C7, - 0x04CD, 0x04CF, 0x04D5, 0x04E1, 0x04EB, 0x04FD, 0x04FF, 0x0503, - 0x0509, 0x050B, 0x0511, 0x0515, 0x0517, 0x051B, 0x0527, 0x0529, - 0x052F, 0x0551, 0x0557, 0x055D, 0x0565, 0x0577, 0x0581, 0x058F, - 0x0593, 0x0595, 0x0599, 0x059F, 0x05A7, 0x05AB, 0x05AD, 0x05B3, - 0x05BF, 0x05C9, 0x05CB, 0x05CF, 0x05D1, 0x05D5, 0x05DB, 0x05E7, - 0x05F3, 0x05FB, 0x0607, 0x060D, 0x0611, 0x0617, 0x061F, 0x0623, - 0x062B, 0x062F, 0x063D, 0x0641, 0x0647, 0x0649, 0x064D, 0x0653 -}; - /* reverse an array, used for radix code */ void bn_reverse (unsigned char *s, int len)

1 0

Andrew Talbot : msi: Remove tentative declaration of static array with no size specifier.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 9e85ec3bad2df40e05dd3b738cd9e7b084003692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e85ec3bad2df40e05dd3b738… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Apr 3 14:50:28 2008 +0100 msi: Remove tentative declaration of static array with no size specifier. --- dlls/msi/action.c | 103 ++++++++++++++++++++++++++--------------------------- 1 files changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ef0e136..e7edabe 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -47,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran); static UINT ACTION_ProcessUISequence(MSIPACKAGE *package); static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI); +static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, UINT* rc, BOOL force); /* * consts and values used @@ -233,8 +234,6 @@ struct _actions { STANDARDACTIONHANDLER handler; }; -static const struct _actions StandardActions[]; - /******************************************************** * helper functions @@ -965,56 +964,6 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) /******************************************************** * ACTION helper functions and functions that perform the actions *******************************************************/ -static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, - UINT* rc, BOOL force ) -{ - BOOL ret = FALSE; - BOOL run = force; - int i; - - if (!run && !package->script->CurrentlyScripting) - run = TRUE; - - if (!run) - { - if (strcmpW(action,szInstallFinalize) == 0 || - strcmpW(action,szInstallExecute) == 0 || - strcmpW(action,szInstallExecuteAgain) == 0) - run = TRUE; - } - - i = 0; - while (StandardActions[i].action != NULL) - { - if (strcmpW(StandardActions[i].action, action)==0) - { - if (!run) - { - ui_actioninfo(package, action, TRUE, 0); - *rc = schedule_action(package,INSTALL_SCRIPT,action); - ui_actioninfo(package, action, FALSE, *rc); - } - else - { - ui_actionstart(package, action); - if (StandardActions[i].handler) - { - *rc = StandardActions[i].handler(package); - } - else - { - FIXME("unhandled standard action %s\n",debugstr_w(action)); - *rc = ERROR_SUCCESS; - } - } - ret = TRUE; - break; - } - i++; - } - return ret; -} - static BOOL ACTION_HandleCustomAction( MSIPACKAGE* package, LPCWSTR action, UINT* rc, UINT script, BOOL force ) { @@ -5852,3 +5801,53 @@ static const struct _actions StandardActions[] = { { szWriteRegistryValues, ACTION_WriteRegistryValues }, { NULL, NULL }, }; + +static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, + UINT* rc, BOOL force ) +{ + BOOL ret = FALSE; + BOOL run = force; + int i; + + if (!run && !package->script->CurrentlyScripting) + run = TRUE; + + if (!run) + { + if (strcmpW(action,szInstallFinalize) == 0 || + strcmpW(action,szInstallExecute) == 0 || + strcmpW(action,szInstallExecuteAgain) == 0) + run = TRUE; + } + + i = 0; + while (StandardActions[i].action != NULL) + { + if (strcmpW(StandardActions[i].action, action)==0) + { + if (!run) + { + ui_actioninfo(package, action, TRUE, 0); + *rc = schedule_action(package,INSTALL_SCRIPT,action); + ui_actioninfo(package, action, FALSE, *rc); + } + else + { + ui_actionstart(package, action); + if (StandardActions[i].handler) + { + *rc = StandardActions[i].handler(package); + } + else + { + FIXME("unhandled standard action %s\n",debugstr_w(action)); + *rc = ERROR_SUCCESS; + } + } + ret = TRUE; + break; + } + i++; + } + return ret; +}

1 0

Dmitry Timoshkov : gdi32: Add a font scaling test when lfHeight == 0 and lfWidth != 0, make it pass under Wine.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 90265ac5863f30bee34db60bffc408d470af16ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=90265ac5863f30bee34db60bf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 3 21:55:49 2008 +0900 gdi32: Add a font scaling test when lfHeight == 0 and lfWidth != 0, make it pass under Wine. --- dlls/gdi32/freetype.c | 3 +-- dlls/gdi32/tests/font.c | 34 +++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6356c1f..0284a00 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3378,14 +3378,13 @@ found: TRACE("Chosen: %s %s (%s/%p:%ld)\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName), face->file, face->font_data_ptr, face->face_index); - ret->aveWidth = abs(lf.lfWidth); + ret->aveWidth = height ? abs(lf.lfWidth) : 0; if(!face->scalable) { /* Windows uses integer scaling factors for bitmap fonts */ INT scale, scaled_height; if (height != 0) height = diff; - else height = 0; height += face->size.height; scale = (height + face->size.height - 1) / face->size.height; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d85ab12..a91adcb 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -158,7 +158,8 @@ static INT CALLBACK font_enum_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DW return 1; /* continue enumeration */ } -static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, const char *test_str, +static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, + LONG lfWidth, const char *test_str, INT test_str_len, const TEXTMETRICA *tm_orig, const SIZE *size_orig, INT width_of_A_orig, INT scale_x, INT scale_y) @@ -188,9 +189,14 @@ static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, const char *t ok(tm.tmAveCharWidth == tm_orig->tmAveCharWidth * scale_x, "%d != %d\n", tm.tmAveCharWidth, tm_orig->tmAveCharWidth * scale_x); ok(tm.tmMaxCharWidth == tm_orig->tmMaxCharWidth * scale_x, "%d != %d\n", tm.tmAveCharWidth, tm_orig->tmMaxCharWidth * scale_x); - ok(lf.lfHeight == lfHeight, "lf %d != %d\n", lf.lfHeight, lfHeight); - if (lf.lfWidth) - ok(lf.lfWidth == tm.tmAveCharWidth, "lf %d != tm %d\n", lf.lfWidth, tm.tmAveCharWidth); + ok(lf.lfHeight == lfHeight, "lf %d != %d\n", lf.lfHeight, lfHeight); + if (lf.lfHeight) + { + if (lf.lfWidth) + ok(lf.lfWidth == tm.tmAveCharWidth, "lf %d != tm %d\n", lf.lfWidth, tm.tmAveCharWidth); + } + else + ok(lf.lfWidth == lfWidth, "lf %d != %d\n", lf.lfWidth, lfWidth); GetTextExtentPoint32A(hdc, test_str, test_str_len, &size); @@ -213,7 +219,7 @@ static void test_bitmap_font(void) HFONT hfont, old_hfont; TEXTMETRICA tm_orig; SIZE size_orig; - INT ret, i, width_orig, height_orig, scale; + INT ret, i, width_orig, height_orig, scale, lfWidth; hdc = GetDC(0); @@ -229,8 +235,9 @@ static void test_bitmap_font(void) trace("found bitmap font %s, height %d\n", bitmap_lf.lfFaceName, bitmap_lf.lfHeight); height_orig = bitmap_lf.lfHeight; - hfont = create_font("bitmap", &bitmap_lf); + lfWidth = bitmap_lf.lfWidth; + hfont = create_font("bitmap", &bitmap_lf); old_hfont = SelectObject(hdc, hfont); ok(GetTextMetricsA(hdc, &tm_orig), "GetTextMetricsA failed\n"); ok(GetTextExtentPoint32A(hdc, test_str, sizeof(test_str), &size_orig), "GetTextExtentPoint32A failed\n"); @@ -238,6 +245,15 @@ static void test_bitmap_font(void) SelectObject(hdc, old_hfont); DeleteObject(hfont); + bitmap_lf.lfHeight = 0; + bitmap_lf.lfWidth = 4; + hfont = create_font("bitmap", &bitmap_lf); + test_font_metrics(hdc, hfont, 0, 4, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, 1); + DeleteObject(hfont); + + bitmap_lf.lfHeight = height_orig; + bitmap_lf.lfWidth = lfWidth; + /* test fractional scaling */ for (i = 1; i <= height_orig * 3; i++) { @@ -249,7 +265,7 @@ static void test_bitmap_font(void) nearest_height = scale * height_orig; /* XP allows not more than 10% deviation */ if (scale > 1 && nearest_height - i > nearest_height / 10) scale--; - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); DeleteObject(hfont); } @@ -257,14 +273,14 @@ static void test_bitmap_font(void) bitmap_lf.lfHeight = height_orig * 2; bitmap_lf.lfWidth *= 3; hfont = create_font("3x2", &bitmap_lf); - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); DeleteObject(hfont); /* test integer scaling 3x3 */ bitmap_lf.lfHeight = height_orig * 3; bitmap_lf.lfWidth = 0; hfont = create_font("3x3", &bitmap_lf); - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); DeleteObject(hfont); ReleaseDC(0, hdc);

1 0

Paul Vriens : rsaenh/tests: Add a few skips for non implemented parameters.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 9666218ca8fc5a56857b40f26bb05bb458f32869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9666218ca8fc5a56857b40f26… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 3 13:09:11 2008 +0200 rsaenh/tests: Add a few skips for non implemented parameters. --- dlls/rsaenh/tests/rsaenh.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 1a8bb92..4fef6e9 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -175,12 +175,20 @@ static void test_prov(void) DWORD dwLen, dwInc; dwLen = (DWORD)sizeof(DWORD); + SetLastError(0xdeadbeef); result = CryptGetProvParam(hProv, PP_SIG_KEYSIZE_INC, (BYTE*)&dwInc, &dwLen, 0); - ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_SIG_KEYSIZE_INC is not supported (win9x or NT)\n"); + else + ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); dwLen = (DWORD)sizeof(DWORD); + SetLastError(0xdeadbeef); result = CryptGetProvParam(hProv, PP_KEYX_KEYSIZE_INC, (BYTE*)&dwInc, &dwLen, 0); - ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_KEYX_KEYSIZE_INC is not supported (win9x or NT)\n"); + else + ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); } static void test_gen_random(void) @@ -1823,9 +1831,13 @@ static void test_null_provider(void) ok(result && dataLen == sizeof(dwParam) && (dwParam & CRYPT_SEC_DESCR), "Expected CRYPT_SEC_DESCR to be set, got 0x%08X\n",dwParam); dataLen = sizeof(keySpec); + SetLastError(0xdeadbeef); result = CryptGetProvParam(prov, PP_KEYSPEC, (LPBYTE)&keySpec, &dataLen, 0); - ok(result && keySpec == (AT_KEYEXCHANGE | AT_SIGNATURE), - "Expected AT_KEYEXCHANGE | AT_SIGNATURE, got %08x\n", keySpec); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_KEYSPEC is not supported (win9x or NT)\n"); + else + ok(result && keySpec == (AT_KEYEXCHANGE | AT_SIGNATURE), + "Expected AT_KEYEXCHANGE | AT_SIGNATURE, got %08x\n", keySpec); /* PP_CONTAINER parameter */ dataLen = sizeof(szName); result = CryptGetProvParam(prov, PP_CONTAINER, (LPBYTE)szName, &dataLen, 0); @@ -1834,10 +1846,14 @@ static void test_null_provider(void) (result)? "TRUE":"FALSE",GetLastError(),dataLen); /* PP_UNIQUE_CONTAINER parameter */ dataLen = sizeof(szName); + SetLastError(0xdeadbeef); result = CryptGetProvParam(prov, PP_UNIQUE_CONTAINER, (LPBYTE)szName, &dataLen, 0); - ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, - "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", - (result)? "TRUE":"FALSE",GetLastError(),dataLen); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_UNIQUE_CONTAINER is not supported (win9x or NT)\n"); + else + ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, + "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", + (result)? "TRUE":"FALSE",GetLastError(),dataLen); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08x\n", GetLastError());

1 0

Paul Vriens : rsabase: Remove rsabase tests as they are covered in rsaenh.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 4f3dbb7f7d6b7da9bcdb92189fae5fbe4abfb261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3dbb7f7d6b7da9bcdb92189… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Apr 4 08:12:13 2008 +0200 rsabase: Remove rsabase tests as they are covered in rsaenh. --- .gitignore | 4 -- Makefile.in | 2 - configure | 3 - configure.ac | 1 - dlls/Makefile.in | 1 - dlls/rsabase/tests/Makefile.in | 13 ------ dlls/rsabase/tests/rsabase.c | 84 ---------------------------------------- programs/winetest/Makefile.in | 3 - programs/winetest/winetest.rc | 1 - 9 files changed, 0 insertions(+), 112 deletions(-) diff --git a/.gitignore b/.gitignore index 7837b5b..dc40bde 100644 --- a/.gitignore +++ b/.gitignore @@ -350,9 +350,6 @@ dlls/rpcrt4/tests/server.h dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/rpcrt4/tests/testlist.c -dlls/rsabase/tests/*.ok -dlls/rsabase/tests/rsabase_crosstest.exe -dlls/rsabase/tests/testlist.c dlls/rsaenh/librsaenh.def dlls/rsaenh/tests/*.ok dlls/rsaenh/tests/rsaenh_crosstest.exe @@ -673,7 +670,6 @@ programs/winetest/quartz_test.exe programs/winetest/riched20_test.exe programs/winetest/riched32_test.exe programs/winetest/rpcrt4_test.exe -programs/winetest/rsabase_test.exe programs/winetest/rsaenh_test.exe programs/winetest/schannel_test.exe programs/winetest/secur32_test.exe diff --git a/Makefile.in b/Makefile.in index b8962a9..cc9211d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -412,7 +412,6 @@ ALL_MAKEFILES = \ dlls/rpcrt4/Makefile \ dlls/rpcrt4/tests/Makefile \ dlls/rsabase/Makefile \ - dlls/rsabase/tests/Makefile \ dlls/rsaenh/Makefile \ dlls/rsaenh/tests/Makefile \ dlls/sane.ds/Makefile \ @@ -837,7 +836,6 @@ dlls/riched32/tests/Makefile: dlls/riched32/tests/Makefile.in dlls/Maketest.rule dlls/rpcrt4/Makefile: dlls/rpcrt4/Makefile.in dlls/Makedll.rules dlls/rpcrt4/tests/Makefile: dlls/rpcrt4/tests/Makefile.in dlls/Maketest.rules dlls/rsabase/Makefile: dlls/rsabase/Makefile.in dlls/Makedll.rules -dlls/rsabase/tests/Makefile: dlls/rsabase/tests/Makefile.in dlls/Maketest.rules dlls/rsaenh/Makefile: dlls/rsaenh/Makefile.in dlls/Makedll.rules dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules dlls/sane.ds/Makefile: dlls/sane.ds/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 86b9bf0..a0f73f8 100755 --- a/configure +++ b/configure @@ -21772,8 +21772,6 @@ ac_config_files="$ac_config_files dlls/rpcrt4/tests/Makefile" ac_config_files="$ac_config_files dlls/rsabase/Makefile" -ac_config_files="$ac_config_files dlls/rsabase/tests/Makefile" - ac_config_files="$ac_config_files dlls/rsaenh/Makefile" ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile" @@ -22912,7 +22910,6 @@ do "dlls/rpcrt4/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/Makefile" ;; "dlls/rpcrt4/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/tests/Makefile" ;; "dlls/rsabase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/Makefile" ;; - "dlls/rsabase/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/tests/Makefile" ;; "dlls/rsaenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/Makefile" ;; "dlls/rsaenh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/tests/Makefile" ;; "dlls/sane.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sane.ds/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0cab238..3e14bdc 100644 --- a/configure.ac +++ b/configure.ac @@ -1915,7 +1915,6 @@ AC_CONFIG_FILES([dlls/riched32/tests/Makefile]) AC_CONFIG_FILES([dlls/rpcrt4/Makefile]) AC_CONFIG_FILES([dlls/rpcrt4/tests/Makefile]) AC_CONFIG_FILES([dlls/rsabase/Makefile]) -AC_CONFIG_FILES([dlls/rsabase/tests/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/tests/Makefile]) AC_CONFIG_FILES([dlls/sane.ds/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index bb473e2..6f171d7 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -342,7 +342,6 @@ TESTSUBDIRS = \ riched20/tests \ riched32/tests \ rpcrt4/tests \ - rsabase/tests \ rsaenh/tests \ schannel/tests \ secur32/tests \ diff --git a/dlls/rsabase/tests/Makefile.in b/dlls/rsabase/tests/Makefile.in deleted file mode 100644 index bd5c77d..0000000 --- a/dlls/rsabase/tests/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -TESTDLL = rsabase.dll -IMPORTS = advapi32 kernel32 - -CTESTS = \ - rsabase.c - -(a)MAKE_TEST_RULES@ - -(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/rsabase/tests/rsabase.c b/dlls/rsabase/tests/rsabase.c deleted file mode 100644 index b7746b1..0000000 --- a/dlls/rsabase/tests/rsabase.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Unit tests for rsabase functions - * - * Copyright (c) 2004 Michael Jung - * - * This library 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 library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <string.h> -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wincrypt.h" - -HCRYPTPROV hProv; -static const char szContainer[] = "Wine Test Container"; -static const char szProvider[] = MS_DEF_PROV_A; - -static int init_environment(void) -{ - hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE; - - if (!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, 0)) - { - if (GetLastError()==NTE_BAD_KEYSET) - { - if(!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET)) - { - trace("%08x\n", GetLastError()); - return 0; - } - } - else - { - trace("%08x\n", GetLastError()); - return 0; - } - } - - return 1; -} - -static void clean_up_environment(void) -{ - CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); -} - -static void test_gen_random(void) -{ - BOOL result; - BYTE rnd1[16], rnd2[16]; - - memset(rnd1, 0, sizeof(rnd1)); - memset(rnd2, 0, sizeof(rnd2)); - - result = CryptGenRandom(hProv, sizeof(rnd1), rnd1); - ok(result, "%08x\n", GetLastError()); - - result = CryptGenRandom(hProv, sizeof(rnd2), rnd2); - ok(result, "%08x\n", GetLastError()); - - ok(memcmp(rnd1, rnd2, sizeof(rnd1)), "CryptGenRandom generates non random data\n"); -} - -START_TEST(rsabase) -{ - if (!init_environment()) - return; - test_gen_random(); - clean_up_environment(); -} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 7ccce18..5a188b6 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -83,7 +83,6 @@ TESTBINS = \ riched20_test.exe \ riched32_test.exe \ rpcrt4_test.exe \ - rsabase_test.exe \ rsaenh_test.exe \ schannel_test.exe \ secur32_test.exe \ @@ -223,8 +222,6 @@ riched32_test.exe: $(DLLDIR)/riched32/tests/riched32_test.exe$(DLLEXT) cp $(DLLDIR)/riched32/tests/riched32_test.exe$(DLLEXT) $@ && $(STRIP) $@ rpcrt4_test.exe: $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) cp $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) $@ && $(STRIP) $@ -rsabase_test.exe: $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) - cp $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) $@ && $(STRIP) $@ rsaenh_test.exe: $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) cp $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) $@ && $(STRIP) $@ schannel_test.exe: $(DLLDIR)/schannel/tests/schannel_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 8c36d63..299e0e3 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -144,7 +144,6 @@ quartz_test.exe TESTRES "quartz_test.exe" riched20_test.exe TESTRES "riched20_test.exe" riched32_test.exe TESTRES "riched32_test.exe" rpcrt4_test.exe TESTRES "rpcrt4_test.exe" -rsabase_test.exe TESTRES "rsabase_test.exe" rsaenh_test.exe TESTRES "rsaenh_test.exe" schannel_test.exe TESTRES "schannel_test.exe" secur32_test.exe TESTRES "secur32_test.exe"

1 0

Lei Zhang : website: add links to cvs web interface and documentation writing
by Jeremy Newman 03 Apr '08

03 Apr '08

Module: website Branch: master Commit: 109a7800eb6b62214ff4220a5c8c6dae27c76577 URL: http://source.winehq.org/git/website.git/?a=commit;h=109a7800eb6b62214ff422… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 3 11:54:54 2008 -0700 website: add links to cvs web interface and documentation writing Hi, This adds a couple more useful links to the cvs page. >From be495374b484f2081d337ba4e8baee8f46a0a169 Mon Sep 17 00:00:00 2001 From: Lei Zhang <thestig(a)google.com> Date: Thu, 3 Apr 2008 11:53:38 -0700 Subject: [PATCH] website: add links to cvs web interface and documentation writing. --- templates/en/cvs.template | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/templates/en/cvs.template b/templates/en/cvs.template index f7e14b1..8044a1a 100644 --- a/templates/en/cvs.template +++ b/templates/en/cvs.template @@ -40,6 +40,12 @@ cvs login <p>When prompted for a password press the enter key. A subdirectory named docs will be created.</p> +<p>You can also Browse +<a href="http://wine.cvs.sourceforge.net/wine/">the Wine Documentation +module</a>. Here is more information on +<a href="http://www.winehq.org/site/contributing#doc">documentation +writing</a>.</p> + <hr /> <h1 id="sourcetree">Source Tree Browsing via the Web</h1>

1 0