October 2007 - Wine-commits

wiki/winehq/css screen.css
by Dimi Paun 12 Oct '07

12 Oct '07

ChangeSet ID: 1192228971302650127866404 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/10/12 15:42:51 Modified files: winehq/css : screen.css Log message: Remove list uglyfing feature, based on a suggestion from Mitchell Mebane. Old revision New revision Changes Path 1.4 1.5 +0 -1 wiki/winehq/css/screen.css Index: wiki/winehq/css/screen.css diff -u -p wiki/winehq/css/screen.css:1.4 wiki/winehq/css/screen.css:1.5 --- wiki/winehq/css/screen.css 12 Oct 2007 22:42:51 -0000 +++ /dev/null 12 Oct 2007 22:42:51 -0000 @@ -123,7 +123,6 @@ span.sep { #pagebar { margin: 0px 0px 0px 0px; padding: 0px 4px 10px 4px; - font-size: 1em; background: #e2e2e2; }

1 0

Alexandre Julliard : Wine release 0.9.47
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: website Branch: master Commit: a741917e1ea50824100d84a71b671d961b37a57f URL: http://source.winehq.org/git/website.git/?a=commit;h=a741917e1ea50824100d84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 12 17:23:03 2007 +0200 Wine release 0.9.47 --- include/winehq.conf | 2 +- news/2007101201.xml | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf b/include/winehq.conf index fe1e29d..7461043 100644 --- a/include/winehq.conf +++ b/include/winehq.conf @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.46 +snapshot_date: 0.9.47 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 diff --git a/news/2007101201.xml b/news/2007101201.xml new file mode 100644 index 0000000..1dd52b7 --- /dev/null +++ b/news/2007101201.xml @@ -0,0 +1,24 @@ +<news> +<date>October 12, 2007</date> +<title>Wine 0.9.47 Released</title> +<body> +<p>Wine 0.9.47 was released today, with the following main changes:</p> + +<ul> +<li>New scheme for OpenGL support in child windows.</li> +<li>Lots of fixes for regression test failures.</li> +<li>A Tahoma replacement font.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.47.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.47">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-0.9.47 : Alexandre Julliard : Release 0.9.47
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: refs/tags/wine-0.9.47 Tag: f8bb3529c402026d5e7aee5e110c3ec27efeba4b URL: http://source.winehq.org/git/wine.git/?a=tag;h=f8bb3529c402026d5e7aee5e110c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 12 17:12:57 2007 +0200 Release 0.9.47

1 0

Alexandre Julliard : Release 0.9.47.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 7be8a646a74695c1a8dcf7ef4eb08fab110e0459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be8a646a74695c1a8dcf7ef4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 12 17:12:57 2007 +0200 Release 0.9.47. --- ANNOUNCE | 924 ++++++++++++++++++----------------------- ChangeLog | 1369 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1780 insertions(+), 533 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7be8a646a74695c1a8dcf…

1 0

Andrew Talbot : wininet: Fix a memory leak.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 2b8a6a3a061778aaf3945ee826cc9ccbb11745b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8a6a3a061778aaf3945ee82… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 11 22:00:17 2007 +0100 wininet: Fix a memory leak. --- dlls/wininet/cookie.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index abf897a..31a0e19 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -369,12 +369,16 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, { szCookieData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); if( !szCookieData ) - return FALSE; - - r = InternetGetCookieW( szUrl, szCookieName, szCookieData, &len ); + { + r = FALSE; + } + else + { + r = InternetGetCookieW( szUrl, szCookieName, szCookieData, &len ); - *lpdwSize = WideCharToMultiByte( CP_ACP, 0, szCookieData, len, - lpCookieData, *lpdwSize, NULL, NULL ); + *lpdwSize = WideCharToMultiByte( CP_ACP, 0, szCookieData, len, + lpCookieData, *lpdwSize, NULL, NULL ); + } } HeapFree( GetProcessHeap(), 0, szCookieData );

1 0

Vitaly Lipatov : tools/wine.desktop: Add Name field in Russian.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 5a47043905a410aca1bdcf45c03bc251438cdf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a47043905a410aca1bdcf45c… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Oct 6 13:04:48 2007 +0400 tools/wine.desktop: Add Name field in Russian. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index ed4982b..6818b88 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -2,6 +2,7 @@ Type=Application Name=Wine Windows Emulator Name[de]=Wine Windows-Emulator +Name[ru]=Wine Эмулятор Windows Exec=wine %f MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable; NoDisplay=true

1 0

John Klehm : inkobj: Stub implementation of IInkCollector.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 997bb8942d400207b315cfddc6046cd8c85a784b URL: http://source.winehq.org/git/wine.git/?a=commit;h=997bb8942d400207b315cfddc… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Fri Oct 12 02:30:14 2007 -0500 inkobj: Stub implementation of IInkCollector. --- dlls/inkobj/Makefile.in | 3 +- dlls/inkobj/inkcollector.c | 413 +++++++++++++++++++++++++++++++++++++++++ dlls/inkobj/inkobj_internal.h | 5 + include/msinkaut.idl | 1 + 4 files changed, 421 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=997bb8942d400207b315c…

1 0

Alexandre Julliard : kernel32: Get rid of the NLS_RegOpenSubKey function, its behavior is broken.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 60c562446c0218aabcb327fb3f7aa731434634d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c562446c0218aabcb327fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 12 11:47:34 2007 +0200 kernel32: Get rid of the NLS_RegOpenSubKey function, its behavior is broken. --- dlls/kernel32/locale.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 73ca344..6624f81 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -62,7 +62,6 @@ static const union cptable *mac_cptable; static const union cptable *unix_cptable; /* NULL if UTF8 */ static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName); -static HANDLE NLS_RegOpenSubKey(HANDLE hRootKey, LPCWSTR szKeyName); static const WCHAR szNlsKeyName[] = { 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', @@ -70,6 +69,25 @@ static const WCHAR szNlsKeyName[] = { 'C','o','n','t','r','o','l','\\','N','l','s','\0' }; +static const WCHAR szLocaleKeyName[] = { + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','N','l','s','\\','L','o','c','a','l','e',0 +}; + +static const WCHAR szCodepageKeyName[] = { + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','N','l','s','\\','C','o','d','e','p','a','g','e',0 +}; + +static const WCHAR szLangGroupsKeyName[] = { + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','N','l','s','\\', + 'L','a','n','g','u','a','g','e',' ','G','r','o','u','p','s',0 +}; + /* Charset to codepage map, sorted by name. */ static const struct charset_entry { @@ -630,7 +648,6 @@ static BOOL locale_update_registry( HKEY hkey, const WCHAR *name, LCID lcid, */ void LOCALE_InitRegistry(void) { - static const WCHAR CodepageW[] = {'C','o','d','e','p','a','g','e',0}; static const WCHAR acpW[] = {'A','C','P',0}; static const WCHAR oemcpW[] = {'O','E','M','C','P',0}; static const WCHAR maccpW[] = {'M','A','C','C','P',0}; @@ -720,7 +737,7 @@ void LOCALE_InitRegistry(void) if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) { - HKEY nls_key = NLS_RegOpenSubKey( NLS_RegOpenKey( 0, szNlsKeyName ), CodepageW ); + HKEY nls_key = NLS_RegOpenKey( 0, szCodepageKeyName ); for (i = 0; i < sizeof(update_cp_values)/sizeof(update_cp_values[0]); i++) { @@ -2928,16 +2945,6 @@ static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName) return hkey; } -static HANDLE NLS_RegOpenSubKey(HANDLE hRootKey, LPCWSTR szKeyName) -{ - HANDLE hKey = NLS_RegOpenKey(hRootKey, szKeyName); - - if (hRootKey) - NtClose( hRootKey ); - - return hKey; -} - static BOOL NLS_RegEnumSubKey(HANDLE hKey, UINT ulIndex, LPWSTR szKeyName, ULONG keyNameSize) { @@ -3051,9 +3058,6 @@ static BOOL NLS_GetLanguageGroupName(LGRPID lgrpid, LPWSTR szName, ULONG nameSiz } /* Registry keys for NLS related information */ -static const WCHAR szLangGroupsKeyName[] = { - 'L','a','n','g','u','a','g','e',' ','G','r','o','u','p','s','\0' -}; static const WCHAR szCountryListName[] = { 'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\', @@ -3101,7 +3105,7 @@ static BOOL NLS_EnumSystemLanguageGroups(ENUMLANGUAGEGROUP_CALLBACKS *lpProcs) return FALSE; } - hKey = NLS_RegOpenSubKey( NLS_RegOpenKey( 0, szNlsKeyName ), szLangGroupsKeyName ); + hKey = NLS_RegOpenKey( 0, szLangGroupsKeyName ); if (!hKey) FIXME("NLS registry key not found. Please apply the default registry file 'wine.inf'\n"); @@ -3234,7 +3238,7 @@ BOOL WINAPI IsValidLanguageGroup(LGRPID lgrpid, DWORD dwFlags) case LGRPID_INSTALLED: case LGRPID_SUPPORTED: - hKey = NLS_RegOpenSubKey( NLS_RegOpenKey( 0, szNlsKeyName ), szLangGroupsKeyName ); + hKey = NLS_RegOpenKey( 0, szLangGroupsKeyName ); sprintfW( szValueName, szFormat, lgrpid ); @@ -3272,9 +3276,6 @@ typedef struct /* Internal implementation of EnumLanguageGrouplocalesA/W */ static BOOL NLS_EnumLanguageGroupLocales(ENUMLANGUAGEGROUPLOCALE_CALLBACKS *lpProcs) { - static const WCHAR szLocaleKeyName[] = { - 'L','o','c','a','l','e','\0' - }; static const WCHAR szAlternateSortsKeyName[] = { 'A','l','t','e','r','n','a','t','e',' ','S','o','r','t','s','\0' }; @@ -3296,7 +3297,7 @@ static BOOL NLS_EnumLanguageGroupLocales(ENUMLANGUAGEGROUPLOCALE_CALLBACKS *lpPr return FALSE; } - hKey = NLS_RegOpenSubKey( NLS_RegOpenKey( 0, szNlsKeyName ), szLocaleKeyName ); + hKey = NLS_RegOpenKey( 0, szLocaleKeyName ); if (!hKey) WARN("NLS registry key not found. Please apply the default registry file 'wine.inf'\n");

1 0

John Klehm : nkobj: Use an internal header.
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: e92819d845db39bdc8e59069c5b6f66a3e1dd5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e92819d845db39bdc8e59069c… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Thu Oct 11 20:38:25 2007 -0500 nkobj: Use an internal header. --- dlls/inkobj/inkobj.c | 11 +++-------- dlls/inkobj/inkobj_internal.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/inkobj/inkobj.c b/dlls/inkobj/inkobj.c index d1cae73..8cddeb7 100644 --- a/dlls/inkobj/inkobj.c +++ b/dlls/inkobj/inkobj.c @@ -15,17 +15,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" +#include "inkobj_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(inkobj); -static LONG INKOBJ_refCount; -static HINSTANCE INKOBJ_hInstance; +LONG INKOBJ_refCount = 0; +HINSTANCE INKOBJ_hInstance; /***************************************************** * DllMain (INKOBJ.init) diff --git a/dlls/inkobj/inkobj_internal.h b/dlls/inkobj/inkobj_internal.h new file mode 100644 index 0000000..6d0b359 --- /dev/null +++ b/dlls/inkobj/inkobj_internal.h @@ -0,0 +1,31 @@ +/* Copyright (C) 2007 C John Klehm + * + * 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 + */ +#ifndef INKOBJ_INTERNAL_H +#define INKOBJ_INTERNAL_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +#include "wine/debug.h" + +extern LONG INKOBJ_refCount; +extern HINSTANCE INKOBJ_hInstance; + +#endif /* INKOBJ_INTERNAL_H */

1 0

Juan Lang : setupapi: Don' t require caller to pass a SP_DEVINFO_DATA pointer to SETUPDI_AddDeviceToSet .
by Alexandre Julliard 12 Oct '07

12 Oct '07

Module: wine Branch: master Commit: 0d39a07ecaa35f06689cd658b852562621f708ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d39a07ecaa35f06689cd658b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 13:25:08 2007 -0700 setupapi: Don't require caller to pass a SP_DEVINFO_DATA pointer to SETUPDI_AddDeviceToSet. --- dlls/setupapi/devinst.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index d549562..a25bc29 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -518,16 +518,18 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, if (set->devices) { WCHAR classGuidStr[39]; + SP_DEVINFO_DATA *DeviceInfoData = &set->devices[set->cDevices++]; - *dev = &set->devices[set->cDevices++]; - (*dev)->cbSize = sizeof(SP_DEVINFO_DATA); - memcpy(&(*dev)->ClassGuid, guid, sizeof(GUID)); - (*dev)->DevInst = devInst; - (*dev)->Reserved = (ULONG_PTR)devInfo; + DeviceInfoData->cbSize = sizeof(SP_DEVINFO_DATA); + memcpy(&DeviceInfoData->ClassGuid, guid, sizeof(GUID)); + DeviceInfoData->DevInst = devInst; + DeviceInfoData->Reserved = (ULONG_PTR)devInfo; SETUPDI_GuidToString(guid, classGuidStr); SetupDiSetDeviceRegistryPropertyW((HDEVINFO)set, - *dev, SPDRP_CLASSGUID, (const BYTE *)classGuidStr, + DeviceInfoData, SPDRP_CLASSGUID, (const BYTE *)classGuidStr, lstrlenW(classGuidStr) * sizeof(WCHAR)); + if (dev) + *dev = DeviceInfoData; ret = TRUE; } else @@ -2090,12 +2092,10 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, * sizeof(WCHAR)); if (instanceId) { - SP_DEVINFO_DATA *dev; - sprintfW(instanceId, fmt, parent, subKeyName); SETUPDI_AddDeviceToSet(set, &deviceClass, 0 /* FIXME: DevInst */, instanceId, - FALSE, &dev); + FALSE, NULL); HeapFree(GetProcessHeap(), 0, instanceId); } }

1 0