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

Henri Verbeet : d3d10core/tests: Fix a typo in shader source in test_clear_state().
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: df16cb2cfe726cb97f86ea12d7dfb4acdc68ad32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df16cb2cfe726cb97f86ea12d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 20 12:41:51 2015 +0100 d3d10core/tests: Fix a typo in shader source in test_clear_state(). --- dlls/d3d10core/tests/device.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 68012ac..dd9ef46 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1238,7 +1238,7 @@ struct gs_out }; [maxvertexcount(4)] -void main(point float4 vin[1] : POSTION, inout TriangleStream<gs_out> vout) +void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout) { float offset = 0.1 * vin[0].w; gs_out v; @@ -1255,24 +1255,24 @@ void main(point float4 vin[1] : POSTION, inout TriangleStream<gs_out> vout) #endif static const DWORD simple_gs[] = { - 0x43425844, 0x9786dfb7, 0xad78ae61, 0x34364b9a, 0xf3b719f8, 0x00000001, 0x00000238, 0x00000003, - 0x0000002c, 0x0000005c, 0x00000090, 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x54534f50, 0x004e4f49, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, - 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x000001a0, 0x00020040, 0x00000068, - 0x0400005f, 0x002010f2, 0x00000001, 0x00000000, 0x02000068, 0x00000001, 0x0100085d, 0x0100285c, - 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, 0x00100032, - 0x00000000, 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3dcccccd, 0x3dcccccd, - 0x00000000, 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, 0x00000000, - 0x00100046, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, 0x00000000, - 0x01000013, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0e000032, 0x00100052, - 0x00000000, 0x00201ff6, 0x00000000, 0x00000000, 0x00004002, 0x3dcccccd, 0x00000000, 0x3dcccccd, - 0x00000000, 0x00201106, 0x00000000, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010002a, - 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, 0x00000000, 0x01000013, - 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, - 0x0010001a, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, 0x00000000, - 0x01000013, 0x05000036, 0x00102032, 0x00000000, 0x00100086, 0x00000000, 0x06000036, 0x001020c2, - 0x00000000, 0x00201ea6, 0x00000000, 0x00000000, 0x01000013, 0x0100003e, + 0x43425844, 0x000ee786, 0xc624c269, 0x885a5cbe, 0x444b3b1f, 0x00000001, 0x0000023c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x000001a0, 0x00020040, + 0x00000068, 0x0400005f, 0x002010f2, 0x00000001, 0x00000000, 0x02000068, 0x00000001, 0x0100085d, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, + 0x00100032, 0x00000000, 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3dcccccd, + 0x3dcccccd, 0x00000000, 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, + 0x00000000, 0x00100046, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, + 0x00000000, 0x01000013, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0e000032, + 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000, 0x00004002, 0x3dcccccd, 0x00000000, + 0x3dcccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000, 0x05000036, 0x00102022, 0x00000000, + 0x0010002a, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, 0x00000000, + 0x01000013, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, + 0x00000000, 0x0010001a, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, + 0x00000000, 0x01000013, 0x05000036, 0x00102032, 0x00000000, 0x00100086, 0x00000000, 0x06000036, + 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, 0x00000000, 0x01000013, 0x0100003e, }; #if 0

1 0

Nikolay Sivov : fusion: Return interface pointer from QI instead of impl pointer.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: dc5d07f51b27424bda93c9abe581b983e3acfd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5d07f51b27424bda93c9abe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 11:25:29 2015 +0300 fusion: Return interface pointer from QI instead of impl pointer. --- dlls/fusion/asmcache.c | 4 ++-- dlls/fusion/asmenum.c | 2 +- dlls/fusion/asmname.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index dd84d38..6cc6602 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -172,7 +172,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryInterface(IAssemblyCache *iface, IsEqualIID(riid, &IID_IAssemblyCache)) { IAssemblyCache_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyCache_iface; return S_OK; } @@ -601,7 +601,7 @@ static HRESULT WINAPI IAssemblyCacheItemImpl_QueryInterface(IAssemblyCacheItem * IsEqualIID(riid, &IID_IAssemblyCacheItem)) { IAssemblyCacheItem_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyCacheItem_iface; return S_OK; } diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 76de1bf..4a5dadd 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -72,7 +72,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, IsEqualIID(riid, &IID_IAssemblyEnum)) { IAssemblyEnum_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyEnum_iface; return S_OK; } diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index f18e622..f892f2b 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -85,7 +85,7 @@ static HRESULT WINAPI IAssemblyNameImpl_QueryInterface(IAssemblyName *iface, IsEqualIID(riid, &IID_IAssemblyName)) { IAssemblyName_AddRef(iface); - *ppobj = This; + *ppobj = &This->IAssemblyName_iface; return S_OK; }

1 0

Francois Gouget : mscoree: Mark internal symbols with hidden visibility.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: b861aed2c1bfd17fe942b29d8bebdcaff1d501be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b861aed2c1bfd17fe942b29d8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 20 09:50:58 2015 +0100 mscoree: Mark internal symbols with hidden visibility. --- dlls/mscoree/mscoree_private.h | 52 +++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index af329f8..175c8f2 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -136,30 +136,30 @@ typedef MonoAssembly* (*MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char * typedef void (*MonoProfileFunc)(MonoProfiler *prof); -extern BOOL is_mono_started; - -extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); -extern MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); -extern MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); -extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); -extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); -extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); -extern MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name); -extern int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); -extern MonoDomain* (CDECL *mono_jit_init)(const char *file); -extern MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); -extern void* (CDECL *mono_marshal_get_vtfixup_ftnptr)(MonoImage *image, DWORD token, WORD type); -extern MonoDomain* (CDECL *mono_object_get_domain)(MonoObject *obj); -extern MonoObject* (CDECL *mono_object_new)(MonoDomain *domain, MonoClass *klass); -extern void* (CDECL *mono_object_unbox)(MonoObject *obj); -extern MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image); -extern MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); -extern void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); -extern void (CDECL *mono_runtime_quit)(void); -extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); -extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); -extern void (CDECL *mono_thread_manage)(void); -extern void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); +extern BOOL is_mono_started DECLSPEC_HIDDEN; + +extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN; +extern MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status) DECLSPEC_HIDDEN; +extern MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status) DECLSPEC_HIDDEN; +extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type) DECLSPEC_HIDDEN; +extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name) DECLSPEC_HIDDEN; +extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count) DECLSPEC_HIDDEN; +extern MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name) DECLSPEC_HIDDEN; +extern int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]) DECLSPEC_HIDDEN; +extern MonoDomain* (CDECL *mono_jit_init)(const char *file) DECLSPEC_HIDDEN; +extern MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) DECLSPEC_HIDDEN; +extern void* (CDECL *mono_marshal_get_vtfixup_ftnptr)(MonoImage *image, DWORD token, WORD type) DECLSPEC_HIDDEN; +extern MonoDomain* (CDECL *mono_object_get_domain)(MonoObject *obj) DECLSPEC_HIDDEN; +extern MonoObject* (CDECL *mono_object_new)(MonoDomain *domain, MonoClass *klass) DECLSPEC_HIDDEN; +extern void* (CDECL *mono_object_unbox)(MonoObject *obj) DECLSPEC_HIDDEN; +extern MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image) DECLSPEC_HIDDEN; +extern MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc) DECLSPEC_HIDDEN; +extern void (CDECL *mono_runtime_object_init)(MonoObject *this_obj) DECLSPEC_HIDDEN; +extern void (CDECL *mono_runtime_quit)(void) DECLSPEC_HIDDEN; +extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) DECLSPEC_HIDDEN; +extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; +extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; +extern void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly) DECLSPEC_HIDDEN; /* loaded runtime interfaces */ extern void expect_no_runtimes(void) DECLSPEC_HIDDEN; @@ -185,7 +185,7 @@ extern HRESULT create_monodata(REFIID riid, LPVOID *ppObj) DECLSPEC_HIDDEN; extern HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int path_length) DECLSPEC_HIDDEN; -extern void runtimehost_init(void); -extern void runtimehost_uninit(void); +extern void runtimehost_init(void) DECLSPEC_HIDDEN; +extern void runtimehost_uninit(void) DECLSPEC_HIDDEN; #endif /* __MSCOREE_PRIVATE__ */

1 0

Alexandre Julliard : Release 1.7.39.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: f34ec94308514d4379d7af2e73e78c3b99a94c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34ec94308514d4379d7af2e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 20 22:41:44 2015 +0900 Release 1.7.39. --- ANNOUNCE | 881 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 454 insertions(+), 449 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f34ec94308514d4379d7a…

1 0

Henri Verbeet : wined3d: Fix a TRACE in wined3d_device_draw_indexed_primitive_instanced().
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: ec78d5019315d224d993ec9233178175a9bcb1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec78d5019315d224d993ec923… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 20 12:41:55 2015 +0100 wined3d: Fix a TRACE in wined3d_device_draw_indexed_primitive_instanced(). --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed00da0..631045a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3464,7 +3464,8 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, UINT start_idx, UINT index_count, UINT start_instance, UINT instance_count) { - TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); + TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", + device, start_idx, index_count, start_instance, instance_count); wined3d_cs_emit_draw(device->cs, start_idx, index_count, start_instance, instance_count, TRUE); }

1 0

Henri Verbeet : d3drm: Get rid of some incorrect comments.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: c5f03c3933f71d7cf3a0ff28b371eed5b2bedcde URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f03c3933f71d7cf3a0ff28b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 20 12:41:53 2015 +0100 d3drm: Get rid of some incorrect comments. --- dlls/d3drm/device.c | 3 --- dlls/d3drm/face.c | 3 --- dlls/d3drm/viewport.c | 3 --- 3 files changed, 9 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index e1e2250..c53abfc 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -3,9 +3,6 @@ * * Copyright 2011, 2012 André Hentschel * - * This file contains the (internal) driver registration functions, - * driver enumeration APIs and DirectDraw creation functions. - * * 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 diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c index 8cba39b..e9e7e9a 100644 --- a/dlls/d3drm/face.c +++ b/dlls/d3drm/face.c @@ -3,9 +3,6 @@ * * Copyright 2013 André Hentschel * - * This file contains the (internal) driver registration functions, - * driver enumeration APIs and DirectDraw creation functions. - * * 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 diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index c39903f..498b764 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -3,9 +3,6 @@ * * Copyright 2012 André Hentschel * - * This file contains the (internal) driver registration functions, - * driver enumeration APIs and DirectDraw creation functions. - * * 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

1 0

Nikolay Sivov : kernel32: Implement GetProcessIdOfThread().
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: 85a3d093290314315386d901cf4a7eb8238fd457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a3d093290314315386d901c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 12:45:33 2015 +0300 kernel32: Implement GetProcessIdOfThread(). --- .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 29 ++++++++++++++++++++++ 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index 0b16649..80a4780 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -16,7 +16,7 @@ @ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread @ stdcall GetPriorityClass(long) kernel32.GetPriorityClass @ stdcall GetProcessId(long) kernel32.GetProcessId -@ stub GetProcessIdOfThread +@ stdcall GetProcessIdOfThread(long) kernel32.GetProcessIdOfThread @ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes @ stdcall GetProcessVersion(long) kernel32.GetProcessVersion @ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index c9054d20..adc7284 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -21,7 +21,7 @@ @ stdcall GetPriorityClass(long) kernel32.GetPriorityClass @ stdcall GetProcessHandleCount(long ptr) kernel32.GetProcessHandleCount @ stdcall GetProcessId(long) kernel32.GetProcessId -@ stub GetProcessIdOfThread +@ stdcall GetProcessIdOfThread(long) kernel32.GetProcessIdOfThread @ stub GetProcessMitigationPolicy @ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes @ stdcall GetProcessVersion(long) kernel32.GetProcessVersion diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 6894ce8..830578f 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -21,7 +21,7 @@ @ stdcall GetPriorityClass(long) kernel32.GetPriorityClass @ stdcall GetProcessHandleCount(long ptr) kernel32.GetProcessHandleCount @ stdcall GetProcessId(long) kernel32.GetProcessId -@ stub GetProcessIdOfThread +@ stdcall GetProcessIdOfThread(long) kernel32.GetProcessIdOfThread @ stub GetProcessMitigationPolicy @ stdcall GetProcessPriorityBoost(long ptr) kernel32.GetProcessPriorityBoost @ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c95c446..1179af2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -780,7 +780,7 @@ @ stdcall -norelay GetProcessHeap() @ stdcall GetProcessHeaps(long ptr) @ stdcall GetProcessId(long) -# @ stub GetProcessIdOfThread +@ stdcall GetProcessIdOfThread(long) @ stdcall GetProcessIoCounters(long ptr) # @ stub GetProcessPreferredUILanguages @ stdcall GetProcessPriorityBoost(long ptr) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 0abfdf1..3dabf94 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -557,6 +557,35 @@ DWORD WINAPI GetThreadId(HANDLE Thread) return HandleToULong(tbi.ClientId.UniqueThread); } +/********************************************************************** + * GetProcessIdOfThread [KERNEL32.@] + * + * Retrieve process identifier given thread belongs to. + * + * PARAMS + * Thread [I] The thread identifier. + * + * RETURNS + * Success: Process identifier + * Failure: 0 + */ +DWORD WINAPI GetProcessIdOfThread(HANDLE Thread) +{ + THREAD_BASIC_INFORMATION tbi; + NTSTATUS status; + + TRACE("(%p)\n", Thread); + + status = NtQueryInformationThread(Thread, ThreadBasicInformation, &tbi, + sizeof(tbi), NULL); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return 0; + } + + return HandleToULong(tbi.ClientId.UniqueProcess); +} /*********************************************************************** * GetCurrentThread [KERNEL32.@] Gets pseudohandle for current thread

1 0

Francois Gouget : shell32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: 351d907bbd0872e3b3a0dfaf8f6d405a9e1b877e URL: http://source.winehq.org/git/wine.git/?a=commit;h=351d907bbd0872e3b3a0dfaf8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 20 09:46:28 2015 +0100 shell32: Remove unneeded NONAMELESSXXX directives. --- dlls/shell32/brsfolder.c | 1 - dlls/shell32/changenotify.c | 2 -- dlls/shell32/cpanelfolder.c | 1 - dlls/shell32/dataobject.c | 1 - dlls/shell32/ebrowser.c | 1 - dlls/shell32/pidl.c | 1 - dlls/shell32/shelldispatch.c | 2 -- dlls/shell32/shellitem.c | 1 - dlls/shell32/shellstring.c | 2 +- dlls/shell32/shfldr_desktop.c | 1 - dlls/shell32/shfldr_fs.c | 1 - dlls/shell32/shfldr_mycomp.c | 1 - dlls/shell32/shfldr_netplaces.c | 2 -- dlls/shell32/shfldr_printers.c | 2 -- dlls/shell32/shfldr_unixfs.c | 1 - dlls/shell32/shlfolder.c | 1 - dlls/shell32/shlview.c | 1 - dlls/shell32/shlview_cmenu.c | 1 - dlls/shell32/systray.c | 1 - 19 files changed, 1 insertion(+), 23 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 145ee09..1a2716e 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -26,7 +26,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "wine/debug.h" #include "undocshell.h" diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 2fba5b9..2efb297 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -21,8 +21,6 @@ #include <stdarg.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wine/list.h" diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 7bc4b3a..1a3b379 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -28,7 +28,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index b8b5a87..64a9401 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "wingdi.h" diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index b5cc21f..afeb821 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -22,7 +22,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 794ff12..d16ca57 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -32,7 +32,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index d83b277..d2c899d 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -24,8 +24,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index b5d70dc..b1cae7e 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -26,7 +26,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 9eb8536..956fd50 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -23,7 +23,7 @@ #include <stdlib.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winnls.h" diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 815a421..4aa1dcf 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -30,7 +30,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 357e4ff..d8bcb4c 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -30,7 +30,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index ac7fd48..767509b 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -29,7 +29,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 36d18bc..16e7cd5 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -29,8 +29,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 7ee6548..fb1b6a9 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -22,8 +22,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 9d10d64..b3b0214 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -148,7 +148,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 0fb8df9..46ccc56 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -31,7 +31,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 48409ff..2c3a908 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -45,7 +45,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winerror.h" diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 8170011..099f5bc 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "wine/debug.h" diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 59df2f8..dfa30ff 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -21,7 +21,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h>

1 0

Nikolay Sivov : explorerframe: Return interface pointer from QI instead of impl pointer.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: 20e302e2032239e0e73089b8d428b8777dbe5fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e302e2032239e0e73089b8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 11:23:15 2015 +0300 explorerframe: Return interface pointer from QI instead of impl pointer. --- dlls/explorerframe/nstc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 52d74c7..87a7200 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -818,7 +818,7 @@ static HRESULT WINAPI NSTC2_fnQueryInterface(INameSpaceTreeControl2* iface, IsEqualIID(riid, &IID_INameSpaceTreeControl) || IsEqualIID(riid, &IID_IUnknown)) { - *ppvObject = This; + *ppvObject = &This->INameSpaceTreeControl2_iface; } else if(IsEqualIID(riid, &IID_IOleWindow)) {

1 0

Henri Verbeet : wined3d: Simplify the wined3d_matrix structure.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: ba396e42122b53723ffeb054ae6b1036201fc32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba396e42122b53723ffeb054a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 20 12:41:54 2015 +0100 wined3d: Simplify the wined3d_matrix structure. --- dlls/wined3d/device.c | 44 +++++++------- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 14 ++--- dlls/wined3d/utils.c | 133 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 15 ++--- 6 files changed, 104 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba396e42122b53723ffeb…

1 0