June 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : quartz: Distinguish interface pointer and implementation pointer in multiple interfaces.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 2e6ff19e0e46572dc17c72cb1dc2ec7bb6ffe4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6ff19e0e46572dc17c72cb1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 26 05:52:42 2015 +0200 quartz: Distinguish interface pointer and implementation pointer in multiple interfaces. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/filesource.c | 8 ++++---- dlls/quartz/memallocator.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 5bc0d8f..d9a94a9 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -394,7 +394,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->tf.filter.IBaseFilter_iface; This->lasttime_real = This->lasttime_sent = -1; return hr; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 5047809..1a58844 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -416,7 +416,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pBihIn = NULL; This->pBihOut = NULL; - *ppv = This; + *ppv = &This->tf.filter.IBaseFilter_iface; return hr; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 84e4214..877c706 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -452,13 +452,13 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; else if (IsEqualIID(riid, &IID_IFileSourceFilter)) *ppv = &This->IFileSourceFilter_iface; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index f1903f9..f5ee3c2 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -116,9 +116,9 @@ static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REF *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; + *ppv = &This->IMemAllocator_iface; else if (IsEqualIID(riid, &IID_IMemAllocator)) - *ppv = This; + *ppv = &This->IMemAllocator_iface; if (*ppv) {

1 0

Alistair Leslie-Hughes : d3dcompiler: Share the source with d3dcompiler_46.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 8609e2d2722b2a9533df24080026206c75a6af79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8609e2d2722b2a9533df24080… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 24 20:03:03 2015 +1000 d3dcompiler: Share the source with d3dcompiler_46. --- dlls/d3dcompiler_46/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_46/d3dcompiler_46.spec | 24 +++++++++--------- dlls/d3dcompiler_46/d3dcompiler_46_main.c | 42 ------------------------------- 3 files changed, 31 insertions(+), 55 deletions(-) diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 08c5145..9edd7b6 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_46.dll +IMPORTS = dxguid uuid +EXTRALIBS = $(LIBWPP) +EXTRADEFS = -DD3D_COMPILER_VERSION=46 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_46_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + d3dcompiler_43_main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec index 526a997..5811b40 100644 --- a/dlls/d3dcompiler_46/d3dcompiler_46.spec +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -1,25 +1,25 @@ -@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble -@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompile2 @ stub D3DCompileFromFile @ stub D3DCompressShaders -@ stdcall D3DCreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob +@ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders -@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassemble(ptr long long ptr ptr) @ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect @ stub D3DDisassemble11Trace @ stub D3DDisassembleRegion -@ stdcall D3DGetBlobPart(ptr long long long ptr) d3dcompiler_43.D3DGetBlobPart -@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo -@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob -@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob -@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DGetBlobPart(ptr long long long ptr) +@ stdcall D3DGetDebugInfo(ptr long ptr) +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stub D3DGetTraceInstructionOffsets -@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stub D3DReadFileToBlob -@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReturnFailure1 @ stub D3DSetBlobPart -@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stdcall D3DStripShader(ptr long long ptr) @ stub D3DWriteBlobToFile @ stub DebugSetMute diff --git a/dlls/d3dcompiler_46/d3dcompiler_46_main.c b/dlls/d3dcompiler_46/d3dcompiler_46_main.c deleted file mode 100644 index 80da1ff..0000000 --- a/dlls/d3dcompiler_46/d3dcompiler_46_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2015 Alistair Leslie-Hughes - * - * 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 "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Alistair Leslie-Hughes : d3dcompiler: Rename d3dcompiler_43_main.c to main.c.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 80205c0160d574bc190438832c9eb4d777bd8f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80205c0160d574bc190438832… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 25 19:37:44 2015 +1000 d3dcompiler: Rename d3dcompiler_43_main.c to main.c. --- dlls/d3dcompiler_43/Makefile.in | 2 +- dlls/d3dcompiler_43/{d3dcompiler_43_main.c => main.c} | 0 dlls/d3dcompiler_46/Makefile.in | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index c88069d..e9a927e 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -8,7 +8,7 @@ C_SRCS = \ blob.c \ bytecodewriter.c \ compiler.c \ - d3dcompiler_43_main.c \ + main.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/main.c similarity index 100% rename from dlls/d3dcompiler_43/d3dcompiler_43_main.c rename to dlls/d3dcompiler_43/main.c diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 9edd7b6..e13cbd0 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -9,7 +9,7 @@ C_SRCS = \ blob.c \ bytecodewriter.c \ compiler.c \ - d3dcompiler_43_main.c \ + main.c \ reflection.c \ utils.c

1 0

Alistair Leslie-Hughes : d3dcompiler: Share the source with d3dcompiler_47.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 0a12011ab60d39eb88eb68bc3f8cfce34d6b0743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a12011ab60d39eb88eb68bc3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 25 19:46:57 2015 +1000 d3dcompiler: Share the source with d3dcompiler_47. --- dlls/d3dcompiler_47/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_47/d3dcompiler_47.spec | 24 +++++++++--------- dlls/d3dcompiler_47/d3dcompiler_47_main.c | 42 ------------------------------- 3 files changed, 31 insertions(+), 55 deletions(-) diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index 9f6ef8f..cb7f557 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_47.dll +IMPORTS = dxguid uuid +EXTRALIBS = $(LIBWPP) +EXTRADEFS = -DD3D_COMPILER_VERSION=47 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_47_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index 08bc418..40ad977 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -1,29 +1,29 @@ -@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble -@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompile2 @ stub D3DCompileFromFile @ stub D3DCompressShaders -@ stdcall D3DCreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob +@ stdcall D3DCreateBlob(long ptr) @ stub D3DCreateFunctionLinkingGraph @ stub D3DCreateLinker @ stub D3DDecompressShaders -@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassemble(ptr long long ptr ptr) @ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect @ stub D3DDisassemble11Trace @ stub D3DDisassembleRegion -@ stdcall D3DGetBlobPart(ptr long long long ptr) d3dcompiler_43.D3DGetBlobPart -@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo -@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob -@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob -@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DGetBlobPart(ptr long long long ptr) +@ stdcall D3DGetDebugInfo(ptr long ptr) +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stub D3DGetTraceInstructionOffsets @ stub D3DLoadModule -@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stub D3DReadFileToBlob -@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReflectLibrary @ stub D3DReturnFailure1 @ stub D3DSetBlobPart -@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stdcall D3DStripShader(ptr long long ptr) @ stub D3DWriteBlobToFile @ stub DebugSetMute diff --git a/dlls/d3dcompiler_47/d3dcompiler_47_main.c b/dlls/d3dcompiler_47/d3dcompiler_47_main.c deleted file mode 100644 index 320a4e0..0000000 --- a/dlls/d3dcompiler_47/d3dcompiler_47_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2015 Alistair Leslie-Hughes - * - * 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 "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE instdll, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instdll); - break; - } - - return TRUE; -}

1 0

Thomas Faller : cmd: Fix invalid "else if" execution.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 3cda870469cc457766f677f51afe352285db437b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cda870469cc457766f677f51… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Wed Jun 24 20:10:04 2015 +0200 cmd: Fix invalid "else if" execution. --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 40 +++++++++++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 30b8684..5309bc0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1561,7 +1561,7 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, (*cmdList)->command)) { /* Swap between if and else processing */ - processThese = !processThese; + processThese = !executecmds; /* Process the ELSE part */ if (processThese) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 16fdd43..5351e9c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -667,7 +667,45 @@ if /c==/c ( ) else ( echo parameter detection seems to be broken ) - +SET elseIF=0 +if 1 == 1 ( + SET /a elseIF=%elseIF%+1 +) else if 1 == 1 ( + SET /a elseIF=%elseIF%+2 +) else ( + SET /a elseIF=%elseIF%+2 +) +if %elseIF% == 1 ( + echo else if seems to work +) else ( + echo else if seems to be broken +) +SET elseIF=0 +if 1 == 2 ( + SET /a elseIF=%elseIF%+2 +) else if 1 == 1 ( + SET /a elseIF=%elseIF%+1 +) else ( + SET /a elseIF=%elseIF%+2 +) +if %elseIF% == 1 ( + echo else if seems to work +) else ( + echo else if seems to be broken +) +SET elseIF=0 +if 1 == 2 ( + SET /a elseIF=%elseIF%+2 +) else if 1 == 2 ( + SET /a elseIF=%elseIF%+2 +) else ( + SET /a elseIF=%elseIF%+1 +) +if %elseIF% == 1 ( + echo else if seems to work +) else ( + echo else if seems to be broken +) echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 828a651..4dddc71 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -438,6 +438,9 @@ Passed: file size check on subdir\a.a [8]@or_broken(a)Skipping file size check on if seems to work else seems to work if seems not to detect /c as parameter +else if seems to work +else if seems to work +else if seems to work --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work

1 0

Thomas Faber : dimm.idl: Add IActiveIMMMessagePumpOwner.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 38fb26fbb3a2e3318575197d0a9e7592f8853c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38fb26fbb3a2e3318575197d0… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jun 23 15:36:53 2015 +0200 dimm.idl: Add IActiveIMMMessagePumpOwner. --- include/dimm.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/dimm.idl b/include/dimm.idl index 851ec90..3e31811 100644 --- a/include/dimm.idl +++ b/include/dimm.idl @@ -579,6 +579,20 @@ interface IActiveIMMApp : IUnknown } [ + object, + uuid(b5cf2cfa-8aeb-11d1-9364-0060b067b86e), + pointer_default(unique) +] +interface IActiveIMMMessagePumpOwner : IUnknown +{ + HRESULT Start(); + HRESULT End(); + HRESULT OnTranslateMessage([in] const MSG *msg); + HRESULT Pause([out] DWORD *cookie); + HRESULT Resume([in] DWORD cookie); +} + +[ uuid(4955dd33-b159-11d0-8fcf-00aa006bcc59) ] coclass CActiveIMM @@ -586,5 +600,5 @@ coclass CActiveIMM [default] interface IActiveIMMApp; /* interface IActiveIMMIME; */ /* interface IActiveIMMRegistrar; */ - /* interface IActiveIMMMessagePumpOwner; */ + interface IActiveIMMMessagePumpOwner; }

1 0

Thomas Faber : msimtf: Add stub implementation for IActiveIMMMessagePumpOwner.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: c4be28ed2605140d3cd9f3908a0f4535ed51c1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4be28ed2605140d3cd9f3908… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jun 23 15:38:16 2015 +0200 msimtf: Add stub implementation for IActiveIMMMessagePumpOwner. --- dlls/msimtf/activeimmapp.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index a9c259a..5749735 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimtf); typedef struct tagActiveIMMApp { IActiveIMMApp IActiveIMMApp_iface; + IActiveIMMMessagePumpOwner IActiveIMMMessagePumpOwner_iface; LONG refCount; } ActiveIMMApp; @@ -66,6 +67,10 @@ static HRESULT WINAPI ActiveIMMApp_QueryInterface (IActiveIMMApp* iface, { *ppvOut = This; } + else if (IsEqualIID(iid, &IID_IActiveIMMMessagePumpOwner)) + { + *ppvOut = &This->IActiveIMMMessagePumpOwner_iface; + } if (*ppvOut) { @@ -812,6 +817,80 @@ static const IActiveIMMAppVtbl ActiveIMMAppVtbl = ActiveIMMApp_EnumInputContext }; +static inline ActiveIMMApp *impl_from_IActiveIMMMessagePumpOwner(IActiveIMMMessagePumpOwner *iface) +{ + return CONTAINING_RECORD(iface, ActiveIMMApp, IActiveIMMMessagePumpOwner_iface); +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_QueryInterface(IActiveIMMMessagePumpOwner* iface, + REFIID iid, LPVOID *ppvOut) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_QueryInterface(&This->IActiveIMMApp_iface, iid, ppvOut); +} + +static ULONG WINAPI ActiveIMMMessagePumpOwner_AddRef(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_AddRef(&This->IActiveIMMApp_iface); +} + +static ULONG WINAPI ActiveIMMMessagePumpOwner_Release(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + return IActiveIMMApp_Release(&This->IActiveIMMApp_iface); +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Start(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_End(IActiveIMMMessagePumpOwner* iface) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_OnTranslateMessage(IActiveIMMMessagePumpOwner* iface, + const MSG *msg) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%p): stub\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Pause(IActiveIMMMessagePumpOwner* iface, + DWORD *cookie) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%p): stub\n", This, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveIMMMessagePumpOwner_Resume(IActiveIMMMessagePumpOwner* iface, + DWORD cookie) +{ + ActiveIMMApp *This = impl_from_IActiveIMMMessagePumpOwner(iface); + FIXME("(%p)->(%u): stub\n", This, cookie); + return E_NOTIMPL; +} + +static const IActiveIMMMessagePumpOwnerVtbl ActiveIMMMessagePumpOwnerVtbl = +{ + ActiveIMMMessagePumpOwner_QueryInterface, + ActiveIMMMessagePumpOwner_AddRef, + ActiveIMMMessagePumpOwner_Release, + ActiveIMMMessagePumpOwner_Start, + ActiveIMMMessagePumpOwner_End, + ActiveIMMMessagePumpOwner_OnTranslateMessage, + ActiveIMMMessagePumpOwner_Pause, + ActiveIMMMessagePumpOwner_Resume, +}; + DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ActiveIMMApp *This; @@ -823,6 +902,7 @@ DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown * return E_OUTOFMEMORY; This->IActiveIMMApp_iface.lpVtbl = &ActiveIMMAppVtbl; + This->IActiveIMMMessagePumpOwner_iface.lpVtbl = &ActiveIMMMessagePumpOwnerVtbl; This->refCount = 1; TRACE("returning %p\n",This);

1 0

Ken Thomases : dbghelp: Fix STABS support for 64-bit on OS X.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 604ce29cb3b31c71496d581a415f8e41f4d026a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604ce29cb3b31c71496d581a4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 16:31:14 2015 -0500 dbghelp: Fix STABS support for 64-bit on OS X. OS X uses a struct nlist_64 for 64-bit images, where the n_value field is a 64-bit unsigned integer. --- dlls/dbghelp/stabs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 1d0d858..177c6bc 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -111,7 +111,11 @@ struct stab_nlist unsigned char n_type; char n_other; short n_desc; +#if defined(__APPLE__) && defined(_WIN64) + unsigned long n_value; +#else unsigned n_value; +#endif }; static void stab_strcpy(char* dest, int sz, const char* source) @@ -1465,7 +1469,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case 35: case 36: loc.reg = CV_REG_MM0 + stab_ptr->n_value - 29; break; default: - FIXME("Unknown register value (%u)\n", stab_ptr->n_value); + FIXME("Unknown register value (%lu)\n", (unsigned long)stab_ptr->n_value); loc.reg = CV_REG_NONE; break; } @@ -1615,7 +1619,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, case N_EXCL: if (stabs_add_include(stabs_find_include(ptr, stab_ptr->n_value)) < 0) { - ERR("Excluded header not found (%s,%d)\n", ptr, stab_ptr->n_value); + ERR("Excluded header not found (%s,%ld)\n", ptr, (unsigned long)stab_ptr->n_value); module_reset_debug_info(module); ret = FALSE; goto done; @@ -1661,8 +1665,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, break; } stabbuff[0] = '\0'; - TRACE("0x%02x %x %s\n", - stab_ptr->n_type, stab_ptr->n_value, debugstr_a(strs + stab_ptr->n_strx)); + TRACE("0x%02x %lx %s\n", + stab_ptr->n_type, (unsigned long)stab_ptr->n_value, debugstr_a(strs + stab_ptr->n_strx)); } module->module.SymType = SymDia; module->module.CVSig = 'S' | ('T' << 8) | ('A' << 16) | ('B' << 24);

1 0

Ken Thomases : dbghelp: Eliminate an unnecessary parameter from macho_load_debug_info().
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 8430ebc6b535a3550a72a01422f0d50825ae8a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8430ebc6b535a3550a72a0142… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:54 2015 -0500 dbghelp: Eliminate an unnecessary parameter from macho_load_debug_info(). >From outside of macho_module.c, it's only called with NULL. When it's called with a non-NULL parameter, it's just a thin wrapper around macho_load_debug_info_from_map(), so the code can just call that directly. --- dlls/dbghelp/dbghelp_private.h | 3 +-- dlls/dbghelp/macho_module.c | 20 ++++++++------------ dlls/dbghelp/module.c | 2 +- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 56a5bb8..b620020 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -572,8 +572,7 @@ extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_th #define MACHO_NO_MAP ((const void*)-1) extern BOOL macho_enum_modules(HANDLE hProc, enum_modules_cb, void*) DECLSPEC_HIDDEN; extern BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) DECLSPEC_HIDDEN; -struct macho_file_map; -extern BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) DECLSPEC_HIDDEN; +extern BOOL macho_load_debug_info(struct module* module) DECLSPEC_HIDDEN; extern struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsigned long) DECLSPEC_HIDDEN; extern BOOL macho_read_wine_loader_dbg_info(struct process* pcs) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index bb49aa5..31beafa 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -901,12 +901,12 @@ static BOOL macho_load_debug_info_from_map(struct module* module, * * Loads Mach-O debugging information from the module image file. */ -BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) +BOOL macho_load_debug_info(struct module* module) { BOOL ret = TRUE; - struct macho_file_map my_fmap; + struct macho_file_map fmap; - TRACE("(%p, %p/%d)\n", module, fmap, fmap ? fmap->fd : -1); + TRACE("(%p)\n", module); if (module->type != DMT_MACHO || !module->format_info[DFI_MACHO]->u.macho_info) { @@ -914,15 +914,11 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) return FALSE; } - if (!fmap) - { - fmap = &my_fmap; - ret = macho_map_file(module->module.LoadedImageName, fmap); - } + ret = macho_map_file(module->module.LoadedImageName, &fmap); if (ret) - ret = macho_load_debug_info_from_map(module, fmap); + ret = macho_load_debug_info_from_map(module, &fmap); - if (fmap == &my_fmap) macho_unmap_file(fmap); + macho_unmap_file(&fmap); return ret; } @@ -1048,7 +1044,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, if (dbghelp_options & SYMOPT_DEFERRED_LOADS) macho_info->module->module.SymType = SymDeferred; - else if (!macho_load_debug_info(macho_info->module, &fmap)) + else if (!macho_load_debug_info_from_map(macho_info->module, &fmap)) ret = FALSE; macho_info->module->format_info[DFI_MACHO]->u.macho_info->in_use = 1; @@ -1480,7 +1476,7 @@ struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsign return NULL; } -BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) +BOOL macho_load_debug_info(struct module* module) { return FALSE; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 15769e8..10b0107 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -366,7 +366,7 @@ BOOL module_get_debug(struct module_pair* pair) &idslW64); break; case DMT_MACHO: - ret = macho_load_debug_info(pair->effective, NULL); + ret = macho_load_debug_info(pair->effective); break; default: ret = FALSE;

1 0

Ken Thomases : dbghelp: Fix a leak of the Mach-O module structure by adding a module_remove callback.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Module: wine Branch: master Commit: 378d557d77cb32d6855201b5fcbdf4dff460fb09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378d557d77cb32d6855201b5f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:13:55 2015 -0500 dbghelp: Fix a leak of the Mach-O module structure by adding a module_remove callback. --- dlls/dbghelp/macho_module.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 31beafa..73beb57 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -943,6 +943,14 @@ BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, } /****************************************************************** + * macho_module_remove + */ +static void macho_module_remove(struct process* pcs, struct module_format* modfmt) +{ + HeapFree(GetProcessHeap(), 0, modfmt); +} + +/****************************************************************** * macho_load_file * * Loads the information for Mach-O module stored in 'filename'. @@ -1036,7 +1044,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, macho_info->module->format_info[DFI_MACHO] = modfmt; modfmt->module = macho_info->module; - modfmt->remove = NULL; + modfmt->remove = macho_module_remove; modfmt->loc_compute = NULL; modfmt->u.macho_info = macho_module_info;

1 0