wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

Alistair Leslie-Hughes : oledb32: Convert to a BSTR to work out it size.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 9c70026092f49872ee3d6f3a71df45f28cf2bed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c70026092f49872ee3d6f3a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 22 21:09:45 2015 +1100 oledb32: Convert to a BSTR to work out it size. This makes code for handling variants with DBTYPE_STR and DBTYPE_WSTR types consistent. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 72714d3..891b31c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1372,10 +1372,16 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, switch (src_type) { case DBTYPE_VARIANT: - if(V_VT((VARIANT*)src) == VT_BSTR) - *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR); - else - WARN("DBTYPE_VARIANT(%d)->DBTYPE_WSTR unimplemented\n", V_VT((VARIANT*)src)); + { + VARIANT v; + + VariantInit(&v); + if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + { + *dst_len = (SysStringLen(V_BSTR(&v))+1) * sizeof(WCHAR); + VariantClear(&v); + } + } break; case DBTYPE_STR: if(src_len)

1 0

Michael Stefaniuc : dsound: Use a better name for IDirectSoundBufferImpl_Create().
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: bb72548f3870b1df03ad9fe7ad2e543a69d5d574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb72548f3870b1df03ad9fe7a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 22 10:50:34 2015 +0100 dsound: Use a better name for IDirectSoundBufferImpl_Create(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 24 +++++++++--------------- dlls/dsound/dsound.c | 7 ++----- dlls/dsound/dsound_private.h | 6 ++---- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index d7717fd..2a80c3f 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -983,19 +983,15 @@ static const IDirectSoundBuffer8Vtbl dsbvt = IDirectSoundBufferImpl_GetObjectInPath }; -HRESULT IDirectSoundBufferImpl_Create( - DirectSoundDevice * device, - IDirectSoundBufferImpl **pdsb, - LPCDSBUFFERDESC dsbd) +HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, + IDirectSoundBuffer **buffer) { IDirectSoundBufferImpl *dsb; LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; - TRACE("(%p,%p,%p)\n",device,pdsb,dsbd); - - *pdsb = NULL; + TRACE("(%p,%p,%p)\n", device, dsbd, buffer); if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) { WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes); @@ -1107,14 +1103,12 @@ HRESULT IDirectSoundBufferImpl_Create( RtlInitializeResource(&dsb->lock); - /* register buffer if not primary */ - if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { - err = DirectSoundDevice_AddBuffer(device, dsb); - if (err == DS_OK) - *pdsb = dsb; - else - IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); - } + /* register buffer */ + err = DirectSoundDevice_AddBuffer(device, dsb); + if (err == DS_OK) + *buffer = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; + else + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return err; } diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index e50ef58..ccefd1f 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -469,8 +469,6 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( WARN("primarybuffer_create() failed\n"); } } else { - IDirectSoundBufferImpl * dsb; - if (dsbd->lpwfxFormat == NULL) { WARN("invalid parameter: dsbd->lpwfxFormat can't be NULL for " "secondary buffer\n"); @@ -547,9 +545,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } - hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); - if (dsb) { - *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; + hres = secondarybuffer_create(device, dsbd, ppdsb); + if (SUCCEEDED(hres)) { if (dsbd->dwFlags & DSBCAPS_LOCHARDWARE) device->drvcaps.dwFreeHwMixingAllBuffers--; } else diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 9c001ed..07bda48 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -182,10 +182,8 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -HRESULT IDirectSoundBufferImpl_Create( - DirectSoundDevice *device, - IDirectSoundBufferImpl **ppdsb, - LPCDSBUFFERDESC dsbd) DECLSPEC_HIDDEN; +HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, + IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb,

1 0

Michael Stefaniuc : dsound: Simplify error handling when creating a sound buffer.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: d51d55bab8995f94dcc78ce8418a4149836c27b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51d55bab8995f94dcc78ce84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 22 10:49:10 2015 +0100 dsound: Simplify error handling when creating a sound buffer. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5aa2834..d7717fd 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -992,29 +992,28 @@ HRESULT IDirectSoundBufferImpl_Create( LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; + TRACE("(%p,%p,%p)\n",device,pdsb,dsbd); + *pdsb = NULL; + if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) { WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes); - *pdsb = NULL; return DSERR_INVALIDPARAM; /* FIXME: which error? */ } dsb = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*dsb)); - if (dsb == 0) { - WARN("out of memory\n"); - *pdsb = NULL; + if (!dsb) return DSERR_OUTOFMEMORY; - } TRACE("Created buffer at %p\n", dsb); - dsb->ref = 0; + dsb->ref = 1; dsb->refn = 0; dsb->ref3D = 0; dsb->refiks = 0; - dsb->numIfaces = 0; + dsb->numIfaces = 1; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = &dsbvt; dsb->IDirectSoundNotify_iface.lpVtbl = &dsnvt; @@ -1025,9 +1024,8 @@ HRESULT IDirectSoundBufferImpl_Create( CopyMemory(&dsb->dsbd, dsbd, dsbd->dwSize); dsb->pwfx = DSOUND_CopyFormat(wfex); - if (dsb->pwfx == NULL) { - HeapFree(GetProcessHeap(),0,dsb); - *pdsb = NULL; + if (!dsb->pwfx) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } @@ -1052,22 +1050,16 @@ HRESULT IDirectSoundBufferImpl_Create( /* Allocate an empty buffer */ dsb->buffer = HeapAlloc(GetProcessHeap(),0,sizeof(*(dsb->buffer))); - if (dsb->buffer == NULL) { - WARN("out of memory\n"); - HeapFree(GetProcessHeap(),0,dsb->pwfx); - HeapFree(GetProcessHeap(),0,dsb); - *pdsb = NULL; + if (!dsb->buffer) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } /* Allocate system memory for buffer */ dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen); - if (dsb->buffer->memory == NULL) { + if (!dsb->buffer->memory) { WARN("out of memory\n"); - HeapFree(GetProcessHeap(),0,dsb->pwfx); - HeapFree(GetProcessHeap(),0,dsb->buffer); - HeapFree(GetProcessHeap(),0,dsb); - *pdsb = NULL; + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } @@ -1118,18 +1110,12 @@ HRESULT IDirectSoundBufferImpl_Create( /* register buffer if not primary */ if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { err = DirectSoundDevice_AddBuffer(device, dsb); - if (err != DS_OK) { - HeapFree(GetProcessHeap(),0,dsb->buffer->memory); - HeapFree(GetProcessHeap(),0,dsb->buffer); - RtlDeleteResource(&dsb->lock); - HeapFree(GetProcessHeap(),0,dsb->pwfx); - HeapFree(GetProcessHeap(),0,dsb); - dsb = NULL; - } + if (err == DS_OK) + *pdsb = dsb; + else + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); } - IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface); - *pdsb = dsb; return err; }

1 0

Austin English : tdi.sys: Add a stub dll.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 7eec8cb4a660508edef376390d374b5e4755176e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eec8cb4a660508edef376390… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 21 20:41:46 2015 -0600 tdi.sys: Add a stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/tdi.sys/Makefile.in | 5 +++++ dlls/tdi.sys/main.c | 38 ++++++++++++++++++++++++++++++++ dlls/tdi.sys/tdi.sys.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 ++ 6 files changed, 104 insertions(+) diff --git a/configure b/configure index 0db4d30..8fe1910 100755 --- a/configure +++ b/configure @@ -1312,6 +1312,7 @@ enable_sxs enable_t2embed enable_tapi32 enable_taskschd +enable_tdi_sys enable_traffic enable_twain_32 enable_ucrtbase @@ -17884,6 +17885,7 @@ wine_fn_config_dll t2embed enable_t2embed wine_fn_config_dll tapi32 enable_tapi32 implib wine_fn_config_dll taskschd enable_taskschd clean wine_fn_config_test dlls/taskschd/tests taskschd_test +wine_fn_config_dll tdi.sys enable_tdi_sys wine_fn_config_dll toolhelp.dll16 enable_win16 wine_fn_config_dll traffic enable_traffic wine_fn_config_dll twain.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 86f12c5..ffeecf4 100644 --- a/configure.ac +++ b/configure.ac @@ -3224,6 +3224,7 @@ WINE_CONFIG_DLL(t2embed) WINE_CONFIG_DLL(tapi32,,[implib]) WINE_CONFIG_DLL(taskschd,,[clean]) WINE_CONFIG_TEST(dlls/taskschd/tests) +WINE_CONFIG_DLL(tdi.sys) WINE_CONFIG_DLL(toolhelp.dll16,enable_win16) WINE_CONFIG_DLL(traffic) WINE_CONFIG_DLL(twain.dll16,enable_win16) diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in new file mode 100644 index 0000000..1b5f5f3 --- /dev/null +++ b/dlls/tdi.sys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = tdi.sys +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + main.c diff --git a/dlls/tdi.sys/main.c b/dlls/tdi.sys/main.c new file mode 100644 index 0000000..d9fbcb1 --- /dev/null +++ b/dlls/tdi.sys/main.c @@ -0,0 +1,38 @@ +/* + * tdi.sys + * + * Copyright 2015 Austin English + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(tdi); + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + + return STATUS_SUCCESS; +} diff --git a/dlls/tdi.sys/tdi.sys.spec b/dlls/tdi.sys/tdi.sys.spec new file mode 100644 index 0000000..9e3d2e4 --- /dev/null +++ b/dlls/tdi.sys/tdi.sys.spec @@ -0,0 +1,56 @@ +@ stub CTEAllocateString +@ stub CTEBlock +@ stub CTEBlockWithTracker +@ stub CTEInitEvent +@ stub CTEInitString +@ stub CTEInitTimer +@ stub CTEInitialize +@ stub CTEInsertBlockTracker +@ stub CTELogEvent +@ stub CTERemoveBlockTracker +@ stub CTEScheduleCriticalEvent +@ stub CTEScheduleDelayedEvent +@ stub CTEScheduleEvent +@ stub CTESignal +@ stub CTEStartTimer +@ stub CTESystemUpTime +@ stub DllInitialize +@ stub DllUnload +@ stub TdiBuildNetbiosAddress +@ stub TdiBuildNetbiosAddressEa +@ stub TdiCopyBufferToMdl +@ stub TdiCopyBufferToMdlWithReservedMappingAtDpcLevel +@ stub TdiCopyMdlChainToMdlChain +@ stub TdiCopyMdlToBuffer +@ stub TdiDefaultChainedRcvDatagramHandler +@ stub TdiDefaultChainedRcvExpeditedHandler +@ stub TdiDefaultChainedReceiveHandler +@ stub TdiDefaultConnectHandler +@ stub TdiDefaultDisconnectHandler +@ stub TdiDefaultErrorHandler +@ stub TdiDefaultRcvDatagramHandler +@ stub TdiDefaultRcvExpeditedHandler +@ stub TdiDefaultReceiveHandler +@ stub TdiDefaultSendPossibleHandler +@ stub TdiDeregisterAddressChangeHandler +@ stub TdiDeregisterDeviceObject +@ stub TdiDeregisterNetAddress +@ stub TdiDeregisterNotificationHandler +@ stub TdiDeregisterPnPHandlers +@ stub TdiDeregisterProvider +@ stub TdiEnumerateAddresses +@ stub TdiGet9FTriageBlock +@ stub TdiInitialize +@ stub TdiMapUserRequest +@ stub TdiMatchPdoWithChainedReceiveContext +@ stub TdiOpenNetbiosAddress +@ stub TdiPnPPowerComplete +@ stub TdiPnPPowerRequest +@ stub TdiProviderReady +@ stub TdiRegisterAddressChangeHandler +@ stub TdiRegisterDeviceObject +@ stub TdiRegisterNetAddress +@ stub TdiRegisterNotificationHandler +@ stub TdiRegisterPnPHandlers +@ stub TdiRegisterProvider +@ stub TdiReturnChainedReceives diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7c0ad09..fb2583d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2514,6 +2514,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,fltmgr.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- +12,,tdi.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2555,6 +2556,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,fltmgr.sys 12,,mountmgr.sys 12,,ndis.sys +12,,tdi.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,-

1 0

Austin English : setupx.dll16: Add DiBuildDriverIndex stub.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 296ac8cf320336353fc5f5da3897c808a65556e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=296ac8cf320336353fc5f5da3… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 11:48:35 2015 -0600 setupx.dll16: Add DiBuildDriverIndex stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupx.dll16/setupx.dll16.spec | 2 +- dlls/setupx.dll16/setupx_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/setupx.dll16/setupx.dll16.spec b/dlls/setupx.dll16/setupx.dll16.spec index 615e92f..34e6b68 100644 --- a/dlls/setupx.dll16/setupx.dll16.spec +++ b/dlls/setupx.dll16/setupx.dll16.spec @@ -205,7 +205,7 @@ 409 stub IPGETDRIVERVERSION 410 stub IpGetVersionString #(str str ptr word str) 411 pascal VcpExplain(ptr long) VcpExplain16 -412 stub DiBuildDriverIndex #(word) +412 pascal DiBuildDriverIndex(word) DiBuildDriverIndex16 413 stub DiAddSingleInfToDrvIdx #(str word word) 414 stub FCEGETFLAGS 450 stub UiMakeDlgNonBold #(word) diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index adc5900..db15cfe 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -628,3 +628,12 @@ RETERR16 WINAPI CtlSetLddPath16(LOGDISKID16 ldid, LPSTR szPath) ldd.pszPath = szPath; return CtlSetLdd16(&ldd); } + +/*********************************************************************** + * DiBuildDriverIndex (SETUPX.412) + */ +RETERR16 WINAPI DiBuildDriverIndex16( WORD w1 ) +{ + FIXME( "%x: stub\n", w1 ); + return 0; +}

1 0

Austin English : iexplore: Sync registry and program resource values.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: bda46cc6fd5fa0f3c9db947108b685533662037a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda46cc6fd5fa0f3c9db94710… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 8 17:05:28 2015 -0600 iexplore: Sync registry and program resource values. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/iexplore.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc index cd75781..3d6d50f 100644 --- a/programs/iexplore/iexplore.rc +++ b/programs/iexplore/iexplore.rc @@ -18,10 +18,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Internet Explorer" #define WINE_FILENAME_STR "iexplore.exe" -#define WINE_FILEVERSION 6,0,2900,2180 -#define WINE_FILEVERSION_STR "6.0.2900.2180" -#define WINE_PRODUCTVERSION 6,0,2900,2180 -#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" +#define WINE_FILEVERSION 9,0,8112,16421 +#define WINE_FILEVERSION_STR "9.0.8112.16421" +#define WINE_PRODUCTVERSION 9,0,8112,16421 +#define WINE_PRODUCTVERSION_STR "9.0.8112.16421" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : comdlg32/fontdlg: Remove dead assignment (Coverity).
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 1a7121b3275fd549fd964dcfe4a8638cb5e03549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7121b3275fd549fd964dcfe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:33 2015 +0300 comdlg32/fontdlg: Remove dead assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 37c82db..344a356 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1011,7 +1011,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO /* face name */ i=SendDlgItemMessageW(hDlg,cmb1,CB_GETCURSEL,0,0); if (i==CB_ERR) - i=GetDlgItemTextW( hDlg, cmb1, str, 256 ); + GetDlgItemTextW( hDlg, cmb1, str, sizeof(str)/sizeof(str[0]) ); else { SendDlgItemMessageW(hDlg,cmb1,CB_GETLBTEXT,i,

1 0

Nikolay Sivov : comdlg32/fontdlg: Fix string format for sizes added to listbox.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 9f5260300d382d9112409a3103cf351a5d72ad5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5260300d382d9112409a310… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:32 2015 +0300 comdlg32/fontdlg: Fix string format for sizes added to listbox. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 245f150..37c82db 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -51,6 +51,7 @@ static const WCHAR strWineFontData[] = {'_','_','W','I','N','E','_','F','O','N', static const WCHAR strWineFontData_a[] = {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A','_','A',0}; static const WCHAR chooseFontW[] = {'C','H','O','O','S','E','_','F','O','N','T',0}; +static const WCHAR fontsizefmtW[] = {'%','d',0}; /* image list with TrueType bitmaps and more */ static HIMAGELIST himlTT = 0; @@ -417,16 +418,15 @@ static BOOL AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf) { int j; WCHAR buffer[20]; - static const WCHAR strFormat[] = {'%','2','d',0}; if ( (!(lpcf->Flags & CF_LIMITSIZE)) || ((lpcf->Flags & CF_LIMITSIZE) && (h >= lpcf->nSizeMin) && (h <= lpcf->nSizeMax))) { - wsprintfW(buffer, strFormat, h); + sprintfW(buffer, fontsizefmtW, h); j=SendMessageW(hwnd, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer); if (j==CB_ERR) { - j=SendMessageW(hwnd, CB_ADDSTRING, 0, (LPARAM)buffer); + j=SendMessageW(hwnd, CB_INSERTSTRING, -1, (LPARAM)buffer); if (j!=CB_ERR) j = SendMessageW(hwnd, CB_SETITEMDATA, j, h); if (j==CB_ERR) return TRUE; } @@ -534,7 +534,6 @@ static INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW * static void CFn_FitFontSize( HWND hDlg, int points) { - static const WCHAR fmtW[] = {'%','d',0}; WCHAR buffW[16]; int i,n; @@ -554,7 +553,7 @@ static void CFn_FitFontSize( HWND hDlg, int points) } /* no default matching size, set text manually */ - sprintfW(buffW, fmtW, points); + sprintfW(buffW, fontsizefmtW, points); SetDlgItemTextW(hDlg, cmb3, buffW); }

1 0

Nikolay Sivov : comdlg32/fontdlg: Allow font sizes outside of defaults set.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: daaa083404a48acd55d1499d0ef6f024fd9a373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=daaa083404a48acd55d1499d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:31 2015 +0300 comdlg32/fontdlg: Allow font sizes outside of defaults set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/comdlg32.rc | 1 + dlls/comdlg32/fontdlg.c | 75 ++++++++++++---- po/ar.po | 222 +++++++++++++++++++++++----------------------- po/bg.po | 222 +++++++++++++++++++++++----------------------- po/ca.po | 222 +++++++++++++++++++++++----------------------- po/cs.po | 222 +++++++++++++++++++++++----------------------- po/da.po | 222 +++++++++++++++++++++++----------------------- po/de.po | 222 +++++++++++++++++++++++----------------------- po/el.po | 222 +++++++++++++++++++++++----------------------- po/en.po | 222 +++++++++++++++++++++++----------------------- po/en_US.po | 222 +++++++++++++++++++++++----------------------- po/eo.po | 222 +++++++++++++++++++++++----------------------- po/es.po | 222 +++++++++++++++++++++++----------------------- po/fa.po | 222 +++++++++++++++++++++++----------------------- po/fi.po | 222 +++++++++++++++++++++++----------------------- po/fr.po | 222 +++++++++++++++++++++++----------------------- po/he.po | 222 +++++++++++++++++++++++----------------------- po/hi.po | 222 +++++++++++++++++++++++----------------------- po/hr.po | 222 +++++++++++++++++++++++----------------------- po/hu.po | 222 +++++++++++++++++++++++----------------------- po/it.po | 222 +++++++++++++++++++++++----------------------- po/ja.po | 222 +++++++++++++++++++++++----------------------- po/ko.po | 222 +++++++++++++++++++++++----------------------- po/lt.po | 222 +++++++++++++++++++++++----------------------- po/ml.po | 222 +++++++++++++++++++++++----------------------- po/nb_NO.po | 222 +++++++++++++++++++++++----------------------- po/nl.po | 222 +++++++++++++++++++++++----------------------- po/or.po | 222 +++++++++++++++++++++++----------------------- po/pa.po | 222 +++++++++++++++++++++++----------------------- po/pl.po | 222 +++++++++++++++++++++++----------------------- po/pt_BR.po | 222 +++++++++++++++++++++++----------------------- po/pt_PT.po | 222 +++++++++++++++++++++++----------------------- po/rm.po | 222 +++++++++++++++++++++++----------------------- po/ro.po | 222 +++++++++++++++++++++++----------------------- po/ru.po | 222 +++++++++++++++++++++++----------------------- po/sk.po | 222 +++++++++++++++++++++++----------------------- po/sl.po | 222 +++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 222 +++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 222 +++++++++++++++++++++++----------------------- po/sv.po | 222 +++++++++++++++++++++++----------------------- po/te.po | 222 +++++++++++++++++++++++----------------------- po/th.po | 222 +++++++++++++++++++++++----------------------- po/tr.po | 222 +++++++++++++++++++++++----------------------- po/uk.po | 222 +++++++++++++++++++++++----------------------- po/wa.po | 222 +++++++++++++++++++++++----------------------- po/wine.pot | 222 +++++++++++++++++++++++----------------------- po/zh_CN.po | 222 +++++++++++++++++++++++----------------------- po/zh_TW.po | 222 +++++++++++++++++++++++----------------------- 49 files changed, 5259 insertions(+), 5030 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=daaa083404a48acd55d14…

1 0

Nikolay Sivov : comdlg32/fontdlg: Limit text length user can type in as font point size.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: a48d96843cfbf0debae54df686fec913d82b0374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48d96843cfbf0debae54df68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:30 2015 +0300 comdlg32/fontdlg: Limit text length user can type in as font point size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 9e73ec9..8ba9c1e 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -753,6 +753,9 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE), (LPARAM)GetDlgItem(hDlg,cmb5)); } + /* limit text length user can type in as font size */ + SendDlgItemMessageW(hDlg, cmb3, CB_LIMITTEXT, 5, 0); + if ((lpcf->Flags & CF_USESTYLE) && lpcf->lpszStyle) { j=SendDlgItemMessageW(hDlg,cmb2,CB_FINDSTRING,-1,(LPARAM)lpcf->lpszStyle);

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2015