September 2006 - Wine-commits

Stefan Dösinger : wined3d: Fix a typo.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 0ce3c59477bb3ccfbff89918bec363b919f5bca1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ce3c59477bb3ccfbff8991… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 23 23:56:13 2006 +0200 wined3d: Fix a typo. --- dlls/wined3d/surface_gdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 9609ebd..f9b20c1 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1516,7 +1516,7 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3 This->resource.allocatedMemory = NULL; /* We don't mind the nonpow2 stuff in GDI */ - This->resource.size = This->currentDesc.Width * getFormatDescEntry(This->resource.format)->bpp * This->currentDesc.Width; + This->resource.size = This->currentDesc.Width * getFormatDescEntry(This->resource.format)->bpp * This->currentDesc.Height; This->pow2Size = This->resource.size; This->pow2Width = This->currentDesc.Width; This->pow2Height = This->currentDesc.Height;

1 0

Andrew Talbot : oleaut32: Cast-qual warnings fix.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 0e9c97eba3709c2ff4493f4ab015c141812e8932 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e9c97eba3709c2ff4493f4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 21 21:25:39 2006 +0100 oleaut32: Cast-qual warnings fix. --- dlls/oleaut32/olefont.c | 4 ++-- dlls/oleaut32/typelib.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index ac0bc8f..6f27d21 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -332,10 +332,10 @@ HRESULT WINAPI OleCreateFontIndirect( if (!lpFontDesc) { FONTDESC fd; - static const WCHAR fname[] = { 'S','y','s','t','e','m',0 }; + static WCHAR fname[] = { 'S','y','s','t','e','m',0 }; fd.cbSizeofstruct = sizeof(fd); - fd.lpstrName = (WCHAR*)fname; + fd.lpstrName = fname; fd.cySize.s.Lo = 80000; fd.cySize.s.Hi = 0; fd.sWeight = 0; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 07da88f..ccca8c3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -611,14 +611,14 @@ #undef XX if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { RegSetValueExW(subKey, NULL, 0, REG_SZ, - (BYTE*)PSOA, sizeof PSOA); + (const BYTE *)PSOA, sizeof PSOA); RegCloseKey(subKey); } if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { RegSetValueExW(subKey, NULL, 0, REG_SZ, - (BYTE*)PSOA, sizeof PSOA); + (const BYTE *)PSOA, sizeof PSOA); RegCloseKey(subKey); }

1 0

Aric Stewart : user: Correct buffer overflows in IME processing code.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 5537fbbcfffcf00c590017dd645049b97ca657fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5537fbbcfffcf00c590017d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 21 09:43:00 2006 -0500 user: Correct buffer overflows in IME processing code. --- dlls/user/edit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user/edit.c b/dlls/user/edit.c index c4f95e4..116340f 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -5341,7 +5341,7 @@ static void EDIT_GetCompositionStr(HWND return; } - lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen); + lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen + sizeof(WCHAR)); if (!lpCompStr) { ERR("Unable to allocate IME CompositionString\n"); @@ -5362,7 +5362,7 @@ static void EDIT_GetCompositionStr(HWND if (dwBufLenAttr) { dwBufLenAttr ++; - lpCompStrAttr = HeapAlloc(GetProcessHeap(),0,dwBufLenAttr); + lpCompStrAttr = HeapAlloc(GetProcessHeap(),0,dwBufLenAttr+1); if (!lpCompStrAttr) { ERR("Unable to allocate IME Attribute String\n"); @@ -5417,7 +5417,7 @@ static void EDIT_GetResultStr(HWND hwnd, return; } - lpResultStr = HeapAlloc(GetProcessHeap(),0, dwBufLen); + lpResultStr = HeapAlloc(GetProcessHeap(),0, dwBufLen+sizeof(WCHAR)); if (!lpResultStr) { ERR("Unable to alloc buffer for IME string\n");

1 0

Andrey Turkin : msiexec: Should recognize /xpackage syntax.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: d456e9f49fdfca008cfa3655ff076a0f8eb4e6ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d456e9f49fdfca008cfa365… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Fri Sep 22 06:16:52 2006 +0400 msiexec: Should recognize /xpackage syntax. --- programs/msiexec/msiexec.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 364d54a..ccb48b2 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -546,14 +546,18 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(msi_option_equal(argvW[i], "x")) + else if(msi_option_prefix(argvW[i], "x")) { FunctionInstall = TRUE; - i++; - if(i >= argc) - ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); - PackageName = argvW[i]; + PackageName = argvW[i]+2; + if (!PackageName[0]) + { + i++; + if (i >= argc) + ShowUsage(1); + PackageName = argvW[i]; + } + WINE_TRACE("PackageName = %s\n", wine_dbgstr_w(PackageName)); StringListAppend(&property_list, RemoveAll); } else if(msi_option_prefix(argvW[i], "j"))

1 0

Roderick Colenbrander : wined3d: glBlend* fixes.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 7c86d91bb929bef4c5a6a4a4df458adf6149b9bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c86d91bb929bef4c5a6a4a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Sep 22 07:58:38 2006 +0200 wined3d: glBlend* fixes. --- dlls/wined3d/device.c | 26 +++++++++++--------------- dlls/wined3d/directx.c | 3 +++ include/wine/wined3d_gl.h | 1 + 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e32b824..c4b9767 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3700,7 +3700,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl FIXME("Unrecognized/Unhandled D3DBLENDOP value %ld\n", Value); } - if(GL_SUPPORT(ARB_IMAGING)) { + if(GL_SUPPORT(EXT_BLEND_MINMAX)) { TRACE("glBlendEquation(%x)\n", glParm); GL_EXTCALL(glBlendEquation(glParm)); checkGLcall("glBlendEquation"); @@ -4509,23 +4509,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_BLENDFACTOR : { float col[4]; - if (GL_SUPPORT(ARB_IMAGING)) { - TRACE("Setting BlendFactor to %ld", Value); + TRACE("Setting BlendFactor to %ld\n", Value); - D3DCOLORTOGLFLOAT4(Value, col); - if (0xFFFFFFFF != Value) { - glEnable(GL_BLEND); - checkGLcall("glEnable(GL_BLEND)"); - } - else { - glDisable(GL_BLEND); - checkGLcall("glDisable(GL_BLEND)"); - } - glBlendColor (col[0],col[1],col[2],col[3]); - } else { - WARN("Unsupported in local OpenGL implementation: glBlendColor\n"); + D3DCOLORTOGLFLOAT4(Value, col); + if (0xFFFFFFFF != Value) { + glEnable(GL_BLEND); + checkGLcall("glEnable(GL_BLEND)"); + } + else { + glDisable(GL_BLEND); + checkGLcall("glDisable(GL_BLEND)"); } + glBlendColor (col[0],col[1],col[2],col[3]); break; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 19e3172..793e3c8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -640,6 +640,9 @@ #undef USE_GL_FUNC } else if (strcmp(ThisExtn, "GL_EXT_framebuffer_object") == 0) { TRACE_(d3d_caps)(" FOUND: EXT Frame Buffer Object support\n"); gl_info->supported[EXT_FRAMEBUFFER_OBJECT] = TRUE; + } else if (strcmp(ThisExtn, "GL_EXT_blend_minmax") == 0) { + TRACE_(d3d_caps)(" FOUND: EXT Blend minmax support\n"); + gl_info->supported[EXT_BLEND_MINMAX] = TRUE; } else if (strcmp(ThisExtn, "GL_EXT_paletted_texture") == 0) { /* handle paletted texture extensions */ TRACE_(d3d_caps)(" FOUND: EXT Paletted texture support\n"); gl_info->supported[EXT_PALETTED_TEXTURE] = TRUE; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 1a589a5..1832287 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1429,6 +1429,7 @@ typedef enum _GL_SupportedExt { ARB_VERTEX_BUFFER_OBJECT, ARB_VERTEX_SHADER, /* EXT */ + EXT_BLEND_MINMAX, EXT_FOG_COORD, EXT_FRAMEBUFFER_OBJECT, EXT_PALETTED_TEXTURE,

1 0

Paul Vriens : wincrypt.h: A few more defines.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: a3d8d14e529f34d09422249cc1f360e1eda548e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3d8d14e529f34d09422249… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Sep 25 15:01:02 2006 +0200 wincrypt.h: A few more defines. --- include/wincrypt.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 4e0a11c..bfe9ac2 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -627,6 +627,11 @@ typedef struct _CMSG_SIGNER_INFO { CRYPT_ATTRIBUTES UnauthAttrs; } CMSG_SIGNER_INFO, *PCMSG_SIGNER_INFO; +#define CMSG_VERIFY_SIGNER_PUBKEY 1 +#define CMSG_VERIFY_SIGNER_CERT 2 +#define CMSG_VERIFY_SIGNER_CHAIN 3 +#define CMSG_VERIFY_SIGNER_NULL 4 + typedef struct _CERT_REVOCATION_CRL_INFO { DWORD cbSize; PCCRL_CONTEXT pBaseCrlContext;

1 0

Nicolas Delcros : wrc: Fixed typo for the --pedantic argument.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: a6fe56a8cf5f90e06a0099f1dc2bf2289f21f307 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6fe56a8cf5f90e06a0099f… Author: Nicolas Delcros <nicolas(a)dyalog.com> Date: Mon Sep 25 14:03:43 2006 +0100 wrc: Fixed typo for the --pedantic argument. --- tools/wrc/wrc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 8509feb..e91661c 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -189,7 +189,7 @@ static struct option long_options[] = { { "nostdinc", 0, 0, 1 }, { "output", 1, 0, 'o' }, { "output-format", 1, 0, 'O' }, - { "pendantic", 0, 0, 8 }, + { "pedantic", 0, 0, 8 }, { "preprocessor", 1, 0, 4 }, { "target", 1, 0, 'F' }, { "undefine", 1, 0, 'U' },

1 0

Marcus Meissner : msi: Support more dialog groups.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 966c5b6c0b42812a7fbc0e8a5d5a9589f77d966d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=966c5b6c0b42812a7fbc0e8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 24 11:54:13 2006 +0200 msi: Support more dialog groups. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 8ebeb09..958d63a 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1078,7 +1078,7 @@ static UINT msi_dialog_edit_control( msi /******************** Masked Edit ********************************************/ -#define MASK_MAX_GROUPS 10 +#define MASK_MAX_GROUPS 20 struct msi_mask_group {

1 0

Huw Davies : gdi32: Win 2000 and Win XP behave differently if there's a '\n ' in the string, so remove the width test completely.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: e41992ccaf56f467780159cf8f3d66fb3c79ebb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e41992ccaf56f467780159c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 21 10:11:28 2006 +0100 gdi32: Win 2000 and Win XP behave differently if there's a '\n' in the string, so remove the width test completely. --- dlls/gdi/tests/font.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index beb7436..6891f14 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -383,11 +383,11 @@ static void test_text_extents(void) GetTextExtentPointW(hdc, wt, len, &sz2); ok(sz1.cy == sz2.cy, "cy from GetTextExtentExPointW (%ld) and GetTextExtentPointW (%ld) differ\n", sz1.cy, sz2.cy); -todo_wine { - /* The \n in the string is apparently handled differently in GetTextExtentPoint and GetTextExtentExPoint */ - ok(sz1.cx != sz2.cx, - "cx from GetTextExtentExPointW (%ld) and GetTextExtentPointW (%ld) are the same\n", sz1.cx, sz2.cx); - } + /* Because of the '\n' in the string GetTextExtentExPoint and + GetTextExtentPoint return different widths under Win2k, but + under WinXP they return the same width. So we don't test that + here. */ + for (i = 1; i < len; ++i) ok(extents[i-1] <= extents[i], "GetTextExtentExPointW generated a non-increasing sequence of partial extents (at position %d)\n",

1 0

Huw Davies : gdi32: Make the bitmap font tests locale aware.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 7dbda7a9f52c0e546d8cbbc41d1407f77472f866 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7dbda7a9f52c0e546d8cbbc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 21 10:43:16 2006 +0100 gdi32: Make the bitmap font tests locale aware. --- dlls/gdi/tests/font.c | 148 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 101 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7dbda7a9f52c0e546d8…

1 0