February 2010 - Wine-Commits

Piotr Caban : oleaut32: Improved ICreateTypeInfo2_SetFuncAndParamNames implementation.
by Alexandre Julliard Feb. 23, 2010

Feb. 23, 2010

Module: wine Branch: master Commit: 3102176cebe5865e621ee87df85abdb85bd18ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=3102176cebe5865e621ee87df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 22 23:13:42 2010 +0100 oleaut32: Improved ICreateTypeInfo2_SetFuncAndParamNames implementation. --- dlls/oleaut32/tests/typelib.c | 27 +++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 48 ++++++++++++++++++++++++++++------------ 2 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 523f33c..b391866 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -971,6 +971,12 @@ if(use_midl_tlb) { static void test_CreateTypeLib(void) { static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; static WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; + static OLECHAR func1W[] = {'f','u','n','c','1',0}; + static OLECHAR func2W[] = {'f','u','n','c','2',0}; + static OLECHAR param1W[] = {'p','a','r','a','m','1',0}; + static OLECHAR param2W[] = {'p','a','r','a','m','2',0}; + static OLECHAR *names1[] = {func1W, param1W, param2W}; + static OLECHAR *names2[] = {func2W, param1W, param2W}; char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; @@ -1083,6 +1089,27 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 1000, NULL, 1); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 1000, names1, 1); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, names1, 2); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, names2, 1); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 0, names1, 1); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 3, names2, 3); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetFuncAndParamNames(createti, 3, names1, 3); + ok(hres == TYPE_E_AMBIGUOUSNAME, "got %08x\n", hres); + ICreateTypeInfo_Release(createti); hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index f392c1d..907eae1 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1914,32 +1914,50 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( UINT cNames) { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; - - CyclicList *iter; - UINT i; - int offset; + CyclicList *iter = NULL, *iter2; + int offset, len, i=0; char *namedata; - FIXME("(%p,%d,%s,%d), stub!\n", iface, index, debugstr_w(*rgszNames), cNames); + TRACE("(%p %d %p %d)\n", iface, index, rgszNames, cNames); - offset = ctl2_alloc_name(This->typelib, rgszNames[0]); + if(!rgszNames) + return E_INVALIDARG; - namedata = This->typelib->typelib_segment_data[MSFT_SEG_NAME] + offset; - namedata[9] &= ~0x10; - if (*((INT *)namedata) == -1) { - *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; + if(index >= This->typeinfo->cElement || !cNames) + return TYPE_E_ELEMENTNOTFOUND; + + len = ctl2_encode_name(This->typelib, rgszNames[0], &namedata); + for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { + if(i == index) + iter = iter2; + else if(iter2->name!=-1 && !memcmp(namedata, + This->typelib->typelib_segment_data[MSFT_SEG_NAME]+iter2->name+8, len)) + return TYPE_E_AMBIGUOUSNAME; + + i++; } - iter = This->typedata->next->next; - for(i=0; i<index; i++) - iter = iter->next; + /* cNames == cParams for put or putref accessor, cParams+1 otherwise */ + if(cNames != iter->u.data[5] + ((iter->u.data[4]>>3)&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF) ? 0 : 1)) + return TYPE_E_ELEMENTNOTFOUND; + + offset = ctl2_alloc_name(This->typelib, rgszNames[0]); + if(offset == -1) + return E_OUTOFMEMORY; iter->name = offset; + namedata = This->typelib->typelib_segment_data[MSFT_SEG_NAME] + offset; + *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; + + if(iter->u.data[4]&0x1000) + len = iter->u.data[5]; + else + len = 0; + for (i = 1; i < cNames; i++) { - /* FIXME: Almost certainly easy to break */ offset = ctl2_alloc_name(This->typelib, rgszNames[i]); - iter->u.data[(i * 3) + 5] = offset; + iter->u.data[(i*3) + 4 + len] = offset; } return S_OK;

1 0

Piotr Caban : oleaut32: Added VT_BSTR handling to ctl2_add_default_value.
by Alexandre Julliard Feb. 23, 2010

Feb. 23, 2010

Module: wine Branch: master Commit: e68c7cf70969afe8972f9d9b4b75810761baa728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68c7cf70969afe8972f9d9b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 22 23:13:14 2010 +0100 oleaut32: Added VT_BSTR handling to ctl2_add_default_value. --- dlls/oleaut32/tests/typelib.c | 8 ++++++++ dlls/oleaut32/typelib2.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9e5d91d..523f33c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -970,6 +970,7 @@ if(use_midl_tlb) { static void test_CreateTypeLib(void) { static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; + static WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; @@ -1075,6 +1076,13 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + elemdesc[0].tdesc.vt = VT_BSTR; + elemdesc[1].tdesc.vt = VT_BSTR; + V_VT(&paramdescex.varDefaultValue) = VT_BSTR; + V_BSTR(&paramdescex.varDefaultValue) = SysAllocString(defaultW); + hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + ICreateTypeInfo_Release(createti); hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 0a4a8bb..f392c1d 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1190,6 +1190,44 @@ static HRESULT ctl2_add_default_value( memcpy(&This->typelib_segment_data[MSFT_SEG_CUSTDATA][*encoded_value], data, 8); return S_OK; } + case VT_BSTR: { + /* Construct the data */ + int i, len = (6+SysStringLen(V_BSTR(&v))+3) & ~0x3; + char *data = HeapAlloc(GetProcessHeap(), 0, len); + + if(!data) + return E_OUTOFMEMORY; + + *((unsigned short*)data) = arg_type; + *((unsigned*)(data+2)) = SysStringLen(V_BSTR(&v)); + for(i=0; i<SysStringLen(V_BSTR(&v)); i++) { + if(V_BSTR(&v)[i] <= 0x7f) + data[i+6] = V_BSTR(&v)[i]; + else + data[i+6] = '?'; + } + WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), SysStringLen(V_BSTR(&v)), &data[6], len-6, NULL, NULL); + for(i=6+SysStringLen(V_BSTR(&v)); i<len; i++) + data[i] = 0x57; + + /* Check if the data was already allocated */ + for(*encoded_value=0; *encoded_value<=This->typelib_segdir[MSFT_SEG_CUSTDATA].length-len; *encoded_value+=4) + if(!memcmp(&This->typelib_segment_data[MSFT_SEG_CUSTDATA][*encoded_value], data, len)) { + HeapFree(GetProcessHeap(), 0, data); + return S_OK; + } + + /* Allocate the data */ + *encoded_value = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATA, len, 0); + if(*encoded_value == -1) { + HeapFree(GetProcessHeap(), 0, data); + return E_OUTOFMEMORY; + } + + memcpy(&This->typelib_segment_data[MSFT_SEG_CUSTDATA][*encoded_value], data, len); + HeapFree(GetProcessHeap(), 0, data); + return S_OK; + } default: FIXME("Argument type not yet handled\n"); return E_NOTIMPL;

1 0

Piotr Caban : oleaut32: Added more arguments with default values handling.
by Alexandre Julliard Feb. 23, 2010

Feb. 23, 2010

Module: wine Branch: master Commit: f42a73d01fe8226b8188997679cc23e1d9a89458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42a73d01fe8226b818899767… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 22 23:12:45 2010 +0100 oleaut32: Added more arguments with default values handling. --- dlls/oleaut32/tests/typelib.c | 8 ++++++++ dlls/oleaut32/typelib2.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index b9bb396..9e5d91d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1067,6 +1067,14 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + elemdesc[0].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + elemdesc[0].paramdesc.pparamdescex = &paramdescex; + elemdesc[1].tdesc.vt = VT_INT; + V_VT(&paramdescex.varDefaultValue) = VT_INT; + V_INT(&paramdescex.varDefaultValue) = 0xffffffff; + hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + ICreateTypeInfo_Release(createti); hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 41b7891..0a4a8bb 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1163,8 +1163,37 @@ static HRESULT ctl2_add_default_value( return S_OK; } - FIXME("default values not implemented\n"); - return S_OK; + switch(arg_type) { + case VT_I4: + case VT_R4: + case VT_UI4: + case VT_INT: + case VT_UINT: + case VT_HRESULT: + case VT_PTR: { + /* Construct the data to be allocated */ + int data[2]; + data[0] = arg_type + (V_UI4(&v)<<16); + data[1] = (V_UI4(&v)>>16) + 0x57570000; + + /* Check if the data was already allocated */ + /* Currently the structures doesn't allow to do it in a nice way */ + for(*encoded_value=0; *encoded_value<=This->typelib_segdir[MSFT_SEG_CUSTDATA].length-8; *encoded_value+=4) + if(!memcmp(&This->typelib_segment_data[MSFT_SEG_CUSTDATA][*encoded_value], data, 8)) + return S_OK; + + /* Allocate the data */ + *encoded_value = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATA, 8, 0); + if(*encoded_value == -1) + return E_OUTOFMEMORY; + + memcpy(&This->typelib_segment_data[MSFT_SEG_CUSTDATA][*encoded_value], data, 8); + return S_OK; + } + default: + FIXME("Argument type not yet handled\n"); + return E_NOTIMPL; + } } /*================== ICreateTypeInfo2 Implementation ===================================*/

1 0

Henri Verbeet : wined3d: Properly report shader comment sizes.
by Alexandre Julliard Feb. 23, 2010

Feb. 23, 2010

Module: wine Branch: master Commit: eefb45f333350c902f4a3a71a09cdeca01eeb623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eefb45f333350c902f4a3a71a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 22 21:37:19 2010 +0100 wined3d: Properly report shader comment sizes. --- dlls/wined3d/shader.c | 9 ++++++--- dlls/wined3d/shader_sm1.c | 7 +++++-- dlls/wined3d/shader_sm4.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e95b4b5..a3b4ddc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -467,10 +467,11 @@ static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct { struct wined3d_shader_instruction ins; const char *comment; + UINT comment_size; UINT param_size; /* Skip comments. */ - fe->shader_read_comment(&ptr, &comment); + fe->shader_read_comment(&ptr, &comment, &comment_size); if (comment) continue; /* Fetch opcode. */ @@ -1115,10 +1116,11 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe while (!fe->shader_is_end(fe_data, &ptr)) { const char *comment; + UINT comment_size; UINT param_size; /* Skip comment tokens. */ - fe->shader_read_comment(&ptr, &comment); + fe->shader_read_comment(&ptr, &comment, &comment_size); if (comment) continue; /* Read opcode. */ @@ -1222,10 +1224,11 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe { struct wined3d_shader_instruction ins; const char *comment; + UINT comment_size; UINT param_size; /* comment */ - fe->shader_read_comment(&ptr, &comment); + fe->shader_read_comment(&ptr, &comment, &comment_size); if (comment) { TRACE("//%s\n", comment); diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 64876b3..aa1da56 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -641,9 +641,10 @@ static void shader_sm1_read_semantic(const DWORD **ptr, struct wined3d_shader_se shader_parse_dst_param(dst_token, NULL, &semantic->reg); } -static void shader_sm1_read_comment(const DWORD **ptr, const char **comment) +static void shader_sm1_read_comment(const DWORD **ptr, const char **comment, UINT *comment_size) { DWORD token = **ptr; + UINT size; if ((token & WINED3DSI_OPCODE_MASK) != WINED3D_SM1_OP_COMMENT) { @@ -651,8 +652,10 @@ static void shader_sm1_read_comment(const DWORD **ptr, const char **comment) return; } + size = (token & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; *comment = (const char *)++(*ptr); - *ptr += (token & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; + *comment_size = size * sizeof(DWORD); + *ptr += size; } static BOOL shader_sm1_is_end(void *data, const DWORD **ptr) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index e5b4609..b463790 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -406,9 +406,9 @@ static void shader_sm4_read_semantic(const DWORD **ptr, struct wined3d_shader_se FIXME("ptr %p, semantic %p stub!\n", ptr, semantic); } -static void shader_sm4_read_comment(const DWORD **ptr, const char **comment) +static void shader_sm4_read_comment(const DWORD **ptr, const char **comment, UINT *comment_size) { - FIXME("ptr %p, comment %p stub!\n", ptr, comment); + FIXME("ptr %p, comment %p, comment_size %p stub!\n", ptr, comment, comment_size); *comment = NULL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 819b55e..a51ea54 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -625,7 +625,7 @@ struct wined3d_shader_frontend void (*shader_read_dst_param)(void *data, const DWORD **ptr, struct wined3d_shader_dst_param *dst_param, struct wined3d_shader_src_param *dst_rel_addr); void (*shader_read_semantic)(const DWORD **ptr, struct wined3d_shader_semantic *semantic); - void (*shader_read_comment)(const DWORD **ptr, const char **comment); + void (*shader_read_comment)(const DWORD **ptr, const char **comment, UINT *comment_size); BOOL (*shader_is_end)(void *data, const DWORD **ptr); };

1 0

Stefan Leichter : ntdll/tests: Test NtCreateFile with an invalid filename.
by Alexandre Julliard Feb. 23, 2010

Feb. 23, 2010

Module: wine Branch: master Commit: 324984ef0222d7c637cae808753d9f34b16e1f3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=324984ef0222d7c637cae8087… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Feb 22 22:37:04 2010 +0100 ntdll/tests: Test NtCreateFile with an invalid filename. --- dlls/ntdll/tests/file.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3672b51..3d28d80 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -155,6 +155,8 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) static void create_file_test(void) { + static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t', + '\\','f','a','i','l','i','n','g',0}; NTSTATUS status; HANDLE dir; WCHAR path[MAX_PATH]; @@ -231,6 +233,21 @@ static void create_file_test(void) "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); + + pRtlInitUnicodeString( &nameW, systemrootW ); + attr.Length = sizeof(attr); + attr.RootDirectory = NULL; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + dir = NULL; + status = pNtCreateFile( &dir, FILE_APPEND_DATA, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, + FILE_OPEN_IF, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + todo_wine + ok( status == STATUS_INVALID_PARAMETER, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); } static void open_file_test(void)

1 0

Henri Verbeet : wined3d: Escape shader comments.
by Alexandre Julliard Feb. 23, 2010

Feb. 23, 2010

Module: wine Branch: master Commit: de006dbcf995661d4df4733f09c8f3f7618c8bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de006dbcf995661d4df4733f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 22 21:37:20 2010 +0100 wined3d: Escape shader comments. --- dlls/wined3d/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a3b4ddc..06c49ab 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1231,7 +1231,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe fe->shader_read_comment(&ptr, &comment, &comment_size); if (comment) { - TRACE("//%s\n", comment); + TRACE("// %s\n", debugstr_an(comment, comment_size)); continue; }

1 0

Piotr Caban : oleaut32: Added partial ICreateTypeInfo2_AddFuncDesc arguments with default values handling .
by Alexandre Julliard Feb. 23, 2010

Feb. 23, 2010

Module: wine Branch: master Commit: 4f555e3cc2a7875af59b8331d97c562df44f76a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f555e3cc2a7875af59b8331d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 22 23:11:57 2010 +0100 oleaut32: Added partial ICreateTypeInfo2_AddFuncDesc arguments with default values handling. --- dlls/oleaut32/tests/typelib.c | 32 ++++++++-- dlls/oleaut32/typelib2.c | 136 +++++++++++++++++++++++++++++++++-------- 2 files changed, 137 insertions(+), 31 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e75d320..b9bb396 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -977,7 +977,8 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo *createti; ITypeLib *tl; FUNCDESC funcdesc; - ELEMDESC elemdesc; + ELEMDESC elemdesc[5]; + PARAMDESCEX paramdescex; HRESULT hres; trace("CreateTypeLib tests\n"); @@ -1018,11 +1019,11 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc); ok(hres == TYPE_E_INCONSISTENTPROPFUNCS, "got %08x\n", hres); - elemdesc.tdesc.vt = VT_BSTR; - elemdesc.idldesc.dwReserved = 0; - elemdesc.idldesc.wIDLFlags = IDLFLAG_FIN; + elemdesc[0].tdesc.vt = VT_BSTR; + elemdesc[0].idldesc.dwReserved = 0; + elemdesc[0].idldesc.wIDLFlags = IDLFLAG_FIN; - funcdesc.lprgelemdescParam = &elemdesc; + funcdesc.lprgelemdescParam = elemdesc; funcdesc.invkind = INVOKE_PROPERTYPUT; funcdesc.cParams = 1; funcdesc.elemdescFunc.tdesc.vt = VT_VOID; @@ -1045,6 +1046,27 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + elemdesc[0].tdesc.vt = VT_INT; + elemdesc[0].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + elemdesc[0].paramdesc.pparamdescex = &paramdescex; + V_VT(&paramdescex.varDefaultValue) = VT_INT; + V_INT(&paramdescex.varDefaultValue) = 0x123; + funcdesc.lprgelemdescParam = elemdesc; + funcdesc.cParams = 1; + hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + + elemdesc[0].idldesc.dwReserved = 0; + elemdesc[0].idldesc.wIDLFlags = IDLFLAG_FIN; + elemdesc[1].tdesc.vt = VT_UI2; + elemdesc[1].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + elemdesc[1].paramdesc.pparamdescex = &paramdescex; + V_VT(&paramdescex.varDefaultValue) = VT_UI2; + V_UI2(&paramdescex.varDefaultValue) = 0xffff; + funcdesc.cParams = 2; + hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + ICreateTypeInfo_Release(createti); hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index e1a36b2..41b7891 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1109,6 +1109,64 @@ static HRESULT ctl2_find_typeinfo_from_offset( return TYPE_E_ELEMENTNOTFOUND; } +/**************************************************************************** + * ctl2_add_default_value + * + * Adds default value of an argument + * + * RETURNS + * + * Success: S_OK + * Failure: Error code from winerror.h + */ +static HRESULT ctl2_add_default_value( + ICreateTypeLib2Impl *This, /* [I] The typelib to allocate data in */ + int *encoded_value, /* [O] The encoded default value or data offset */ + VARIANT *value, /* [I] Default value to be encoded */ + VARTYPE arg_type) /* [I] Argument type */ +{ + VARIANT v; + HRESULT hres; + + TRACE("%p %d %d\n", This, V_VT(value), arg_type); + + if(arg_type == VT_INT) + arg_type = VT_I4; + if(arg_type == VT_UINT) + arg_type = VT_UI4; + + v = *value; + if(V_VT(value) != arg_type) { + hres = VariantChangeType(&v, value, 0, arg_type); + if(FAILED(hres)) + return hres; + } + + /* Check if default value can be stored in encoded_value */ + switch(arg_type) { + int mask = 0; + case VT_I4: + case VT_UI4: + mask = 0x3ffffff; + if(V_UI4(&v)>0x3ffffff) + break; + case VT_I1: + case VT_UI1: + case VT_BOOL: + if(!mask) + mask = 0xff; + case VT_I2: + case VT_UI2: + if(!mask) + mask = 0xffff; + *encoded_value = (V_UI4(&v)&mask) | ((0x80+0x4*arg_type)<<24); + return S_OK; + } + + FIXME("default values not implemented\n"); + return S_OK; +} + /*================== ICreateTypeInfo2 Implementation ===================================*/ /****************************************************************************** @@ -1384,8 +1442,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( CyclicList *iter, *insert; int *typedata; - int i; + int i, num_defaults = 0; int decoded_size; + HRESULT hres; TRACE("(%p,%d,%p)\n", iface, index, pFuncDesc); @@ -1419,6 +1478,11 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( !pFuncDesc->cParams) return TYPE_E_INCONSISTENTPROPFUNCS; + /* get number of arguments with default values specified */ + for (i = 0; i < pFuncDesc->cParams; i++) + if(pFuncDesc->lprgelemdescParam[i].u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + num_defaults++; + if (!This->typedata) { This->typedata = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); if(!This->typedata) @@ -1432,56 +1496,76 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( insert = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); if(!insert) return E_OUTOFMEMORY; - insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[6])+sizeof(int[3])*pFuncDesc->cParams); + insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[6])+sizeof(int[(num_defaults?4:3)])*pFuncDesc->cParams); if(!insert->u.data) { HeapFree(GetProcessHeap(), 0, insert); return E_OUTOFMEMORY; } - /* insert type data to list */ - if(index == This->typeinfo->cElement) { - insert->next = This->typedata->next; - This->typedata->next = insert; - This->typedata = insert; - } else { - iter = This->typedata->next; - for(i=0; i<index; i++) - iter = iter->next; - - insert->next = iter->next; - iter->next = insert; - } - - /* update type data size */ - This->typedata->next->u.val += 0x18 + (pFuncDesc->cParams * 12); - /* fill out the basic type information */ typedata = insert->u.data; - typedata[0] = 0x18 + pFuncDesc->cParams * 12; + typedata[0] = 0x18 + pFuncDesc->cParams*(num_defaults?16:12); ctl2_encode_typedesc(This->typelib, &pFuncDesc->elemdescFunc.tdesc, &typedata[1], NULL, NULL, &decoded_size); typedata[2] = pFuncDesc->wFuncFlags; typedata[3] = ((sizeof(FUNCDESC) + decoded_size) << 16) | This->typeinfo->cbSizeVft; typedata[4] = (pFuncDesc->callconv << 8) | (pFuncDesc->invkind << 3) | pFuncDesc->funckind; + if(num_defaults) typedata[4] |= 0x1000; typedata[5] = pFuncDesc->cParams; /* NOTE: High word of typedata[3] is total size of FUNCDESC + size of all ELEMDESCs for params + TYPEDESCs for pointer params and return types. */ /* That is, total memory allocation required to reconstitute the FUNCDESC in its entirety. */ typedata[3] += (sizeof(ELEMDESC) * pFuncDesc->cParams) << 16; + typedata[3] += (sizeof(PARAMDESCEX) * num_defaults) << 16; + + /* add default values */ + if(num_defaults) { + for (i = 0; i < pFuncDesc->cParams; i++) + if(pFuncDesc->lprgelemdescParam[i].u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) { + hres = ctl2_add_default_value(This->typelib, typedata+6+i, + &pFuncDesc->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue, + pFuncDesc->lprgelemdescParam[i].tdesc.vt); + + if(FAILED(hres)) { + HeapFree(GetProcessHeap(), 0, insert->u.data); + HeapFree(GetProcessHeap(), 0, insert); + return hres; + } + } else + typedata[6+i] = 0xffffffff; + + num_defaults = pFuncDesc->cParams; + } + /* add arguments */ for (i = 0; i < pFuncDesc->cParams; i++) { - ctl2_encode_typedesc(This->typelib, &pFuncDesc->lprgelemdescParam[i].tdesc, &typedata[6+(i*3)], NULL, NULL, &decoded_size); - typedata[7+(i*3)] = -1; - typedata[8+(i*3)] = pFuncDesc->lprgelemdescParam[i].u.paramdesc.wParamFlags; + ctl2_encode_typedesc(This->typelib, &pFuncDesc->lprgelemdescParam[i].tdesc, + &typedata[6+num_defaults+(i*3)], NULL, NULL, &decoded_size); + typedata[7+num_defaults+(i*3)] = -1; + typedata[8+num_defaults+(i*3)] = pFuncDesc->lprgelemdescParam[i].u.paramdesc.wParamFlags; typedata[3] += decoded_size << 16; - - if(pFuncDesc->lprgelemdescParam[i].u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) - FIXME("default values not implemented\n"); } /* update the index data */ insert->indice = (This->typeinfo->cImplTypes << 16) | pFuncDesc->memid; insert->name = -1; + /* insert type data to list */ + if(index == This->typeinfo->cElement) { + insert->next = This->typedata->next; + This->typedata->next = insert; + This->typedata = insert; + } else { + iter = This->typedata->next; + for(i=0; i<index; i++) + iter = iter->next; + + insert->next = iter->next; + iter->next = insert; + } + + /* update type data size */ + This->typedata->next->u.val += 0x18 + pFuncDesc->cParams*(num_defaults?16:12); + /* Increment the number of function elements */ This->typeinfo->cElement += 1;

1 0

Vitaly Perov : mshtml: Silence IStdMarshalInfo in htmldoc_qi FIXME.
by Alexandre Julliard Feb. 23, 2010

Feb. 23, 2010

Module: wine Branch: master Commit: e2f3b143fd2f8cc960d0fa25eb5da99c36c0484f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f3b143fd2f8cc960d0fa25e… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Mon Feb 22 19:19:31 2010 +0300 mshtml: Silence IStdMarshalInfo in htmldoc_qi FIXME. --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/tests/htmldoc.c | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 93aea06..8adfdb1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1776,6 +1776,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IExternalConnection, riid)) { TRACE("(%p)->(IID_IExternalConnection %p) returning NULL\n", This, ppv); *ppv = NULL; + }else if(IsEqualGUID(&IID_IStdMarshalInfo, riid)) { + TRACE("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv); + *ppv = NULL; }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv); *ppv = OBJSITE(This); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index adc318a..08e0359 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4314,6 +4314,11 @@ static void test_QueryInterface(IHTMLDocument2 *doc) hres = IUnknown_QueryInterface(doc, &IID_IExternalConnection, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); + + qi = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(doc, &IID_IStdMarshalInfo, (void**)&qi); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); } static void init_test(enum load_state_t ls) {

1 0

Alexandre Julliard : mlang/tests: Add another possible failure for Win2k.
by Alexandre Julliard Feb. 23, 2010

Feb. 23, 2010

Module: wine Branch: master Commit: 51c0314951220e72567cdccafac0de7eb420737a URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c0314951220e72567cdccaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 11:26:32 2010 +0100 mlang/tests: Add another possible failure for Win2k. --- dlls/mlang/tests/mlang.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 11e26db..7ab3ff9 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1946,7 +1946,9 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) * up an installation dialog on some platforms, even when specifying CPIOD_PEEK. */ if (IsValidCodePage(i)) - ok(hr == S_OK || broken(hr == E_INVALIDARG), /* win2k */ + ok(hr == S_OK || + broken(hr == S_FALSE) || /* win2k */ + broken(hr == E_INVALIDARG), /* win2k */ "code page %u is valid but not installable 0x%08x\n", i, hr); } }

1 0

Eric Pouech : ntdll: Notify valgrind for stack management while in exception.
by Alexandre Julliard Feb. 23, 2010

Feb. 23, 2010

Module: wine Branch: master Commit: 27fb22637a36ebf05c863da30cfdf2bfd57e6862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27fb22637a36ebf05c863da30… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 22 21:03:35 2010 +0100 ntdll: Notify valgrind for stack management while in exception. --- dlls/ntdll/signal_x86_64.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 97a952e..45cdb32 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -50,6 +50,10 @@ #include "ntdll_misc.h" #include "wine/debug.h" +#ifdef HAVE_VALGRIND_MEMCHECK_H +#include <valgrind/memcheck.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(seh); struct _DISPATCHER_CONTEXT; @@ -1679,6 +1683,11 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun } stack--; /* push the stack_layout structure */ +#if defined(VALGRIND_MAKE_MEM_UNDEFINED) + VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack)); +#elif defined(VALGRIND_MAKE_WRITABLE) + VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack)); +#endif stack->rec.ExceptionRecord = NULL; stack->rec.ExceptionCode = exception_code; stack->rec.ExceptionFlags = EXCEPTION_CONTINUABLE;

1 0