wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Hans Leidekker : uninstaller: Fix a leak.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: f488f1af14592d95e30d7f09e8a45119eb8a77e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f488f1af14592d95e30d7f09e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 24 09:37:51 2010 +0100 uninstaller: Fix a leak. (cherry picked from commit 458fcf4aa7df0cc8526cee5d1274e4e8310c73b7) --- programs/uninstaller/main.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index f781d3c..5d74ea8 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -209,8 +209,12 @@ static int FetchFromRootKey(HKEY root) command = HeapAlloc(GetProcessHeap(), 0, uninstlen); RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)command, &uninstlen); } - else continue; - + else + { + RegCloseKey(hkeyApp); + sizeOfSubKeyName = 255; + continue; + } numentries++; entries = HeapReAlloc(GetProcessHeap(), 0, entries, numentries*sizeof(uninst_entry)); entries[numentries-1].root = root;

1 0

Hans Leidekker : uninstaller: Run msiexec if the WindowsInstaller value is set.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 8d18bcdc2be1080796ed74ce6c3dbf0aacd186f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d18bcdc2be1080796ed74ce6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 23 17:09:31 2010 +0100 uninstaller: Run msiexec if the WindowsInstaller value is set. (cherry picked from commit fea5767a025e24d4592eb1e89c6a9a402bc73442) --- programs/uninstaller/main.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 912d23d..f781d3c 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -59,6 +59,7 @@ static const WCHAR PathUninstallW[] = { 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'U','n','i','n','s','t','a','l','l',0 }; static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l','S','t','r','i','n','g',0}; +static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; /** @@ -192,9 +193,24 @@ static int FetchFromRootKey(HKEY root) { lstrcpyW(p, subKeyName); RegOpenKeyExW(root, key_app, 0, KEY_READ, &hkeyApp); - if ((RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen) == ERROR_SUCCESS) - && (RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, NULL, &uninstlen) == ERROR_SUCCESS)) + if (!RegQueryValueExW(hkeyApp, DisplayNameW, NULL, NULL, NULL, &displen)) { + DWORD value, type; + WCHAR *command; + + if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &type, NULL, &value) && type == REG_DWORD && value == 1) + { + static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; + command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + lstrlenW(subKeyName)) * sizeof(WCHAR)); + wsprintfW(command, fmtW, subKeyName); + } + else if (!RegQueryValueExW(hkeyApp, UninstallCommandlineW, NULL, NULL, NULL, &uninstlen)) + { + command = HeapAlloc(GetProcessHeap(), 0, uninstlen); + RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)command, &uninstlen); + } + else continue; + numentries++; entries = HeapReAlloc(GetProcessHeap(), 0, entries, numentries*sizeof(uninst_entry)); entries[numentries-1].root = root; @@ -202,9 +218,8 @@ static int FetchFromRootKey(HKEY root) lstrcpyW(entries[numentries-1].key, subKeyName); entries[numentries-1].descr = HeapAlloc(GetProcessHeap(), 0, displen); RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, (LPBYTE)entries[numentries-1].descr, &displen); - entries[numentries-1].command = HeapAlloc(GetProcessHeap(), 0, uninstlen); + entries[numentries-1].command = command; entries[numentries-1].active = 0; - RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)entries[numentries-1].command, &uninstlen); WINE_TRACE("allocated entry #%d: %s (%s), %s\n", numentries, wine_dbgstr_w(entries[numentries-1].key), wine_dbgstr_w(entries[numentries-1].descr), wine_dbgstr_w(entries[numentries-1].command)); if(sFilter != NULL && StrStrIW(entries[numentries-1].descr,sFilter)==NULL)

1 0

Alexandre Julliard : wpp: Line and column numbers must start at one.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: bc3d7f0ffac60850746011e8eaa23f917bd2d518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3d7f0ffac60850746011e8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 30 13:08:43 2010 +0100 wpp: Line and column numbers must start at one. (cherry picked from commit b9b0bcbf3fb3adf05929880f3d6f94c170bafbd3) --- libs/wpp/wpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 582ad6f..41ac54f 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -168,8 +168,8 @@ int wpp_parse( const char *input, FILE *output ) int ret; pp_status.input = NULL; - pp_status.line_number = 0; - pp_status.char_number = 0; + pp_status.line_number = 1; + pp_status.char_number = 1; pp_status.state = 0; ret = pp_push_define_state();

1 0

Juan Lang : crypt32: Accept any matching CN when checking a certificate' s name.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 208b8181da76f1c05f2ee10224e7518a1d4c27bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=208b8181da76f1c05f2ee1022… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 16 10:31:47 2010 -0800 crypt32: Accept any matching CN when checking a certificate's name. (cherry picked from commit 667aeb3ede3ddad63b387fad248b66c03690c5a6) --- dlls/crypt32/chain.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index e951ef8..206f2c8 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3267,13 +3267,24 @@ static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) } else { - PCERT_RDN_ATTR attr; + DWORD i, j; /* If the certificate isn't using a DN attribute in the name, make - * make sure the common name matches. + * make sure at least one common name matches. From RFC 2818, + * section 3.1: + * "If more than one identity of a given type is present in the + * certificate (e.g., more than one dNSName name, a match in any + * one of the set is considered acceptable.)" */ - if ((attr = CertFindRDNAttr(szOID_COMMON_NAME, name))) - matches = match_common_name(server_name, attr); + for (i = 0; !matches && i < name->cRDN; i++) + for (j = 0; !matches && j < name->rgRDN[i].cRDNAttr; j++) + { + PCERT_RDN_ATTR attr = &name->rgRDN[i].rgRDNAttr[j]; + + if (attr->pszObjId && !strcmp(szOID_COMMON_NAME, + attr->pszObjId)) + matches = match_common_name(server_name, attr); + } } LocalFree(name); }

1 0

Jerome Leclanche : winemenubuilder: Add a trailing semicolon to MimeType in desktop files.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 56a8f271ba1124edef5dae5d1c3c97e173e7f360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a8f271ba1124edef5dae5d1… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Dec 13 17:17:17 2010 +0000 winemenubuilder: Add a trailing semicolon to MimeType in desktop files. (cherry picked from commit 33c7105ecf8b1f7243c001de2fce1e85d4c150d8) --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8ee8387..ce28e3b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2190,7 +2190,7 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c fprintf(desktop, "[Desktop Entry]\n"); fprintf(desktop, "Type=Application\n"); fprintf(desktop, "Name=%s\n", friendlyAppName); - fprintf(desktop, "MimeType=%s\n", mimeType); + fprintf(desktop, "MimeType=%s;\n", mimeType); fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", progId); fprintf(desktop, "NoDisplay=true\n"); fprintf(desktop, "StartupNotify=true\n");

1 0

David Bartley : iphlpapi: Add CancelIPChangeNotify stub.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: fc8dcd39d8b53d83b04c3a744e18776b9f0daf3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8dcd39d8b53d83b04c3a744… Author: David Bartley <dtb(a)google.com> Date: Sat Dec 11 00:57:24 2010 -0800 iphlpapi: Add CancelIPChangeNotify stub. (cherry picked from commit bf6a20fad39e788638f1c7c9ebc9865a9e0cdf66) --- dlls/iphlpapi/iphlpapi.spec | 1 + dlls/iphlpapi/iphlpapi_main.c | 24 ++++++++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 1 + include/iphlpapi.h | 2 ++ 4 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 794ece2..d6f33d7 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -6,6 +6,7 @@ @ stdcall AllocateAndGetIpNetTableFromStack( ptr long long long ) @ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) +@ stdcall CancelIPChangeNotify( ptr ) @ stdcall CreateIpForwardEntry( ptr ) @ stdcall CreateIpNetEntry( ptr ) @ stdcall CreateProxyArpEntry( long long long ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 493fe3f..53cad0e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -200,6 +200,30 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, /****************************************************************** + * CancelIPChangeNotify (IPHLPAPI.@) + * + * Cancel a previous notification created by NotifyAddrChange or + * NotifyRouteChange. + * + * PARAMS + * overlapped [In] overlapped structure that notifies the caller + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * FIXME + * Stub, returns FALSE. + */ +BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED overlapped) +{ + FIXME("(overlapped %p): stub\n", overlapped); + return FALSE; +} + + + +/****************************************************************** * CreateIpForwardEntry (IPHLPAPI.@) * * Create a route in the local computer's IP table. diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 2410aca..8e03863 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -799,6 +799,7 @@ static void testGetPerAdapterInfo(void) /* still-to-be-tested 2K-onward functions: AddIPAddress +CancelIPChangeNotify CreateProxyArpEntry DeleteIPAddress DeleteProxyArpEntry diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 1e64a18..0f7eba6 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -111,6 +111,8 @@ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped); DWORD WINAPI NotifyRouteChange(PHANDLE Handle, LPOVERLAPPED overlapped); +BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED overlapped); + DWORD WINAPI GetAdapterIndex(IN LPWSTR AdapterName, OUT PULONG IfIndex); DWORD WINAPI AddIPAddress(IPAddr Address, IPMask IpMask, DWORD IfIndex,

1 0

Alexandre Julliard : loader: Make sure the new stack is 16-byte aligned in the preloader.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 177e15df4bb1c4e926df17a0847fd2d3c85ca461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177e15df4bb1c4e926df17a08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 16:52:02 2010 +0100 loader: Make sure the new stack is 16-byte aligned in the preloader. (cherry picked from commit 144cb78dbaeedcc36946907c5ccf391ecb011f04) --- loader/preloader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 2dc2872..8524ba5 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -512,18 +512,19 @@ static void set_auxiliary_values( ElfW(auxv_t) *av, const ElfW(auxv_t) *new_av, src = (char *)*stack; dst = src - (new_count - delete_count) * sizeof(*av); - if (new_count > delete_count) /* need to make room for the extra values */ + dst = (char *)((unsigned long)dst & ~15); + if (dst < src) /* need to make room for the extra values */ { int len = (char *)(av + av_count + 1) - src; for (i = 0; i < len; i++) dst[i] = src[i]; } - else if (new_count < delete_count) /* get rid of unused values */ + else if (dst > src) /* get rid of unused values */ { int len = (char *)(av + av_count + 1) - src; for (i = len - 1; i >= 0; i--) dst[i] = src[i]; } *stack = dst; - av -= (new_count - delete_count); + av = (ElfW(auxv_t) *)((char *)av + (dst - src)); /* now set the values */ for (j = 0; new_av[j].a_type != AT_NULL; j++)

1 0

Alexandre Julliard : krnl386: Fetch version from the PEB to avoid potentially using GetVersionEx before it 's initialized.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: a62026f05fa210f34f5d55c1536df1be2774a4f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62026f05fa210f34f5d55c15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 13:17:41 2010 +0100 krnl386: Fetch version from the PEB to avoid potentially using GetVersionEx before it's initialized. (cherry picked from commit 5ce81a9dc2f727dfb8d3fb5db5ea8d0c79459faf) --- dlls/krnl386.exe16/ne_module.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 9f777cc..0bf4bd5 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -917,7 +917,6 @@ static HMODULE16 NE_DoLoadBuiltinModule( const IMAGE_DOS_HEADER *mz_header, cons NE_MODULE *pModule; HMODULE16 hModule; HINSTANCE16 hInstance; - OSVERSIONINFOW versionInfo; SIZE_T mapping_size = ~0UL; /* assume builtins don't contain invalid offsets... */ hModule = build_module( mz_header, mapping_size, file_name ); @@ -927,9 +926,8 @@ static HMODULE16 NE_DoLoadBuiltinModule( const IMAGE_DOS_HEADER *mz_header, cons pModule->owner32 = owner32; /* fake the expected version the module should have according to the current Windows version */ - versionInfo.dwOSVersionInfoSize = sizeof(versionInfo); - if (GetVersionExW( &versionInfo )) - pModule->ne_expver = MAKEWORD( versionInfo.dwMinorVersion, versionInfo.dwMajorVersion ); + pModule->ne_expver = MAKEWORD( NtCurrentTeb()->Peb->OSMajorVersion, + NtCurrentTeb()->Peb->OSMinorVersion ); hInstance = NE_DoLoadModule( pModule ); if (hInstance < 32) NE_FreeModule( hModule, 0 );

1 0

Jacek Caban : aclocal.m4: Recognize mingw-w64 as 32-bit cross compiler.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 609be12dab74b82492022cd1e8e09e26b3f3c9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=609be12dab74b82492022cd1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 21 18:08:38 2010 +0100 aclocal.m4: Recognize mingw-w64 as 32-bit cross compiler. (cherry picked from commit 0b6bfade5240eafe1c9ab5653192dc88ccf31b0d) --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a77f15e..e46da7b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -125,7 +125,7 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in i[[3456789]]86*) - ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32], + ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; x86_64) ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32,w64-mingw32],[x86_64-ac_wine_prefix-$2 ])" ;; diff --git a/configure b/configure index 08fd4b0..638d7ba 100755 --- a/configure +++ b/configure @@ -7008,7 +7008,7 @@ if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" then case "$host_cpu" in i[3456789]86*) - ac_prefix_list="i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; + ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; x86_64) ac_prefix_list="x86_64-pc-mingw32-gcc x86_64-w64-mingw32-gcc " ;; *)

1 0

Huw Davies : gdi32: Clear the accel flags.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: b2b0ad736f3fc5a9575d313926710abf7e29add0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b0ad736f3fc5a9575d31392… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 7 11:37:14 2010 +0000 gdi32: Clear the accel flags. (cherry picked from commit aec376dcef20823b81d6c70926e02d5c27c40b3b) --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 532278c4..cd1497e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6230,6 +6230,7 @@ DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) { glyphset->cbThis = size; glyphset->cRanges = num_ranges; + glyphset->flAccel = 0; } return size; }

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011