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

Alexandre Julliard : oleaut32/tests: Allow UuidCreate to return RPC_S_UUID_LOCAL_ONLY.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: ec11a7b828e4aaab1772a4a2964efee8d505c6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec11a7b828e4aaab1772a4a29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 24 11:51:07 2008 +0200 oleaut32/tests: Allow UuidCreate to return RPC_S_UUID_LOCAL_ONLY. --- dlls/oleaut32/tests/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 74a7812..3479c18 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -640,7 +640,7 @@ static void test_QueryPathOfRegTypeLib(void) BSTR path; status = UuidCreate(&uid); - ok(!status, "UuidCreate error %08lx\n", status); + ok(!status || status == RPC_S_UUID_LOCAL_ONLY, "UuidCreate error %08lx\n", status); StringFromGUID2(&uid, uid_str, 40); /*trace("GUID: %s\n", wine_dbgstr_w(uid_str));*/

1 0

Alexandre Julliard : ole32: Don' t consider RPC_S_UUID_LOCAL_ONLY an error in CoCreateGuid.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: d324c42b4c87e286d67793e941a67172bbdde9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d324c42b4c87e286d67793e94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 24 11:50:42 2008 +0200 ole32: Don't consider RPC_S_UUID_LOCAL_ONLY an error in CoCreateGuid. Return a proper HRESULT for other errors. --- dlls/ole32/compobj.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 7280150..07e0f50 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1231,7 +1231,9 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) */ HRESULT WINAPI CoCreateGuid(GUID *pguid) { - return UuidCreate(pguid); + DWORD status = UuidCreate(pguid); + if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; + return HRESULT_FROM_WIN32( status ); } /******************************************************************************

1 0

H. Verbeet : d3d9: Use color_match() in alpha_test().
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 60b5581e1cedc3ad6f679d453d241ebf0e8ac26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b5581e1cedc3ad6f679d453… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 23 23:56:09 2008 +0200 d3d9: Use color_match() in alpha_test(). Also fixes some of the messages. --- dlls/d3d9/tests/visual.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a328123..ad5bab2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6656,7 +6656,7 @@ static void alpha_test(IDirect3DDevice9 *device) HRESULT hr; IDirect3DTexture9 *offscreenTexture; IDirect3DSurface9 *backbuffer = NULL, *offscreen = NULL; - DWORD color, red, green, blue; + DWORD color; struct vertex quad1[] = { @@ -6778,32 +6778,20 @@ static void alpha_test(IDirect3DDevice9 *device) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); color = getPixelColor(device, 160, 360); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff); - ok(red >= 0xbe && red <= 0xc0 && green >= 0x39 && green <= 0x41 && blue == 0x00, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0x40, 0x00), 1), "SRCALPHA on frame buffer returned color %08x, expected 0x00bf4000\n", color); color = getPixelColor(device, 160, 120); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff); - ok(red >= 0x7e && red <= 0x81 && green == 0x00 && blue >= 0x7e && blue <= 0x81, - "DSTALPHA on frame buffer returned color %08x, expected 0x00ff0000\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x00, 0x80), 2), + "DSTALPHA on frame buffer returned color %08x, expected 0x007f0080\n", color); color = getPixelColor(device, 480, 360); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff); - ok(red >= 0xbe && red <= 0xc0 && green >= 0x39 && green <= 0x41 && blue == 0x00, - "SRCALPHA on texture returned color %08x, expected bar\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0x40, 0x00), 1), + "SRCALPHA on texture returned color %08x, expected 0x00bf4000\n", color); color = getPixelColor(device, 480, 120); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff); - ok(red == 0x00 && green == 0x00 && blue >= 0xfe && blue <= 0xff , - "DSTALPHA on texture returned color %08x, expected 0x00800080\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff), 1), + "DSTALPHA on texture returned color %08x, expected 0x000000ff\n", color); out: /* restore things */

1 0

H. Verbeet : d3d8: Use color_match() in alpha_test().
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 3546b8bbfc9b0626c87a4be55c52d91cf78c5a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3546b8bbfc9b0626c87a4be55… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 23 23:56:04 2008 +0200 d3d8: Use color_match() in alpha_test(). Also fixes some of the messages. --- dlls/d3d8/tests/visual.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 4c15560..893a93f 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -746,7 +746,7 @@ static void alpha_test(IDirect3DDevice8 *device) HRESULT hr; IDirect3DTexture8 *offscreenTexture; IDirect3DSurface8 *backbuffer = NULL, *offscreen = NULL, *depthstencil = NULL; - DWORD color, red, green, blue; + DWORD color; struct vertex quad1[] = { @@ -870,32 +870,20 @@ static void alpha_test(IDirect3DDevice8 *device) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); color = getPixelColor(device, 160, 360); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff); - ok(red >= 0xbe && red <= 0xc0 && green >= 0x39 && green <= 0x41 && blue == 0x00, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0x40, 0x00), 1), "SRCALPHA on frame buffer returned color %08x, expected 0x00bf4000\n", color); color = getPixelColor(device, 160, 120); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff); - ok(red >= 0x7e && red <= 0x81 && green == 0x00 && blue >= 0x7e && blue <= 0x81, - "DSTALPHA on frame buffer returned color %08x, expected 0x00ff0000\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x00, 0x80), 2), + "DSTALPHA on frame buffer returned color %08x, expected 0x007f0080\n", color); color = getPixelColor(device, 480, 360); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff); - ok(red >= 0xbe && red <= 0xc0 && green >= 0x39 && green <= 0x41 && blue == 0x00, - "SRCALPHA on texture returned color %08x, expected bar\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0x40, 0x00), 1), + "SRCALPHA on texture returned color %08x, expected 0x00bf4000\n", color); color = getPixelColor(device, 480, 120); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff); - ok(red == 0x00 && green == 0x00 && blue >= 0xfe && blue <= 0xff , - "DSTALPHA on texture returned color %08x, expected foo\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff), 1), + "DSTALPHA on texture returned color %08x, expected 0x000000ff\n", color); out: /* restore things */

1 0

Rob Shearman : include: Add the local attribute to IShellExecuteHookA/ W since they use an undefined structure.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: f453699983230f41e1cc7cbda768a27be01c7025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f453699983230f41e1cc7cbda… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 23 22:29:22 2008 +0100 include: Add the local attribute to IShellExecuteHookA/W since they use an undefined structure. --- include/shobjidl.idl | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 563d9e2..31d211d 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1120,7 +1120,8 @@ interface IContextMenu3 : IContextMenu2 [ object, uuid(000214f5-0000-0000-c000-000000000046), - pointer_default(unique) + pointer_default(unique), + local ] interface IShellExecuteHookA : IUnknown { @@ -1136,7 +1137,8 @@ interface IShellExecuteHookA : IUnknown [ object, uuid(000214fb-0000-0000-c000-000000000046), - pointer_default(unique) + pointer_default(unique), + local ] interface IShellExecuteHookW : IUnknown {

1 0

Rob Shearman : widl: Fix check_remoting_fields to enumerate the correct list of fields.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: b2286fd45c76a4ccae83965f62f6a758ea87a119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2286fd45c76a4ccae83965f6… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 23 22:29:15 2008 +0100 widl: Fix check_remoting_fields to enumerate the correct list of fields. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4db992b..8257035 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2623,7 +2623,7 @@ static void check_remoting_fields(const var_t *var, type_t *type) fields = type->fields_or_args; } - if (fields) LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) + if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) if (field->type) check_field_common(type, type->name, field); }

1 0

Rob Shearman : widl: Fix type_memsize to follow aliases so that the correct size is calculated.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 925a7005743707c5d440a5bef2f40d410b9fa117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925a7005743707c5d440a5bef… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 23 22:29:11 2008 +0100 widl: Fix type_memsize to follow aliases so that the correct size is calculated. --- tools/widl/typegen.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8d86e8a..f89f13f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -814,7 +814,9 @@ size_t type_memsize(const type_t *t, unsigned int *align) { size_t size = 0; - if (t->declarray && is_conformant_array(t)) + if (t->kind == TKIND_ALIAS) + size = type_memsize(t->orig, align); + else if (t->declarray && is_conformant_array(t)) { type_memsize(t->ref, align); size = 0;

1 0

Rob Shearman : widl: Fix crash in find_array_or_string_in_struct if the structure or union has no fields or cases .
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: b3dde47ed760880e323222af9ec7ad30702dec7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3dde47ed760880e323222af9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 23 22:28:56 2008 +0100 widl: Fix crash in find_array_or_string_in_struct if the structure or union has no fields or cases. --- tools/widl/typegen.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7808cea..8d86e8a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1721,14 +1721,20 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type static const var_t *find_array_or_string_in_struct(const type_t *type) { - const var_t *last_field = LIST_ENTRY( list_tail(type->fields_or_args), const var_t, entry ); - const type_t *ft = last_field->type; + const var_t *last_field; + const type_t *ft; + + if (!type->fields_or_args || list_empty(type->fields_or_args)) + return NULL; + + last_field = LIST_ENTRY( list_tail(type->fields_or_args), const var_t, entry ); + ft = last_field->type; if (ft->declarray && is_conformant_array(ft)) return last_field; if (ft->type == RPC_FC_CSTRUCT || ft->type == RPC_FC_CPSTRUCT || ft->type == RPC_FC_CVSTRUCT) - return find_array_or_string_in_struct(last_field->type); + return find_array_or_string_in_struct(ft); else return NULL; }

1 0

Rob Shearman : widl: Fix the types of enums with the v1_enum attribute applied.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: 4997f1849b0716cbf2db1b646886162f5ae014c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4997f1849b0716cbf2db1b646… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 23 22:29:03 2008 +0100 widl: Fix the types of enums with the v1_enum attribute applied. --- tools/widl/parser.y | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3248bf8..4db992b 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1479,6 +1479,14 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, error_loc("'%s': [string] attribute applied to non-pointer, non-array type\n", v->name); + if (is_attr(v->attrs, ATTR_V1ENUM)) + { + if (v->type->type == RPC_FC_ENUM16) + v->type->type = RPC_FC_ENUM32; + else + error_loc("'%s': [v1_enum] attribute applied to non-enum type\n", v->name); + } + sizeless = FALSE; if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) {

1 0

Rob Shearman : widl: Set the type of the type_t node constructured for dispinterfaces to RPC_FC_IP , like we do for interfaces.
by Alexandre Julliard 24 Jun '08

24 Jun '08

Module: wine Branch: master Commit: ada3ca6f0990b265baff0c29f621cb9c4afd401f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada3ca6f0990b265baff0c29f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 23 22:28:50 2008 +0100 widl: Set the type of the type_t node constructured for dispinterfaces to RPC_FC_IP, like we do for interfaces. --- tools/widl/parser.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ba909bc..3248bf8 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -874,8 +874,8 @@ coclass_int: m_attributes interfacedec { $$ = make_ifref($2); $$->attrs = $1; } ; -dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(0, $2, 0); $$->kind = TKIND_DISPATCH; } - | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(0, $2, 0); $$->kind = TKIND_DISPATCH; } +dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_DISPATCH; } + | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_DISPATCH; } ; dispinterfacehdr: attributes dispinterface { attr_t *attrs;

1 0