June 2008 - Wine-commits - list.winehq.org

Rob Shearman : ole32: Include compobj_private.h in oleobj. c to type-check the function signatures of DataAdviseHolder_OnConnect and DataAdviseHolder_OnDisconnect .
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 7302227b2e10c60b42463ae2c5febd91bc6339e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7302227b2e10c60b42463ae2c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Jun 22 09:41:19 2008 +0100 ole32: Include compobj_private.h in oleobj.c to type-check the function signatures of DataAdviseHolder_OnConnect and DataAdviseHolder_OnDisconnect. --- dlls/ole32/oleobj.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 217e01d..b01f59d 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -32,6 +32,8 @@ #include "wine/debug.h" #include "ole2.h" +#include "compobj_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(ole); #define INITIAL_SINKS 10

1 0

Rob Shearman : include: Add declarations for OleNoteObjectVisible, GetConvertStg and OleDoAutoConvert to ole2.h.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 4a8ab265c371e7bee83594f3d6defde10c5f39ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8ab265c371e7bee83594f3d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Jun 22 09:40:49 2008 +0100 include: Add declarations for OleNoteObjectVisible, GetConvertStg and OleDoAutoConvert to ole2.h. --- include/ole2.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/ole2.h b/include/ole2.h index 5617c83..a92c2f4 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -84,6 +84,7 @@ HRESULT WINAPI OleCreateLinkFromData(LPDATAOBJECT pSrcDataObj, REFIID riid, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); HRESULT WINAPI OleSetContainedObject(LPUNKNOWN pUnknown, BOOL fContained); +HRESULT WINAPI OleNoteObjectVisible(LPUNKNOWN pUnknown, BOOL fVisible); HRESULT WINAPI OleQueryLinkFromData(IDataObject* pSrcDataObject); HRESULT WINAPI OleQueryCreateFromData(LPDATAOBJECT pSrcDataObject); HRESULT WINAPI OleRun(LPUNKNOWN pUnknown); @@ -111,6 +112,7 @@ HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD render HRESULT WINAPI OleCreate(REFCLSID rclsid, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); HRESULT WINAPI OleFlushClipboard(void); +HRESULT WINAPI GetConvertStg(LPSTORAGE pStg); HRESULT WINAPI SetConvertStg(LPSTORAGE pStg, BOOL fConvert); BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, struct tagMSG* lpMsg, WORD* lpwCmd); HRESULT WINAPI OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc, @@ -154,6 +156,7 @@ typedef struct _OLESTREAM { HRESULT WINAPI OleConvertOLESTREAMToIStorage( LPOLESTREAM lpolestream, LPSTORAGE pstg, const DVTARGETDEVICE* ptd); HRESULT WINAPI OleConvertIStorageToOLESTREAM( LPSTORAGE pstg, LPOLESTREAM lpolestream); +HRESULT WINAPI OleDoAutoConvert( LPSTORAGE pStg, LPCLSID pClsidNew ); HRESULT WINAPI OleGetAutoConvert( REFCLSID clsidOld, LPCLSID pClsidNew ); HRESULT WINAPI OleSetAutoConvert( REFCLSID clsidOld, REFCLSID clsidNew );

1 0

Rob Shearman : ole32: Include enumx.h in enumx. c to get the declarations of the functions.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 2c183cba024ec5ee5af2a2246ed4b0c03ebd8f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c183cba024ec5ee5af2a2246… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Jun 22 09:39:59 2008 +0100 ole32: Include enumx.h in enumx.c to get the declarations of the functions. --- dlls/ole32/enumx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c index ea85092..2665301 100644 --- a/dlls/ole32/enumx.c +++ b/dlls/ole32/enumx.c @@ -25,12 +25,15 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" + +#include "enumx.h" + #include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -typedef struct tagEnumSTATPROPSETSTG_impl +struct tagEnumSTATPROPSETSTG_impl { const void *vtbl; LONG ref; @@ -38,7 +41,7 @@ typedef struct tagEnumSTATPROPSETSTG_impl struct list *current; ULONG elem_size; GUID riid; -} enumx_impl; +}; /************************************************************************ * enumx_QueryInterface

1 0

Rob Shearman : ole32: Include ole2.h in ole32_main. c to type-check the function signature of OleMetafilePictFromIconAndLabel.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: f91d3bbeb1232d8b44408f9e1a540f837053b51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91d3bbeb1232d8b44408f9e1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Jun 22 09:40:16 2008 +0100 ole32: Include ole2.h in ole32_main.c to type-check the function signature of OleMetafilePictFromIconAndLabel. --- dlls/ole32/ole32_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 89878b7..4c68321 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -30,6 +30,7 @@ #include "winuser.h" #include "winnls.h" #include "objbase.h" +#include "ole2.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole);

1 0

Rob Shearman : ole32: Remove unused BIGBLOCKFILE_GetSize.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 42d5b12e63cdc5e8e4a83329a4200f3be74717c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d5b12e63cdc5e8e4a83329a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Jun 22 09:40:33 2008 +0100 ole32: Remove unused BIGBLOCKFILE_GetSize. --- dlls/ole32/stg_bigblockfile.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 2c89a3d..b0e54e5 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -412,17 +412,6 @@ void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize) } /****************************************************************************** - * BIGBLOCKFILE_GetSize - * - * Returns the size of the file. - * - */ -ULARGE_INTEGER BIGBLOCKFILE_GetSize(LPBIGBLOCKFILE This) -{ - return This->filesize; -} - -/****************************************************************************** * BIGBLOCKFILE_FindPageInList [PRIVATE] * */

1 0

Gerald Pfeifer : winex11: Remove two unused parameters from BITBLT_GetSrcArea().
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 773d53d82e0533d501ce91558cfefeef81bdcb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=773d53d82e0533d501ce91558… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jun 21 20:13:00 2008 +0200 winex11: Remove two unused parameters from BITBLT_GetSrcArea(). --- dlls/winex11.drv/bitblt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index d2ff6fe..8bbc252 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -909,7 +909,7 @@ static int BITBLT_GetSrcAreaStretch( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE * pixels to Windows colors. */ static int BITBLT_GetSrcArea( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, - Pixmap pixmap, GC gc, INT xSrc, INT ySrc, RECT *visRectSrc ) + Pixmap pixmap, GC gc, RECT *visRectSrc ) { XImage *imageSrc, *imageDst; register INT x, y; @@ -1443,7 +1443,7 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT &visRectSrc, &visRectDst ); else BITBLT_GetSrcArea( physDevSrc, physDevDst, pixmaps[SRC], tmpGC, - xSrc, ySrc, &visRectSrc ); + &visRectSrc ); } if (useDst) BITBLT_GetDstArea( physDevDst, pixmaps[DST], tmpGC, &visRectDst );

1 0

Ted Percival : regedit: Interpret REG_DWORD as unsigned in editor.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 0674e619550909cf1e2d3aa492c3ddbedd2abd64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0674e619550909cf1e2d3aa49… Author: Ted Percival <ted(a)midg3t.net> Date: Sat Jun 21 22:30:33 2008 +1000 regedit: Interpret REG_DWORD as unsigned in editor. --- programs/regedit/edit.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 40a0834..5135dea 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -107,8 +107,8 @@ static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) DWORD val; if (!GetDlgItemText(hwndDlg, IDC_VALUE_DATA, buf, COUNT_OF(buf))) return FALSE; - if (!_stscanf(buf, toHex ? "%d" : "%x", &val)) return FALSE; - wsprintf(buf, toHex ? "%lx" : "%ld", val); + if (!_stscanf(buf, toHex ? "%u" : "%x", &val)) return FALSE; + wsprintf(buf, toHex ? "%x" : "%u", val); return SetDlgItemText(hwndDlg, IDC_VALUE_DATA, buf); } @@ -305,10 +305,10 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName) else error_code_messagebox(hwnd, lRet); } } else if ( type == REG_DWORD ) { - wsprintf(stringValueData, isDecimal ? "%ld" : "%lx", *((DWORD*)stringValueData)); + wsprintf(stringValueData, isDecimal ? "%u" : "%x", *((DWORD*)stringValueData)); if (DialogBox(0, MAKEINTRESOURCE(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; - if (_stscanf(stringValueData, isDecimal ? "%d" : "%x", &val)) { + if (_stscanf(stringValueData, isDecimal ? "%u" : "%x", &val)) { lRet = RegSetValueEx(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val)); if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, lRet);

1 0

Eric Pouech : winhelp: Properly quit winhelp when no file are given on command line.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: 25b79fafe335eaf58563093f3a4e493a0e2ecfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b79fafe335eaf58563093f3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 21 10:50:26 2008 +0200 winhelp: Properly quit winhelp when no file are given on command line. --- programs/winhlp32/winhelp.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 3b8f173..f5d512b 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -376,6 +376,13 @@ typedef struct WORD ofsData; } WINHELP,*LPWINHELP; +static BOOL WINHELP_HasWorkingWindow(void) +{ + if (!Globals.active_win) return FALSE; + if (Globals.active_win->next || Globals.win_list != Globals.active_win) return TRUE; + return Globals.active_win->page != NULL && Globals.active_win->page->file != NULL; +} + /****************************************************************** * WINHELP_HandleCommand * @@ -407,6 +414,7 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) { MACRO_JumpContext(ptr, "main", wh->data); } + if (!WINHELP_HasWorkingWindow()) MACRO_Exit(); break; case HELP_QUIT: MACRO_Exit(); @@ -416,9 +424,11 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) { MACRO_JumpContents(ptr, "main"); } + if (!WINHELP_HasWorkingWindow()) MACRO_Exit(); break; case HELP_HELPONHELP: MACRO_HelpOn(); + if (!WINHELP_HasWorkingWindow()) MACRO_Exit(); break; /* case HELP_SETINDEX: */ case HELP_SETCONTENTS:

1 0

Gerald Pfeifer : comctl32: tooltips: Adjust the type of three loop variables from INT to UINT.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: bc588e6a37fea72f7a39ab1d65f1f07df4449d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc588e6a37fea72f7a39ab1d6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jun 21 19:51:01 2008 +0200 comctl32: tooltips: Adjust the type of three loop variables from INT to UINT. --- dlls/comctl32/tooltips.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 48d7757..fb2191b 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -883,7 +883,7 @@ static INT TOOLTIPS_GetToolFromInfoA (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) { TTTOOL_INFO *toolPtr; - INT nTool; + UINT nTool; for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) { toolPtr = &infoPtr->tools[nTool]; @@ -910,7 +910,7 @@ static INT TOOLTIPS_GetToolFromInfoW (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) { TTTOOL_INFO *toolPtr; - INT nTool; + UINT nTool; for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) { toolPtr = &infoPtr->tools[nTool]; @@ -937,7 +937,7 @@ static INT TOOLTIPS_GetToolFromPoint (const TOOLTIPS_INFO *infoPtr, HWND hwnd, const POINT *lpPt) { TTTOOL_INFO *toolPtr; - INT nTool; + UINT nTool; for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) { toolPtr = &infoPtr->tools[nTool];

1 0

Mikołaj Zalewski : kernel32: Improve Esperanto locale definition.
by Alexandre Julliard 23 Jun '08

23 Jun '08

Module: wine Branch: master Commit: dfe4747b1e0dcbb8541c820f58daf73d846a2ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe4747b1e0dcbb8541c820f5… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jun 21 14:32:50 2008 +0200 kernel32: Improve Esperanto locale definition. --- dlls/kernel32/nls/eox.nls | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls index 4b263d8..cf4ec56 100644 --- a/dlls/kernel32/nls/eox.nls +++ b/dlls/kernel32/nls/eox.nls @@ -37,14 +37,15 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT { - LOCALE_FONTSIGNATURE L"" + /* FIXME: .NET 2.0 requires a font signature - English (US) signature added */ + LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x8000\x01ff\x003f\x8000\xffff" LOCALE_ICALENDARTYPE L"1" LOCALE_ICENTURY L"0" - LOCALE_ICOUNTRY L"" + LOCALE_ICOUNTRY L"0" LOCALE_ICURRDIGITS L"2" LOCALE_ICURRENCY L"3" LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"" + LOCALE_IDAYLZERO L"0" LOCALE_IDEFAULTANSICODEPAGE L"0" LOCALE_IDEFAULTCODEPAGE L"1" LOCALE_IDEFAULTCOUNTRY L"" @@ -113,15 +114,15 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_SENGCOUNTRY L"" LOCALE_SENGCURRNAME L"Euro" LOCALE_SENGLANGUAGE L"Esperanto" - LOCALE_SGROUPING L"0;0" - LOCALE_SINTLSYMBOL L"EMU" + LOCALE_SGROUPING L"3;0" + LOCALE_SINTLSYMBOL L"EUR" LOCALE_SISO3166CTRYNAME L"" LOCALE_SISO639LANGNAME L"eo" LOCALE_SLANGUAGE L"Esperanto" LOCALE_SLIST L";" LOCALE_SLONGDATE L"ddd, d. MMMM yyyy" LOCALE_SMONDECIMALSEP L"," - LOCALE_SMONGROUPING L"" + LOCALE_SMONGROUPING L"3;0" LOCALE_SMONTHNAME1 L"januaro" LOCALE_SMONTHNAME2 L"februaro" LOCALE_SMONTHNAME3 L"marto"

1 0