wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Jacek Caban : mshtml: Moved HTMLDocumentNode creating to HTMLWindow_Create.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 23891357a34d47f29e4ebb8e9de96221359dc269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23891357a34d47f29e4ebb8e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:29:36 2009 +0200 mshtml: Moved HTMLDocumentNode creating to HTMLWindow_Create. --- dlls/mshtml/htmldoc.c | 6 ++++- dlls/mshtml/htmliframe.c | 17 +------------- dlls/mshtml/htmlwindow.c | 47 +++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsembed.c | 52 ------------------------------------------ dlls/mshtml/nsevents.c | 1 - 7 files changed, 54 insertions(+), 74 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5e34ced..3e07924 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1998,7 +1998,11 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) return hres; } - update_nsdocument(doc); + if(!doc->basedoc.doc_node && doc->basedoc.window->doc) { + doc->basedoc.doc_node = doc->basedoc.window->doc; + htmldoc_addref(&doc->basedoc.doc_node->basedoc); + } + get_thread_hwnd(); return S_OK; diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 7af0070..dc514d8 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -353,9 +353,7 @@ static HRESULT WINAPI HTMLIFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, if(!This->content_window) { nsIDOMHTMLDocument *nshtmldoc; - HTMLDocumentNode *content_doc; nsIDOMDocument *nsdoc; - HTMLWindow *window; nsresult nsres; HRESULT hres; @@ -377,23 +375,10 @@ static HRESULT WINAPI HTMLIFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, return E_FAIL; } - hres = create_content_window(This, nshtmldoc, &window); - if(FAILED(hres)) { - nsIDOMHTMLDocument_Release(nshtmldoc); - return E_FAIL; - } - - hres = create_doc_from_nsdoc(nshtmldoc, This->element.node.doc->basedoc.doc_obj, window, &content_doc); + hres = create_content_window(This, nshtmldoc, &This->content_window); nsIDOMHTMLDocument_Release(nshtmldoc); - if(SUCCEEDED(hres)) - window_set_docnode(window, content_doc); - else - IHTMLWindow2_Release(HTMLWINDOW2(window)); - htmldoc_release(&content_doc->basedoc); if(FAILED(hres)) return hres; - - This->content_window = window; } IHTMLWindow2_AddRef(HTMLWINDOW2(This->content_window)); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fe7444a..91e0e34 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static struct list window_list = LIST_INIT(window_list); -void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) +static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) { if(window->doc) { window->doc->basedoc.window = NULL; @@ -45,6 +45,14 @@ void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) window->doc = doc_node; if(doc_node) htmldoc_addref(&doc_node->basedoc); + + if(window->doc_obj && window->doc_obj->basedoc.window == window) { + if(window->doc_obj->basedoc.doc_node) + htmldoc_release(&window->doc_obj->basedoc.doc_node->basedoc); + window->doc_obj->basedoc.doc_node = doc_node; + if(doc_node) + htmldoc_addref(&doc_node->basedoc); + } } #define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) @@ -1516,12 +1524,49 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->scriptmode = SCRIPTMODE_GECKO; list_init(&window->script_hosts); + update_window_doc(window); + list_add_head(&window_list, &window->entry); *ret = window; return S_OK; } +void update_window_doc(HTMLWindow *window) +{ + nsIDOMHTMLDocument *nshtmldoc; + nsIDOMDocument *nsdoc; + nsresult nsres; + + nsres = nsIDOMWindow_GetDocument(window->nswindow, &nsdoc); + if(NS_FAILED(nsres) || !nsdoc) { + ERR("GetDocument failed: %08x\n", nsres); + return; + } + + nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); + nsIDOMDocument_Release(nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMHTMLDocument iface: %08x\n", nsres); + return; + } + + if(!window->doc || window->doc->nsdoc != nshtmldoc) { + HTMLDocumentNode *doc; + HRESULT hres; + + hres = create_doc_from_nsdoc(nshtmldoc, window->doc_obj, window, &doc); + if(SUCCEEDED(hres)) { + window_set_docnode(window, doc); + htmldoc_release(&doc->basedoc); + }else { + ERR("create_doc_from_nsdoc failed: %08x\n", hres); + } + } + + nsIDOMHTMLDocument_Release(nshtmldoc); +} + HTMLWindow *nswindow_to_window(const nsIDOMWindow *nswindow) { HTMLWindow *iter; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 85421d1..8fc9b01 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -572,7 +572,7 @@ HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**); HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLWindow*,HTMLDocumentNode**); HRESULT HTMLWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLWindow**); -void window_set_docnode(HTMLWindow*,HTMLDocumentNode*); +void update_window_doc(HTMLWindow*); HTMLWindow *nswindow_to_window(const nsIDOMWindow*); HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLWindow*); HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLWindow*); @@ -647,7 +647,6 @@ void get_editor_controller(NSContainer*); void init_nsevents(NSContainer*); void add_nsevent_listener(HTMLWindow*,LPCWSTR); nsresult get_nsinterface(nsISupports*,REFIID,void**); -void update_nsdocument(HTMLDocumentObj*); void set_document_bscallback(HTMLDocument*,nsChannelBSC*); void set_current_mon(HTMLDocument*,IMoniker*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 951b04d..33bf1c1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -952,7 +952,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) /* events are reset when a new document URI is loaded, so re-initialise them here */ if(This->bsc.doc && This->bsc.doc->doc_obj->bscallback == This && This->bsc.doc->doc_obj->nscontainer) { - update_nsdocument(This->bsc.doc->doc_obj); + update_window_doc(This->bsc.doc->window); init_nsevents(This->bsc.doc->doc_obj->nscontainer); } } diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 256c09a..f6efd26 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -807,58 +807,6 @@ void set_ns_editmode(NSContainer *This) nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); } -void update_nsdocument(HTMLDocumentObj *doc) -{ - HTMLDocumentNode *doc_node; - nsIDOMHTMLDocument *nsdoc; - nsIDOMDocument *nsdomdoc; - nsresult nsres; - HRESULT hres; - - if(!doc->nscontainer || !doc->nscontainer->navigation) - return; - - nsres = nsIWebNavigation_GetDocument(doc->nscontainer->navigation, &nsdomdoc); - if(NS_FAILED(nsres) || !nsdomdoc) { - ERR("GetDocument failed: %08x\n", nsres); - return; - } - - nsres = nsIDOMDocument_QueryInterface(nsdomdoc, &IID_nsIDOMHTMLDocument, (void**)&nsdoc); - nsIDOMDocument_Release(nsdomdoc); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLDocument iface: %08x\n", nsres); - return; - } - - if(doc->basedoc.doc_node && nsdoc == doc->basedoc.doc_node->nsdoc) { - nsIDOMHTMLDocument_Release(nsdoc); - return; - } - - if(doc->basedoc.doc_node && doc->basedoc.doc_node->nsdoc) { - doc_node = doc->basedoc.doc_node; - doc_node->basedoc.doc_obj = NULL; - IHTMLDocument2_Release(HTMLDOC(&doc_node->basedoc)); - doc->basedoc.doc_node = NULL; - } - - if(!nsdoc) { - doc->basedoc.doc_node = NULL; - window_set_docnode(doc->basedoc.window, NULL); - return; - } - - hres = create_doc_from_nsdoc(nsdoc, doc, doc->basedoc.window, &doc_node); - if(FAILED(hres)) { - ERR("Could not create document: %08x\n", hres); - return; - } - - doc->basedoc.doc_node = doc_node; - window_set_docnode(doc->basedoc.window, doc_node); -} - void close_gecko(void) { TRACE("()\n"); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 2a0130a..e2758ce 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -137,7 +137,6 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event if(!This->doc) return NS_OK; - update_nsdocument(This->doc); connect_scripts(This->doc->basedoc.window); if(This->editor_controller) {

1 0

Jacek Caban : mshtml: Get rid of update_nsdocument call in SetStatus hack.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 5b5528f299b69c329a2ff5568213bee6cfe9e089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5528f299b69c329a2ff5568… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:29:01 2009 +0200 mshtml: Get rid of update_nsdocument call in SetStatus hack. --- dlls/mshtml/nsembed.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 463c4ee..256c09a 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -958,13 +958,7 @@ static nsresult NSAPI nsWebBrowserChrome_SetStatus(nsIWebBrowserChrome *iface, PRUint32 statusType, const PRUnichar *status) { NSContainer *This = NSWBCHROME_THIS(iface); - TRACE("(%p)->(%d %s)\n", This, statusType, debugstr_w(status)); - - /* FIXME: This hack should be removed when we'll load all pages by URLMoniker */ - if(This->doc) - update_nsdocument(This->doc); - return NS_OK; }

1 0

Jacek Caban : mshtml: Moved Wine[Add|Remove] Observer calls to HTMLDocumentNode constructor/destructor.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 250ec843a537bb8f620e3254fbdda70a46994f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=250ec843a537bb8f620e3254f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:28:39 2009 +0200 mshtml: Moved Wine[Add|Remove]Observer calls to HTMLDocumentNode constructor/destructor. --- dlls/mshtml/htmldoc.c | 8 +++--- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/mutation.c | 57 ++++++++++++++++++++---------------------- dlls/mshtml/nsembed.c | 2 - 4 files changed, 32 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f6cb876..5e34ced 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1769,8 +1769,10 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) detach_ranges(This); release_nodes(This); - if(This->nsdoc) + if(This->nsdoc) { + release_mutation(This); nsIDOMHTMLDocument_Release(This->nsdoc); + } destroy_htmldoc(&This->basedoc); } @@ -1811,7 +1813,6 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob doc->basedoc.doc_node = doc; doc->basedoc.doc_obj = doc_obj; - init_mutation(doc); init_dispex(&doc->node.dispex, (IUnknown*)HTMLDOMNODE(&doc->node), &HTMLDocumentNode_dispex); init_doc(&doc->basedoc, (IUnknown*)HTMLDOMNODE(&doc->node), DISPATCHEX(&doc->node.dispex)); HTMLDocumentNode_SecMgr_Init(doc); @@ -1819,6 +1820,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob nsIDOMHTMLDocument_AddRef(nsdoc); doc->nsdoc = nsdoc; + init_mutation(doc); doc->basedoc.window = window; @@ -1887,8 +1889,6 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) set_document_bscallback(&This->basedoc, NULL); set_current_mon(&This->basedoc, NULL); if(This->basedoc.doc_node) { - if(This->basedoc.doc_node->nsdoc) - remove_mutation_observer(This->basedoc.doc_node); This->basedoc.doc_node->basedoc.doc_obj = NULL; IHTMLDocument2_Release(HTMLDOC(&This->basedoc.doc_node->basedoc)); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 92688e1..85421d1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -601,8 +601,7 @@ NSContainer *NSContainer_Create(HTMLDocumentObj*,NSContainer*); void NSContainer_Release(NSContainer*); void init_mutation(HTMLDocumentNode*); -void set_mutation_observer(HTMLDocumentNode*); -void remove_mutation_observer(HTMLDocumentNode*); +void release_mutation(HTMLDocumentNode*); void HTMLDocument_LockContainer(HTMLDocumentObj*,BOOL); void show_context_menu(HTMLDocumentObj*,DWORD,POINT*,IDispatch*); diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index f2c510a..20ef121 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -40,36 +40,6 @@ enum { MUTATION_SCRIPT }; -void set_mutation_observer(HTMLDocumentNode *doc) -{ - nsIDOMNSDocument *nsdoc; - nsresult nsres; - - nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); - return; - } - - nsIDOMNSDocument_WineAddObserver(nsdoc, NSDOCOBS(doc)); - nsIDOMNSDocument_Release(nsdoc); -} - -void remove_mutation_observer(HTMLDocumentNode *doc) -{ - nsIDOMNSDocument *nsdoc; - nsresult nsres; - - nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); - return; - } - - nsIDOMNSDocument_WineRemoveObserver(nsdoc, NSDOCOBS(doc)); - nsIDOMNSDocument_Release(nsdoc); -} - #define IE_MAJOR_VERSION 7 #define IE_MINOR_VERSION 0 @@ -612,6 +582,33 @@ static const nsIDocumentObserverVtbl nsDocumentObserverVtbl = { void init_mutation(HTMLDocumentNode *doc) { + nsIDOMNSDocument *nsdoc; + nsresult nsres; + doc->lpIDocumentObserverVtbl = &nsDocumentObserverVtbl; doc->lpIRunnableVtbl = &nsRunnableVtbl; + + nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); + return; + } + + nsIDOMNSDocument_WineAddObserver(nsdoc, NSDOCOBS(doc)); + nsIDOMNSDocument_Release(nsdoc); +} + +void release_mutation(HTMLDocumentNode *doc) +{ + nsIDOMNSDocument *nsdoc; + nsresult nsres; + + nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); + return; + } + + nsIDOMNSDocument_WineRemoveObserver(nsdoc, NSDOCOBS(doc)); + nsIDOMNSDocument_Release(nsdoc); } diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 565b688..463c4ee 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -838,7 +838,6 @@ void update_nsdocument(HTMLDocumentObj *doc) if(doc->basedoc.doc_node && doc->basedoc.doc_node->nsdoc) { doc_node = doc->basedoc.doc_node; - remove_mutation_observer(doc_node); doc_node->basedoc.doc_obj = NULL; IHTMLDocument2_Release(HTMLDOC(&doc_node->basedoc)); doc->basedoc.doc_node = NULL; @@ -856,7 +855,6 @@ void update_nsdocument(HTMLDocumentObj *doc) return; } - set_mutation_observer(doc_node); doc->basedoc.doc_node = doc_node; window_set_docnode(doc->basedoc.window, doc_node); }

1 0

Jacek Caban : mshtml: Moved nsIDocumentObserver implementation to HTMLDocumentNode object.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 5894e3be7524a93e693ecb24ccb0fb0d9188c990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5894e3be7524a93e693ecb24c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:28:09 2009 +0200 mshtml: Moved nsIDocumentObserver implementation to HTMLDocumentNode object. --- dlls/mshtml/htmldoc.c | 3 +- dlls/mshtml/mshtml_private.h | 37 +++++++-------- dlls/mshtml/mutation.c | 102 +++++++++++++++++++++-------------------- dlls/mshtml/nsembed.c | 7 +-- 4 files changed, 74 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5894e3be7524a93e693ec…

1 0

Jacek Caban : mshtml: Moved nsdoc to HTMLDocumentNode object.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: f9eff688918f68ae4eb793032474e69dfa689f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9eff688918f68ae4eb793032… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:27:42 2009 +0200 mshtml: Moved nsdoc to HTMLDocumentNode object. --- dlls/mshtml/editor.c | 6 ++-- dlls/mshtml/htmlbody.c | 4 +- dlls/mshtml/htmlcurstyle.c | 4 +- dlls/mshtml/htmldoc.c | 67 +++++++++++++++++++++-------------------- dlls/mshtml/htmldoc3.c | 18 +++++----- dlls/mshtml/htmldoc5.c | 8 ++-- dlls/mshtml/htmlelem.c | 14 ++++---- dlls/mshtml/htmlevent.c | 4 +- dlls/mshtml/htmloption.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 6 ++-- dlls/mshtml/nsembed.c | 9 ++--- dlls/mshtml/nsevents.c | 4 +- dlls/mshtml/persist.c | 6 ++-- dlls/mshtml/selection.c | 4 +- dlls/mshtml/txtrange.c | 8 ++-- 16 files changed, 84 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9eff688918f68ae4eb79…

1 0

Eric Pouech : winmm: Create a real function for MMSYSTEM.timeGetTime.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 3abaed0f22fb8a0beec7df511738a14255ba25b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abaed0f22fb8a0beec7df511… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Oct 21 21:00:56 2009 +0200 winmm: Create a real function for MMSYSTEM.timeGetTime. --- dlls/winmm/mmsystem.c | 8 ++++++++ dlls/winmm/mmsystem.spec | 2 +- dlls/winmm/time.c | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index d560773..d3214f7 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -2509,6 +2509,14 @@ MMRESULT16 WINAPI timeEndPeriod16(UINT16 wPeriod) return timeEndPeriod(wPeriod); } +/************************************************************************** + * timeGetTime [MMSYSTEM.607] + */ +DWORD WINAPI timeGetTime16(void) +{ + return timeGetTime(); +} + /* ################################################### * # JOYSTICK # * ################################################### diff --git a/dlls/winmm/mmsystem.spec b/dlls/winmm/mmsystem.spec index 516f027..66d1e9b 100644 --- a/dlls/winmm/mmsystem.spec +++ b/dlls/winmm/mmsystem.spec @@ -103,7 +103,7 @@ 604 pascal timeGetDevCaps(ptr word) timeGetDevCaps16 605 pascal timeBeginPeriod(word) timeBeginPeriod16 606 pascal timeEndPeriod(word) timeEndPeriod16 -607 pascal timeGetTime() timeGetTime +607 pascal timeGetTime() timeGetTime16 701 pascal mciSendCommand(word word long long) mciSendCommand16 702 pascal mciSendString(str ptr word word) mciSendString16 703 pascal mciGetDeviceID(ptr) mciGetDeviceID16 diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index fcf31f0..85577c2 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -438,7 +438,6 @@ MMRESULT WINAPI timeEndPeriod(UINT wPeriod) } /************************************************************************** - * timeGetTime [MMSYSTEM.607] * timeGetTime [WINMM.@] */ DWORD WINAPI timeGetTime(void)

1 0

Ken Thomases : msacm32.drv: Don't access uninitialized memory.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: 0377c0d3e8020389c89e21d605e537186f6563c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0377c0d3e8020389c89e21d60… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 21 10:05:15 2009 -0500 msacm32.drv: Don't access uninitialized memory. --- dlls/msacm32.drv/wavemap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 556b0c0..1faf7d2 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -673,7 +673,7 @@ static void CALLBACK widCallback(HWAVEIN hWave, UINT uMsg, DWORD_PTR dwInstance, return; } - if (hWave != wim->u.in.hInnerWave && uMsg != WIM_OPEN) + if (uMsg != WIM_OPEN && hWave != wim->u.in.hInnerWave) ERR("Shouldn't happen (%p %p)\n", hWave, wim->u.in.hInnerWave); switch (uMsg) {

1 0

Alexandre Julliard : kernel32: Make sure the 32/ 64-bit state of the wineprefix matches the binary we are running.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: f86d10ffb6a36073786f1beb4a764348dbde8bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86d10ffb6a36073786f1beb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 18:03:32 2009 +0200 kernel32: Make sure the 32/64-bit state of the wineprefix matches the binary we are running. --- dlls/kernel32/process.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7f0a218..f867cc9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -906,10 +906,15 @@ static void start_wineboot( HANDLE handles[2] ) } if (GetLastError() != ERROR_ALREADY_EXISTS) /* we created it */ { - static const WCHAR command_line[] = {'\\','w','i','n','e','b','o','o','t','.','e','x','e',' ','-','-','i','n','i','t',0}; + static const WCHAR wineboot[] = {'\\','w','i','n','e','b','o','o','t','.','e','x','e',0}; + static const WCHAR args[] = {' ','-','-','i','n','i','t',0}; + const DWORD expected_type = (sizeof(void*) > sizeof(int) || is_wow64) ? + SCS_64BIT_BINARY : SCS_32BIT_BINARY; STARTUPINFOW si; PROCESS_INFORMATION pi; - WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; + DWORD type; + void *redir; + WCHAR cmdline[MAX_PATH + (sizeof(wineboot) + sizeof(args)) / sizeof(WCHAR)]; memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); @@ -919,7 +924,21 @@ static void start_wineboot( HANDLE handles[2] ) si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); GetSystemDirectoryW( cmdline, MAX_PATH ); - lstrcatW( cmdline, command_line ); + lstrcatW( cmdline, wineboot ); + + Wow64DisableWow64FsRedirection( &redir ); + if (GetBinaryTypeW( cmdline, &type ) && type != expected_type) + { + if (type == SCS_64BIT_BINARY) + MESSAGE( "wine: '%s' is a 64-bit prefix, it cannot be used with 32-bit Wine.\n", + wine_get_config_dir() ); + else + MESSAGE( "wine: '%s' is a 32-bit prefix, it cannot be used with %s Wine.\n", + wine_get_config_dir(), is_wow64 ? "wow64" : "64-bit" ); + ExitProcess( 1 ); + } + + lstrcatW( cmdline, args ); if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) { TRACE( "started wineboot pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); @@ -932,6 +951,7 @@ static void start_wineboot( HANDLE handles[2] ) CloseHandle( handles[0] ); handles[0] = 0; } + Wow64RevertWow64FsRedirection( redir ); } }

1 0

Alexandre Julliard : kernel32: Return the appropriate binary type for 64-bit PE files.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: 11b0b0658d888a7fadc79a5102b7798e6c1953f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b0b0658d888a7fadc79a510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 18:02:30 2009 +0200 kernel32: Return the appropriate binary type for 64-bit PE files. --- dlls/kernel32/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 05d5add..8b5231b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -443,7 +443,7 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType ) break; } case BINARY_PE: - *lpBinaryType = SCS_32BIT_BINARY; + *lpBinaryType = (binary_type & BINARY_FLAG_64BIT) ? SCS_64BIT_BINARY : SCS_32BIT_BINARY; ret = TRUE; break; case BINARY_WIN16:

1 0

Dan Kegel : kernel32: Fix two little leaks in heap test.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: 4696a53679cdaabd858f51d214c6fbd024e5d975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4696a53679cdaabd858f51d21… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Oct 21 05:57:26 2009 -0700 kernel32: Fix two little leaks in heap test. Found by valgrind. --- dlls/kernel32/tests/heap.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index c59d304..56f9744 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -72,6 +72,7 @@ static void test_heap(void) /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); ok(mem != NULL, "memory not allocated for size 0\n"); + HeapFree(GetProcessHeap(), 0, mem); mem = HeapReAlloc(GetProcessHeap(), 0, NULL, 10); ok(mem == NULL, "memory allocated by HeapReAlloc\n"); @@ -249,6 +250,8 @@ static void test_heap(void) "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } + GlobalFree(gbl); + /* ####################################### */ /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009