wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Stefan Dösinger : wined3d: Create a common sampling function in GLSL.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: 8781174a98082962e604f5fa2b8e180e0e73fbc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8781174a98082962e604f5fa2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 25 17:06:05 2009 +0100 wined3d: Create a common sampling function in GLSL. This way the individual instruction handlers don't have to bother about the color correction, and there's now a single place to implement fixup dependent sampling writemask selection. --- dlls/wined3d/glsl_shader.c | 197 ++++++++++++++++++++++++-------------------- 1 files changed, 108 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8781174a98082962e604f…

1 0

Stefan Dösinger : wined3d: Make shader_glsl_get_sample_function aware of *Lod functions.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: d7a6859960312b432dabad738eebdf9fd263a6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a6859960312b432dabad738… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 25 15:37:34 2009 +0100 wined3d: Make shader_glsl_get_sample_function aware of *Lod functions. --- dlls/wined3d/glsl_shader.c | 52 ++++++++++++++++++++++++++++++------------- 1 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 88cbd4e..07212a3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1300,27 +1300,47 @@ static inline const char* shader_get_comp_op( } } -static void shader_glsl_get_sample_function(DWORD sampler_type, BOOL projected, BOOL texrect, glsl_sample_function_t *sample_function) { +static void shader_glsl_get_sample_function(DWORD sampler_type, BOOL projected, BOOL texrect, BOOL lod, glsl_sample_function_t *sample_function) { /* Note that there's no such thing as a projected cube texture. */ switch(sampler_type) { case WINED3DSTT_1D: - sample_function->name = projected ? "texture1DProj" : "texture1D"; + if(lod) { + sample_function->name = projected ? "texture1DProjLod" : "texture1DLod"; + } else { + sample_function->name = projected ? "texture1DProj" : "texture1D"; + } sample_function->coord_mask = WINED3DSP_WRITEMASK_0; break; case WINED3DSTT_2D: if(texrect) { - sample_function->name = projected ? "texture2DRectProj" : "texture2DRect"; + if(lod) { + sample_function->name = projected ? "texture2DRectProjLod" : "texture2DRectLod"; + } else { + sample_function->name = projected ? "texture2DRectProj" : "texture2DRect"; + } } else { - sample_function->name = projected ? "texture2DProj" : "texture2D"; + if(lod) { + sample_function->name = projected ? "texture2DProjLod" : "texture2DLod"; + } else { + sample_function->name = projected ? "texture2DProj" : "texture2D"; + } } sample_function->coord_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1; break; case WINED3DSTT_CUBE: - sample_function->name = "textureCube"; + if(lod) { + sample_function->name = "textureCubeLod"; + } else { + sample_function->name = "textureCube"; + } sample_function->coord_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; break; case WINED3DSTT_VOLUME: - sample_function->name = projected ? "texture3DProj" : "texture3D"; + if(lod) { + sample_function->name = projected ? "texture3DProjLod" : "texture3DLod"; + } else { + sample_function->name = projected ? "texture3DProj" : "texture3D"; + } sample_function->coord_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; break; default: @@ -2316,7 +2336,7 @@ static void pshader_glsl_tex(const SHADER_OPCODE_ARG *arg) texrect = TRUE; } - shader_glsl_get_sample_function(sampler_type, projected, texrect, &sample_function); + shader_glsl_get_sample_function(sampler_type, projected, texrect, FALSE, &sample_function); mask |= sample_function.coord_mask; if (shader_version < WINED3DPS_VERSION(2,0)) shader_glsl_get_write_mask(arg->dst, dst_swizzle); @@ -2368,7 +2388,7 @@ static void shader_glsl_texldl(const SHADER_OPCODE_ARG *arg) IWineD3DBaseTexture_GetTextureDimensions(deviceImpl->stateBlock->textures[sampler_idx]) == GL_TEXTURE_RECTANGLE_ARB) { texrect = TRUE; } - shader_glsl_get_sample_function(sampler_type, FALSE, texrect, &sample_function); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], sample_function.coord_mask, &coord_param); + shader_glsl_get_sample_function(sampler_type, FALSE, texrect, TRUE, &sample_function); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_3, &lod_param); @@ -2379,11 +2399,11 @@ static void shader_glsl_texldl(const SHADER_OPCODE_ARG *arg) /* The GLSL spec claims the Lod sampling functions are only supported in vertex shaders. * However, they seem to work just fine in fragment shaders as well. */ WARN("Using %sLod in fragment shader.\n", sample_function.name); - shader_addline(arg->buffer, "%sLod(Psampler%u, %s, %s)%s);\n", + shader_addline(arg->buffer, "%s(Psampler%u, %s, %s)%s);\n", sample_function.name, sampler_idx, coord_param.param_str, lod_param.param_str, dst_swizzle); shader_glsl_color_correction(arg, ps->cur_args->color_fixup[sampler_idx]); } else { - shader_addline(arg->buffer, "%sLod(Vsampler%u, %s, %s)%s);\n", + shader_addline(arg->buffer, "%s(Vsampler%u, %s, %s)%s);\n", sample_function.name, sampler_idx, coord_param.param_str, lod_param.param_str, dst_swizzle); } } @@ -2458,7 +2478,7 @@ static void pshader_glsl_texdp3tex(const SHADER_OPCODE_ARG *arg) * * It is a dependent read - not valid with conditional NP2 textures */ - shader_glsl_get_sample_function(sampler_type, FALSE, FALSE, &sample_function); + shader_glsl_get_sample_function(sampler_type, FALSE, FALSE, FALSE, &sample_function); switch(count_bits(sample_function.coord_mask)) { case 1: @@ -2602,7 +2622,7 @@ static void pshader_glsl_texm3x3tex(const SHADER_OPCODE_ARG *arg) shader_glsl_append_dst(arg->buffer, arg); shader_glsl_get_write_mask(arg->dst, dst_mask); /* Dependent read, not valid with conditional NP2 */ - shader_glsl_get_sample_function(sampler_type, FALSE, FALSE, &sample_function); + shader_glsl_get_sample_function(sampler_type, FALSE, FALSE, FALSE, &sample_function); /* Sample the texture using the calculated coordinates */ shader_addline(arg->buffer, "%s(Psampler%u, tmp0.xyz)%s);\n", sample_function.name, reg, dst_mask); @@ -2657,7 +2677,7 @@ static void pshader_glsl_texm3x3spec(const SHADER_OPCODE_ARG *arg) shader_glsl_append_dst(buffer, arg); shader_glsl_get_write_mask(arg->dst, dst_mask); /* Dependent read, not valid with conditional NP2 */ - shader_glsl_get_sample_function(stype, FALSE, FALSE, &sample_function); + shader_glsl_get_sample_function(stype, FALSE, FALSE, FALSE, &sample_function); /* Sample the texture */ shader_addline(buffer, "%s(Psampler%u, tmp0.xyz)%s);\n", sample_function.name, reg, dst_mask); @@ -2693,7 +2713,7 @@ static void pshader_glsl_texm3x3vspec(const SHADER_OPCODE_ARG *arg) shader_glsl_append_dst(buffer, arg); shader_glsl_get_write_mask(arg->dst, dst_mask); /* Dependent read, not valid with conditional NP2 */ - shader_glsl_get_sample_function(sampler_type, FALSE, FALSE, &sample_function); + shader_glsl_get_sample_function(sampler_type, FALSE, FALSE, FALSE, &sample_function); /* Sample the texture using the calculated coordinates */ shader_addline(buffer, "%s(Psampler%u, tmp0.xyz)%s);\n", sample_function.name, reg, dst_mask); @@ -2724,7 +2744,7 @@ static void pshader_glsl_texbem(const SHADER_OPCODE_ARG *arg) sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; /* Dependent read, not valid with conditional NP2 */ - shader_glsl_get_sample_function(sampler_type, FALSE, FALSE, &sample_function); + shader_glsl_get_sample_function(sampler_type, FALSE, FALSE, FALSE, &sample_function); mask = sample_function.coord_mask; shader_glsl_get_write_mask(arg->dst, dst_swizzle); @@ -2825,7 +2845,7 @@ static void pshader_glsl_texreg2rgb(const SHADER_OPCODE_ARG *arg) shader_glsl_append_dst(arg->buffer, arg); shader_glsl_get_write_mask(arg->dst, dst_mask); /* Dependent read, not valid with conditional NP2 */ - shader_glsl_get_sample_function(sampler_type, FALSE, FALSE, &sample_function); + shader_glsl_get_sample_function(sampler_type, FALSE, FALSE, FALSE, &sample_function); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], sample_function.coord_mask, &src0_param); shader_addline(arg->buffer, "%s(Psampler%u, %s)%s);\n", sample_function.name, sampler_idx, src0_param.param_str, dst_mask);

1 0

Stefan Dösinger : wined3d: Put the color_correction calls into the instruction handlers.
by Alexandre Julliard 27 Feb '09

27 Feb '09

Module: wine Branch: master Commit: 5cf764aec2177df93509be0f7f04f4268ad40c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cf764aec2177df93509be0f7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 16 14:58:52 2009 +0100 wined3d: Put the color_correction calls into the instruction handlers. The color correction cannot be done behind the back of the individual instruction handlers because it might conflict with the instruction's color modifications and the D3D provided writemask. --- dlls/wined3d/arb_program_shader.c | 108 ++++++++++++++++++------------------- dlls/wined3d/baseshader.c | 65 ---------------------- dlls/wined3d/glsl_shader.c | 22 +++++++- dlls/wined3d/pixelshader.c | 17 +++--- dlls/wined3d/wined3d_private.h | 6 +-- 5 files changed, 81 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cf764aec2177df93509b…

1 0

Maurilio Genovese : patch for debian repository
by Jeremy Newman 26 Feb '09

26 Feb '09

Module: website Branch: master Commit: c1b20d2071365348ee5b90704374edc6eed8211a URL: http://source.winehq.org/git/website.git/?a=commit;h=c1b20d2071365348ee5b90… Author: Maurilio Genovese <repository(a)lamaresh.net> Date: Thu Feb 26 02:21:42 2009 +0100 patch for debian repository in attachment Maurilio Genovese >From bca7fa4b530d82d7a68781d72c494aec18748183 Mon Sep 17 00:00:00 2001 From: Maurilio Genovese <repository(a)lamaresh.net> Date: Thu, 26 Feb 2009 02:20:19 +0100 Subject: Added gpg key info --- templates/en/download/deblenny.template | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/templates/en/download/deblenny.template b/templates/en/download/deblenny.template index 6a18dea..3c404b5 100644 --- a/templates/en/download/deblenny.template +++ b/templates/en/download/deblenny.template @@ -26,6 +26,7 @@ Wine for Debian Etch, Lenny and Sid <div style="position:relative;left:20px">Add this line for Lenny: <i>deb http://www.lamaresh.net/apt lenny main</i></div> <div style="position:relative;left:20px">Add this line for Sid: <i>deb http://www.lamaresh.net/apt sid main</i></div> <div style="position:relative;left:20px">Save and close sources.list</div> +<div style="position:relative;left:20px"><i>wget -O - http://www.lamaresh.net/apt/key.gpg | apt-key add</i> <font color="gray">#to add gpg key</font></div> <div style="position:relative;left:20px"><i>apt-get update</i> <font color="gray">#to update package list</font></div> <div style="position:relative;left:20px"><i>apt-get install wine</i> <font color="gray">#to install latest wine version</font></div><p></p> <h2>Method 2: Download .deb and manually install it</h2>

1 0

Huw Davies : ole32/tests: win9x and winnt don't include the trailing '\0'.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 5e0d4c774cbc365c0729a7f670e8831ab194dabb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0d4c774cbc365c0729a7f67… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 26 12:48:11 2009 +0000 ole32/tests: win9x and winnt don't include the trailing '\0'. --- dlls/ole32/tests/usrmarshal.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 03ced75..b36fdf6 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -100,14 +100,16 @@ static void test_marshal_CLIPFORMAT(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = CLIPFORMAT_UserSize(&umcb.Flags, 0, &cf); - ok(size == 8 + sizeof(cf_marshaled), "CLIPFORMAT: Wrong size %d\n", size); + ok(size == 8 + sizeof(cf_marshaled) || + broken(size == 8 + sizeof(cf_marshaled) - 2), /* win9x and winnt don't include the '\0' */ + "CLIPFORMAT: Wrong size %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); CLIPFORMAT_UserMarshal(&umcb.Flags, buffer, &cf); ok(*(LONG *)(buffer + 0) == WDT_REMOTE_CALL, "CLIPFORMAT: Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(LONG *)(buffer + 0)); ok(*(DWORD *)(buffer + 4) == cf, "CLIPFORMAT: Marshaled value should be 0x%04x instead of 0x%04x\n", cf, *(DWORD *)(buffer + 4)); - ok(!memcmp(buffer + 8, cf_marshaled, sizeof(cf_marshaled)), "Marshaled data differs\n"); + ok(!memcmp(buffer + 8, cf_marshaled, size - 8), "Marshaled data differs\n"); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); CLIPFORMAT_UserUnmarshal(&umcb.Flags, buffer, &cf2);

1 0

Paul Vriens : shlwapi/tests: Fix remaining test failures on several platforms.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 11b44f83634e1dc1aeaaeea6c542af9dab11fa51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b44f83634e1dc1aeaaeea6c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Feb 26 13:48:52 2009 +0100 shlwapi/tests: Fix remaining test failures on several platforms. --- dlls/shlwapi/tests/path.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 2260d88..86c8198 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -410,7 +410,9 @@ static void test_PathCombineW(void) wszString = pPathCombineW(wbuf, wstr1, wstr2); ok(wszString == NULL, "Expected a NULL return\n"); - ok(wbuf[0] == 0, "Buffer contains data\n"); + ok(wbuf[0] == 0 || + broken(wbuf[0] = 0xbfbf), /* Win95 and some W2K */ + "Buffer contains data\n"); /* PathCombineW can be used in place */ wstr1[3] = 0; @@ -469,7 +471,9 @@ static void test_PathCombineA(void) lstrcpyA(dest, "control"); str = PathCombineA(dest, "", ""); ok(str == dest, "Expected str == dest, got %p\n", str); - ok(!lstrcmp(str, "\\"), "Expected \\, got %s\n", str); + ok(!lstrcmp(str, "\\") || + broken(!lstrcmp(str, "control")), /* Win95 and some W2K */ + "Expected \\, got %s\n", str); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try NULL directory */ @@ -485,14 +489,20 @@ static void test_PathCombineA(void) lstrcpyA(dest, "control"); str = PathCombineA(dest, NULL, ""); ok(str == dest, "Expected str == dest, got %p\n", str); - ok(!lstrcmp(str, "\\"), "Expected \\, got %s\n", str); - ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(!lstrcmp(str, "\\") || + broken(!lstrcmp(str, "one\\two\\three")), /* Win95 and some W2K */ + "Expected \\, got %s\n", str); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win95 */ + "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try NULL directory and file part */ SetLastError(0xdeadbeef); lstrcpyA(dest, "control"); str = PathCombineA(dest, NULL, NULL); - ok(str == NULL, "Expected str == NULL, got %p\n", str); + ok(str == NULL || + broken(str != NULL), /* Win95 and some W2K */ + "Expected str == NULL, got %p\n", str); ok(lstrlenA(dest) == 0 || broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ "Expected 0 length, got %i\n", lstrlenA(dest)); @@ -776,7 +786,9 @@ static void test_PathAppendA(void) res = PathAppendA(too_long, "two\\three"); ok(!res, "Expected failure\n"); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlen(too_long) == 0, "Expected length of too_long to be zero, got %i\n", lstrlen(too_long)); + ok(lstrlen(too_long) == 0 || + broken(lstrlen(too_long) == (LONG_LEN - 1)), /* Win95 and some W2K */ + "Expected length of too_long to be zero, got %i\n", lstrlen(too_long)); /* pszMore is too long */ lstrcpy(path, "C:\\one"); @@ -786,7 +798,9 @@ static void test_PathAppendA(void) res = PathAppendA(path, too_long); ok(!res, "Expected failure\n"); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlen(path) == 0, "Expected length of path to be zero, got %i\n", lstrlen(path)); + ok(lstrlen(path) == 0 || + broken(!lstrcmp(path, "C:\\one")), /* Win95 and some W2K */ + "Expected length of path to be zero, got %i\n", lstrlen(path)); /* both params combined are too long */ memset(one, 'a', HALF_LEN); @@ -796,7 +810,9 @@ static void test_PathAppendA(void) SetLastError(0xdeadbeef); res = PathAppendA(one, two); ok(!res, "Expected failure\n"); - ok(lstrlen(one) == 0, "Expected length of one to be zero, got %i\n", lstrlen(one)); + ok(lstrlen(one) == 0 || + broken(lstrlen(one) == (HALF_LEN - 1)), /* Win95 and some W2K */ + "Expected length of one to be zero, got %i\n", lstrlen(one)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); } @@ -822,7 +838,9 @@ static void test_PathCanonicalizeA(void) res = PathCanonicalizeA(dest, ""); ok(res, "Expected success\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(!lstrcmp(dest, "\\"), "Expected \\, got %s\n", dest); + ok(!lstrcmp(dest, "\\") || + broken(!lstrcmp(dest, "test")), /* Win95 and some W2K */ + "Expected \\, got %s\n", dest); /* try a NULL dest */ SetLastError(0xdeadbeef); @@ -915,7 +933,9 @@ static void test_PathCanonicalizeA(void) lstrcpy(dest, "test"); SetLastError(0xdeadbeef); res = PathCanonicalizeA(dest, too_long); - ok(!res, "Expected failure\n"); + ok(!res || + broken(res), /* Win95, some W2K and XP-SP1 */ + "Expected failure\n"); todo_wine { ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_FILENAME_EXCED_RANGE /* Vista */,

1 0

Alistair Leslie-Hughes : mshtml: Add idl for IPersistHistory interface.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 8ffadacb11ae005eb600437fed5911f24d2576cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ffadacb11ae005eb600437fe… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 26 21:32:57 2009 +1100 mshtml: Add idl for IPersistHistory interface. --- .gitignore | 1 + include/Makefile.in | 1 + include/perhist.idl | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 113321d..5bbd4d0 100644 --- a/.gitignore +++ b/.gitignore @@ -180,6 +180,7 @@ include/oleacc.h include/oledb.h include/oleidl.h include/optary.h +include/perhist.h include/propidl.h include/pstore.h include/qedit.h diff --git a/include/Makefile.in b/include/Makefile.in index f3dc4ff..9f70cba 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -60,6 +60,7 @@ PUBLIC_IDL_H_SRCS = \ oledb.idl \ oleidl.idl \ optary.idl \ + perhist.idl \ propidl.idl \ pstore.idl \ qedit.idl \ diff --git a/include/perhist.idl b/include/perhist.idl new file mode 100644 index 0000000..d8cc531 --- /dev/null +++ b/include/perhist.idl @@ -0,0 +1,38 @@ +/* + * Copyright 2009 Alistair Leslie-Hughes + * + * 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 + */ + +import "objidl.idl"; +import "oleidl.idl"; + +[ + object, + uuid(91A565C1-E38F-11d0-94BF-00A0C9055CBF), + pointer_default(unique) +] +interface IPersistHistory : IPersist +{ + typedef [unique] IPersistHistory *LPPERSISTHISTORY; + + HRESULT LoadHistory([in] IStream *pStream, [in] IBindCtx *pbc); + + HRESULT SaveHistory([in] IStream *pStream); + + HRESULT SetPositionCookie([in] DWORD dwPositioncookie); + + HRESULT GetPositionCookie([out] DWORD *pdwPositioncookie); +}

1 0

Alexandre Julliard : user32/tests: Fix some message sequences for Win9x.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: af0029925b6cefe1bedd921e268115f1a55a6cec URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0029925b6cefe1bedd921e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 26 14:28:38 2009 +0100 user32/tests: Fix some message sequences for Win9x. --- dlls/user32/tests/msg.c | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e68910c..d8bfd26 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -192,6 +192,11 @@ static const struct message WmSWP_ShowOverlappedSeq[] = { static const struct message WmSWP_HideOverlappedSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, + { HCBT_ACTIVATE, hook|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|wparam|optional, 1 }, + { WM_NCACTIVATE, sent|optional }, + { WM_ACTIVATE, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; @@ -202,12 +207,12 @@ static const struct message WmSWP_HideOverlappedSeq[] = { static const struct message WmSWP_ResizeSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_NOMOVE }, { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_NCCALCSIZE, sent|wparam|optional, TRUE }, { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOCLIENTMOVE }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOCLIENTMOVE }, + { WM_SIZE, sent|defwinproc|optional }, { WM_NCCALCSIZE, sent|wparam|optional, TRUE }, { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, @@ -223,12 +228,12 @@ static const struct message WmSWP_ResizeSeq[] = { static const struct message WmSWP_ResizePopupSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_NOMOVE }, { WM_GETMINMAXINFO, sent|defwinproc|optional }, /* Win9x */ - { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_NCCALCSIZE, sent|wparam|optional, TRUE }, { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOCLIENTMOVE }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOCLIENTMOVE }, + { WM_SIZE, sent|defwinproc|wparam|optional, SIZE_RESTORED }, { WM_NCCALCSIZE, sent|wparam|optional, TRUE }, { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, @@ -261,9 +266,10 @@ static const struct message WmSWP_ResizeNoZOrder[] = { { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, /*SWP_NOZORDER|*/SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE }, + { WM_WINDOWPOSCHANGED, sent|wparam, /*SWP_NOZORDER|*/SWP_NOACTIVATE, 0, + SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|defwinproc|wparam|optional, SIZE_RESTORED }, + { WM_SIZE, sent|defwinproc|optional }, { WM_NCCALCSIZE, sent|wparam|optional, 1 }, /* Win9x doesn't send it */ { WM_NCPAINT, sent|optional }, /* Win9x doesn't send it */ { WM_GETTEXT, sent|defwinproc|optional }, /* Win9x doesn't send it */ @@ -611,7 +617,7 @@ static const struct message WmDestroyOverlappedSeq[] = { { 0x0090, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCACTIVATE, sent|optional|wparam, 0 }, - { WM_ACTIVATE, sent|optional|wparam, 0 }, + { WM_ACTIVATE, sent|optional }, { WM_ACTIVATEAPP, sent|optional|wparam, 0 }, { WM_KILLFOCUS, sent|optional|wparam, 0 }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, @@ -649,7 +655,7 @@ static const struct message WmCreateMaxPopupSeq[] = { { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE|SWP_NOMOVE|SWP_NOSIZE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, @@ -699,7 +705,7 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, @@ -728,7 +734,7 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, @@ -765,7 +771,7 @@ static const struct message WmCreatePopupSeq[] = { { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, @@ -838,7 +844,7 @@ static const struct message WmShowVisiblePopupSeq_3[] = { { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, { HCBT_SETFOCUS, hook }, { WM_KILLFOCUS, sent|parent }, @@ -1217,7 +1223,7 @@ static const struct message WmCreateCustomDialogSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_GETTEXT, sent|optional|defwinproc }, { WM_GETTEXT, sent|optional|defwinproc }, { WM_GETTEXT, sent|optional|defwinproc }, @@ -1284,7 +1290,7 @@ static const struct message WmShowCustomDialogSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam|optional, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, { WM_GETTEXT, sent|optional }, @@ -1322,7 +1328,7 @@ static const struct message WmModalDialogSeq[] = { { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_GETTEXT, sent|optional }, { WM_ACTIVATE, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, @@ -1587,7 +1593,7 @@ static const struct message WmSetScrollRangeHV_NC_Seq[] = { WM_ERASEBKGND, sent|optional }, { WM_CTLCOLORDLG, sent|defwinproc|optional }, /* sent to a parent of the dialog */ { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE|SWP_NOCLIENTMOVE, 0, SWP_NOCLIENTSIZE }, - { WM_SIZE, sent|defwinproc|wparam|optional, SIZE_RESTORED }, + { WM_SIZE, sent|defwinproc|optional }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam|optional, 0/*OBJID_HSCROLL or OBJID_VSCROLL*/, 0 }, { WM_GETTEXT, sent|optional }, @@ -4349,7 +4355,7 @@ static const struct message WmZOrder[] = { { WM_GETTEXT, sent|optional }, { WM_NCCALCSIZE, sent|wparam|optional, 1 }, { WM_ACTIVATEAPP, sent|wparam, 1, 0 }, - { WM_NCACTIVATE, sent|wparam|lparam, 1, 0 }, + { WM_NCACTIVATE, sent|lparam, 1, 0 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam|lparam, 1, 0 },

1 0

Hans Leidekker : msi: Add reinstall tests.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 148ef5f48506411f6f7135692f85196cb164e70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=148ef5f48506411f6f7135692… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Thu Feb 26 10:50:01 2009 +0100 msi: Add reinstall tests. Based on a patch by Aric Stewart. --- dlls/msi/tests/package.c | 1331 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1327 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=148ef5f48506411f6f713…

1 0

Dylan Smith : richedit: Avoid crashing if TxSendMessage is called with NULL plresult.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: b441bb2e4c094eaf476ec274161eefaff2e84f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b441bb2e4c094eaf476ec2741… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Feb 26 03:43:14 2009 -0500 richedit: Avoid crashing if TxSendMessage is called with NULL plresult. --- dlls/riched20/txtsrv.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index d7b915c..a6d8170 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -156,8 +156,10 @@ HRESULT WINAPI fnTextSrv_TxSendMessage(ITextServices *iface, { ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); HRESULT hresult; + LRESULT lresult; - *plresult = ME_HandleMessage(This->editor, msg, wparam, lparam, TRUE, &hresult); + lresult = ME_HandleMessage(This->editor, msg, wparam, lparam, TRUE, &hresult); + if (plresult) *plresult = lresult; return hresult; }

1 0

← Newer
1
2
3
4
5
6
7
...
97
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2009