wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Alexandre Julliard : cabarc: Add support for starting a new folder with a ' +' file name.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: c24cd869cd17d6fc47f74cc7befdb11149762a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24cd869cd17d6fc47f74cc7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 14 17:27:29 2011 +0100 cabarc: Add support for starting a new folder with a '+' file name. --- programs/cabarc/cabarc.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 6528d70..2d1de8a 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -549,6 +549,7 @@ static BOOL add_file_or_directory( HFCI fci, WCHAR *name ) static int new_cabinet( char *cab_dir ) { + static const WCHAR plusW[] = {'+',0}; WCHAR **file; ERF erf; BOOL ret = FALSE; @@ -573,7 +574,12 @@ static int new_cabinet( char *cab_dir ) fci_write, fci_close, fci_lseek, fci_delete, fci_get_temp, &cab, NULL ); for (file = opt_files; *file; file++) - if (!(ret = add_file_or_directory( fci, *file ))) break; + { + if (!strcmpW( *file, plusW )) + FCIFlushFolder( fci, fci_get_next_cab, fci_status ); + else + if (!(ret = add_file_or_directory( fci, *file ))) break; + } if (ret) {

1 0

Alexandre Julliard : cabarc: Add support for specifying a maximum cabinet file.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 0c1e7ff7c4142d474ebd3dc234d95cd6e01f7639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1e7ff7c4142d474ebd3dc23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 14 17:24:53 2011 +0100 cabarc: Add support for specifying a maximum cabinet file. --- programs/cabarc/cabarc.c | 61 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 48 insertions(+), 13 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 2aeb88e..6528d70 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -63,12 +63,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); #define _A_ARCH 0x20 /* command-line options */ +static int opt_cabinet_size = CB_MAX_DISK; static int opt_cabinet_id; static int opt_compression = tcompTYPE_MSZIP; static int opt_recurse; static int opt_preserve_paths; static int opt_reserve_space; static int opt_verbose; +static char *opt_cab_file; static WCHAR *opt_dest_dir; static WCHAR **opt_files; @@ -106,6 +108,29 @@ static char *strdupWtoA( UINT cp, const WCHAR *str ) return ret; } +/* format a cabinet name by replacing the '*' wildcard by the cabinet id */ +static BOOL format_cab_name( char *dest, int id, const char *name ) +{ + const char *num = strchr( name, '*' ); + int len; + + if (!num) + { + if (id == 1) + { + strcpy( dest, name ); + return TRUE; + } + WINE_MESSAGE( "cabarc: Cabinet name must contain a '*' character\n" ); + return FALSE; + } + len = num - name; + memcpy( dest, name, len ); + len += sprintf( dest + len, "%u", id ); + lstrcpynA( dest + len, num + 1, CB_MAX_CABINET_NAME - len ); + return TRUE; +} + static int CDECL fci_file_placed( CCAB *cab, char *file, LONG size, BOOL continuation, void *ptr ) { if (!continuation && opt_verbose) printf( "adding %s\n", file ); @@ -219,8 +244,7 @@ static BOOL CDECL fci_get_temp( char *name, int size, void *ptr ) static BOOL CDECL fci_get_next_cab( CCAB *cab, ULONG prev_size, void *ptr ) { - WINE_ERR( "shouldn't happen\n" ); - return FALSE; + return format_cab_name( cab->szCab, cab->iCab, opt_cab_file ); } static LONG CDECL fci_status( UINT type, ULONG cb1, ULONG cb2, void *ptr ) @@ -364,14 +388,14 @@ static INT_PTR CDECL list_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf } } -static int list_cabinet( char *cab_dir, char *cab_file ) +static int list_cabinet( char *cab_dir ) { ERF erf; int ret = 0; HFDI fdi = FDICreate( cab_alloc, cab_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_lseek, cpuUNKNOWN, &erf ); - if (!FDICopy( fdi, cab_file, cab_dir, 0, list_notify, NULL, NULL )) ret = GetLastError(); + if (!FDICopy( fdi, opt_cab_file, cab_dir, 0, list_notify, NULL, NULL )) ret = GetLastError(); FDIDestroy( fdi ); return ret; } @@ -436,14 +460,14 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION } } -static int extract_cabinet( char *cab_dir, char *cab_file ) +static int extract_cabinet( char *cab_dir ) { ERF erf; int ret = 0; HFDI fdi = FDICreate( cab_alloc, cab_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_lseek, cpuUNKNOWN, &erf ); - if (!FDICopy( fdi, cab_file, cab_dir, 0, extract_notify, NULL, NULL )) ret = GetLastError(); + if (!FDICopy( fdi, opt_cab_file, cab_dir, 0, extract_notify, NULL, NULL )) ret = GetLastError(); FDIDestroy( fdi ); return ret; } @@ -523,7 +547,7 @@ static BOOL add_file_or_directory( HFCI fci, WCHAR *name ) return add_file( fci, name ); } -static int new_cabinet( char *cab_dir, char *cab_file ) +static int new_cabinet( char *cab_dir ) { WCHAR **file; ERF erf; @@ -531,7 +555,7 @@ static int new_cabinet( char *cab_dir, char *cab_file ) HFCI fci; CCAB cab; - cab.cb = CB_MAX_DISK; + cab.cb = opt_cabinet_size; cab.cbFolderThresh = CB_MAX_DISK; cab.cbReserveCFHeader = opt_reserve_space; cab.cbReserveCFFolder = 0; @@ -543,7 +567,7 @@ static int new_cabinet( char *cab_dir, char *cab_file ) strcpy( cab.szCabPath, cab_dir ); strcat( cab.szCabPath, "\\" ); - strcpy( cab.szCab, cab_file ); + format_cab_name( cab.szCab, 1, opt_cab_file ); fci = FCICreate( &erf, fci_file_placed, cab_alloc, cab_free,fci_open, fci_read, fci_write, fci_close, fci_lseek, fci_delete, fci_get_temp, &cab, NULL ); @@ -554,7 +578,7 @@ static int new_cabinet( char *cab_dir, char *cab_file ) if (ret) { if (!(ret = FCIFlushCabinet( fci, FALSE, fci_get_next_cab, fci_status ))) - WINE_MESSAGE( "cabarc: Failed to create cabinet %s\n", wine_dbgstr_a(cab_file) ); + WINE_MESSAGE( "cabarc: Failed to create cabinet %s\n", wine_dbgstr_a(opt_cab_file) ); } FCIDestroy( fci ); return !ret; @@ -569,6 +593,7 @@ static void usage( void ) " N Create a new cabinet\n" " X Extract files from the cabinet into dest_dir\n" "\nOptions:\n" + " -d size Set maximum disk size\n" " -h Display this help\n" " -i id Set cabinet id\n" " -m type Set compression type (mszip|none)\n" @@ -592,6 +617,15 @@ int wmain( int argc, WCHAR *argv[] ) { switch (argv[1][1]) { + case 'd': + argv++; argc--; + opt_cabinet_size = atoiW( argv[1] ); + if (opt_cabinet_size < 50000) + { + WINE_MESSAGE( "cabarc: Cabinet size must be at least 50000\n" ); + return 1; + } + break; case 'h': usage(); return 0; @@ -652,15 +686,16 @@ int wmain( int argc, WCHAR *argv[] ) for (p = argv[i]; *p; p++) if (*p == '/') *p = '\\'; opt_files = argv + 1; + opt_cab_file = file_part; switch (*command) { case 'l': case 'L': - return list_cabinet( buffer, file_part ); + return list_cabinet( buffer ); case 'n': case 'N': - return new_cabinet( buffer, file_part ); + return new_cabinet( buffer ); case 'x': case 'X': if (argc > 1) /* check for destination dir as last argument */ @@ -672,7 +707,7 @@ int wmain( int argc, WCHAR *argv[] ) argv[--argc] = NULL; } } - return extract_cabinet( buffer, file_part ); + return extract_cabinet( buffer ); default: usage(); return 1;

1 0

André Hentschel : wineusr: Fix a typo.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: docs Branch: master Commit: e762da805e1d4854577d76754f88b74fcbd1d3a0 URL: http://source.winehq.org/git/docs.git/?a=commit;h=e762da805e1d4854577d76754… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 6 20:02:36 2011 +0100 wineusr: Fix a typo. --- en/wineusr-configuring.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 1efb21a..6bfc27e 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -359,7 +359,7 @@ Wine can load Windows themes if you have them available. While this certainly isn't necessary in order to use Wine or applications, it does allow you to customize the look and feel of a program. Wine - supports the newer MSStyles typ of themese. Unlike the older Microsoft + supports the newer MSStyles type of themes. Unlike the older Microsoft Plus! style themes, the uxtheme engine supports special .msstyles files that can retheme all of the Windows controls. This is more or less the same kind of theming that modern Linux desktops have supported for

1 0

Igor Paliychuk : wordpad: Improve translations.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: a24e8c8f0bd3924cc72501007eaaee10349c6c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24e8c8f0bd3924cc72501007… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Thu Feb 10 20:52:54 2011 +0200 wordpad: Improve translations. --- programs/wordpad/Da.rc | 6 +++--- programs/wordpad/De.rc | 6 +++--- programs/wordpad/En.rc | 6 +++--- programs/wordpad/Fr.rc | 6 +++--- programs/wordpad/He.rc | 6 +++--- programs/wordpad/It.rc | 6 +++--- programs/wordpad/Ko.rc | 6 +++--- programs/wordpad/Lt.rc | 6 +++--- programs/wordpad/Nl.rc | 6 +++--- programs/wordpad/No.rc | 6 +++--- programs/wordpad/Pl.rc | 6 +++--- programs/wordpad/Pt.rc | 6 +++--- programs/wordpad/Ro.rc | 6 +++--- programs/wordpad/Ru.rc | 6 +++--- programs/wordpad/Si.rc | 6 +++--- programs/wordpad/Sv.rc | 6 +++--- programs/wordpad/Uk.rc | 6 +++--- programs/wordpad/Zh.rc | 12 ++++++------ 18 files changed, 57 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a24e8c8f0bd3924cc7250…

1 0

Igor Paliychuk : wininet: Fix translations.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 22b63d2c5493ca4209686fa64ad07538607bad89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b63d2c5493ca4209686fa64… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Thu Feb 10 20:12:57 2011 +0200 wininet: Fix translations. --- dlls/wininet/wininet_Bg.rc | 4 ++-- dlls/wininet/wininet_Cs.rc | 4 ++-- dlls/wininet/wininet_Da.rc | 8 ++++---- dlls/wininet/wininet_De.rc | 8 ++++---- dlls/wininet/wininet_En.rc | 8 ++++---- dlls/wininet/wininet_Eo.rc | 4 ++-- dlls/wininet/wininet_Es.rc | 8 ++++---- dlls/wininet/wininet_Fi.rc | 4 ++-- dlls/wininet/wininet_Fr.rc | 8 ++++---- dlls/wininet/wininet_He.rc | 8 ++++---- dlls/wininet/wininet_Hu.rc | 8 ++++---- dlls/wininet/wininet_It.rc | 8 ++++---- dlls/wininet/wininet_Ja.rc | 8 ++++---- dlls/wininet/wininet_Ko.rc | 8 ++++---- dlls/wininet/wininet_Lt.rc | 8 ++++---- dlls/wininet/wininet_Nl.rc | 8 ++++---- dlls/wininet/wininet_No.rc | 8 ++++---- dlls/wininet/wininet_Pl.rc | 8 ++++---- dlls/wininet/wininet_Pt.rc | 16 ++++++++-------- dlls/wininet/wininet_Ro.rc | 8 ++++---- dlls/wininet/wininet_Ru.rc | 8 ++++---- dlls/wininet/wininet_Si.rc | 8 ++++---- dlls/wininet/wininet_Sr.rc | 16 ++++++++-------- dlls/wininet/wininet_Sv.rc | 8 ++++---- dlls/wininet/wininet_Tr.rc | 4 ++-- dlls/wininet/wininet_Uk.rc | 8 ++++---- dlls/wininet/wininet_Zh.rc | 12 ++++++------ po/uk.po | 11 +++++------ 28 files changed, 113 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22b63d2c5493ca4209686…

1 0

Igor Paliychuk : cryptui: Fix French translation.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: c5ee445f89dfdbeb85b25b522ad096f3a94b46e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ee445f89dfdbeb85b25b522… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Thu Feb 10 20:05:17 2011 +0200 cryptui: Fix French translation. --- dlls/cryptui/cryptui_Fr.rc | 2 +- po/fr.po | 105 ++++++++++++++++++++----------------------- 2 files changed, 50 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5ee445f89dfdbeb85b25…

1 0

Austin English : msiexec: Add /unreg as an alias for /z.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: b827ab329be24e8bb590ae6b1905e49b44f7d3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b827ab329be24e8bb590ae6b1… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 12 21:05:20 2011 -0800 msiexec: Add /unreg as an alias for /z. --- programs/msiexec/msiexec.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 70e3255..d7c83cb 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -563,7 +563,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine { FunctionRegServer = TRUE; } - else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister")) + else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister") + || msi_option_equal(argvW[i], "unreg")) { FunctionUnregServer = TRUE; }

1 0

Austin English : wine.inf: Add HKLM\\Software\\Microsoft\\Windows\\Current Version\\Run key.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 3c5f46c962a91f1dee25984a890878526e84a31b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5f46c962a91f1dee25984a8… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 12 20:27:33 2011 -0800 wine.inf: Add HKLM\\Software\\Microsoft\\Windows\\Current Version\\Run key. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 4c06900..57e9ecf 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -454,6 +454,7 @@ HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 HKCU,%CurrentVersion%\Run,,16 +HKLM,%CurrentVersion%\Run,,16 HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%"

1 0

André Hentschel : urlmon/tests: Fix expected result.
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 4b3ad0d31cde9d33171f09f73cfbe572981f46ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3ad0d31cde9d33171f09f73… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 12 15:10:00 2011 +0100 urlmon/tests: Fix expected result. --- dlls/urlmon/tests/sec_mgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index b88b37a..1711755 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -482,7 +482,7 @@ static void test_CoInternetCreateZoneManager(void) IUnknown_Release(punk); hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManagerEx2, (void **) &punk); - ok(hr == S_OK || broken(hr == ERROR_NOINTERFACE /* some W2K3 */), + ok(hr == S_OK || broken(hr == E_NOINTERFACE /* some W2K3 */), "got 0x%x (expected S_OK)\n", hr); if (punk) IUnknown_Release(punk);

1 0

Austin English : ntdll/tests: Make sure return values are used (LLVM/Clang) .
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: fe9544abd20b1bf5f297473760ccea612cb4ac04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9544abd20b1bf5f29747376… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 15:15:44 2011 -0800 ntdll/tests: Make sure return values are used (LLVM/Clang). --- dlls/ntdll/tests/rtlbitmap.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c index d24f0af..4c1559b 100644 --- a/dlls/ntdll/tests/rtlbitmap.c +++ b/dlls/ntdll/tests/rtlbitmap.c @@ -497,6 +497,7 @@ static void test_RtlFindSetRuns(void) /* Get first 2 */ ulCount = pRtlFindSetRuns(&bm, runs, 2, FALSE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 19 + 3,"bad size\n"); @@ -506,6 +507,7 @@ static void test_RtlFindSetRuns(void) /* Get longest 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindSetRuns(&bm, runs, 2, TRUE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 1877,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 33 + 19,"bad size\n"); @@ -515,6 +517,7 @@ static void test_RtlFindSetRuns(void) /* Get all 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindSetRuns(&bm, runs, 3, TRUE); + ok(ulCount == 3, "RtlFindClearRuns returned %d, expected 3\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101 || @@ -571,6 +574,7 @@ static void test_RtlFindClearRuns(void) /* Get first 2 */ ulCount = pRtlFindClearRuns(&bm, runs, 2, FALSE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 19 + 3,"bad size\n"); @@ -580,6 +584,7 @@ static void test_RtlFindClearRuns(void) /* Get longest 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindClearRuns(&bm, runs, 2, TRUE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 1877,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 33 + 19,"bad size\n"); @@ -589,6 +594,7 @@ static void test_RtlFindClearRuns(void) /* Get all 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindClearRuns(&bm, runs, 3, TRUE); + ok(ulCount == 3, "RtlFindClearRuns returned %d, expected 3\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101 ||

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2011