September 2010 - Wine-Commits

Alexandre Julliard : server: Fix a couple of leaks in the new console code.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: 1cb09660ce20c5da26e0cfbffb6f86faa378e333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb09660ce20c5da26e0cfbff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 19 12:27:12 2010 +0200 server: Fix a couple of leaks in the new console code. --- server/console.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index 957e35f..d256ae8 100644 --- a/server/console.c +++ b/server/console.c @@ -381,7 +381,11 @@ static struct screen_buffer *create_console_output( struct console_input *consol struct screen_buffer *screen_buffer; int i; - if (!(screen_buffer = alloc_object( &screen_buffer_ops ))) return NULL; + if (!(screen_buffer = alloc_object( &screen_buffer_ops ))) + { + if (fd != -1) close( fd ); + return NULL; + } screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; screen_buffer->input = console_input; screen_buffer->cursor_size = 100; @@ -1438,7 +1442,7 @@ DECL_HANDLER(alloc_console) } close_handle( current->process, in ); } - free_console( process ); + release_object( console ); } the_end: release_object( process ); @@ -1601,6 +1605,7 @@ DECL_HANDLER(create_console_output) if (console_input_is_bare( console ) ^ (fd != -1)) { close( fd ); + release_object( console ); set_error( STATUS_INVALID_HANDLE ); return; }

1 0

André Hentschel : Wine 1.3.3 freigegeben
by Jeremy Newman Sept. 20, 2010

Sept. 20, 2010

Module: website Branch: master Commit: 5745f0e2a1e28b49755238f17b095003d42b8894 URL: http://source.winehq.org/git/website.git/?a=commit;h=5745f0e2a1e28b49755238… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 19 19:45:46 2010 +0200 Wine 1.3.3 freigegeben --- news/de/2010091801.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/de/2010091801.xml b/news/de/2010091801.xml new file mode 100644 index 0000000..6c4bfd1 --- /dev/null +++ b/news/de/2010091801.xml @@ -0,0 +1,19 @@ +<news> +<date>18. September 2010</date> +<title>Wine 1.3.3 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Unterstützung für von rechts nach links geschriebenen Text.</li> + <li>Unterstützung für CMYK JPEG Bilder.</li> + <li>Anfänge einer Game Explorer Implementierung.</li> + <li>Verbesserte 64-Bit Unterstützung in MSI.</li> + <li>Stub inetcpl Systemsteuerungs Applet.</li> + <li>Einige Fehlerbehebungen für crypto Unterstützung.</li> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.3.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.3
by Jeremy Newman Sept. 20, 2010

Sept. 20, 2010

Module: website Branch: master Commit: cfaa245684f7e9870771829b0d4f2b43518cb759 URL: http://source.winehq.org/git/website.git/?a=commit;h=cfaa245684f7e987077182… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 19 00:11:20 2010 +0200 French translation for release 1.3.3 --- news/fr/2010091801.xml | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/news/fr/2010091801.xml b/news/fr/2010091801.xml new file mode 100644 index 0000000..7236bfa --- /dev/null +++ b/news/fr/2010091801.xml @@ -0,0 +1,22 @@ +<news> +<date>18 septembre 2010</date> +<title>Sortie de Wine 1.3.3</title> +<body> + La version de développement 1.3.3 de Wine est à présent disponible. + <a href="{$root}/announce/1.3.3">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge améliorée du texte écrit de droite à gauche.</li> + <li>Support des images JPEG CMYK.</li> + <li>Implémentation préliminaire d'un explorateur de jeux.</li> + <li>Support 64 buts amélioré des MSI.</li> + <li>Ébauche d'une applet inetcpl dans le panneau de configuation.</li> + <li>Plusieurs correctifs dans le support de la cryptographie.</li> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.3.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.3
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: website Branch: master Commit: 6432a47322e321b9c6bc6af265e965cafa59b9d3 URL: http://source.winehq.org/git/website.git/?a=commit;h=6432a47322e321b9c6bc6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 18 20:04:25 2010 +0200 Wine release 1.3.3 --- news/en/2010091801.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/en/2010091801.xml b/news/en/2010091801.xml new file mode 100644 index 0000000..92abc34 --- /dev/null +++ b/news/en/2010091801.xml @@ -0,0 +1,19 @@ +<news> +<date>September 18, 2010</date> +<title>Wine 1.3.3 Released</title> +<body> + The Wine development release 1.3.3 is now available. + <a href="{$root}/announce/1.3.3">What's new</a> in this release: +<ul> + <li>Improved support for right-to-left text.</li> + <li>Support for CMYK JPEG images.</li> + <li>Beginnings of a Game Explorer implementation.</li> + <li>Improved 64-bit support in MSI.</li> + <li>Stub inetcpl control panel applet.</li> + <li>A number of fixes to crypto support.</li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.3.3 : Alexandre Julliard : Release 1.3.3
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: refs/tags/wine-1.3.3 Tag: 2682f3de5fb76ba4d6229db8ede77ce1e5d1d74c URL: http://source.winehq.org/git/wine.git/?a=tag;h=2682f3de5fb76ba4d6229db8ede7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 18 19:55:18 2010 +0200 Release 1.3.3

1 0

Alexandre Julliard : Release 1.3.3.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: e78c2117b6756c2d6ae177c98eeb58976210ca56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e78c2117b6756c2d6ae177c98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 18 19:55:17 2010 +0200 Release 1.3.3. --- ANNOUNCE | 1153 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 532 insertions(+), 641 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e78c2117b6756c2d6ae17…

1 0

Oldřich Jedlička : ddraw: Add checking of SURFACEDESC type/nullness into CreateSurface methods.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: a6c3d0d6ac2f071a673744f7472975845f073295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c3d0d6ac2f071a673744f74… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Fri Sep 17 07:31:26 2010 +0200 ddraw: Add checking of SURFACEDESC type/nullness into CreateSurface methods. --- dlls/ddraw/ddraw.c | 30 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 36 ++++++++++++++++++++++++------------ 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5449d84..7552144 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3311,6 +3311,12 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); + if(surface_desc == NULL || surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Application supplied invalid surface descriptor\n"); + return DDERR_INVALIDPARAMS; + } + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -3336,6 +3342,12 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); + if(surface_desc == NULL || surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Application supplied invalid surface descriptor\n"); + return DDERR_INVALIDPARAMS; + } + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -3372,6 +3384,12 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); + if(surface_desc == NULL || surface_desc->dwSize != sizeof(DDSURFACEDESC)) + { + WARN("Application supplied invalid surface descriptor\n"); + return DDERR_INVALIDPARAMS; + } + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -3412,6 +3430,12 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); + if(surface_desc == NULL || surface_desc->dwSize != sizeof(DDSURFACEDESC)) + { + WARN("Application supplied invalid surface descriptor\n"); + return DDERR_INVALIDPARAMS; + } + if(surface_desc->ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)) { if (TRACE_ON(ddraw)) @@ -3451,6 +3475,12 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); + if(surface_desc == NULL || surface_desc->dwSize != sizeof(DDSURFACEDESC)) + { + WARN("Application supplied invalid surface descriptor\n"); + return DDERR_INVALIDPARAMS; + } + /* Remove front buffer flag, this causes failure in v7, and its added to normal * primaries anyway. */ surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 1c219a4..93934e5 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3638,16 +3638,19 @@ static void CreateSurfaceBadCapsSizeTest(void) IDirectDrawSurface_Release(surf); hr = IDirectDraw_CreateSurface(lpDD, &ddsd_bad1, &surf, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw_CreateSurface(lpDD, &ddsd_bad2, &surf, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw_CreateSurface(lpDD, &ddsd_bad3, &surf, NULL); ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw_CreateSurface(lpDD, &ddsd_bad4, &surf, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw_CreateSurface(lpDD, NULL, &surf, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2); @@ -3658,16 +3661,19 @@ static void CreateSurfaceBadCapsSizeTest(void) IDirectDrawSurface_Release(surf); hr = IDirectDraw2_CreateSurface(dd2, &ddsd_bad1, &surf, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw2_CreateSurface(dd2, &ddsd_bad2, &surf, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw2_CreateSurface(dd2, &ddsd_bad3, &surf, NULL); ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw2_CreateSurface(dd2, &ddsd_bad4, &surf, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw2_CreateSurface(dd2, NULL, &surf, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw2_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); IDirectDraw2_Release(dd2); @@ -3680,16 +3686,19 @@ static void CreateSurfaceBadCapsSizeTest(void) IDirectDrawSurface4_Release(surf4); hr = IDirectDraw4_CreateSurface(dd4, &ddsd2_bad1, &surf4, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw4_CreateSurface(dd4, &ddsd2_bad2, &surf4, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw4_CreateSurface(dd4, &ddsd2_bad3, &surf4, NULL); ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw4_CreateSurface(dd4, &ddsd2_bad4, &surf4, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw4_CreateSurface(dd4, NULL, &surf4, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw4_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); IDirectDraw4_Release(dd4); @@ -3702,16 +3711,19 @@ static void CreateSurfaceBadCapsSizeTest(void) IDirectDrawSurface7_Release(surf7); hr = IDirectDraw7_CreateSurface(dd7, &ddsd2_bad1, &surf7, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw7_CreateSurface(dd7, &ddsd2_bad2, &surf7, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw7_CreateSurface(dd7, &ddsd2_bad3, &surf7, NULL); ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); hr = IDirectDraw7_CreateSurface(dd7, &ddsd2_bad4, &surf7, NULL); - todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", + DDERR_INVALIDPARAMS, hr); + hr = IDirectDraw7_CreateSurface(dd7, NULL, &surf7, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7_CreateSurface didn't return 0x%08x, but 0x%08x\n", DDERR_INVALIDPARAMS, hr); IDirectDraw7_Release(dd7);

1 0

Aric Stewart : quartz: Return E_OUTOFMEMORY of the StdMemAllocator is unable to allocate memory.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: ac6db331ac4d23ded42ed8fda31a518f865b3ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6db331ac4d23ded42ed8fda… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Sep 17 13:59:28 2010 -0500 quartz: Return E_OUTOFMEMORY of the StdMemAllocator is unable to allocate memory. --- dlls/quartz/memallocator.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index a1c4473..c0be482 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -802,6 +802,9 @@ static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) /* allocate memory */ This->pMemory = VirtualAlloc(NULL, (This->base.props.cbBuffer + This->base.props.cbPrefix) * This->base.props.cBuffers, MEM_COMMIT, PAGE_READWRITE); + if (!This->pMemory) + return E_OUTOFMEMORY; + for (i = This->base.props.cBuffers - 1; i >= 0; i--) { /* pbBuffer does not start at the base address, it starts at base + cbPrefix */

1 0

Jacek Caban : mshtml: Try getting window from notification callback if load group is not available in AsyncOpen .
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: e081b65aee3f521b8e0a317bb7c557eb57dbd95f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e081b65aee3f521b8e0a317bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 17 18:33:32 2010 +0200 mshtml: Try getting window from notification callback if load group is not available in AsyncOpen. --- dlls/mshtml/nsio.c | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index a157a4c..d5a32e4 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -882,27 +882,34 @@ static HTMLWindow *get_window_from_load_group(nsChannel *This) static HTMLWindow *get_channel_window(nsChannel *This) { - nsIRequestObserver *req_observer; nsIWebProgress *web_progress; nsIDOMWindow *nswindow; HTMLWindow *window; nsresult nsres; - if(!This->load_group) { - ERR("NULL load_group\n"); - return NULL; - } + if(This->load_group) { + nsIRequestObserver *req_observer; - nsres = nsILoadGroup_GetGroupObserver(This->load_group, &req_observer); - if(NS_FAILED(nsres) || !req_observer) { - ERR("GetGroupObserver failed: %08x\n", nsres); - return NULL; - } + nsres = nsILoadGroup_GetGroupObserver(This->load_group, &req_observer); + if(NS_FAILED(nsres) || !req_observer) { + ERR("GetGroupObserver failed: %08x\n", nsres); + return NULL; + } - nsres = nsIRequestObserver_QueryInterface(req_observer, &IID_nsIWebProgress, (void**)&web_progress); - nsIRequestObserver_Release(req_observer); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIWebProgress iface: %08x\n", nsres); + nsres = nsIRequestObserver_QueryInterface(req_observer, &IID_nsIWebProgress, (void**)&web_progress); + nsIRequestObserver_Release(req_observer); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIWebProgress iface: %08x\n", nsres); + return NULL; + } + }else if(This->notif_callback) { + nsres = nsIInterfaceRequestor_GetInterface(This->notif_callback, &IID_nsIWebProgress, (void**)&web_progress); + if(NS_FAILED(nsres)) { + ERR("GetInterface(IID_nsIWebProgress failed: %08x\n", nsres); + return NULL; + } + }else { + ERR("no load group nor notif callback\n"); return NULL; } @@ -1008,8 +1015,12 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen if(This->uri->window_ref && This->uri->window_ref->window) { window = This->uri->window_ref->window; IHTMLWindow2_AddRef(HTMLWINDOW2(window)); - }else if(This->load_group) { - window = get_window_from_load_group(This); + }else { + /* FIXME: Analyze removing get_window_from_load_group call */ + if(This->load_group) + window = get_window_from_load_group(This); + if(!window) + window = get_channel_window(This); if(window) set_uri_window(This->uri, window); }

1 0

Jacek Caban : mshtml: Added nsIURL::GetQuery implementation.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: ffe9cc87c0e759dffe2a19a96a1e5c7746c7ad62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe9cc87c0e759dffe2a19a96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 17 18:33:45 2010 +0200 mshtml: Added nsIURL::GetQuery implementation. --- dlls/mshtml/nsio.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d5a32e4..35a35f0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2105,14 +2105,41 @@ static nsresult NSAPI nsURL_SetParam(nsIURL *iface, const nsACString *aParam) static nsresult NSAPI nsURL_GetQuery(nsIURL *iface, nsACString *aQuery) { nsWineURI *This = NSURI_THIS(iface); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + WCHAR *ptr_end, *ptr; + char *query; + int len; TRACE("(%p)->(%p)\n", This, aQuery); if(This->nsurl) return nsIURL_GetQuery(This->nsurl, aQuery); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + url.dwExtraInfoLength = 1; + if(!InternetCrackUrlW(This->wine_url, 0, 0, &url)) { + WARN("InternetCrackUrlW failed: 0x%08x\n", GetLastError()); + nsACString_SetData(aQuery, ""); + return NS_OK; + } + + ptr_end = url.lpszExtraInfo+url.dwExtraInfoLength; + for(ptr = url.lpszExtraInfo; ptr < ptr_end; ptr++) { + if(*ptr == '#') + break; + } + + ptr = url.lpszExtraInfo; + len = WideCharToMultiByte(CP_ACP, 0, ptr, ptr_end-ptr, NULL, 0, NULL, NULL); + query = heap_alloc(len+1); + if(!query) + return NS_ERROR_OUT_OF_MEMORY; + WideCharToMultiByte(CP_ACP, 0, ptr, ptr_end-ptr, query, len, NULL, NULL); + query[len] = 0; + nsACString_SetData(aQuery, query); + + TRACE("ret %s\n", debugstr_a(query)); + heap_free(query); + return NS_OK; } static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery)

1 0