November 2014 - Wine-Commits

Hans Leidekker : user32: Add a stub implementation of IsTouchWindow.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 9023a95e5b0a8d96bdf74d926d3715fafbf98266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9023a95e5b0a8d96bdf74d926… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 27 12:17:26 2014 +0100 user32: Add a stub implementation of IsTouchWindow. --- dlls/user32/misc.c | 11 ++++++++++- dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index bcf6263..b3615e8 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -727,7 +727,16 @@ BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG { FIXME("(%p %08x %u %p %u): stub\n", hwnd, reserved, id, config, size); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return FALSE; +} + +/********************************************************************** + * IsTouchWindow [USER32.@] + */ +BOOL WINAPI IsTouchWindow( HWND hwnd, PULONG flags ) +{ + FIXME("(%p %p): stub\n", hwnd, flags); + return FALSE; } static const WCHAR imeW[] = {'I','M','E',0}; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index da02c58..a8bbe83 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -445,6 +445,7 @@ @ stdcall IsMenu(long) @ stdcall IsRectEmpty(ptr) # @ stub IsServerSideWindow +@ stdcall IsTouchWindow(long ptr) @ stdcall IsWinEventHookInstalled(long) @ stdcall IsWindow(long) @ stdcall IsWindowEnabled(long) diff --git a/include/winuser.h b/include/winuser.h index 303f5d3..3d9b937 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3735,6 +3735,7 @@ WINUSERAPI BOOL WINAPI IsHungAppWindow(HWND); WINUSERAPI BOOL WINAPI IsIconic(HWND); WINUSERAPI BOOL WINAPI IsMenu(HMENU); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); +WINUSERAPI BOOL WINAPI IsTouchWindow(HWND,PULONG); WINUSERAPI BOOL WINAPI IsWinEventHookInstalled(DWORD); WINUSERAPI BOOL WINAPI IsWindow(HWND); WINUSERAPI BOOL WINAPI IsWindowEnabled(HWND);

1 0

Hans Leidekker : vssapi: Add stub implementations for a couple of functions.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: a4a48d3fc87fb62c7e9266978a197f36e9407cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a48d3fc87fb62c7e9266978… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 27 12:16:54 2014 +0100 vssapi: Add stub implementations for a couple of functions. --- dlls/vssapi/Makefile.in | 3 ++ dlls/vssapi/main.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/vssapi/vssapi.spec | 10 ++--- include/Makefile.in | 2 + include/vss.idl | 31 ++++++++++++++ include/vswriter.h | 47 +++++++++++++++++++++ 6 files changed, 196 insertions(+), 5 deletions(-) diff --git a/dlls/vssapi/Makefile.in b/dlls/vssapi/Makefile.in index 583ec1c..867a562 100644 --- a/dlls/vssapi/Makefile.in +++ b/dlls/vssapi/Makefile.in @@ -1 +1,4 @@ MODULE = vssapi.dll + +C_SRCS = \ + main.c diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c new file mode 100644 index 0000000..133f4c5 --- /dev/null +++ b/dlls/vssapi/main.c @@ -0,0 +1,108 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "vss.h" +#include "vswriter.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL( vssapi ); + +#ifdef __i386__ /* thiscall functions are i386-specific */ + +#define THISCALL(func) __thiscall_ ## func +#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) +#define __thiscall __stdcall +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#else /* __i386__ */ + +#define THISCALL(func) func +#define THISCALL_NAME(func) __ASM_NAME(#func) +#define __thiscall __cdecl +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#endif /* __i386__ */ + +struct CVssWriter +{ + void **vtable; +}; + +/****************************************************************** + * ??0CVssWriter@@QAE(a)XZ (VSSAPI.@) + */ +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_default_ctor, 4 ) +struct CVssWriter * __thiscall VSSAPI_CVssWriter_default_ctor( struct CVssWriter *writer ) +{ + FIXME( "%p\n", writer ); + writer->vtable = NULL; + return writer; +} + +/****************************************************************** + * ??1CVssWriter@@UAE(a)XZ (VSSAPI.@) + */ +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_dtor, 4 ) +void __thiscall VSSAPI_CVssWriter_dtor( struct CVssWriter *writer ) +{ + FIXME( "%p\n", writer ); +} + +/****************************************************************** + * ?Initialize(a)CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N(a)Z + */ +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Initialize, 52 ) +HRESULT __thiscall VSSAPI_CVssWriter_Initialize( struct CVssWriter *writer, VSS_ID id, + LPCWSTR name, VSS_USAGE_TYPE usage_type, VSS_SOURCE_TYPE source_type, + VSS_APPLICATION_LEVEL level, DWORD timeout, VSS_ALTERNATE_WRITER_STATE alt_writer_state, + BOOL throttle, LPCWSTR instance ) +{ + FIXME( "%p, %s, %s, %u, %u, %u, %u, %u, %d, %s\n", writer, debugstr_guid(&id), + debugstr_w(name), usage_type, source_type, level, timeout, alt_writer_state, + throttle, debugstr_w(instance) ); + return S_OK; +} + +/****************************************************************** + * ?Subscribe(a)CVssWriter@@QAGJK(a)Z + */ +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Subscribe, 8 ) +HRESULT __thiscall VSSAPI_CVssWriter_Subscribe( struct CVssWriter *writer, DWORD flags ) +{ + FIXME( "%p, %x\n", writer, flags ); + return S_OK; +} + +/****************************************************************** + * ?Unsubscribe(a)CVssWriter@@QAGJXZ + */ +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Unsubscribe, 4 ) +HRESULT __thiscall VSSAPI_CVssWriter_Unsubscribe( struct CVssWriter *writer ) +{ + FIXME( "%p\n", writer ); + return S_OK; +} diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 4ad38a3..77599ab 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -2,9 +2,9 @@ @ stub VssFreeSnapshotProperties @ stub ShouldBlockRevert @ stub ??0CVssJetWriter@@QAE(a)XZ -@ stub ??0CVssWriter@@QAE(a)XZ +@ thiscall -arch=i386 ??0CVssWriter@@QAE(a)XZ(ptr) VSSAPI_CVssWriter_default_ctor @ stub ??1CVssJetWriter@@UAE(a)XZ -@ stub ??1CVssWriter@@UAE(a)XZ +@ thiscall -arch=i386 ??1CVssWriter@@UAE(a)XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected(a)CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected(a)CVssWriter@@IBG_NXZ @ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z @@ -27,7 +27,7 @@ @ stub ?GetSnapshotDeviceName(a)CVssJetWriter@@IBGJPBGPAPBG(a)Z @ stub ?GetSnapshotDeviceName(a)CVssWriter@@IBGJPBGPAPBG(a)Z @ stub ?Initialize(a)CVssJetWriter@@QAGJU_GUID@@PBG_N211K(a)Z -@ stub ?Initialize(a)CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N(a)Z +@ thiscall -arch=i386 ?Initialize(a)CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N(a)Z(ptr ptr wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize @ stub ?InstallAlternateWriter(a)CVssWriter@@QAGJU_GUID@@0(a)Z @ stub ?IsBootableSystemStateBackedUp(a)CVssJetWriter@@IBG_NXZ @ stub ?IsBootableSystemStateBackedUp(a)CVssWriter@@IBG_NXZ @@ -67,9 +67,9 @@ @ stub ?OnVSSShutdown(a)CVssWriter@@UAG_NXZ @ stub ?SetWriterFailure(a)CVssJetWriter@@IAGJJ(a)Z @ stub ?SetWriterFailure(a)CVssWriter@@IAGJJ(a)Z -@ stub ?Subscribe(a)CVssWriter@@QAGJK(a)Z +@ thiscall -arch=i386 ?Subscribe(a)CVssWriter@@QAGJK(a)Z(ptr long) VSSAPI_CVssWriter_Subscribe @ stub ?Uninitialize(a)CVssJetWriter@@QAGXXZ -@ stub ?Unsubscribe(a)CVssWriter@@QAGJXZ +@ thiscall -arch=i386 ?Unsubscribe(a)CVssWriter@@QAGJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe @ stub CreateVssBackupComponentsInternal @ stub CreateVssExamineWriterMetadataInternal @ stub CreateVssExpressWriterInternal diff --git a/include/Makefile.in b/include/Makefile.in index e8d2379..a952964 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -118,6 +118,7 @@ PUBLIC_IDL_H_SRCS = \ urlhist.idl \ urlmon.idl \ vmr9.idl \ + vss.idl \ wbemcli.idl \ wbemdisp.idl \ wbemprov.idl \ @@ -577,6 +578,7 @@ SRCDIR_INCLUDES = \ vmrender.idl \ vsstyle.h \ vssym32.h \ + vswriter.h \ werapi.h \ wfext.h \ wia.h \ diff --git a/include/vss.idl b/include/vss.idl new file mode 100644 index 0000000..62335ea --- /dev/null +++ b/include/vss.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 + */ + +import "oaidl.idl"; + +typedef GUID VSS_ID; + +typedef enum _VSS_APPLICATION_LEVEL +{ + VSS_APP_AUTO = -1, + VSS_APP_UNKNOWN = 0, + VSS_APP_SYSTEM = 1, + VSS_APP_BACK_END = 2, + VSS_APP_FRONT_END = 3, + VSS_APP_SYSTEM_RM = 4 +} VSS_APPLICATION_LEVEL; diff --git a/include/vswriter.h b/include/vswriter.h new file mode 100644 index 0000000..043b871 --- /dev/null +++ b/include/vswriter.h @@ -0,0 +1,47 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#ifndef __WINE_VSWRITER_H +#define __WINE_VSWRITER_H + +typedef enum +{ + VSS_UT_UNDEFINED, + VSS_UT_BOOTABLESYSTEMSTATE, + VSS_UT_SYSTEMSERVICE, + VSS_UT_USERDATA, + VSS_UT_OTHER +} VSS_USAGE_TYPE; + +typedef enum +{ + VSS_ST_UNDEFINED, + VSS_ST_TRANSACTEDDB, + VSS_ST_NONTRANSACTEDDB, + VSS_ST_OTHER +} VSS_SOURCE_TYPE; + +typedef enum +{ + VSS_AWS_UNDEFINED, + VSS_AWS_NO_ALTERNATE_WRITER, + VSS_AWS_ALTERNATE_WRITER_EXISTS, + VSS_AWS_THIS_IS_ALTERNATE_WRITER +} VSS_ALTERNATE_WRITER_STATE; + +#endif /* ___WINE_VSWRITER_H */

1 0

Hans Leidekker : vssapi: New dll.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 153d389f459bf1d10e206432cccbc06fd22a8ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=153d389f459bf1d10e206432c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 27 12:16:07 2014 +0100 vssapi: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/vssapi/Makefile.in | 1 + dlls/vssapi/vssapi.spec | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+) diff --git a/configure b/configure index d09438e..4b1a37d 100755 --- a/configure +++ b/configure @@ -1255,6 +1255,7 @@ enable_vcomp100 enable_vcomp90 enable_vdmdbg enable_version +enable_vssapi enable_wbemdisp enable_wbemprox enable_webservices @@ -17356,6 +17357,7 @@ wine_fn_config_test dlls/version/tests version_test wine_fn_config_dll vmm.vxd enable_win16 wine_fn_config_dll vnbt.vxd enable_win16 wine_fn_config_dll vnetbios.vxd enable_win16 +wine_fn_config_dll vssapi enable_vssapi wine_fn_config_dll vtdapi.vxd enable_win16 wine_fn_config_dll vwin32.vxd enable_win16 wine_fn_config_dll w32skrnl enable_win16 diff --git a/configure.ac b/configure.ac index 04bcbd8..5521af2 100644 --- a/configure.ac +++ b/configure.ac @@ -3235,6 +3235,7 @@ WINE_CONFIG_TEST(dlls/version/tests) WINE_CONFIG_DLL(vmm.vxd,enable_win16) WINE_CONFIG_DLL(vnbt.vxd,enable_win16) WINE_CONFIG_DLL(vnetbios.vxd,enable_win16) +WINE_CONFIG_DLL(vssapi) WINE_CONFIG_DLL(vtdapi.vxd,enable_win16) WINE_CONFIG_DLL(vwin32.vxd,enable_win16) WINE_CONFIG_DLL(w32skrnl,enable_win16) diff --git a/dlls/vssapi/Makefile.in b/dlls/vssapi/Makefile.in new file mode 100644 index 0000000..583ec1c --- /dev/null +++ b/dlls/vssapi/Makefile.in @@ -0,0 +1 @@ +MODULE = vssapi.dll diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec new file mode 100644 index 0000000..4ad38a3 --- /dev/null +++ b/dlls/vssapi/vssapi.spec @@ -0,0 +1,84 @@ +@ stub IsVolumeSnapshotted +@ stub VssFreeSnapshotProperties +@ stub ShouldBlockRevert +@ stub ??0CVssJetWriter@@QAE(a)XZ +@ stub ??0CVssWriter@@QAE(a)XZ +@ stub ??1CVssJetWriter@@UAE(a)XZ +@ stub ??1CVssWriter@@UAE(a)XZ +@ stub ?AreComponentsSelected(a)CVssJetWriter@@IBG_NXZ +@ stub ?AreComponentsSelected(a)CVssWriter@@IBG_NXZ +@ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z +@ stub ?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z +@ stub ?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z +@ stub ?GetBackupType(a)CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ +@ stub ?GetBackupType(a)CVssWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ +@ stub ?GetContext(a)CVssJetWriter@@IBGJXZ +@ stub ?GetContext(a)CVssWriter@@IBGJXZ +@ stub ?GetCurrentLevel(a)CVssJetWriter@@IBG?AW4_VSS_APPLICATION_LEVEL@@XZ +@ stub ?GetCurrentLevel(a)CVssWriter@@IBG?AW4_VSS_APPLICATION_LEVEL@@XZ +@ stub ?GetCurrentSnapshotSetId(a)CVssJetWriter@@IBG?AU_GUID@@XZ +@ stub ?GetCurrentSnapshotSetId(a)CVssWriter@@IBG?AU_GUID@@XZ +@ stub ?GetCurrentVolumeArray(a)CVssJetWriter@@IBGPAPBGXZ +@ stub ?GetCurrentVolumeArray(a)CVssWriter@@IBGPAPBGXZ +@ stub ?GetCurrentVolumeCount(a)CVssJetWriter@@IBGIXZ +@ stub ?GetCurrentVolumeCount(a)CVssWriter@@IBGIXZ +@ stub ?GetRestoreType(a)CVssJetWriter@@IBG?AW4_VSS_RESTORE_TYPE@@XZ +@ stub ?GetRestoreType(a)CVssWriter@@IBG?AW4_VSS_RESTORE_TYPE@@XZ +@ stub ?GetSnapshotDeviceName(a)CVssJetWriter@@IBGJPBGPAPBG(a)Z +@ stub ?GetSnapshotDeviceName(a)CVssWriter@@IBGJPBGPAPBG(a)Z +@ stub ?Initialize(a)CVssJetWriter@@QAGJU_GUID@@PBG_N211K(a)Z +@ stub ?Initialize(a)CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N(a)Z +@ stub ?InstallAlternateWriter(a)CVssWriter@@QAGJU_GUID@@0(a)Z +@ stub ?IsBootableSystemStateBackedUp(a)CVssJetWriter@@IBG_NXZ +@ stub ?IsBootableSystemStateBackedUp(a)CVssWriter@@IBG_NXZ +@ stub ?IsPartialFileSupportEnabled(a)CVssJetWriter@@IBG_NXZ +@ stub ?IsPartialFileSupportEnabled(a)CVssWriter@@IBG_NXZ +@ stub ?IsPathAffected(a)CVssJetWriter@@IBG_NPBG(a)Z +@ stub ?IsPathAffected(a)CVssWriter@@IBG_NPBG(a)Z +@ stub ?LoadVssSnapshotSetDescription@@YGJPBGPAPAVIVssSnapshotSetDescription@@U_GUID@@@Z +@ stub ?OnAbortBegin(a)CVssJetWriter@@UAGXXZ +@ stub ?OnAbortEnd(a)CVssJetWriter@@UAGXXZ +@ stub ?OnBackOffIOOnVolume(a)CVssWriter@@UAG_NPAGU_GUID@@1(a)Z +@ stub ?OnBackupComplete(a)CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnBackupCompleteBegin(a)CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnBackupCompleteEnd(a)CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N(a)Z +@ stub ?OnBackupShutdown(a)CVssWriter@@UAG_NU_GUID@@@Z +@ stub ?OnContinueIOOnVolume(a)CVssWriter@@UAG_NPAGU_GUID@@1(a)Z +@ stub ?OnFreezeBegin(a)CVssJetWriter@@UAG_NXZ +@ stub ?OnFreezeEnd(a)CVssJetWriter@@UAG_N_N(a)Z +@ stub ?OnIdentify(a)CVssJetWriter@@UAG_NPAVIVssCreateWriterMetadata@@@Z +@ stub ?OnIdentify(a)CVssWriter@@UAG_NPAVIVssCreateWriterMetadata@@@Z +@ stub ?OnPostRestore(a)CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPostRestoreBegin(a)CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPostRestoreEnd(a)CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N(a)Z +@ stub ?OnPostSnapshot(a)CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPostSnapshot(a)CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPreRestore(a)CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPreRestoreBegin(a)CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPreRestoreEnd(a)CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N(a)Z +@ stub ?OnPrepareBackup(a)CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPrepareBackupBegin(a)CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPrepareBackupEnd(a)CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N(a)Z +@ stub ?OnPrepareSnapshotBegin(a)CVssJetWriter@@UAG_NXZ +@ stub ?OnPrepareSnapshotEnd(a)CVssJetWriter@@UAG_N_N(a)Z +@ stub ?OnThawBegin(a)CVssJetWriter@@UAG_NXZ +@ stub ?OnThawEnd(a)CVssJetWriter@@UAG_N_N(a)Z +@ stub ?OnVSSApplicationStartup(a)CVssWriter@@UAG_NXZ +@ stub ?OnVSSShutdown(a)CVssWriter@@UAG_NXZ +@ stub ?SetWriterFailure(a)CVssJetWriter@@IAGJJ(a)Z +@ stub ?SetWriterFailure(a)CVssWriter@@IAGJJ(a)Z +@ stub ?Subscribe(a)CVssWriter@@QAGJK(a)Z +@ stub ?Uninitialize(a)CVssJetWriter@@QAGXXZ +@ stub ?Unsubscribe(a)CVssWriter@@QAGJXZ +@ stub CreateVssBackupComponentsInternal +@ stub CreateVssExamineWriterMetadataInternal +@ stub CreateVssExpressWriterInternal +@ stub CreateWriter +@ stub CreateWriterEx +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub GetProviderMgmtInterface +@ stub GetProviderMgmtInterfaceInternal +@ stub IsVolumeSnapshottedInternal +@ stub ShouldBlockRevertInternal +@ stub VssFreeSnapshotPropertiesInternal

1 0

Stefan Dösinger : wined3d: Vertex fog uses the absolute eye position z.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: c9b10beb368d81fcc82edd83041896407f3a0a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b10beb368d81fcc82edd830… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 27 12:12:33 2014 +0100 wined3d: Vertex fog uses the absolute eye position z. --- dlls/d3d8/tests/visual.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 99 +++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 4 +- 4 files changed, 308 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9b10beb368d81fcc82ed…

1 0

Hans Leidekker : msiexec: Add support for /update.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: d81b8bbd798d340bd51f3b1dfca8e0c570446781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81b8bbd798d340bd51f3b1df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 27 12:15:46 2014 +0100 msiexec: Add support for /update. --- programs/msiexec/msiexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 1c42e90..cb0984d 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -870,7 +870,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine ExitProcess(1); } } - else if(msi_option_equal(argvW[i], "p")) + else if(msi_option_equal(argvW[i], "p") || msi_option_equal(argvW[i], "update")) { FunctionPatch = TRUE; i++;

1 0

Michael Stefaniuc : msvcrt/tests: Don't open code offsetof().
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 42e6019c009b46dbc0862d43a4a220271ef98786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e6019c009b46dbc0862d43a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 27 11:30:28 2014 +0100 msvcrt/tests: Don't open code offsetof(). --- dlls/msvcrt/tests/headers.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 7c102b4..52d739e 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -66,11 +66,10 @@ #define TYPEOF(type) int #endif #define MSVCRT(x) MSVCRT_##x -#define OFFSET(T,F) ((unsigned int)((char *)&((struct T *)0L)->F - (char *)0L)) #define CHECK_SIZE(e) ok(sizeof(e) == sizeof(MSVCRT(e)), "Element has different sizes\n") #define CHECK_TYPE(t) { TYPEOF(t) a = 0; TYPEOF(MSVCRT(t)) b = a; a = b; CHECK_SIZE(t); } #define CHECK_STRUCT(s) ok(sizeof(struct s) == sizeof(struct MSVCRT(s)), "Struct has different sizes\n") -#define CHECK_FIELD(s,e) ok(OFFSET(s,e) == OFFSET(MSVCRT(s),e), "Bad offset\n") +#define CHECK_FIELD(s,e) ok(offsetof(struct s,e) == offsetof(struct MSVCRT(s),e), "Bad offset\n") #define CHECK_DEF(d) ok(d == MSVCRT_##d, "Defines (MSVCRT_)" #d " are different: %d vs. %d\n", d, MSVCRT_##d) /************* Checking types ***************/

1 0

Michael Stefaniuc : comdlg32: RT_DIALOG is already an INTRESOURCE ( PVS-Studio).
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 51d0345ebd8fd2291bfae039026a2de8202494d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d0345ebd8fd2291bfae0390… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 27 11:28:42 2014 +0100 comdlg32: RT_DIALOG is already an INTRESOURCE (PVS-Studio). --- dlls/comdlg32/printdlg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index bedd9c4..83b22c3 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3817,16 +3817,16 @@ static void *pagesetup_get_template(pagesetup_data *data) { if(data->unicode) res = FindResourceW(data->u.dlgw->hInstance, - data->u.dlgw->lpPageSetupTemplateName, MAKEINTRESOURCEW(RT_DIALOG)); + data->u.dlgw->lpPageSetupTemplateName, (LPWSTR)RT_DIALOG); else res = FindResourceA(data->u.dlga->hInstance, - data->u.dlga->lpPageSetupTemplateName, MAKEINTRESOURCEA(RT_DIALOG)); + data->u.dlga->lpPageSetupTemplateName, (LPSTR)RT_DIALOG); tmpl_handle = LoadResource(data->u.dlgw->hInstance, res); } else { res = FindResourceW(COMDLG32_hInstance, MAKEINTRESOURCEW(PAGESETUPDLGORD), - MAKEINTRESOURCEW(RT_DIALOG)); + (LPWSTR)RT_DIALOG); tmpl_handle = LoadResource(COMDLG32_hInstance, res); } return LockResource(tmpl_handle);

1 0

Nikolay Sivov : dwrite: Estimate x-height and cap height metrics if they' re missing.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 9afd55072f49a79fe3069e68fc5266ce32b04830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afd55072f49a79fe3069e68f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 27 12:51:04 2014 +0300 dwrite: Estimate x-height and cap height metrics if they're missing. --- dlls/dwrite/opentype.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a0f1c31..8a22699 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -866,12 +866,18 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po memset(metrics, 0, sizeof(*metrics)); + if (tt_head) { + metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); + metrics->glyphBoxLeft = GET_BE_WORD(tt_head->xMin); + metrics->glyphBoxTop = GET_BE_WORD(tt_head->yMax); + metrics->glyphBoxRight = GET_BE_WORD(tt_head->xMax); + metrics->glyphBoxBottom = GET_BE_WORD(tt_head->yMin); + } + if (tt_os2) { metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); metrics->descent = GET_BE_WORD(tt_os2->usWinDescent); metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); - metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight); - metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight); metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); metrics->strikethroughThickness = GET_BE_WORD(tt_os2->yStrikeoutSize); metrics->subscriptPositionX = GET_BE_WORD(tt_os2->ySubscriptXOffset); @@ -883,20 +889,24 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po metrics->superscriptPositionY = GET_BE_WORD(tt_os2->ySuperscriptYOffset); metrics->superscriptSizeX = GET_BE_WORD(tt_os2->ySuperscriptXSize); metrics->superscriptSizeY = GET_BE_WORD(tt_os2->ySuperscriptYSize); - } - if (tt_head) { - metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); - metrics->glyphBoxLeft = GET_BE_WORD(tt_head->xMin); - metrics->glyphBoxTop = GET_BE_WORD(tt_head->yMax); - metrics->glyphBoxRight = GET_BE_WORD(tt_head->xMax); - metrics->glyphBoxBottom = GET_BE_WORD(tt_head->yMin); + /* version 2 fields */ + if (tt_os2->version >= 2) { + metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight); + metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight); + } } if (tt_post) { metrics->underlinePosition = GET_BE_WORD(tt_post->underlinePosition); metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } + + /* estimate missing metrics */ + if (metrics->xHeight == 0) + metrics->xHeight = metrics->designUnitsPerEm / 2; + if (metrics->capHeight == 0) + metrics->capHeight = metrics->designUnitsPerEm * 7 / 10; } void opentype_get_font_properties(const void *os2, const void *head, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style)

1 0

Nikolay Sivov : dwrite/tests: Fix some test failures on older dwrite versions.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 298f08d602bf37e2e37f574fcfc96aa96f119990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298f08d602bf37e2e37f574fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 27 09:26:45 2014 +0300 dwrite/tests: Fix some test failures on older dwrite versions. --- dlls/dwrite/tests/font.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c14cf09..3276b6d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2433,8 +2433,9 @@ static void test_CreateStreamFromKey(void) hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream2); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(stream == stream2, "got %p, %p\n", stream, stream2); - EXPECT_REF(stream, 2); + ok(stream == stream2 || broken(stream != stream2) /* Win7 SP0 */, "got %p, %p\n", stream, stream2); + if (stream == stream2) + EXPECT_REF(stream, 2); IDWriteFontFileStream_Release(stream); IDWriteFontFileStream_Release(stream2);

1 0

Nikolay Sivov : dwrite: Use stream fragment context when reading font tables.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 31496c600d1963b1df827ed8362151942272d361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31496c600d1963b1df827ed83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 26 09:27:38 2014 +0300 dwrite: Use stream fragment context when reading font tables. --- dlls/dwrite/font.c | 38 ++------------------------------------ dlls/dwrite/tests/font.c | 2 -- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 76f3e3e..073f11a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -91,14 +91,6 @@ struct dwrite_font { struct dwrite_font_data *data; }; -#define DWRITE_FONTTABLE_MAGIC 0xededfafa - -struct dwrite_fonttablecontext { - UINT32 magic; - void *context; - UINT32 file_index; -}; - struct dwrite_fonttable { void *data; void *context; @@ -359,45 +351,19 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace2 *iface, UI const void **table_data, UINT32 *table_size, void **context, BOOL *exists) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - struct dwrite_fonttablecontext *tablecontext; - HRESULT hr = S_OK; - int i; TRACE("(%p)->(%u %p %p %p %p)\n", This, table_tag, table_data, table_size, context, exists); - tablecontext = heap_alloc(sizeof(struct dwrite_fonttablecontext)); - if (!tablecontext) - return E_OUTOFMEMORY; - tablecontext->magic = DWRITE_FONTTABLE_MAGIC; - - *exists = FALSE; - for (i = 0; i < This->file_count && !(*exists); i++) { - hr = opentype_get_font_table(This->streams[i], This->type, This->index, table_tag, table_data, &tablecontext->context, table_size, exists); - tablecontext->file_index = i; - } - if (FAILED(hr) && !*exists) - heap_free(tablecontext); - else - *context = (void*)tablecontext; - - return hr; + return opentype_get_font_table(This->streams[0], This->type, This->index, table_tag, table_data, context, table_size, exists); } static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace2 *iface, void *table_context) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - struct dwrite_fonttablecontext *tablecontext = (struct dwrite_fonttablecontext*)table_context; TRACE("(%p)->(%p)\n", This, table_context); - if (tablecontext->magic != DWRITE_FONTTABLE_MAGIC) - { - TRACE("Invalid table magic\n"); - return; - } - - IDWriteFontFileStream_ReleaseFileFragment(This->streams[tablecontext->file_index], tablecontext->context); - heap_free(tablecontext); + IDWriteFontFileStream_ReleaseFileFragment(This->streams[0], table_context); } static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace2 *iface, FLOAT emSize, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 221a5d3..c14cf09 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2324,7 +2324,6 @@ static void test_TryGetFontTable(void) hr = IDWriteFontFace_TryGetFontTable(fontface, MS_CMAP_TAG, &table, &size, &context, &exists); ok(hr == S_OK, "got 0x%08x\n",hr); ok(exists == TRUE, "got %d\n", exists); -todo_wine ok(context == NULL && table != NULL, "cmap: context %p, table %p\n", context, table); exists = FALSE; @@ -2333,7 +2332,6 @@ todo_wine hr = IDWriteFontFace_TryGetFontTable(fontface, MS_CMAP_TAG, &table2, &size, &context2, &exists); ok(hr == S_OK, "got 0x%08x\n",hr); ok(exists == TRUE, "got %d\n", exists); -todo_wine ok(context2 == context && table2 == table, "cmap: context2 %p, table2 %p\n", context2, table2); IDWriteFontFace_ReleaseFontTable(fontface, context2);

1 0

Hans Leidekker : msi: Update version resource.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: e3143f11056c056df1a2b105e62ffa1f3449cee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3143f11056c056df1a2b105e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 27 12:15:22 2014 +0100 msi: Update version resource. --- dlls/msi/msi.rc | 8 ++++---- programs/msiexec/rsrc.rc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index 24587e9..e52fac5 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -79,9 +79,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine MSI dll" #define WINE_FILENAME_STR "msi.dll" -#define WINE_FILEVERSION 4,5,6001,22299 -#define WINE_FILEVERSION_STR "4.5.6001.22299" -#define WINE_PRODUCTVERSION 4,5,6001,22299 -#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" +#define WINE_FILEVERSION 4,5,6001,22308 +#define WINE_FILEVERSION_STR "4.5.6001.22308" +#define WINE_PRODUCTVERSION 4,5,6001,22308 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22308" #include "wine/wine_common_ver.rc" diff --git a/programs/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc index b9994ef..91c3df8 100644 --- a/programs/msiexec/rsrc.rc +++ b/programs/msiexec/rsrc.rc @@ -21,10 +21,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" #define WINE_FILETYPE VFT_APP -#define WINE_FILEVERSION 4,5,6001,22299 -#define WINE_FILEVERSION_STR "4.5.6001.22299" -#define WINE_PRODUCTVERSION 4,5,6001,22299 -#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" +#define WINE_FILEVERSION 4,5,6001,22308 +#define WINE_FILEVERSION_STR "4.5.6001.22308" +#define WINE_PRODUCTVERSION 4,5,6001,22308 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22308" #define WINE_PRODUCTNAME_STR "Wine Installer" #include "wine/wine_common_ver.rc"

1 0

Michael Stefaniuc : cmd: Remove duplicated if-check (PVS-Studio).
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 232390e5b885756a9e53092145009a60d8d0dc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232390e5b885756a9e5309214… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 27 11:27:33 2014 +0100 cmd: Remove duplicated if-check (PVS-Studio). --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6751d3e..992ca5c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3112,7 +3112,7 @@ void WCMD_rename (void) if (dotDst && (*(dotDst+1)=='*')) { if (dotSrc) strcatW(dest, dotSrc); } else if (dotDst) { - if (dotDst) strcatW(dest, dotDst); + strcatW(dest, dotDst); } WINE_TRACE("Source '%s'\n", wine_dbgstr_w(src));

1 0

Nikolay Sivov : dwrite: Remove DLL_WINE_PREATTACH case, native module can' t be used.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: c5af130e92a1609550c5d1c91b331170e40542a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5af130e92a1609550c5d1c91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 26 12:21:26 2014 +0300 dwrite: Remove DLL_WINE_PREATTACH case, native module can't be used. --- dlls/dwrite/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 79aa7d0..ac7aff5 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -41,8 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); init_freetype();

1 0

Michael Stefaniuc : ieframe: IDC_ARROW is already an INTRESOURCE ( PVS-Studio).
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 908af25a6fa2d5941da1b7e9c190f7cecc50d303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908af25a6fa2d5941da1b7e9c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 27 11:29:40 2014 +0100 ieframe: IDC_ARROW is already an INTRESOURCE (PVS-Studio). --- dlls/ieframe/iexplore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 0bdb556..08bb167 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -707,7 +707,7 @@ void register_iewindow_class(void) wc.hIcon = LoadIconW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON)); wc.hIconSm = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); - wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDC_ARROW)); + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wc.hbrBackground = 0; wc.lpszClassName = szIEWinFrame; wc.lpszMenuName = NULL;

1 0

Nikolay Sivov : dwrite: Hide factory vtable selection in init helper.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: 4b38ced13c055514e1fbb785b91f9eaf3f4e2e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b38ced13c055514e1fbb785b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 26 12:23:46 2014 +0300 dwrite: Hide factory vtable selection in init helper. --- dlls/dwrite/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ac7aff5..82a28d7 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1067,9 +1067,9 @@ static const struct IDWriteFactoryVtbl shareddwritefactoryvtbl = { dwritefactory_CreateGlyphRunAnalysis }; -static void init_dwritefactory(struct dwritefactory *factory, const struct IDWriteFactoryVtbl *vtbl) +static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYPE type) { - factory->IDWriteFactory_iface.lpVtbl = vtbl; + factory->IDWriteFactory_iface.lpVtbl = type == DWRITE_FACTORY_TYPE_SHARED ? &shareddwritefactoryvtbl : &dwritefactoryvtbl; factory->ref = 1; factory->localfontfileloader = NULL; factory->system_collection = NULL; @@ -1099,7 +1099,7 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno factory = heap_alloc(sizeof(struct dwritefactory)); if (!factory) return E_OUTOFMEMORY; - init_dwritefactory(factory, type == DWRITE_FACTORY_TYPE_SHARED ? &shareddwritefactoryvtbl : &dwritefactoryvtbl); + init_dwritefactory(factory, type); if (type == DWRITE_FACTORY_TYPE_SHARED) if (InterlockedCompareExchangePointer((void**)&shared_factory, factory, NULL)) {

1 0

Stefan Dösinger : d3d8/tests: Call TestCooperativeLevel after Present.
by Alexandre Julliard Nov. 27, 2014

Nov. 27, 2014

Module: wine Branch: master Commit: d1bd7094715aaad6dc0ddf05006946fa14993b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1bd7094715aaad6dc0ddf050… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 26 19:08:55 2014 +0100 d3d8/tests: Call TestCooperativeLevel after Present. --- dlls/d3d8/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 99fe70a..6a4dcc2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6812,10 +6812,10 @@ static void test_lost_device(void) ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); - hr = IDirect3DDevice8_TestCooperativeLevel(device); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); ret = ShowWindow(window, SW_RESTORE); ok(ret, "Failed to restore window.\n");

1 0

Alexandre Julliard : d3d9/tests: Don't require a WM_MOVE message.
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 099bc21df7f53467664791203fd88487a89726b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099bc21df7f53467664791203… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 26 20:40:49 2014 +0100 d3d9/tests: Don't require a WM_MOVE message. --- dlls/d3d9/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 04bdf41..cd6a9bd 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3295,7 +3295,7 @@ static void test_wndproc(void) { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, - {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, + /* optional WM_MOVE here if size changed */ {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, {0, 0, FALSE, 0}, };

1 0

Austin English : ole2disp: Add a stub for VARIANTCHANGETYPE.
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 5df9286e193c2bb4cf94ce978542794d4a791092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df9286e193c2bb4cf94ce978… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 21 19:29:33 2014 -0600 ole2disp: Add a stub for VARIANTCHANGETYPE. --- dlls/ole2disp.dll16/ole2disp.c | 10 ++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 957d1bc..61a4043 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -214,6 +214,16 @@ int WINAPI SysStringLen16(BSTR16 str) } /****************************************************************************** + * VariantChangeType [OLE2DISP.12] + */ +HRESULT WINAPI VariantChangeType16(VARIANTARG *vargDest, VARIANTARG *varSrc, unsigned short flags, VARTYPE vt) +{ + FIXME("stub: (%p, %p, %d, %d)\n", vargDest, varSrc, flags, vt); + return E_NOTIMPL; +} + + +/****************************************************************************** * CreateDispTypeInfo [OLE2DISP.31] */ HRESULT WINAPI CreateDispTypeInfo16( diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 0bc4bae..c027d12 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -9,7 +9,7 @@ 9 stub VARIANTCLEAR 10 stub VARIANTCOPY 11 stub VARIANTCOPYIND -12 stub VARIANTCHANGETYPE +12 pascal VARIANTCHANGETYPE(ptr ptr long long) VariantChangeType16 13 stub VARIANTTIMETODOSDATETIME 14 stub DOSDATETIMETOVARIANTTIME 15 stub SAFEARRAYCREATE

1 0

Austin English : cryptext: Add stubs for CryptExtAddPFX/CryptExtAddPFXW.
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: ca1bf14aaf5c076a7629e9565d20c1b26f8abc3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1bf14aaf5c076a7629e9565… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 21 15:17:36 2014 -0800 cryptext: Add stubs for CryptExtAddPFX/CryptExtAddPFXW. --- dlls/cryptext/cryptext.spec | 4 ++-- dlls/cryptext/cryptext_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/cryptext/cryptext.spec b/dlls/cryptext/cryptext.spec index b0e920e..0dba38e 100644 --- a/dlls/cryptext/cryptext.spec +++ b/dlls/cryptext/cryptext.spec @@ -6,8 +6,8 @@ @ stub CryptExtAddCTLW @ stub CryptExtAddP7R @ stub CryptExtAddP7RW -@ stub CryptExtAddPFX -@ stub CryptExtAddPFXW +@ stdcall CryptExtAddPFX(str) +@ stdcall CryptExtAddPFXW(wstr) @ stub CryptExtAddSPC @ stub CryptExtAddSPCW @ stub CryptExtOpenCAT diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c index 75ede4e..473c326 100644 --- a/dlls/cryptext/cryptext_main.c +++ b/dlls/cryptext/cryptext_main.c @@ -43,3 +43,21 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +/*********************************************************************** + * CryptExtAddPFX (CRYPTEXT.@) + */ +HRESULT WINAPI CryptExtAddPFX(LPCSTR filename) +{ + FIXME("stub: %s\n", debugstr_a(filename)); + return E_NOTIMPL; +} + +/*********************************************************************** + * CryptExtAddPFXW (CRYPTEXT.@) + */ +HRESULT WINAPI CryptExtAddPFXW(LPCWSTR filename) +{ + FIXME("stub: %s\n", debugstr_w(filename)); + return E_NOTIMPL; +}

1 0

Jacek Caban : mshtml: Added fontname command support to execCommand.
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: c910c8ceeddf7723873b42dc0004f502b5d37622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c910c8ceeddf7723873b42dc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 26 14:55:45 2014 +0100 mshtml: Added fontname command support to execCommand. --- dlls/mshtml/htmldoc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c760c36..edc91e6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1096,6 +1096,8 @@ static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface) return S_OK; } +static const WCHAR fontnameW[] = + {'f','o','n','t','n','a','m','e',0}; static const WCHAR insertorderedlistW[] = {'i','n','s','e','r','t','o','r','d','e','r','e','d','l','i','s','t',0}; static const WCHAR insertunorderedlistW[] = @@ -1109,6 +1111,7 @@ static const struct { const WCHAR *name; OLECMDID id; }command_names[] = { + {fontnameW, IDM_FONTNAME}, {insertorderedlistW, IDM_ORDERLIST}, {insertunorderedlistW, IDM_UNORDERLIST}, {outdentW, IDM_OUTDENT},

1 0

Michael Stefaniuc : comdlg32: Remove an always true if check (PVS-Studio).
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 0867e7fe785841f7e3ddb3d95f82eac74ce2979e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0867e7fe785841f7e3ddb3d95… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 26 12:08:37 2014 +0100 comdlg32: Remove an always true if check (PVS-Studio). --- dlls/comdlg32/filedlg.c | 64 ++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2738467..e0939ef 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1586,39 +1586,37 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* 2. (All platforms) If initdir is not null, then use it */ if (!handledPath && fodInfos->initdir && *fodInfos->initdir) { - /* Work out the proper path as supplied one might be relative */ - /* (Here because supplying '.' as dir browses to My Computer) */ - if (!handledPath) { - WCHAR tmpBuf[MAX_PATH]; - WCHAR tmpBuf2[MAX_PATH]; - WCHAR *nameBit; - DWORD result; - - lstrcpyW(tmpBuf, fodInfos->initdir); - if( PathFileExistsW(tmpBuf) ) { - /* initdir does not have to be a directory. If a file is - * specified, the dir part is taken */ - if( PathIsDirectoryW(tmpBuf)) { - PathAddBackslashW( tmpBuf ); - lstrcatW(tmpBuf, szwStar); - } - result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); - if (result) { - *nameBit = 0x00; - MemFree(fodInfos->initdir); - fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf2) + 1)*sizeof(WCHAR)); - lstrcpyW(fodInfos->initdir, tmpBuf2); - handledPath = TRUE; - TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir)); - } - } - else if (fodInfos->initdir) - { - MemFree(fodInfos->initdir); - fodInfos->initdir = NULL; - TRACE("Value in InitDir is not an existing path, changed to (nil)\n"); - } - } + /* Work out the proper path as supplied one might be relative */ + /* (Here because supplying '.' as dir browses to My Computer) */ + WCHAR tmpBuf[MAX_PATH]; + WCHAR tmpBuf2[MAX_PATH]; + WCHAR *nameBit; + DWORD result; + + lstrcpyW(tmpBuf, fodInfos->initdir); + if (PathFileExistsW(tmpBuf)) { + /* initdir does not have to be a directory. If a file is + * specified, the dir part is taken */ + if (PathIsDirectoryW(tmpBuf)) { + PathAddBackslashW(tmpBuf); + lstrcatW(tmpBuf, szwStar); + } + result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); + if (result) { + *nameBit = 0x00; + MemFree(fodInfos->initdir); + fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf2) + 1) * sizeof(WCHAR)); + lstrcpyW(fodInfos->initdir, tmpBuf2); + handledPath = TRUE; + TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir)); + } + } + else if (fodInfos->initdir) + { + MemFree(fodInfos->initdir); + fodInfos->initdir = NULL; + TRACE("Value in InitDir is not an existing path, changed to (nil)\n"); + } } if (!handledPath && (!fodInfos->initdir || !*fodInfos->initdir))

1 0

Nikolay Sivov : dwrite: Use file mapping for local file stream.
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 416527a6adb62ff446960226a9e4127d5e1ffcfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=416527a6adb62ff446960226a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 26 08:59:04 2014 +0300 dwrite: Use file mapping for local file stream. --- dlls/dwrite/font.c | 58 +++++++++++++++++++++++++----------------------- dlls/dwrite/tests/font.c | 16 ++++++++----- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index cef4a27..76f3e3e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2042,7 +2042,8 @@ struct dwrite_localfontfilestream LONG ref; struct local_cached_stream *entry; - HANDLE handle; + const void *file_ptr; + UINT64 size; }; struct dwrite_localfontfileloader { @@ -2100,8 +2101,7 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - if (This->handle != INVALID_HANDLE_VALUE) - CloseHandle(This->handle); + UnmapViewOfFile(This->file_ptr); release_cached_stream(This->entry); heap_free(This); } @@ -2112,26 +2112,18 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream *iface, void const **fragment_start, UINT64 offset, UINT64 fragment_size, void **fragment_context) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - LARGE_INTEGER distance; - DWORD bytes = fragment_size; - DWORD read; TRACE("(%p)->(%p, %s, %s, %p)\n",This, fragment_start, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(fragment_size), fragment_context); *fragment_context = NULL; - distance.QuadPart = offset; - if (!SetFilePointerEx(This->handle, distance, NULL, FILE_BEGIN)) - return E_FAIL; - *fragment_start = *fragment_context = heap_alloc(bytes); - if (!*fragment_context) - return E_FAIL; - if (!ReadFile(This->handle, *fragment_context, bytes, &read, NULL)) - { - heap_free(*fragment_context); + + if ((offset >= This->size - 1) || (fragment_size > This->size - offset)) { + *fragment_start = NULL; return E_FAIL; } + *fragment_start = (char*)This->file_ptr + offset; return S_OK; } @@ -2139,16 +2131,13 @@ static void WINAPI localfontfilestream_ReleaseFileFragment(IDWriteFontFileStream { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); TRACE("(%p)->(%p)\n", This, fragment_context); - heap_free(fragment_context); } static HRESULT WINAPI localfontfilestream_GetFileSize(IDWriteFontFileStream *iface, UINT64 *size) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - LARGE_INTEGER li; - TRACE("(%p)->(%p)\n",This, size); - GetFileSizeEx(This->handle, &li); - *size = li.QuadPart; + TRACE("(%p)->(%p)\n", This, size); + *size = This->size; return S_OK; } @@ -2177,15 +2166,17 @@ static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl = localfontfilestream_GetLastWriteTime }; -static HRESULT create_localfontfilestream(HANDLE handle, struct local_cached_stream *entry, IDWriteFontFileStream** iface) +static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, struct local_cached_stream *entry, IDWriteFontFileStream** iface) { struct dwrite_localfontfilestream *This = heap_alloc(sizeof(struct dwrite_localfontfilestream)); if (!This) return E_OUTOFMEMORY; - This->ref = 1; - This->handle = handle; This->IDWriteFontFileStream_iface.lpVtbl = &localfontfilestreamvtbl; + This->ref = 1; + + This->file_ptr = file_ptr; + This->size = size; This->entry = entry; *iface = &This->IDWriteFontFileStream_iface; @@ -2244,11 +2235,12 @@ static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFi const struct local_refkey *refkey = key; struct local_cached_stream *stream; IDWriteFontFileStream *filestream; - HANDLE handle; + HANDLE file, mapping; + LARGE_INTEGER size; + void *file_ptr; HRESULT hr; TRACE("(%p)->(%p, %i, %p)\n", This, key, key_size, ret); - TRACE("name: %s\n", debugstr_w(refkey->name)); /* search cache first */ @@ -2262,18 +2254,27 @@ static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFi *ret = NULL; - handle = CreateFileW(refkey->name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + file = CreateFileW(refkey->name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return E_FAIL; - if (handle == INVALID_HANDLE_VALUE) + GetFileSizeEx(file, &size); + mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(file); + if (!mapping) return E_FAIL; + file_ptr = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + CloseHandle(mapping); + stream = heap_alloc(sizeof(*stream)); if (!stream) return E_OUTOFMEMORY; stream->key = heap_alloc(key_size); if (!stream->key) { + UnmapViewOfFile(file_ptr); heap_free(stream); return E_OUTOFMEMORY; } @@ -2281,8 +2282,9 @@ static HRESULT WINAPI localfontfileloader_CreateStreamFromKey(IDWriteLocalFontFi stream->key_size = key_size; memcpy(stream->key, key, key_size); - hr = create_localfontfilestream(handle, stream, &filestream); + hr = create_localfontfilestream(file_ptr, size.QuadPart, stream, &filestream); if (FAILED(hr)) { + UnmapViewOfFile(file_ptr); heap_free(stream->key); heap_free(stream); return hr; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8143120..221a5d3 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2497,16 +2497,14 @@ static void test_ReadFileFragment(void) fragment = (void*)0xdeadbeef; context = (void*)0xdeadbeef; hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize+1, &context); -todo_wine { ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(context == NULL, "got %p\n", context); ok(fragment == NULL, "got %p\n", fragment); -} + fragment = (void*)0xdeadbeef; context = (void*)0xdeadbeef; hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize, &context); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(context == NULL, "got %p\n", context); ok(fragment != NULL, "got %p\n", fragment); @@ -2514,13 +2512,21 @@ todo_wine context2 = (void*)0xdeadbeef; hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment2, 0, filesize, &context2); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(context2 == NULL, "got %p\n", context2); ok(fragment == fragment2, "got %p, %p\n", fragment, fragment2); -} + IDWriteFontFileStream_ReleaseFileFragment(stream, context); IDWriteFontFileStream_ReleaseFileFragment(stream, context2); + /* fragment is released, try again */ + fragment = (void*)0xdeadbeef; + context = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize, &context); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(context == NULL, "got %p\n", context); + ok(fragment == fragment2, "got %p, %p\n", fragment, fragment2); + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + IDWriteFontFileStream_Release(stream); IDWriteLocalFontFileLoader_Release(localloader); IDWriteFactory_Release(factory);

1 0

Michael Stefaniuc : msi/tests: Remove redundant if check (PVS-Studio).
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: f52983807e3d9756742a136cd36d50fa7268aa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52983807e3d9756742a136cd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 26 12:08:19 2014 +0100 msi/tests: Remove redundant if check (PVS-Studio). --- dlls/msi/tests/automation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index beed6fd..016b1a2 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1935,7 +1935,7 @@ static void test_Session(IDispatch *pSession) hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); - if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); + ok_exception(hr, szModeFlag); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); @@ -1943,7 +1943,7 @@ static void test_Session(IDispatch *pSession) hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); - if (hr == DISP_E_EXCEPTION) ok_exception(hr, szModeFlag); + ok_exception(hr, szModeFlag); hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE); ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr);

1 0

Nikolay Sivov : gdi32: Clarify read length values used with get_font_data( ).
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 0c507a17688719299ff2fe4962b41f5ad5a4a3fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c507a17688719299ff2fe496… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 25 22:08:22 2014 +0300 gdi32: Clarify read length values used with get_font_data(). --- dlls/gdi32/freetype.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b063c80..f1af5d6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4456,7 +4456,7 @@ typedef struct { static LONG load_VDMX(GdiFont *font, LONG height) { - WORD hdr[3], tmp; + WORD hdr[3]; VDMX_group group; BYTE devXRatio, devYRatio; USHORT numRecs, numRatios; @@ -4464,7 +4464,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) LONG ppem = 0; int i; - result = get_font_data(font, MS_VDMX_TAG, 0, hdr, 6); + result = get_font_data(font, MS_VDMX_TAG, 0, hdr, sizeof(hdr)); if(result == GDI_ERROR) /* no vdmx table present, use linear scaling */ return ppem; @@ -4495,8 +4495,10 @@ static LONG load_VDMX(GdiFont *font, LONG height) devYRatio >= ratio.yStartRatio && devYRatio <= ratio.yEndRatio)) { + WORD tmp; + offset = (3 * 2) + (numRatios * 4) + (i * 2); - get_font_data(font, MS_VDMX_TAG, offset, &tmp, 2); + get_font_data(font, MS_VDMX_TAG, offset, &tmp, sizeof(tmp)); offset = GET_BE_WORD(tmp); break; } @@ -4504,7 +4506,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) if(offset == -1) return 0; - if(get_font_data(font, MS_VDMX_TAG, offset, &group, 4) != GDI_ERROR) { + if(get_font_data(font, MS_VDMX_TAG, offset, &group, sizeof(group)) != GDI_ERROR) { USHORT recs; BYTE startsz, endsz; WORD *vTable;

1 0

Michael Stefaniuc : shlwapi: Remove always true if-check (PVS-Studio).
by Alexandre Julliard Nov. 26, 2014

Nov. 26, 2014

Module: wine Branch: master Commit: 6ae26c7b53bf3ccd039f6976427fbe0f5bb3a7db URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae26c7b53bf3ccd039f69764… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 26 12:08:26 2014 +0100 shlwapi: Remove always true if-check (PVS-Studio). --- dlls/shlwapi/ordinal.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8d3f1eb..0ea235c 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -5054,11 +5054,8 @@ INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, { if ((fmt_flags & FDTF_LONGDATE) && (ret < size + 2)) { - if (ret < size + 2) - { - lstrcatW(&buf[ret-1], sep1); - ret += 2; - } + lstrcatW(&buf[ret-1], sep1); + ret += 2; } else {

1 0