March 2016 - Wine-Commits - list.winehq.org

Michael Müller : ole32: Implement semi-stub for CoGetApartmentType.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 381ce2956bc82a074e535be18e70c3dc76f25855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=381ce2956bc82a074e535be18… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 2 16:19:53 2016 +0100 ole32: Implement semi-stub for CoGetApartmentType. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1.spec | 2 +- .../api-ms-win-downlevel-ole32-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 29 +++++++++++ dlls/ole32/ole32.spec | 1 + dlls/ole32/tests/compobj.c | 56 ++++++++++++++++++++++ include/objbase.h | 1 + include/objidl.idl | 9 ++++ 9 files changed, 100 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index f8026db..f645c9d 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -17,7 +17,7 @@ @ stub CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx -@ stub CoGetApartmentType +@ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext @ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID @ stub CoGetCancelObject diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index 56aaf36..d2914f0 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -17,7 +17,7 @@ @ stub CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx -@ stub CoGetApartmentType +@ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext @ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID @ stub CoGetCancelObject diff --git a/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec b/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec index a0eabe9..82ff0f1 100644 --- a/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec @@ -8,7 +8,7 @@ @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx -@ stub CoGetApartmentType +@ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject @ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 4bda470..b612bef 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -90,7 +90,7 @@ @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState @ stub CoGetApartmentID -@ stub CoGetApartmentType +@ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext @ stdcall CoGetCallState(long ptr) ole32.CoGetCallState @ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 080940e..de7438c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5029,6 +5029,35 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) } /*********************************************************************** + * CoGetApartmentType [OLE32.@] + */ +HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) +{ + struct oletls *info = COM_CurrentInfo(); + + FIXME("(%p, %p): semi-stub\n", type, qualifier); + + if (!type || !qualifier) + return E_INVALIDARG; + + if (!info) + return E_OUTOFMEMORY; + + if (!info->apt) + *type = APTTYPE_CURRENT; + else if (info->apt->multi_threaded) + *type = APTTYPE_MTA; + else if (info->apt->main) + *type = APTTYPE_MAINSTA; + else + *type = APTTYPE_STA; + + *qualifier = APTTYPEQUALIFIER_NONE; + + return info->apt ? S_OK : CO_E_NOTINITIALIZED; +} + +/*********************************************************************** * DllMain (OLE32.@) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 04c9f1e..c836176 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -23,6 +23,7 @@ @ stdcall CoFreeUnusedLibraries() @ stdcall CoFreeUnusedLibrariesEx(long long) @ stdcall CoGetActivationState(int128 long ptr) +@ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) @ stdcall CoGetCallState(long ptr) @ stdcall CoGetCallerTID(ptr) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 6fa6dfc..de511ab 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -70,6 +70,7 @@ static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppO static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); static HRESULT (WINAPI * pCoTreatAsClass)(REFCLSID clsidOld, REFCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); +static HRESULT (WINAPI * pCoGetApartmentType)(APTTYPE *type, APTTYPEQUALIFIER *qualifier); static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); @@ -2879,6 +2880,59 @@ if (0) /* crashes on native */ IMalloc_Release(imalloc); } +static void test_CoGetApartmentType(void) +{ + APTTYPEQUALIFIER qualifier; + APTTYPE type; + HRESULT hr; + + if (!pCoGetApartmentType) + { + win_skip("CoGetApartmentType not present\n"); + return; + } + + hr = pCoGetApartmentType(NULL, NULL); + ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); + + type = 0xdeadbeef; + hr = pCoGetApartmentType(&type, NULL); + ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); + ok(type == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", type); + + qualifier = 0xdeadbeef; + hr = pCoGetApartmentType(NULL, &qualifier); + ok(hr == E_INVALIDARG, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); + ok(qualifier == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", qualifier); + + type = 0xdeadbeef; + qualifier = 0xdeadbeef; + hr = pCoGetApartmentType(&type, &qualifier); + ok(hr == CO_E_NOTINITIALIZED, "CoGetApartmentType succeeded, error: 0x%08x\n", hr); + ok(type == APTTYPE_CURRENT, "Expected APTTYPE_CURRENT, got %u\n", type); + ok(qualifier == APTTYPEQUALIFIER_NONE, "Expected APTTYPEQUALIFIER_NONE, got %u\n", qualifier); + + type = 0xdeadbeef; + qualifier = 0xdeadbeef; + hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "CoInitializeEx failed, error: 0x%08x\n", hr); + hr = pCoGetApartmentType(&type, &qualifier); + ok(hr == S_OK, "CoGetApartmentType failed, error: 0x%08x\n", hr); + ok(type == APTTYPE_MAINSTA, "Expected APTTYPE_MAINSTA, got %u\n", type); + ok(qualifier == APTTYPEQUALIFIER_NONE, "Expected APTTYPEQUALIFIER_NONE, got %u\n", qualifier); + CoUninitialize(); + + type = 0xdeadbeef; + qualifier = 0xdeadbeef; + hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "CoInitializeEx failed, error: 0x%08x\n", hr); + hr = pCoGetApartmentType(&type, &qualifier); + ok(hr == S_OK, "CoGetApartmentType failed, error: 0x%08x\n", hr); + ok(type == APTTYPE_MTA, "Expected APTTYPE_MTA, got %u\n", type); + ok(qualifier == APTTYPEQUALIFIER_NONE, "Expected APTTYPEQUALIFIER_NONE, got %u\n", qualifier); + CoUninitialize(); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -2890,6 +2944,7 @@ static void init_funcs(void) pCoGetTreatAsClass = (void*)GetProcAddress(hOle32,"CoGetTreatAsClass"); pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); + pCoGetApartmentType = (void*)GetProcAddress(hOle32, "CoGetApartmentType"); pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); @@ -2944,4 +2999,5 @@ START_TEST(compobj) test_CoWaitForMultipleHandles(); test_CoGetMalloc(); test_OleRegGetUserType(); + test_CoGetApartmentType(); } diff --git a/include/objbase.h b/include/objbase.h index d73f220..02656d1 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -285,6 +285,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved); HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit); void WINAPI CoUninitialize(void); DWORD WINAPI CoGetCurrentProcess(void); +HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier); HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree); void WINAPI CoFreeAllLibraries(void); diff --git a/include/objidl.idl b/include/objidl.idl index 335282d..168e533 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -2327,6 +2327,15 @@ typedef enum _APTTYPE { APTTYPE_MAINSTA = 3 } APTTYPE; +typedef enum _APTTYPEQUALIFIER { + APTTYPEQUALIFIER_NONE, + APTTYPEQUALIFIER_IMPLICIT_MTA, + APTTYPEQUALIFIER_NA_ON_MTA, + APTTYPEQUALIFIER_NA_ON_STA, + APTTYPEQUALIFIER_NA_ON_IMPLICIT_MTA, + APTTYPEQUALIFIER_NA_ON_MAINSTA +} APTTYPEQUALIFIER; + typedef enum _THDTYPE { THDTYPE_BLOCKMESSAGES = 0, THDTYPE_PROCESSMESSAGES = 1

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_3d_GetLevelDesc().
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 9f51e8f77e73f7aae77f1e256763fc33dbe6ae78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f51e8f77e73f7aae77f1e256… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:12 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_3d_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 13 ++++--------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 2 -- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 50ef88d..07bd83e 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1077,21 +1077,16 @@ static void WINAPI d3d9_texture_3d_GenerateMipSubLevels(IDirect3DVolumeTexture9 static HRESULT WINAPI d3d9_texture_3d_GetLevelDesc(IDirect3DVolumeTexture9 *iface, UINT level, D3DVOLUME_DESC *desc) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_VOLUME; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Width = wined3d_desc.width; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4b24c21..e96b029 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -716,7 +716,7 @@ void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) FIXME("texture %p stub!\n", texture); } -struct wined3d_resource * CDECL wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, +struct wined3d_resource *wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx) { UINT sub_count = texture->level_count * texture->layer_count; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5e2e426..247e4de 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -250,7 +250,6 @@ @ cdecl wined3d_texture_get_parent(ptr) @ cdecl wined3d_texture_get_pitch(ptr long ptr ptr) @ cdecl wined3d_texture_get_resource(ptr) -@ cdecl wined3d_texture_get_sub_resource(ptr long) @ cdecl wined3d_texture_get_sub_resource_desc(ptr long ptr) @ cdecl wined3d_texture_get_sub_resource_parent(ptr long) @ cdecl wined3d_texture_incref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d36c557..d89bd24 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2409,6 +2409,8 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_texture_force_reload(struct wined3d_texture *texture) DECLSPEC_HIDDEN; +struct wined3d_resource *wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, + UINT sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a4b2a30..e678c39 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2448,8 +2448,6 @@ void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture) void __cdecl wined3d_texture_get_pitch(const struct wined3d_texture *texture, unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch); struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_texture *texture); -struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, - UINT sub_resource_idx); HRESULT __cdecl wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc); void * __cdecl wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx);

1 0

Henri Verbeet : wined3d: Use a single allocation for texture sub-resource objects.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: e3e5dcd2cd548bed34cc193383da96c1898fee2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e5dcd2cd548bed34cc19338… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:13 2016 +0100 wined3d: Use a single allocation for texture sub-resource objects. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 57 +----------------- dlls/wined3d/texture.c | 130 ++++++++++++++++++++++++++++++----------- dlls/wined3d/volume.c | 47 +-------------- dlls/wined3d/wined3d_private.h | 25 ++++---- 4 files changed, 117 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3e5dcd2cd548bed34cc1…

1 0

Stefan Dösinger : wined3d: Cleanup sub-resource buffer objects in wined3d_texture_cleanup().
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 45fa5b6471093db4f97f90b661d1f89d56aa48e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45fa5b6471093db4f97f90b66… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 2 19:24:19 2016 +0100 wined3d: Cleanup sub-resource buffer objects in wined3d_texture_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 +---------- dlls/wined3d/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/volume.c | 3 --- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 994756d..208c254 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -48,13 +48,10 @@ static unsigned int surface_get_sub_resource_idx(const struct wined3d_surface *s void wined3d_surface_cleanup(struct wined3d_surface *surface) { struct wined3d_surface *overlay, *cur; - GLuint buffer_object; TRACE("surface %p.\n", surface); - buffer_object = surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object; - if (buffer_object || surface->rb_multisample - || surface->rb_resolved || !list_empty(&surface->renderbuffers)) + if (surface->rb_multisample || surface->rb_resolved || !list_empty(&surface->renderbuffers)) { struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info; @@ -64,12 +61,6 @@ void wined3d_surface_cleanup(struct wined3d_surface *surface) context = context_acquire(device, NULL); gl_info = context->gl_info; - if (buffer_object) - { - TRACE("Deleting buffer object %u.\n", buffer_object); - GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); - } - if (surface->rb_multisample) { TRACE("Deleting multisample renderbuffer %u.\n", surface->rb_multisample); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cb2b310..a8e9194 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -108,8 +108,35 @@ static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) static void wined3d_texture_cleanup(struct wined3d_texture *texture) { + unsigned int sub_count = texture->level_count * texture->layer_count; + struct wined3d_device *device = texture->resource.device; + struct wined3d_context *context = NULL; + const struct wined3d_gl_info *gl_info; + GLuint buffer_object; + unsigned int i; + TRACE("texture %p.\n", texture); + for (i = 0; i < sub_count; ++i) + { + if (!(buffer_object = texture->sub_resources[i].buffer_object)) + continue; + + TRACE("Deleting buffer object %u.\n", buffer_object); + + /* We may not be able to get a context in wined3d_texture_cleanup() in + * general, but if a buffer object was previously created we can. */ + if (!context) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + } + + GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); + } + if (context) + context_release(context); + texture->texture_ops->texture_cleanup_sub_resources(texture); wined3d_texture_unload_gl_texture(texture); resource_cleanup(&texture->resource); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3782642..ef0d69b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -397,9 +397,6 @@ void wined3d_volume_cleanup(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); - if (volume->container->sub_resources[volume->texture_level].buffer_object) - wined3d_volume_free_pbo(volume); - resource_cleanup(&volume->resource); }

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in texture2d_prepare_texture().
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: b309b831deb81f47b22f0c25a5fc0a1db6759d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b309b831deb81f47b22f0c25a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:15 2016 +0100 wined3d: Avoid surface_from_resource() in texture2d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 651318c..af1c1de 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -868,7 +868,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi for (i = 0; i < sub_count; ++i) { - struct wined3d_surface *surface = surface_from_resource(texture->sub_resources[i].resource); + struct wined3d_surface *surface = texture->sub_resources[i].u.surface; GLsizei height = surface->pow2Height; GLsizei width = surface->pow2Width;

1 0

Michael Müller : shutdown: Add stub implementation.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 183e8cf14e85546cb93533184782959fdf9e75ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=183e8cf14e85546cb93533184… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 2 07:46:42 2016 +0100 shutdown: Add stub implementation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/shutdown/Makefile.in | 5 +++++ programs/shutdown/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index 02ba099..692b26f 100755 --- a/configure +++ b/configure @@ -1489,6 +1489,7 @@ enable_sdbinst enable_secedit enable_servicemodelreg enable_services +enable_shutdown enable_spoolsv enable_start enable_svchost @@ -18166,6 +18167,7 @@ wine_fn_config_program secedit enable_secedit install wine_fn_config_program servicemodelreg enable_servicemodelreg install wine_fn_config_program services enable_services clean,install wine_fn_config_test programs/services/tests services.exe_test +wine_fn_config_program shutdown enable_shutdown install wine_fn_config_program spoolsv enable_spoolsv install wine_fn_config_program start enable_start clean,install wine_fn_config_program svchost enable_svchost install diff --git a/configure.ac b/configure.ac index 1e6bba3..b57ff6a 100644 --- a/configure.ac +++ b/configure.ac @@ -3484,6 +3484,7 @@ WINE_CONFIG_PROGRAM(secedit,,[install]) WINE_CONFIG_PROGRAM(servicemodelreg,,[install]) WINE_CONFIG_PROGRAM(services,,[clean,install]) WINE_CONFIG_TEST(programs/services/tests) +WINE_CONFIG_PROGRAM(shutdown,,[install]) WINE_CONFIG_PROGRAM(spoolsv,,[install]) WINE_CONFIG_PROGRAM(start,,[clean,install]) WINE_CONFIG_PROGRAM(svchost,,[install]) diff --git a/programs/shutdown/Makefile.in b/programs/shutdown/Makefile.in new file mode 100644 index 0000000..0014021 --- /dev/null +++ b/programs/shutdown/Makefile.in @@ -0,0 +1,5 @@ +MODULE = shutdown.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/shutdown/main.c b/programs/shutdown/main.c new file mode 100644 index 0000000..49f8d24 --- /dev/null +++ b/programs/shutdown/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shutdown); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Hugh McMaster : reg: Display the default value name when ask_confirm() is passed "" for reg_info.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 8220a32e0ab33b4ee145f29ae294c7fa1affde86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8220a32e0ab33b4ee145f29ae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 2 21:31:19 2016 +1100 reg: Display the default value name when ask_confirm() is passed "" for reg_info. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6ae4aa1..6f3db63 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -151,6 +151,7 @@ static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) WCHAR Nbuffer[4]; WCHAR defval[32]; WCHAR answer[MAX_PATH]; + WCHAR *str; DWORD count; hmod = GetModuleHandleW(NULL); @@ -158,9 +159,11 @@ static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) LoadStringW(hmod, STRING_NO, Nbuffer, ARRAY_SIZE(Nbuffer)); LoadStringW(hmod, STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval)); + str = (reg_info && strlenW(reg_info)) ? reg_info : defval; + while (1) { - output_message(msgid, reg_info ? reg_info : defval); + output_message(msgid, str); output_message(STRING_YESNO); ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count, NULL); answer[0] = toupperW(answer[0]);

1 0

Hans Leidekker : webservices: Move the reader to EOF at end of data in WsReadEndElement.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: d5255f51b2e0fe5e7e7fb0c4c520ccd5ee65b0af URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5255f51b2e0fe5e7e7fb0c4c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 14:06:26 2016 +0100 webservices: Move the reader to EOF at end of data in WsReadEndElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 10 +++++ dlls/webservices/tests/reader.c | 84 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 89 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index db68733..7abbf3c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1194,6 +1194,16 @@ static HRESULT read_endelement( struct reader *reader ) WS_XML_STRING *prefix, *localname; HRESULT hr; + if (reader->state == READER_STATE_EOF) return WS_E_INVALID_FORMAT; + + if (read_end_of_data( reader )) + { + struct list *eof = list_tail( &reader->root->children ); + reader->current = LIST_ENTRY( eof, struct node, entry ); + reader->state = READER_STATE_EOF; + return S_OK; + } + if (read_cmp( reader, "</", 2 )) return WS_E_INVALID_FORMAT; read_skip( reader, 2 ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 62a8846..6054690 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -887,11 +887,11 @@ static void test_WsReadStartElement(void) /* WsReadEndElement advances reader to EOF */ hr = WsReadEndElement( reader, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - todo_wine if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); @@ -904,6 +904,7 @@ static void test_WsReadEndElement(void) HRESULT hr; WS_XML_READER *reader; const WS_XML_NODE *node; + int found; hr = WsCreateReader( NULL, 0, &reader, NULL ) ; ok( hr == S_OK, "got %08x\n", hr ); @@ -976,11 +977,11 @@ static void test_WsReadEndElement(void) /* WsReadEndElement advances reader to EOF */ hr = WsReadEndElement( reader, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - todo_wine if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); @@ -1009,6 +1010,79 @@ static void test_WsReadEndElement(void) hr = WsReadEndElement( reader, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_input( reader, "<a></a>", sizeof("<a></a>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof("<a></a>") - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( found == TRUE, "got %d\n", found ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_input( reader, "<a></a>", sizeof("<a></a>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof("<a></a>") - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( found == TRUE, "got %d\n", found ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = set_input( reader, "<a/>", sizeof("<a/>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof("<a/>") - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( found == TRUE, "got %d\n", found ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeReader( reader ); } @@ -2134,7 +2208,7 @@ static void test_WsGetNamespaceFromPrefix(void) hr = WsReadStartElement( reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadEndElement( reader, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr );

1 0

Matteo Bruni : wined3d: Add a setting to check relative addressing indices when accessing uniforms.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 8e696dee5ff05377c8ccc59b4d204eb42d4cdeca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e696dee5ff05377c8ccc59b4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 00:50:00 2016 +0100 wined3d: Add a setting to check relative addressing indices when accessing uniforms. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 ++++++- dlls/wined3d/wined3d_main.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a2ce187..a56ee9b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2257,7 +2257,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* Relative addressing */ if (reg->idx[0].rel_addr) { - if (reg->idx[0].offset) + if (wined3d_settings.check_float_constants) + sprintf(register_name, "(%s + %u >= 0 && %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", + rel_param0.param_str, reg->idx[0].offset, + rel_param0.param_str, reg->idx[0].offset, shader->limits->constant_float, + prefix, rel_param0.param_str, reg->idx[0].offset); + else if (reg->idx[0].offset) sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); else sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0543d97..45e41ad 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -82,6 +82,7 @@ struct wined3d_settings wined3d_settings = TRUE, /* Multisampling enabled by default. */ FALSE, /* No strict draw ordering. */ TRUE, /* Don't try to render onscreen by default. */ + FALSE, /* Don't range check relative addressing indices in float constants. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No GS shader model limit by default. */ ~0U, /* No PS shader model limit by default. */ @@ -302,6 +303,12 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Not always rendering backbuffers offscreen.\n"); wined3d_settings.always_offscreen = FALSE; } + if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) + && !strcmp(buffer, "enabled")) + { + TRACE("Checking relative addressing indices in float constants.\n"); + wined3d_settings.check_float_constants = TRUE; + } if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce2f196..d36c557 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -290,6 +290,7 @@ struct wined3d_settings int allow_multisampling; BOOL strict_draw_ordering; BOOL always_offscreen; + BOOL check_float_constants; unsigned int max_sm_vs; unsigned int max_sm_gs; unsigned int max_sm_ps;

1 0

Józef Kucia : d3d10core/tests: Viewport properties are integers.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 28c04a64f6fc3dd6dff24b6919ea71e56dcbe278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c04a64f6fc3dd6dff24b691… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:46:07 2016 +0100 d3d10core/tests: Viewport properties are integers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 00302bb..27c7ee0 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5617,10 +5617,10 @@ float4 main(const ps_in v) : SV_TARGET ID3D10Device_VSSetConstantBuffers(device, 1, 1, &colors_cb); ID3D10Device_PSSetShader(device, ps); - vp.TopLeftX = 0.0f; - vp.TopLeftY = 0.0f; - vp.Width = 640.0f; - vp.Height = 480.0f; + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 640; + vp.Height = 480; vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; ID3D10Device_RSSetViewports(device, 1, &vp);

1 0