wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Nikolay Sivov : oledb32: Implement DBTYPE_I4 -> DBTYPE_VARIANT conversion.
by Alexandre Julliard 11 Apr '13

11 Apr '13

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

Nikolay Sivov : oledb32: Destination status and length are optional.
by Alexandre Julliard 11 Apr '13

11 Apr '13

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 11 Apr '13

11 Apr '13

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

Piotr Caban : oleaut32: Use MSFT_VarFunc to store FUNCDESC.
by Alexandre Julliard 11 Apr '13

11 Apr '13

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 11 Apr '13

11 Apr '13

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 11 Apr '13

11 Apr '13

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

Piotr Caban : oleaut32: Don' t add stdole2 import when TYPEFLAG_FDISPATCHABLE is set.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 5e6016e2a7d42bd8a40f3eed61bc4ab0af8f21ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6016e2a7d42bd8a40f3eed6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 11 13:54:55 2013 +0200 oleaut32: Don't add stdole2 import when TYPEFLAG_FDISPATCHABLE is set. --- dlls/oleaut32/typelib2.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 97f61a4..a7815a9 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1688,6 +1688,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, U TRACE("(%p,0x%x)\n", iface, uTypeFlags); if(uTypeFlags & TYPEFLAG_FDUAL) { + static const WCHAR stdole2tlb[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; + ITypeLib *stdole; + ITypeInfo *dispatch; + HREFTYPE hreftype; + HRESULT hres; + This->typeinfo->typekind |= 0x10; This->typeinfo->typekind &= ~0x0f; This->typeinfo->typekind |= TKIND_DISPATCH; @@ -1719,14 +1725,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, U } } else iface = &This->dual->ICreateTypeInfo2_iface; - } - - if (uTypeFlags & (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL)) { - static const WCHAR stdole2tlb[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; - ITypeLib *stdole; - ITypeInfo *dispatch; - HREFTYPE hreftype; - HRESULT hres; hres = LoadTypeLib(stdole2tlb, &stdole); if(FAILED(hres))

1 0

Jonathan Liu : d3dcompiler.h: Add function pointer typedefs.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: ff27c49d3c5560eb2adf15e889ab6f76cf689849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff27c49d3c5560eb2adf15e88… Author: Jonathan Liu <net147(a)gmail.com> Date: Thu Apr 11 21:47:28 2013 +1000 d3dcompiler.h: Add function pointer typedefs. --- include/d3dcompiler.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 2dd0fcf..4bbf53f 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -65,6 +65,9 @@ static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); +typedef HRESULT (WINAPI *pD3DCompile)(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); typedef enum D3DCOMPILER_STRIP_FLAGS { @@ -94,6 +97,8 @@ typedef enum D3D_BLOB_PART HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size, UINT flags, const char *comments, ID3DBlob **disassembly); +typedef HRESULT (WINAPI *pD3DDisassemble)(const void *data, SIZE_T data_size, + UINT flags, const char *comments, ID3DBlob **disassembly); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); @@ -107,6 +112,9 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); +typedef HRESULT (WINAPI *pD3DPreprocess)(const void *data, SIZE_T size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, + ID3DBlob **shader, ID3DBlob **error_messages); #ifdef __cplusplus }

1 0

Jonathan Liu : d3dcompiler.h: Fix typos.
by Alexandre Julliard 11 Apr '13

11 Apr '13

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

Matteo Bruni : winex11.drv: Fix attributes conversion in wglCreateContextAttribsARB().
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 6118676c20b2a63cc1fe3597f02c28b4dbc617ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6118676c20b2a63cc1fe3597f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 11 16:34:31 2013 +0200 winex11.drv: Fix attributes conversion in wglCreateContextAttribsARB(). --- dlls/winex11.drv/opengl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index bb3b366..2313eca 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1953,27 +1953,30 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg case WGL_CONTEXT_MAJOR_VERSION_ARB: pContextAttribList[0] = GLX_CONTEXT_MAJOR_VERSION_ARB; pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; break; case WGL_CONTEXT_MINOR_VERSION_ARB: pContextAttribList[0] = GLX_CONTEXT_MINOR_VERSION_ARB; pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; break; case WGL_CONTEXT_LAYER_PLANE_ARB: break; case WGL_CONTEXT_FLAGS_ARB: pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; break; case WGL_CONTEXT_PROFILE_MASK_ARB: pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; break; default: ERR("Unhandled attribList pair: %#x %#x\n", attribList[0], attribList[1]); } ret->numAttribs++; attribList += 2; - pContextAttribList += 2; } }

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013