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

Rob Shearman : widl: Check that the structure has been defined in check_remoting_args.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 037fa861ab07be09a90409e5031d8207ddf27bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=037fa861ab07be09a90409e50… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jul 2 00:01:42 2008 +0100 widl: Check that the structure has been defined in check_remoting_args. --- tools/widl/parser.y | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bb54b43..6616193 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2611,7 +2611,12 @@ static void check_remoting_fields(const var_t *var, type_t *type) type->checked = TRUE; if (is_struct(type->type)) - fields = type->fields_or_args; + { + if (type->defined) + fields = type->fields_or_args; + else + error_loc_info(&var->loc_info, "undefined type declaration %s\n", type->name); + } else if (is_union(type->type)) { if (type->type == RPC_FC_ENCAPSULATED_UNION)

1 0

Dan Hipschman : include: Fix type redefinitions in IDL files.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 6db7ce7a6dcf8023bf4c0ffc78c0eb3271e68cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db7ce7a6dcf8023bf4c0ffc7… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 1 13:08:04 2008 -0700 include: Fix type redefinitions in IDL files. --- include/d3d10.idl | 2 +- include/vmr9.idl | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 4e5292f..120f884 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -676,7 +676,7 @@ typedef struct D3D10_TEX2DMS_SRV { UINT UnusedField_NothingToDefine; } D3D10_TEX2DMS_SRV; -typedef struct D3D10_TEX2DMS_ARRAY_RTV { +typedef struct D3D10_TEX2DMS_ARRAY_SRV { UINT FirstArraySlice; UINT ArraySize; } D3D10_TEX2DMS_ARRAY_SRV; diff --git a/include/vmr9.idl b/include/vmr9.idl index e5e5fd8..b7f916c 100644 --- a/include/vmr9.idl +++ b/include/vmr9.idl @@ -25,7 +25,6 @@ typedef LONGLONG REFERENCE_TIME; typedef DWORD D3DFORMAT; typedef DWORD D3DPOOL; typedef HANDLE HMONITOR; -typedef HANDLE HDC; typedef struct { } AM_MEDIA_TYPE; typedef struct { } D3DCOLOR; cpp_quote("#endif")

1 0

Dan Hipschman : widl: Implement type redefinition checks.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 6725c5d756dc6cd1dc19e7de0e0c45005a2024a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6725c5d756dc6cd1dc19e7de0… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 1 13:08:51 2008 -0700 widl: Implement type redefinition checks. This allows widl to catch type redefinitions and report an error, like MIDL. However, this does a better job than MIDL since it also reports the location of the originial definition, like GCC. --- tools/widl/parser.y | 41 ++++++++++++++++++++++++++++++++++------- tools/widl/typelib.c | 1 + tools/widl/widltypes.h | 3 +++ 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6616193..fc27b2d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -156,6 +156,8 @@ static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(func_t *func); +static type_t *find_type_helper(const char *name, int t); +static void check_def(const type_t *t); static statement_t *make_statement(enum statement_type type); static statement_t *make_statement_type_decl(type_t *type); @@ -845,12 +847,15 @@ int_std: tINT { $$ = make_builtin($<str>1); } coclass: tCOCLASS aIDENTIFIER { $$ = make_class($2); } | tCOCLASS aKNOWNTYPE { $$ = find_type($2, 0); - if ($$->defined) error_loc("multiple definition error\n"); - if ($$->kind != TKIND_COCLASS) error_loc("%s was not declared a coclass\n", $2); + if ($$->kind != TKIND_COCLASS) + error_loc("%s was not declared a coclass at %s:%d\n", + $2, $$->loc_info.input_name, + $$->loc_info.line_number); } ; coclasshdr: attributes coclass { $$ = $2; + check_def($$); $$->attrs = check_coclass_attrs($2->name, $1); if (!parse_only && do_header) write_coclass($$); @@ -882,7 +887,7 @@ dispinterfacehdr: attributes dispinterface { attr_t *attrs; is_in_interface = TRUE; is_object_interface = TRUE; $$ = $2; - if ($$->defined) error_loc("multiple definition error\n"); + check_def($$); attrs = make_attr(ATTR_DISPINTERFACE); $$->attrs = append_attr( check_dispiface_attrs($2->name, $1), attrs ); $$->ref = find_type("IDispatch", 0); @@ -934,7 +939,7 @@ interfacehdr: attributes interface { $$.interface = $2; pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); is_object_interface = is_object($1); is_in_interface = TRUE; - if ($2->defined) error_loc("multiple definition error\n"); + check_def($2); $2->attrs = check_iface_attrs($2->name, $1); $2->defined = TRUE; if (!parse_only && do_header) write_forward($2); @@ -1060,6 +1065,7 @@ pointer_type: structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, tsSTRUCT); /* overwrite RPC_FC_STRUCT with a more exact type */ + check_def($$); $$->type = get_struct_type( $4 ); $$->kind = TKIND_RECORD; $$->fields_or_args = $4; @@ -1089,6 +1095,7 @@ typedef: tTYPEDEF m_attributes decl_spec declarator_list uniondef: tUNION t_ident '{' ne_union_fields '}' { $$ = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, $2, tsUNION); + check_def($$); $$->kind = TKIND_UNION; $$->fields_or_args = $4; $$->defined = TRUE; @@ -1097,6 +1104,7 @@ uniondef: tUNION t_ident '{' ne_union_fields '}' tSWITCH '(' s_field ')' m_ident '{' cases '}' { var_t *u = $7; $$ = get_typev(RPC_FC_ENCAPSULATED_UNION, $2, tsUNION); + check_def($$); $$->kind = TKIND_UNION; if (!u) u = make_var( xstrdup("tagged_union") ); u->type = make_type(RPC_FC_NON_ENCAPSULATED_UNION, NULL); @@ -1390,6 +1398,7 @@ type_t *make_type(unsigned char type, type_t *ref) t->tfswrite = FALSE; t->checked = FALSE; t->typelib_idx = -1; + init_loc_info(&t->loc_info); return t; } @@ -1701,9 +1710,7 @@ static var_t *make_var(char *name) v->attrs = NULL; v->eval = NULL; v->stgclass = STG_NONE; - v->loc_info.input_name = input_name ? input_name : "stdin"; - v->loc_info.line_number = line_number; - v->loc_info.near_text = parser_text; + init_loc_info(&v->loc_info); return v; } @@ -1894,6 +1901,12 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at if (name->name) { type_t *cur; + cur = find_type_helper(name->name, 0); + if (cur) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + cur->name, cur->loc_info.input_name, + cur->loc_info.line_number); + /* set the attributes to allow set_type to do some checks on them */ name->attrs = attrs; set_type(name, decl_spec, decl, 0); @@ -2896,3 +2909,17 @@ static func_list_t *append_func_from_statement(func_list_t *list, statement_t *s } return list; } + +void init_loc_info(loc_info_t *i) +{ + i->input_name = input_name ? input_name : "stdin"; + i->line_number = line_number; + i->near_text = parser_text; +} + +static void check_def(const type_t *t) +{ + if (t->defined) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + t->name, t->loc_info.input_name, t->loc_info.line_number); +} diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 4102fad..b30b323 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -70,6 +70,7 @@ type_t *alias(type_t *t, const char *name) a->kind = TKIND_ALIAS; a->attrs = NULL; a->declarray = FALSE; + init_loc_info(&a->loc_info); return a; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index c3a3948..d00a732 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -274,6 +274,7 @@ struct _type_t { unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx; + loc_info_t loc_info; unsigned int declarray : 1; /* if declared as an array */ unsigned int ignore : 1; unsigned int defined : 1; @@ -410,6 +411,8 @@ var_t *find_const(const char *name, int f); type_t *find_type(const char *name, int t); type_t *make_type(unsigned char type, type_t *ref); +void init_loc_info(loc_info_t *); + static inline type_t *get_func_return_type(const func_t *func) { return func->def->type->ref;

1 0

Peter Oberndorfer : msvcrt: Add a test for scanf %p.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 02fb99e6b360a6f321f716b57df97ca79ec1b9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02fb99e6b360a6f321f716b57… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Jul 1 21:14:51 2008 +0200 msvcrt: Add a test for scanf %p. --- dlls/msvcrt/tests/scanf.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 65bea46..c2a695b 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -28,6 +28,7 @@ static void test_sscanf( void ) char format[20]; int result, ret; char c; + void *ptr; float res1= -82.6267f, res2= 27.76f, res11, res12; static const char pname[]=" St. Petersburg, Florida\n"; int hour=21,min=59,sec=20; @@ -39,6 +40,34 @@ static void test_sscanf( void ) ret = sscanf(buffer, "%d", &result); ok( ret == EOF,"sscanf returns %x instead of %x\n", ret, EOF ); + /* check %p */ + todo_wine { + ok( sscanf("000000000046F170", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x46F170,"sscanf reads %p instead of %x\n", ptr, 0x46F170 ); + + ok( sscanf("0046F171", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x46F171,"sscanf reads %p instead of %x\n", ptr, 0x46F171 ); + + ok( sscanf("46F172", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x46F172,"sscanf reads %p instead of %x\n", ptr, 0x46F172 ); + + ok( sscanf("0x46F173", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0,"sscanf reads %p instead of %x\n", ptr, 0 ); + + ok( sscanf("-46F174", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0xFFB90E8C,"sscanf reads %p instead of %x\n", ptr, 0xFFB90E8C ); + + ok( sscanf("+46F175", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x46F175,"sscanf reads %p instead of %x\n", ptr, 0x46F175 ); + + /* check %p with no hex digits */ + ok( sscanf("1233", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x1233,"sscanf reads %p instead of %x\n", ptr, 0x1233 ); + + ok( sscanf("1234", "%P", &ptr) == 1, "sscanf failed\n" ); + ok( ptr == (void *)0x1234,"sscanf reads %p instead of %x\n", ptr, 0x1234 ); + } + /* check %x */ strcpy(buffer,"0x519"); ok( sscanf(buffer, "%x", &result) == 1, "sscanf failed\n" );

1 0

Peter Oberndorfer : msvcrt: Implement %p for scanf.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: 9e3a4652dafbcf1f3f957858a54f2149e91942b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3a4652dafbcf1f3f957858a… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Jul 1 21:15:00 2008 +0200 msvcrt: Implement %p for scanf. --- dlls/msvcrt/scanf.h | 4 +++- dlls/msvcrt/tests/scanf.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 07c64e8..c236f48 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -149,6 +149,8 @@ _FUNCTION_ { } /* read type */ switch(*format) { + case 'p': + case 'P': /* pointer. */ case 'x': case 'X': /* hexadecimal integer. */ base = 16; @@ -179,7 +181,7 @@ _FUNCTION_ { if (width>0) width--; } /* look for leading indication of base */ - if (width!=0 && nch == '0') { + if (width!=0 && nch == '0' && *format != 'p' && *format != 'P') { nch = _GETC_(file); if (width>0) width--; seendigit=1; diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index c2a695b..b152eac 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -41,7 +41,6 @@ static void test_sscanf( void ) ok( ret == EOF,"sscanf returns %x instead of %x\n", ret, EOF ); /* check %p */ - todo_wine { ok( sscanf("000000000046F170", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x46F170,"sscanf reads %p instead of %x\n", ptr, 0x46F170 ); @@ -66,7 +65,6 @@ static void test_sscanf( void ) ok( sscanf("1234", "%P", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x1234,"sscanf reads %p instead of %x\n", ptr, 0x1234 ); - } /* check %x */ strcpy(buffer,"0x519");

1 0

H. Verbeet : wined3d: Get rid of a redundant local variable.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: a1a14fb2c33ed729641979e65e8b7859732ff221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a14fb2c33ed729641979e65… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 1 21:29:45 2008 +0200 wined3d: Get rid of a redundant local variable. --- dlls/wined3d/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f7301d7..e3fa816 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6464,11 +6464,10 @@ static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_ static void set_render_target_fbo(IWineD3DDevice *iface, DWORD idx, IWineD3DSurface *render_target) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSurfaceImpl *rtimpl = (IWineD3DSurfaceImpl *)render_target; TRACE("Set render target %u to %p\n", idx, render_target); - if (rtimpl) { + if (render_target) { attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, idx, render_target); This->draw_buffers[idx] = GL_COLOR_ATTACHMENT0_EXT + idx; } else {

1 0

Piotr Caban : msxml3: Added IXMLDOMElement_getAttributeNode implementation.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: c0661fdb90816ff5b19c86bb80709cec70896cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0661fdb90816ff5b19c86bb8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 1 19:47:08 2008 +0200 msxml3: Added IXMLDOMElement_getAttributeNode implementation. --- dlls/msxml3/element.c | 29 +++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 4 ---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 76af4c6..4b9bf6c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -582,8 +582,33 @@ static HRESULT WINAPI domelem_getAttributeNode( IXMLDOMElement *iface, BSTR p, IXMLDOMAttribute** attributeNode ) { - FIXME("\n"); - return E_NOTIMPL; + domelem *This = impl_from_IXMLDOMElement( iface ); + xmlChar *xml_name; + xmlNodePtr element; + xmlAttrPtr attr; + IUnknown *unk; + HRESULT hr = E_FAIL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), attributeNode); + + element = get_element( This ); + if ( !element ) + return E_FAIL; + + xml_name = xmlChar_from_wchar(p); + + attr = xmlHasProp(element, xml_name); + if(attr) { + unk = create_attribute((xmlNodePtr)attr); + hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); + IUnknown_Release(unk); + }else { + *attributeNode = NULL; + } + + HeapFree(GetProcessHeap(), 0, xml_name); + + return hr; } static HRESULT WINAPI domelem_setAttributeNode( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0479d80..d5c463d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -939,10 +939,8 @@ static void test_domnode( void ) attr = (IXMLDOMAttribute*)0xdeadbeef; r = IXMLDOMElement_getAttributeNode( element, str, &attr); - todo_wine { ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); - } SysFreeString( str ); str = SysAllocString( szdl ); @@ -962,10 +960,8 @@ static void test_domnode( void ) attr = NULL; r = IXMLDOMElement_getAttributeNode( element, str, &attr); - todo_wine { ok( r == S_OK, "GetAttributeNode ret %08x\n", r ); ok( attr != NULL, "getAttributeNode returned NULL\n" ); - } if(attr) IXMLDOMAttribute_Release(attr);

1 0

Piotr Caban : msxml3: Added IXMLDOMElement_getAttributeNode test.
by Alexandre Julliard 02 Jul '08

02 Jul '08

Module: wine Branch: master Commit: bd4e7379aedfa6f453cd850d47e7a2c17708d411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4e7379aedfa6f453cd850d4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 1 19:47:03 2008 +0200 msxml3: Added IXMLDOMElement_getAttributeNode test. --- dlls/msxml3/tests/domdoc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 820a37a..0479d80 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -853,6 +853,7 @@ static void test_domnode( void ) IXMLDOMNamedNodeMap *map = NULL; IXMLDOMNode *node = NULL, *next = NULL; IXMLDOMNodeList *list = NULL; + IXMLDOMAttribute *attr = NULL; DOMNodeType type = NODE_INVALID; VARIANT_BOOL b; BSTR str; @@ -935,6 +936,13 @@ static void test_domnode( void ) ok( r == E_FAIL, "getAttribute ret %08x\n", r ); ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); + + attr = (IXMLDOMAttribute*)0xdeadbeef; + r = IXMLDOMElement_getAttributeNode( element, str, &attr); + todo_wine { + ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); + ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); + } SysFreeString( str ); str = SysAllocString( szdl ); @@ -952,6 +960,15 @@ static void test_domnode( void ) r = IXMLDOMElement_getAttribute( element, str, NULL ); ok( r == E_INVALIDARG, "getAttribute ret %08x\n", r ); + attr = NULL; + r = IXMLDOMElement_getAttributeNode( element, str, &attr); + todo_wine { + ok( r == S_OK, "GetAttributeNode ret %08x\n", r ); + ok( attr != NULL, "getAttributeNode returned NULL\n" ); + } + if(attr) + IXMLDOMAttribute_Release(attr); + SysFreeString( str ); r = IXMLDOMElement_get_attributes( element, &map );

1 0

James Hawkins : rpcrt4: Fix a few failing tests in win2k.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: ee24a372bee31baff6f5c7ab6084da5ceb67bf69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee24a372bee31baff6f5c7ab6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 00:28:01 2008 -0500 rpcrt4: Fix a few failing tests in win2k. --- dlls/rpcrt4/tests/ndr_marshall.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index a860253..fa19674 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1161,7 +1161,9 @@ static void test_client_init(void) ok(stubMsg.IsClient == 1, "stubMsg.IsClient should have been 1 instead of %u\n", stubMsg.IsClient); TEST_ZERO(ReuseBuffer, "%d"); TEST_ZERO(pAllocAllNodesContext, "%p"); - TEST_ZERO(pPointerQueueState, "%p"); + ok(stubMsg.pPointerQueueState == 0 || + broken(stubMsg.pPointerQueueState == (void *)0xcccccccc), /* win2k */ + "stubMsg.pPointerQueueState should have been unset instead of %p\n", stubMsg.pPointerQueueState); TEST_ZERO(IgnoreEmbeddedPointers, "%d"); TEST_ZERO(PointerBufferMark, "%p"); TEST_ZERO(CorrDespIncrement, "%d"); @@ -1260,9 +1262,13 @@ todo_wine TEST_ULONG_UNSET(MemorySize); TEST_POINTER_UNSET(Memory); ok(stubMsg.IsClient == 0, "stubMsg.IsClient should have been 0 instead of %u\n", stubMsg.IsClient); - TEST_ZERO(ReuseBuffer, "%d"); + ok(stubMsg.ReuseBuffer == 0 || + broken(stubMsg.ReuseBuffer == 1), /* win2k */ + "stubMsg.ReuseBuffer should have been set to zero instead of %d\n", stubMsg.ReuseBuffer); TEST_ZERO(pAllocAllNodesContext, "%p"); - TEST_ZERO(pPointerQueueState, "%p"); + ok(stubMsg.pPointerQueueState == 0 || + broken(stubMsg.pPointerQueueState == (void *)0xcccccccc), /* win2k */ + "stubMsg.pPointerQueueState should have been unset instead of %p\n", stubMsg.pPointerQueueState); TEST_ZERO(IgnoreEmbeddedPointers, "%d"); TEST_ZERO(PointerBufferMark, "%p"); ok(stubMsg.CorrDespIncrement == 0xcc, "CorrDespIncrement should have been unset instead of 0x%x\n", stubMsg.CorrDespIncrement);

1 0

Michael Karcher : gdi32: Fix palette of 1bpp DIB in GetDIBits.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: fd8746b43ce24e209dd22c0bb1a4fe3ea38720a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8746b43ce24e209dd22c0bb… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jun 29 13:30:01 2008 +0200 gdi32: Fix palette of 1bpp DIB in GetDIBits. Windows always generates a black/white palette for 1 bit DIBs generated from DDBs. Copying from the current palette only takes place for color DDBs (not explicitly mentioned in MSDN), and only if depth equal (MSDN states it, explicitly). --- dlls/gdi32/dib.c | 6 ++++-- dlls/gdi32/tests/bitmap.c | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 46be0f0..677cda5 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -705,8 +705,10 @@ INT WINAPI GetDIBits( for (i = 0; i < (1 << bpp); i++) ((WORD *)colorPtr)[i] = (WORD)i; } - else if(bpp >= bmp->bitmap.bmBitsPixel) { - /* Generate the color map from the selected palette */ + else if(bpp > 1 && bpp == bmp->bitmap.bmBitsPixel) { + /* For color DDBs in native depth (mono DDBs always have + a black/white palette): + Generate the color map from the selected palette */ PALETTEENTRY palEntry[256]; memset( palEntry, 0, sizeof(palEntry) ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 79f6003..9a7213c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1499,7 +1499,6 @@ static void test_GetDIBits(void) "expected bmiColors[0] 0,0,0,0 - got %x %x %x %x\n", bi->bmiColors[0].rgbRed, bi->bmiColors[0].rgbGreen, bi->bmiColors[0].rgbBlue, bi->bmiColors[0].rgbReserved); -todo_wine ok(bi->bmiColors[1].rgbRed == 0xff && bi->bmiColors[1].rgbGreen == 0xff && bi->bmiColors[1].rgbBlue == 0xff && bi->bmiColors[1].rgbReserved == 0, "expected bmiColors[0] 0xff,0xff,0xff,0 - got %x %x %x %x\n",

1 0