wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Alexandre Julliard : makefiles: Add dependencies on all po files for po-translated resources.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 7c2a4bf25eb2269094897d3b4a4911c9b3243d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2a4bf25eb2269094897d3b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 16:55:54 2011 +0100 makefiles: Add dependencies on all po files for po-translated resources. --- Make.rules.in | 1 + Make.vars.in | 2 ++ configure | 42 ++++++++++++++++++++++++++++++++++++++++++ configure.ac | 40 ++++++++++++++++++++++++++++++++++++++++ programs/clock/Makefile.in | 1 + tools/make_makefiles | 17 +++++++++++++++-- 6 files changed, 101 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 34ee6fc..090a06e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -181,6 +181,7 @@ $(MC_SRCS:.mc=.mc.rc): $(WMC) $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_R_SRCS:.idl=_r.res): $(WIDL) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res): $(WRC) +$(PO_SRCS:.rc=.res): $(ALL_PO_FILES) dummy: diff --git a/Make.vars.in b/Make.vars.in index f04a088..93eec22 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -53,6 +53,8 @@ RSVG = @RSVG@ CONVERT = @CONVERT@ ICOTOOL = @ICOTOOL@ CROSSTARGET = @CROSSTARGET@ +LINGUAS = @LINGUAS@ +ALL_PO_FILES = $(LINGUAS:%=@top_srcdir@/po/%.po) CROSSAR = $(CROSSTARGET)-ar CROSSRANLIB = $(CROSSTARGET)-ranlib MKINSTALLDIRS = $(top_srcdir)/tools/mkinstalldirs -m 755 diff --git a/configure b/configure index 25b8533..2074d3b 100755 --- a/configure +++ b/configure @@ -596,6 +596,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +LINGUAS ALL_TEST_BINARIES ALL_WINETEST_DEPENDS LDAPLIBS @@ -15454,6 +15455,47 @@ wine_fn_config_tool tools/winegcc wine_fn_config_tool tools/wmc wine_fn_config_tool tools/wrc +LINGUAS="\ +cs \ +da \ +de \ +en_US \ +eo \ +es \ +fi \ +fr \ +he \ +hi \ +hu \ +it \ +ja \ +ko \ +lt \ +ml \ +nb_NO \ +nl \ +or \ +pa \ +pl \ +pt_BR \ +pt_PT \ +ro \ +ru \ +sk \ +sl \ +sr_Latn_SP \ +sr_SP \ +sv \ +te \ +th \ +tr \ +uk \ +wa \ +zh_CN \ +zh_TW" + + + ac_config_commands="$ac_config_commands Makefile" diff --git a/configure.ac b/configure.ac index 9ed1a5d..f27659d 100644 --- a/configure.ac +++ b/configure.ac @@ -2940,6 +2940,46 @@ WINE_CONFIG_TOOL(tools/winedump) WINE_CONFIG_TOOL(tools/winegcc) WINE_CONFIG_TOOL(tools/wmc) WINE_CONFIG_TOOL(tools/wrc) + +AC_SUBST([LINGUAS],["\ +cs \ +da \ +de \ +en_US \ +eo \ +es \ +fi \ +fr \ +he \ +hi \ +hu \ +it \ +ja \ +ko \ +lt \ +ml \ +nb_NO \ +nl \ +or \ +pa \ +pl \ +pt_BR \ +pt_PT \ +ro \ +ru \ +sk \ +sl \ +sr_Latn_SP \ +sr_SP \ +sv \ +te \ +th \ +tr \ +uk \ +wa \ +zh_CN \ +zh_TW"]) + dnl End of auto-generated output commands AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index c085893..a9c4b72 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -8,5 +8,6 @@ C_SRCS = \ winclock.c RC_SRCS = clock.rc +PO_SRCS = clock.rc @MAKE_PROG_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index bee12f8..08e7dd2 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -170,7 +170,7 @@ my %ignored_source_files = ( "programs/winetest/dist.rc" => 1, ); -my (@makefiles, %makefiles); +my (@linguas, @makefiles, %makefiles); sub dirname($) { @@ -472,6 +472,8 @@ sub update_makefiles(@) } } + push @lines, "\nAC_SUBST([LINGUAS],[\"\\\n", join( " \\\n", sort @linguas ), "\"])\n\n"; + # update the source variables in all the makefiles foreach my $file (sort @_) @@ -563,10 +565,20 @@ sub update_gitignore(@) } +################################################################ +# update the LINGUAS file + +sub update_linguas(@) +{ + replace_in_file( "po/LINGUAS", undef, undef, join("\n", sort @_), "\n" ); +} + + die "needs to be run from a git checkout" unless -d ".git"; my @all_files = split /\0/, `git ls-files -c -z`; -@makefiles = map { my $ret = $_; $ret =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files; +@linguas = map { (my $ret = $_) =~ s/^po\/(.*)\.po/$1/; $ret; } grep /^po\/.*\.po$/, @all_files; +@makefiles = map { (my $ret = $_) =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files; foreach my $file (sort values %makerules, @makefiles) { @@ -575,6 +587,7 @@ foreach my $file (sort values %makerules, @makefiles) } assign_sources_to_makefiles( @all_files ); +update_linguas( @linguas ); update_makefiles( @makefiles ); push @ignores, update_ignores( @makefiles ); update_gitignore( @ignores );

1 0

Yaron Shahrabani : website: About page updated (Hebrew links)
by Jeremy Newman 04 Jan '11

04 Jan '11

Module: website Branch: master Commit: f30622f007d836213ae4abe6ecc728acefdf7589 URL: http://source.winehq.org/git/website.git/?a=commit;h=f30622f007d836213ae4ab… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue Jan 4 17:52:44 2011 +0200 website: About page updated (Hebrew links) --0016e6deddd39a89ba04990743de Content-Type: text/plain; charset=UTF-8 Sorry then, hope this one is ok... Kind regards, Yaron Shahrabani <Hebrew translator> On Tue, Jan 4, 2011 at 5:10 PM, Jeremy Newman <jnewman(a)codeweavers.com>wrote: > This patch does not apply cleanly. > > -- > Applying: website: About page updated (Hebrew links) > error: patch failed: templates/he/about.template:13 > error: templates/he/about.template: patch does not apply > Patch failed at 0001 website: About page updated (Hebrew links) > -- > > -N > > On 12/27/2010 03:53 PM, Yaron Shahrabani wrote: > >> >> YaronShahrabani >> >> <Hebrew translator> >> >> >> >> >> >> <div dir="ltr">Sorry then, hope this one is ok... Kind regards, <div dir="ltr">Yaron Shahrabani<blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <div><Hebrew translator></div></blockquote></div> <div class="gmail_quote">On Tue, Jan 4, 2011 at 5:10 PM, Jeremy Newman <<a href="mailto:jnewman@codeweavers.com">jnewman(a)codeweavers.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"> This patch does not apply cleanly. -- Applying: website: About page updated (Hebrew links) error: patch failed: templates/he/about.template:13 error: templates/he/about.template: patch does not apply Patch failed at 0001 website: About page updated (Hebrew links) -- -N On 12/27/2010 03:53 PM, Yaron Shahrabani wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> YaronShahrabani <Hebrew translator> </blockquote> </blockquote></div> </div> >From 8d2c78480afeac7a3061d9b997b827ee4177a577 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue, 4 Jan 2011 17:49:27 +0200 Subject: website: [about] Update Hebrew translation. --- templates/he/about.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/he/about.template b/templates/he/about.template index 54809f4..61591d7 100644 --- a/templates/he/about.template +++ b/templates/he/about.template @@ -17,8 +17,8 @@ <ul> <li><a href="http://wiki.winehq.org/ImportanceOfWine">מדוע Wine כה חשובה</a></li> <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">אגדות נפוצות על Wine</a></li> - <li><a href="http://wiki.winehq.org/WineHistory">היסטוריית מיזם Wine</a></li> - <li><a href="http://wiki.winehq.org/ProjectOrganization">ארגון ומנהיגות</a></li> + <li><a href="http://wiki.winehq.org/WineHistory/he">היסטוריית מיזם Wine</a></li> + <li><a href="http://wiki.winehq.org/ProjectOrganization/he">ארגון ומנהיגות</a></li> </ul> <hr>

1 0

Mikhail Maroukhine : user32: Add constness to params and variables.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: f85953577496ef416b911b2617c63a5fb30f06eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85953577496ef416b911b261… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Mon Jan 3 21:04:40 2011 +0600 user32: Add constness to params and variables. --- dlls/user32/cursoricon.c | 70 +++++++++++++++++++++++----------------------- 1 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 356dbd8..fcb5d75 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -404,7 +404,7 @@ BOOL get_icon_size( HICON handle, SIZE *size ) * The following macro functions account for the irregularities of * accessing cursor and icon resources in files and resource entries. */ -typedef BOOL (*fnGetCIEntry)( LPVOID dir, int n, +typedef BOOL (*fnGetCIEntry)( LPCVOID dir, int n, int *width, int *height, int *bits ); /********************************************************************** @@ -412,7 +412,7 @@ typedef BOOL (*fnGetCIEntry)( LPVOID dir, int n, * * Find the icon closest to the requested size and bit depth. */ -static int CURSORICON_FindBestIcon( LPVOID dir, fnGetCIEntry get_entry, +static int CURSORICON_FindBestIcon( LPCVOID dir, fnGetCIEntry get_entry, int width, int height, int depth ) { int i, cx, cy, bits, bestEntry = -1; @@ -452,11 +452,11 @@ static int CURSORICON_FindBestIcon( LPVOID dir, fnGetCIEntry get_entry, return bestEntry; } -static BOOL CURSORICON_GetResIconEntry( LPVOID dir, int n, +static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, int n, int *width, int *height, int *bits ) { - CURSORICONDIR *resdir = dir; - ICONRESDIR *icon; + const CURSORICONDIR *resdir = dir; + const ICONRESDIR *icon; if ( resdir->idCount <= n ) return FALSE; @@ -474,7 +474,7 @@ static BOOL CURSORICON_GetResIconEntry( LPVOID dir, int n, * * FIXME: parameter 'color' ignored. */ -static int CURSORICON_FindBestCursor( LPVOID dir, fnGetCIEntry get_entry, +static int CURSORICON_FindBestCursor( LPCVOID dir, fnGetCIEntry get_entry, int width, int height, int depth ) { int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; @@ -514,11 +514,11 @@ static int CURSORICON_FindBestCursor( LPVOID dir, fnGetCIEntry get_entry, return bestEntry; } -static BOOL CURSORICON_GetResCursorEntry( LPVOID dir, int n, +static BOOL CURSORICON_GetResCursorEntry( LPCVOID dir, int n, int *width, int *height, int *bits ) { - CURSORICONDIR *resdir = dir; - CURSORDIR *cursor; + const CURSORICONDIR *resdir = dir; + const CURSORDIR *cursor; if ( resdir->idCount <= n ) return FALSE; @@ -529,7 +529,7 @@ static BOOL CURSORICON_GetResCursorEntry( LPVOID dir, int n, return TRUE; } -static CURSORICONDIRENTRY *CURSORICON_FindBestIconRes( CURSORICONDIR * dir, +static const CURSORICONDIRENTRY *CURSORICON_FindBestIconRes( const CURSORICONDIR * dir, int width, int height, int depth ) { int n; @@ -541,7 +541,7 @@ static CURSORICONDIRENTRY *CURSORICON_FindBestIconRes( CURSORICONDIR * dir, return &dir->idEntries[n]; } -static CURSORICONDIRENTRY *CURSORICON_FindBestCursorRes( CURSORICONDIR *dir, +static const CURSORICONDIRENTRY *CURSORICON_FindBestCursorRes( const CURSORICONDIR *dir, int width, int height, int depth ) { int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetResCursorEntry, @@ -551,38 +551,38 @@ static CURSORICONDIRENTRY *CURSORICON_FindBestCursorRes( CURSORICONDIR *dir, return &dir->idEntries[n]; } -static BOOL CURSORICON_GetFileEntry( LPVOID dir, int n, +static BOOL CURSORICON_GetFileEntry( LPCVOID dir, int n, int *width, int *height, int *bits ) { - CURSORICONFILEDIR *filedir = dir; - CURSORICONFILEDIRENTRY *entry; - BITMAPINFOHEADER *info; + const CURSORICONFILEDIR *filedir = dir; + const CURSORICONFILEDIRENTRY *entry; + const BITMAPINFOHEADER *info; if ( filedir->idCount <= n ) return FALSE; entry = &filedir->idEntries[n]; /* FIXME: check against file size */ - info = (BITMAPINFOHEADER *)((char *)dir + entry->dwDIBOffset); + info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); *width = entry->bWidth; *height = entry->bHeight; *bits = info->biBitCount; return TRUE; } -static CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( CURSORICONFILEDIR *dir, +static const CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( const CURSORICONFILEDIR *dir, int width, int height, int depth ) { - int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetFileEntry, + int n = CURSORICON_FindBestCursor( (LPCVOID) dir, CURSORICON_GetFileEntry, width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } -static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *dir, +static const CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( const CURSORICONFILEDIR *dir, int width, int height, int depth ) { - int n = CURSORICON_FindBestIcon( dir, CURSORICON_GetFileEntry, + int n = CURSORICON_FindBestIcon((LPCVOID) dir, CURSORICON_GetFileEntry, width, height, depth ); if ( n < 0 ) return NULL; @@ -684,7 +684,7 @@ static BOOL create_icon_bitmaps( const BITMAPINFO *bmi, int width, int height, BOOL monochrome = is_dib_monochrome( bmi ); unsigned int size = bitmap_info_size( bmi, DIB_RGB_COLORS ); BITMAPINFO *info; - void *color_bits, *mask_bits; + const void *color_bits, *mask_bits; BOOL ret = FALSE; HDC hdc = 0; @@ -695,8 +695,8 @@ static BOOL create_icon_bitmaps( const BITMAPINFO *bmi, int width, int height, memcpy( info, bmi, size ); info->bmiHeader.biHeight /= 2; - color_bits = (char *)bmi + size; - mask_bits = (char *)color_bits + + color_bits = (const char*)bmi + size; + mask_bits = (const char*)color_bits + get_dib_width_bytes( bmi->bmiHeader.biWidth, bmi->bmiHeader.biBitCount ) * abs(info->bmiHeader.biHeight); @@ -997,15 +997,15 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, icon_data = fram_chunk.data + (2 * sizeof(DWORD)); for (i=0; i<header.num_frames; i++) { - DWORD chunk_size = *(DWORD *)(icon_chunk + sizeof(DWORD)); + const DWORD chunk_size = *(const DWORD *)(icon_chunk + sizeof(DWORD)); struct cursoricon_frame *frame = &info->frames[i]; - CURSORICONFILEDIRENTRY *entry; - BITMAPINFO *bmi; + const CURSORICONFILEDIRENTRY *entry; + const BITMAPINFO *bmi; - entry = CURSORICON_FindBestIconFile( (CURSORICONFILEDIR *) icon_data, + entry = CURSORICON_FindBestIconFile((const CURSORICONFILEDIR *) icon_data, width, height, depth ); - bmi = (BITMAPINFO *) (icon_data + entry->dwDIBOffset); + bmi = (const BITMAPINFO *) (icon_data + entry->dwDIBOffset); info->hotspot.x = entry->xHotspot; info->hotspot.y = entry->yHotspot; if (!header.width || !header.height) @@ -1115,8 +1115,8 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, INT width, INT height, INT depth, BOOL fCursor, UINT loadflags) { - CURSORICONFILEDIRENTRY *entry; - CURSORICONFILEDIR *dir; + const CURSORICONFILEDIRENTRY *entry; + const CURSORICONFILEDIR *dir; DWORD filesize = 0; HICON hIcon = 0; LPBYTE bits; @@ -1136,7 +1136,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, goto end; } - dir = (CURSORICONFILEDIR*) bits; + dir = (const CURSORICONFILEDIR*) bits; if ( filesize < sizeof(*dir) ) goto end; @@ -1179,8 +1179,8 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, HANDLE handle = 0; HICON hIcon = 0; HRSRC hRsrc; - CURSORICONDIR *dir; - CURSORICONDIRENTRY *dirEntry; + const CURSORICONDIR *dir; + const CURSORICONDIRENTRY *dirEntry; LPBYTE bits; WORD wResId; POINT hotspot; @@ -1536,11 +1536,11 @@ BOOL WINAPI SetSystemCursor(HCURSOR hcur, DWORD id) INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE xdir, BOOL bIcon, INT width, INT height, UINT cFlag ) { - CURSORICONDIR *dir = (CURSORICONDIR*)xdir; + const CURSORICONDIR *dir = (const CURSORICONDIR*)xdir; UINT retVal = 0; if( dir && !dir->idReserved && (dir->idType & 3) ) { - CURSORICONDIRENTRY* entry; + const CURSORICONDIRENTRY* entry; const HDC hdc = GetDC(0); const int depth = (cFlag & LR_MONOCHROME) ?

1 0

Francois Gouget : winemenubuilder: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 7b28ae53e16ec65f5599b5524c78ad90b9259e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b28ae53e16ec65f5599b5524… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 4 15:58:22 2011 +0100 winemenubuilder: Fix compilation on systems that don't support nameless unions. --- programs/winemenubuilder/winemenubuilder.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8414d7b..d88dac1 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -78,6 +78,7 @@ #endif #define COBJMACROS +#define NONAMELESSUNION #include <windows.h> #include <shlobj.h> @@ -2676,9 +2677,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link } ps[0].ulKind = PRSPEC_PROPID; - ps[0].propid = PID_IS_ICONFILE; + ps[0].u.propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; - ps[1].propid = PID_IS_ICONINDEX; + ps[1].u.propid = PID_IS_ICONINDEX; hr = url->lpVtbl->QueryInterface(url, &IID_IPropertySetStorage, (void **) &pPropSetStg); if (SUCCEEDED(hr)) @@ -2689,9 +2690,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link hr = IPropertyStorage_ReadMultiple(pPropStg, 2, ps, pv); if (SUCCEEDED(hr)) { - icon_name = extract_icon( pv[0].pwszVal, pv[1].iVal, NULL, bWait ); + icon_name = extract_icon( pv[0].u.pwszVal, pv[1].u.iVal, NULL, bWait ); - WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].pwszVal), pv[1].iVal, icon_name); + WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].u.pwszVal), pv[1].u.iVal, icon_name); PropVariantClear(&pv[0]); PropVariantClear(&pv[1]); } @@ -2710,7 +2711,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link goto cleanup; } WINE_ERR("failed to extract icon from %s\n", - wine_dbgstr_w( pv[0].pwszVal )); + wine_dbgstr_w( pv[0].u.pwszVal )); } hSem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore");

1 0

Francois Gouget : shdocvw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: ce3fcda1d3dcbe8b6ffb3793a4fac7b00a322a31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3fcda1d3dcbe8b6ffb3793a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 4 15:58:02 2011 +0100 shdocvw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/shdocvw/tests/intshcut.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 360876e..0b90cf7 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -22,6 +22,7 @@ #include <stdio.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -185,9 +186,9 @@ static void test_ReadAndWriteProperties(void) char testurl[] = "http://some/bogus/url.html"; PROPSPEC ps[2]; ps[0].ulKind = PRSPEC_PROPID; - ps[0].propid = PID_IS_ICONFILE; + U(ps[0]).propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; - ps[1].propid = PID_IS_ICONINDEX; + U(ps[1]).propid = PID_IS_ICONINDEX; /* Make sure we have a valid temporary directory */ GetTempPathW(MAX_PATH, fileNameW); @@ -215,9 +216,9 @@ static void test_ReadAndWriteProperties(void) IPersistFile_Release(pf); pv[0].vt = VT_LPWSTR; - pv[0].pwszVal = (void *) iconPath; + U(pv[0]).pwszVal = (void *) iconPath; pv[1].vt = VT_I4; - pv[1].iVal = iconIndex; + U(pv[1]).iVal = iconIndex; hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPropertySetStorage, (void **) &pPropSetStg); ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); @@ -270,9 +271,9 @@ static void test_ReadAndWriteProperties(void) todo_wine /* Wine doesn't yet support setting properties after save */ { - ok(pvread[1].iVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); + ok(U(pvread[1]).iVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); - ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n",wine_dbgstr_w(pvread[0].pwszVal)); + ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); } PropVariantClear(&pvread[0]);

1 0

Greg Geldorp : msi/tests: Fix remaining Wow64 failures for action test set.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: faf19ec966b99ea825a5cffc8f4bb25afb5ccb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf19ec966b99ea825a5cffc8… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Tue Jan 4 15:57:29 2011 +0100 msi/tests: Fix remaining Wow64 failures for action test set. --- dlls/msi/tests/action.c | 54 +++++++++++++++++++++++++++++++--------------- 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 86abecc..a306f25 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2869,7 +2869,8 @@ machprod: CHECK_DEL_REG_STR(net, "1", temp); - RegDeleteKeyA(net, ""); + res = delete_key(net, "", access); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); RegCloseKey(net); res = RegOpenKeyExA(sourcelist, "Media", 0, access, &media); @@ -2877,11 +2878,14 @@ machprod: CHECK_DEL_REG_STR(media, "1", "DISK1;"); - RegDeleteKeyA(media, ""); + res = delete_key(media, "", access); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); RegCloseKey(media); - RegDeleteKeyA(sourcelist, ""); + res = delete_key(sourcelist, "", access); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); RegCloseKey(sourcelist); - RegDeleteKeyA(hkey, ""); + res = delete_key(hkey, "", access); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, machup, 0, access, &hkey); @@ -2889,7 +2893,8 @@ machprod: CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); - RegDeleteKeyA(hkey, ""); + res = delete_key(hkey, "", access); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); RegCloseKey(hkey); error: @@ -2910,9 +2915,12 @@ static void test_publish_features(void) static const CHAR cupath[] = "Software\\Microsoft\\Installer\\Features" "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; - static const CHAR udpath[] = "Software\\Microsoft\\Windows\\CurrentVersion" - "\\Installer\\UserData\\%s\\Products" - "\\84A88FD7F6998CE40A22FB59F6B9C2BB\\Features"; + static const CHAR udfeatpath[] = "Software\\Microsoft\\Windows\\CurrentVersion" + "\\Installer\\UserData\\%s\\Products" + "\\84A88FD7F6998CE40A22FB59F6B9C2BB\\Features"; + static const CHAR udpridpath[] = "Software\\Microsoft\\Windows\\CurrentVersion" + "\\Installer\\UserData\\%s\\Products" + "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; static const CHAR featkey[] = "Software\\Microsoft\\Windows\\CurrentVersion" "\\Installer\\Features"; static const CHAR classfeat[] = "Software\\Classes\\Installer\\Features" @@ -2962,10 +2970,10 @@ static void test_publish_features(void) RegDeleteValueA(hkey, "feature"); RegDeleteValueA(hkey, "montecristo"); - RegDeleteKeyA(hkey, ""); + delete_key(hkey, "", access); RegCloseKey(hkey); - sprintf(keypath, udpath, usersid); + sprintf(keypath, udfeatpath, usersid); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -2974,8 +2982,10 @@ static void test_publish_features(void) RegDeleteValueA(hkey, "feature"); RegDeleteValueA(hkey, "montecristo"); - RegDeleteKeyA(hkey, ""); + delete_key(hkey, "", access); RegCloseKey(hkey); + sprintf(keypath, udpridpath, usersid); + delete_key(HKEY_LOCAL_MACHINE, keypath, access); /* PublishFeatures, machine */ r = MsiInstallProductA(msifile, "PUBLISH_FEATURES=1 ALLUSERS=1"); @@ -2988,7 +2998,6 @@ static void test_publish_features(void) res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, classfeat, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -2997,10 +3006,10 @@ static void test_publish_features(void) RegDeleteValueA(hkey, "feature"); RegDeleteValueA(hkey, "montecristo"); - RegDeleteKeyA(hkey, ""); + delete_key(hkey, "", access); RegCloseKey(hkey); - sprintf(keypath, udpath, "S-1-5-18"); + sprintf(keypath, udfeatpath, "S-1-5-18"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3009,8 +3018,10 @@ static void test_publish_features(void) RegDeleteValueA(hkey, "feature"); RegDeleteValueA(hkey, "montecristo"); - RegDeleteKeyA(hkey, ""); + delete_key(hkey, "", access); RegCloseKey(hkey); + sprintf(keypath, udpridpath, "S-1-5-18"); + delete_key(HKEY_LOCAL_MACHINE, keypath, access); error: DeleteFile(msifile); @@ -3092,9 +3103,12 @@ static void test_register_user(void) CHAR keypath[MAX_PATH]; REGSAM access = KEY_ALL_ACCESS; - static const CHAR keyfmt[] = + static const CHAR keypropsfmt[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\" "UserData\\%s\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB\\InstallProperties"; + static const CHAR keypridfmt[] = + "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\" + "UserData\\%s\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; if (is_process_limited()) { @@ -3128,7 +3142,7 @@ static void test_register_user(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); - sprintf(keypath, keyfmt, usersid); + sprintf(keypath, keypropsfmt, usersid); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3141,6 +3155,8 @@ static void test_register_user(void) RegDeleteValueA(props, "RegOwner"); delete_key(props, "", access); RegCloseKey(props); + sprintf(keypath, keypridfmt, usersid); + delete_key(HKEY_LOCAL_MACHINE, keypath, access); /* RegisterUser, machine */ r = MsiInstallProductA(msifile, "REGISTER_USER=1 ALLUSERS=1"); @@ -3148,7 +3164,7 @@ static void test_register_user(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); - sprintf(keypath, keyfmt, "S-1-5-18"); + sprintf(keypath, keypropsfmt, "S-1-5-18"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3161,6 +3177,8 @@ static void test_register_user(void) RegDeleteValueA(props, "RegOwner"); delete_key(props, "", access); RegCloseKey(props); + sprintf(keypath, keypridfmt, "S-1-5-18"); + delete_key(HKEY_LOCAL_MACHINE, keypath, access); error: HeapFree(GetProcessHeap(), 0, company);

1 0

Nikolay Sivov : oleaut32: Do nothing for TKIND_ALIAS types in ::LayOut().
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 0044cc8f269273873a9a35bd689d06cb5f30c0c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0044cc8f269273873a9a35bd6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 4 14:38:41 2011 +0300 oleaut32: Do nothing for TKIND_ALIAS types in ::LayOut(). --- dlls/oleaut32/typelib2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index d4a0ae6..8260ef2 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2623,10 +2623,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( unsigned user_vft = 0; int i; - TRACE("(%p)\n", iface); + TRACE("(%p)\n", This); /* FIXME: LayOut should be run on all ImplTypes */ - if(This->typekind == TKIND_COCLASS) + if(This->typekind == TKIND_COCLASS || This->typekind == TKIND_ALIAS) return S_OK; /* Validate inheritance */

1 0

Nikolay Sivov : oleaut32: Use VARENUM members instead of hardcoded values.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: ea3c215b5749e1cf6c709f0f9849748819747f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3c215b5749e1cf6c709f0f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 4 14:30:47 2011 +0300 oleaut32: Use VARENUM members instead of hardcoded values. --- dlls/oleaut32/typelib.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1892ac6..854b165 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1448,17 +1448,17 @@ static void dump_VARDESC(const VARDESC *v) MESSAGE("varkind %d\n",v->varkind); } -static TYPEDESC stndTypeDesc[VT_LPWSTR+1]= -{ - /* VT_LPWSTR is largest type that */ - /* may appear in type description*/ - {{0}, 0},{{0}, 1},{{0}, 2},{{0}, 3},{{0}, 4}, - {{0}, 5},{{0}, 6},{{0}, 7},{{0}, 8},{{0}, 9}, - {{0},10},{{0},11},{{0},12},{{0},13},{{0},14}, - {{0},15},{{0},16},{{0},17},{{0},18},{{0},19}, - {{0},20},{{0},21},{{0},22},{{0},23},{{0},24}, - {{0},25},{{0},26},{{0},27},{{0},28},{{0},29}, - {{0},30},{{0},31} +static TYPEDESC std_typedesc[VT_LPWSTR+1] = +{ + /* VT_LPWSTR is largest type that, may appear in type description */ + {{0}, VT_EMPTY}, {{0}, VT_NULL}, {{0}, VT_I2}, {{0}, VT_I4}, + {{0}, VT_R4}, {{0}, VT_R8}, {{0}, VT_CY}, {{0}, VT_DATE}, + {{0}, VT_BSTR}, {{0}, VT_DISPATCH}, {{0}, VT_ERROR}, {{0}, VT_BOOL}, + {{0}, VT_VARIANT},{{0}, VT_UNKNOWN}, {{0}, VT_DECIMAL}, {{0}, 15}, /* unused in VARENUM */ + {{0}, VT_I1}, {{0}, VT_UI1}, {{0}, VT_UI2}, {{0}, VT_UI4}, + {{0}, VT_I8}, {{0}, VT_UI8}, {{0}, VT_INT}, {{0}, VT_UINT}, + {{0}, VT_VOID}, {{0}, VT_HRESULT}, {{0}, VT_PTR}, {{0}, VT_SAFEARRAY}, + {{0}, VT_CARRAY}, {{0}, VT_USERDEFINED}, {{0}, VT_LPSTR}, {{0}, VT_LPWSTR} }; static void TLB_abort(void) @@ -2977,9 +2977,9 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) { /* FIXME: check safearray */ if(td[3] < 0) - pTypeLibImpl->pTypeDesc[i].u.lptdesc= & stndTypeDesc[td[2]]; + pTypeLibImpl->pTypeDesc[i].u.lptdesc = &std_typedesc[td[2]]; else - pTypeLibImpl->pTypeDesc[i].u.lptdesc= & pTypeLibImpl->pTypeDesc[td[2]/8]; + pTypeLibImpl->pTypeDesc[i].u.lptdesc = &pTypeLibImpl->pTypeDesc[td[2]/8]; } else if(td[0] == VT_CARRAY) {

1 0

Nikolay Sivov : oleaut32: Use alloc/ free helpers for typelib creation part too.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 2e25e5e22c19b0f28733e385f567f69f66e01a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e25e5e22c19b0f28733e385f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 4 14:15:53 2011 +0300 oleaut32: Use alloc/free helpers for typelib creation part too. --- dlls/oleaut32/typelib.c | 11 +++- dlls/oleaut32/typelib.h | 6 ++ dlls/oleaut32/typelib2.c | 115 ++++++++++++++++++++++----------------------- 3 files changed, 70 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e25e5e22c19b0f28733e…

1 0

Nikolay Sivov : oleaut32: Use IDispatch vtable size instead of hardcoded value.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: ed749f51ceedf5cdfff3f3417bb829d169a32b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed749f51ceedf5cdfff3f3417… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 4 14:00:13 2011 +0300 oleaut32: Use IDispatch vtable size instead of hardcoded value. --- dlls/oleaut32/typelib.c | 5 +++-- dlls/oleaut32/typelib2.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d9fa638..199d2ba 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1082,7 +1082,7 @@ typedef struct tagTLBVarDesc VARDESC vardesc; /* lots of info on the variable and its attributes. */ BSTR Name; /* the name of this variable */ int HelpContext; - int HelpStringContext; /* FIXME: where? */ + int HelpStringContext; BSTR HelpString; int ctCustData; TLBCustData * pCustData;/* linked list to cust data; */ @@ -5110,7 +5110,8 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, if((*ppTypeAttr)->typekind == TKIND_DISPATCH) { /* This should include all the inherited funcs */ (*ppTypeAttr)->cFuncs = (*ppTypeAttr)->cbSizeVft / sizeof(void *); - (*ppTypeAttr)->cbSizeVft = 7 * sizeof(void *); /* This is always the size of IDispatch's vtbl */ + /* This is always the size of IDispatch's vtbl */ + (*ppTypeAttr)->cbSizeVft = sizeof(IDispatchVtbl); (*ppTypeAttr)->wTypeFlags &= ~TYPEFLAG_FOLEAUTOMATION; } return S_OK; diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index fdf712b..6cc1081 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3207,10 +3207,10 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeAttr( (*ppTypeAttr)->typekind = This->typekind; (*ppTypeAttr)->cFuncs = cti2_get_func_count(This->typeinfo); if(This->typeinfo->flags&TYPEFLAG_FDUAL && This->typekind==TKIND_DISPATCH) - (*ppTypeAttr)->cFuncs += 7; + (*ppTypeAttr)->cFuncs += sizeof(IDispatchVtbl)/sizeof(void*); (*ppTypeAttr)->cVars = cti2_get_var_count(This->typeinfo); (*ppTypeAttr)->cImplTypes = This->typeinfo->cImplTypes; - (*ppTypeAttr)->cbSizeVft = This->typekind==TKIND_DISPATCH ? 7 * sizeof(void*) : This->typeinfo->cbSizeVft; + (*ppTypeAttr)->cbSizeVft = This->typekind == TKIND_DISPATCH ? sizeof(IDispatchVtbl) : This->typeinfo->cbSizeVft; (*ppTypeAttr)->cbAlignment = (This->typeinfo->typekind>>11) & 0x1f; (*ppTypeAttr)->wTypeFlags = This->typeinfo->flags; (*ppTypeAttr)->wMajorVerNum = LOWORD(This->typeinfo->version);

1 0

← Newer
1
...
74
75
76
77
78
79
80
...
88
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 January 2011