February 2010 - Wine-Commits

André Hentschel : msi: Fix crash with access to component.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 3299bfd4714821ed168afbb3d122354ae405f02f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3299bfd4714821ed168afbb3d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 30 14:01:58 2010 +0100 msi: Fix crash with access to component. --- dlls/msi/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7e74dca..b7af4d3 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -365,7 +365,8 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) debugstr_w(component)); /* the action taken was the same as the current install state */ - comp->Action = comp->Installed; + if (comp) + comp->Action = comp->Installed; return ERROR_SUCCESS; }

1 0

Juan Lang : wintrust: Fix copy-paste error.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: ab270f9966f0f7a35d1f880101d75bae7e87ec7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab270f9966f0f7a35d1f88010… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 1 09:23:30 2010 -0800 wintrust: Fix copy-paste error. --- dlls/wintrust/softpub.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 852976a..f753c93 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -395,8 +395,8 @@ static DWORD SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_GetSIP(data); if (err) goto error; - err = SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, - data->pWintrustData->u.pFile->pcwszFilePath); + err = SOFTPUB_GetMessageFromFile(data, catalog, + data->pWintrustData->u.pCatalog->pcwszCatalogFilePath); if (err) goto error; err = SOFTPUB_CreateStoreFromMessage(data);

1 0

Jaime Rave : appwiz.cpl: Added Spanish translation.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 88f81550b48c732e8967c8e8ba0cef3394fca563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f81550b48c732e8967c8e8b… Author: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Sat Jan 30 09:07:46 2010 -0500 appwiz.cpl: Added Spanish translation. --- dlls/appwiz.cpl/Es.rc | 86 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Makefile.in | 1 + 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Es.rc b/dlls/appwiz.cpl/Es.rc new file mode 100644 index 0000000..7826e06 --- /dev/null +++ b/dlls/appwiz.cpl/Es.rc @@ -0,0 +1,86 @@ +/* +* Add/Remove Programs Spanish resources +* +* Copyright 2010 Jaime Rave +* +* 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 "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CPL_TITLE, "Agregar/Quitar Programas" + IDS_CPL_DESC, "Te permite instalar nuevo software, o desinstalar el software existente de tu computador." + IDS_TAB1_TITLE, "Aplicaciones" + + IDS_UNINSTALL_FAILED, "Imposible ejecutar el desinstalador, '%s'. ¿Desea quitar la entrada de desinstalación de este programa del registro?" + IDS_NOT_SPECIFIED, "No especificado" + + IDS_COLUMN_NAME, "Nombre" + IDS_COLUMN_PUBLISHER, "Editor" + IDS_COLUMN_VERSION, "Versión" + IDS_INSTALL_FILTER, "Programas de instalación\0*instal*.exe;*setup*.exe;*.msi\0Programas (*.exe)\0*.exe\0Todos los archivos (*.*)\0*.*\0\0" + + IDS_REMOVE, "&Quitar..." + IDS_MODIFY_REMOVE, "&Modificar/Quitar..." +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalar/Desinstalar" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Para instalar un nuevo programa desde un disquete, unidad de CD-ROM, o tu disco duro, haz clic en instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Instalar...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "El siguiete software puede ser eliminado automaticamente. Para quitar un programa o modificar sus componentes instalados, seleccionanlo en la lista y haz clic en Modificar/Quitar.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Información de soporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Modificar...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "Quita&r...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Información de Soporte" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Aceptar", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "La siguiente información puede ser usada para obtener soporte técnico para %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Editor:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versión:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contacto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Información de Soporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Teléfono de Soporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Leeme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Actualizaciones del Producto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Comentarios:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 50c9099..dff8035 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Es.rc \ Fr.rc \ It.rc \ Ja.rc \

1 0

Alexandre Julliard : shell: Explicitly convert icons to 16-bit instead of casting handles.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 03f7bbdbf7798d2f5154f4a98ca17adecdc1b8e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f7bbdbf7798d2f5154f4a98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 17:03:23 2010 +0100 shell: Explicitly convert icons to 16-bit instead of casting handles. --- dlls/shell.dll16/Makefile.in | 2 +- dlls/shell.dll16/shell.c | 67 +++++++++++++++++++++++++++++++++-------- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in index 8dff0a9..36b23fc 100644 --- a/dlls/shell.dll16/Makefile.in +++ b/dlls/shell.dll16/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shell.dll16 -IMPORTS = shell32 user32 advapi32 kernel32 kernel +IMPORTS = shell32 user32 gdi32 advapi32 kernel32 kernel EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,shell32.dll EXTRARCFLAGS = -O res16 diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index b8d99fd..be8ffeb 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -52,7 +52,6 @@ extern HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpF LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd, void *callback); -#define HICON_16(h32) (LOWORD(h32)) #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) #define HINSTANCE_16(h32) (LOWORD(h32)) @@ -84,6 +83,50 @@ static HICON convert_icon_to_32( HICON16 icon16 ) return ret; } +static HICON16 convert_icon_to_16( HINSTANCE16 inst, HICON icon ) +{ + static HICON16 (WINAPI *pCreateIcon16)(HINSTANCE16,INT16,INT16,BYTE,BYTE,LPCVOID,LPCVOID); + ICONINFO info; + BITMAP bm; + UINT and_size, xor_size; + void *xor_bits = NULL, *and_bits; + HICON16 handle = 0; + + if (!pCreateIcon16 && + !(pCreateIcon16 = (void *)GetProcAddress( GetModuleHandleA("user.exe16"), "CreateIcon16" ))) + return 0; + + if (!(GetIconInfo( icon, &info ))) return 0; + GetObjectW( info.hbmMask, sizeof(bm), &bm ); + and_size = bm.bmHeight * bm.bmWidthBytes; + if (!(and_bits = HeapAlloc( GetProcessHeap(), 0, and_size ))) goto done; + GetBitmapBits( info.hbmMask, and_size, and_bits ); + if (info.hbmColor) + { + GetObjectW( info.hbmColor, sizeof(bm), &bm ); + xor_size = bm.bmHeight * bm.bmWidthBytes; + if (!(xor_bits = HeapAlloc( GetProcessHeap(), 0, xor_size ))) goto done; + GetBitmapBits( info.hbmColor, xor_size, xor_bits ); + } + else + { + bm.bmHeight /= 2; + xor_bits = (char *)and_bits + and_size / 2; + } + handle = pCreateIcon16( inst, bm.bmWidth, bm.bmHeight, bm.bmPlanes, bm.bmBitsPixel, + and_bits, xor_bits ); +done: + HeapFree( GetProcessHeap(), 0, and_bits ); + if (info.hbmColor) + { + HeapFree( GetProcessHeap(), 0, xor_bits ); + DeleteObject( info.hbmColor ); + } + DeleteObject( info.hbmMask ); + DestroyIcon( icon ); + return handle; +} + /*********************************************************************** * DllEntryPoint [SHELL.101] * @@ -239,7 +282,7 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16 hInstance, if ((ret != 0xffffffff) && ret) { int i; - for (i = 0; i < n; i++) RetPtr[i] = HICON_16(icons[i]); + for (i = 0; i < n; i++) RetPtr[i] = convert_icon_to_16(hInstance, icons[i]); } else { @@ -257,19 +300,18 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16 hInstance, HICON16 WINAPI ExtractIcon16( HINSTANCE16 hInstance, LPCSTR lpszExeFileName, UINT16 nIconIndex ) { TRACE("\n"); - return HICON_16(ExtractIconA(HINSTANCE_32(hInstance), lpszExeFileName, nIconIndex)); + return convert_icon_to_16( hInstance, ExtractIconA(NULL, lpszExeFileName, nIconIndex) ); } /************************************************************************* * ExtractIconEx (SHELL.40) */ -HICON16 WINAPI ExtractIconEx16( +UINT16 WINAPI ExtractIconEx16( LPCSTR lpszFile, INT16 nIconIndex, HICON16 *phiconLarge, HICON16 *phiconSmall, UINT16 nIcons ) { HICON *ilarge,*ismall; - UINT16 ret; - int i; + int i, ret; if (phiconLarge) ilarge = HeapAlloc(GetProcessHeap(),0,nIcons*sizeof(HICON)); @@ -279,15 +321,15 @@ HICON16 WINAPI ExtractIconEx16( ismall = HeapAlloc(GetProcessHeap(),0,nIcons*sizeof(HICON)); else ismall = NULL; - ret = HICON_16(ExtractIconExA(lpszFile,nIconIndex,ilarge,ismall,nIcons)); + ret = ExtractIconExA(lpszFile,nIconIndex,ilarge,ismall,nIcons); if (ilarge) { - for (i=0;i<nIcons;i++) - phiconLarge[i]=HICON_16(ilarge[i]); + for (i=0;i<ret;i++) + phiconLarge[i] = convert_icon_to_16(0, ilarge[i]); HeapFree(GetProcessHeap(),0,ilarge); } if (ismall) { - for (i=0;i<nIcons;i++) - phiconSmall[i]=HICON_16(ismall[i]); + for (i=0;i<ret;i++) + phiconSmall[i] = convert_icon_to_16(0, ismall[i]); HeapFree(GetProcessHeap(),0,ismall); } return ret; @@ -301,8 +343,7 @@ HICON16 WINAPI ExtractIconEx16( */ HICON16 WINAPI ExtractAssociatedIcon16(HINSTANCE16 hInst, LPSTR lpIconPath, LPWORD lpiIcon) { - return HICON_16(ExtractAssociatedIconA(HINSTANCE_32(hInst), lpIconPath, - lpiIcon)); + return convert_icon_to_16( hInst, ExtractAssociatedIconA(NULL, lpIconPath, lpiIcon) ); } /*************************************************************************

1 0

Jörg Höhle : winmm: Have xyzGetDevCaps return MMSYSERR_BADDEVICEID, not INVALHANDLE.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: b0d2f77cc95f9ea86f09977d3b64411d948b9743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d2f77cc95f9ea86f09977d3… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 30 22:09:12 2010 +0100 winmm: Have xyzGetDevCaps return MMSYSERR_BADDEVICEID, not INVALHANDLE. --- dlls/winmm/winmm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 76c3752..6205466 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -697,7 +697,7 @@ UINT WINAPI auxGetDevCapsW(UINT_PTR uDeviceID, LPAUXCAPSW lpCaps, UINT uSize) if (lpCaps == NULL) return MMSYSERR_INVALPARAM; if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) - return MMSYSERR_INVALHANDLE; + return MMSYSERR_BADDEVICEID; return MMDRV_Message(wmld, AUXDM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize); } @@ -789,7 +789,7 @@ UINT WINAPI midiOutGetDevCapsW(UINT_PTR uDeviceID, LPMIDIOUTCAPSW lpCaps, if (lpCaps == NULL) return MMSYSERR_INVALPARAM; if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_MIDIOUT, TRUE)) == NULL) - return MMSYSERR_INVALHANDLE; + return MMSYSERR_BADDEVICEID; return MMDRV_Message(wmld, MODM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize); } @@ -1161,7 +1161,7 @@ UINT WINAPI midiInGetDevCapsW(UINT_PTR uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSi if (lpCaps == NULL) return MMSYSERR_INVALPARAM; if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_MIDIIN, TRUE)) == NULL) - return MMSYSERR_INVALHANDLE; + return MMSYSERR_BADDEVICEID; return MMDRV_Message(wmld, MIDM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize); }

1 0

Juan Lang : wintrust: Fix uninitialized return value (Coverity).
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 0f632c0caf124914b2a233909f2f08946ee80a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f632c0caf124914b2a233909… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 1 09:11:51 2010 -0800 wintrust: Fix uninitialized return value (Coverity). --- dlls/wintrust/softpub.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 3e79172..852976a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -284,7 +284,7 @@ error: static DWORD SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) { - DWORD err; + DWORD err = ERROR_SUCCESS; if (data->pWintrustData->u.pCert && WVT_IS_CBSTRUCT_GT_MEMBEROFFSET(WINTRUST_CERT_INFO, @@ -325,11 +325,6 @@ static DWORD SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) if (!ret) err = GetLastError(); } - else - { - /* Do nothing!? See the tests */ - err = ERROR_SUCCESS; - } } else err = ERROR_INVALID_PARAMETER;

1 0

Paul Vriens : msi/tests: Fix some test failures on Win9x up to W2K.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 086711818b547be8b5fde5ed7885a92c81d30d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086711818b547be8b5fde5ed7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 1 17:41:38 2010 +0100 msi/tests: Fix some test failures on Win9x up to W2K. --- dlls/msi/tests/install.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5da3ed6..9ac9420 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -352,7 +352,7 @@ static const CHAR service_control_dat[] = "ServiceControl\tName\tEvent\tArgument static const CHAR sss_service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" "s72\tl255\ti2\tL255\tI2\ts72\n" "ServiceControl\tServiceControl\n" - "ServiceControl\tTermService\t1\t\t0\tservice_comp"; + "ServiceControl\tSpooler\t1\t\t0\tservice_comp"; static const CHAR sss_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -7453,11 +7453,22 @@ static void test_start_services(void) BOOL ret; DWORD error = ERROR_SUCCESS; + if (on_win9x) + { + win_skip("Services are not implemented on Win9x and WinMe\n"); + return; + } scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); ok(scm != NULL, "Failed to open the SC Manager\n"); - service = OpenService(scm, "TermService", SC_MANAGER_ALL_ACCESS); - ok(service != NULL, "Failed to open TermService\n"); + service = OpenService(scm, "Spooler", SC_MANAGER_ALL_ACCESS); + if (!service && GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) + { + win_skip("The 'Spooler' service does not exist\n"); + CloseServiceHandle(scm); + return; + } + ok(service != NULL, "Failed to open Spooler\n"); ret = StartService(service, 0, NULL); if (!ret && (error = GetLastError()) != ERROR_SERVICE_ALREADY_RUNNING) @@ -7499,7 +7510,7 @@ static void test_start_services(void) SERVICE_STATUS status; scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - service = OpenService(scm, "TermService", SC_MANAGER_ALL_ACCESS); + service = OpenService(scm, "Spooler", SC_MANAGER_ALL_ACCESS); ret = ControlService(service, SERVICE_CONTROL_STOP, &status); ok(ret, "ControlService failed %u\n", GetLastError());

1 0

Alexandre Julliard : user.exe: Make CreateIcon16 available as 32-bit export .
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 5f27257e57b63ef6fa4bb7cdd1755e9758179ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f27257e57b63ef6fa4bb7cdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 17:02:46 2010 +0100 user.exe: Make CreateIcon16 available as 32-bit export. --- dlls/user.exe16/user.exe16.spec | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user.exe16/user.exe16.spec b/dlls/user.exe16/user.exe16.spec index 7094f47..8d928bc 100644 --- a/dlls/user.exe16/user.exe16.spec +++ b/dlls/user.exe16/user.exe16.spec @@ -564,3 +564,8 @@ # Wine internal functions 1010 pascal __wine_call_wndproc(word word word long long) __wine_call_wndproc + +################################################################ +# 32-bit exports of the 16-bit functions needed by other dlls +# +@ stdcall -arch=win32 CreateIcon16(long long long long long ptr ptr)

1 0

Alexandre Julliard : kernel32/tests: Remove leftover Sleep() call.
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 5c9753e2b6d62d9e7aa6747d249002c71129cb97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9753e2b6d62d9e7aa6747d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 16:19:21 2010 +0100 kernel32/tests: Remove leftover Sleep() call. --- dlls/kernel32/tests/heap.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 68ed459..edc0a64 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -810,7 +810,6 @@ START_TEST(heap) test_debug_heap( argv[0], FLG_HEAP_DISABLE_COALESCING ); test_debug_heap( argv[0], FLG_HEAP_PAGE_ALLOCS ); test_debug_heap( argv[0], 0xdeadbeef ); - Sleep(5000); } else win_skip( "RtlGetNtGlobalFlags not found, skipping heap debug tests\n" ); }

1 0

Alexandre Julliard : server: Make terminate_process more robust against recursive calls for the same process .
by Alexandre Julliard Feb. 2, 2010

Feb. 2, 2010

Module: wine Branch: master Commit: 349eba9e0944c24cfd6623f063b84a05adba6dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=349eba9e0944c24cfd6623f06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 16:22:53 2010 +0100 server: Make terminate_process more robust against recursive calls for the same process. --- server/process.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/server/process.c b/server/process.c index 379bec6..e4dca68 100644 --- a/server/process.c +++ b/server/process.c @@ -562,23 +562,17 @@ static void process_unload_dll( struct process *process, mod_handle_t base ) /* terminate a process with the given exit code */ static void terminate_process( struct process *process, struct thread *skip, int exit_code ) { - struct list *ptr; - - if (skip && skip->process == process) /* move it to the end of the list */ - { - assert( skip->state != TERMINATED ); - list_remove( &skip->proc_entry ); - list_add_tail( &process->thread_list, &skip->proc_entry ); - } + struct thread *thread; grab_object( process ); /* make sure it doesn't get freed when threads die */ - while ((ptr = list_head( &process->thread_list ))) +restart: + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) { - struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); - if (exit_code) thread->exit_code = exit_code; - if (thread == skip) break; + if (thread == skip) continue; + if (thread->state == TERMINATED) continue; kill_thread( thread, 1 ); + goto restart; } release_object( process ); }

1 0