October 2011 - Wine-commits

Frédéric Delanoy : cmd: Make MOVE work for read-only files.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 1e4c17e5ddc30581067c13cff48e672b1a292329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e4c17e5ddc30581067c13cff… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 13 17:30:17 2011 +0200 cmd: Make MOVE work for read-only files. --- programs/cmd/builtins.c | 87 +++++++++++++---------------- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 2 files changed, 40 insertions(+), 49 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1db9b3c..ed2b6f0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1554,8 +1554,8 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { * Move a file, directory tree or wildcarded set of files. */ -void WCMD_move (void) { - +void WCMD_move (void) +{ int status; WIN32_FIND_DATAW fd; HANDLE hff; @@ -1594,6 +1594,7 @@ void WCMD_move (void) { WCHAR dest[MAX_PATH]; WCHAR src[MAX_PATH]; DWORD attribs; + BOOL ok = TRUE; WINE_TRACE("Processing file '%s'\n", wine_dbgstr_w(fd.cFileName)); @@ -1617,60 +1618,50 @@ void WCMD_move (void) { WINE_TRACE("Source '%s'\n", wine_dbgstr_w(src)); WINE_TRACE("Dest '%s'\n", wine_dbgstr_w(dest)); - /* Check if file is read only, otherwise move it */ - attribs = GetFileAttributesW(src); - if ((attribs != INVALID_FILE_ATTRIBUTES) && - (attribs & FILE_ATTRIBUTE_READONLY)) { - SetLastError(ERROR_ACCESS_DENIED); - status = 0; - } else { - BOOL ok = TRUE; - - /* If destination exists, prompt unless /Y supplied */ - if (GetFileAttributesW(dest) != INVALID_FILE_ATTRIBUTES) { - BOOL force = FALSE; - WCHAR copycmd[MAXSTRING]; - int len; - - /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ - if (strstrW (quals, parmNoY)) - force = FALSE; - else if (strstrW (quals, parmY)) - force = TRUE; - else { - static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; - len = GetEnvironmentVariableW(copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); - force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) - && ! lstrcmpiW (copycmd, parmY)); - } + /* If destination exists, prompt unless /Y supplied */ + if (GetFileAttributesW(dest) != INVALID_FILE_ATTRIBUTES) { + BOOL force = FALSE; + WCHAR copycmd[MAXSTRING]; + int len; - /* Prompt if overwriting */ - if (!force) { - WCHAR question[MAXSTRING]; - WCHAR yesChar[10]; + /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ + if (strstrW (quals, parmNoY)) + force = FALSE; + else if (strstrW (quals, parmY)) + force = TRUE; + else { + static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; + len = GetEnvironmentVariableW(copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); + force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) + && ! lstrcmpiW (copycmd, parmY)); + } - strcpyW(yesChar, WCMD_LoadMessage(WCMD_YES)); + /* Prompt if overwriting */ + if (!force) { + WCHAR question[MAXSTRING]; + WCHAR yesChar[10]; - /* Ask for confirmation */ - wsprintfW(question, WCMD_LoadMessage(WCMD_OVERWRITE), dest); - ok = WCMD_ask_confirm(question, FALSE, NULL); + strcpyW(yesChar, WCMD_LoadMessage(WCMD_YES)); - /* So delete the destination prior to the move */ - if (ok) { - if (!DeleteFileW(dest)) { - WCMD_print_error (); - errorlevel = 1; - ok = FALSE; - } + /* Ask for confirmation */ + wsprintfW(question, WCMD_LoadMessage(WCMD_OVERWRITE), dest); + ok = WCMD_ask_confirm(question, FALSE, NULL); + + /* So delete the destination prior to the move */ + if (ok) { + if (!DeleteFileW(dest)) { + WCMD_print_error (); + errorlevel = 1; + ok = FALSE; } } } + } - if (ok) { - status = MoveFileW(src, dest); - } else { - status = 1; /* Anything other than 0 to prevent error msg below */ - } + if (ok) { + status = MoveFileW(src, dest); + } else { + status = 1; /* Anything other than 0 to prevent error msg below */ } if (!status) { diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2318d08..e45016c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -609,7 +609,7 @@ bar file move succeeded @todo_wine(a)file move with overwrite succeeded(a)or_broken@file overwrite impossible! @todo_wine(a)bar@or_broken(a)baz -(a)todo_wine@read-only files are moveable +read-only files are moveable file moved in subdirectory @todo_wine(a)moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op! @todo_wine(a)ErrorLevel: 0(a)or_broken@ErrorLevel: 1

1 0

Dan Kegel : winealsa.drv: When allocating opaque blobs for alsa, initialize them to zero.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 78e6287f71cca2b7dfb30cc0f1d2151f0f00da8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e6287f71cca2b7dfb30cc0f… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Oct 13 11:14:18 2011 -0700 winealsa.drv: When allocating opaque blobs for alsa, initialize them to zero. --- dlls/winealsa.drv/mmdevdrv.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 640b191..29c3f72 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -258,7 +258,7 @@ static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char int err, device; snd_pcm_info_t *info; - info = HeapAlloc(GetProcessHeap(), 0, snd_pcm_info_sizeof()); + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_info_sizeof()); if(!info) return E_OUTOFMEMORY; @@ -943,7 +943,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, goto exit; } - sw_params = HeapAlloc(GetProcessHeap(), 0, snd_pcm_sw_params_sizeof()); + sw_params = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_sw_params_sizeof()); if(!sw_params){ hr = E_OUTOFMEMORY; goto exit; @@ -1364,7 +1364,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(!fmt) return E_OUTOFMEMORY; - formats = HeapAlloc(GetProcessHeap(), 0, snd_pcm_format_mask_sizeof()); + formats = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_format_mask_sizeof()); if(!formats){ CoTaskMemFree(fmt); return E_OUTOFMEMORY;

1 0

Vincent Povirk : windowscodecs: Use a smaller magic number to detect JPEG files.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 219b987fa11cff464eaf76065adf687e9fb400d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219b987fa11cff464eaf76065… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 11 11:36:05 2011 -0500 windowscodecs: Use a smaller magic number to detect JPEG files. --- dlls/windowscodecs/regsvr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 1ea0aa0..bc12e40 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -720,7 +720,7 @@ static struct decoder_pattern const ico_patterns[] = { {0} }; -static const BYTE jpeg_magic[] = {0xff, 0xd8, 0xff, 0xe0}; +static const BYTE jpeg_magic[] = {0xff, 0xd8}; static GUID const * const jpeg_formats[] = { &GUID_WICPixelFormat24bppBGR, @@ -730,7 +730,7 @@ static GUID const * const jpeg_formats[] = { }; static struct decoder_pattern const jpeg_patterns[] = { - {4,0,jpeg_magic,mask_all,0}, + {2,0,jpeg_magic,mask_all,0}, {0} };

1 0

Vincent Povirk : msi: Use MsgWaitForMultipleObjectsEx to do waits.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 2556173f20ba9583044aaf31b16cbb2214d2b907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2556173f20ba9583044aaf31b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 13 13:32:42 2011 -0500 msi: Use MsgWaitForMultipleObjectsEx to do waits. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 7074a7b..8b10215 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3787,7 +3787,7 @@ void msi_dialog_check_messages( HANDLE handle ) if( uiThreadId != GetCurrentThreadId() ) { if( handle ) - WaitForSingleObject( handle, INFINITE ); + MsgWaitForMultipleObjectsEx( 1, &handle, INFINITE, 0, 0 ); return; }

1 0

Dylan Smith : d3dx9: Removed a duplicate NULL check.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 8f8e86eaa35af2c20589fa1933e82ef3c62b2958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8e86eaa35af2c20589fa193… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Oct 13 09:12:55 2011 -0400 d3dx9: Removed a duplicate NULL check. --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6e1433e..2460373 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3444,7 +3444,7 @@ HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc current_frame = frame->pFrameSibling; frame->pFrameSibling = current_frame->pFrameSibling; current_frame->pFrameSibling = NULL; - } else if (frame) { + } else { current_frame = frame; last = TRUE; }

1 0

Piotr Caban : msvcp90: Added basic_string::operator[] implementation.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 700e1da5c29e87308a2681ae9b03e7f879350515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=700e1da5c29e87308a2681ae9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 14:09:09 2011 +0200 msvcp90: Added basic_string::operator[] implementation. --- dlls/msvcp90/msvcp90.spec | 32 ++++++------ dlls/msvcp90/string.c | 130 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 124 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=700e1da5c29e87308a268…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 445b934005a607e3884ee4310dbb3bd1857f8296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=445b934005a607e3884ee4310… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 14:09:20 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 48 +++++++++--------- dlls/msvcp70/msvcp70.spec | 80 +++++++++++++++--------------- dlls/msvcp71/msvcp71.spec | 96 ++++++++++++++++++------------------ dlls/msvcp80/msvcp80.spec | 112 +++++++++++++++++++++--------------------- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 7 files changed, 171 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=445b934005a607e3884ee…

1 0

Alistair Leslie-Hughes : mscoree: Register interfaces.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: b2ef9218ec2a61634885f9a3b7666d8450314548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ef9218ec2a61634885f9a3b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 11 16:08:00 2011 +1100 mscoree: Register interfaces. --- dlls/mscoree/Makefile.in | 2 + dlls/mscoree/mscoree_classes.idl | 72 ++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 11 ++++-- 3 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index a39c696..114b130 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -10,4 +10,6 @@ C_SRCS = \ metahost.c \ mscoree_main.c +IDL_R_SRCS = mscoree_classes.idl + @MAKE_DLL_RULES@ diff --git a/dlls/mscoree/mscoree_classes.idl b/dlls/mscoree/mscoree_classes.idl new file mode 100644 index 0000000..692210e --- /dev/null +++ b/dlls/mscoree/mscoree_classes.idl @@ -0,0 +1,72 @@ +/* + * Copyright 2011 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + helpstring("Microsoft Common Language Runtime Host V2"), + threading(both), + progid("CLRMetaData.CLRRuntimeHost.1"), + vi_progid("CLRMetaData.CLRRuntimeHost"), + uuid(90F1A06E-7712-4762-86B5-7A5EBA6BDB01), +] +coclass ICLRRuntimeHost +{ +} + +[ + helpstring("Microsoft Common Language Runtime Host V2"), + threading(both), + progid("CLRMetaData.CLRRuntimeHost.2"), + vi_progid("CLRMetaData.CLRRuntimeHost"), + uuid(90F1A06E-7712-4762-86B5-7A5EBA6BDB02), +] +coclass CLRRuntimeHost +{ +} + +[ + helpstring("Microsoft Common Language Runtime Meta Data"), + threading(both), + progid("CLRMetaData.CorMetaDataDispenser.2"), + vi_progid("CLRMetaData.CorMetaDataDispenser"), + uuid(E5CB7A31-7512-11D2-89CE-0080C792E5D8), +] +coclass CorMetaDataDispenser +{ +} + +[ + helpstring("Microsoft Common Language Runtime Meta Data"), + threading(both), + progid("CLRMetaData.CorMetaDataDispenserRuntime.2"), + vi_progid("CLRMetaData.CorMetaDataDispenserRuntime"), + uuid(1EC2DE53-75CC-11d2-9775-00A0C9B4D50C), +] +coclass CorMetaDataDispenserRuntime +{ +} + +[ + helpstring("Microsoft Common Language Runtime Host"), + threading(both), + progid("CLRMetaData.CorRuntimeHost.2"), + vi_progid("CLRMetaData.CorRuntimeHost"), + uuid(CB2F6723-AB3A-11d2-9C40-00C04FA30A3E), +] +coclass CorRuntimeHost +{ +} diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 64c226f..8b72ec8 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -44,11 +44,14 @@ #include "fusion.h" #include "wine/list.h" #include "mscoree_private.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); +static HINSTANCE MSCOREE_hInstance; + char *WtoA(LPCWSTR wstr) { int length; @@ -116,6 +119,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + MSCOREE_hInstance = hinstDLL; + switch (fdwReason) { case DLL_WINE_PREATTACH: @@ -508,14 +513,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) HRESULT WINAPI DllRegisterServer(void) { - FIXME("\n"); - return S_OK; + return __wine_register_resources( MSCOREE_hInstance ); } HRESULT WINAPI DllUnregisterServer(void) { - FIXME("\n"); - return S_OK; + return __wine_unregister_resources( MSCOREE_hInstance ); } HRESULT WINAPI DllCanUnloadNow(VOID)

1 0

Alexandre Julliard : gdi32: Add support for arbitrary DIB bitfields for 32-bpp conversions.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: b084e52bf68ce8e65a375c9e95c48fd629fe76dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b084e52bf68ce8e65a375c9e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 23:25:32 2011 +0200 gdi32: Add support for arbitrary DIB bitfields for 32-bpp conversions. --- dlls/gdi32/dibdrv/primitives.c | 203 ++++++++++++++++++++++++++++++++++------ dlls/gdi32/tests/bitmap.c | 2 +- 2 files changed, 176 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b084e52bf68ce8e65a375…

1 0

Alexandre Julliard : gdi32: Add support for arbitrary DIB bitfields for 16-bpp conversions.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 587f492fdf9341a535e262d7d8cdb85a326996e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587f492fdf9341a535e262d7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 00:12:04 2011 +0200 gdi32: Add support for arbitrary DIB bitfields for 16-bpp conversions. --- dlls/gdi32/dibdrv/primitives.c | 162 +++++++++++++++++++++++++++++++++++----- dlls/gdi32/tests/bitmap.c | 55 +++----------- 2 files changed, 156 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=587f492fdf9341a535e26…

1 0