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

Jeremy Newman : quote all tag params
by Jeremy Newman 29 Aug '08

29 Aug '08

Module: website Branch: master Commit: 93715411ad567a4683fccc9179d3bc0ae8254e33 URL: http://source.winehq.org/git/website.git/?a=commit;h=93715411ad567a4683fccc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Aug 29 15:51:20 2008 -0500 quote all tag params --- templates/en/download.template | 46 ++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 9b9adb8..55ebe7b 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -13,16 +13,16 @@ for post-installation instructions. <table><tr><td>Latest stable release:</td><td>Wine {$stable_release}</td></tr> <tr><td>Latest development release:</td><td>Wine {$master_release}</td></tr></table> -<table width="95%" border=0 cellpadding=5 cellspacing=1 bgcolor="#EFEFEF"> +<table width="95%" border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> <tr> - <td align=center bgcolor=black>System</td> - <td align=center bgcolor=black>Notes</td> - <td align=center bgcolor=black>Maintainer</td> + <td align="center" bgcolor="black">System</td> + <td align="center" bgcolor="black">Notes</td> + <td align="center" bgcolor="black">Maintainer</td> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> + <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Red Hat / CentOS / Fedora</a> @@ -36,7 +36,7 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://en.opensuse.org/Wine#Repositories"> + <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> @@ -47,7 +47,7 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> + <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandriva</a> @@ -57,7 +57,7 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> + <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> @@ -66,7 +66,7 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/site/download-deb"> + <td align="center"><a href="{$root}/site/download-deb"> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/site/download-deb">Ubuntu</a> @@ -75,7 +75,7 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="{$root}/site/download-deb"> + <td align="center"><a href="{$root}/site/download-deb"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian linux" border="0"></a> </td> <td> <a href="{$root}/site/download-deb">Debian</a> @@ -84,7 +84,7 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://www.freshports.org/emulators/wine/"> + <td align="center"><a href="http://www.freshports.org/emulators/wine/"> <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> </td> <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> @@ -93,7 +93,7 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search"> + <td align="center"><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search"> <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a> </td> <td> <a href="http://www.pbidir.com/bt/search/?str=wine&search=Search">PC-BSD</a> @@ -102,7 +102,7 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://ocean1.ee.duth.gr/SolarisX/"> + <td align="center"><a href="http://ocean1.ee.duth.gr/SolarisX/"> <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a> </td> <td> <a href="http://ocean1.ee.duth.gr/SolarisX/">Solaris</a> @@ -112,7 +112,7 @@ for post-installation instructions. <tr bgcolor="#ffffff"> - <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=1…"> + <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=1…"> <img src="{$root}/images/distro/windows.png" width="50" height="54" alt="Windows" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=1…">Windows</a> binary .zips</td> @@ -128,21 +128,21 @@ for post-installation instructions. <h1><a name="commercial"></a>Commercial Wine Versions</h1> -<table width="95%" border=0 cellpadding=5 cellspacing=1 bgcolor="#EFEFEF"> +<table width="95%" border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> <tr> - <td align=center bgcolor=black>Product</td> - <td align=center bgcolor=black>Description</td> + <td align="center" bgcolor="black">Product</td> + <td align="center" bgcolor="black">Description</td> </tr> <tr> - <td align=center bgcolor="#ffffff"> + <td align="center" bgcolor="#ffffff"> <a href="http://www.codeweavers.com/products/"> <img src="{$root}/images/distro/crossover.png" width="50" height="50" alt="CrossOver Office" border="0"> </a> </td> - <td align=left bgcolor="#ffffff"> + <td align="left" bgcolor="#ffffff"> <a href="http://www.codeweavers.com/products/">CrossOver</a> - Award winning highly customized versions for <a href="http://www.codeweavers.com/products/cxmac/">Mac OS</a> and @@ -160,11 +160,11 @@ for post-installation instructions. <h1><a name="source"></a>Wine Source Downloads</h1> -<table width="95%" border=0 cellpadding=5 cellspacing=1 bgcolor="#EFEFEF"> +<table width="95%" border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> <tr> - <td align=center bgcolor=black>Location</td> - <td align=center bgcolor=black>Description</td> + <td align="center" bgcolor="black">Location</td> + <td align="center" bgcolor="black">Description</td> </tr> <tr bgcolor="#ffffff"> @@ -191,7 +191,7 @@ for post-installation instructions. <a href="http://www.winehq.org/site/download" target="_blank"><img - src="{$root}/images/download_wine.png" border=1 width=88 height=31 vspace=0 hspace=5 align=left + src="{$root}/images/download_wine.png" border="1" width="88" height="31" vspace="0" hspace="5" align="left" alt="Download Wine"></a> Use this image if you want to link to our download page.

1 0

Austin English : update solaris download link and maintainer (try 2)
by Jeremy Newman 29 Aug '08

29 Aug '08

Module: website Branch: master Commit: 4a44c80fd8779bd232859212e35ae242a23212f3 URL: http://source.winehq.org/git/website.git/?a=commit;h=4a44c80fd8779bd2328592… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 15:47:16 2008 -0500 update solaris download link and maintainer (try 2) --- templates/en/download.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index e052d82..9b9adb8 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -105,7 +105,7 @@ for post-installation instructions. <td align=center><a href="http://ocean1.ee.duth.gr/SolarisX/"> <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a> </td> - <td> <a href="http://www.blastwave.org/wine/">Solaris</a> + <td> <a href="http://ocean1.ee.duth.gr/SolarisX/">Solaris</a> binary and source for Solaris 10 and 11</td> <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> </tr>

1 0

Austin English : download.template: update Solaris website/maintainer ( website)
by Jeremy Newman 29 Aug '08

29 Aug '08

Module: website Branch: master Commit: c5c1455e0bd8015601a1ff2fb4e6fca7b3ffc643 URL: http://source.winehq.org/git/website.git/?a=commit;h=c5c1455e0bd8015601a1ff… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 12:38:35 2008 -0500 download.template: update Solaris website/maintainer (website) >From bd51b456326995a5fc77ce41693b24bc59f73ae7 Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish(a)gmail.com> Date: Fri, 29 Aug 2008 12:37:22 -0500 Subject: [PATCH] download.template: update Solaris website/maintainer --- templates/en/download.template | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 147bc8e..e052d82 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -102,12 +102,12 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://www.blastwave.org/wine/"> + <td align=center><a href="http://ocean1.ee.duth.gr/SolarisX/"> <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a> </td> <td> <a href="http://www.blastwave.org/wine/">Solaris</a> - binary and source for Solaris 9 and 10</td> - <td><a href="mailto:solaris.wine(a)optusnet.com.au">Robert Lunnon</a></td> + binary and source for Solaris 10 and 11</td> + <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> </tr>

1 0

Michael Stefaniuc : winhttp: Move the wine includes after the system includes.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 7c0d28b0da423d5d8ca32594d786c86418f17b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0d28b0da423d5d8ca32594d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 29 15:38:43 2008 +0200 winhttp: Move the wine includes after the system includes. --- dlls/winhttp/net.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 80d1b9a..d367723 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -18,8 +18,6 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" -#include "wine/library.h" #include <stdarg.h> #include <stdio.h> @@ -44,6 +42,9 @@ #undef DSA #endif +#include "wine/debug.h" +#include "wine/library.h" + #include "windef.h" #include "winbase.h" #include "winhttp.h"

1 0

Henri Verbeet : msvcrt: Don't depend on the system's implementation of acos () & asin().
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 71aa14af993dd065b1882675fb9f01af44ed232a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71aa14af993dd065b1882675f… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Fri Aug 29 02:11:53 2008 +0200 msvcrt: Don't depend on the system's implementation of acos() & asin(). --- dlls/msvcrt/math.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b449af5..25ac69f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -57,7 +57,12 @@ static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL; double CDECL MSVCRT_acos( double x ) { if (x < -1.0 || x > 1.0 || !finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; - return acos(x); + /* glibc implements acos() as the FPU equivalent of atan2(sqrt(1 - x ^ 2), x). + * asin() uses a similar construction. This is bad because as x gets nearer to + * 1 the error in the expression "1 - x^2" can get relatively large due to + * cancellation. The sqrt() makes things worse. A safer way to calculate + * acos() is to use atan2(sqrt((1 - x) * (1 + x)), x). */ + return atan2(sqrt((1 - x) * (1 + x)), x); } /********************************************************************* @@ -66,7 +71,7 @@ double CDECL MSVCRT_acos( double x ) double CDECL MSVCRT_asin( double x ) { if (x < -1.0 || x > 1.0 || !finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; - return asin(x); + return atan2(x, sqrt((1 - x) * (1 + x))); } /*********************************************************************

1 0

Nikolay Sivov : gdiplus: Stub for GdipFlattenPath with tests.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 5c1edcfaad88844a5cbd4bbdbe2e69c0d0e2366d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1edcfaad88844a5cbd4bbdb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Aug 29 15:47:05 2008 +0400 gdiplus: Stub for GdipFlattenPath with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 13 ++++++ dlls/gdiplus/tests/graphicspath.c | 75 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 90 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 94123fa..725c024 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -233,7 +233,7 @@ @ stdcall GdipFillRegion(ptr ptr ptr) @ stdcall GdipFindFirstImageItem(ptr ptr) @ stub GdipFindNextImageItem -@ stub GdipFlattenPath +@ stdcall GdipFlattenPath(ptr ptr long) @ stdcall GdipFlush(ptr long) @ stdcall GdipFree(ptr) @ stub GdipGetAdjustableArrowCapFillState diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 7727721..d0f5dc0 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -816,6 +816,19 @@ GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) return Ok; } +GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatness) +{ + static int calls; + + if(!path) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetPathData(GpPath *path, GpPathData* pathData) { TRACE("(%p, %p)\n", path, pathData); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 5fad0b1..47d8205 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -886,6 +886,80 @@ static void test_addpie(void) GdipDeletePath(path); } +static path_test_t flattenellipse_path[] = { + {100.0, 25.0,PathPointTypeStart, 0, 0}, /*0*/ + {99.0, 30.0, PathPointTypeLine, 0, 1}, /*1*/ + {96.0, 34.8, PathPointTypeLine, 0, 1}, /*2*/ + {91.5, 39.0, PathPointTypeLine, 0, 1}, /*3*/ + {85.5, 42.8, PathPointTypeLine, 0, 1}, /*4*/ + {69.5, 48.0, PathPointTypeLine, 0, 1}, /*5*/ + {50.0, 50.0, PathPointTypeLine, 0, 1}, /*6*/ + {30.5, 48.0, PathPointTypeLine, 0, 1}, /*7*/ + {14.8, 42.8, PathPointTypeLine, 0, 1}, /*8*/ + {8.5, 39.0, PathPointTypeLine, 0, 1}, /*9*/ + {4.0, 34.8, PathPointTypeLine, 0, 1}, /*10*/ + {1.0, 30.0, PathPointTypeLine, 0, 1}, /*11*/ + {0.0, 25.0, PathPointTypeLine, 0, 1}, /*12*/ + {1.0, 20.0, PathPointTypeLine, 0, 1}, /*13*/ + {4.0, 15.3, PathPointTypeLine, 0, 1}, /*14*/ + {8.5, 11.0, PathPointTypeLine, 0, 1}, /*15*/ + {14.8, 7.3, PathPointTypeLine, 0, 1}, /*16*/ + {30.5, 2.0, PathPointTypeLine, 0, 1}, /*17*/ + {50.0, 0.0, PathPointTypeLine, 0, 1}, /*18*/ + {69.5, 2.0, PathPointTypeLine, 0, 1}, /*19*/ + {85.5, 7.3, PathPointTypeLine, 0, 1}, /*20*/ + {91.5, 11.0, PathPointTypeLine, 0, 1}, /*21*/ + {96.0, 15.3, PathPointTypeLine, 0, 1}, /*22*/ + {99.0, 20.0, PathPointTypeLine, 0, 1}, /*23*/ + {100.0,25.0, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 1} /*24*/ + }; + +static path_test_t flattenarc_path[] = { + {100.0, 25.0,PathPointTypeStart, 0, 0}, /*0*/ + {99.0, 30.0, PathPointTypeLine, 0, 1}, /*1*/ + {96.0, 34.8, PathPointTypeLine, 0, 1}, /*2*/ + {91.5, 39.0, PathPointTypeLine, 0, 1}, /*3*/ + {85.5, 42.8, PathPointTypeLine, 0, 1}, /*4*/ + {69.5, 48.0, PathPointTypeLine, 0, 1}, /*5*/ + {50.0, 50.0, PathPointTypeLine, 0, 1} /*6*/ + }; + +static void test_flatten(void) +{ + GpStatus status; + GpPath *path; + GpMatrix *m; + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + status = GdipCreateMatrix(&m); + expect(Ok, status); + + /* NULL arguments */ + status = GdipFlattenPath(NULL, NULL, 0.0); + expect(InvalidParameter, status); + status = GdipFlattenPath(NULL, m, 0.0); + expect(InvalidParameter, status); + + status = GdipAddPathEllipse(path, 0.0, 0.0, 100.0, 50.0); + expect(Ok, status); + + status = GdipFlattenPath(path, NULL, 1.0); + todo_wine expect(Ok, status); + ok_path(path, flattenellipse_path, sizeof(flattenellipse_path)/sizeof(path_test_t), TRUE); + + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathArc(path, 0.0, 0.0, 100.0, 50.0, 0.0, 90.0); + expect(Ok, status); + status = GdipFlattenPath(path, NULL, 1.0); + todo_wine expect(Ok, status); + ok_path(path, flattenarc_path, sizeof(flattenarc_path)/sizeof(path_test_t), TRUE); + + GdipDeleteMatrix(m); + GdipDeletePath(path); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -913,6 +987,7 @@ START_TEST(graphicspath) test_addclosedcurve(); test_reverse(); test_addpie(); + test_flatten(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0b4a67f..12e8d94 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -288,6 +288,7 @@ GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF*,GDIPCONST BYTE*,INT, GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint*,GDIPCONST BYTE*,INT,GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); +GpStatus WINGDIPAPI GdipFlattenPath(GpPath*,GpMatrix*,REAL); GpStatus WINGDIPAPI GdipGetPathData(GpPath*,GpPathData*); GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*); GpStatus WINGDIPAPI GdipGetPathLastPoint(GpPath*,GpPointF*);

1 0

Aric Stewart : systray: Keep systray hidden when requested by moving it off screen.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: f8096d2b84f29e2352e536b20d5e2d93d9fd0f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8096d2b84f29e2352e536b20… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 27 12:31:14 2008 -0500 systray: Keep systray hidden when requested by moving it off screen. --- programs/explorer/systray.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 8b82d9a..07e683a 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -430,6 +430,14 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) return ret; } +static void do_hide_systray(void) +{ + SetWindowPos( tray_window, 0, + GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), + GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN), + 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); +} + static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -437,6 +445,10 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_COPYDATA: return handle_incoming((HWND)wparam, (COPYDATASTRUCT *)lparam); + case WM_DISPLAYCHANGE: + if (hide_systray) do_hide_systray(); + break; + case WM_TIMER: cleanup_destroyed_windows(); break; @@ -568,5 +580,8 @@ void initialize_systray(void) WINE_ERR("Could not create tray window\n"); return; } + + if (hide_systray) do_hide_systray(); + SetTimer( tray_window, 1, 2000, NULL ); }

1 0

Alexandre Julliard : comctl32: Rename the Chinese resources to comctl_Zh.rc .
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: c5ef467f4dd6d1d225294289f78113c5fd1eed7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ef467f4dd6d1d225294289f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 29 13:53:21 2008 +0200 comctl32: Rename the Chinese resources to comctl_Zh.rc. --- dlls/comctl32/{comctl_Cn.rc => comctl_Zh.rc} | 0 dlls/comctl32/rsrc.rc | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl_Cn.rc b/dlls/comctl32/comctl_Zh.rc similarity index 100% rename from dlls/comctl32/comctl_Cn.rc rename to dlls/comctl32/comctl_Zh.rc diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc index 772248a..c3bf74a 100644 --- a/dlls/comctl32/rsrc.rc +++ b/dlls/comctl32/rsrc.rc @@ -91,7 +91,6 @@ IDI_TT_ERROR_SM ICON LOADONCALL DISCARDABLE idi_tt_error_sm.ico */ #include "comctl_Bg.rc" -#include "comctl_Cn.rc" #include "comctl_Cs.rc" #include "comctl_De.rc" #include "comctl_El.rc" @@ -114,3 +113,4 @@ IDI_TT_ERROR_SM ICON LOADONCALL DISCARDABLE idi_tt_error_sm.ico #include "comctl_Th.rc" #include "comctl_Tr.rc" #include "comctl_Uk.rc" +#include "comctl_Zh.rc"

1 0

Alexandre Julliard : shell32: Merge Chinese resources into a single file.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 2bf33c0a324d98406a05e9d3721cb4faa51692c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf33c0a324d98406a05e9d37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 29 13:52:10 2008 +0200 shell32: Merge Chinese resources into a single file. --- dlls/shell32/shell32_Cn.rc | 115 -------------------------------------------- dlls/shell32/shell32_Zh.rc | 95 ++++++++++++++++++++++++++++++++++++ dlls/shell32/shres.rc | 1 - 3 files changed, 95 insertions(+), 116 deletions(-) diff --git a/dlls/shell32/shell32_Cn.rc b/dlls/shell32/shell32_Cn.rc deleted file mode 100644 index 31ee724..0000000 --- a/dlls/shell32/shell32_Cn.rc +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2002 Tisheng Chen - * - * 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 - */ - -/* Chinese text is encoded in UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED - -/* - shellview item menu -*/ -MENU_SHV_FILE MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "选择(&S)" FCIDM_SHVIEW_OPEN - MENUITEM "文件管理器(&x)",FCIDM_SHVIEW_EXPLORE - MENUITEM "打开(&O)", FCIDM_SHVIEW_OPEN - MENUITEM SEPARATOR - MENUITEM "剪切(&u)", FCIDM_SHVIEW_CUT - MENUITEM "复制(&C)", FCIDM_SHVIEW_COPY - MENUITEM SEPARATOR - MENUITEM "生成连接(&L)", FCIDM_SHVIEW_CREATELINK - MENUITEM "删除(&D)", FCIDM_SHVIEW_DELETE - MENUITEM "改名(&R)", FCIDM_SHVIEW_RENAME - MENUITEM SEPARATOR - MENUITEM "属性(&P)", FCIDM_SHVIEW_PROPERTIES - END -END - -MENU_CPANEL MENU -BEGIN - POPUP "文件(&F)" - BEGIN - MENUITEM SEPARATOR - MENUITEM "退出(&x)", IDM_CPANEL_EXIT - END - - POPUP "查看(&V)" - BEGIN - MENUITEM "大图标(&g)", FCIDM_SHVIEW_BIGICON - MENUITEM "小图标(&m)", FCIDM_SHVIEW_SMALLICON - MENUITEM "列表(&L)", FCIDM_SHVIEW_LISTVIEW - MENUITEM "详情(&D)", FCIDM_SHVIEW_REPORTVIEW - END - - POPUP "帮助(&H)" - BEGIN - MENUITEM "关于控制面板(&A)...", IDM_CPANEL_ABOUT - END -END - -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "关于 %s" -FONT 9, "MS Song" -{ - DEFPUSHBUTTON "确定", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "使用许可(&l)...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP - LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", stc1, 10, 10, 30, 30 - LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 - LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 - LTEXT "运行于 %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 - LTEXT "Wine 开发人员:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 -} - -SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" -FONT 9, "MS Song" -{ - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "输入程序，目录，文件或者Internet资源名，Wine将为您打开它。", 12289, 36, 11, 182, 18 - LTEXT "打开(&O):", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 - DEFPUSHBUTTON "确定", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "取消", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "浏览(&B)...", 12288, 170, 63, 50, 14, WS_TABSTOP -} - -/* columns in the shellview */ -STRINGTABLE -BEGIN - IDS_SHV_COLUMN1 "文件" - IDS_SHV_COLUMN2 "大小" - IDS_SHV_COLUMN3 "类型" - IDS_SHV_COLUMN4 "修改" - IDS_SHV_COLUMN5 "属性" - IDS_SHV_COLUMN6 "使用空间" - IDS_SHV_COLUMN7 "剩余空间" - IDS_SHV_COLUMN8 "名称" - IDS_SHV_COLUMN9 "备注" - - IDS_CPANEL_TITLE "Wine 控制面板" - IDS_CPANEL_NAME "名称" - IDS_CPANEL_DESCRIPTION "描述" -END - -#pragma code_page(default) diff --git a/dlls/shell32/shell32_Zh.rc b/dlls/shell32/shell32_Zh.rc index b6218fb..282e88b 100644 --- a/dlls/shell32/shell32_Zh.rc +++ b/dlls/shell32/shell32_Zh.rc @@ -2,6 +2,7 @@ * shell32 (Traditional Chinese Resource) * * Copyright 1998 Juergen Schmied + * Copyright 2002 Tisheng Chen * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> * * This library is free software; you can redistribute it and/or @@ -22,6 +23,100 @@ /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "选择(&S)" FCIDM_SHVIEW_OPEN + MENUITEM "文件管理器(&x)",FCIDM_SHVIEW_EXPLORE + MENUITEM "打开(&O)", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "剪切(&u)", FCIDM_SHVIEW_CUT + MENUITEM "复制(&C)", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "生成连接(&L)", FCIDM_SHVIEW_CREATELINK + MENUITEM "删除(&D)", FCIDM_SHVIEW_DELETE + MENUITEM "改名(&R)", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "属性(&P)", FCIDM_SHVIEW_PROPERTIES + END +END + +MENU_CPANEL MENU +BEGIN + POPUP "文件(&F)" + BEGIN + MENUITEM SEPARATOR + MENUITEM "退出(&x)", IDM_CPANEL_EXIT + END + + POPUP "查看(&V)" + BEGIN + MENUITEM "大图标(&g)", FCIDM_SHVIEW_BIGICON + MENUITEM "小图标(&m)", FCIDM_SHVIEW_SMALLICON + MENUITEM "列表(&L)", FCIDM_SHVIEW_LISTVIEW + MENUITEM "详情(&D)", FCIDM_SHVIEW_REPORTVIEW + END + + POPUP "帮助(&H)" + BEGIN + MENUITEM "关于控制面板(&A)...", IDM_CPANEL_ABOUT + END +END + +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "关于 %s" +FONT 9, "MS Song" +{ + DEFPUSHBUTTON "确定", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "使用许可(&l)...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER + ICON "", stc1, 10, 10, 30, 30 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 + LTEXT "运行于 %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine 开发人员:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 +} + +SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 9, "MS Song" +{ + ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE + LTEXT "输入程序，目录，文件或者Internet资源名，Wine将为您打开它。", 12289, 36, 11, 182, 18 + LTEXT "打开(&O):", 12305, 7, 39, 24, 10 + CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + DEFPUSHBUTTON "确定", IDOK, 62, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "取消", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "浏览(&B)...", 12288, 170, 63, 50, 14, WS_TABSTOP +} + +/* columns in the shellview */ +STRINGTABLE +BEGIN + IDS_SHV_COLUMN1 "文件" + IDS_SHV_COLUMN2 "大小" + IDS_SHV_COLUMN3 "类型" + IDS_SHV_COLUMN4 "修改" + IDS_SHV_COLUMN5 "属性" + IDS_SHV_COLUMN6 "使用空间" + IDS_SHV_COLUMN7 "剩余空间" + IDS_SHV_COLUMN8 "名称" + IDS_SHV_COLUMN9 "备注" + + IDS_CPANEL_TITLE "Wine 控制面板" + IDS_CPANEL_NAME "名称" + IDS_CPANEL_DESCRIPTION "描述" +END + + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL /* diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index b82c839..8222f95 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -130,7 +130,6 @@ IDR_AVI_FILEDELETE AVI searching.avi */ #include "shell32_Bg.rc" #include "shell32_Ca.rc" -#include "shell32_Cn.rc" #include "shell32_Cs.rc" #include "shell32_Da.rc" #include "shell32_De.rc"

1 0

Alexandre Julliard : comdlg32: Merge Chinese resources into a single file.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: f4d2477b6c41cd9bbb299100d254c71b1670a4f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d2477b6c41cd9bbb299100d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 29 13:52:47 2008 +0200 comdlg32: Merge Chinese resources into a single file. --- dlls/comdlg32/cdlg_Cn.rc | 445 ---------------------------------------------- dlls/comdlg32/cdlg_Zh.rc | 421 +++++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/rsrc.rc | 1 - 3 files changed, 421 insertions(+), 446 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4d2477b6c41cd9bbb299…

1 0