September 2007 - Wine-commits

Andrew Talbot : dmusic: Indirection level fix.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: f56ca618170fb943886822d9a28a852c2a678821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56ca618170fb943886822d9a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 21 00:02:37 2007 +0100 dmusic: Indirection level fix. --- dlls/dmusic/dmusic_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index b952f5a..24901ba 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -400,7 +400,7 @@ const char *debugstr_dmguid (const GUID *id) { if (!id) return "(null)"; for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { - if (IsEqualGUID(id, &guids[i].guid)) + if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } /* if we didn't find it, act like standard debugstr_guid */

1 0

Andrew Talbot : dpnet: Indirection level fix.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: eecc57f1047ca780fbfb2167fc0e9b859ff2c395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eecc57f1047ca780fbfb2167f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 21 00:02:44 2007 +0100 dpnet: Indirection level fix. --- dlls/dpnet/address.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 0e45b80..c0b924c 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -267,7 +267,7 @@ const char *debugstr_SP(const GUID *id) { if (!id) return "(null)"; for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { - if (IsEqualGUID(id, &guids[i].guid)) + if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } /* if we didn't find it, act like standard debugstr_guid */

1 0

Misha Koshelev : wininet: Track child handles, free all child handles on WININET_FreeHandle as native.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 728e5fa55966987c3a2fdc96d8890987eb7b7e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=728e5fa55966987c3a2fdc96d… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Sep 20 20:59:40 2007 -0500 wininet: Track child handles, free all child handles on WININET_FreeHandle as native. --- dlls/wininet/cookie.c | 2 -- dlls/wininet/ftp.c | 3 +++ dlls/wininet/http.c | 2 ++ dlls/wininet/internet.c | 15 ++++++++++++++- dlls/wininet/internet.h | 3 +++ dlls/wininet/urlcache.c | 1 - 6 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index b479aa7..abf897a 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -39,8 +39,6 @@ #include "wine/debug.h" #include "internet.h" -#include "wine/list.h" - #define RESPONSE_TIMEOUT 30 /* FROM internet.c */ diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 901f0a2..805ab44 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1128,6 +1128,7 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, WININET_AddRef( &lpwfs->hdr ); lpwh->lpFtpSession = lpwfs; + list_add_head( &lpwfs->hdr.children, &lpwh->hdr.entry ); handle = WININET_AllocHandle( &lpwh->hdr ); if( !handle ) @@ -1904,6 +1905,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, WININET_AddRef( &hIC->hdr ); lpwfs->lpAppInfo = hIC; + list_add_head( &hIC->hdr.children, &lpwfs->hdr.entry ); handle = WININET_AllocHandle( &lpwfs->hdr ); if( !handle ) @@ -3012,6 +3014,7 @@ static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LP WININET_AddRef( &lpwfs->hdr ); lpwfn->lpFtpSession = lpwfs; + list_add_head( &lpwfs->hdr.children, &lpwfn->hdr.entry ); handle = WININET_AllocHandle( &lpwfn->hdr ); } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c1b8864..454d332 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1371,6 +1371,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, WININET_AddRef( &lpwhs->hdr ); lpwhr->lpHttpSession = lpwhs; + list_add_head( &lpwhs->hdr.children, &lpwhr->hdr.entry ); handle = WININET_AllocHandle( &lpwhr->hdr ); if (NULL == handle) @@ -2824,6 +2825,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, WININET_AddRef( &hIC->hdr ); lpwhs->lpAppInfo = hIC; + list_add_head( &hIC->hdr.children, &lpwhs->hdr.entry ); handle = WININET_AllocHandle( &lpwhs->hdr ); if (NULL == handle) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 345b2aa..5e95a12 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -105,6 +105,8 @@ HINTERNET WININET_AllocHandle( LPWININETHANDLEHEADER info ) LPWININETHANDLEHEADER *p; UINT handle = 0, num; + list_init( &info->children ); + EnterCriticalSection( &WININET_cs ); if( !WININET_dwMaxHandles ) { @@ -182,6 +184,8 @@ BOOL WININET_Release( LPWININETHANDLEHEADER info ) INTERNET_STATUS_HANDLE_CLOSING, &info->hInternet, sizeof(HINTERNET)); TRACE( "destroying object %p\n", info); + if ( info->htype != WH_HINIT ) + list_remove( &info->entry ); info->destroy( info ); } return TRUE; @@ -191,7 +195,7 @@ BOOL WININET_FreeHandle( HINTERNET hinternet ) { BOOL ret = FALSE; UINT handle = (UINT) hinternet; - LPWININETHANDLEHEADER info = NULL; + LPWININETHANDLEHEADER info = NULL, child, next; EnterCriticalSection( &WININET_cs ); @@ -212,7 +216,16 @@ BOOL WININET_FreeHandle( HINTERNET hinternet ) LeaveCriticalSection( &WININET_cs ); if( info ) + { + /* Free all children as native does */ + LIST_FOR_EACH_ENTRY_SAFE( child, next, &info->children, WININETHANDLEHEADER, entry ) + { + TRACE( "freeing child handle %d for parent handle %d\n", + (UINT)child->hInternet, handle+1); + WININET_FreeHandle( child->hInternet ); + } WININET_Release( info ); + } return ret; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c820975..0f283e1 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -28,6 +28,7 @@ #endif #include "wine/unicode.h" +#include "wine/list.h" #include <time.h> #ifdef HAVE_NETDB_H @@ -149,6 +150,8 @@ struct _WININETHANDLEHEADER WININET_object_function close_connection; WININET_object_function destroy; INTERNET_STATUS_CALLBACK lpfnStatusCB; + struct list entry; + struct list children; }; diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 2692dfe..d9db16f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -46,7 +46,6 @@ #include "shlobj.h" #include "wine/unicode.h" -#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wininet);

1 0

Misha Koshelev : wininet/tests: Add test to show that InternetCloseHandle closes open child handles too.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 01de104a75737887837154712c309860bcbc7a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01de104a75737887837154712… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Sep 20 21:00:38 2007 -0500 wininet/tests: Add test to show that InternetCloseHandle closes open child handles too. --- dlls/wininet/tests/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1040689..589fe8a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -447,10 +447,10 @@ abort: "Double close of handle should have set ERROR_INVALID_HANDLE instead of %u\n", GetLastError()); } - if (hic != 0x0) { - rc = InternetCloseHandle(hic); - ok ((rc != 0), "InternetCloseHandle of handle opened by InternetConnectA failed\n"); - } + /* We intentionally do not close the handle opened by InternetConnectA as this + * tickles bug #9479: native closes child internet handles when the parent handles + * are closed. This is verified below by checking that the number of + * INTERNET_STATUS_HANDLE_CLOSING notifications matches the number expected. */ if (hi != 0x0) { SET_WINE_ALLOW(INTERNET_STATUS_HANDLE_CLOSING); rc = InternetCloseHandle(hi);

1 0

Peter Oberndorfer : user32/tests: Fix dialog proc prototypes.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 1fce55410efafd758a98798ae8d8e55515fd12c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fce55410efafd758a98798ae… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu Sep 20 19:31:56 2007 +0200 user32/tests: Fix dialog proc prototypes. --- dlls/user32/tests/dialog.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index fe8a0fd..afde292 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -676,7 +676,7 @@ static void IsDialogMessageWTest (void) } -static LRESULT CALLBACK delayFocusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, +static INT_PTR CALLBACK delayFocusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { switch (uiMsg) @@ -716,7 +716,7 @@ static LRESULT CALLBACK delayFocusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wPar return FALSE; } -static LRESULT CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, +static INT_PTR CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { switch (uiMsg) @@ -781,7 +781,7 @@ static void InitialFocusTest (void) g_styleInitialFocusT1 = -1; g_styleInitialFocusT2 = -1; - DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, (DLGPROC)delayFocusDlgWinProc); + DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, delayFocusDlgWinProc); ok (((g_styleInitialFocusT1 & WS_TABSTOP) == 0), "Error in wrc - Detected WS_TABSTOP as default style for GROUPBOX\n"); @@ -812,7 +812,7 @@ static void InitialFocusTest (void) g_styleInitialFocusT1 = -1; g_styleInitialFocusT2 = -1; - DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, (DLGPROC)delayFocusDlgWinProc); + DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, delayFocusDlgWinProc); ok ((g_hwndInitialFocusT1 == g_hwndButton2), "Error in initial focus when WM_INITDIALOG returned TRUE: " @@ -839,7 +839,7 @@ static void InitialFocusTest (void) pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate); g_hwndInitialFocusT1 = 0; - hDlg = CreateDialogIndirectParamW(g_hinst, pTemplate, NULL, (DLGPROC)focusDlgWinProc,0); + hDlg = CreateDialogIndirectParamW(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); ok (hDlg != 0, "Failed to create test dialog.\n"); ok ((g_hwndInitialFocusT1 == 0),

1 0

Francois Gouget : regstr. h only defines constants and structures and thus does not need an extern "C " statement.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 2b891021275a8ce3f3ce92303c4efe8d287a9e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b891021275a8ce3f3ce92303… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 20 21:35:31 2007 +0200 regstr.h only defines constants and structures and thus does not need an extern "C" statement. --- include/regstr.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/include/regstr.h b/include/regstr.h index ef6cf99..99df694 100644 --- a/include/regstr.h +++ b/include/regstr.h @@ -21,9 +21,6 @@ #ifndef _INC_REGSTR #define _INC_REGSTR -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ #define REGSTR_PATH_UNINSTALL TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall") @@ -32,8 +29,5 @@ extern "C" { /* UninstallString <= 63 chars in Windows (otherwise problems) */ #define REGSTR_VAL_UNINSTALLER_COMMANDLINE TEXT("UninstallString") -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ #endif /* _INC_REGSTR_H */

1 0

Francois Gouget : gdiplus: Make gdiplustypes.h C++ compatible.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 0bf3f1d9f1f4cf0b0a3372fcb056098bff71331a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf3f1d9f1f4cf0b0a3372fcb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 20 21:36:10 2007 +0200 gdiplus: Make gdiplustypes.h C++ compatible. Add GetThumbnailImageAbort. --- include/gdiplustypes.h | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 9d73a85..c9a5740 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -21,9 +21,6 @@ typedef float REAL; -typedef BOOL (CALLBACK * ImageAbort)(VOID *); -typedef ImageAbort DrawImageAbort; - enum Status{ Ok = 0, GenericError = 1, @@ -48,6 +45,20 @@ enum Status{ PropertyNotSupported = 20 }; + +#ifdef __cplusplus +extern "C" { +#endif + +typedef BOOL (CALLBACK * ImageAbort)(VOID *); +typedef ImageAbort DrawImageAbort; +typedef ImageAbort GetThumbnailImageAbort; + +#ifdef __cplusplus +} +#endif + + #ifdef __cplusplus class Point

1 0

Francois Gouget : mpr: Move MAX_INTERFACE_NAME_LEN to mprapi. h and add related constants.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 49b2c3fee667ef15d319b174c8dcb1f9a039d1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b2c3fee667ef15d319b174c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 20 21:34:56 2007 +0200 mpr: Move MAX_INTERFACE_NAME_LEN to mprapi.h and add related constants. Fix iprtrmib.h so it includes mprapi.h. --- include/iprtrmib.h | 3 +-- include/mprapi.h | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/iprtrmib.h b/include/iprtrmib.h index 630a54b..ba84cc5 100644 --- a/include/iprtrmib.h +++ b/include/iprtrmib.h @@ -18,8 +18,7 @@ #ifndef WINE_IPRTRMIB_H__ #define WINE_IPRTRMIB_H__ -#define MAX_INTERFACE_NAME_LEN 256 - +#include <mprapi.h> #include <ipifcons.h> #define MAXLEN_IFDESCR 256 diff --git a/include/mprapi.h b/include/mprapi.h index c5f0edb..2eec3b9 100644 --- a/include/mprapi.h +++ b/include/mprapi.h @@ -23,6 +23,15 @@ #include <ras.h> /* FIXME: #include <in6addr.h> */ +#define MAX_DEVICE_NAME 128 +#define MAX_DEVICETYPE_NAME 16 +#define MAX_INTERFACE_NAME_LEN 256 +#define MAX_MEDIA_NAME 16 +#define MAX_PHONE_NUMBER_LEN 128 +#define MAX_PORT_NAME 16 +#define MAX_TRANSPORT_NAME_LEN 40 + + #ifdef __cplusplus extern "C" { #endif

1 0

Francois Gouget : fci.h: Include basetsd.h.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 253b251ff5d654d7f8f1fa93532bb95b91365b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253b251ff5d654d7f8f1fa935… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 20 21:35:41 2007 +0200 fci.h: Include basetsd.h. --- include/fci.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/fci.h b/include/fci.h index 30bcce1..6ced99f 100644 --- a/include/fci.h +++ b/include/fci.h @@ -19,6 +19,8 @@ #ifndef __WINE_FCI_H #define __WINE_FCI_H +#include <basetsd.h> + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */

1 0

Francois Gouget : infosoft: indexsrv.idl must import objidl. idl and not unknwn.idl.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: deb355be8171fdeed759903f31afa3c7c5e7f72a URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb355be8171fdeed759903f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 20 21:36:29 2007 +0200 infosoft: indexsrv.idl must import objidl.idl and not unknwn.idl. Add a commented out import directive as a reminder. --- include/indexsrv.idl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/indexsrv.idl b/include/indexsrv.idl index e7b9919..85e4e66 100644 --- a/include/indexsrv.idl +++ b/include/indexsrv.idl @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "unknwn.idl"; +import "objidl.idl"; +/* FIXME: import "filter.idl"; */ /* * widl doesn't like the declaration of PFNFILLTEXTBUFFER, so work around it...

1 0