January 2009 - Wine-commits

Juan Lang : cryptui: Improve control spacing.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 9ecb7b75e365bf1ae1867b80b0773e663878a99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ecb7b75e365bf1ae1867b80b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 9 08:26:41 2009 -0800 cryptui: Improve control spacing. This makes the two static control borders between the three regions on the general page appear to be the same height. --- dlls/cryptui/cryptui_En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 474e292..ff4dc55 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -158,7 +158,7 @@ BEGIN ES_READONLY|ES_MULTILINE|WS_DISABLED,8,38,238,78 CONTROL "", IDC_STATIC, "Static", SS_BLACKFRAME, 16,116,222,1 CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", - ES_READONLY|ES_MULTILINE|WS_DISABLED,8,117,238,91 + ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 PUSHBUTTON "&Install Certificate...", IDC_ADDTOSTORE,103,216,70,14 PUSHBUTTON "Issuer &Statement", IDC_ISSUERSTATEMENT,177,216,70,14 END

1 0

Juan Lang : cryptui: Don't make certificate status control disabled.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 113cb2d31387baac3cf8b1128781ff6d6991703d URL: http://source.winehq.org/git/wine.git/?a=commit;h=113cb2d31387baac3cf8b1128… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 9 08:31:51 2009 -0800 cryptui: Don't make certificate status control disabled. This allows using the scrollbar when there are lots of usages set for the certificate. --- dlls/cryptui/cryptui_En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index ff4dc55..119eac6 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -155,7 +155,7 @@ BEGIN ES_READONLY|WS_DISABLED,34,11,212,26 CONTROL "", IDC_STATIC, "Static", SS_BLACKFRAME, 16,37,222,1 CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", - ES_READONLY|ES_MULTILINE|WS_DISABLED,8,38,238,78 + ES_READONLY|ES_MULTILINE,8,38,238,78 CONTROL "", IDC_STATIC, "Static", SS_BLACKFRAME, 16,116,222,1 CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90

1 0

Alexandre Julliard : gdi32/tests: Fix an uninitialized pointer check for Win64.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 328ca0e00c210d41823ea4d0e541773d6b42c21e URL: http://source.winehq.org/git/wine.git/?a=commit;h=328ca0e00c210d41823ea4d0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 18:08:50 2009 +0100 gdi32/tests: Fix an uninitialized pointer check for Win64. --- dlls/gdi32/tests/font.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0624de0..0aa9af6 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1185,6 +1185,7 @@ static void test_GetOutlineTextMetrics(void) HFONT hfont, hfont_old; HDC hdc; DWORD ret, otm_size; + LPSTR unset_ptr; if (!is_font_installed("Arial")) { @@ -1241,6 +1242,7 @@ static void test_GetOutlineTextMetrics(void) /* ask about truncated data */ memset(otm, 0xAA, otm_size); + memset(&unset_ptr, 0xAA, sizeof(unset_ptr)); SetLastError(0xdeadbeef); otm->otmSize = sizeof(*otm) - sizeof(LPSTR); /* just in case for Win9x compatibility */ ret = GetOutlineTextMetrics(hdc, otm->otmSize, otm); @@ -1253,7 +1255,7 @@ static void test_GetOutlineTextMetrics(void) ok(otm->otmpFaceName == NULL, "expected NULL got %p\n", otm->otmpFaceName); ok(otm->otmpStyleName == NULL, "expected NULL got %p\n", otm->otmpStyleName); } - ok(otm->otmpFullName == (LPSTR)0xAAAAAAAA, "expected 0xAAAAAAAA got %p\n", otm->otmpFullName); + ok(otm->otmpFullName == unset_ptr, "expected %p got %p\n", unset_ptr, otm->otmpFullName); HeapFree(GetProcessHeap(), 0, otm);

1 0

Alexandre Julliard : rpcrt4/tests: Fix an uninitialized pointer check for Win64.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 450e9e3adfb296f59852e3b7beabb592c9c758ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=450e9e3adfb296f59852e3b7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 18:08:57 2009 +0100 rpcrt4/tests: Fix an uninitialized pointer check for Win64. --- dlls/rpcrt4/tests/rpc_async.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc_async.c b/dlls/rpcrt4/tests/rpc_async.c index a540b90..64f0daf 100644 --- a/dlls/rpcrt4/tests/rpc_async.c +++ b/dlls/rpcrt4/tests/rpc_async.c @@ -34,6 +34,7 @@ static void test_RpcAsyncInitializeHandle(void) RPC_ASYNC_STATE async; RPC_STATUS status; int i; + void *unset_ptr; status = pRpcAsyncInitializeHandle((PRPC_ASYNC_STATE)buffer, sizeof(buffer)); ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with large Size should have returned ERROR_INVALID_PARAMETER instead of %d\n", status); @@ -42,6 +43,7 @@ static void test_RpcAsyncInitializeHandle(void) ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with small Size should have returned ERROR_INVALID_PARAMETER instead of %d\n", status); memset(&async, 0xcc, sizeof(async)); + memset(&unset_ptr, 0xcc, sizeof(unset_ptr)); status = pRpcAsyncInitializeHandle(&async, sizeof(async)); ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %d\n", status); @@ -50,7 +52,7 @@ static void test_RpcAsyncInitializeHandle(void) ok(async.Lock == 0, "async.Lock should be 0, but is %d instead\n", async.Lock); ok(async.Flags == 0, "async.Flags should be 0, but is %d instead\n", async.Flags); ok(async.StubInfo == NULL, "async.StubInfo should be NULL, not %p\n", async.StubInfo); - ok(async.UserInfo == (void *)0xcccccccc, "async.UserInfo should be unset, not %p\n", async.UserInfo); + ok(async.UserInfo == unset_ptr, "async.UserInfo should be unset, not %p\n", async.UserInfo); ok(async.RuntimeInfo == NULL, "async.RuntimeInfo should be NULL, not %p\n", async.RuntimeInfo); ok(async.Event == 0xcccccccc, "async.Event should be unset, not %d\n", async.Event); ok(async.NotificationType == 0xcccccccc, "async.NotificationType should be unset, not %d\n", async.NotificationType);

1 0

Alexandre Julliard : include: Fix packing of the STRRET structure.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 2e0a7252e100127aad8076aa9a839b632d0ddebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0a7252e100127aad8076aa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 17:46:24 2009 +0100 include: Fix packing of the STRRET structure. --- include/shtypes.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/shtypes.idl b/include/shtypes.idl index eb4cb57..89e6bb0 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -51,7 +51,7 @@ typedef enum tagSTRRET_TYPE STRRET_CSTR = 2 } STRRET_TYPE; -cpp_quote("#include <pshpack4.h>") +cpp_quote("#include <pshpack8.h>") typedef struct _STRRET { UINT uType; /* STRRET_xxx */

1 0

Alexandre Julliard : include: Fix packing of the msacm structures.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 10b089abc88e8c78a08b898e52f83bd8deca5333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b089abc88e8c78a08b898e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 17:46:36 2009 +0100 include: Fix packing of the msacm structures. --- include/msacm.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msacm.h b/include/msacm.h index 8a2c8e7..c4da171 100644 --- a/include/msacm.h +++ b/include/msacm.h @@ -25,6 +25,8 @@ extern "C" { #endif /* defined(__cplusplus) */ +#include <pshpack1.h> + #define ACMAPI WINAPI /*********************************************************************** @@ -773,6 +775,8 @@ MMRESULT WINAPI acmStreamUnprepareHeader( HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare ); +#include <poppack.h> + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

Alexandre Julliard : include: Fix a number of mmsystem. h structure for Win64.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: ec1b28edb0c259f5a0c639edee4ed42b9cac9d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1b28edb0c259f5a0c639ede… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 9 17:46:46 2009 +0100 include: Fix a number of mmsystem.h structure for Win64. --- dlls/mcicda/mcicda.c | 12 ++++++------ dlls/mciseq/mcimidi.c | 8 ++++---- dlls/mciwave/mciwave.c | 22 +++++++++++----------- dlls/msvfw32/mciwnd.c | 4 ++-- dlls/winealsa.drv/waveout.c | 2 +- dlls/wineesd.drv/audio.c | 4 ++-- dlls/wineoss.drv/audio.c | 2 +- dlls/winmm/mci.c | 4 ++-- include/mmsystem.h | 12 ++++++------ 9 files changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec1b28edb0c259f5a0c63…

1 0

Jeremy Newman : fix links to WWN in news post
by Jeremy Newman 09 Jan '09

09 Jan '09

Module: website Branch: master Commit: 5f641285a30f7be5868aeb6acd4684ef203e7a21 URL: http://source.winehq.org/git/website.git/?a=commit;h=5f641285a30f7be5868aeb… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Jan 9 15:23:14 2009 -0600 fix links to WWN in news post --- news/en/2009010901.xml | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/news/en/2009010901.xml b/news/en/2009010901.xml index bb72dcf..9440a72 100644 --- a/news/en/2009010901.xml +++ b/news/en/2009010901.xml @@ -2,16 +2,16 @@ <date>January 09, 2009</date> <title>World Wine News Issue 355</title> <body> - <a href="?issue=355">WWN Issue 355</a> was released today. + <a href="{$root}/wwn/355">WWN Issue 355</a> was released today. <ul> -<li><a href="?issue=355#News: Wine in 2009">News: Wine in 2009</a></li> -<li><a href="?issue=355#Test Suite Passes!">Test Suite Passes!</a></li> -<li><a href="?issue=355#Wine in Ubuntu">Wine in Ubuntu</a></li> -<li><a href="?issue=355#OpenBSD, we do care!">OpenBSD, we do care!</a></li> -<li><a href="?issue=355#DXDiag for Wine">DXDiag for Wine</a></li> -<li><a href="?issue=355#Real DIB Progress">Real DIB Progress</a></li> -<li><a href="?issue=355#Serious Wine64 Progress">Serious Wine64 Progress</a></li> -<li><a href="?issue=355#Vertex Pipeline Replacement Status Update">Vertex Pipeline Replacement Status Update</a></li> +<li><a href="{$root}/wwn/355#News: Wine in 2009">News: Wine in 2009</a></li> +<li><a href="{$root}/wwn/355#Test Suite Passes!">Test Suite Passes!</a></li> +<li><a href="{$root}/wwn/355#Wine in Ubuntu">Wine in Ubuntu</a></li> +<li><a href="{$root}/wwn/355#OpenBSD, we do care!">OpenBSD, we do care!</a></li> +<li><a href="{$root}/wwn/355#DXDiag for Wine">DXDiag for Wine</a></li> +<li><a href="{$root}/wwn/355#Real DIB Progress">Real DIB Progress</a></li> +<li><a href="{$root}/wwn/355#Serious Wine64 Progress">Serious Wine64 Progress</a></li> +<li><a href="{$root}/wwn/355#Vertex Pipeline Replacement Status Update">Vertex Pipeline Replacement Status Update</a></li> </ul> </body> </news>

1 0

Zachary Goldberg : WWN 355
by Jeremy Newman 09 Jan '09

09 Jan '09

Module: website Branch: master Commit: 0c3dff401578828257761dc75fc075e60ac75194 URL: http://source.winehq.org/git/website.git/?a=commit;h=0c3dff401578828257761d… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Fri Jan 9 15:55:00 2009 -0500 WWN 355 --- news/en/2009010901.xml | 17 + wwn/en/wn20090109_355.xml | 5361 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 5378 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0c3dff401578828257…

1 0

Scott Ritchie : Remove long defunct Windows, Solaris, and Etch versions from download page
by Jeremy Newman 09 Jan '09

09 Jan '09

Module: website Branch: master Commit: cf859c6871d9f092c9f43f9200e6054df2e9cea9 URL: http://source.winehq.org/git/website.git/?a=commit;h=cf859c6871d9f092c9f43f… Author: Scott Ritchie <scott(a)open-vote.org> Date: Thu Jan 8 15:21:49 2009 -0800 Remove long defunct Windows, Solaris, and Etch versions from download page Remove references to unmaintained Etch, Solaris, and Windows versions from the download page. Update Ubuntu download page to make Ubuntu specific, and move command line instructions to the bottom. >From 6989941bfd0209d9fde707c190a7fb595fc47ae7 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Thu, 8 Jan 2009 15:12:28 -0800 Subject: Remove references to unmaintained Etch, Solaris, and Windows versions from the download page. Update Ubuntu download page to make Ubuntu specific, and move command line instructions to the bottom. --- templates/en/download.template | 27 ------------- templates/en/download/deb.template | 76 +++++++++++++++++------------------- 2 files changed, 36 insertions(+), 67 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 8c0bdb8..97e5dfb 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -64,15 +64,6 @@ for post-installation instructions. <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/deb"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian linux" border="0"></a> - </td> - <td> <a href="{$root}/download/deb">Debian</a> - binary and source .debs for Debian Etch (4.0)</td> - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> - </tr> - <tr bgcolor="#ffffff"> <td align=center><a href="{$root}/download/deblenny"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> @@ -144,24 +135,6 @@ for post-installation instructions. <td><a href="mailto:kris(a)pcbsd.com">Kris Moore</a></td> </tr> - <tr bgcolor="#ffffff"> - <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> - binary and source for Solaris 10 and 11</td> - <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> - </tr> - - - <tr bgcolor="#ffffff"> - <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> - <td><a href="mailto:ivanleo(a)gmail.com">Ivan Leo Puoti</a></td> - </tr> - </table> diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index c5d413e..240beaa 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -1,17 +1,16 @@   -<h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Linux" border="0"></a> -Wine for Ubuntu, Debian Etch, and Debian-based distributions -<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> +<h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> +Wine for Ubuntu and Ubuntu derivatives +<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> Ubuntu and other Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up -to date, by scanning what are known as APT repositories. Debian-based -distributions have their own repositories of software that include Wine, -however we keep our own repository of the latest available beta packages here -for download. +to date, by scanning what are known as APT repositories. Ubuntu has its own +repository of software that includes Wine, however we keep our own repository +of the latest available beta packages here for download. <h2>Warning: These are beta packages</h2> @@ -37,8 +36,6 @@ version you are running. deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex" For Ubuntu Hardy (8.04): deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron" -For Debian Etch (4.0): -deb http://wine.budgetdedicated.com/apt etch main #WineHQ - Debian 4.0 "Etch" <h2>Trusting the WineHQ APT Repository and installing Wine:</h2> @@ -48,40 +45,16 @@ to your system's list of trusted keys. <a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Download and save Scott Ritchie's key</a> to your desktop. Then open the Authentication tab, click import key file, and select the key -file you just saved (Scott Ritchie.gpg). It is safe to delete this file after -doing this step. +file you just saved (Scott Ritchie.gpg). It is safe to delete this file +after doing this step. <img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0"> -Click close to finish, and then reload the package information. If -you have Wine installed, the system's update manager will now inform you of the -latest Wine beta release and prompt you to upgrade. If you haven't installed -Wine yet, go to Applications->Add/Remove and search for Wine. - -<h2>Command Line Instructions for Installing Wine:</h2> - -An alternate method for adding the Wine repositories and installing Wine is through the command line, as follows: - -First, open a terminal window (Applications->Accessories->Terminal). On -Debian, you will need to open a root terminal. Then add the repository's key -to your system's list of trusted APT keys by copy and pasting the following into your terminal: - -wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - - -Next, add the repository to your system's list of APT sources: - -For Ubuntu Intrepid (8.10): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list -For Ubuntu Hardy (8.04): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list -For Debian Etch (4.0): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list - -Then update APT's package information by running 'sudo apt-get update'. - -If you are using Ubuntu, you can now install Wine by <a href="apt://wine"> -clicking this link</a>. Alternatively, you can install by going to -Applications->Add/Remove and searching for Wine. +Click close to finish, and then reload the package information when +prompted. If you have Wine installed, the system's update manager will now +inform you of the latest Wine beta release and prompt you to upgrade. If you +haven't installed Wine yet, go to Applications->Add/Remove and search for +Wine or just <a href="apt://wine">click this link</a>. <h2>Upgrading to a new version of Ubuntu</h2> @@ -98,5 +71,28 @@ the packages are available at You can install downloaded packages by double-clicking on them. +<h2>Alternative command Line Instructions for Installing Wine:</h2> + +It is also possible to add the Wine repositories and install via the command +line, as follows. These may be useful on Kubuntu, Xubuntu, and other Ubuntu +derivatives. + +First, open a terminal window (Applications->Accessories->Terminal). Then +add the repository's key to your system's list of trusted APT keys by copy +and pasting the following into your terminal: + +wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - + +Next, add the repository to your system's list of APT sources: + +For Ubuntu Intrepid (8.10): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list +For Ubuntu Hardy (8.04): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list + +Then update APT's package information by running 'sudo apt-get +update'. You can now install Wine normally or by typing 'sudo apt-get +install wine' into the terminal. + Very fast and reliable webhosting for the APT repository is graciously provided by <a href="http://www.budgetdedicated.com/">budgetdedicated.com</a>.

1 0