November 2006 - Wine-commits

Andrew Talbot : rpcrt4: Cast-qual warnings fix.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: b011a4eecd064bb2d7a53fe88c45d1fd01c11092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b011a4eecd064bb2d7a53fe88… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 11 14:56:45 2006 +0000 rpcrt4: Cast-qual warnings fix. --- dlls/rpcrt4/cstub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index fdaec78..0ae85ae 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -37,7 +37,7 @@ #include "cpsf.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define STUB_HEADER(This) (((CInterfaceStubHeader*)((This)->lpVtbl))[-1]) +#define STUB_HEADER(This) (((const CInterfaceStubHeader*)((This)->lpVtbl))[-1]) static WINE_EXCEPTION_FILTER(stub_filter) {

1 0

Andrew Talbot : quartz: Cast-qual warnings fix.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: a0e9fc872f4c475a51375b4b5f923b9a195ddf02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e9fc872f4c475a51375b4b5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 11 11:03:30 2006 +0000 quartz: Cast-qual warnings fix. --- dlls/quartz/pin.c | 6 +++--- dlls/quartz/pin.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 70ebd5e..9336022 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -845,7 +845,7 @@ static const IPinVtbl OutputPin_Vtbl = OutputPin_NewSegment }; -HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, const REFERENCE_TIME * tStart, const REFERENCE_TIME * tStop, DWORD dwFlags) +HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags) { HRESULT hr; @@ -862,10 +862,10 @@ HRESULT OutputPin_GetDeliveryBuffer(Outp hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); if (SUCCEEDED(hr)) - hr = IMemAllocator_GetBuffer(pAlloc, ppSample, (REFERENCE_TIME *)tStart, (REFERENCE_TIME *)tStop, dwFlags); + hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags); if (SUCCEEDED(hr)) - hr = IMediaSample_SetTime(*ppSample, (REFERENCE_TIME *)tStart, (REFERENCE_TIME *)tStop); + hr = IMediaSample_SetTime(*ppSample, tStart, tStop); if (pAlloc) IMemAllocator_Release(pAlloc); diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index d56dae1..bb48df3 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -133,7 +133,7 @@ HRESULT WINAPI OutputPin_EndFlush(IPin * HRESULT WINAPI OutputPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); HRESULT OutputPin_CommitAllocator(OutputPin * This); -HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, const REFERENCE_TIME * tStart, const REFERENCE_TIME * tStop, DWORD dwFlags); +HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags); HRESULT OutputPin_SendSample(OutputPin * This, IMediaSample * pSample); HRESULT OutputPin_DeliverDisconnect(OutputPin * This); HRESULT OutputPin_DeliverNewSegment(OutputPin * This, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate);

1 0

Andrew Talbot : qcap: Cast-qual warnings fix.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 4b675fd3555495780d3242a32f81473aaf3c795c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b675fd3555495780d3242a32… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 11 11:02:18 2006 +0000 qcap: Cast-qual warnings fix. --- dlls/qcap/pin.c | 6 +++--- dlls/qcap/pin.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/pin.c b/dlls/qcap/pin.c index d306307..7e579b6 100644 --- a/dlls/qcap/pin.c +++ b/dlls/qcap/pin.c @@ -357,7 +357,7 @@ HRESULT WINAPI OutputPin_Disconnect(IPin return hr; } -HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, const REFERENCE_TIME * tStart, const REFERENCE_TIME * tStop, DWORD dwFlags) +HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags) { HRESULT hr; @@ -374,10 +374,10 @@ HRESULT OutputPin_GetDeliveryBuffer(Outp hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); if (SUCCEEDED(hr)) - hr = IMemAllocator_GetBuffer(pAlloc, ppSample, (REFERENCE_TIME *)tStart, (REFERENCE_TIME *)tStop, dwFlags); + hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags); if (SUCCEEDED(hr)) - hr = IMediaSample_SetTime(*ppSample, (REFERENCE_TIME *)tStart, (REFERENCE_TIME *)tStop); + hr = IMediaSample_SetTime(*ppSample, tStart, tStop); if (pAlloc) IMemAllocator_Release(pAlloc); diff --git a/dlls/qcap/pin.h b/dlls/qcap/pin.h index ca536c8..5dba694 100644 --- a/dlls/qcap/pin.h +++ b/dlls/qcap/pin.h @@ -76,5 +76,5 @@ HRESULT WINAPI OutputPin_Connect(IPin * HRESULT WINAPI OutputPin_Disconnect(IPin * iface); HRESULT WINAPI OutputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); -HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, const REFERENCE_TIME * tStart, const REFERENCE_TIME * tStop, DWORD dwFlags); +HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags); HRESULT OutputPin_SendSample(OutputPin * This, IMediaSample * pSample);

1 0

James Hawkins : msi: Fix a heap corruption bug by resizing the src string before adding to it.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 5cc4a8915f5b9873c16a2c2b6465d795fb05d019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc4a8915f5b9873c16a2c2b6… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Nov 10 13:26:38 2006 -0800 msi: Fix a heap corruption bug by resizing the src string before adding to it. --- dlls/msi/files.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 38b1f8f..dc81e6a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -469,8 +469,13 @@ static UINT download_remote_cabinet(MSIP *(ptr + 1) = '\0'; ptr = strrchrW(mi->source, '\\'); + src = msi_realloc(src, (lstrlenW(src) + lstrlenW(ptr)) * sizeof(WCHAR)); + if (!src) + return ERROR_OUTOFMEMORY; + lstrcatW(src, ptr + 1); + temppath[0] = '\0'; cab = msi_download_file(src, temppath); lstrcpyW(mi->source, cab);

1 0

Francois Gouget : include/tapi.h: Add missing include directives.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: d78ea3ccfa19bd16c92243b3d50293bea6589467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d78ea3ccfa19bd16c92243b3d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 10 15:25:21 2006 +0100 include/tapi.h: Add missing include directives. --- dlls/tapi32/assisted.c | 2 ++ dlls/tapi32/line.c | 2 ++ dlls/tapi32/phone.c | 1 + include/tapi.h | 6 ++++++ 4 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/tapi32/assisted.c b/dlls/tapi32/assisted.c index 66ccf5e..6b4ed02 100644 --- a/dlls/tapi32/assisted.c +++ b/dlls/tapi32/assisted.c @@ -22,7 +22,9 @@ #include <stdarg.h> #include <stdio.h> #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winreg.h" +#include "objbase.h" #include "tapi.h" #include "wine/debug.h" diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 16b4cba..19f8d0a 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -24,9 +24,11 @@ #include <stdarg.h> #include <stdio.h> #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winreg.h" #include "winnls.h" #include "winerror.h" +#include "objbase.h" #include "tapi.h" #include "wine/debug.h" diff --git a/dlls/tapi32/phone.c b/dlls/tapi32/phone.c index 89e44e9..994d787 100644 --- a/dlls/tapi32/phone.c +++ b/dlls/tapi32/phone.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "objbase.h" #include "tapi.h" #include "wine/debug.h" diff --git a/include/tapi.h b/include/tapi.h index 74a2b6e..8673665 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -21,6 +21,12 @@ #ifndef __WINE_TAPI_H #define __WINE_TAPI_H +#ifndef __WINESRC__ +# include <windows.h> +#endif +#include <basetsd.h> +#include <oaidl.h> + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */

1 0

Francois Gouget : user: Only perform the screen resolution changing tests in interactive mode.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 8e9c87628875fb8c043426ac9831a569d991a621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9c87628875fb8c043426ac9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 10 15:23:39 2006 +0100 user: Only perform the screen resolution changing tests in interactive mode. --- dlls/user/tests/monitor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user/tests/monitor.c b/dlls/user/tests/monitor.c index 787ac2e..153a353 100644 --- a/dlls/user/tests/monitor.c +++ b/dlls/user/tests/monitor.c @@ -168,6 +168,7 @@ START_TEST(monitor) { init_function_pointers(); test_enumdisplaydevices(); - test_ChangeDisplaySettingsEx(); + if (winetest_interactive) + test_ChangeDisplaySettingsEx(); test_monitors(); }

1 0

Francois Gouget : kernel32: Fix the 'MAP_FOLDCZONE' ok() test.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 4c9f668e7ce0cb2c0833db8f7e742ebe70dc53fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c9f668e7ce0cb2c0833db8f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 10 15:17:44 2006 +0100 kernel32: Fix the 'MAP_FOLDCZONE' ok() test. --- dlls/kernel32/tests/locale.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a091248..da51a24 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1857,8 +1857,15 @@ static void test_FoldStringW(void) EXPECT_LEN(2); EXPECT_VALID; ok(dst[0] == expected || /* Wine (correctly) uses updated mappings for some Unicode 4.0 chars */ - (ch >= 0xFA0D && ch <= 0xFA47) || - 0xf92c || ch == 0xf979 || ch == 0xf995 || ch == 0xf9e7 || ch == 0xf9f1, + /* FIXME: But they should be re-checked */ + ch == 0xf92c || ch == 0xf979 || ch == 0xf995 || ch == 0xf9e7 || + ch == 0xf9f1 || + (0xfa0c <= ch && ch <= 0xfa6a) || + (0xfa70 <= ch && ch <= 0xfad9) || + ch == 0xfe47 || ch == 0xfe48 || ch == 0xfe68 || + (0xfe70 <= ch && ch <= 0xfe7f) || + ch == 0xff3c || ch == 0xff5f || ch == 0xff60 || + ch == 0xff9e || ch == 0xff9f, "MAP_FOLDCZONE: ch %d 0x%04x Expected 0x%04x got 0x%04x\n", ch, ch, expected, dst[0]); }

1 0

Kirill K. Smirnov : winhelp: Use path of parent helpfile while looking for popup window.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 3545dc519e1c526d2c2aa9d3d22dc4dfd6ccf803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3545dc519e1c526d2c2aa9d3d… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Nov 10 19:37:26 2006 +0300 winhelp: Use path of parent helpfile while looking for popup window. --- programs/winhelp/winhelp.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index c1d07ef..8905d6e 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -117,8 +117,25 @@ HLPFILE* WINHELP_LookupHelpFile(LPCSTR l { HLPFILE* hlpfile; char szFullName[MAX_PATH]; + char szAddPath[MAX_PATH]; + char *p; + + /* + * NOTE: This is needed by popup windows only. + * In other cases it's not needed but does not hurt though. + */ + if (Globals.active_win && Globals.active_win->page && Globals.active_win->page->file) + { + strcpy(szAddPath, Globals.active_win->page->file->lpszPath); + p = strrchr(szAddPath, '\\'); + if (p) *p = 0; + } - if (!SearchPath(NULL, lpszFile, ".hlp", MAX_PATH, szFullName, NULL)) + /* + * FIXME: Should we swap conditions? + */ + if (!SearchPath(NULL, lpszFile, ".hlp", MAX_PATH, szFullName, NULL) && + !SearchPath(szAddPath, lpszFile, ".hlp", MAX_PATH, szFullName, NULL)) { if (WINHELP_MessageBoxIDS_s(STID_FILE_NOT_FOUND_s, lpszFile, STID_WHERROR, MB_YESNO|MB_ICONQUESTION) != IDYES)

1 0

Kirill K. Smirnov : winhelp: Fix WINHELP_DeleteWindow.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 133477c2766d91b9648e0ba4528dd02498c84009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=133477c2766d91b9648e0ba45… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Nov 10 19:32:34 2006 +0300 winhelp: Fix WINHELP_DeleteWindow. --- programs/winhelp/winhelp.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index f7c0ae3..c1d07ef 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1781,6 +1781,13 @@ static void WINHELP_DeleteWindow(WINHELP } } + if (Globals.active_win == win) + { + Globals.active_win = Globals.win_list; + if (Globals.win_list) + SetActiveWindow(Globals.win_list->hMainWnd); + } + for (b = win->first_button; b; b = bp) { DestroyWindow(b->hWnd);

1 0

Kirill K. Smirnov : winhelp: Do not create popup window if file not found.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: a9ae65d2f6ca4e2d5211c784a34dd38eb6e8288a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ae65d2f6ca4e2d5211c784a… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Nov 10 17:20:53 2006 +0300 winhelp: Do not create popup window if file not found. --- programs/winhelp/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 389ba5a..f7c0ae3 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1195,7 +1195,7 @@ static LRESULT CALLBACK WINHELP_TextWndP break; case hlp_link_popup: hlpfile = WINHELP_LookupHelpFile(part->link->lpszString); - WINHELP_CreateHelpWindowByHash(hlpfile, part->link->lHash, + if (hlpfile) WINHELP_CreateHelpWindowByHash(hlpfile, part->link->lHash, WINHELP_GetPopupWindowInfo(hlpfile, hWnd, &mouse), SW_NORMAL); break;

1 0