April 2013 - Wine-Commits - list.winehq.org

Nikolay Sivov : oledb32: Destination status and length are optional.
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: 1d462aabea7e3a543cc38a278ef2182cfc64d60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d462aabea7e3a543cc38a278… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 11 18:42:56 2013 +0400 oledb32: Destination status and length are optional. --- dlls/oledb32/convert.c | 6 +++++- dlls/oledb32/tests/convert.c | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 0e31e4a..381210a 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -163,12 +163,17 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, DBDATACONVERT flags) { convert *This = impl_from_IDataConvert(iface); + DBLENGTH dst_len_loc; + DBSTATUS dst_status_loc; HRESULT hr; TRACE("(%p)->(%d, %d, %ld, %p, %p, %p, %ld, %d, %p, %d, %d, %x)\n", This, src_type, dst_type, src_len, dst_len, src, dst, dst_max_len, src_status, dst_status, precision, scale, flags); + if (!dst_len) dst_len = &dst_len_loc; + if (!dst_status) dst_status = &dst_status_loc; + *dst_status = DBSTATUS_E_BADACCESSOR; if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK) @@ -752,7 +757,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type); return E_NOTIMPL; - } if(hr == DISP_E_OVERFLOW) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 3c2f661..8c68154 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2491,6 +2491,7 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_VARIANT, sizeof(strW), &dst_len, strW, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); @@ -2499,6 +2500,14 @@ static void test_converttovar(void) ok(!lstrcmpW(V_BSTR(&dst), strW), "got %s\n", wine_dbgstr_w(V_BSTR(&dst))); VariantClear(&dst); + /* with null dest length and status */ + V_VT(&dst) = VT_EMPTY; + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_VARIANT, sizeof(strW), NULL, strW, &dst, sizeof(dst), 0, NULL, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dst) == VT_BSTR, "got %d\n", V_VT(&dst)); + ok(!lstrcmpW(V_BSTR(&dst), strW), "got %s\n", wine_dbgstr_w(V_BSTR(&dst))); + VariantClear(&dst); + IDataConvert_Release(convert); }

1 0

Piotr Caban : winedump: Dump parameters default values in typelib.
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: 8985e968d465d51b3654522fd313353910559467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8985e968d465d51b3654522fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 11 14:28:22 2013 +0200 winedump: Dump parameters default values in typelib. --- tools/winedump/tlb.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 8cabca2..9ca20b8 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -520,7 +520,7 @@ static int dump_msft_res0f(seg_t *seg) static void dump_msft_func(int n) { - int size, args_cnt, i, extra_attr; + int size, args_cnt, i, extra_attr, fkccic; print_begin_block_id("FuncRecord", n); @@ -530,11 +530,11 @@ static void dump_msft_func(int n) print_hex("flags"); print_short_hex("VtableOffset"); print_short_hex("funcdescsize"); - print_hex("FKCCIC"); + fkccic = print_hex("FKCCIC"); args_cnt = print_short_hex("nrargs"); print_short_hex("noptargs"); - extra_attr = size/sizeof(INT) - 6 - args_cnt*3; + extra_attr = size/sizeof(INT) - 6 - args_cnt*(fkccic&0x1000 ? 4 : 3); if(extra_attr) print_hex("helpcontext"); @@ -551,6 +551,11 @@ static void dump_msft_func(int n) if(extra_attr >= 7) print_hex("oCustData"); + if(fkccic & 0x1000) { + for(i=0; i < args_cnt; i++) + print_hex_id("default value[%d]", i); + } + for(i=0; i < args_cnt; i++) { print_begin_block_id("param", i);

1 0

Nikolay Sivov : oledb32: Implement DBTYPE_I4 -> DBTYPE_VARIANT conversion.
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: 872788356ce9fd0059035dc25200e02f29f8321a URL: http://source.winehq.org/git/wine.git/?a=commit;h=872788356ce9fd0059035dc25… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 11 18:52:54 2013 +0400 oledb32: Implement DBTYPE_I4 -> DBTYPE_VARIANT conversion. --- dlls/oledb32/convert.c | 7 ++++++- dlls/oledb32/tests/convert.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 381210a..f4002fb 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -740,6 +740,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, switch(src_type) { + case DBTYPE_I4: + V_VT(v) = VT_I4; + V_I4(v) = *(signed int*)src; + hr = S_OK; + break; case DBTYPE_BSTR: { BSTR s = *(WCHAR**)src; @@ -747,8 +752,8 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_VT(v) = VT_BSTR; V_BSTR(v) = SysAllocString(s); hr = V_BSTR(v) ? S_OK : E_OUTOFMEMORY; + break; } - break; default: FIXME("Unimplemented conversion %04x -> VARIANT\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 8c68154..4623825 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2481,6 +2481,7 @@ static void test_converttovar(void) DBLENGTH dst_len; VARIANT dst; HRESULT hr; + INT i4; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2508,6 +2509,17 @@ static void test_converttovar(void) ok(!lstrcmpW(V_BSTR(&dst), strW), "got %s\n", wine_dbgstr_w(V_BSTR(&dst))); VariantClear(&dst); + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; + i4 = 123; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_I4, "got %d\n", V_VT(&dst)); + ok(V_I4(&dst) == 123, "got %d\n", V_I4(&dst)); + IDataConvert_Release(convert); }

1 0

Piotr Caban : oleaut32: Use MSFT_VarFunc to store FUNCDESC.
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: 06845a443e44f8a4fcb3fc44f46e771507d1c372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06845a443e44f8a4fcb3fc44f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 11 13:55:54 2013 +0200 oleaut32: Use MSFT_VarFunc to store FUNCDESC. --- dlls/oleaut32/typelib2.c | 271 +++++++++++++++++++++------------------------- 1 files changed, 123 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06845a443e44f8a4fcb3f…

1 0

Piotr Caban : oleaut32: Use MSFT_VarRecord to store VARDESC.
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: ea5dbbb0fb7f637cdd114bac89912adb425fdb92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5dbbb0fb7f637cdd114bac8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 11 13:55:43 2013 +0200 oleaut32: Use MSFT_VarRecord to store VARDESC. --- dlls/oleaut32/typelib2.c | 57 ++++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index df25271..399ac06 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -131,6 +131,7 @@ typedef struct tagCyclicList { union { int val; + MSFT_VarRecord *var; int *data; }u; } CyclicList; @@ -255,20 +256,18 @@ static inline INT ctl2_get_record_size(const CyclicList *iter) return iter->u.data[0] & 0xFFFF; } -static void ctl2_update_var_size(const ICreateTypeInfo2Impl *This, CyclicList *var, int size) +static void ctl2_update_var_size(const ICreateTypeInfo2Impl *This, MSFT_VarRecord *var) { - int old = ctl2_get_record_size(var), i; + int old = var->Info & 0xFFFF, size; - if (old >= size) return; - - /* initialize fields included in size but currently unused */ - for (i = old/sizeof(int); i < (size/sizeof(int) - 1); i++) - { - /* HelpContext/HelpStringContext being 0 means it's not set */ - var->u.data[i] = (i == 5 || i == 9) ? 0 : -1; - } + if(var->HelpStringContext) + size = sizeof(*var); + else if(var->HelpContext) + size = FIELD_OFFSET(MSFT_VarRecord, HelpString); + else + size = FIELD_OFFSET(MSFT_VarRecord, HelpContext); - var->u.data[0] += size - old; + var->Info += size - old; This->typedata->next->u.val += size - old; } @@ -2252,7 +2251,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( HRESULT status = S_OK; CyclicList *insert; - INT *typedata; + MSFT_VarRecord *typedata; int var_datawidth; int var_alignment; int var_type_size; @@ -2283,8 +2282,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( return E_OUTOFMEMORY; /* allocate whole structure, it's fixed size always */ - insert->u.data = heap_alloc(sizeof(MSFT_VarRecord)); - if(!insert->u.data) { + insert->u.var = heap_alloc(sizeof(MSFT_VarRecord)); + if(!insert->u.var) { heap_free(insert); return E_OUTOFMEMORY; } @@ -2297,14 +2296,18 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( This->dual->typedata = This->typedata; This->typedata->next->u.val += FIELD_OFFSET(MSFT_VarRecord, HelpContext); - typedata = This->typedata->u.data; + typedata = This->typedata->u.var; /* fill out the basic type information */ + memset(typedata, 0xff, sizeof(MSFT_VarRecord)); + typedata->HelpContext = 0; + typedata->HelpStringContext = 0; /* no optional fields initially */ - typedata[0] = FIELD_OFFSET(MSFT_VarRecord, HelpContext) | (index << 16); - typedata[2] = pVarDesc->wVarFlags; - typedata[3] = (sizeof(VARDESC) << 16) | pVarDesc->varkind; + typedata->Info = FIELD_OFFSET(MSFT_VarRecord, HelpContext) | (index << 16); + typedata->Flags = pVarDesc->wVarFlags; + typedata->VarKind = pVarDesc->varkind; + typedata->vardescsize = sizeof(VARDESC); /* update the index data */ insert->indice = 0x40000000 + index; @@ -2312,7 +2315,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( /* figure out type widths and whatnot */ ctl2_encode_typedesc(This->typelib, &pVarDesc->elemdescVar.tdesc, - &typedata[1], &var_datawidth, &var_alignment, + &typedata->DataType, &var_datawidth, &var_alignment, &var_type_size); if (pVarDesc->varkind != VAR_CONST) @@ -2320,7 +2323,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( /* pad out starting position to data width */ This->datawidth += var_alignment - 1; This->datawidth &= ~(var_alignment - 1); - typedata[4] = This->datawidth; + typedata->OffsValue = This->datawidth; /* add the new variable to the total data width */ This->datawidth += var_datawidth; @@ -2328,7 +2331,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( This->dual->datawidth = This->datawidth; /* add type description size to total required allocation */ - typedata[3] += var_type_size << 16; + typedata->vardescsize += var_type_size; /* fix type alignment */ alignment = (This->typeinfo->typekind >> 11) & 0x1f; @@ -2352,9 +2355,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( This->typeinfo->size = (This->datawidth + (alignment - 1)) & ~(alignment - 1); } else { VARIANT *value = pVarDesc->DUMMYUNIONNAME.lpvarValue; - status = ctl2_encode_variant(This->typelib, typedata+4, value, V_VT(value)); + status = ctl2_encode_variant(This->typelib, &typedata->OffsValue, value, V_VT(value)); /* ??? native sets size 0x34 */ - typedata[3] += 0x10 << 16; + typedata->vardescsize += 0x10; } /* increment the number of variable elements */ @@ -2553,8 +2556,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarDocString( int offset = ctl2_alloc_string(This->typelib, docstring); if (offset == -1) return E_OUTOFMEMORY; - ctl2_update_var_size(This, iter, FIELD_OFFSET(MSFT_VarRecord, res9)); - iter->u.data[6] = offset; + iter->u.var->HelpString = offset; + ctl2_update_var_size(This, iter->u.var); return S_OK; } } @@ -2615,8 +2618,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext( { if (index-- == 0) { - ctl2_update_var_size(This, iter, FIELD_OFFSET(MSFT_VarRecord, HelpString)); - iter->u.data[5] = context; + iter->u.var->HelpContext = context; + ctl2_update_var_size(This, iter->u.var); return S_OK; } }

1 0

Piotr Caban : oleaut32: Make typeinfo offsets table dynamic.
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: b0dcf32b85f945de2644e71ee2412fff43156163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dcf32b85f945de2644e71ee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 11 13:55:30 2013 +0200 oleaut32: Make typeinfo offsets table dynamic. --- dlls/oleaut32/typelib2.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index a7815a9..df25271 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -178,7 +178,8 @@ typedef struct tagICreateTypeLib2Impl int typelib_guids; /* Number of defined typelib guids */ int typeinfo_guids; /* Number of defined typeinfo guids */ - INT typelib_typeinfo_offsets[0x200]; /* Hope that's enough. */ + INT *typelib_typeinfo_offsets; + int typeinfo_offsets_size; INT *typelib_namehash_segment; INT *typelib_guidhash_segment; @@ -621,6 +622,21 @@ static int ctl2_alloc_typeinfo( int offset; MSFT_TypeInfoBase *typeinfo; + if (!This->typeinfo_offsets_size) { + This->typelib_typeinfo_offsets = heap_alloc(8*sizeof(INT)); + if(!This->typelib_typeinfo_offsets) + return -1; + This->typeinfo_offsets_size = 8; + }else if (This->typelib_header.nrtypeinfos == This->typeinfo_offsets_size) { + INT *new_offsets = heap_realloc(This->typelib_typeinfo_offsets, + 2*This->typeinfo_offsets_size*sizeof(INT)); + if(!new_offsets) + return -1; + + This->typelib_typeinfo_offsets = new_offsets; + This->typeinfo_offsets_size *= 2; + } + offset = ctl2_alloc_segment(This, MSFT_SEG_TYPEINFO, sizeof(MSFT_TypeInfoBase), 0); if (offset == -1) return -1; @@ -4338,6 +4354,7 @@ static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface) heap_free(This->typelib_segment_data[i]); This->typelib_segment_data[i] = NULL; } + heap_free(This->typelib_typeinfo_offsets); SysFreeString(This->filename); This->filename = NULL;

1 0

Jonathan Liu : d3dcompiler.h: Fix typos.
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: 4936b8e5ec78b9538d08af139cdaf0db4e1f831b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4936b8e5ec78b9538d08af139… Author: Jonathan Liu <net147(a)gmail.com> Date: Thu Apr 11 21:47:24 2013 +1000 d3dcompiler.h: Fix typos. --- include/d3dcompiler.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 7ce83be..2dd0fcf 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -26,8 +26,8 @@ extern "C" { #endif #if defined(__GNUC__) -#define D3DCOMPILER_DLL_W (const WCHAR[]){'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0}; -#elif defined(_MSV_VER) +#define D3DCOMPILER_DLL_W (const WCHAR[]){'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0} +#elif defined(_MSC_VER) #define D3DCOMPILER_DLL_W L"d3dcompiler_43.dll" #else static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0};

1 0

Sergey Guralnik : extrac32: Avoid appending redundant backslash to path end .
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: 80bc3838a73aa057624880758d81e476a58e1c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bc3838a73aa057624880758… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Thu Apr 11 10:54:02 2013 +0300 extrac32: Avoid appending redundant backslash to path end. --- programs/extrac32/extrac32.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 644f885..2126c04 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -200,7 +200,6 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho int i; WCHAR check, cmd = 0; WCHAR path[MAX_PATH]; - WCHAR backslash[] = {'\\',0}; LPCWSTR cabfile = NULL; path[0] = 0; @@ -273,7 +272,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho if (cmd == 'E' && !path[0]) GetCurrentDirectoryW(MAX_PATH, path); - lstrcatW(path, backslash); + PathAddBackslashW(path); /* Execute the specified command */ switch(cmd)

1 0

Erich Hoover : server: Report administrator ownership by default for registry objects.
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: 56c1a8b06293cfef2cb39e1f04e9e725d81982e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c1a8b06293cfef2cb39e1f0… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Mar 5 09:52:38 2013 -0700 server: Report administrator ownership by default for registry objects. --- dlls/advapi32/tests/security.c | 31 +++++++++++++++++++++++++++---- server/registry.c | 25 ++++++++++++++++++++++++- server/security.h | 1 + server/token.c | 8 ++++++++ 4 files changed, 60 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e4adab1..7dd0501 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3005,10 +3005,12 @@ static void test_SetEntriesInAclA(void) static void test_GetNamedSecurityInfoA(void) { - char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100], *user; + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; + char system_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; + PSID admin_sid = (PSID) admin_ptr, system_sid = (PSID) system_ptr, user_sid; DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; - PSID admin_sid = (PSID) admin_ptr, user_sid; + char software_key[] = "MACHINE\\Software"; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR_CONTROL control; ACL_SIZE_INFORMATION acl_size; @@ -3113,10 +3115,10 @@ static void test_GetNamedSecurityInfoA(void) /* Create security descriptor information and test that it comes back the same */ pSD = &sd; - pDacl = (PACL)&dacl; + pDacl = HeapAlloc(GetProcessHeap(), 0, 100); InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); - bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); + bret = InitializeAcl(pDacl, 100, ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); ok(bret, "Failed to add Current User to ACL.\n"); @@ -3130,6 +3132,7 @@ static void test_GetNamedSecurityInfoA(void) SetLastError(0xdeadbeef); error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, pDacl, NULL); + HeapFree(GetProcessHeap(), 0, pDacl); if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("SetNamedSecurityInfoA is not implemented\n"); @@ -3178,6 +3181,26 @@ static void test_GetNamedSecurityInfoA(void) LocalFree(pSD); HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); + + /* Test querying the ownership of a built-in registry key */ + sid_size = sizeof(system_ptr); + pCreateWellKnownSid(WinLocalSystemSid, NULL, system_sid, &sid_size); + error = pGetNamedSecurityInfoA(software_key, SE_REGISTRY_KEY, + OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); + ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + ok(owner != NULL, "owner should not be NULL\n"); + ok(EqualSid(owner, admin_sid), "MACHINE\\Software owner SID != Administrators SID.\n"); + + bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); + ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + ok(group != NULL, "group should not be NULL\n"); + ok(EqualSid(group, admin_sid) || broken(EqualSid(group, system_sid)) /* before Win7 */, + "MACHINE\\Software group SID != Local System SID.\n"); + LocalFree(pSD); } static void test_ConvertStringSecurityDescriptor(void) diff --git a/server/registry.c b/server/registry.c index a144c26..efc2005 100644 --- a/server/registry.c +++ b/server/registry.c @@ -147,6 +147,7 @@ struct file_load_info static void key_dump( struct object *obj, int verbose ); static unsigned int key_map_access( struct object *obj, unsigned int access ); +static struct security_descriptor *key_get_sd( struct object *obj ); static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void key_destroy( struct object *obj ); @@ -162,7 +163,7 @@ static const struct object_ops key_ops = no_signal, /* signal */ no_get_fd, /* get_fd */ key_map_access, /* map_access */ - default_get_sd, /* get_sd */ + key_get_sd, /* get_sd */ default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_open_file, /* open_file */ @@ -336,6 +337,28 @@ static unsigned int key_map_access( struct object *obj, unsigned int access ) KEY_WOW64_64KEY | KEY_WOW64_32KEY); } +static struct security_descriptor *key_get_sd( struct object *obj ) +{ + static struct security_descriptor *key_default_sd; + + if (obj->sd) return obj->sd; + + if (!key_default_sd) + { + size_t sid_len = security_sid_len( security_builtin_admins_sid ); + + key_default_sd = mem_alloc( sizeof(*key_default_sd) + 2 * sid_len ); + key_default_sd->control = 0; + key_default_sd->owner_len = sid_len; + key_default_sd->group_len = sid_len; + key_default_sd->sacl_len = 0; + key_default_sd->dacl_len = 0; + memcpy( key_default_sd + 1, security_builtin_admins_sid, sid_len ); + memcpy( (char *)(key_default_sd + 1) + sid_len, security_builtin_admins_sid, sid_len ); + } + return key_default_sd; +} + /* close the notification associated with a handle */ static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { diff --git a/server/security.h b/server/security.h index 03fd74e..9856f96 100644 --- a/server/security.h +++ b/server/security.h @@ -42,6 +42,7 @@ extern const LUID SeCreateGlobalPrivilege; extern const PSID security_world_sid; extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; +extern const PSID security_builtin_admins_sid; /* token functions */ diff --git a/server/token.c b/server/token.c index 5e0493a..7d6086d 100644 --- a/server/token.c +++ b/server/token.c @@ -77,6 +77,13 @@ static const struct /* same fields as struct SID */ SID_IDENTIFIER_AUTHORITY IdentifierAuthority; DWORD SubAuthority[5]; } local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; +static const struct /* same fields as struct SID */ +{ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[2]; +} builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -84,6 +91,7 @@ static const PSID security_interactive_sid = (PSID)&interactive_sid; static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_sid; const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; +const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; static luid_t prev_luid_value = { 1000, 0 };

1 0

Sam Edwards : wined3d: Properly handle backbuffer_width/_height= 0 in wined3d_device_reset.
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: 33d31a3547b51eddbf9fe835285577541b91c05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d31a3547b51eddbf9fe8352… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Apr 9 00:48:43 2013 -0600 wined3d: Properly handle backbuffer_width/_height=0 in wined3d_device_reset. --- dlls/d3d8/tests/device.c | 21 +++++++++++++++------ dlls/d3d9/tests/d3d9ex.c | 10 +++++----- dlls/d3d9/tests/device.c | 18 ++++++++++++++---- dlls/wined3d/device.c | 36 ++++++++++++++++++++++++++++++------ 4 files changed, 64 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ba7e5e6..2f281d2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1265,8 +1265,8 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); - todo_wine ok(vp.Width == 200, "D3DVIEWPORT->Width = %u, expected 200.\n", vp.Width); - todo_wine ok(vp.Height == 150, "D3DVIEWPORT->Height = %u, expected 150.\n", vp.Height); + ok(vp.Width == 200, "D3DVIEWPORT->Width = %u, expected 200.\n", vp.Width); + ok(vp.Height == 150, "D3DVIEWPORT->Height = %u, expected 150.\n", vp.Height); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); } @@ -1275,10 +1275,8 @@ static void test_reset(void) ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); ok(hr == D3D_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", - surface_desc.Width); - todo_wine ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", - surface_desc.Height); + ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", surface_desc.Width); + ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", surface_desc.Height); IDirect3DSurface8_Release(surface); memset(&d3dpp, 0, sizeof(d3dpp)); @@ -1443,6 +1441,17 @@ static void test_reset(void) hr = IDirect3DDevice8_TestCooperativeLevel(device1); ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); + memset(&d3dpp, 0, sizeof(d3dpp)); + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = FALSE; + d3dpp.BackBufferWidth = 0; + d3dpp.BackBufferHeight = 0; + d3dpp.BackBufferFormat = d3ddm.Format; + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(hr == D3DERR_INVALIDCALL, "Reset returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = IDirect3DDevice8_TestCooperativeLevel(device1); + ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); + hr = IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &d3ddm); ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index a55f9e5..5e5524e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -690,7 +690,7 @@ static void test_reset(void) hr = IDirect3DDevice9Ex_GetScissorRect(device, &rect); ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); - todo_wine ok(rect.left == 0 && rect.top == 0 && rect.right == 200 && rect.bottom == 150, + ok(rect.left == 0 && rect.top == 0 && rect.right == 200 && rect.bottom == 150, "Got unexpected scissor rect {%d, %d, %d, %d}.\n", rect.left, rect.top, rect.right, rect.bottom); @@ -698,8 +698,8 @@ static void test_reset(void) ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); ok(vp.X == 0, "Got unexpected vp.X %u.\n", vp.X); ok(vp.Y == 0, "Got unexpected vp.Y %u.\n", vp.Y); - todo_wine ok(vp.Width == 200, "Got unexpected vp.Width %u.\n", vp.Width); - todo_wine ok(vp.Height == 150, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.Width == 200, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 150, "Got unexpected vp.Height %u.\n", vp.Height); ok(vp.MinZ == 2.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); ok(vp.MaxZ == 3.0f, "Got unexpected vp,MaxZ %.8e.\n", vp.MaxZ); @@ -707,8 +707,8 @@ static void test_reset(void) ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x.\n", hr); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &d3dpp); ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x.\n", hr); - todo_wine ok(d3dpp.BackBufferWidth == 200, "Got unexpected backbuffer width %u.\n", d3dpp.BackBufferWidth); - todo_wine ok(d3dpp.BackBufferHeight == 150, "Got unexpected backbuffer height %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == 200, "Got unexpected backbuffer width %u.\n", d3dpp.BackBufferWidth); + ok(d3dpp.BackBufferHeight == 150, "Got unexpected backbuffer height %u.\n", d3dpp.BackBufferHeight); IDirect3DSwapChain9_Release(swapchain); memset(&d3dpp, 0, sizeof(d3dpp)); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f30938b..e1f3c63 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1110,8 +1110,8 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); - todo_wine ok(vp.Width == 200, "D3DVIEWPORT->Width = %d\n", vp.Width); - todo_wine ok(vp.Height == 150, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.Width == 200, "D3DVIEWPORT->Width = %d\n", vp.Width); + ok(vp.Height == 150, "D3DVIEWPORT->Height = %d\n", vp.Height); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } @@ -1125,8 +1125,8 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DSwapChain9_GetPresentParameters returned %08x\n", hr); if(SUCCEEDED(hr)) { - todo_wine ok(d3dpp.BackBufferWidth == 200, "Back buffer width is %d\n", d3dpp.BackBufferWidth); - todo_wine ok(d3dpp.BackBufferHeight == 150, "Back buffer height is %d\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == 200, "Back buffer width is %d\n", d3dpp.BackBufferWidth); + ok(d3dpp.BackBufferHeight == 150, "Back buffer height is %d\n", d3dpp.BackBufferHeight); } IDirect3DSwapChain9_Release(pSwapchain); } @@ -1291,6 +1291,16 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3DERR_DEVICENOTRESET, "IDirect3DDevice9_TestCooperativeLevel after a failed reset returned %#x\n", hr); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = FALSE; + d3dpp.BackBufferWidth = 0; + d3dpp.BackBufferHeight = 0; + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Reset to w=0, h=0, windowed=FALSE failed with %08x\n", hr); + hr = IDirect3DDevice9_TestCooperativeLevel(device1); + ok(hr == D3DERR_DEVICENOTRESET, "IDirect3DDevice9_TestCooperativeLevel after a failed reset returned %#x\n", hr); + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); ZeroMemory( &d3dpp, sizeof(d3dpp) ); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34a58aa..3ae5eae 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4904,6 +4904,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_display_mode m; BOOL DisplayModeChanged = FALSE; BOOL update_desc = FALSE; + UINT backbuffer_width = swapchain_desc->backbuffer_width; + UINT backbuffer_height = swapchain_desc->backbuffer_height; HRESULT hr = WINED3D_OK; unsigned int i; @@ -5034,16 +5036,38 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } - /* Should Width == 800 && Height == 0 set 800x600? */ - if (swapchain_desc->backbuffer_width && swapchain_desc->backbuffer_height - && (swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width - || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height)) + if (!backbuffer_width || !backbuffer_height) + { + /* The application is requesting that either the swapchain width or + * height be set to the corresponding dimension in the window's + * client rect. */ + + RECT client_rect; + + if (!swapchain_desc->windowed) + return WINED3DERR_INVALIDCALL; + + if (!GetClientRect(swapchain->device_window, &client_rect)) + { + ERR("Failed to get client rect, last error %#x.\n", GetLastError()); + return WINED3DERR_INVALIDCALL; + } + + if (!backbuffer_width) + backbuffer_width = client_rect.right; + + if (!backbuffer_height) + backbuffer_height = client_rect.bottom; + } + + if (backbuffer_width != swapchain->desc.backbuffer_width + || backbuffer_height != swapchain->desc.backbuffer_height) { if (!swapchain_desc->windowed) DisplayModeChanged = TRUE; - swapchain->desc.backbuffer_width = swapchain_desc->backbuffer_width; - swapchain->desc.backbuffer_height = swapchain_desc->backbuffer_height; + swapchain->desc.backbuffer_width = backbuffer_width; + swapchain->desc.backbuffer_height = backbuffer_height; update_desc = TRUE; }

1 0