January 2015 - Wine-Commits

Mark Harmstone : xaudio2_7: Add stub DLL.
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 9d5e4edae646390c59e0b7c79114ab5604da9995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5e4edae646390c59e0b7c79… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 11 17:05:56 2015 +0000 xaudio2_7: Add stub DLL. --- configure | 2 + configure.ac | 1 + dlls/xaudio2_7/Makefile.in | 5 +++ dlls/xaudio2_7/xaudio2_7.spec | 4 ++ dlls/xaudio2_7/xaudio_dll.c | 86 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+) diff --git a/configure b/configure index 6c87c03..817ddd7 100755 --- a/configure +++ b/configure @@ -1321,6 +1321,7 @@ enable_wuapi enable_wuaueng enable_x3daudio1_7 enable_xapofx1_1 +enable_xaudio2_7 enable_xinput1_1 enable_xinput1_2 enable_xinput1_3 @@ -17544,6 +17545,7 @@ wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 +wine_fn_config_dll xaudio2_7 enable_xaudio2_7 wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput diff --git a/configure.ac b/configure.ac index 8263c66..df3c37b 100644 --- a/configure.ac +++ b/configure.ac @@ -3368,6 +3368,7 @@ WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) +WINE_CONFIG_DLL(xaudio2_7) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput]) diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in new file mode 100644 index 0000000..853d1d6 --- /dev/null +++ b/dlls/xaudio2_7/Makefile.in @@ -0,0 +1,5 @@ +MODULE = xaudio2_7.dll +IMPORTS = advapi32 kernel32 ole32 user32 uuid + +C_SRCS = \ + xaudio_dll.c diff --git a/dlls/xaudio2_7/xaudio2_7.spec b/dlls/xaudio2_7/xaudio2_7.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/xaudio2_7/xaudio2_7.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c new file mode 100644 index 0000000..c8b7904 --- /dev/null +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2015 Mark Harmstone + * + * 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> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" + +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" +#include <propsys.h> +#include "initguid.h" +#include "xaudio2.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + instance = hinstDLL; + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (ppv == NULL) { + WARN("invalid parameter\n"); + return E_INVALIDARG; + } + + *ppv = NULL; + + WARN("(%s, %s, %p): no class found.\n", debugstr_guid(rclsid), + debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("\n"); + return __wine_register_resources( instance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("\n"); + return __wine_unregister_resources( instance ); +}

1 0

Michael Stefaniuc : d3dx9_36/tests: Actually test retrieve_device_state calls (PVS-Studio).
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: ceef3a844a68ec1db8e92a6ef35d0dcac0c8c2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceef3a844a68ec1db8e92a6ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 12:26:02 2015 +0100 d3dx9_36/tests: Actually test retrieve_device_state calls (PVS-Studio). --- dlls/d3dx9_36/tests/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index b55f7ea..6c1bab3 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -875,6 +875,7 @@ static void test_ID3DXRenderToSurface_device_state(IDirect3DDevice9 *device) } hr = retrieve_device_state(device, &pre_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, TRUE, D3DFMT_D24X8, &render); ok(hr == D3D_OK, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3D_OK); @@ -1100,6 +1101,7 @@ static void test_ID3DXRenderToEnvMap_cube_map(IDirect3DDevice9 *device) } hr = retrieve_device_state(device, &pre_state); + ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); hr = D3DXCreateRenderToEnvMap(device, 256, 0, D3DFMT_A8R8G8B8, TRUE, D3DFMT_D24X8, &render); ok(hr == D3D_OK, "D3DCreateRenderToEnvMap returned %#x, expected %#x\n", hr, D3D_OK);

1 0

Michael Stefaniuc : d3drm: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: dcba8edba686b390b164199aed979f5eaa5f92b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcba8edba686b390b164199ae… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 12:25:27 2015 +0100 d3drm: Remove an unused assignment (PVS-Studio). --- dlls/d3drm/meshbuilder.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 0a700bc..b3c5dbf 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1078,7 +1078,6 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, This->nb_vertices = *(DWORD*)ptr; This->nb_faces = *(DWORD*)(ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR)); faces_vertex_idx_size = size - sizeof(DWORD) - This->nb_vertices * sizeof(D3DVECTOR) - sizeof(DWORD); - faces_vertex_idx_ptr = (DWORD*)(ptr + sizeof(DWORD) + This->nb_vertices * sizeof(D3DVECTOR) + sizeof(DWORD)); TRACE("Mesh: nb_vertices = %d, nb_faces = %d, faces_vertex_idx_size = %d\n", This->nb_vertices, This->nb_faces, faces_vertex_idx_size);

1 0

Michael Stefaniuc : wrc: Remove some more always-true conditions.
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 11bee58bdab1211ded89cbc80c705c6a2d60df3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bee58bdab1211ded89cbc80… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 12 12:09:38 2015 +0100 wrc: Remove some more always-true conditions. --- tools/wrc/translation.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index 74f2017..b7caa07 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -614,18 +614,16 @@ static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) { if((ver_value1->type == ver_value2->type)) { switch(ver_value1->type) { case val_str: - if(!different && ver_value1->key && ver_value2->key) + if(ver_value1->key && ver_value2->key) different = compare_string(ver_value1->key, ver_value2->key); - else if(!different && - ((ver_value1->key && !ver_value2->key) || + else if(((ver_value1->key && !ver_value2->key) || (!ver_value1->key && ver_value2->key))) different = 1; break; case val_words: - if(!different && ver_value1->key && ver_value2->key) + if(ver_value1->key && ver_value2->key) different = compare_string(ver_value1->key, ver_value2->key); - else if(!different && - ((ver_value1->key && !ver_value2->key) || + else if(((ver_value1->key && !ver_value2->key) || (!ver_value1->key && ver_value2->key))) different = 1; if(!different && ver_value1->value.words && ver_value2->value.words) { @@ -644,10 +642,9 @@ static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) { different = 1; break; case val_block: - if(!different && ver_value1->value.block && ver_value2->value.block) + if(ver_value1->value.block && ver_value2->value.block) different = compare_ver_block(ver_value1->value.block, ver_value2->value.block); - else if(!different && - ((ver_value1->value.block && !ver_value2->value.block) || + else if(((ver_value1->value.block && !ver_value2->value.block) || (!ver_value1->value.block && ver_value2->value.block))) different = 1; break;

1 0

Michael Stefaniuc : winmm: Remove an unused variable (PVS-Studio).
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 36ab1878fa8aa601077f1e38877440db9451c3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ab1878fa8aa601077f1e388… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 12 11:12:24 2015 +0100 winmm: Remove an unused variable (PVS-Studio). --- dlls/winmm/mci.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 10e2b40..a77514c 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -2054,14 +2054,13 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm */ static DWORD MCI_Break(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) { - DWORD dwRet = 0; - - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms == NULL) + return MCIERR_NULL_PARAMETER_BLOCK; FIXME("(%04x) vkey %04X stub\n", dwFlags, lpParms->nVirtKey); - if (MMSYSERR_NOERROR==dwRet && (dwFlags & MCI_NOTIFY)) + if (dwFlags & MCI_NOTIFY) mciDriverNotify((HWND)lpParms->dwCallback, wDevID, MCI_NOTIFY_SUCCESSFUL); - return dwRet; + return MMSYSERR_NOERROR; } /**************************************************************************

1 0

Axel Davy : d3d8/tests: Fix volume_dxt5_test getPixelColor check.
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 58083dfb12655ee0e23fc0d2cc248db1d647f220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58083dfb12655ee0e23fc0d2c… Author: Axel Davy <axel.davy(a)ens.fr> Date: Sun Jan 11 11:29:13 2015 +0100 d3d8/tests: Fix volume_dxt5_test getPixelColor check. getPixelColor should be called before Present, because the device swapchain was created with discard mode. --- dlls/d3d8/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a8a771e..68c3319 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4507,8 +4507,6 @@ static void volume_dxt5_test(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); for (i = 0; i < 4; i++) { color = getPixelColor(device, 80 + 160 * i, 240); @@ -4516,6 +4514,8 @@ static void volume_dxt5_test(void) "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); } + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); IDirect3DVolumeTexture8_Release(texture); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Mark Harmstone : winealsa: Do not destroy remapping info on IsFormatSupported.
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: dcf8767b5879f88548ab35de3e65afbef17bd65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf8767b5879f88548ab35de3… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 11 17:10:28 2015 +0000 winealsa: Do not destroy remapping info on IsFormatSupported. --- dlls/winealsa.drv/mmdevdrv.c | 62 +++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2079dcc..e32cb54 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1130,11 +1130,11 @@ static int alsa_channel_index(DWORD flag) return -1; } -static BOOL need_remapping(ACImpl *This, const WAVEFORMATEX *fmt) +static BOOL need_remapping(ACImpl *This, const WAVEFORMATEX *fmt, int *map) { unsigned int i; for(i = 0; i < fmt->nChannels; ++i){ - if(This->alsa_channel_map[i] != i) + if(map[i] != i) return TRUE; } return FALSE; @@ -1166,8 +1166,10 @@ static DWORD get_channel_mask(unsigned int channels) return 0; } -static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt) +static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt, int *alsa_channels, int *map) { + BOOL need_remap; + if(This->dataflow != eCapture && (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2) ){ WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; DWORD mask, flag = SPEAKER_FRONT_LEFT; @@ -1179,47 +1181,47 @@ static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt) else mask = get_channel_mask(fmt->nChannels); - This->alsa_channels = 0; + *alsa_channels = 0; while(i < fmt->nChannels && !(flag & SPEAKER_RESERVED)){ if(mask & flag){ - This->alsa_channel_map[i] = alsa_channel_index(flag); + map[i] = alsa_channel_index(flag); TRACE("Mapping mmdevapi channel %u (0x%x) to ALSA channel %d\n", - i, flag, This->alsa_channel_map[i]); - if(This->alsa_channel_map[i] >= This->alsa_channels) - This->alsa_channels = This->alsa_channel_map[i] + 1; + i, flag, map[i]); + if(map[i] >= *alsa_channels) + *alsa_channels = map[i] + 1; ++i; } flag <<= 1; } while(i < fmt->nChannels){ - This->alsa_channel_map[i] = This->alsa_channels; + map[i] = *alsa_channels; TRACE("Mapping mmdevapi channel %u to ALSA channel %d\n", - i, This->alsa_channel_map[i]); - ++This->alsa_channels; + i, map[i]); + ++*alsa_channels; ++i; } for(i = 0; i < fmt->nChannels; ++i){ - if(This->alsa_channel_map[i] == -1){ - This->alsa_channel_map[i] = This->alsa_channels; - ++This->alsa_channels; + if(map[i] == -1){ + map[i] = *alsa_channels; + ++*alsa_channels; TRACE("Remapping mmdevapi channel %u to ALSA channel %d\n", - i, This->alsa_channel_map[i]); + i, map[i]); } } - This->need_remapping = need_remapping(This, fmt); - - TRACE("need_remapping: %u, alsa_channels: %d\n", This->need_remapping, This->alsa_channels); + need_remap = need_remapping(This, fmt, map); }else{ - This->need_remapping = FALSE; - This->alsa_channels = fmt->nChannels; - TRACE("need_remapping: %u, alsa_channels: %d\n", This->need_remapping, This->alsa_channels); + *alsa_channels = fmt->nChannels; + + need_remap = FALSE; } - return S_OK; + TRACE("need_remapping: %u, alsa_channels: %d\n", need_remap, *alsa_channels); + + return need_remap ? S_OK : S_FALSE; } static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) @@ -1304,11 +1306,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, dump_fmt(fmt); - if(FAILED(map_channels(This, fmt))){ - WARN("map_channels failed\n"); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } + This->need_remapping = map_channels(This, fmt, &This->alsa_channels, This->alsa_channel_map) == S_OK ? TRUE : FALSE; if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); @@ -1623,6 +1621,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX *closest = NULL; unsigned int max = 0, min = 0; int err; + int alsa_channels, alsa_channel_map[32]; TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); @@ -1717,12 +1716,9 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, closest->nChannels = min; } - if(FAILED(map_channels(This, fmt))){ - hr = AUDCLNT_E_DEVICE_INVALIDATED; - WARN("map_channels failed\n"); - goto exit; - } - if(This->alsa_channels > max){ + map_channels(This, fmt, &alsa_channels, alsa_channel_map); + + if(alsa_channels > max){ hr = S_FALSE; closest->nChannels = max; }

1 0

Marcus Meissner : combase: Reorder checks (Coverity).
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: a20e75432e86c7dffe8abc458cebbb617888543b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20e75432e86c7dffe8abc458… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 11 23:37:03 2015 +0100 combase: Reorder checks (Coverity). --- dlls/combase/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 9ec05c6..7054af6 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -99,13 +99,13 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, return E_INVALIDARG; if (ptr == NULL && len > 0) return E_POINTER; - if (ptr[len] != '\0') - return E_INVALIDARG; if (len == 0) { *out = NULL; return S_OK; } + if (ptr[len] != '\0') + return E_INVALIDARG; priv->buffer = (LPWSTR)ptr; priv->length = len; priv->reference = TRUE;

1 0

Michael Stefaniuc : comdlg32: Remove unused variable assigments ( PVS-Studio).
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 74007d4405fdb60ddaa703359966848b16cdb1e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74007d4405fdb60ddaa703359… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 12:25:03 2015 +0100 comdlg32: Remove unused variable assigments (PVS-Studio). --- dlls/comdlg32/printdlg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 83b22c3..acdb46c 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -838,8 +838,7 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, Names = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(char)*NamesSize); Words = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(WORD)); - NrOfEntries = DeviceCapabilitiesA(PrinterName, PortName, - fwCapability_Names, Names, dm); + DeviceCapabilitiesA(PrinterName, PortName, fwCapability_Names, Names, dm); NrOfEntries = DeviceCapabilitiesA(PrinterName, PortName, fwCapability_Words, (LPSTR)Words, dm); @@ -949,8 +948,7 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, Names = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(WCHAR)*NamesSize); Words = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(WORD)); - NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, - fwCapability_Names, Names, dm); + DeviceCapabilitiesW(PrinterName, PortName, fwCapability_Names, Names, dm); NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, fwCapability_Words, Words, dm);

1 0

Jacek Caban : activscp.idl: Added SCRIPT_E_* error codes.
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 50608908ebb5e791692a9d112e55c42009e040b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50608908ebb5e791692a9d112… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 12 17:13:31 2015 +0100 activscp.idl: Added SCRIPT_E_* error codes. --- include/activscp.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/activscp.idl b/include/activscp.idl index c7fc2d2..8a3d75d 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -118,6 +118,10 @@ cpp_quote("#define SCRIPTSTAT_INSTRUCTION_COUNT 2") cpp_quote("#define SCRIPTSTAT_INTSTRUCTION_TIME 3") cpp_quote("#define SCRIPTSTAT_TOTAL_TIME 4") +cpp_quote("#define SCRIPT_E_RECORDED 0x86664004") +cpp_quote("#define SCRIPT_E_REPORTED 0x80020101") +cpp_quote("#define SCRIPT_E_PROPAGATE 0x80020102") + [ object, uuid(EAE1BA61-A4ED-11cf-8F20-00805F2CD064),

1 0