February 2007 - Wine-Commits

Dmitry Timoshkov : user32: Add traces to the cursor APIs.
by Alexandre Julliard Feb. 21, 2007

Feb. 21, 2007

Module: wine Branch: master Commit: e35db3408bf79e1e72fb99004848cc5eb1d9a34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35db3408bf79e1e72fb99004… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 21 16:17:34 2007 +0800 user32: Add traces to the cursor APIs. --- dlls/user32/cursoricon.c | 24 ++++++++++++++++++++++-- dlls/winex11.drv/mouse.c | 6 ++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7bbb79a..e17d4c6 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -950,6 +950,9 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, WORD wResId; DWORD dwBytesInRes; + TRACE("%p, %s, %dx%d, colors %d, fCursor %d, flags 0x%04x\n", + hInstance, debugstr_w(name), width, height, colors, fCursor, loadflags); + if ( loadflags & LR_LOADFROMFILE ) /* Load from file */ return CURSORICON_LoadFromFile( name, width, height, colors, fCursor, loadflags ); @@ -1395,6 +1398,8 @@ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon ) HBITMAP hXorBits, hAndBits; COLORREF oldFg, oldBg; + TRACE("%p, (%d,%d), %p\n", hdc, x, y, hIcon); + if (!(ptr = (CURSORICONINFO *)GlobalLock16(HICON_16(hIcon)))) return FALSE; if (!(hMemDC = CreateCompatibleDC( hdc ))) return FALSE; hAndBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1, @@ -1455,7 +1460,7 @@ HCURSOR WINAPI SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) HCURSOR hOldCursor; if (hCursor == thread_info->cursor) return hCursor; /* No change */ - TRACE_(cursor)("%p\n", hCursor ); + TRACE("%p\n", hCursor); hOldCursor = thread_info->cursor; thread_info->cursor = hCursor; /* Change the cursor shape only if it is visible */ @@ -1474,7 +1479,7 @@ INT WINAPI ShowCursor( BOOL bShow ) { struct user_thread_info *thread_info = get_user_thread_info(); - TRACE_(cursor)("%d, count=%d\n", bShow, thread_info->cursor_count ); + TRACE("%d, count=%d\n", bShow, thread_info->cursor_count ); if (bShow) { @@ -1664,6 +1669,8 @@ HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew ) */ HCURSOR WINAPI LoadCursorW(HINSTANCE hInstance, LPCWSTR name) { + TRACE("%p, %s\n", hInstance, debugstr_w(name)); + return LoadImageW( hInstance, name, IMAGE_CURSOR, 0, 0, LR_SHARED | LR_DEFAULTSIZE ); } @@ -1673,6 +1680,8 @@ HCURSOR WINAPI LoadCursorW(HINSTANCE hInstance, LPCWSTR name) */ HCURSOR WINAPI LoadCursorA(HINSTANCE hInstance, LPCSTR name) { + TRACE("%p, %s\n", hInstance, debugstr_a(name)); + return LoadImageA( hInstance, name, IMAGE_CURSOR, 0, 0, LR_SHARED | LR_DEFAULTSIZE ); } @@ -1682,6 +1691,8 @@ HCURSOR WINAPI LoadCursorA(HINSTANCE hInstance, LPCSTR name) */ HCURSOR WINAPI LoadCursorFromFileW (LPCWSTR name) { + TRACE("%s\n", debugstr_w(name)); + return LoadImageW( 0, name, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE | LR_DEFAULTSIZE ); } @@ -1691,6 +1702,8 @@ HCURSOR WINAPI LoadCursorFromFileW (LPCWSTR name) */ HCURSOR WINAPI LoadCursorFromFileA (LPCSTR name) { + TRACE("%s\n", debugstr_a(name)); + return LoadImageA( 0, name, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE | LR_DEFAULTSIZE ); } @@ -1700,6 +1713,8 @@ HCURSOR WINAPI LoadCursorFromFileA (LPCSTR name) */ HICON WINAPI LoadIconW(HINSTANCE hInstance, LPCWSTR name) { + TRACE("%p, %s\n", hInstance, debugstr_w(name)); + return LoadImageW( hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE ); } @@ -1709,6 +1724,8 @@ HICON WINAPI LoadIconW(HINSTANCE hInstance, LPCWSTR name) */ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name) { + TRACE("%p, %s\n", hInstance, debugstr_a(name)); + return LoadImageA( hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE ); } @@ -1725,6 +1742,9 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) if (!ciconinfo) return FALSE; + TRACE("%p => %dx%d, %d bpp\n", hIcon, + ciconinfo->nWidth, ciconinfo->nHeight, ciconinfo->bBitsPerPixel); + if ( (ciconinfo->ptHotSpot.x == ICON_HOTSPOT) && (ciconinfo->ptHotSpot.y == ICON_HOTSPOT) ) { diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 069333a..1016c69 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -649,6 +649,12 @@ void X11DRV_SetCursor( CURSORICONINFO *lpCursor ) { Cursor cursor; + if (lpCursor) + TRACE("%ux%u, planes %u, bpp %u\n", + lpCursor->nWidth, lpCursor->nHeight, lpCursor->bPlanes, lpCursor->bBitsPerPixel); + else + TRACE("NULL\n"); + if (root_window != DefaultRootWindow(gdi_display)) { /* If in desktop mode, set the cursor on the desktop window */

1 0

Aric Stewart : imm32: Implement stubs for ImmGetImeMenuItemsA and ImmGetImeMenuItemsW.
by Alexandre Julliard Feb. 21, 2007

Feb. 21, 2007

Module: wine Branch: master Commit: 1840f5e192520aaee4f226f951f3510e3c4ceb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1840f5e192520aaee4f226f95… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 21 17:02:49 2007 +0900 imm32: Implement stubs for ImmGetImeMenuItemsA and ImmGetImeMenuItemsW. --- dlls/imm32/imm.c | 23 +++++++++++++++++++++++ dlls/imm32/imm32.spec | 6 +++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 8c07651..c63b300 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1492,6 +1492,29 @@ BOOL WINAPI ImmUnregisterWordW( return FALSE; } +/*********************************************************************** + * ImmGetImeMenuItemsA (IMM32.@) + */ +DWORD WINAPI ImmGetImeMenuItemsA( HIMC hIMC, DWORD dwFlags, DWORD dwType, + LPIMEMENUITEMINFOA lpImeParentMenu, LPIMEMENUITEMINFOA lpImeMenu, + DWORD dwSize) +{ + FIXME("(%p, %i, %i, %p, %p, %i): stub\n", hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + return 0; +} + +/*********************************************************************** +* ImmGetImeMenuItemsW (IMM32.@) +*/ +DWORD WINAPI ImmGetImeMenuItemsW( HIMC hIMC, DWORD dwFlags, DWORD dwType, + LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, + DWORD dwSize) +{ + FIXME("(%p, %i, %i, %p, %p, %i): stub\n", hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + return 0; +} /***** * Internal functions to help with IME window management diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index bf8ceaa..0134954 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -43,10 +43,10 @@ @ stub ImmGetIMCCSize @ stub ImmGetIMCLockCount @ stdcall ImmGetIMEFileNameA(long ptr long) -@ stdcall ImmGetIMEFileNameW(long ptr long) +@ stdcall ImmGetIMEFileNameW(long ptr long) @ stub ImmGetImeInfoEx -@ stub ImmGetImeMenuItemsA -@ stub ImmGetImeMenuItemsW +@ stdcall ImmGetImeMenuItemsA(long long long ptr ptr long) +@ stdcall ImmGetImeMenuItemsW(long long long ptr ptr long) @ stdcall ImmGetOpenStatus(long) @ stdcall ImmGetProperty(long long) @ stdcall ImmGetRegisterWordStyleA(long long ptr)

1 0

Paul Vriens : wininet/ftp.c: Fix some typos.
by Alexandre Julliard Feb. 21, 2007

Feb. 21, 2007

Module: wine Branch: master Commit: 8bc9bc2e29971565dd3932bc55c07ba7044807d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc9bc2e29971565dd3932bc5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 21 08:52:08 2007 +0100 wininet/ftp.c: Fix some typos. --- dlls/wininet/tests/ftp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 4afaddd..e87aa45 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -472,7 +472,7 @@ static void test_openfile(void) /* We have a handle so all ftp calls should fail (TODO: Put more ftp-calls in here) */ SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); - ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); + ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); DeleteFileA("should_be_non_existing_deadbeef"); /* Just in case */ @@ -482,7 +482,7 @@ static void test_openfile(void) ok ( bRet == FALSE, "Expected FtpOpenFileA to fail\n"); ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); - InternetCloseHandle(hOpenFile); /* Just in case */ + InternetCloseHandle(hOpenFile2); /* Just in case */ } InternetCloseHandle(hOpenFile);

1 0

Marcus Meissner : shlwapi: Fix size passed to MultiByteToWideChar.
by Alexandre Julliard Feb. 21, 2007

Feb. 21, 2007

Module: wine Branch: master Commit: 74bb55108138eb4175b77c267b12e921c9d3c1e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74bb55108138eb4175b77c267… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Feb 20 22:52:07 2007 +0100 shlwapi: Fix size passed to MultiByteToWideChar. --- dlls/shlwapi/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 50e608a..20c0ba2 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -191,7 +191,7 @@ HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y) y->cchSuffix = lstrlenA(y->pszSuffix); len = MultiByteToWideChar(CP_ACP, 0, y->pszProtocol, y->cchProtocol, - scheme, sizeof(scheme)); + scheme, sizeof(scheme)/sizeof(WCHAR)); y->nScheme = get_scheme_code(scheme, len); return S_OK;

1 0

Chris Robinson : quartz: Implement IUnknown methods for IMediaPosition.
by Alexandre Julliard Feb. 21, 2007

Feb. 21, 2007

Module: wine Branch: master Commit: ac647156d8e2e8595a9a1a05a8aa33182bd27085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac647156d8e2e8595a9a1a05a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Feb 20 12:36:12 2007 -0800 quartz: Implement IUnknown methods for IMediaPosition. --- dlls/quartz/filtergraph.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c301220..36767a0 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1753,19 +1753,28 @@ static const IMediaSeekingVtbl IMediaSeeking_VTable = }; /*** IUnknown methods ***/ -static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition* iface, REFIID riid, void** ppvObject){ - FIXME("(%p) stub!\n", iface); - return E_NOTIMPL; +static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition* iface, REFIID riid, void** ppvObj){ + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); + + TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + + return Filtergraph_QueryInterface(This, riid, ppvObj); } static ULONG WINAPI MediaPosition_AddRef(IMediaPosition *iface){ - FIXME("(%p) stub!\n", iface); - return E_NOTIMPL; + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return Filtergraph_AddRef(This); } static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface){ - FIXME("(%p) stub!\n", iface); - return E_NOTIMPL; + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return Filtergraph_Release(This); } /*** IDispatch methods ***/

1 0

Chris Robinson : quartz: Don't release filters when they connect.
by Alexandre Julliard Feb. 21, 2007

Feb. 21, 2007

Module: wine Branch: master Commit: 5a8ee37191abcee35c2dc2475ed9b03f7b0500f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8ee37191abcee35c2dc2475… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Feb 20 12:35:19 2007 -0800 quartz: Don't release filters when they connect. --- dlls/quartz/filtergraph.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b894781..c301220 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -815,7 +815,6 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface, } while (++i < nb) IPin_Release(ppins[i]); CoTaskMemFree(ppins); - IBaseFilter_Release(pfilter); IPin_Release(ppinfilter); break; } @@ -1082,7 +1081,7 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, } IGraphBuilder_RemoveFilter(iface, psplitter); IBaseFilter_Release(psplitter); - ppinsplitter = NULL; + psplitter = NULL; } /* Render all output pin of the splitter by calling IGraphBuilder_Render on each of them */ @@ -1104,10 +1103,6 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, hr = (partial ? VFW_S_PARTIAL_RENDER : S_OK); } - if (psplitter) - IBaseFilter_Release(psplitter); - IBaseFilter_Release(preader); - return hr; }

1 0

James Hawkins : msi: Cleanup the dialog event subscriptions when destroying the dialog.
by Alexandre Julliard Feb. 21, 2007

Feb. 21, 2007

Module: wine Branch: master Commit: 0746b9076d2c32906de4d291e1ce8f809927988c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0746b9076d2c32906de4d291e… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Feb 20 14:16:10 2007 -0600 msi: Cleanup the dialog event subscriptions when destroying the dialog. --- dlls/msi/dialog.c | 3 +++ dlls/msi/events.c | 3 +-- dlls/msi/msipriv.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a542546..28fb2e9 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3429,6 +3429,9 @@ void msi_dialog_destroy( msi_dialog *dialog ) if( dialog->hwnd ) DestroyWindow( dialog->hwnd ); + /* unsubscribe events */ + ControlEvent_CleanupDialogSubscriptions(dialog->package, dialog->name); + /* destroy the list of controls */ while( !list_empty( &dialog->controls ) ) { diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 4ddab41..714e060 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -54,7 +54,6 @@ struct subscriber { }; static UINT ControlEvent_HandleControlEvent(MSIPACKAGE *, LPCWSTR, LPCWSTR, msi_dialog*); -static VOID ControlEvent_CleanupDialogSubscriptions(MSIPACKAGE *package, LPWSTR dialog); /* * Create a dialog box and run it if it's modal @@ -321,7 +320,7 @@ VOID ControlEvent_FireSubscribedEvent( MSIPACKAGE *package, LPCWSTR event, } } -static VOID ControlEvent_CleanupDialogSubscriptions(MSIPACKAGE *package, LPWSTR dialog) +VOID ControlEvent_CleanupDialogSubscriptions(MSIPACKAGE *package, LPWSTR dialog) { struct list *i, *t; struct subscriber *sub; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b01bb27..971f71e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -781,6 +781,7 @@ extern void msi_ui_error( DWORD msg_id, DWORD type ); /* control event stuff */ extern VOID ControlEvent_FireSubscribedEvent(MSIPACKAGE *package, LPCWSTR event, MSIRECORD *data); +extern VOID ControlEvent_CleanupDialogSubscriptions(MSIPACKAGE *package, LPWSTR dialog); extern VOID ControlEvent_CleanupSubscriptions(MSIPACKAGE *package); extern VOID ControlEvent_SubscribeToEvent(MSIPACKAGE *package, msi_dialog *dialog, LPCWSTR event, LPCWSTR control, LPCWSTR attribute);

1 0

lostwages/templates/en download.template
by Jeremy Newman Feb. 20, 2007

Feb. 20, 2007

ChangeSet ID: 30935 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/02/20 16:48:07 Modified files: templates/en : download.template Log message: Marcus Meissner <meissner(a)suse.de> SUSE adjustments Patch: http://cvs.winehq.org/patch.py?id=30935 Old revision New revision Changes Path 1.89 1.90 +2 -3 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.89 lostwages/templates/en/download.template:1.90 --- lostwages/templates/en/download.template:1.89 20 Feb 2007 22:48: 7 -0000 +++ lostwages/templates/en/download.template 20 Feb 2007 22:48: 7 -0000 @@ -38,9 +38,8 @@ for post-installation instructions.< <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…"> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SUSE</a> - binary and source .rpms for SUSE 9.3, 10.0, 10.1, and 10.2. - Release and daily snapshots are also available via the <a href="http://en.opensuse.org/Wine">openSUSE buildservice</a>, as YUM and YAST package repositories. + <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> + release binary and source .rpms and daily snapshot RPMs for SUSE Linux 9.3, 10.0, 10.1, and openSUSE 10.2. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr>

1 0

Jacek Caban : shdocvw: Fix module ref counting.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: 0197c2c2928eb6d6f4833243b96769f2151643ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0197c2c2928eb6d6f4833243b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 20 17:13:27 2007 +0100 shdocvw: Fix module ref counting. --- dlls/shdocvw/factory.c | 1 + dlls/shdocvw/urlhist.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 71a37aa..58fffcb 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -54,6 +54,7 @@ static HRESULT WINAPI WBCF_QueryInterface(LPCLASSFACTORY iface, if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { *ppobj = iface; + IClassFactory_AddRef(iface); return S_OK; } diff --git a/dlls/shdocvw/urlhist.c b/dlls/shdocvw/urlhist.c index 2b2e572..c801718 100644 --- a/dlls/shdocvw/urlhist.c +++ b/dlls/shdocvw/urlhist.c @@ -37,9 +37,10 @@ static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFII *ppv = iface; } - if(*ppv) + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); return S_OK; - + } WARN("(%s %p)\n", debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -47,11 +48,13 @@ static HRESULT WINAPI UrlHistoryStg_QueryInterface(IUrlHistoryStg2 *iface, REFII static ULONG WINAPI UrlHistoryStg_AddRef(IUrlHistoryStg2 *iface) { + SHDOCVW_LockModule(); return 2; } static ULONG WINAPI UrlHistoryStg_Release(IUrlHistoryStg2 *iface) { + SHDOCVW_UnlockModule(); return 1; }

1 0

Detlef Riekenberg : kernel32: Display correct parameters in comm traces.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: d7e88ff996fb56267bcc09effdc549964fb6130c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e88ff996fb56267bcc09eff… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 20 16:38:13 2007 +0100 kernel32: Display correct parameters in comm traces. --- dlls/kernel32/comm.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index b9fd19c..07caa83 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -1198,7 +1198,7 @@ BOOL WINAPI CommConfigDialogA( HMODULE hConfigModule; BOOL r = FALSE; - TRACE("(%p %p %p)\n",lpszDevice, hWnd, lpCommConfig); + TRACE("(%s, %p, %p)\n", debugstr_a(lpszDevice), hWnd, lpCommConfig); hConfigModule = LoadLibraryW(lpszSerialUI); if(!hConfigModule) @@ -1228,7 +1228,7 @@ BOOL WINAPI CommConfigDialogW( HMODULE hConfigModule; BOOL r = FALSE; - TRACE("(%p %p %p)\n",lpszDevice, hWnd, lpCommConfig); + TRACE("(%s, %p, %p)\n", debugstr_w(lpszDevice), hWnd, lpCommConfig); hConfigModule = LoadLibraryW(lpszSerialUI); if(!hConfigModule) @@ -1266,7 +1266,7 @@ BOOL WINAPI GetCommConfig( { BOOL r; - TRACE("(%p %p)\n",hFile,lpCommConfig); + TRACE("(%p, %p, %p) *lpdwSize: %u\n", hFile, lpCommConfig, lpdwSize, lpdwSize ? *lpdwSize : 0 ); if(lpCommConfig == NULL) return FALSE; @@ -1300,7 +1300,7 @@ BOOL WINAPI SetCommConfig( LPCOMMCONFIG lpCommConfig, /* [in] The desired configuration. */ DWORD dwSize) /* [in] size of the lpCommConfig struct */ { - TRACE("(%p %p)\n",hFile,lpCommConfig); + TRACE("(%p, %p, %u)\n", hFile, lpCommConfig, dwSize); return SetCommState(hFile,&lpCommConfig->dcb); } @@ -1323,7 +1323,7 @@ BOOL WINAPI SetDefaultCommConfigW( HMODULE hConfigModule; BOOL r = FALSE; - TRACE("(%p %p %x)\n",lpszDevice, lpCommConfig, dwSize); + TRACE("(%s, %p, %u)\n", debugstr_w(lpszDevice), lpCommConfig, dwSize); hConfigModule = LoadLibraryW(lpszSerialUI); if(!hConfigModule) @@ -1357,7 +1357,7 @@ BOOL WINAPI SetDefaultCommConfigA( LPWSTR lpDeviceW = NULL; DWORD len; - TRACE("(%s %p %x)\n",debugstr_a(lpszDevice),lpCommConfig,dwSize); + TRACE("(%s, %p, %u)\n", debugstr_a(lpszDevice), lpCommConfig, dwSize); if (lpszDevice) { @@ -1393,12 +1393,13 @@ BOOL WINAPI GetDefaultCommConfigW( static const WCHAR comW[] = {'C','O','M',0}; static const WCHAR formatW[] = {'C','O','M','%','c',':','3','8','4','0','0',',','n',',','8',',','1',0}; + TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_w(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 ); + if (strncmpiW(lpszName,comW,3)) { ERR("not implemented for <%s>\n", debugstr_w(lpszName)); return FALSE; } - TRACE("(%s %p %d)\n", debugstr_w(lpszName), lpCC, *lpdwSize ); if (*lpdwSize < sizeof(COMMCONFIG)) { *lpdwSize = sizeof(COMMCONFIG); return FALSE; @@ -1438,7 +1439,7 @@ BOOL WINAPI GetDefaultCommConfigA( BOOL ret = FALSE; UNICODE_STRING lpszNameW; - TRACE("(%s,%p,%d)\n",lpszName,lpCC,*lpdwSize); + TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_a(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 ); if(lpszName) RtlCreateUnicodeStringFromAsciiz(&lpszNameW,lpszName); else lpszNameW.Buffer = NULL;

1 0