June 2007 - Wine-commits - list.winehq.org

lostwages/ include/winehq.conf news/2007061501.xml
by Alexandre Julliard 15 Jun '07

15 Jun '07

ChangeSet ID: 31203 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/06/15 10:09:51 Modified files: include : winehq.conf Added files: news : 2007061501.xml Log message: Release 0.9.39 Patch: http://cvs.winehq.org/patch.py?id=31203 Old revision New revision Changes Path 1.61 1.62 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007061501.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.61 lostwages/include/winehq.conf:1.62 --- lostwages/include/winehq.conf:1.61 15 Jun 2007 15: 9:51 -0000 +++ lostwages/include/winehq.conf 15 Jun 2007 15: 9:51 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.38 +snapshot_date: 0.9.39 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007061501.xml diff -u -p /dev/null lostwages/news/2007061501.xml:1.1 --- /dev/null 15 Jun 2007 15: 9:51 -0000 +++ lostwages/news/2007061501.xml 15 Jun 2007 15: 9:51 -0000 @@ -0,0 +1,26 @@ +<news> +<date>June 15, 2007</date> +<title>Wine 0.9.39 Released</title> +<body> +<p>Wine 0.9.39 was released today, with the following main changes:</p> + +<ul> +<li>Many MSHTML improvements.</li> +<li>Several improvements to the sound support.</li> +<li>A number of Winsock fixes.</li> +<li>Several new supported constructs in the IDL compiler.</li> +<li>Many Direct3D threading fixes.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.39.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.39">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.39.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: d9dec068c3c6130e28fb403ee3949808e87c5515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9dec068c3c6130e28fb403ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 15 16:51:04 2007 +0200 Release 0.9.39. --- ANNOUNCE | 996 +++++++++++++++++-------------------- ChangeLog | 1670 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2143 insertions(+), 543 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9dec068c3c6130e28fb4…

1 0

Tag wine-0.9.39 : Alexandre Julliard : Release 0.9.39
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: refs/tags/wine-0.9.39 Tag: 1f141bf964cbf64ff47e9f07c8a1b80f9551bf16 URL: http://source.winehq.org/git/wine.git/?a=tag;h=1f141bf964cbf64ff47e9f07c8a1… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 15 16:51:05 2007 +0200 Release 0.9.39

1 0

Evan Stade : gdiplus: Brush tests.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: e4fdc9690c6b12e0dc0db4f064100724e378a75e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fdc9690c6b12e0dc0db4f06… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jun 14 16:09:14 2007 -0700 gdiplus: Brush tests. --- dlls/gdiplus/tests/Makefile.in | 1 + dlls/gdiplus/tests/brush.c | 76 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 8cb6810..45853f6 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = gdiplus.dll IMPORTS = gdiplus kernel32 CTESTS = \ + brush.c \ pen.c @MAKE_TEST_RULES@ diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c new file mode 100644 index 0000000..7c72f48 --- /dev/null +++ b/dlls/gdiplus/tests/brush.c @@ -0,0 +1,76 @@ +/* + * Unit test suite for brushes + * + * Copyright (C) 2007 Google (Evan Stade) + * + * 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 "windef.h" +#include "gdiplus.h" +#include "wine/test.h" + +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + +static void test_constructor_destructor(void) +{ + GpStatus status; + GpSolidFill *brush = NULL; + + status = GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); + expect(Ok, status); + ok(brush != NULL, "Expected brush to be initialized\n"); + + status = GdipDeleteBrush(NULL); + expect(InvalidParameter, status); + + status = GdipDeleteBrush((GpBrush*) brush); + expect(Ok, status); +} + +static void test_type(void) +{ + GpStatus status; + GpBrushType bt; + GpSolidFill *brush = NULL; + + GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); + + status = GdipGetBrushType((GpBrush*)brush, &bt); + expect(status, Ok); + expect(bt, BrushTypeSolidColor); + + GdipDeleteBrush((GpBrush*) brush); +} + +START_TEST(brush) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_constructor_destructor(); + test_type(); + + GdiplusShutdown(gdiplusToken); +}

1 0

Evan Stade : gdiplus: Brush implementation.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: cc0a676b22134a68b69f8f268ca308c3920bc0f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0a676b22134a68b69f8f268… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jun 14 16:09:07 2007 -0700 gdiplus: Brush implementation. --- dlls/gdiplus/Makefile.in | 1 + dlls/gdiplus/brush.c | 57 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 6 ++-- dlls/gdiplus/gdiplus_private.h | 11 +++++++- 4 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index d1089af..b2bd0c4 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -7,6 +7,7 @@ IMPORTLIB = libgdiplus.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 ntdll C_SRCS = \ + brush.c \ gdiplus.c \ graphics.c \ pen.c diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c new file mode 100644 index 0000000..2a27fc8 --- /dev/null +++ b/dlls/gdiplus/brush.c @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2007 Google (Evan Stade) + * + * 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 "windef.h" +#include "wingdi.h" +#include "gdiplus.h" +#include "gdiplus_private.h" + +GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) +{ + COLORREF col = ARGB2COLORREF(color); + + if(!sf) return InvalidParameter; + + *sf = GdipAlloc(sizeof(GpSolidFill)); + if (!*sf) return OutOfMemory; + + (*sf)->brush.gdibrush = CreateSolidBrush(col); + (*sf)->brush.bt = BrushTypeSolidColor; + (*sf)->brush.color = col; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetBrushType(GpBrush *brush, GpBrushType *type) +{ + if(!brush || !type) return InvalidParameter; + + *type = brush->bt; + + return Ok; +} + +GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) +{ + if(!brush) return InvalidParameter; + + DeleteObject(brush->gdibrush); + GdipFree(brush); + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 142011f..c7a4dc1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -119,7 +119,7 @@ @ stub GdipCreateRegionRect @ stub GdipCreateRegionRectI @ stub GdipCreateRegionRgnData -@ stub GdipCreateSolidFill +@ stdcall GdipCreateSolidFill(long ptr) @ stub GdipCreateStreamOnFile @ stub GdipCreateStringFormat @ stub GdipCreateTexture2 @@ -127,7 +127,7 @@ @ stub GdipCreateTexture @ stub GdipCreateTextureIA @ stub GdipCreateTextureIAI -@ stub GdipDeleteBrush +@ stdcall GdipDeleteBrush(ptr) @ stub GdipDeleteCachedBitmap @ stub GdipDeleteCustomLineCap @ stub GdipDeleteFont @@ -228,7 +228,7 @@ @ stub GdipGetAdjustableArrowCapMiddleInset @ stub GdipGetAdjustableArrowCapWidth @ stub GdipGetAllPropertyItems -@ stub GdipGetBrushType +@ stdcall GdipGetBrushType(ptr ptr) @ stub GdipGetCellAscent @ stub GdipGetCellDescent @ stub GdipGetClip diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f6e238a..6cb2e43 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -20,7 +20,6 @@ #define __WINE_GP_PRIVATE_H_ #include "windef.h" -#include "winbase.h" #include "gdiplus.h" #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_ENDCAP_FLAT) @@ -40,4 +39,14 @@ struct GpGraphics{ HWND hwnd; }; +struct GpBrush{ + HBRUSH gdibrush; + GpBrushType bt; + COLORREF color; +}; + +struct GpSolidFill{ + GpBrush brush; +}; + #endif

1 0

Kolbjørn Fredheim : winex11.drv: Echo the video mode requested in the error message when not finding a matching mode .
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: c960cae9794514752324111f53b5ba55fd5a2a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c960cae9794514752324111f5… Author: Kolbjørn Fredheim <hightower(a)tregt.net> Date: Fri Jun 15 09:51:35 2007 +0200 winex11.drv: Echo the video mode requested in the error message when not finding a matching mode. --- dlls/winex11.drv/settings.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index fd4671a..cc6dd2c 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -303,7 +303,9 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, } /* no valid modes found */ - ERR("No matching mode found! (%s)\n", handler_name); + ERR("No matching mode found(%dx%dx%d)! (%s)\n", + devmode->dmPelsWidth, devmode->dmPelsHeight, + devmode->dmBitsPerPel, handler_name); return DISP_CHANGE_BADMODE; }

1 0

Jason Edmeades : cmd.exe: Add support for cmd.exe /u ( Unicode from internal pgms).
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 7e9d498d1ec15b6bd20542e58bb725e006735ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9d498d1ec15b6bd20542e58… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Thu Jun 14 23:06:37 2007 +0100 cmd.exe: Add support for cmd.exe /u (Unicode from internal pgms). --- programs/cmd/wcmdmain.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2a7afe1..3f4cdd0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -92,6 +92,7 @@ extern struct env_stack *pushd_directories; static const WCHAR *pagedMessage = NULL; static char *output_bufA = NULL; #define MAX_WRITECONSOLE_SIZE 65535 +BOOL unicodePipes = FALSE; static WCHAR *WCMD_expand_envvar(WCHAR *start); @@ -141,6 +142,10 @@ int wmain (int argc, WCHAR *argvW[]) opt_k=1; } else if (tolowerW(c)=='s') { opt_s=1; + } else if (tolowerW(c)=='a') { + unicodePipes=FALSE; + } else if (tolowerW(c)=='u') { + unicodePipes=TRUE; } else if (tolowerW(c)=='t' && (*argvW)[2]==':') { opt_t=strtoulW(&(*argvW)[3], NULL, 16); } else if (tolowerW(c)=='x' || tolowerW(c)=='y') { @@ -1306,22 +1311,27 @@ static void WCMD_output_asis_len(const WCHAR *message, int len) { BOOL usedDefaultChar = FALSE; DWORD convertedChars; - /* - * Allocate buffer to use when writing to file. (Not freed, as one off) - */ - if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); - if (!output_bufA) { - WINE_FIXME("Out of memory - could not allocate ansi 64K buffer\n"); - return; - } + if (!unicodePipes) { + /* + * Allocate buffer to use when writing to file. (Not freed, as one off) + */ + if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0, + MAX_WRITECONSOLE_SIZE); + if (!output_bufA) { + WINE_FIXME("Out of memory - could not allocate ansi 64K buffer\n"); + return; + } - /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, message, - len, output_bufA, MAX_WRITECONSOLE_SIZE, - "?", &usedDefaultChar); - WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), output_bufA, convertedChars, - &nOut, FALSE); + /* Convert to OEM, then output */ + convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, message, + len, output_bufA, MAX_WRITECONSOLE_SIZE, + "?", &usedDefaultChar); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), output_bufA, convertedChars, + &nOut, FALSE); + } else { + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), message, len*sizeof(WCHAR), + &nOut, FALSE); + } } return; }

1 0

Misha Koshelev : setupapi: Handle unquoted paths in InstallHinfSection as native.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 41fd380005ca3e6a0fa81b5969ac462a62646e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41fd380005ca3e6a0fa81b596… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 14 16:37:08 2007 -0500 setupapi: Handle unquoted paths in InstallHinfSection as native. --- dlls/setupapi/install.c | 2 +- dlls/setupapi/tests/install.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 902216e..b53b266 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1024,7 +1024,7 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I path=d=s; while (*s) { - if (*s==0 || ((*s=='\t' || *s==' ') && !in_quotes)) { + if (*s==0) { /* end of this command line argument */ break; } else if (*s=='\\') { diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 3f447dd..5cecd97 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -121,7 +121,7 @@ static void test_cmdline(void) create_inf_file(infwithspaces, cmdline_inf); sprintf(path, "%s\\%s", CURR_DIR, infwithspaces); - todo_wine ok_cmdline("DefaultInstall", 128, path, TRUE); + ok_cmdline("DefaultInstall", 128, path, TRUE); sprintf(path, "\"%s\\%s\"", CURR_DIR, infwithspaces); todo_wine ok_cmdline("DefaultInstall", 128, path, FALSE);

1 0

Lei Zhang : comctl32: Make modal property sheets modal.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: ebb460c3c0c227392699fd1b0809f6f35ea52847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb460c3c0c227392699fd1b0… Author: Lei Zhang <thestig(a)google.com> Date: Thu Jun 14 18:41:43 2007 -0700 comctl32: Make modal property sheets modal. --- dlls/comctl32/propsheet.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 8740f01..04929c5 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2836,7 +2836,12 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) bRet = PROPSHEET_CreateDialog(psInfo); if(!psInfo->isModeless) + { + HWND parent = GetParent(psInfo->hwnd); + if (parent) EnableWindow(parent, FALSE); bRet = do_loop(psInfo); + if (parent) EnableWindow(parent, TRUE); + } return bRet; }

1 0

Misha Koshelev : setupapi/tests: Add basic tests for InstallHinfSectionA/ W command line processing.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 095c9bf26a9fbc4302743d988343e06a926d0534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=095c9bf26a9fbc4302743d988… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 14 16:36:56 2007 -0500 setupapi/tests: Add basic tests for InstallHinfSectionA/W command line processing. --- dlls/setupapi/tests/Makefile.in | 3 +- dlls/setupapi/tests/install.c | 179 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index e629670..23b0f5e 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -3,10 +3,11 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = setupapi.dll -IMPORTS = setupapi advapi32 kernel32 +IMPORTS = setupapi user32 advapi32 kernel32 CTESTS = \ devinst.c \ + install.c \ misc.c \ parser.c \ query.c \ diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c new file mode 100644 index 0000000..3f447dd --- /dev/null +++ b/dlls/setupapi/tests/install.c @@ -0,0 +1,179 @@ +/* + * Unit test for setupapi.dll install functions + * + * Copyright 2007 Misha Koshelev + * + * 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 <stdio.h> +#include <string.h> +#include <assert.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winuser.h" +#include "winreg.h" +#include "setupapi.h" + +#include "wine/test.h" + +static const char inffile[] = "test.inf"; +static char CURR_DIR[MAX_PATH]; + +/* Notes on InstallHinfSectionA/W: + * - InstallHinfSectionW on Win98 and InstallHinfSectionA on WinXP seem to be stubs - they do not do anything + * and simply return without displaying any error message or setting last error. We test whether + * InstallHinfSectionA sets last error, and if it doesn't we set it to NULL and use the W version if available. + * - These functions do not return a value and do not always set last error to ERROR_SUCCESS when installation still + * occurs (e.g., unquoted inf file with spaces, registry keys are written but last error is 6). Also, on Win98 last error + * is set to ERROR_SUCCESS even if install fails (e.g., quoted inf file with spaces, no registry keys set, MessageBox with + * "Installation Error" displayed). Thus, we must use functional tests (e.g., is registry key created) to determine whether + * or not installation occured. + * - On installation problems, a MessageBox() is displayed and a Beep() is issued. The MessageBox() is disabled with a + * CBT hook. + */ + +static void (WINAPI *pInstallHinfSectionA)(HWND, HINSTANCE, LPCSTR, INT); +static void (WINAPI *pInstallHinfSectionW)(HWND, HINSTANCE, LPCWSTR, INT); + +/* + * Helpers + */ + +static void create_inf_file(LPCSTR filename, const char *data) +{ + DWORD res; + HANDLE handle = CreateFile(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + assert(handle != INVALID_HANDLE_VALUE); + assert(WriteFile(handle, data, strlen(data), &res, NULL)); + CloseHandle(handle); +} + +/* CBT hook to ensure a window (e.g., MessageBox) cannot be created */ +static HHOOK hhook; +static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) +{ + return nCode == HCBT_CREATEWND ? 1: CallNextHookEx(hhook, nCode, wParam, lParam); +} + +/* + * Tests + */ + +static const char *cmdline_inf = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "AddReg=Add.Settings\n" + "[Add.Settings]\n" + "HKCU,Software\\Wine\\setupapitest,,\n"; + +static void ok_cmdline(LPCSTR section, int mode, LPCSTR path, BOOL expectsuccess) +{ + CHAR cmdline[MAX_PATH * 2]; + LONG ret; + + sprintf(cmdline, "%s %d %s", section, mode, path); + if (pInstallHinfSectionA) pInstallHinfSectionA(NULL, NULL, cmdline, 0); + else + { + WCHAR cmdlinew[MAX_PATH * 2]; + MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlinew, MAX_PATH*2); + pInstallHinfSectionW(NULL, NULL, cmdlinew, 0); + } + + /* Functional tests for success of install and clean up */ + ret = RegDeleteKey(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest"); + ok((expectsuccess && ret == ERROR_SUCCESS) || + (!expectsuccess && ret == ERROR_FILE_NOT_FOUND), + "Expected registry key Software\\Wine\\setupapitest to %s, RegDeleteKey returned %d\n", + expectsuccess ? "exist" : "not exist", + ret); +} + +/* Test command line processing */ +static void test_cmdline(void) +{ + static const char infwithspaces[] = "test file.inf"; + char path[MAX_PATH]; + + create_inf_file(inffile, cmdline_inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + ok_cmdline("DefaultInstall", 128, path, TRUE); + ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + + /* Test handling of spaces in path, unquoted and quoted */ + create_inf_file(infwithspaces, cmdline_inf); + + sprintf(path, "%s\\%s", CURR_DIR, infwithspaces); + todo_wine ok_cmdline("DefaultInstall", 128, path, TRUE); + + sprintf(path, "\"%s\\%s\"", CURR_DIR, infwithspaces); + todo_wine ok_cmdline("DefaultInstall", 128, path, FALSE); + + ok(DeleteFile(infwithspaces), "Expected source inf to exist, last error was %d\n", GetLastError()); +} + +START_TEST(install) +{ + HMODULE hsetupapi = GetModuleHandle("setupapi.dll"); + char temp_path[MAX_PATH], prev_path[MAX_PATH]; + DWORD len; + + GetCurrentDirectory(MAX_PATH, prev_path); + GetTempPath(MAX_PATH, temp_path); + SetCurrentDirectory(temp_path); + + strcpy(CURR_DIR, temp_path); + len = strlen(CURR_DIR); + if(len && (CURR_DIR[len - 1] == '\\')) + CURR_DIR[len - 1] = 0; + + pInstallHinfSectionA = (void *)GetProcAddress(hsetupapi, "InstallHinfSectionA"); + pInstallHinfSectionW = (void *)GetProcAddress(hsetupapi, "InstallHinfSectionW"); + if (pInstallHinfSectionA) + { + /* Check if pInstallHinfSectionA sets last error or is a stub (as on WinXP) */ + static const char *minimal_inf = "[Version]\nSignature=\"$Chicago$\"\n"; + char cmdline[MAX_PATH*2]; + create_inf_file(inffile, minimal_inf); + sprintf(cmdline, "DefaultInstall 128 %s\\%s", CURR_DIR, inffile); + SetLastError(0xdeadbeef); + pInstallHinfSectionA(NULL, NULL, cmdline, 0); + if (GetLastError() == 0xdeadbeef) + { + skip("InstallHinfSectionA is broken (stub)\n"); + pInstallHinfSectionA = NULL; + } + ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); + } + if (!pInstallHinfSectionW && !pInstallHinfSectionA) + skip("InstallHinfSectionA and InstallHinfSectionW are not available\n"); + else + { + /* Set CBT hook to disallow MessageBox creation in current thread */ + hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); + assert(hhook != 0); + + test_cmdline(); + + UnhookWindowsHookEx(hhook); + } + + SetCurrentDirectory(prev_path); +}

1 0