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

Paul Vriens : setupapi/tests: Fix some test failures on W2K.
by Alexandre Julliard 11 Jun '08

11 Jun '08

Module: wine Branch: master Commit: 5cd4cbc49c6bbafca67a511bea60e6801aff53b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd4cbc49c6bbafca67a511be… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jun 11 14:57:42 2008 +0200 setupapi/tests: Fix some test failures on W2K. --- dlls/setupapi/tests/devinst.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f00de28..7c0c182 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -814,6 +814,8 @@ static void testGetDeviceInterfaceDetail(void) { static const char path[] = "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + static const char path_w2k[] = + "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\"; LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size); SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_A *)buf; @@ -845,14 +847,19 @@ static void testGetDeviceInterfaceDetail(void) size, &size, NULL); ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %d\n", GetLastError()); - ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", - detail->DevicePath); + ok(!lstrcmpiA(path, detail->DevicePath) || + !lstrcmpiA(path_w2k, detail->DevicePath), "Unexpected path %s\n", + detail->DevicePath); /* Check SetupDiGetDeviceInterfaceDetailW */ if (pSetupDiGetDeviceInterfaceDetailW) { ret = pSetupDiGetDeviceInterfaceDetailW(set, &interfaceData, NULL, 0, &size, NULL); - ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got error code: %d\n", GetLastError()); - ok(expectedsize == size, "SetupDiGetDeviceInterfaceDetailW returned wrong reqsize: expected %d, got %d\n", expectedsize, size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got error code: %d\n", GetLastError()); + ok(expectedsize == size || + (expectedsize + sizeof(WCHAR)) == size /* W2K adds a backslash */, + "SetupDiGetDeviceInterfaceDetailW returned wrong reqsize, got %d\n", + size); } else skip("SetupDiGetDeviceInterfaceDetailW is not available\n"); @@ -1097,6 +1104,8 @@ static void testRegisterAndGetDetail(void) { static const char path[] = "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + static const char path_w2k[] = + "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\"; PSP_DEVICE_INTERFACE_DETAIL_DATA_A detail = NULL; detail = (PSP_DEVICE_INTERFACE_DETAIL_DATA_A)HeapAlloc(GetProcessHeap(), 0, dwSize); @@ -1111,8 +1120,9 @@ static void testRegisterAndGetDetail(void) * as all the tests are cleaned up correctly this has to be (or should be) fixed */ todo_wine - ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", - detail->DevicePath); + ok(!lstrcmpiA(path, detail->DevicePath) || + !lstrcmpiA(path_w2k, detail->DevicePath), "Unexpected path %s\n", + detail->DevicePath); HeapFree(GetProcessHeap(), 0, detail); } }

1 0

Mikołaj Zalewski : xcopy: German should use SUBLANG_NEUTRAL.
by Alexandre Julliard 11 Jun '08

11 Jun '08

Module: wine Branch: master Commit: d0d2b4a45c4d059371a79ed346ff21fe56a6e0ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d2b4a45c4d059371a79ed34… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Jun 11 15:28:25 2008 +0200 xcopy: German should use SUBLANG_NEUTRAL. --- programs/xcopy/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/De.rc b/programs/xcopy/De.rc index 020577d..f201671 100644 --- a/programs/xcopy/De.rc +++ b/programs/xcopy/De.rc @@ -21,7 +21,7 @@ */ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE {

1 0

Alexandre Julliard : winedoc_release: Changed to run from cron instead of at release time.
by Alexandre Julliard 11 Jun '08

11 Jun '08

Module: tools Branch: master Commit: f533b48cfd7590c2d59daa1c9ae10c2959f1a6cf URL: http://source.winehq.org/git/tools.git/?a=commit;h=f533b48cfd7590c2d59daa1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 11 19:58:26 2008 +0200 winedoc_release: Changed to run from cron instead of at release time. Renamed to winedocs.cron. --- winedoc_release | 83 ------------------------------------------------------- winedocs.cron | 64 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 83 deletions(-) diff --git a/winedoc_release b/winedoc_release deleted file mode 100755 index 63ae24f..0000000 --- a/winedoc_release +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -# This script is ran after a new release of Wine. It updates the website -# and FTP for the new wine release. - -# usage: winedoc_release <winedoc version> - -set -e -umask 002 - -if [ $# -lt 1 ] -then - echo "Usage: $0 version|cvs" - exit 1 -fi - -version=$1 - -# nuke old attempt (if any) -rm -rf wine-docs-$version - -if [ "$version" = "cvs" ] -then - cvs -z9 -d :pserver:anonymous(a)wine.cvs.sourceforge.net:/cvsroot/wine co -d wine-docs-cvs docs -else - if [ -f wine-docs-$version.tar.bz2 ] - then - echo "Already have Wine docs, skipping download" - else - ncftpget ftp://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-$version.tar.bz2 - fi - tar xfj wine-docs-$version.tar.bz2 - rm wine-docs-$version.tar.bz2 -fi - -echo "==== BUILDING SGML DOCUMENTATION ====" - -books="wineusr-guide winedev-guide winelib-guide" -langs="en" -site_base_dir="/home/winehq/opt/website" -tools_dir="/home/winehq/opt/git-tools" -guides_base_dir="$site_base_dir/docs" -winehq_base_dir="$site_base_dir/templates" - -cd wine-docs-$version - -for lang in $langs -do - [ -d $guides_base_dir/$lang ] || mkdir $guides_base_dir/$lang - [ -d $winehq_base_dir/$lang/docs ] || mkdir $winehq_base_dir/$lang/docs - rm -f $guides_base_dir/$lang/winedoc.css && cp $tools_dir/winedoc.css $guides_base_dir/$lang - - cd $lang - for book in $books - do - echo "* $book" - - # build guides as single files (only for releases) - if [ "$version" != "cvs" ] - then - docbook2html -u -d $tools_dir/winehtml.dsl $book.sgml - docbook2pdf -d $tools_dir/wineprint.dsl $book.sgml - docbook2ps -d $tools_dir/wineprint.dsl $book.sgml - mv -f $book.html $book.pdf $book.ps $guides_base_dir/$lang - fi - - # build the online html version - docbook2html -d $tools_dir/winehtml.dsl -o $book.web $book.sgml - [ -d $winehq_base_dir/$lang/docs/$book ] || mkdir $winehq_base_dir/$lang/docs/$book - for f in $book.web/*.htm - do - outfile=`basename $f .htm`.template - $tools_dir/html2template -i $f -o $outfile && mv -f $outfile $winehq_base_dir/$lang/docs/$book/$outfile - done - rm -rf $book.web - done - cd .. -done - -cd .. -rm -rf wine-docs-$version - -# end diff --git a/winedocs.cron b/winedocs.cron new file mode 100755 index 0000000..472a087 --- /dev/null +++ b/winedocs.cron @@ -0,0 +1,64 @@ +#!/bin/sh +# +# This script updates the documentation on the website if necessary. +# It should be run periodically from cron. +# + +set -e +umask 002 + +cd /home/winehq/opt/wine-docs +git fetch >/dev/null 2>&1 + +# check if anything has changed +if [ "$(git rev-parse HEAD)" = "$(git rev-parse origin/master)" ] +then + exit 0 # nothing to do +fi + +rm -f lastbuild.log +exec >lastbuild.log 2>&1 + +git reset --hard origin/master + +echo "==== BUILDING SGML DOCUMENTATION ====" + +books="wineusr-guide winedev-guide winelib-guide" +langs="en" +site_base_dir="/home/winehq/opt/website" +tools_dir="/home/winehq/opt/git-tools" +git_dir="/home/winehq/opt/source/git" +guides_base_dir="$site_base_dir/docs" +winehq_base_dir="$site_base_dir/templates" + +for lang in $langs +do + [ -d $guides_base_dir/$lang ] || mkdir $guides_base_dir/$lang + [ -d $winehq_base_dir/$lang/docs ] || mkdir $winehq_base_dir/$lang/docs + rm -f $guides_base_dir/$lang/winedoc.css && cp $tools_dir/winedoc.css $guides_base_dir/$lang + + cd $lang + for book in $books + do + echo "* $book" + + # build guides as single files + docbook2html -u -d $tools_dir/winehtml.dsl $book.sgml + docbook2pdf -d $tools_dir/wineprint.dsl $book.sgml + docbook2ps -d $tools_dir/wineprint.dsl $book.sgml + mv -f $book.html $book.pdf $book.ps $guides_base_dir/$lang + + # build the online html version + docbook2html -d $tools_dir/winehtml.dsl -o $book.web $book.sgml + [ -d $winehq_base_dir/$lang/docs/$book ] || mkdir $winehq_base_dir/$lang/docs/$book + for f in $book.web/*.htm + do + outfile=`basename $f .htm`.template + $tools_dir/html2template -i $f -o $outfile && mv -f $outfile $winehq_base_dir/$lang/docs/$book/$outfile + done + rm -rf $book.web + done + cd .. +done + +# end

1 0

Alexandre Julliard : The documentation source is in git now.
by Alexandre Julliard 11 Jun '08

11 Jun '08

Module: website Branch: master Commit: c8534ffb809fd22a2628f7ac427a839d893046d0 URL: http://source.winehq.org/git/website.git/?a=commit;h=c8534ffb809fd22a2628f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 11 18:12:18 2008 +0200 The documentation source is in git now. --- templates/en/cvs.template | 17 ----------------- templates/en/git.template | 14 +------------- 2 files changed, 1 insertions(+), 30 deletions(-) diff --git a/templates/en/cvs.template b/templates/en/cvs.template index 8044a1a..e2404b0 100644 --- a/templates/en/cvs.template +++ b/templates/en/cvs.template @@ -9,7 +9,6 @@ <ol> <li><a href="#co">Getting a local copy of Wine</a></li> - <li><a href="#docs">Documentation module available via CVS from Sourceforge</a></li> <li><a href="#sourcetree">Source Tree Browsing via the Web</a></li> </ol> @@ -32,22 +31,6 @@ cvs login <hr /> -<h1 id="docs">Documentation module available via CVS from Sourceforge</h1> - -<p>The documentation lives in a separate CVS tree on Sourceforge. To get the docs in - a terminal run:</p> -<p><code>cvs -z3 -d:pserver:anonymous(a)wine.cvs.sourceforge.net:/cvsroot/wine co -P docs</code></p> - -<p>When prompted for a password press the enter key. A subdirectory named docs will be created.</p> - -<p>You can also Browse -<a href="http://wine.cvs.sourceforge.net/wine/">the Wine Documentation -module</a>. Here is more information on -<a href="http://www.winehq.org/site/contributing#doc">documentation -writing</a>.</p> - -<hr /> - <h1 id="sourcetree">Source Tree Browsing via the Web</h1> <p>The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) diff --git a/templates/en/git.template b/templates/en/git.template index 951e4c6..f00d788 100644 --- a/templates/en/git.template +++ b/templates/en/git.template @@ -23,7 +23,6 @@ such as the Linux Kernel source.</p> <li><a href="#sourcetree">Source Tree Browsing via the Web</a></li> <li><a href="#modules">Other modules available from WineHQ</a></li> <li><a href="#clonecvs">Getting a local copy of Wine with CVS</a></li> - <li><a href="#docs">Documentation module available from Sourceforge</a></li> </ol> <hr /> @@ -98,6 +97,7 @@ exports the following modules:</p> <li><a href="http://source.winehq.org/git/website.git">website.git</a> -- source for the WineHQ.org website</li> <li><a href="http://source.winehq.org/git/bugzilla.git">bugzilla.git</a> -- source for the bugzilla version used on the WineHQ site</li> <li><a href="http://source.winehq.org/git/appdb.git">appdb.git</a> -- source for the application database web site</li> + <li><a href="http://source.winehq.org/git/docs.git">docs.git</a> -- source for the Wine documentation</li> <li><a href="http://source.winehq.org/git/tools.git">tools.git</a> -- tools used on the WineHQ site</li> </ul> @@ -117,15 +117,3 @@ exports the following modules:</p> <p>To check out the Wine source tree run:</p> <p><code>cvs -z 3 -d :pserver:cvs(a)cvs.winehq.org:/home/wine checkout wine</code></p> - -<hr /> - -<h1 id="docs">Documentation module available from Sourceforge</h1> - -<p>The documentation lives in a separate CVS tree on Sourceforge.<br /> -To get a git repository of the documentation create a new directory and -in a terminal run in that directory:</p> - -<p><code>git cvsimport -v -k -d :pserver:anonymous(a)wine.cvs.sourceforge.net:/cvsroot/wine docs</code></p> - -<p>But be aware that this can take quite some time.</p>

1 0

Paul Vriens : d3d9/tests: Fix a few typos.
by Alexandre Julliard 11 Jun '08

11 Jun '08

Module: wine Branch: master Commit: 189603a995fd6c712975f80ede3cfe345742baea URL: http://source.winehq.org/git/wine.git/?a=commit;h=189603a995fd6c712975f80ed… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jun 11 10:52:08 2008 +0200 d3d9/tests: Fix a few typos. --- dlls/d3d9/tests/device.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 490593d..fe72e9f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -787,11 +787,11 @@ static void test_reset(void) if(SUCCEEDED(hr)) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); - ok(vp.Y == 0, "D3DVIEWPORT->X = %d\n", vp.Y); - ok(vp.Width == 800, "D3DVIEWPORT->X = %d\n", vp.Width); - ok(vp.Height == 600, "D3DVIEWPORT->X = %d\n", vp.Height); - ok(vp.MinZ == 0, "D3DVIEWPORT->X = %d\n", vp.Height); - ok(vp.MaxZ == 1, "D3DVIEWPORT->X = %d\n", vp.Height); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); + ok(vp.Width == 800, "D3DVIEWPORT->Width = %d\n", vp.Width); + ok(vp.Height == 600, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } vp.X = 10; vp.X = 20; @@ -817,11 +817,11 @@ static void test_reset(void) if(SUCCEEDED(hr)) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); - ok(vp.Y == 0, "D3DVIEWPORT->X = %d\n", vp.Y); - ok(vp.Width == 640, "D3DVIEWPORT->X = %d\n", vp.Width); - ok(vp.Height == 480, "D3DVIEWPORT->X = %d\n", vp.Height); - ok(vp.MinZ == 0, "D3DVIEWPORT->X = %d\n", vp.Height); - ok(vp.MaxZ == 1, "D3DVIEWPORT->X = %d\n", vp.Height); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); + ok(vp.Width == 640, "D3DVIEWPORT->Width = %d\n", vp.Width); + ok(vp.Height == 480, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } width = GetSystemMetrics(SM_CXSCREEN); @@ -865,11 +865,11 @@ static void test_reset(void) if(SUCCEEDED(hr)) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); - ok(vp.Y == 0, "D3DVIEWPORT->X = %d\n", vp.Y); - ok(vp.Width == 400, "D3DVIEWPORT->X = %d\n", vp.Width); - ok(vp.Height == 300, "D3DVIEWPORT->X = %d\n", vp.Height); - ok(vp.MinZ == 0, "D3DVIEWPORT->X = %d\n", vp.Height); - ok(vp.MaxZ == 1, "D3DVIEWPORT->X = %d\n", vp.Height); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); + ok(vp.Width == 400, "D3DVIEWPORT->Width = %d\n", vp.Width); + ok(vp.Height == 300, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } hr = IDirect3DDevice9_GetSwapChain(pDevice, 0, &pSwapchain);

1 0

Michael Stefaniuc : winecfg: Fix and re-enable the Italian translation.
by Alexandre Julliard 11 Jun '08

11 Jun '08

Module: wine Branch: master Commit: b68f6d9fbece287f9f4862e6336968fc626eb35e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68f6d9fbece287f9f4862e63… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 11 00:52:23 2008 +0200 winecfg: Fix and re-enable the Italian translation. --- programs/winecfg/It.rc | 107 +++++++++++++++++++++---------------------- programs/winecfg/winecfg.rc | 2 +- 2 files changed, 54 insertions(+), 55 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 13e0df4..0400b65 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -22,17 +22,14 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_ABOUTCFG DIALOGEX 0, 0, 260, 250 +IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Versione di Wine:",IDC_STATIC,119,17,55,8 - LTEXT "CVS",IDC_WINEVER,179,17,56,8 - CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER,15,17,157,111, WS_EX_TRANSPARENT + LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 + CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - GROUPBOX "Informazioni",IDC_STATIC,8,4,244,106 - CTEXT "This program 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.", + LTEXT "This program 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.", IDC_STATIC,119,44,124,72 END @@ -42,14 +39,13 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Impostazioni delle applicazioni",IDC_STATIC, 8,4,244,240 LTEXT "Wine pu� simulare diverse versioni e stili di Windows per le applicazioni per Windows", - IDC_STATIC,15,20,227,20 - CONTROL "Applicazioni",IDC_APP_TREEVIEW,"SysTreeView32",WS_BORDER | WS_TABSTOP | TVS_LINESATROOT | TVS_HASLINES | TVS_SHOWSELALWAYS | TVS_HASBUTTONS, 15,40,142,145 - PUSHBUTTON "Aggiungi applicazione...",IDC_APP_ADDAPP, 163,40,82,60 - PUSHBUTTON "Rimuovi applicazione",IDC_APP_REMOVEAPP, 163,125,82,60 - LTEXT "Versione di Windows:",IDC_STATIC,17,192,58,8 - LTEXT "Version del DOS:",IDC_STATIC,17,211,57,8 - COMBOBOX IDC_WINVER,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DOSVER,83,208,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + IDC_STATIC,15,20,227,30 + CONTROL "Applicazioni",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, + 15,50,230,150 + PUSHBUTTON "&Aggiungi applicazione...",IDC_APP_ADDAPP, 70,204,85,14 + PUSHBUTTON "&Rimuovi applicazione",IDC_APP_REMOVEAPP, 160,204,85,14 + LTEXT "Versione di &Windows:",IDC_STATIC,17,226,58,8 + COMBOBOX IDC_WINVER,83,224,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -79,49 +75,41 @@ BEGIN LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 END -IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "DLL Overrides",IDC_STATIC,8,4,244,240 - LTEXT "Si pu� specificare per ogni libreria se deve essere builtin o nativa. Una voce specificata come ""*"" si applica a tutte le dll che non hanno un'impostazione specifica." - , IDC_STATIC,15,17,228,32 - CONTROL "DLL Overrides", IDC_TREE_DLLS, "SysTreeView32", WS_BORDER | WS_TABSTOP | TVS_LINESATROOT | TVS_HASLINES | TVS_SHOWSELALWAYS | TVS_HASBUTTONS, 15,50,142,187 - LTEXT "Ordine di caricamento:",IDC_STATIC,163,50,37,8 - CONTROL "Builtin (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,163,65,75,10 - CONTROL "Native (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,163,80,75,10 - CONTROL "Builtin, Native",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,163,95,75,10 - CONTROL "Native, Builtin",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,163,110,75,10 - CONTROL "Disabilita",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,163,125,75,10 - PUSHBUTTON "Aggiungi applicazione...",IDC_DLLS_ADDAPP,163,144,82,14 - PUSHBUTTON "Rimuovi applicazione",IDC_DLLS_REMOVEAPP, 163,164,82,14 - PUSHBUTTON "Aggiungi DLL override per:",IDC_DLLS_ADDDLL, 163,184,82,14 - COMBOBOX IDC_DLLLIST,163,204,82,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE - PUSHBUTTON "Rimuovi DLL override",IDC_DLLS_REMOVEDLL,163,224,82,14 -END + GROUPBOX "Altri Drive",IDC_STATIC,8,4,244,240 + CONTROL "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 + PUSHBUTTON "Aggiungi...",IDC_BUTTON_ADD,15,98,37,14 + PUSHBUTTON "Rimuovi",IDC_BUTTON_REMOVE,56,98,37,14 + PUSHBUTTON "Rileva automaticamente...",IDC_BUTTON_AUTODETECT,157,98,89,14 -IDD_SYSTEMCFG DIALOG DISCARDABLE 0, 0, 260, 250 -STYLE WS_CHILD -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Drives",IDC_STATIC,8,4,244,120 - LISTBOX IDC_LIST_DRIVES,15,23,179,90,WS_VSCROLL - PUSHBUTTON "&Aggiungi",IDC_DRIVE_ADD,197,22,50,22 - PUSHBUTTON "&Rimuovi",IDC_DRIVE_REMOVE,197,51,50,22 - PUSHBUTTON "&Modifica",IDC_DRIVE_EDIT,197,80,50,22 -END + /* editing drive details */ + LTEXT "&Path:",IDC_STATIC,15,123,20,9 + EDITTEXT IDC_EDIT_PATH,41,120,160,13,ES_AUTOHSCROLL | WS_TABSTOP + PUSHBUTTON "&Browse...",IDC_BUTTON_BROWSE_PATH,206,120,40,13 -IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 -STYLE WS_CHILD | WS_DISABLED -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Altri Drive",IDC_STATIC,7,107,246,112 - LISTBOX IDC_LIST_DRIVES,14,118,232,76,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Aggiungi...",IDC_BUTTON_ADD,14,199,37,14 - PUSHBUTTON "Rimuovi",IDC_BUTTON_REMOVE,55,199,37,14 - PUSHBUTTON "Modifica...",IDC_BUTTON_EDIT,97,199,37,14 - PUSHBUTTON "Rileva automaticamente...",IDC_BUTTON_AUTODETECT,197,199,49,14 - LTEXT "ATTENZIONE: Non � stato definito un driver C. Clicca su 'Aggiungi Driver' per aggiungerne uno.", IDS_DRIVE_NO_C, 7,223,250,110 + LTEXT "&Type:",IDC_STATIC_TYPE,15,138,21,10 + COMBOBOX IDC_COMBO_TYPE,41,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + LTEXT "Label and serial number",IDC_LABELSERIAL_STATIC,15,155,95,10 + + PUSHBUTTON "Show &Advanced",IDC_BUTTON_SHOW_HIDE_ADVANCED,186,136,60,13 + CONTROL "Autodetect &from Device:",IDC_RADIO_AUTODETECT,"Button", + BS_AUTORADIOBUTTON,15,166,93,10 + EDITTEXT IDC_EDIT_DEVICE,27,176,174,13,ES_AUTOHSCROLL + PUSHBUTTON "Bro&wse...",IDC_BUTTON_BROWSE_DEVICE,206,176,40,13 + CONTROL "&Manually Assign:",IDC_RADIO_ASSIGN,"Button", + BS_AUTORADIOBUTTON,15,195,69,10 + + LTEXT "&Label:",IDC_STATIC_LABEL,33,208,29,12 + EDITTEXT IDC_EDIT_LABEL,63,205,78,13,ES_AUTOHSCROLL | WS_TABSTOP + LTEXT "S&erial:",IDC_STATIC_SERIAL,33,225,29,12 + EDITTEXT IDC_EDIT_SERIAL,63,221,78,13,ES_AUTOHSCROLL | WS_TABSTOP + + CONTROL "Show &dot files",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,260,230,8 END IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -173,7 +161,18 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_TAB_GENERAL "Generale" + IDS_TAB_APPLICATIONS "Applications" IDS_TAB_DLLS "Librerie" IDS_TAB_DRIVES "Drive" + IDS_CHOOSE_PATH "Select the unix target directory, please." + IDS_HIDE_ADVANCED "Hide &Advanced" + IDS_SHOW_ADVANCED "Show &Advanced" + IDS_NOTHEME "(No Theme)" + IDS_TAB_GRAPHICS "Graphics" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" + IDS_TAB_AUDIO "Audio" + IDS_TAB_ABOUT "About" + IDS_WINECFG_TITLE "Wine configuration" + IDS_THEMEFILE "Theme files" + IDS_THEMEFILE_SELECT "Select a theme file" END diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 99744c0..ff12383 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -38,7 +38,7 @@ #include "Fi.rc" #include "Fr.rc" #include "Hu.rc" -/* #include "It.rc" */ +#include "It.rc" #include "Ja.rc" #include "Ko.rc" #include "Nl.rc"

1 0

Michael Stefaniuc : regedit: Fix the Danish translation.
by Alexandre Julliard 11 Jun '08

11 Jun '08

Module: wine Branch: master Commit: 48bc578c688749b96862c5e9aa1c2123933996ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=48bc578c688749b96862c5e9a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 11 00:52:07 2008 +0200 regedit: Fix the Danish translation. --- programs/regedit/Da.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Da.rc b/programs/regedit/Da.rc index bcc19c2..27a517a 100644 --- a/programs/regedit/Da.rc +++ b/programs/regedit/Da.rc @@ -106,6 +106,7 @@ BEGIN MENUITEM "&Slet\tDel", ID_EDIT_DELETE MENUITEM "&Omd�b\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Export...", ID_EDIT_EXPORT MENUITEM "&Kopier n�glenavn", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Find\tCtrl+F", ID_EDIT_FIND, GRAYED

1 0

Paul Vriens : shlwapi/tests: Don't create testfile at a fixed location.
by Alexandre Julliard 11 Jun '08

11 Jun '08

Module: wine Branch: master Commit: c81c11f72d17c0263c288891c39cfb39b2c017cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81c11f72d17c0263c288891c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jun 11 08:32:35 2008 +0200 shlwapi/tests: Don't create testfile at a fixed location. --- dlls/shlwapi/tests/istream.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index d8aced5..05a0e5a 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -384,10 +384,15 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) IStream * template = NULL; HRESULT ret; ULONG refcount; - static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't', '\0' }; + WCHAR test_file[MAX_PATH]; + static const WCHAR testEx_txt[] = { '\\', 't', 'e', 's', 't', 'E','x', '.', 't', 'x', 't', '\0' }; trace("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm); + /* Don't used a fixed path for the testEx.txt file */ + GetTempPathW(MAX_PATH, test_file); + lstrcatW(test_file, testEx_txt); + /* invalid arguments */ stream = NULL;

1 0

Michael Stefaniuc : regedit: Fix the Slovenian translation.
by Alexandre Julliard 11 Jun '08

11 Jun '08

Module: wine Branch: master Commit: 4f03310ec52d0511e8967c53bf665ff9d697078c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f03310ec52d0511e8967c53b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 11 00:51:50 2008 +0200 regedit: Fix the Slovenian translation. --- programs/regedit/Si.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Si.rc b/programs/regedit/Si.rc index 52d2972..07c9ec8 100644 --- a/programs/regedit/Si.rc +++ b/programs/regedit/Si.rc @@ -108,6 +108,7 @@ BEGIN MENUITEM "Izbri&ši\tDel", ID_EDIT_DELETE MENUITEM "Prei&menuj\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Export...", ID_EDIT_EXPORT MENUITEM "&Kopiraj ime ključa", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Najdi\tCtrl+F", ID_EDIT_FIND, GRAYED

1 0

Michael Stefaniuc : regedit: Fix the Turkish translation.
by Alexandre Julliard 11 Jun '08

11 Jun '08

Module: wine Branch: master Commit: 7f09556e240bd814d52459d963df47679083e007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f09556e240bd814d52459d96… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 11 00:51:34 2008 +0200 regedit: Fix the Turkish translation. --- programs/regedit/Tr.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Tr.rc b/programs/regedit/Tr.rc index 2b2ced6..561eb93 100644 --- a/programs/regedit/Tr.rc +++ b/programs/regedit/Tr.rc @@ -49,6 +49,7 @@ BEGIN MENUITEM "&Dizge De�eri", ID_EDIT_NEW_STRINGVALUE MENUITEM "&�kili De�er", ID_EDIT_NEW_BINARYVALUE MENUITEM "&�ift S�zc�k De�eri", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Sil\tDel", ID_EDIT_DELETE @@ -99,11 +100,13 @@ BEGIN MENUITEM "&Dizge De�eri", ID_EDIT_NEW_STRINGVALUE MENUITEM "&�kili De�er", ID_EDIT_NEW_BINARYVALUE MENUITEM "&�ift S�zc�k De�eri", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Sil\tDel", ID_EDIT_DELETE MENUITEM "&Yeniden Adland�r\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Export...", ID_EDIT_EXPORT MENUITEM "&Anahtar Ad�n� Kopyala", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Bul\tCtrl+F", ID_EDIT_FIND, GRAYED

1 0