February 2011 - Wine-Commits

Kusanagi Kouichi : gdi32: Upper 24 bits of a character range must be same.
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: 2d6b748c79f51b473973ed71fe2b867ba07a6c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6b748c79f51b473973ed71f… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Feb 2 01:37:09 2011 +0900 gdi32: Upper 24 bits of a character range must be same. --- dlls/gdi32/font.c | 2 + dlls/gdi32/tests/font.c | 67 +++++++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3df3d0b..6f1f867 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1571,6 +1571,8 @@ static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT case 1361: if (lastChar > 0xffff) return NULL; + if ((firstChar ^ lastChar) > 0xff) + return NULL; break; default: if (lastChar > 0xff) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 538e983..01411ff 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -922,18 +922,36 @@ static void test_GetCharABCWidths(void) DWORD nb; static const struct { + UINT first; + UINT last; + } range[] = + { + {0xff, 0xff}, + {0x100, 0x100}, + {0xff, 0x100}, + {0x1ff, 0xff00}, + {0xffff, 0xffff}, + {0x10000, 0x10000}, + {0xffff, 0x10000}, + {0xffffff, 0xffffff}, + {0x1000000, 0x1000000}, + {0xffffff, 0x1000000}, + {0xffffffff, 0xffffffff} + }; + static const struct + { UINT cs; UINT a; UINT w; - BOOL r[10]; + BOOL r[sizeof range / sizeof range[0]]; } c[] = { {ANSI_CHARSET, 0x30, 0x30, {TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, - {SHIFTJIS_CHARSET, 0x82a0, 0x3042, {TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, - {HANGEUL_CHARSET, 0x8141, 0xac02, {TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, - {JOHAB_CHARSET, 0x8446, 0x3135, {TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, - {GB2312_CHARSET, 0x8141, 0x4e04, {TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, - {CHINESEBIG5_CHARSET, 0xa142, 0x3001, {TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}} + {SHIFTJIS_CHARSET, 0x82a0, 0x3042, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, + {HANGEUL_CHARSET, 0x8141, 0xac02, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, + {JOHAB_CHARSET, 0x8446, 0x3135, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, + {GB2312_CHARSET, 0x8141, 0x4e04, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, + {CHINESEBIG5_CHARSET, 0xa142, 0x3001, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}} }; UINT i; @@ -979,7 +997,7 @@ static void test_GetCharABCWidths(void) { ABC a[2], w[2]; ABC full[256]; - UINT code = 0x41; + UINT code = 0x41, j; lf.lfFaceName[0] = '\0'; lf.lfCharSet = c[i].cs; @@ -1007,35 +1025,12 @@ static void test_GetCharABCWidths(void) ok(memcmp(&a[0], &full[code], sizeof(ABC)) == 0, "GetCharABCWidthsA info should match. codepage = %u\n", c[i].cs); - ret = pGetCharABCWidthsA(hdc, 0xff, 0xff, abc); - ok(ret == c[i].r[0], "GetCharABCWidthsA should have %s\n", c[i].r[0] ? "succeeded" : "failed"); - - ret = pGetCharABCWidthsA(hdc, 0x100, 0x100, abc); - ok(ret == c[i].r[1], "GetCharABCWidthsA should have %s\n", c[i].r[1] ? "succeeded" : "failed"); - - ret = pGetCharABCWidthsA(hdc, 0xff, 0x100, a); - ok(ret == c[i].r[2], "GetCharABCWidthsA should have %s\n", c[i].r[2] ? "succeeded" : "failed"); - - ret = pGetCharABCWidthsA(hdc, 0xffff, 0xffff, abc); - ok(ret == c[i].r[3], "GetCharABCWidthsA should have %s\n", c[i].r[3] ? "succeeded" : "failed"); - - ret = pGetCharABCWidthsA(hdc, 0x10000, 0x10000, abc); - ok(ret == c[i].r[4], "GetCharABCWidthsA should have %s\n", c[i].r[4] ? "succeeded" : "failed"); - - ret = pGetCharABCWidthsA(hdc, 0xffff, 0x10000, a); - ok(ret == c[i].r[5], "GetCharABCWidthsA should have %s\n", c[i].r[5] ? "succeeded" : "failed"); - - ret = pGetCharABCWidthsA(hdc, 0xffffff, 0xffffff, abc); - ok(ret == c[i].r[6], "GetCharABCWidthsA should have %s\n", c[i].r[6] ? "succeeded" : "failed"); - - ret = pGetCharABCWidthsA(hdc, 0x1000000, 0x1000000, abc); - ok(ret == c[i].r[7], "GetCharABCWidthsA should have %s\n", c[i].r[7] ? "succeeded" : "failed"); - - ret = pGetCharABCWidthsA(hdc, 0xffffff, 0x1000000, a); - ok(ret == c[i].r[8], "GetCharABCWidthsA should have %s\n", c[i].r[8] ? "succeeded" : "failed"); - - ret = pGetCharABCWidthsA(hdc, 0xffffffff, 0xffffffff, abc); - ok(ret == c[i].r[9], "GetCharABCWidthsA should have %s\n", c[i].r[9] ? "succeeded" : "failed"); + for (j = 0; j < sizeof range / sizeof range[0]; ++j) + { + ret = pGetCharABCWidthsA(hdc, range[j].first, range[j].last, full); + ok(ret == c[i].r[j], "GetCharABCWidthsA %x - %x should have %s\n", + range[j].first, range[j].last, c[i].r[j] ? "succeeded" : "failed"); + } hfont = SelectObject(hdc, hfont); DeleteObject(hfont);

1 0

Nikolay Sivov : ntdll: Fix a compile time warning.
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: d3d06c46d2cd5dc7d214b3e7f6a978b8141c02b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d06c46d2cd5dc7d214b3e7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 00:58:18 2011 +0300 ntdll: Fix a compile time warning. --- dlls/ntdll/file.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 68bed0e..4d49956 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1290,11 +1290,11 @@ static void ignore_server_ioctl_struct_holes (ULONG code, const void *in_buffer, #ifdef VALGRIND_MAKE_MEM_DEFINED # define IGNORE_STRUCT_HOLE(buf, size, t, f1, f2) \ do { \ - if ((size) >= FIELD_OFFSET(t, f2) && \ - FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1) < FIELD_OFFSET(t, f2)) \ - VALGRIND_MAKE_MEM_DEFINED( \ - (const char *)(buf) + FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1), \ - FIELD_OFFSET(t, f2) - FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1)); \ + if (FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1) < FIELD_OFFSET(t, f2)) \ + if ((size) >= FIELD_OFFSET(t, f2)) \ + VALGRIND_MAKE_MEM_DEFINED( \ + (const char *)(buf) + FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1), \ + FIELD_OFFSET(t, f2) - FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1)); \ } while (0) switch (code)

1 0

Paul Vriens : shdocvw: Initialize variable (Coverity).
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: b03f8771637f69f9b74aa24dd6881c2b9db20bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03f8771637f69f9b74aa24dd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Feb 1 15:12:17 2011 +0100 shdocvw: Initialize variable (Coverity). --- dlls/shdocvw/iexplore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 3b652cb..f8d74ac 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -173,7 +173,7 @@ static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) HANDLE findhandle; WIN32_FIND_DATAW finddata; IUniformResourceLocatorW* urlobj; - IPersistFile* urlfile; + IPersistFile* urlfile = NULL; HRESULT res; lstrcpyW(path, dir);

1 0

Paul Vriens : explorerframe/tests: Don' t compare potentially uninitialized variables (Coverity).
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: fd2bf1fae12f7824bd87b4b49d0f6ae1e55130c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2bf1fae12f7824bd87b4b49… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Feb 1 14:46:14 2011 +0100 explorerframe/tests: Don't compare potentially uninitialized variables (Coverity). --- dlls/explorerframe/tests/nstc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index df69a1a..047d7cd 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -811,7 +811,6 @@ static void test_basics(void) } ILFree(pidl_desktop); } - ok(psidesktop != psidesktop2, "psidesktop == psidesktop2\n"); IShellFolder_Release(psfdesktop); if(FAILED(hr)) @@ -820,6 +819,8 @@ static void test_basics(void) return; } + ok(psidesktop != psidesktop2, "psidesktop == psidesktop2\n"); + CreateFilesFolders(); GetCurrentDirectoryW(MAX_PATH, curdirW); ok(lstrlenW(curdirW), "Got 0 length string.\n");

1 0

Alexandre Julliard : msvcrt: longjmp doesn't have a return value.
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: 9b76c16e7ed2999a8e5ea087b7be79308b37176e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b76c16e7ed2999a8e5ea087b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 1 16:34:42 2011 +0100 msvcrt: longjmp doesn't have a return value. --- dlls/msvcrt/except.c | 2 +- include/msvcrt/setjmp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 94a4367..db36af6 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -473,7 +473,7 @@ int CDECL __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, /********************************************************************* * longjmp (MSVCRT.@) */ -int CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) +void CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) { unsigned long cur_frame = 0; diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index ded4c9a..2468373 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -95,7 +95,7 @@ extern "C" { #endif int __cdecl _setjmp(jmp_buf); -int __cdecl longjmp(jmp_buf,int); +void __cdecl longjmp(jmp_buf,int); #ifdef __cplusplus }

1 0

André Hentschel : kernel32: Use define instead of hardcoded value.
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: 008cf3c18cf9a73f1ec1a11582e2d5e90a1caa0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=008cf3c18cf9a73f1ec1a1158… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 31 19:52:54 2011 +0100 kernel32: Use define instead of hardcoded value. --- dlls/kernel32/tests/volume.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index f632eb0..4484a80 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -20,6 +20,7 @@ #include "wine/test.h" #include "winbase.h" +#include "winioctl.h" #include <stdio.h> static HINSTANCE hdll; @@ -509,7 +510,7 @@ static void test_enum_vols(void) pFindVolumeClose( hFind ); } -static void test_ioctl_560000(void) +static void test_disk_extents(void) { BOOL ret; DWORD size; @@ -523,10 +524,11 @@ static void test_ioctl_560000(void) return; } size = 0; - ret = DeviceIoControl( handle, 0x560000, &data, sizeof(data), &data, sizeof(data), &size, NULL ); + ret = DeviceIoControl( handle, IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS, &data, + sizeof(data), &data, sizeof(data), &size, NULL ); if (!ret && GetLastError() == ERROR_INVALID_FUNCTION) { - win_skip("ioctl 0x560000 not supported\n"); + win_skip("IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS not supported\n"); CloseHandle( handle ); return; } @@ -555,5 +557,5 @@ START_TEST(volume) test_GetLogicalDriveStringsW(); test_GetVolumeInformationA(); test_enum_vols(); - test_ioctl_560000(); + test_disk_extents(); }

1 0

Hans Leidekker : programs: Add winemsibuilder.
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: 13700720573bdbadb3bbeb25f1e8a88c11dbf605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13700720573bdbadb3bbeb25f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 14:01:42 2011 +0100 programs: Add winemsibuilder. --- configure | 1 + configure.ac | 1 + programs/winemsibuilder/Makefile.in | 8 + programs/winemsibuilder/main.c | 281 +++++++++++++++++++++++++++++++++++ 4 files changed, 291 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 89cbede..64a7c50 100755 --- a/configure +++ b/configure @@ -15427,6 +15427,7 @@ wine_fn_config_program winedevice enable_winedevice install wine_fn_config_program winefile enable_winefile po,install,installbin wine_fn_config_program winemenubuilder enable_winemenubuilder install wine_fn_config_program winemine enable_winemine po,install,installbin +wine_fn_config_program winemsibuilder enable_winemsibuilder install wine_fn_config_program winepath enable_winepath install,installbin wine_fn_config_program winetest enable_winetest wine_fn_config_program winevdm enable_win16 install diff --git a/configure.ac b/configure.ac index 48ed667..6d8b574 100644 --- a/configure.ac +++ b/configure.ac @@ -2928,6 +2928,7 @@ WINE_CONFIG_PROGRAM(winedevice,,[install]) WINE_CONFIG_PROGRAM(winefile,,[po,install,installbin]) WINE_CONFIG_PROGRAM(winemenubuilder,,[install]) WINE_CONFIG_PROGRAM(winemine,,[po,install,installbin]) +WINE_CONFIG_PROGRAM(winemsibuilder,,[install]) WINE_CONFIG_PROGRAM(winepath,,[install,installbin]) WINE_CONFIG_PROGRAM(winetest) WINE_CONFIG_PROGRAM(winevdm,enable_win16,[install]) diff --git a/programs/winemsibuilder/Makefile.in b/programs/winemsibuilder/Makefile.in new file mode 100644 index 0000000..14517f1 --- /dev/null +++ b/programs/winemsibuilder/Makefile.in @@ -0,0 +1,8 @@ +MODULE = winemsibuilder.exe +APPMODE = -mconsole -municode +IMPORTS = msi ole32 +EXTRADEFS = -DWINE_NO_UNICODE_MACROS + +C_SRCS = main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/winemsibuilder/main.c b/programs/winemsibuilder/main.c new file mode 100644 index 0000000..ea4607e --- /dev/null +++ b/programs/winemsibuilder/main.c @@ -0,0 +1,281 @@ +/* + * winemsibuilder - tool to build MSI packages + * + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS + +#include <stdio.h> +#include <windows.h> +#include <msi.h> +#include <msiquery.h> +#include <objbase.h> + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winemsibuilder); + +static UINT open_database( const WCHAR *msifile, MSIHANDLE *handle ) +{ + UINT r; + MSIHANDLE hdb; + + if (GetFileAttributesW( msifile ) == INVALID_FILE_ATTRIBUTES) + { + r = MsiOpenDatabaseW( msifile, MSIDBOPEN_CREATE, &hdb ); + if (r != ERROR_SUCCESS) + { + WINE_ERR( "failed to create package database %s (%u)\n", wine_dbgstr_w(msifile), r ); + return r; + } + r = MsiDatabaseCommit( hdb ); + if (r != ERROR_SUCCESS) + { + WINE_ERR( "failed to commit database (%u)\n", r ); + MsiCloseHandle( hdb ); + return r; + } + } + else + { + r = MsiOpenDatabaseW( msifile, MSIDBOPEN_TRANSACT, &hdb ); + if (r != ERROR_SUCCESS) + { + WINE_ERR( "failed to open package database %s (%u)\n", wine_dbgstr_w(msifile), r ); + return r; + } + } + + *handle = hdb; + return ERROR_SUCCESS; +} + +static int import_tables( const WCHAR *msifile, WCHAR **tables ) +{ + UINT r; + MSIHANDLE hdb; + WCHAR *dir; + DWORD len; + + r = open_database( msifile, &hdb ); + if (r != ERROR_SUCCESS) return 1; + + len = GetCurrentDirectoryW( 0, NULL ); + if (!(dir = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + { + MsiCloseHandle( hdb ); + return 1; + } + GetCurrentDirectoryW( len + 1, dir ); + + while (*tables) + { + r = MsiDatabaseImportW( hdb, dir, *tables ); + if (r != ERROR_SUCCESS) + { + WINE_ERR( "failed to import table %s (%u)\n", wine_dbgstr_w(*tables), r ); + break; + } + tables++; + } + + if (r == ERROR_SUCCESS) + { + r = MsiDatabaseCommit( hdb ); + if (r != ERROR_SUCCESS) + WINE_ERR( "failed to commit changes (%u)\n", r ); + } + + HeapFree( GetProcessHeap(), 0, dir ); + MsiCloseHandle( hdb ); + return (r != ERROR_SUCCESS); +} + +/* taken from dlls/msi/table.c */ +static int utf2mime( int x ) +{ + if (x >= '0' && x <= '9') + return x - '0'; + if (x >= 'A' && x <= 'Z') + return x - 'A' + 10; + if (x >= 'a' && x <= 'z') + return x - 'a' + 10 + 26; + if (x == '.') + return 10 + 26 + 26; + if (x == '_') + return 10 + 26 + 26 + 1; + return -1; +} + +#define MAX_STREAM_NAME 0x1f + +static WCHAR *encode_stream( const WCHAR *in ) +{ + DWORD c, next, count; + WCHAR *out, *p; + + count = strlenW( in ); + if (count > MAX_STREAM_NAME) + return NULL; + + count += 2; + if (!(out = HeapAlloc( GetProcessHeap(), 0, count * sizeof(WCHAR) ))) return NULL; + p = out; + while (count--) + { + c = *in++; + if (!c) + { + *p = c; + return out; + } + if (c < 0x80 && utf2mime( c ) >= 0) + { + c = utf2mime( c ) + 0x4800; + next = *in; + if (next && next < 0x80) + { + next = utf2mime( next ); + if (next != -1) + { + next += 0x3ffffc0; + c += next << 6; + in++; + } + } + } + *p++ = c; + } + HeapFree( GetProcessHeap(), 0, out ); + return NULL; +} + +static int add_stream( const WCHAR *msifile, const WCHAR *stream, const WCHAR *file ) +{ + UINT r; + HRESULT hr; + MSIHANDLE hdb; + IStorage *stg; + IStream *stm = NULL; + HANDLE handle; + char buffer[4096]; + ULARGE_INTEGER size; + DWORD low, high, read; + WCHAR *encname; + int ret = 1; + + /* make sure we have the right type of file */ + r = open_database( msifile, &hdb ); + if (r != ERROR_SUCCESS) return 1; + MsiCloseHandle( hdb ); + + hr = StgOpenStorage( msifile, NULL, STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg ); + if (hr != S_OK) + { + WINE_WARN( "failed to open storage %s (0x%08x)\n", wine_dbgstr_w(msifile), hr ); + return 1; + } + encname = encode_stream( stream ); + if (!encname) + { + WINE_WARN( "failed to encode stream name %s\n", wine_dbgstr_w(stream) ); + goto done; + } + hr = IStorage_CreateStream( stg, encname, STGM_CREATE|STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); + if (hr != S_OK) + { + WINE_WARN( "failed to create stream %s (0x%08x)\n", wine_dbgstr_w(encname), hr ); + goto done; + } + handle = CreateFileW( file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); + if (handle == INVALID_HANDLE_VALUE) + { + WINE_WARN( "failed to open file %s (%u)\n", wine_dbgstr_w(file), GetLastError() ); + goto done; + } + low = GetFileSize( handle, &high ); + if (low == INVALID_FILE_SIZE || high) + { + WINE_WARN( "file %s too big\n", wine_dbgstr_w(file) ); + CloseHandle( handle ); + goto done; + } + size.QuadPart = low; + hr = IStream_SetSize( stm, size ); + if (hr != S_OK) goto done; + + while (ReadFile( handle, buffer, sizeof(buffer), &read, NULL ) && read) + { + hr = IStream_Write( stm, buffer, read, NULL ); + if (hr != S_OK) break; + size.QuadPart -= read; + } + CloseHandle( handle ); + if (size.QuadPart) + { + WINE_WARN( "failed to write stream contents\n" ); + goto done; + } + IStorage_Commit( stg, 0 ); + ret = 0; + +done: + HeapFree( GetProcessHeap(), 0, encname ); + if (stm) IStream_Release( stm ); + IStorage_Release( stg ); + return ret; +} + +static void show_usage( void ) +{ + WINE_MESSAGE( + "Usage: winemsibuilder [OPTION] [MSIFILE] ...\n" + "Options:\n" + " -i package.msi table1.idt [table2.idt ...] Import one or more tables into the database.\n" + " -a package.msi stream file Add 'stream' to storage with contents of 'file'.\n" + "\nExisting tables or streams will be overwritten. If package.msi does not exist a new file\n" + "will be created with an empty database.\n" + ); +} + +int wmain( int argc, WCHAR *argv[] ) +{ + if (argc < 3 || argv[1][0] != '-') + { + show_usage(); + return 1; + } + + switch (argv[1][1]) + { + case 'i': + if (argc < 4) break; + return import_tables( argv[2], argv + 3 ); + case 'a': + if (argc < 5) break; + return add_stream( argv[2], argv[3], argv[4] ); + default: + WINE_WARN( "unknown option\n" ); + break; + } + + show_usage(); + return 1; +}

1 0

Hans Leidekker : msi: Handle out-of-memory condition in encode_streamname.
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: bf192f6ac96fe372ad0fbed5ed5b657a091e1c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf192f6ac96fe372ad0fbed5e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 1 14:02:01 2011 +0100 msi: Handle out-of-memory condition in encode_streamname. --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index d3675e2..739e189 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -156,7 +156,7 @@ LPWSTR encode_streamname(BOOL bTable, LPCWSTR in) if( !bTable ) count = lstrlenW( in )+2; - out = msi_alloc( count*sizeof(WCHAR) ); + if (!(out = msi_alloc( count*sizeof(WCHAR) ))) return NULL; p = out; if( bTable )

1 0

Alexandre Julliard : ntdll: Add support for longjmp in RtlUnwindEx.
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: 10dcc85de0d829eb274b22d47d1f883e3ef87b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10dcc85de0d829eb274b22d47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 1 16:34:04 2011 +0100 ntdll: Add support for longjmp in RtlUnwindEx. --- dlls/ntdll/signal_x86_64.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 86f5c93..0fc53c7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -100,6 +100,33 @@ typedef struct _SCOPE_TABLE } SCOPE_TABLE, *PSCOPE_TABLE; +/* layering violation: the setjmp buffer is defined in msvcrt, but used by RtlUnwindEx */ +struct MSVCRT_JUMP_BUFFER +{ + ULONG64 Frame; + ULONG64 Rbx; + ULONG64 Rsp; + ULONG64 Rbp; + ULONG64 Rsi; + ULONG64 Rdi; + ULONG64 R12; + ULONG64 R13; + ULONG64 R14; + ULONG64 R15; + ULONG64 Rip; + ULONG64 Spare; + M128A Xmm6; + M128A Xmm7; + M128A Xmm8; + M128A Xmm9; + M128A Xmm10; + M128A Xmm11; + M128A Xmm12; + M128A Xmm13; + M128A Xmm14; + M128A Xmm15; +}; + /*********************************************************************** * signal context platform-specific definitions */ @@ -3008,6 +3035,31 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec context = new_context; } + + if (rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) + { + struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; + context.Rbx = jmp->Rbx; + context.Rsp = jmp->Rsp; + context.Rbp = jmp->Rbp; + context.Rsi = jmp->Rsi; + context.Rdi = jmp->Rdi; + context.R12 = jmp->R12; + context.R13 = jmp->R13; + context.R14 = jmp->R14; + context.R15 = jmp->R15; + context.Rip = jmp->Rip; + context.u.s.Xmm6 = jmp->Xmm6; + context.u.s.Xmm7 = jmp->Xmm7; + context.u.s.Xmm8 = jmp->Xmm8; + context.u.s.Xmm9 = jmp->Xmm9; + context.u.s.Xmm10 = jmp->Xmm10; + context.u.s.Xmm11 = jmp->Xmm11; + context.u.s.Xmm12 = jmp->Xmm12; + context.u.s.Xmm13 = jmp->Xmm13; + context.u.s.Xmm14 = jmp->Xmm14; + context.u.s.Xmm15 = jmp->Xmm15; + } context.Rax = (ULONG64)retval; context.Rip = (ULONG64)target_ip; TRACE( "returning to %lx stack %lx\n", context.Rip, context.Rsp );

1 0

David Hedberg : gdi32: Stay within the clipping area when painting text background.
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: 81bbd17c406e37ea23e8f86f95d307c0c45e2bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81bbd17c406e37ea23e8f86f9… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Sun Jan 30 20:47:55 2011 +0800 gdi32: Stay within the clipping area when painting text background. --- dlls/gdi32/font.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b4aa9bc..3df3d0b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2030,7 +2030,16 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, rc.right = x + width.x; rc.top = y - tm.tmAscent; rc.bottom = y + tm.tmDescent; - dc->funcs->pExtTextOut(dc->physDev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL); + + if(flags & ETO_CLIPPED) + { + rc.left = max(lprect->left, rc.left); + rc.right = min(lprect->right, rc.right); + rc.top = max(lprect->top, rc.top); + rc.bottom = min(lprect->bottom, rc.bottom); + } + if(rc.left < rc.right && rc.top < rc.bottom) + dc->funcs->pExtTextOut(dc->physDev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL); } } }

1 0