July 2012 - Wine-commits - list.winehq.org

Łukasz Wojniłowicz : Polish translation for release 1.5.8
by Jeremy Newman 16 Jul '12

16 Jul '12

Module: website Branch: master Commit: 3e5c4c952e996cd37f25d33800c6b570a638c9c3 URL: http://source.winehq.org/git/website.git/?a=commit;h=3e5c4c952e996cd37f25d3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Jul 15 10:25:51 2012 +0200 Polish translation for release 1.5.8 --- news/pl/2012070301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012070301.xml b/news/pl/2012070301.xml new file mode 100644 index 0000000..e22d3e9 --- /dev/null +++ b/news/pl/2012070301.xml @@ -0,0 +1,17 @@ +<news> +<date>Lipiec 3, 2012</date> +<title>Wydano Wine 1.5.8</title> +<body> + Wydanie rozwojowe Wine 1.5.8 jest już dostępne. + <a href="{$root}/announce/1.5.8">Co nowego</a> w tym wydaniu: +<ul> + <li>Większa funkcjonalność strumieni w bibliotece uruchomieniowej C++.</li> + <li>Kilka usprawnień w kodekach Windowsa.</li> + <li>Więcej klas i właściwości WBEM.</li> + <li>Kilka poprawek w pomocy HTML.</li> + <li>Wsparcie dla drukowania fałszywych czcionek z kursywą.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.8.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Nikolay Sivov : ole32: Simplify storage root entry name initialization.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 08303391e91deefbf6785ca202d653f638910eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08303391e91deefbf6785ca20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 13 12:01:53 2012 +0400 ole32: Simplify storage root entry name initialization. --- dlls/ole32/storage32.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 47341f7..584f492 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -65,8 +65,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); static const BYTE STORAGE_magic[8] ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1}; static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d}; -static const char rootEntryName[] = "Root Entry"; - /**************************************************************************** * Storage32InternalImpl definitions. * @@ -2874,21 +2872,21 @@ static HRESULT StorageImpl_Construct( */ if (create) { + static const WCHAR rootentryW[] = {'R','o','o','t',' ','E','n','t','r','y',0}; DirEntry rootEntry; /* * Initialize the directory table */ memset(&rootEntry, 0, sizeof(rootEntry)); - MultiByteToWideChar( CP_ACP, 0, rootEntryName, -1, rootEntry.name, - sizeof(rootEntry.name)/sizeof(WCHAR) ); - rootEntry.sizeOfNameString = (strlenW(rootEntry.name)+1) * sizeof(WCHAR); + strcpyW(rootEntry.name, rootentryW); + rootEntry.sizeOfNameString = sizeof(rootentryW); rootEntry.stgType = STGTY_ROOT; - rootEntry.leftChild = DIRENTRY_NULL; - rootEntry.rightChild = DIRENTRY_NULL; + rootEntry.leftChild = DIRENTRY_NULL; + rootEntry.rightChild = DIRENTRY_NULL; rootEntry.dirRootEntry = DIRENTRY_NULL; rootEntry.startingBlock = BLOCK_END_OF_CHAIN; - rootEntry.size.u.HighPart = 0; - rootEntry.size.u.LowPart = 0; + rootEntry.size.u.HighPart = 0; + rootEntry.size.u.LowPart = 0; StorageImpl_WriteDirEntry(This, 0, &rootEntry); }

1 0

Nikolay Sivov : ole32: COM cleanup for IStorage interface of base storage implementation.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 0c658860b12213d4ce6d972cde27398da5398e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c658860b12213d4ce6d972cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 13 14:37:58 2012 +0400 ole32: COM cleanup for IStorage interface of base storage implementation. --- dlls/ole32/stg_prop.c | 2 +- dlls/ole32/storage32.c | 135 +++++++++++++++++++++-------------------------- dlls/ole32/storage32.h | 16 ++---- 3 files changed, 66 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c658860b12213d4ce6d9…

1 0

Henri Verbeet : ddraw: Get rid of the "tex_root" hack.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 46a9a7e54814a28cb57a5ed3675bcef909cdf8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a9a7e54814a28cb57a5ed36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 13 12:53:07 2012 +0200 ddraw: Get rid of the "tex_root" hack. --- dlls/ddraw/ddraw.c | 13 +++++-------- dlls/ddraw/ddraw_private.h | 3 --- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7b72e5e..838652f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3093,11 +3093,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, /* Create a WineD3DTexture if a texture was requested */ if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) - { - ddraw->tex_root = object; ddraw_surface_create_texture(object); - ddraw->tex_root = NULL; - } return hr; } @@ -5364,15 +5360,16 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) { - struct ddraw *ddraw = ddraw_from_device_parent(device_parent); + struct ddraw_surface *tex_root = container_parent; struct ddraw_surface *surf = NULL; + DDSCAPS2 searchcaps; UINT i = 0; - DDSCAPS2 searchcaps = ddraw->tex_root->surface_desc.ddsCaps; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" "\tpool %#x, level %u, face %u, surface %p.\n", device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + searchcaps = tex_root->surface_desc.ddsCaps; searchcaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; switch (face) { @@ -5382,7 +5379,7 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ { searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; } - surf = ddraw->tex_root; break; + surf = tex_root; break; case WINED3D_CUBEMAP_FACE_NEGATIVE_X: TRACE("Asked for negative x\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEX; break; @@ -5405,7 +5402,7 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ if (!surf) { IDirectDrawSurface7 *attached; - IDirectDrawSurface7_GetAttachedSurface(&ddraw->tex_root->IDirectDrawSurface7_iface, &searchcaps, &attached); + IDirectDrawSurface7_GetAttachedSurface(&tex_root->IDirectDrawSurface7_iface, &searchcaps, &attached); surf = unsafe_impl_from_IDirectDrawSurface7(attached); IDirectDrawSurface7_Release(attached); } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0688d07..563377f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -92,9 +92,6 @@ struct ddraw HWND devicewindow; HWND dest_window; - /* Helpers for surface creation */ - struct ddraw_surface *tex_root; - /* For the dll unload cleanup code */ struct list ddraw_list_entry; /* The surface list - can't relay this to WineD3D

1 0

Henri Verbeet : ddraw: Get rid of some redundant TRACE_ON invocations.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: d4fa0d8de292db5c25563646a8797e0d0c2b7ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fa0d8de292db5c25563646a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 13 12:53:08 2012 +0200 ddraw: Get rid of some redundant TRACE_ON invocations. --- dlls/ddraw/surface.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3f9f78f..bb594be 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -712,14 +712,11 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa surf = This->complex_array[i]; if(!surf) break; - if (TRACE_ON(ddraw)) - { - TRACE("Surface: (%p) caps: %x,%x,%x,%x\n", surf, - surf->surface_desc.ddsCaps.dwCaps, - surf->surface_desc.ddsCaps.dwCaps2, - surf->surface_desc.ddsCaps.dwCaps3, - surf->surface_desc.ddsCaps.dwCaps4); - } + TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + surf->surface_desc.ddsCaps.dwCaps, + surf->surface_desc.ddsCaps.dwCaps2, + surf->surface_desc.ddsCaps.dwCaps3, + surf->surface_desc.ddsCaps.dwCaps4); if (((surf->surface_desc.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && ((surf->surface_desc.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) { @@ -745,14 +742,11 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa while( (surf = surf->next_attached) ) { - if (TRACE_ON(ddraw)) - { - TRACE("Surface: (%p) caps: %x,%x,%x,%x\n", surf, - surf->surface_desc.ddsCaps.dwCaps, - surf->surface_desc.ddsCaps.dwCaps2, - surf->surface_desc.ddsCaps.dwCaps3, - surf->surface_desc.ddsCaps.dwCaps4); - } + TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + surf->surface_desc.ddsCaps.dwCaps, + surf->surface_desc.ddsCaps.dwCaps2, + surf->surface_desc.ddsCaps.dwCaps3, + surf->surface_desc.ddsCaps.dwCaps4); if (((surf->surface_desc.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && ((surf->surface_desc.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) {

1 0

Henri Verbeet : ddraw: Create texture surfaces from device_parent_create_texture_surface().
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: e5bb2e7d8bcaf4bf1d1da28773ba19686232aeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5bb2e7d8bcaf4bf1d1da2877… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 13 12:53:09 2012 +0200 ddraw: Create texture surfaces from device_parent_create_texture_surface(). Instead of creating them in advance and hoping we can find them back later. --- dlls/ddraw/ddraw.c | 246 ++++++++++++++++++-------------------------------- dlls/ddraw/surface.c | 39 ++++++++- 2 files changed, 124 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5bb2e7d8bcaf4bf1d1da…

1 0

Henri Verbeet : winex11: Simplify the XRandR mode matching code a bit.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 92e04256a91b77483cfa7dd6ca17459091046862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e04256a91b77483cfa7dd6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 13 12:53:10 2012 +0200 winex11: Simplify the XRandR mode matching code a bit. --- dlls/winex11.drv/xrandr.c | 130 +++++++++++++++++++-------------------------- 1 files changed, 54 insertions(+), 76 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 83137a4..dfe392e 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -50,12 +50,8 @@ MAKE_FUNCPTR(XRRSizes) extern int usexrandr; static struct x11drv_mode_info *dd_modes; -static unsigned int dd_mode_count; -static XRRScreenSize *real_xrandr_sizes; -static short **real_xrandr_rates; -static int real_xrandr_sizes_count; -static int *real_xrandr_rates_count; -static unsigned int real_xrandr_modes_count; +static SizeID *xrandr_modes; +static unsigned int xrandr_mode_count; static int load_xrandr(void) { @@ -112,15 +108,13 @@ static int X11DRV_XRandR_GetCurrentMode(void) rate = pXRRConfigCurrentRate (sc); pXRRFreeScreenConfigInfo(sc); wine_tsx11_unlock(); - for (i = 0; i < real_xrandr_modes_count; i++) + for (i = 0; i < xrandr_mode_count; ++i) { - if ( (dd_modes[i].width == real_xrandr_sizes[size].width ) && - (dd_modes[i].height == real_xrandr_sizes[size].height) && - (dd_modes[i].refresh_rate == rate ) ) - { - res = i; - break; - } + if (xrandr_modes[i] == size && dd_modes[i].refresh_rate == rate) + { + res = i; + break; + } } if (res == -1) { @@ -136,52 +130,28 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode) Rotation rot; Window root; XRRScreenConfiguration *sc; - Status stat = RRSetConfigSuccess; + Status stat; short rate; - unsigned int i; - int j; wine_tsx11_lock(); root = RootWindow (gdi_display, DefaultScreen(gdi_display)); sc = pXRRGetScreenInfo (gdi_display, root); size = pXRRConfigCurrentConfiguration (sc, &rot); - mode = mode%real_xrandr_modes_count; + mode = mode % xrandr_mode_count; TRACE("Changing Resolution to %dx%d @%d Hz\n", dd_modes[mode].width, dd_modes[mode].height, dd_modes[mode].refresh_rate); - for (i = 0; i < real_xrandr_sizes_count; i++) - { - if ( (dd_modes[mode].width == real_xrandr_sizes[i].width ) && - (dd_modes[mode].height == real_xrandr_sizes[i].height) ) - { - size = i; - if (real_xrandr_rates_count[i]) - { - for (j=0; j < real_xrandr_rates_count[i]; j++) - { - if (dd_modes[mode].refresh_rate == real_xrandr_rates[i][j]) - { - rate = real_xrandr_rates[i][j]; - TRACE("Resizing X display to %dx%d @%d Hz\n", - dd_modes[mode].width, dd_modes[mode].height, rate); - stat = pXRRSetScreenConfigAndRate (gdi_display, sc, root, - size, rot, rate, CurrentTime); - break; - } - } - } - else - { - TRACE("Resizing X display to %dx%d <default Hz>\n", - dd_modes[mode].width, dd_modes[mode].height); - stat = pXRRSetScreenConfig (gdi_display, sc, root, size, rot, CurrentTime); - } - break; - } - } + size = xrandr_modes[mode]; + rate = dd_modes[mode].refresh_rate; + + if (rate) + stat = pXRRSetScreenConfigAndRate( gdi_display, sc, root, size, rot, rate, CurrentTime ); + else + stat = pXRRSetScreenConfig( gdi_display, sc, root, size, rot, CurrentTime ); + pXRRFreeScreenConfigInfo(sc); wine_tsx11_unlock(); if (stat == RRSetConfigSuccess) @@ -196,30 +166,29 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode) static void xrandr_init_modes(void) { + XRRScreenSize *sizes; + int sizes_count; int i, j, nmodes = 0; - real_xrandr_sizes = pXRRSizes( gdi_display, DefaultScreen(gdi_display), &real_xrandr_sizes_count); - if (real_xrandr_sizes_count <= 0) return; + sizes = pXRRSizes( gdi_display, DefaultScreen(gdi_display), &sizes_count ); + if (sizes_count <= 0) return; - TRACE("XRandR: found %u sizes.\n", real_xrandr_sizes_count); - real_xrandr_rates = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(short *) * real_xrandr_sizes_count ); - real_xrandr_rates_count = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(int) * real_xrandr_sizes_count ); - for (i = 0; i < real_xrandr_sizes_count; ++i) + TRACE("XRandR: found %d sizes.\n", sizes_count); + for (i = 0; i < sizes_count; ++i) { - real_xrandr_rates[i] = pXRRRates( gdi_display, DefaultScreen(gdi_display), - i, &real_xrandr_rates_count[i] ); - TRACE("- at %d: %dx%d (%d rates):", i, real_xrandr_sizes[i].width, - real_xrandr_sizes[i].height, real_xrandr_rates_count[i]); - if (real_xrandr_rates_count[i]) + int rates_count; + short *rates; + + rates = pXRRRates( gdi_display, DefaultScreen(gdi_display), i, &rates_count ); + TRACE("- at %d: %dx%d (%d rates):", i, sizes[i].width, sizes[i].height, rates_count); + if (rates_count) { - nmodes += real_xrandr_rates_count[i]; - for (j = 0; j < real_xrandr_rates_count[i]; ++j) + nmodes += rates_count; + for (j = 0; j < rates_count; ++j) { if (j > 0) TRACE(","); - TRACE(" %d", real_xrandr_rates[i][j]); + TRACE(" %d", rates[j]); } } else @@ -230,37 +199,46 @@ static void xrandr_init_modes(void) TRACE(" Hz\n"); } - real_xrandr_modes_count = nmodes; TRACE("XRandR modes: count=%d\n", nmodes); + if (!(xrandr_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr_modes) * nmodes ))) + { + ERR("Failed to allocate xrandr mode info array.\n"); + return; + } + dd_modes = X11DRV_Settings_SetHandlers( "XRandR", X11DRV_XRandR_GetCurrentMode, X11DRV_XRandR_SetCurrentMode, nmodes, 1 ); - for (i = 0; i < real_xrandr_sizes_count; ++i) + xrandr_mode_count = 0; + for (i = 0; i < sizes_count; ++i) { - if (real_xrandr_rates_count[i]) + int rates_count; + short *rates; + + rates = pXRRRates( gdi_display, DefaultScreen(gdi_display), i, &rates_count ); + + if (rates_count) { - for (j = 0; j < real_xrandr_rates_count[i]; ++j) + for (j = 0; j < rates_count; ++j) { - X11DRV_Settings_AddOneMode( real_xrandr_sizes[i].width, - real_xrandr_sizes[i].height, - 0, real_xrandr_rates[i][j] ); + X11DRV_Settings_AddOneMode( sizes[i].width, sizes[i].height, 0, rates[j] ); + xrandr_modes[xrandr_mode_count++] = i; } } else { - X11DRV_Settings_AddOneMode( real_xrandr_sizes[i].width, - real_xrandr_sizes[i].height, - 0, 0 ); + X11DRV_Settings_AddOneMode( sizes[i].width, sizes[i].height, 0, 0 ); + xrandr_modes[xrandr_mode_count++] = i; } } X11DRV_Settings_AddDepthModes(); - dd_mode_count = X11DRV_Settings_GetModeCount(); + nmodes = X11DRV_Settings_GetModeCount(); - TRACE("Available DD modes: count=%d\n", dd_mode_count); + TRACE("Available DD modes: count=%d\n", nmodes); TRACE("Enabling XRandR\n"); }

1 0

Henri Verbeet : winex11: Fix the virtual desktop check in update_desktop_fullscreen().
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 401d12085bc897e973badee3260aa41389c63c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=401d12085bc897e973badee32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 13 12:53:11 2012 +0200 winex11: Fix the virtual desktop check in update_desktop_fullscreen(). --- dlls/winex11.drv/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 81a64b1..c75c54c 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -208,7 +208,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) Display *display = thread_display(); XEvent xev; - if (!display || root_window != DefaultRootWindow( display )) return; + if (!display || root_window == DefaultRootWindow( display )) return; xev.xclient.type = ClientMessage; xev.xclient.window = root_window;

1 0

Jacek Caban : mshtml: Use proper task_magic in async_open.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 35710be1284f3d9be1668ebb1306ea3a79862d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35710be1284f3d9be1668ebb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:44:24 2012 +0200 mshtml: Use proper task_magic in async_open. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 483f41d..b2a8aaa 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1027,7 +1027,7 @@ static nsresult async_open(nsChannel *This, HTMLOuterWindow *window, BOOL is_doc task->window = window->base.inner_window; task->bscallback = bscallback; - push_task(&task->header, start_binding_proc, start_binding_task_destr, window->base.inner_window->doc->basedoc.task_magic); + push_task(&task->header, start_binding_proc, start_binding_task_destr, window->base.inner_window->task_magic); } return NS_OK;

1 0

Jacek Caban : mshtml: Get rid of no longer needed support for new window navigation in before_async_open .
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 447f1c89dca3741e9f87b1e1de52146370adce09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=447f1c89dca3741e9f87b1e1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:44:45 2012 +0200 mshtml: Get rid of no longer needed support for new window navigation in before_async_open. --- dlls/mshtml/nsio.c | 25 +++++-------------------- 1 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b2a8aaa..1be94e8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -225,18 +225,8 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO { HTMLDocumentObj *doc = container->doc; BSTR display_uri; - DWORD hlnf = 0; HRESULT hres; - if(!doc) { - NSContainer *container_iter = container; - - hlnf = HLNF_OPENINNEWWINDOW; - while(!container_iter->doc) - container_iter = container_iter->parent; - doc = container_iter->doc; - } - if(!doc->client) { *cancel = TRUE; return NS_OK; @@ -246,18 +236,13 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO if(FAILED(hres)) return NS_ERROR_FAILURE; - if(!hlnf) { - BOOL b; - - b = !exec_shldocvw_67(doc, display_uri); - if(b) { - SysFreeString(display_uri); - *cancel = FALSE; - return NS_OK; - } + if(!exec_shldocvw_67(doc, display_uri)) { + SysFreeString(display_uri); + *cancel = FALSE; + return NS_OK; } - hres = hlink_frame_navigate(&doc->basedoc, display_uri, channel, hlnf, cancel); + hres = hlink_frame_navigate(&doc->basedoc, display_uri, channel, 0, cancel); SysFreeString(display_uri); if(FAILED(hres)) *cancel = TRUE;

1 0