February 2009 - Wine-Commits

Alexandre Julliard : Wine release 1.1.16
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: website Branch: master Commit: 2303eacddeba5851301436e21ddd4a1c4efa4e14 URL: http://source.winehq.org/git/website.git/?a=commit;h=2303eacddeba5851301436… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 27 23:28:20 2009 +0100 Wine release 1.1.16 --- news/en/2009022701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009022701.xml b/news/en/2009022701.xml new file mode 100644 index 0000000..1cf2b56 --- /dev/null +++ b/news/en/2009022701.xml @@ -0,0 +1,17 @@ +<news> +<date>February 27, 2009</date> +<title>Wine 1.1.16 Released</title> +<body> + The Wine development release 1.1.16 is now available. + <a href="{$root}/announce/1.1.16">What's new</a> in this release: +<ul> + <li>Improved SANE scanner support.</li> + <li>Support for digital CD audio playback.</li> + <li>Improved cookies management in Wininet.</li> + <li>Support for building stand-alone 16-bit modules.</li> + <li>Many fixes to the regression tests on Windows.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.16.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.16.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 0d7bec3578e02e1f551813e86100b59e36aec542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7bec3578e02e1f551813e86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 27 23:21:46 2009 +0100 Release 1.1.16. --- ANNOUNCE | 1212 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 629 insertions(+), 603 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d7bec3578e02e1f55181…

1 0

Tag wine-1.1.16 : Alexandre Julliard : Release 1.1.16
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: refs/tags/wine-1.1.16 Tag: a6c315f6b7d0d7082f8882d23210c359ac39be96 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a6c315f6b7d0d7082f8882d23210… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 27 23:21:47 2009 +0100 Release 1.1.16

1 0

Alexandre Julliard : winebuild: Don' t prefix local symbols with an underscore.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: b2575ebab655d7737ed8da535b6071fb70bdc23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2575ebab655d7737ed8da535… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 27 17:39:54 2009 +0100 winebuild: Don't prefix local symbols with an underscore. --- tools/winebuild/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index b5ac1b9..3a29a4b 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -659,6 +659,7 @@ const char *asm_name( const char *sym ) { case PLATFORM_APPLE: case PLATFORM_WINDOWS: + if (sym[0] == '.' && sym[1] == 'L') return sym; buffer[0] = '_'; strcpy( buffer + 1, sym ); return buffer;

1 0

Huw Davies : gdi32/tests: Winnt doesn' t set last error when a NULL dc is passed to GetDIBits.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 973ac6dbd206da5ca824f0fed5c538df944440dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=973ac6dbd206da5ca824f0fed… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 27 11:36:38 2009 +0000 gdi32/tests: Winnt doesn't set last error when a NULL dc is passed to GetDIBits. --- dlls/gdi32/tests/bitmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 561f96b..db3ae6d 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1547,7 +1547,9 @@ static void test_GetDIBits(void) SetLastError(0xdeadbeef); lines = GetDIBits(0, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS); ok(lines == 0, "GetDIBits copied %d lines with hdc = 0\n", lines); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* winnt */ + "wrong error %u\n", GetLastError()); ok(bi->bmiHeader.biSizeImage == 0, "expected 0, got %u\n", bi->bmiHeader.biSizeImage); memset(buf, 0xAA, sizeof(buf));

1 0

Huw Davies : gdi32/tests: Don't expect the screen dc' s bitmap to be mono 1x1.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 103f3db95f236688bd5ba89950fc5f7287c12a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=103f3db95f236688bd5ba8995… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 27 11:33:44 2009 +0000 gdi32/tests: Don't expect the screen dc's bitmap to be mono 1x1. --- dlls/gdi32/tests/bitmap.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 61ed443..561f96b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1988,7 +1988,6 @@ todo_wine test_mono_1x1_bmp(bm5); test_mono_1x1_bmp(old1); test_mono_1x1_bmp(curObj1); - test_mono_1x1_bmp(curObj2); DeleteObject(bm); DeleteObject(bm1);

1 0

Christian Costa : mciqtz32: Add stubbed mciqtz32.dll (part of DirectShow).
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: a9c825e036102801ecdc026cc5054740c507baa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c825e036102801ecdc026cc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Feb 26 23:27:36 2009 +0100 mciqtz32: Add stubbed mciqtz32.dll (part of DirectShow). --- configure | 9 ++++++ configure.ac | 1 + dlls/mciqtz32/Makefile.in | 15 ++++++++++ dlls/mciqtz32/mciqtz.c | 63 +++++++++++++++++++++++++++++++++++++++++++ dlls/mciqtz32/mciqtz32.spec | 1 + dlls/mciqtz32/version.rc | 27 ++++++++++++++++++ 6 files changed, 116 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7ab9c8e..b6a0c69 100755 --- a/configure +++ b/configure @@ -25678,6 +25678,14 @@ dlls/mcicda/Makefile: dlls/mcicda/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mcicda/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/mciqtz32/Makefile" +test "x$enable_mciqtz32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mciqtz32" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/mciqtz32/Makefile: dlls/mciqtz32/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/mciqtz32/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mciseq/Makefile" test "x$enable_mciseq" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ mciseq" @@ -28805,6 +28813,7 @@ do "dlls/mapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mapi32/tests/Makefile" ;; "dlls/mciavi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mciavi32/Makefile" ;; "dlls/mcicda/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mcicda/Makefile" ;; + "dlls/mciqtz32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mciqtz32/Makefile" ;; "dlls/mciseq/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mciseq/Makefile" ;; "dlls/mciwave/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mciwave/Makefile" ;; "dlls/midimap/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/midimap/Makefile" ;; diff --git a/configure.ac b/configure.ac index 06afdf9..c883430 100644 --- a/configure.ac +++ b/configure.ac @@ -2041,6 +2041,7 @@ WINE_CONFIG_MAKEFILE([dlls/mapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/mapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/mciavi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mcicda/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mciqtz32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mciseq/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mciwave/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in new file mode 100644 index 0000000..1d136eb --- /dev/null +++ b/dlls/mciqtz32/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mciqtz32.dll +IMPORTS = kernel32 + +C_SRCS = \ + mciqtz.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c new file mode 100644 index 0000000..6d272b5 --- /dev/null +++ b/dlls/mciqtz32/mciqtz.c @@ -0,0 +1,63 @@ +/* + * DirectShow MCI Driver + * + * Copyright 2009 Christian Costa + * + * 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 + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "mmddk.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mciqtz); + +/*======================================================================* + * MCI QTZ implementation * + *======================================================================*/ + +HINSTANCE MCIQTZ_hInstance = 0; + +/*********************************************************************** + * DllMain (MCIQTZ.0) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) +{ + switch (fdwReason) { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + MCIQTZ_hInstance = hInstDLL; + break; + } + return TRUE; +} + +/*======================================================================* + * MCI QTZ entry points * + *======================================================================*/ + +/************************************************************************** + * DriverProc (MCIQTZ.@) + */ +LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) +{ + FIXME("(%08lX, %p, %08X, %08lX, %08lX): Stub!\n", + dwDevID, hDriv, wMsg, dwParam1, dwParam2); + + return MCIERR_UNRECOGNIZED_COMMAND; +} diff --git a/dlls/mciqtz32/mciqtz32.spec b/dlls/mciqtz32/mciqtz32.spec new file mode 100644 index 0000000..ba507d7 --- /dev/null +++ b/dlls/mciqtz32/mciqtz32.spec @@ -0,0 +1 @@ +@ stdcall -private DriverProc(long long long long long) MCIQTZ_DriverProc diff --git a/dlls/mciqtz32/version.rc b/dlls/mciqtz32/version.rc new file mode 100644 index 0000000..94c6078 --- /dev/null +++ b/dlls/mciqtz32/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2009 Christian Costa + * + * 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 + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine DirectShow MCI Driver" +#define WINE_FILENAME_STR "mciqtz32.dll" +#define WINE_FILEVERSION 6,5,1,900 +#define WINE_FILEVERSION_STR "6.5.1.900" +#define WINE_PRODUCTVERSION 6,5,1,900 +#define WINE_PRODUCTVERSION_STR "6.5" + +#include "wine/wine_common_ver.rc"

1 0

Huw Davies : gdi32/tests: Add a broken() to an always true test.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: e270f5a89ddbab0152cb9c6647176c204a3b23aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e270f5a89ddbab0152cb9c664… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 27 11:33:12 2009 +0000 gdi32/tests: Add a broken() to an always true test. --- dlls/gdi32/tests/bitmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index b4dc09e..61ed443 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1974,7 +1974,9 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); - ok(bm != curObj2 /* XP */ || bm == curObj2 /* Win9x */, +todo_wine + ok(bm != curObj2 || /* WinXP */ + broken(bm == curObj2) /* Win9x */, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2);

1 0

Chris Robinson : mcicda: Partially handle Play notifications.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 2a1582603fd17434264f3f94f1420c0beaef3f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1582603fd17434264f3f94f… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Feb 26 08:49:42 2009 -0800 mcicda: Partially handle Play notifications. --- dlls/mcicda/mcicda.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 384e8eb..79f3bae 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -141,6 +141,16 @@ static DWORD CALLBACK MCICDA_playLoop(void *ptr) IDirectSoundBuffer_Stop(wmcda->dsBuf); SetEvent(wmcda->stopEvent); + EnterCriticalSection(&wmcda->cs); + if (wmcda->hCallback) { + mciDriverNotify(wmcda->hCallback, wmcda->wNotifyDeviceID, + FAILED(hr) ? MCI_NOTIFY_FAILURE : + ((endPos!=lastPos) ? MCI_NOTIFY_ABORTED : + MCI_NOTIFY_SUCCESSFUL)); + wmcda->hCallback = NULL; + } + LeaveCriticalSection(&wmcda->cs); + ExitThread(0); return 0; } @@ -892,6 +902,14 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) IDirectSound_Release(wmcda->dsObj); wmcda->dsObj = NULL; } + else if(wmcda->hCallback) { + mciDriverNotify(wmcda->hCallback, wmcda->wNotifyDeviceID, + MCI_NOTIFY_ABORTED); + wmcda->hCallback = NULL; + } + + if ((dwFlags&MCI_NOTIFY)) + wmcda->hCallback = HWND_32(LOWORD(lpParms->dwCallback)); if (pDirectSoundCreate) { WAVEFORMATEX format; @@ -983,6 +1001,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) play.EndingF = end % CDFRAMES_PERSEC; if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PLAY_AUDIO_MSF, &play, sizeof(play), NULL, 0, &br, NULL)) { + wmcda->hCallback = NULL; ret = MCIERR_HARDWARE; } else if (dwFlags & MCI_NOTIFY) { TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); @@ -1023,6 +1042,11 @@ static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms else if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_STOP_AUDIO, NULL, 0, NULL, 0, &br, NULL)) return MCIERR_HARDWARE; + if (wmcda->hCallback) { + mciDriverNotify(wmcda->hCallback, wmcda->wNotifyDeviceID, MCI_NOTIFY_ABORTED); + wmcda->hCallback = NULL; + } + if (lpParms && (dwFlags & MCI_NOTIFY)) { TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), @@ -1052,6 +1076,13 @@ static DWORD MCICDA_Pause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParm else if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PAUSE_AUDIO, NULL, 0, NULL, 0, &br, NULL)) return MCIERR_HARDWARE; + EnterCriticalSection(&wmcda->cs); + if (wmcda->hCallback) { + mciDriverNotify(wmcda->hCallback, wmcda->wNotifyDeviceID, MCI_NOTIFY_SUPERSEDED); + wmcda->hCallback = NULL; + } + LeaveCriticalSection(&wmcda->cs); + if (lpParms && (dwFlags & MCI_NOTIFY)) { TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),

1 0

Alexandre Julliard : winecfg: Offer a few more dlls in the load order drop-down list.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 7776faf3a7f17b4328d6d9511a00d729b704e605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7776faf3a7f17b4328d6d9511… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 27 16:05:30 2009 +0100 winecfg: Offer a few more dlls in the load order drop-down list. --- programs/winecfg/libraries.c | 73 ++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 30 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 6abe04d..37cc12b 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -55,13 +55,15 @@ static const char * const builtin_only[] = "gdi32", "glu32", "icmp", + "gphoto2.ds", "iphlpapi", "kernel32", + "mountmgr.sys", "mswsock", "ntdll", + "ntoskrnl.exe", "opengl32", - "stdole2.tlb", - "stdole32.tlb", + "sane.ds", "twain_32", "unicows", "user32", @@ -205,10 +207,35 @@ static int compare_dll( const void *ptr1, const void *ptr2 ) /* check if dll is recommended as builtin only */ static inline int is_builtin_only( const char *name ) { + const char *ext = strrchr( name, '.' ); + + if (ext) + { + if (!strcmp( ext, ".vxd" ) || + !strcmp( ext, ".drv" ) || + !strcmp( ext, ".tlb" )) + return TRUE; + } return bsearch( &name, builtin_only, sizeof(builtin_only)/sizeof(builtin_only[0]), sizeof(builtin_only[0]), compare_dll ) != NULL; } +/* check if dll should be offered in the drop-down list */ +static int show_dll_in_list( const char *name ) +{ + const char *ext = strrchr( name, '.' ); + + if (ext) + { + /* skip 16-bit dlls */ + if (strlen(ext) > 2 && !strcmp( ext + strlen(ext) - 2, "16" )) return FALSE; + /* skip exes */ + if (!strcmp( ext, ".exe" )) return FALSE; + } + /* skip dlls that should always be builtin */ + return !is_builtin_only( name ); +} + static void set_controls_from_selection(HWND dialog) { /* FIXME: display/update some information about the selected dll (purpose, recommended loadorder) maybe? */ @@ -232,28 +259,6 @@ static void clear_settings(HWND dialog) } } -/* check if a given dll is 16-bit */ -static int is_16bit_dll( const char *dir, const char *name ) -{ - char buffer[64]; - int res; - size_t len = strlen(dir) + strlen(name) + 2; - char *path = HeapAlloc( GetProcessHeap(), 0, len ); - - strcpy( path, dir ); - strcat( path, "/" ); - strcat( path, name ); - res = readlink( path, buffer, sizeof(buffer) ); - HeapFree( GetProcessHeap(), 0, path ); - - if (res == -1) return 0; /* not a symlink */ - if (res < 4 || res >= sizeof(buffer)) return 0; - buffer[res] = 0; - if (strchr( buffer, '/' )) return 0; /* contains a path, not valid */ - if (strcmp( buffer + res - 3, ".so" )) return 0; /* does not end in .so, not valid */ - return 1; -} - /* load the list of available libraries from a given dir */ static void load_library_list_from_dir( HWND dialog, const char *dir_path, int check_subdirs ) { @@ -270,23 +275,31 @@ static void load_library_list_from_dir( HWND dialog, const char *dir_path, int c { size_t len = strlen(de->d_name); if (len > sizeof(name)) continue; - if (len > 7 && !strcmp( de->d_name + len - 7, ".dll.so")) + if (len > 3 && !strcmp( de->d_name + len - 3, ".so")) { - if (is_16bit_dll( dir_path, de->d_name )) continue; /* 16-bit dlls can't be configured */ - len -= 7; + len -= 3; + if (len > 4 && !strcmp( de->d_name + len - 4, ".dll.so")) len -= 4; memcpy( name, de->d_name, len ); name[len] = 0; - /* skip dlls that should always be builtin */ - if (is_builtin_only( name )) continue; + if (!show_dll_in_list( name )) continue; SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)name ); } else if (check_subdirs) { struct stat st; - if (is_builtin_only( de->d_name )) continue; + if (!show_dll_in_list( de->d_name )) continue; sprintf( buffer, "%s/%s/%s.dll.so", dir_path, de->d_name, de->d_name ); if (!stat( buffer, &st )) + { + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)de->d_name ); + continue; + } + sprintf( buffer, "%s/%s/%s.so", dir_path, de->d_name, de->d_name ); + if (!stat( buffer, &st )) + { SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)de->d_name ); + continue; + } } } closedir( dir );

1 0