September 2007 - Wine-Commits

Lionel Debroux : setupapi: Fix HeapFree of wrong pointer (found by Smatch).
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: d7abb09b465097f1bd5b063d78f8d3fcc57c669f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7abb09b465097f1bd5b063d7… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Thu Sep 6 11:32:44 2007 +0200 setupapi: Fix HeapFree of wrong pointer (found by Smatch). --- dlls/setupapi/stringtable.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c index 7be6b18..985e777 100644 --- a/dlls/setupapi/stringtable.c +++ b/dlls/setupapi/stringtable.c @@ -86,7 +86,7 @@ StringTableInitialize(VOID) pStringTable->pSlots = MyMalloc(sizeof(TABLE_SLOT) * TABLE_DEFAULT_SIZE); if (pStringTable->pSlots == NULL) { - MyFree(pStringTable->pSlots); + MyFree(pStringTable); return NULL; } @@ -131,7 +131,7 @@ StringTableInitializeEx(DWORD dwMaxExtraDataSize, pStringTable->pSlots = MyMalloc(sizeof(TABLE_SLOT) * TABLE_DEFAULT_SIZE); if (pStringTable->pSlots == NULL) { - MyFree(pStringTable->pSlots); + MyFree(pStringTable); return NULL; }

1 0

Rob Shearman : mshtml: Implement IDM_HYPERLINK.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 1fbedd92d453bb5547f03e307cfdd767fcd3f8f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbedd92d453bb5547f03e307… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Sep 12 10:41:49 2007 +0100 mshtml: Implement IDM_HYPERLINK. --- dlls/mshtml/En.rc | 14 +++ dlls/mshtml/editor.c | 216 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 66 ++++++++++++++ dlls/mshtml/resource.h | 6 ++ 4 files changed, 302 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fbedd92d453bb5547f03…

1 0

Rob Shearman : mshtml: Implement PersistStreamInit_IsDirty when in edit mode.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 41a3b734f9468b4c3a3516eca9b8bc3d50db1d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a3b734f9468b4c3a3516eca… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Sep 12 10:42:01 2007 +0100 mshtml: Implement PersistStreamInit_IsDirty when in edit mode. --- dlls/mshtml/editor.c | 12 ++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/persist.c | 2 +- 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 43c8b38..6f202e0 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1163,3 +1163,15 @@ void init_editor(HTMLDocument *This) set_ns_fontname(This->nscontainer, "Times New Roman"); } + +HRESULT editor_is_dirty(HTMLDocument *This) +{ + PRBool modified; + + if(!This->nscontainer || !This->nscontainer->editor) + return S_FALSE; + + nsIEditor_GetDocumentModified(This->nscontainer->editor, &modified); + + return modified ? S_OK : S_FALSE; +} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1719714..79935a8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -456,6 +456,7 @@ HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*); void handle_edit_load(HTMLDocument *This); +HRESULT editor_is_dirty(HTMLDocument*); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 3b606d6..9f74c91 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -600,7 +600,7 @@ static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) TRACE("(%p)\n", This); if(This->usermode == EDITMODE) - FIXME("Unimplemented in edit mode\n"); + return editor_is_dirty(This); return S_FALSE; }

1 0

Rob Shearman : mshtml: Store the nsIEditor interface in the NSContainer object for use in implementing editor commands .
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 006d9f940d6893ebb9ff00a41433291c7bea91fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=006d9f940d6893ebb9ff00a41… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Sep 12 10:41:36 2007 +0100 mshtml: Store the nsIEditor interface in the NSContainer object for use in implementing editor commands. --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/nsembed.c | 36 ++++++++++------ dlls/mshtml/nsiface.idl | 94 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 119 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=006d9f940d6893ebb9ff0…

1 0

Rob Shearman : ole32: Fix the default unload delay to depend on the threading model of the component loaded .
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 97f389451da03e9f6d0cbb9facdda0327a66380d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f389451da03e9f6d0cbb9fa… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Sep 12 10:03:35 2007 +0100 ole32: Fix the default unload delay to depend on the threading model of the component loaded. --- dlls/ole32/compobj.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index e0bcea8..b4022e7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -182,12 +182,14 @@ struct apartment_loaded_dll struct list entry; OpenDll *dll; DWORD unload_time; + BOOL multi_threaded; }; static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r','e','a','d','W','n','d','C','l','a','s','s',' ', '0','x','#','#','#','#','#','#','#','#',' ',0}; static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, + BOOL apartment_threaded, REFCLSID rclsid, REFIID riid, void **ppv); static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay); @@ -501,6 +503,7 @@ struct host_object_params HANDLE event; /* event signalling when ready for multi-threaded case */ HRESULT hr; /* result for multi-threaded case */ IStream *stream; /* stream that the object will be marshaled into */ + BOOL apartment_threaded; /* is the component purely apartment-threaded? */ }; static HRESULT apartment_hostobject(struct apartment *apt, @@ -520,7 +523,8 @@ static HRESULT apartment_hostobject(struct apartment *apt, return REGDB_E_CLASSNOTREG; } - hr = apartment_getclassobject(apt, dllpath, &params->clsid, &params->iid, (void **)&object); + hr = apartment_getclassobject(apt, dllpath, params->apartment_threaded, + &params->clsid, &params->iid, (void **)&object); if (FAILED(hr)) return hr; @@ -678,6 +682,7 @@ static HRESULT apartment_hostobject_in_hostapt(struct apartment *apt, BOOL multi hr = CreateStreamOnHGlobal(NULL, TRUE, &params.stream); if (FAILED(hr)) return hr; + params.apartment_threaded = !multi_threaded; if (multi_threaded) { params.hr = S_OK; @@ -743,6 +748,7 @@ void apartment_joinmta(void) } static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, + BOOL apartment_threaded, REFCLSID rclsid, REFIID riid, void **ppv) { static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; @@ -781,6 +787,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, if (SUCCEEDED(hr)) { apartment_loaded_dll->unload_time = 0; + apartment_loaded_dll->multi_threaded = FALSE; hr = COMPOBJ_DllList_Add( dllpath, &apartment_loaded_dll->dll ); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, apartment_loaded_dll); @@ -796,6 +803,11 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, if (SUCCEEDED(hr)) { + /* one component being multi-threaded overrides any number of + * apartment-threaded components */ + if (!apartment_threaded) + apartment_loaded_dll->multi_threaded = TRUE; + TRACE("calling DllGetClassObject %p\n", apartment_loaded_dll->dll->DllGetClassObject); /* OK: get the ClassObject */ hr = apartment_loaded_dll->dll->DllGetClassObject(rclsid, riid, ppv); @@ -815,14 +827,24 @@ static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) { if (entry->dll->DllCanUnloadNow && (entry->dll->DllCanUnloadNow() == S_OK)) { - if (!delay || (entry->unload_time && (entry->unload_time < GetTickCount()))) + DWORD real_delay = delay; + + if (real_delay == INFINITE) + { + if (entry->multi_threaded) + real_delay = 10 * 60 * 1000; /* 10 minutes */ + else + real_delay = 0; + } + + if (!real_delay || (entry->unload_time && (entry->unload_time < GetTickCount()))) { list_remove(&entry->entry); COMPOBJ_DllList_ReleaseRef(entry->dll, TRUE); HeapFree(GetProcessHeap(), 0, entry); } else - entry->unload_time = GetTickCount() + delay; + entry->unload_time = GetTickCount() + real_delay; } else if (entry->unload_time) entry->unload_time = 0; @@ -2085,7 +2107,9 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, return REGDB_E_CLASSNOTREG; } - return apartment_getclassobject(apt, dllpath, rclsid, riid, ppv); + return apartment_getclassobject(apt, dllpath, + !strcmpiW(threading_model, wszApartment), + rclsid, riid, ppv); } /*********************************************************************** @@ -2517,14 +2541,6 @@ void WINAPI CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD dwReserved) return; } - if (dwUnloadDelay == INFINITE) - { - if (apt->multi_threaded) - dwUnloadDelay = 10 * 60 * 1000; /* 10 minutes */ - else - dwUnloadDelay = 0; - } - apartment_freeunusedlibraries(apt, dwUnloadDelay); }

1 0

Rob Shearman : ole32: Implement CoFreeUnusedLibrariesEx.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 5ffe867dc7194b7741fa9fd1aed3eb859d3a8257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffe867dc7194b7741fa9fd1a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Sep 12 10:02:08 2007 +0100 ole32: Implement CoFreeUnusedLibrariesEx. Fix CoFreeUnusedLibraries to use a delay of 10 minutes when used with multi-threaded apartments. --- dlls/ole32/compobj.c | 64 +++++++++++++++++++++++++++++++++++++++---------- dlls/ole32/ole32.spec | 1 + include/objbase.h | 1 + 3 files changed, 53 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 662b42a..e0bcea8 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -181,6 +181,7 @@ struct apartment_loaded_dll { struct list entry; OpenDll *dll; + DWORD unload_time; }; static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r','e','a','d','W','n','d','C','l','a','s','s',' ', @@ -188,7 +189,7 @@ static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r',' static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, REFCLSID rclsid, REFIID riid, void **ppv); -static void apartment_freeunusedlibraries(struct apartment *apt); +static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay); static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret); static OpenDll *COMPOBJ_DllList_Get(LPCWSTR library_name); @@ -403,7 +404,7 @@ DWORD apartment_release(struct apartment *apt) if (apt->filter) IUnknown_Release(apt->filter); /* free as many unused libraries as possible... */ - apartment_freeunusedlibraries(apt); + apartment_freeunusedlibraries(apt, 0); /* ... and free the memory for the apartment loaded dll entry and * release the dll list reference without freeing the library for the @@ -779,6 +780,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) { + apartment_loaded_dll->unload_time = 0; hr = COMPOBJ_DllList_Add( dllpath, &apartment_loaded_dll->dll ); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, apartment_loaded_dll); @@ -805,7 +807,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, return hr; } -static void apartment_freeunusedlibraries(struct apartment *apt) +static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) { struct apartment_loaded_dll *entry, *next; EnterCriticalSection(&apt->cs); @@ -813,10 +815,17 @@ static void apartment_freeunusedlibraries(struct apartment *apt) { if (entry->dll->DllCanUnloadNow && (entry->dll->DllCanUnloadNow() == S_OK)) { - list_remove(&entry->entry); - COMPOBJ_DllList_ReleaseRef(entry->dll, TRUE); - HeapFree(GetProcessHeap(), 0, entry); + if (!delay || (entry->unload_time && (entry->unload_time < GetTickCount()))) + { + list_remove(&entry->entry); + COMPOBJ_DllList_ReleaseRef(entry->dll, TRUE); + HeapFree(GetProcessHeap(), 0, entry); + } + else + entry->unload_time = GetTickCount() + delay; } + else if (entry->unload_time) + entry->unload_time = 0; } LeaveCriticalSection(&apt->cs); } @@ -2482,13 +2491,16 @@ void WINAPI CoFreeAllLibraries(void) /* NOP */ } - /*********************************************************************** - * CoFreeUnusedLibraries [OLE32.@] - * CoFreeUnusedLibraries [COMPOBJ.17] + * CoFreeUnusedLibrariesEx [OLE32.@] * - * Frees any unused libraries. Unused are identified as those that return - * S_OK from their DllCanUnloadNow function. + * Frees any previously unused libraries whose delay has expired and marks + * currently unused libraries for unloading. Unused are identified as those that + * return S_OK from their DllCanUnloadNow function. + * + * PARAMS + * dwUnloadDelay [I] Unload delay in milliseconds. + * dwReserved [I] Reserved. Set to 0. * * RETURNS * Nothing. @@ -2496,7 +2508,7 @@ void WINAPI CoFreeAllLibraries(void) * SEE ALSO * CoLoadLibrary, CoFreeAllLibraries, CoFreeLibrary */ -void WINAPI CoFreeUnusedLibraries(void) +void WINAPI CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD dwReserved) { struct apartment *apt = COM_CurrentApt(); if (!apt) @@ -2505,7 +2517,33 @@ void WINAPI CoFreeUnusedLibraries(void) return; } - apartment_freeunusedlibraries(apt); + if (dwUnloadDelay == INFINITE) + { + if (apt->multi_threaded) + dwUnloadDelay = 10 * 60 * 1000; /* 10 minutes */ + else + dwUnloadDelay = 0; + } + + apartment_freeunusedlibraries(apt, dwUnloadDelay); +} + +/*********************************************************************** + * CoFreeUnusedLibraries [OLE32.@] + * CoFreeUnusedLibraries [COMPOBJ.17] + * + * Frees any unused libraries. Unused are identified as those that return + * S_OK from their DllCanUnloadNow function. + * + * RETURNS + * Nothing. + * + * SEE ALSO + * CoLoadLibrary, CoFreeAllLibraries, CoFreeLibrary + */ +void WINAPI CoFreeUnusedLibraries(void) +{ + CoFreeUnusedLibrariesEx(INFINITE, 0); } /*********************************************************************** diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e018b0f..0b62995 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -20,6 +20,7 @@ @ stdcall CoFreeAllLibraries() @ stdcall CoFreeLibrary(long) @ stdcall CoFreeUnusedLibraries() +@ stdcall CoFreeUnusedLibrariesEx(long long) @ stdcall CoGetCallContext(ptr ptr) @ stub CoGetCallerTID @ stdcall CoGetClassObject(ptr long ptr ptr ptr) diff --git a/include/objbase.h b/include/objbase.h index 4d94c05..33fe4c9 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -329,6 +329,7 @@ HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree); void WINAPI CoFreeAllLibraries(void); void WINAPI CoFreeLibrary(HINSTANCE hLibrary); void WINAPI CoFreeUnusedLibraries(void); +void WINAPI CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD dwReserved); HRESULT WINAPI CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID iid, LPVOID *ppv); HRESULT WINAPI CoCreateInstanceEx(REFCLSID rclsid,

1 0

Alexander Nicolaysen Sørnes : wordpad: Add initial print preview support.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: cd64bf8e4d6880605dd096714dbb9e8dbc4deb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd64bf8e4d6880605dd096714… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 15:09:49 2007 +0200 wordpad: Add initial print preview support. --- programs/wordpad/De.rc | 9 ++ programs/wordpad/En.rc | 9 ++ programs/wordpad/Fr.rc | 9 ++ programs/wordpad/Hu.rc | 9 ++ programs/wordpad/Ko.rc | 9 ++ programs/wordpad/Nl.rc | 9 ++ programs/wordpad/No.rc | 9 ++ programs/wordpad/Pl.rc | 9 ++ programs/wordpad/Ru.rc | 9 ++ programs/wordpad/Tr.rc | 9 ++ programs/wordpad/resource.h | 17 +++- programs/wordpad/wordpad.c | 298 ++++++++++++++++++++++++++++++++++++++++-- 12 files changed, 389 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd64bf8e4d6880605dd09…

1 0

Alexander Nicolaysen Sørnes : wordpad: Add view options dialog.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 7fa0590e5a7d61dc8d3035c86c266ac6da9d9603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa0590e5a7d61dc8d3035c86… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 15:08:41 2007 +0200 wordpad: Add view options dialog. --- programs/wordpad/De.rc | 24 ++++ programs/wordpad/En.rc | 23 +++ programs/wordpad/Fr.rc | 24 ++++ programs/wordpad/Hu.rc | 24 ++++ programs/wordpad/Ko.rc | 24 ++++ programs/wordpad/Nl.rc | 24 ++++ programs/wordpad/No.rc | 24 ++++ programs/wordpad/Pl.rc | 24 ++++ programs/wordpad/Ru.rc | 24 ++++ programs/wordpad/Tr.rc | 24 ++++ programs/wordpad/resource.h | 19 +++- programs/wordpad/wordpad.c | 310 +++++++++++++++++++++++++++++++++++-------- 12 files changed, 514 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fa0590e5a7d61dc8d303…

1 0

Alexander Nicolaysen Sørnes : wordpad: Add support for printing a page range.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 05e6a4e60c55885624f5a47c0a4ea8c0a1c75cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e6a4e60c55885624f5a47c0… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 15:03:00 2007 +0200 wordpad: Add support for printing a page range. --- programs/wordpad/wordpad.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index de58c2f..03f9391 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -936,6 +936,7 @@ static void print(LPPRINTDLGW pd) FORMATRANGE fr; DOCINFOW di; int dpiY, dpiX, width, height; + int printedPages = 0; fr.hdc = pd->hDC; fr.hdcTarget = pd->hDC; @@ -975,6 +976,18 @@ static void print(LPPRINTDLGW pd) gt.codepage = 1200; fr.chrg.cpMin = 0; fr.chrg.cpMax = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); + + if(pd->Flags & PD_PAGENUMS) + { + int i; + for(i = 1; i <= pd->nToPage; i++) + { + if(i == pd->nFromPage) + break; + + fr.chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)&fr); + } + } } StartDocW(fr.hdc, &di); @@ -987,6 +1000,10 @@ static void print(LPPRINTDLGW pd) if(EndPage(fr.hdc) <= 0) break; + + printedPages++; + if((pd->Flags & PD_PAGENUMS) && (printedPages > (pd->nToPage - pd->nFromPage))) + break; } while(fr.chrg.cpMin < fr.chrg.cpMax); @@ -1061,7 +1078,7 @@ static void dialog_print(void) pd.hwndOwner = hMainWnd; pd.Flags = PD_RETURNDC | PD_USEDEVMODECOPIESANDCOLLATE; pd.nMinPage = 1; - pd.nMaxPage = 1; + pd.nMaxPage = -1; pd.hDevMode = devMode; pd.hDevNames = devNames;

1 0

Alexander Nicolaysen Sørnes : wordpad: Add context menu.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 5bc0dfc28c5b8c023710bb57a277a51fb1edf3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc0dfc28c5b8c023710bb57a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 15:05:23 2007 +0200 wordpad: Add context menu. --- programs/wordpad/De.rc | 13 +++++++++++++ programs/wordpad/En.rc | 13 +++++++++++++ programs/wordpad/Fr.rc | 13 +++++++++++++ programs/wordpad/Hu.rc | 13 +++++++++++++ programs/wordpad/Ko.rc | 13 +++++++++++++ programs/wordpad/Nl.rc | 13 +++++++++++++ programs/wordpad/No.rc | 13 +++++++++++++ programs/wordpad/Pl.rc | 13 +++++++++++++ programs/wordpad/Ru.rc | 14 ++++++++++++++ programs/wordpad/Tr.rc | 13 +++++++++++++ programs/wordpad/resource.h | 2 ++ programs/wordpad/wordpad.c | 31 +++++++++++++++++++++++++++++++ 12 files changed, 164 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 39ff38f..d25a034 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -81,6 +81,19 @@ BEGIN END END +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Aus&schneiden", ID_EDIT_CUT + MENUITEM "&Kopieren", ID_EDIT_COPY + MENUITEM "&Einf�gen", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&Paragraph . . ." ID_PARAFORMAT + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 835cb01..2ac43e3 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -81,6 +81,19 @@ BEGIN END END +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Cu&t", ID_EDIT_CUT + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&Paragraph . . ." ID_PARAFORMAT + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 1a0d6a2..b343de7 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -81,6 +81,19 @@ BEGIN END END +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Couper", ID_EDIT_CUT + MENUITEM "Co&pier", ID_EDIT_COPY + MENUITEM "C&oller", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&Paragraph . . ." ID_PARAFORMAT + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index e2ac6e5..142efee 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -81,6 +81,19 @@ BEGIN END END +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Kiv&�g�s\tCtrl+X", ID_EDIT_CUT + MENUITEM "M�&sol�s\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Beilleszt�s\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&Paragraph . . ." ID_PARAFORMAT + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index f51a8da..b3edd53 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -82,6 +82,19 @@ BEGIN END END +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "�߶󳻱�(&T)", ID_EDIT_CUT + MENUITEM "��(&C)", ID_EDIT_COPY + MENUITEM "�ٿ��ֱ�(&P)", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&Paragraph . . ." ID_PARAFORMAT + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "��¥�� ð�" diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 6416322..58193ef 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -81,6 +81,19 @@ BEGIN END END +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "K&nippen", ID_EDIT_CUT + MENUITEM "&Kopieren", ID_EDIT_COPY + MENUITEM "&Plakken", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&Paragraph . . ." ID_PARAFORMAT + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 5c980ce..a135909 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -81,6 +81,19 @@ BEGIN END END +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Klipp u&t" ID_EDIT_CUT + MENUITEM "&Kopier" ID_EDIT_COPY + MENUITEM "&Lim inn" ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Punktmerking" ID_BULLET + MENUITEM "&Avsnitt . . ." ID_PARAFORMAT + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dato og klokkeslett" diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 7812a79..7232aaa 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -82,6 +82,19 @@ BEGIN END END +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Wy&tnij", ID_EDIT_CUT + MENUITEM "&Kopiuj", ID_EDIT_COPY + MENUITEM "Wkl&ej", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&Paragraph . . ." ID_PARAFORMAT + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index ae43e35..78d2212 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -40,6 +40,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&��\tCtrl+X", ID_EDIT_CUT MENUITEM "&��\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Find . . .\tCrtl+F", ID_FIND MENUITEM "Find &next\tF3", ID_FIND_NEXT @@ -79,6 +80,19 @@ BEGIN END END +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&��\tCtrl+X", ID_EDIT_CUT + MENUITEM "&��\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Paste", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&Paragraph . . ." ID_PARAFORMAT + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 2cd1edf..b5e0c5e 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -84,6 +84,19 @@ BEGIN END END +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Ke&s", ID_EDIT_CUT + MENUITEM "&Kopyala", ID_EDIT_COPY + MENUITEM "Ya&p��t�r", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&Paragraph . . ." ID_PARAFORMAT + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 9264cd8..75a18e5 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -104,6 +104,8 @@ #define IDD_PARAFORMAT 2102 #define IDD_TABSTOPS 2103 +#define IDM_POPUP 2200 + #define IDB_TOOLBAR 100 #define IDB_FORMATBAR 101 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 03f9391..8b0ca5a 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -61,6 +61,7 @@ static const WCHAR var_pagemargin[] = {'P','a','g','e','M','a','r','g','i','n',0 static HWND hMainWnd; static HWND hEditorWnd; static HWND hFindWnd; +static HMENU hPopupMenu; static UINT ID_FINDMSGSTRING; @@ -1657,6 +1658,29 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP return FALSE; } +static int context_menu(LPARAM lParam) +{ + int x = (int)(short)LOWORD(lParam); + int y = (int)(short)HIWORD(lParam); + HMENU hPop = GetSubMenu(hPopupMenu, 0); + + if(x == -1) + { + int from = 0, to = 0; + POINTL pt; + SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + SendMessageW(hEditorWnd, EM_POSFROMCHAR, (WPARAM)&pt, (LPARAM)to); + ClientToScreen(hEditorWnd, (POINT*)&pt); + x = pt.x; + y = pt.y; + } + + TrackPopupMenu(hPop, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON, + x, y, 0, hMainWnd, 0); + + return 0; +} + static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) { HWND hToolBarWnd, hFormatBarWnd, hReBarWnd; @@ -2330,6 +2354,12 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_SIZE: return OnSize( hWnd, wParam, lParam ); + case WM_CONTEXTMENU: + if((HWND)wParam == hEditorWnd) + return context_menu(lParam); + else + return DefWindowProcW(hWnd, msg, wParam, lParam); + case WM_DROPFILES: { WCHAR file[MAX_PATH]; @@ -2381,6 +2411,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar set_caption(NULL); set_bar_states(); + hPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_POPUP)); HandleCommandLine(GetCommandLineW());

1 0