wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetTypeDescAlias.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 810ec233c0bffe4a4bd0cac4e36c1f72b9079190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=810ec233c0bffe4a4bd0cac4e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 26 12:40:08 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetTypeDescAlias. --- dlls/oleaut32/tests/typelib.c | 341 ++++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 82 +++++++---- 2 files changed, 393 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=810ec233c0bffe4a4bd0c…

1 0

Andrew Eikum : oleaut32: Resize 32-bit typeinfos when loaded in 64-bit.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 56aa7d015d559dc8dafed52c4456673a3974dac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56aa7d015d559dc8dafed52c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 26 12:39:48 2013 -0500 oleaut32: Resize 32-bit typeinfos when loaded in 64-bit. --- dlls/oleaut32/typelib.c | 172 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 163 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 118e1f0..8985a02 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1909,6 +1909,120 @@ static TLBString *TLB_append_str(struct list *string_list, BSTR new_str) return str; } +static HRESULT TLB_get_size_from_hreftype(ITypeInfoImpl *info, HREFTYPE href, + ULONG *size, WORD *align) +{ + ITypeInfo *other; + TYPEATTR *attr; + HRESULT hr; + + hr = ITypeInfo2_GetRefTypeInfo(&info->ITypeInfo2_iface, href, &other); + if(FAILED(hr)) + return hr; + + hr = ITypeInfo_GetTypeAttr(other, &attr); + if(FAILED(hr)){ + ITypeInfo_Release(other); + return hr; + } + + if(size) + *size = attr->cbSizeInstance; + if(align) + *align = attr->cbAlignment; + + ITypeInfo_ReleaseTypeAttr(other, attr); + ITypeInfo_Release(other); + + return S_OK; +} + +static HRESULT TLB_size_instance(ITypeInfoImpl *info, SYSKIND sys, + TYPEDESC *tdesc, ULONG *size, WORD *align) +{ + ULONG i, sub, ptr_size; + HRESULT hr; + + ptr_size = get_ptr_size(sys); + + switch(tdesc->vt){ + case VT_VOID: + *size = 0; + break; + case VT_I1: + case VT_UI1: + *size = 1; + break; + case VT_I2: + case VT_BOOL: + case VT_UI2: + *size = 2; + break; + case VT_I4: + case VT_R4: + case VT_ERROR: + case VT_UI4: + case VT_INT: + case VT_UINT: + case VT_HRESULT: + *size = 4; + break; + case VT_R8: + case VT_I8: + case VT_UI8: + *size = 8; + break; + case VT_BSTR: + case VT_DISPATCH: + case VT_UNKNOWN: + case VT_PTR: + case VT_SAFEARRAY: + case VT_LPSTR: + case VT_LPWSTR: + *size = ptr_size; + break; + case VT_DATE: + *size = sizeof(DATE); + break; + case VT_VARIANT: + *size = sizeof(VARIANT); +#ifdef _WIN64 + if(sys == SYS_WIN32) + *size -= 8; /* 32-bit VARIANT is 8 bytes smaller than 64-bit VARIANT */ +#endif + break; + case VT_DECIMAL: + *size = sizeof(DECIMAL); + break; + case VT_CY: + *size = sizeof(CY); + break; + case VT_CARRAY: + *size = 0; + for(i = 0; i < tdesc->u.lpadesc->cDims; ++i) + *size += tdesc->u.lpadesc->rgbounds[i].cElements; + hr = TLB_size_instance(info, sys, &tdesc->u.lpadesc->tdescElem, &sub, align); + if(FAILED(hr)) + return hr; + *size *= sub; + return S_OK; + case VT_USERDEFINED: + return TLB_get_size_from_hreftype(info, tdesc->u.hreftype, size, align); + default: + FIXME("Unsized VT: 0x%x\n", tdesc->vt); + return E_FAIL; + } + + if(align){ + if(*size < 4) + *align = *size; + else + *align = 4; + } + + return S_OK; +} + /********************************************************************** * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) @@ -2512,6 +2626,47 @@ static void MSFT_DoImplTypes(TLBContext *pcx, ITypeInfoImpl *pTI, int count, ++pImpl; } } + +#ifdef _WIN64 +/* when a 32-bit typelib is loaded in 64-bit mode, we need to resize pointers + * and some structures, and fix the alignment */ +static void TLB_fix_32on64_typeinfo(ITypeInfoImpl *info) +{ + if(info->typekind == TKIND_ALIAS){ + switch(info->tdescAlias.vt){ + case VT_BSTR: + case VT_DISPATCH: + case VT_UNKNOWN: + case VT_PTR: + case VT_SAFEARRAY: + case VT_LPSTR: + case VT_LPWSTR: + info->cbSizeInstance = sizeof(void*); + info->cbAlignment = sizeof(void*); + break; + case VT_CARRAY: + case VT_USERDEFINED: + TLB_size_instance(info, SYS_WIN64, &info->tdescAlias, &info->cbSizeInstance, &info->cbAlignment); + break; + case VT_VARIANT: + info->cbSizeInstance = sizeof(VARIANT); + info->cbAlignment = 8; + default: + if(info->cbSizeInstance < sizeof(void*)) + info->cbAlignment = info->cbSizeInstance; + else + info->cbAlignment = sizeof(void*); + break; + } + }else if(info->typekind == TKIND_INTERFACE || + info->typekind == TKIND_DISPATCH || + info->typekind == TKIND_COCLASS){ + info->cbSizeInstance = sizeof(void*); + info->cbAlignment = sizeof(void*); + } +} +#endif + /* * process a typeinfo record */ @@ -2537,18 +2692,10 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->lcid=pLibInfo->set_lcid; /* FIXME: correct? */ ptiRet->lpstrSchema=NULL; /* reserved */ ptiRet->cbSizeInstance=tiBase.size; -#ifdef _WIN64 - if(pLibInfo->syskind == SYS_WIN32) - ptiRet->cbSizeInstance=sizeof(void*); -#endif ptiRet->typekind=tiBase.typekind & 0xF; ptiRet->cFuncs=LOWORD(tiBase.cElement); ptiRet->cVars=HIWORD(tiBase.cElement); ptiRet->cbAlignment=(tiBase.typekind >> 11 )& 0x1F; /* there are more flags there */ -#ifdef _WIN64 - if(pLibInfo->syskind == SYS_WIN32) - ptiRet->cbAlignment = 8; -#endif ptiRet->wTypeFlags=tiBase.flags; ptiRet->wMajorVerNum=LOWORD(tiBase.version); ptiRet->wMinorVerNum=HIWORD(tiBase.version); @@ -3318,6 +3465,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) MSFT_Header tlbHeader; MSFT_SegDir tlbSegDir; ITypeLibImpl * pTypeLibImpl; + int i; TRACE("%p, TLB length = %d\n", pLib, dwTLBLength); @@ -3503,7 +3651,6 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) if(tlbHeader.nrtypeinfos >= 0 ) { ITypeInfoImpl **ppTI; - int i; ppTI = pTypeLibImpl->typeinfos = heap_alloc_zero(sizeof(ITypeInfoImpl*) * tlbHeader.nrtypeinfos); @@ -3516,6 +3663,13 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) } } +#ifdef _WIN64 + if(pTypeLibImpl->syskind == SYS_WIN32){ + for(i = 0; i < pTypeLibImpl->TypeInfoCount; ++i) + TLB_fix_32on64_typeinfo(pTypeLibImpl->typeinfos[i]); + } +#endif + TRACE("(%p)\n", pTypeLibImpl); return &pTypeLibImpl->ITypeLib2_iface; }

1 0

Alexandre Julliard : kernel32/tests: Increase some wait timeouts.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: b0153951f4e92db8ed777e1cde011fa926941315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0153951f4e92db8ed777e1cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 27 11:50:45 2013 +0200 kernel32/tests: Increase some wait timeouts. --- dlls/kernel32/tests/loader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0018d67..3b72cc8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1101,9 +1101,9 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; + trace("%04u: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) { - trace("%04u: mutex_thread_proc: still alive\n", GetCurrentThreadId()); ret = WaitForMultipleObjects(sizeof(wait_list)/sizeof(wait_list[0]), wait_list, FALSE, 50); if (ret == WAIT_OBJECT_0) break; else if (ret == WAIT_OBJECT_0 + 1) @@ -1702,9 +1702,9 @@ static void child_process(const char *dll_name, DWORD target_offset) } else { - ret = WaitForSingleObject(attached_thread[0], 100); + ret = WaitForSingleObject(attached_thread[0], 1000); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - ret = WaitForSingleObject(attached_thread[1], 100); + ret = WaitForSingleObject(attached_thread[1], 1000); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); }

1 0

Henri Verbeet : d3dx9: Simplify D3DXGetImageInfoFromResourceW().
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 4c850f0e7964df9da5c8b557e0c0b4624e0720f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c850f0e7964df9da5c8b557e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 27 08:45:01 2013 +0200 d3dx9: Simplify D3DXGetImageInfoFromResourceW(). --- dlls/d3dx9_36/surface.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index efcf09c..4b86f1c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -966,28 +966,23 @@ HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, const char *resourc return D3DXGetImageInfoFromFileInMemory(buffer, size, info); } -HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info) +HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, D3DXIMAGE_INFO *info) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s, %p)\n", module, debugstr_w(resource), info); - - resinfo = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA); - if (!resinfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ - resinfo = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP); + TRACE("module %p, resource %s, info %p.\n", module, debugstr_w(resource), info); - if (resinfo) - { - LPVOID buffer; - HRESULT hr; - DWORD size; + if (!(resinfo = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA)) + /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ + && !(resinfo = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP))) + return D3DXERR_INVALIDDATA; - hr = load_resource_into_memory(module, resinfo, &buffer, &size); - if(FAILED(hr)) return D3DXERR_INVALIDDATA; - return D3DXGetImageInfoFromFileInMemory(buffer, size, info); - } + if (FAILED(load_resource_into_memory(module, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXGetImageInfoFromFileInMemory(buffer, size, info); } /************************************************************

1 0

Henri Verbeet : d3dx9: Simplify D3DXGetImageInfoFromResourceA().
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: aaff163ae0150cf584ef48a769384545cd2ed625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaff163ae0150cf584ef48a76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 27 08:45:00 2013 +0200 d3dx9: Simplify D3DXGetImageInfoFromResourceA(). --- dlls/d3dx9_36/surface.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index f5c954f..efcf09c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -947,28 +947,23 @@ HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info) * if we fail to load resource * */ -HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, LPCSTR resource, D3DXIMAGE_INFO *info) +HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, const char *resource, D3DXIMAGE_INFO *info) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s, %p)\n", module, debugstr_a(resource), info); - - resinfo = FindResourceA(module, resource, (const char *)RT_RCDATA); - if (!resinfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ - resinfo = FindResourceA(module, resource, (const char *)RT_BITMAP); + TRACE("module %p, resource %s, info %p.\n", module, debugstr_a(resource), info); - if (resinfo) - { - LPVOID buffer; - HRESULT hr; - DWORD size; + if (!(resinfo = FindResourceA(module, resource, (const char *)RT_RCDATA)) + /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ + && !(resinfo = FindResourceA(module, resource, (const char *)RT_BITMAP))) + return D3DXERR_INVALIDDATA; - hr = load_resource_into_memory(module, resinfo, &buffer, &size); - if(FAILED(hr)) return D3DXERR_INVALIDDATA; - return D3DXGetImageInfoFromFileInMemory(buffer, size, info); - } + if (FAILED(load_resource_into_memory(module, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXGetImageInfoFromFileInMemory(buffer, size, info); } HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info)

1 0

Henri Verbeet : wined3d: Replace the "stateBlock" wined3d_device field with a wined3d_state structure.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: b85c2a74bbd8bbaf10e5c962d2203619d3934165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85c2a74bbd8bbaf10e5c962d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 27 08:44:59 2013 +0200 wined3d: Replace the "stateBlock" wined3d_device field with a wined3d_state structure. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 205 ++++++++++++++++++---------------------- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/stateblock.c | 22 ++--- dlls/wined3d/wined3d_private.h | 137 ++++++++++++++------------- include/wine/wined3d.h | 1 - 8 files changed, 179 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b85c2a74bbd8bbaf10e5c…

1 0

Henri Verbeet : wined3d: Make stateblock_init_default_state() work with a wined3d_state structure instead.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: fc5f9d4709d6fbcc86f4828554800d3fb721b32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5f9d4709d6fbcc86f482855… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 27 08:44:58 2013 +0200 wined3d: Make stateblock_init_default_state() work with a wined3d_state structure instead. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 6 ++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 18dcae4..8a2557b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1169,7 +1169,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, /* Set up some starting GL setup */ /* Setup all the devices defaults */ - stateblock_init_default_state(device->stateBlock); + state_init_default(&device->stateBlock->state, device); context = context_acquire(device, swapchain->front_buffer); @@ -5216,7 +5216,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("Created stateblock %p.\n", device->stateBlock); device->update_state = &device->stateBlock->state; - stateblock_init_default_state(device->stateBlock); + state_init_default(&device->stateBlock->state, device); } else { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1621ba7..c7b68ea 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1168,11 +1168,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } -void stateblock_init_default_state(struct wined3d_stateblock *stateblock) +void state_init_default(struct wined3d_state *state, struct wined3d_device *device) { - struct wined3d_device *device = stateblock->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_state *state = &stateblock->state; union { struct wined3d_line_pattern lp; @@ -1193,7 +1191,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) 0.0f, 0.0f, 0.0f, 1.0f, }}}; - TRACE("stateblock %p.\n", stateblock); + TRACE("state %p, device %p.\n", state, device); /* Set some of the defaults for lights, transforms etc */ state->transforms[WINED3D_TS_PROJECTION] = identity; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e113ef..89a4be7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2453,8 +2453,8 @@ struct wined3d_stateblock }; void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; -void stateblock_init_default_state(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; +void state_init_default(struct wined3d_state *state, struct wined3d_device *device) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state

1 0

Henri Verbeet : wined3d: Introduce a separate function for initializing a wined3d_state structure.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: cc85c6aff032f7def880e9ba7f199e758cba1c96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc85c6aff032f7def880e9ba7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 27 08:44:57 2013 +0200 wined3d: Introduce a separate function for initializing a wined3d_state structure. --- dlls/wined3d/stateblock.c | 46 ++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8abd8e5..1621ba7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -196,19 +196,10 @@ static HRESULT stateblock_allocate_shader_constants(struct wined3d_stateblock *o { const struct wined3d_d3d_info *d3d_info = &object->device->adapter->d3d_info; - /* Allocate space for floating point constants */ - object->state.ps_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(float) * d3d_info->limits.ps_uniform_count * 4); - if (!object->state.ps_consts_f) goto fail; - object->changed.pixelShaderConstantsF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOL) * d3d_info->limits.ps_uniform_count); if (!object->changed.pixelShaderConstantsF) goto fail; - object->state.vs_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(float) * d3d_info->limits.vs_uniform_count * 4); - if (!object->state.vs_consts_f) goto fail; - object->changed.vertexShaderConstantsF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOL) * d3d_info->limits.vs_uniform_count); if (!object->changed.vertexShaderConstantsF) goto fail; @@ -225,9 +216,7 @@ static HRESULT stateblock_allocate_shader_constants(struct wined3d_stateblock *o fail: ERR("Failed to allocate memory\n"); - HeapFree(GetProcessHeap(), 0, object->state.ps_consts_f); HeapFree(GetProcessHeap(), 0, object->changed.pixelShaderConstantsF); - HeapFree(GetProcessHeap(), 0, object->state.vs_consts_f); HeapFree(GetProcessHeap(), 0, object->changed.vertexShaderConstantsF); HeapFree(GetProcessHeap(), 0, object->contained_vs_consts_f); HeapFree(GetProcessHeap(), 0, object->contained_ps_consts_f); @@ -609,6 +598,29 @@ static void state_cleanup(struct wined3d_state *state) HeapFree(GetProcessHeap(), 0, state->ps_consts_f); } +static HRESULT state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) +{ + unsigned int i; + + for (i = 0; i < LIGHTMAP_SIZE; i++) + { + list_init(&state->light_map[i]); + } + + if (!(state->vs_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + 4 * sizeof(float) * d3d_info->limits.vs_uniform_count))) + return E_OUTOFMEMORY; + + if (!(state->ps_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + 4 * sizeof(float) * d3d_info->limits.ps_uniform_count))) + { + HeapFree(GetProcessHeap(), 0, state->vs_consts_f); + return E_OUTOFMEMORY; + } + + return WINED3D_OK; +} + ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) { ULONG refcount = InterlockedDecrement(&stateblock->ref); @@ -1407,21 +1419,21 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, struct wined3d_device *device, enum wined3d_stateblock_type type) { - unsigned int i; HRESULT hr; const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; stateblock->ref = 1; stateblock->device = device; - for (i = 0; i < LIGHTMAP_SIZE; i++) + if (FAILED(hr = state_init(&stateblock->state, d3d_info))) + return hr; + + if (FAILED(hr = stateblock_allocate_shader_constants(stateblock))) { - list_init(&stateblock->state.light_map[i]); + state_cleanup(&stateblock->state); + return hr; } - hr = stateblock_allocate_shader_constants(stateblock); - if (FAILED(hr)) return hr; - /* The WINED3D_SBT_INIT stateblock type is used during initialization to * produce a placeholder stateblock so other functions called can update a * state block. */

1 0

Nikolay Sivov : ole32: Missing MiscStatus key is not a failure for OleRegGetMiscStatus().
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: c192885df403107c7a07ac003547e029bdf706e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c192885df403107c7a07ac003… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 27 10:13:15 2013 +0400 ole32: Missing MiscStatus key is not a failure for OleRegGetMiscStatus(). --- dlls/ole32/ole2.c | 11 +++++------ dlls/ole32/tests/compobj.c | 25 ++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index a1a4b9a..0994a5f 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -882,11 +882,6 @@ HRESULT WINAPI OleRegGetMiscStatus( LONG result; /* - * Initialize the out parameter. - */ - *pdwStatus = 0; - - /* * Build the key name we're looking for */ sprintfW( keyName, clsidfmtW, @@ -896,6 +891,10 @@ HRESULT WINAPI OleRegGetMiscStatus( TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwAspect, pdwStatus); + if (!pdwStatus) return E_INVALIDARG; + + *pdwStatus = 0; + /* * Open the class id Key */ @@ -910,7 +909,7 @@ HRESULT WINAPI OleRegGetMiscStatus( if (result != ERROR_SUCCESS) { RegCloseKey(clsidKey); - return REGDB_E_READREGDB; + return S_OK; } /* diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index c81a017..519cb74 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1732,18 +1732,41 @@ static void test_OleRegGetMiscStatus(void) DWORD status; HRESULT hr; + hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + status = 0xdeadbeef; hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, &status); ok(hr == REGDB_E_CLASSNOTREG, "got 0x%08x\n", hr); + ok(status == 0, "got 0x%08x\n", status); + + status = -1; + hr = OleRegGetMiscStatus(&CLSID_StdFont, DVASPECT_ICON, &status); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == 0, "got 0x%08x\n", status); if ((handle = activate_context(actctx_manifest, &cookie))) { - status = 0; hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, &status); todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(status == OLEMISC_RECOMPOSEONRESIZE, "got 0x%08x\n", status); } + /* context data takes precedence over registration info */ + status = 0; + hr = OleRegGetMiscStatus(&CLSID_StdFont, DVASPECT_ICON, &status); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(status == OLEMISC_RECOMPOSEONRESIZE, "got 0x%08x\n", status); + + /* there's no such attribute in context */ + status = -1; + hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_DOCPRINT, &status); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == 0, "got 0x%08x\n", status); + pDeactivateActCtx(0, cookie); pReleaseActCtx(handle); }

1 0

Ken Thomases : winemac: Don' t generate scroll wheel events for axes with 0 delta.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 1b9fac3b3dfbb63157dbfeeb5d90c34f4f7d81bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9fac3b3dfbb63157dbfeeb5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Aug 26 20:14:00 2013 -0500 winemac: Don't generate scroll wheel events for axes with 0 delta. --- dlls/winemac.drv/mouse.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index b729d55..f9130c0 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -911,12 +911,14 @@ void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) event->mouse_scroll.x, event->mouse_scroll.y, event->mouse_scroll.time_ms, (GetTickCount() - event->mouse_scroll.time_ms)); - send_mouse_input(hwnd, event->window, MOUSEEVENTF_WHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, - event->mouse_scroll.x, event->mouse_scroll.y, - event->mouse_scroll.y_scroll, FALSE, event->mouse_scroll.time_ms); - send_mouse_input(hwnd, event->window, MOUSEEVENTF_HWHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, - event->mouse_scroll.x, event->mouse_scroll.y, - event->mouse_scroll.x_scroll, FALSE, event->mouse_scroll.time_ms); + if (event->mouse_scroll.y_scroll) + send_mouse_input(hwnd, event->window, MOUSEEVENTF_WHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, + event->mouse_scroll.x, event->mouse_scroll.y, + event->mouse_scroll.y_scroll, FALSE, event->mouse_scroll.time_ms); + if (event->mouse_scroll.x_scroll) + send_mouse_input(hwnd, event->window, MOUSEEVENTF_HWHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, + event->mouse_scroll.x, event->mouse_scroll.y, + event->mouse_scroll.x_scroll, FALSE, event->mouse_scroll.time_ms); }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
47
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 August 2013