August 2011 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use task destructor for navigate_javascript task.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 3be3074fa1ebe77fe34964305226551aeeeb8707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be3074fa1ebe77fe34964305… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:35:27 2011 +0200 mshtml: Use task destructor for navigate_javascript task. --- dlls/mshtml/htmlwindow.c | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6e04612..7581337 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1679,17 +1679,33 @@ static ULONG WINAPI HTMLPrivateWindow_Release(IHTMLPrivateWindow *iface) return IHTMLWindow2_Release(&This->IHTMLWindow2_iface); } -static void handle_javascript(HTMLWindow *window, const WCHAR *code) +typedef struct { + task_t header; + HTMLWindow *window; + IUri *uri; +} navigate_javascript_task_t; + +static void navigate_javascript_proc(task_t *_task) { + navigate_javascript_task_t *task = (navigate_javascript_task_t*)_task; + HTMLWindow *window = task->window; VARIANT v; + BSTR code; HRESULT hres; static const WCHAR jscriptW[] = {'j','s','c','r','i','p','t',0}; + task->window->readystate = READYSTATE_COMPLETE; + + hres = IUri_GetPath(task->uri, &code); + if(FAILED(hres)) + return; + set_download_state(window->doc_obj, 1); V_VT(&v) = VT_EMPTY; hres = exec_script(window, code, jscriptW, &v); + SysFreeString(code); if(SUCCEEDED(hres) && V_VT(&v) != VT_EMPTY) { FIXME("javascirpt URL returned %s\n", debugstr_variant(&v)); VariantClear(&v); @@ -1701,28 +1717,12 @@ static void handle_javascript(HTMLWindow *window, const WCHAR *code) set_download_state(window->doc_obj, 0); } -typedef struct { - task_t header; - HTMLWindow *window; - IUri *uri; -} navigate_javascript_task_t; - -static void navigate_javascript_proc(task_t *_task) +static void navigate_javascript_task_destr(task_t *_task) { navigate_javascript_task_t *task = (navigate_javascript_task_t*)_task; - BSTR code; - HRESULT hres; - - task->window->readystate = READYSTATE_COMPLETE; - hres = IUri_GetPath(task->uri, &code); - if(SUCCEEDED(hres)) { - handle_javascript(task->window, code); - SysFreeString(code); - } - - IHTMLWindow2_Release(&task->window->IHTMLWindow2_iface); IUri_Release(task->uri); + heap_free(task); } typedef struct { @@ -1868,10 +1868,9 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, return E_OUTOFMEMORY; } - IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); task->window = This; task->uri = uri; - push_task(&task->header, navigate_javascript_proc, NULL, This->task_magic); + push_task(&task->header, navigate_javascript_proc, navigate_javascript_task_destr, This->task_magic); /* Why silently? */ This->readystate = READYSTATE_COMPLETE;

1 0

Jacek Caban : mshtml: Use task destructor for start_request task.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: d65758db2826e3eac3e5e78281dbc59d535a8ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65758db2826e3eac3e5e7828… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:35:47 2011 +0200 mshtml: Use task destructor for start_request task. --- dlls/mshtml/navigate.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ee6fd93..b42b372 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1224,7 +1224,14 @@ static void stop_request_proc(task_t *_task) list_remove(&task->bsc->bsc.entry); list_init(&task->bsc->bsc.entry); on_stop_nsrequest(task->bsc, S_OK); +} + +static void stop_request_task_destr(task_t *_task) +{ + stop_request_task_t *task = (stop_request_task_t*)_task; + IBindStatusCallback_Release(&task->bsc->bsc.IBindStatusCallback_iface); + heap_free(task); } static HRESULT async_stop_request(nsChannelBSC *This) @@ -1242,7 +1249,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface); task->bsc = This; - push_task(&task->header, stop_request_proc, NULL, This->bsc.doc->basedoc.doc_obj->basedoc.task_magic); + push_task(&task->header, stop_request_proc, stop_request_task_destr, This->bsc.doc->basedoc.doc_obj->basedoc.task_magic); return S_OK; }

1 0

Jacek Caban : mshtml: Use task destructor for async_doc_binding task.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 6830a3b3123214be427bb13f13bd9c19a9cfa4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6830a3b3123214be427bb13f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:36:10 2011 +0200 mshtml: Use task destructor for async_doc_binding task. --- dlls/mshtml/navigate.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index b42b372..23a7c0d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1598,7 +1598,14 @@ static void start_doc_binding_proc(task_t *_task) start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; start_binding(task->window, NULL, (BSCallback*)task->bscallback, NULL); +} + +static void start_doc_binding_task_destr(task_t *_task) +{ + start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; + IBindStatusCallback_Release(&task->bscallback->bsc.IBindStatusCallback_iface); + heap_free(task); } HRESULT async_start_doc_binding(HTMLWindow *window, nsChannelBSC *bscallback) @@ -1613,7 +1620,7 @@ HRESULT async_start_doc_binding(HTMLWindow *window, nsChannelBSC *bscallback) task->bscallback = bscallback; IBindStatusCallback_AddRef(&bscallback->bsc.IBindStatusCallback_iface); - push_task(&task->header, start_doc_binding_proc, NULL, window->task_magic); + push_task(&task->header, start_doc_binding_proc, start_doc_binding_task_destr, window->task_magic); return S_OK; }

1 0

Jacek Caban : mshtml: Use task destructor for start_binding task.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 9f77da607f46e8c0b4d87ca9fd09ab7e55cf91a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f77da607f46e8c0b4d87ca9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:36:26 2011 +0200 mshtml: Use task destructor for start_binding task. --- dlls/mshtml/nsio.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 36ffcf8..4e4e530 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -889,8 +889,14 @@ static void start_binding_proc(task_t *_task) start_binding_task_t *task = (start_binding_task_t*)_task; start_binding(NULL, task->doc, (BSCallback*)task->bscallback, NULL); +} + +static void start_binding_task_destr(task_t *_task) +{ + start_binding_task_t *task = (start_binding_task_t*)_task; - IUnknown_Release((IUnknown*)task->bscallback); + IBindStatusCallback_Release(&task->bscallback->bsc.IBindStatusCallback_iface); + heap_free(task); } static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_channel, nsIStreamListener *listener, @@ -925,7 +931,7 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan task->doc = window->doc; task->bscallback = bscallback; - push_task(&task->header, start_binding_proc, NULL, window->doc->basedoc.task_magic); + push_task(&task->header, start_binding_proc, start_binding_task_destr, window->doc->basedoc.task_magic); } return NS_OK;

1 0

Jacek Caban : mshtml: Use task destructor for set_downloading task.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 923484bd7caadfbffe03d5b880b50a6752b4c42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=923484bd7caadfbffe03d5b88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:36:41 2011 +0200 mshtml: Use task destructor for set_downloading task. --- dlls/mshtml/persist.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a8f6834..a299be2 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -166,7 +166,6 @@ static void set_downloading_proc(task_t *_task) TRACE("(%p)\n", doc); set_statustext(doc, IDS_STATUS_DOWNLOADINGFROM, task->url); - CoTaskMemFree(task->url); if(task->set_download) set_download_state(doc, 1); @@ -188,6 +187,14 @@ static void set_downloading_proc(task_t *_task) } } +static void set_downloading_task_destr(task_t *_task) +{ + download_proc_task_t *task = (download_proc_task_t*)_task; + + CoTaskMemFree(task->url); + heap_free(task); +} + void prepare_for_binding(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL navigated_binding) { HRESULT hres; @@ -303,7 +310,7 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel download_task->doc = This->doc_obj; download_task->set_download = set_download; download_task->url = url; - push_task(&download_task->header, set_downloading_proc, NULL, This->doc_obj->basedoc.task_magic); + push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, This->doc_obj->basedoc.task_magic); return S_OK; }

1 0

Jacek Caban : mshtml: Properly free tasks in remove_target_tasks.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 5150e0f0483b89379ca4ef40cb95aa39a4cbedaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5150e0f0483b89379ca4ef40c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:37:12 2011 +0200 mshtml: Properly free tasks in remove_target_tasks. --- dlls/mshtml/task.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 136561c..a38437c 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -116,15 +116,16 @@ void remove_target_tasks(LONG target) SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time - GetTickCount(), NULL); } - while(thread_data->task_queue_head - && thread_data->task_queue_head->target_magic == target) - pop_task(); + while(thread_data->task_queue_head && thread_data->task_queue_head->target_magic == target) { + iter = pop_task(); + iter->destr(iter); + } for(iter = thread_data->task_queue_head; iter; iter = iter->next) { while(iter->next && iter->next->target_magic == target) { tmp = iter->next; iter->next = tmp->next; - heap_free(tmp); + tmp->destr(tmp); } if(!iter->next)

1 0

Jacek Caban : mshtml: Removed duplicated includes.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 7891fc45d3eb3150e98fc82e89087a953ea6d197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7891fc45d3eb3150e98fc82e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:37:37 2011 +0200 mshtml: Removed duplicated includes. --- dlls/mshtml/editor.c | 1 - dlls/mshtml/hlink.c | 1 - dlls/mshtml/htmlelem.c | 1 - dlls/mshtml/htmlelem2.c | 1 - dlls/mshtml/htmlelem3.c | 1 - dlls/mshtml/htmlstyle.c | 1 - dlls/mshtml/htmlstyle2.c | 1 - dlls/mshtml/htmlstyle3.c | 1 - dlls/mshtml/htmlstylesheet.c | 1 - dlls/mshtml/ipwindow.c | 1 - dlls/mshtml/main.c | 1 - dlls/mshtml/navigate.c | 1 - dlls/mshtml/npplugin.c | 1 - dlls/mshtml/nsembed.c | 1 - dlls/mshtml/nsevents.c | 1 - dlls/mshtml/nsio.c | 1 - dlls/mshtml/nsservice.c | 1 - dlls/mshtml/olecmd.c | 1 - dlls/mshtml/persist.c | 1 - dlls/mshtml/pluginhost.c | 1 - dlls/mshtml/propbag.c | 1 - dlls/mshtml/protocol.c | 1 - dlls/mshtml/script.c | 1 - dlls/mshtml/secmgr.c | 1 - dlls/mshtml/selection.c | 1 - dlls/mshtml/txtrange.c | 1 - 26 files changed, 0 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 20d7d8f..3a8b654 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -28,7 +28,6 @@ #include "mshtmcid.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "resource.h" diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index 965318f..fd836de 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -26,7 +26,6 @@ #include "ole2.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index c4e0f0a..b2938c0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -29,7 +29,6 @@ #include "shlwapi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 7f642f9..a2b7351 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -27,7 +27,6 @@ #include "ole2.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index b23c5ad..ece779d 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -26,7 +26,6 @@ #include "ole2.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4d9300a..c835880 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -31,7 +31,6 @@ #include "htmlstyle.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index a270833..e3bd22f 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -29,7 +29,6 @@ #include "htmlstyle.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 047fed9..912d80c 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -29,7 +29,6 @@ #include "htmlstyle.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 3b6956b..3fa6c27 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -26,7 +26,6 @@ #include "ole2.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/dlls/mshtml/ipwindow.c b/dlls/mshtml/ipwindow.c index bce01eb..f4f32c7 100644 --- a/dlls/mshtml/ipwindow.c +++ b/dlls/mshtml/ipwindow.c @@ -32,7 +32,6 @@ #include "pluginhost.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 00bf0ef..a00c274 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -36,7 +36,6 @@ #include "rpcproxy.h" #include "shlguid.h" -#include "wine/unicode.h" #include "wine/debug.h" #define INIT_GUID diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 23a7c0d..0e0ea27 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -35,7 +35,6 @@ #include "shlwapi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "binding.h" diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 042478b..433ed27 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -32,7 +32,6 @@ #include "pluginhost.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 73817da..33d34b9 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -31,7 +31,6 @@ #include "shlobj.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index c3b6e95..a5b274f 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -30,7 +30,6 @@ #include "shlguid.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4e4e530..0e1a168 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -33,7 +33,6 @@ #include "shlwapi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "binding.h" diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index a2b6cab..442a73b 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -29,7 +29,6 @@ #include "ole2.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 97d2c4f..b0e40e0 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -30,7 +30,6 @@ #include "mshtmcid.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "resource.h" diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a299be2..7f974f0 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -33,7 +33,6 @@ #include "idispids.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" #include "htmlevent.h" diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 1cfae5f..8a1e6c0 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -33,7 +33,6 @@ #include "pluginhost.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c index e579c6f..f7bcf28 100644 --- a/dlls/mshtml/propbag.c +++ b/dlls/mshtml/propbag.c @@ -32,7 +32,6 @@ #include "pluginhost.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 456c3fd..0e966a7 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -29,7 +29,6 @@ #include "ole2.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 003413e..9b1a81e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -28,7 +28,6 @@ #include "ole2.h" #include "activscp.h" #include "activdbg.h" -#include "objsafe.h" #include "wine/debug.h" diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index 24fd7c2..a2005aa 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" -#include "objsafe.h" #include "activscp.h" #include "wine/debug.h" diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 1ffc567..34e3259 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -26,7 +26,6 @@ #include "ole2.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h" diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 9a542db..f70e242 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -27,7 +27,6 @@ #include "mshtmcid.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mshtml_private.h"

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: ed3c9a1ecae405f88dc6242f57d2d30581455eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3c9a1ecae405f88dc6242f5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 11:36:15 2011 +0200 Assorted spelling fixes. --- dlls/comdlg32/printdlg.c | 2 +- dlls/dinput/tests/joystick.c | 4 ++-- dlls/dinput8/tests/device.c | 2 +- dlls/msdaps/usrmarshal.c | 2 +- dlls/mshtml/nsio.c | 2 +- dlls/msxml3/tests/domdoc.c | 2 +- dlls/winealsa.drv/midi.c | 4 ++-- dlls/wineoss.drv/midi.c | 2 +- dlls/winex11.drv/dib_convert.c | 2 +- dlls/winex11.drv/dib_dst_swap.c | 2 +- dlls/winex11.drv/dib_src_swap.c | 2 +- programs/cmd/tests/test_builtins.cmd | 2 +- programs/wineconsole/winecon_private.h | 2 +- tools/winemaker | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 43967a9..b2d5331 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3363,7 +3363,7 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) HDC hdc; HBRUSH hbrush, holdbrush; pagesetup_data *data; - int papersize=0, orientation=0; /* FIXME: set this values for user paint hook */ + int papersize=0, orientation=0; /* FIXME: set these values for the user paint hook */ double scalx, scaly; if (uMsg != WM_PAINT) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 194069d..0251f35 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -395,7 +395,7 @@ static BOOL CALLBACK EnumJoysticks( } /* Check effect status. - * State: initialy stopped + * State: initially stopped * start * State: started * unacquire, acquire, download @@ -435,7 +435,7 @@ static BOOL CALLBACK EnumJoysticks( ok(IsEqualGUID(&GUID_ConstantForce, &guid), "Wrong guid returned\n"); /* Check autocenter status - * State: initialy stopped + * State: initially stopped * enable * State: enabled * acquire diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 31e2e3f..30c702f 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -296,7 +296,7 @@ static void test_action_mapping(void) hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); - /* After a succesfull action mapping we should have no devices available */ + /* After a successful action mapping we should have no devices available */ count.ndevices = 0; hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_AVAILABLEDEVICES); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 0f2517d..7b983f3 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1,5 +1,5 @@ /* - * Misc marshaling routinues + * Misc marshaling routines * * Copyright 2009 Huw Davies * diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fdfa44f..8829bf7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1538,7 +1538,7 @@ static BOOL ensure_uri_builder(nsWineURI *This) hres = CreateIUriBuilder(This->uri, 0, 0, &This->uri_builder); if(FAILED(hres)) { - WARN("CreateIUriBulder failed: %08x\n", hres); + WARN("CreateIUriBuilder failed: %08x\n", hres); return FALSE; } } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bced22c..a646501 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8499,7 +8499,7 @@ static void test_setAttributeNode(void) IXMLDOMElement_Release(elem); - /* initialy used element is released, attribute still 'has' a container */ + /* initially used element is released, attribute still 'has' a container */ hr = IXMLDOMDocument_get_documentElement(doc, &elem); ok( hr == S_OK, "got 0x%08x\n", hr); ret_attr = (void*)0xdeadbeef; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 1e5b436..ceae2d7 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -150,12 +150,12 @@ static int MIDI_AlsaToWindowsDeviceType(unsigned int type) * MOD_SQSYNTH square wave internal synth * MOD_FMSYNTH FM internal synth * MOD_MAPPER MIDI mapper - * MOD_WAVETABLE hardware watetable internal synth + * MOD_WAVETABLE hardware wavetable internal synth * MOD_SWSYNTH software internal synth */ /* FIXME Is this really the correct equivalence from ALSA to - Windows Sound type */ + Windows Sound type? */ if (type & SND_SEQ_PORT_TYPE_SYNTH) return MOD_FMSYNTH; diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 3b28213..7ca4cff 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -155,7 +155,7 @@ static int MIDI_UnixToWindowsDeviceType(int type) * MOD_SQSYNTH square wave internal synth * MOD_FMSYNTH FM internal synth * MOD_MAPPER MIDI mapper - * MOD_WAVETABLE hardware watetable internal synth + * MOD_WAVETABLE hardware wavetable internal synth * MOD_SWSYNTH software internal synth */ diff --git a/dlls/winex11.drv/dib_convert.c b/dlls/winex11.drv/dib_convert.c index c34e16c..0bca50d 100644 --- a/dlls/winex11.drv/dib_convert.c +++ b/dlls/winex11.drv/dib_convert.c @@ -1,5 +1,5 @@ /* - * DIB conversion routinues for cases where the source and destination + * DIB conversion routines for cases where the source and destination * have the same byte order. * * Copyright (C) 2001 Francois Gouget diff --git a/dlls/winex11.drv/dib_dst_swap.c b/dlls/winex11.drv/dib_dst_swap.c index cf0aa41..b81f48c 100644 --- a/dlls/winex11.drv/dib_dst_swap.c +++ b/dlls/winex11.drv/dib_dst_swap.c @@ -1,5 +1,5 @@ /* - * DIB conversion routinues for cases where the destination + * DIB conversion routines for cases where the destination * has non-native byte order. * * Copyright (C) 2003 Huw Davies diff --git a/dlls/winex11.drv/dib_src_swap.c b/dlls/winex11.drv/dib_src_swap.c index 65deed7..d260f98 100644 --- a/dlls/winex11.drv/dib_src_swap.c +++ b/dlls/winex11.drv/dib_src_swap.c @@ -1,5 +1,5 @@ /* - * DIB conversion routinues for cases where the source + * DIB conversion routines for cases where the source * has non-native byte order. * * Copyright (C) 2003 Huw Davies diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index eb79fb2..be1eead 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -530,7 +530,7 @@ mkdir foobar rd foobar echo %ErrorLevel% if not exist foobar echo dir removed -rem Removing non-existent directory +rem Removing nonexistent directory rmdir foobar echo %ErrorLevel% rem Removing single-level directories diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index ca5cb8c..951b45a 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -74,7 +74,7 @@ struct inner_data { void (*fnSetFont)(struct inner_data* data, const WCHAR* font, unsigned height, unsigned weight); void (*fnDeleteBackend)(struct inner_data* data); - void* private; /* data part belonging to the choosen backed */ + void* private; /* data part belonging to the chosen backed */ }; /* from wineconsole.c */ diff --git a/tools/winemaker b/tools/winemaker index a561076..2ee79ea 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -67,7 +67,7 @@ my $OPT_ASK_SKIP=-1; # The following constants define the architecture ## -# Default Architecture will be choosen +# Default Architecture will be chosen my $OPT_ARCH_DEFAULT=0; ##

1 0

Francois Gouget : oleaut32: Fix the spelling of an internal structure field name.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: c21bfe4479eb25da29fec1b018c2391ede8e7beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21bfe4479eb25da29fec1b01… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 11:36:33 2011 +0200 oleaut32: Fix the spelling of an internal structure field name. --- dlls/oleaut32/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 97bfef7..c67f384 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -190,7 +190,7 @@ void WINAPI BSTR_UserFree(ULONG *pFlags, BSTR *pstr) typedef struct { DWORD clSize; - DWORD rpcReserverd; + DWORD rpcReserved; USHORT vt; USHORT wReserved1; USHORT wReserved2; @@ -459,7 +459,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, header = (variant_wire_t *)Buffer; header->clSize = 0; /* fixed up at the end */ - header->rpcReserverd = 0; + header->rpcReserved = 0; header->vt = pvar->n1.n2.vt; header->wReserved1 = pvar->n1.n2.wReserved1; header->wReserved2 = pvar->n1.n2.wReserved2;

1 0

Francois Gouget : hlink: Fix the spelling of a parameter name.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 70c9510b459567851d449ca53d2768ca4aa60158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c9510b459567851d449ca53… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 11:36:46 2011 +0200 hlink: Fix the spelling of a parameter name. --- dlls/hlink/browse_ctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 2496f9a..f6735d8 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -271,7 +271,7 @@ static HRESULT WINAPI IHlinkBC_Clone( IHlinkBrowseContext* iface, } static HRESULT WINAPI IHlinkBC_Close(IHlinkBrowseContext* iface, - DWORD reserverd) + DWORD reserved) { FIXME("\n"); return E_NOTIMPL;

1 0