wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

André Hentschel : winedev: Remove information about wine-[pk]thread, and some small pieces of love.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: docs Branch: master Commit: babd6c94465a947c063a420168c237f29a2b235a URL: http://source.winehq.org/git/docs.git/?a=commit;h=babd6c94465a947c063a42016… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 20 19:24:32 2011 +0100 winedev: Remove information about wine-[pk]thread, and some small pieces of love. --- en/winedev-architecture.sgml | 2 +- en/winedev-kernel.sgml | 143 ++++-------------------------------------- 2 files changed, 13 insertions(+), 132 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index 953c24c..bb8638b 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -172,7 +172,7 @@ Only available on AMD64 architectures. </entry> <entry> - Flat model, with 32 bit addresses. + Flat model, with 32/64 bit addresses. </entry> </row> <row> diff --git a/en/winedev-kernel.sgml b/en/winedev-kernel.sgml index c60f1f8..4381c96 100644 --- a/en/winedev-kernel.sgml +++ b/en/winedev-kernel.sgml @@ -43,12 +43,8 @@ the next stage in the startup sequence. See the beginning of this chapter for more information on this check and why it's necessary. You can find this code in <filename>loader/glibc.c</filename>. The result - of this check is an exec of either <command>wine-pthread</command> or - <command>wine-kthread</command>, potentially (on Linux) via the - <emphasis>preloader</emphasis>. We need to use separate binaries here - because overriding the native pthreads library requires us to exploit - a property of ELF symbol fixup semantics: it's not possible to do this - without starting a new process. + of this check is an exec of <command>wine</command>, potentially (on Linux) + via the <emphasis>preloader</emphasis>. </para> <para> @@ -57,12 +53,10 @@ impose a Win32 style address space layout upon the newly created Win32 process. The details of what this does is covered in the address space layout chapter. The preloader is a statically linked ELF binary which - is passed the name of the actual Wine binary to run (either - <command>wine-kthread</command> or <command>wine-pthread</command>) - along with the arguments the user passed in from the command line. The - preloader is an unusual program: it does not have a - <function>main()</function> function. In standard ELF applications, - the entry point is actually at a symbol named + is passed the name of the actual Wine binary to run along with the arguments + the user passed in from the command line. The preloader is an unusual program: + it does not have a <function>main()</function> function. In standard + ELF applications, the entry point is actually at a symbol named <function>_start()</function>: this is provided by the standard <command>gcc</command> infrastructure and normally jumps to <function>__libc_start_main()</function> which initializes glibc before @@ -87,10 +81,10 @@ regions of the address space so the dynamic linker does not map shared libraries into them, and once that is done loading the real Wine binary off disk, linking it and starting it up. Normally all this is - automatically by glibc and the kernel but as we intercepted this + done automatically by glibc and the kernel but as we intercepted this process by using a static binary it's up to us to restart the process. The bulk of the code in the preloader is about loading - <command>wine-[pk]thread</command> and + <command>wine</command> and <filename>ld-linux.so.2</filename> off disk, linking them together, then starting the dynamic linking process. </para> @@ -121,11 +115,9 @@ </para> <para> - Both the <command>wine-pthread</command> and - <command>wine-kthread</command> binaries share a common - <function>main()</function> function, defined in - <filename>loader/main.c</filename>, so no matter which binary is - selected after the preloader has run we start here. This passes the + The <command>wine</command> binary has a <function>main()</function> + function, defined in <filename>loader/main.c</filename>, so after the + preloader has run we start here. This passes the information provided by the preloader into <filename>libwine</filename> and then calls <function>wine_init()</function>, defined in @@ -207,7 +199,7 @@ ExitProcess( entry( peb ) ); <para> As already explained in previous chapter (see <xref linkend="arch-mem"> for the details), Wine creates every 32-bit Windows process in its own - 32 address space. Wine also tries to map at the relevant addresses what + 32-bit address space. Wine also tries to map at the relevant addresses what Windows would do. There are however a few nasty bits to look at. </para> @@ -669,117 +661,6 @@ if (res != ERROR_SUCCESS) return res; </sect2> <sect2> - <title>POSIX threading vs. kernel threading</title> - - <para> - Wine runs in one of two modes: either pthreads (posix threading) or - kthreads (kernel threading). This section explains the differences - between them. The one that is used is automatically selected on - startup by a small test program which then execs the correct binary, - either <command>wine-kthread</command> or - <command>wine-pthread</command>. On NPTL-enabled systems pthreads - will be used, and on older non-NPTL systems kthreads is selected. - </para> - - <para> - Let's start with a bit of history. Back in the dark ages when Wine's - threading support was first implemented a problem was faced - Windows - had much more capable threading APIs than Linux did. This presented a - problem - Wine works either by reimplementing an API entirely or by - mapping it onto the underlying systems equivalent. How could Win32 - threading be implemented using a library which did not have all the - needed features? The answer, of course, was that it couldn't be. - </para> - - <para> - On Linux the pthreads interface is used to start, stop and control - threads. The pthreads library in turn is based on top of so-called - "kernel threads" which are created using the - <function>clone(2)</function> syscall. Pthreads provides a nicer (more - portable) interface to this functionality and also provides APIs for - controlling mutexes. There is a <ulink - url="http://www.llnl.gov/computing/tutorials/pthreads/"> good - tutorial on pthreads</ulink> available if you want to learn more. - </para> - - <para> - As pthreads did not provide the necessary semantics to implement Win32 - threading, the decision was made to implement Win32 threading on top - of the underlying kernel threads by using syscalls like - <function>clone()</function> directly. This provided maximum - flexibility and allowed a correct implementation but caused some bad - side effects. Most notably, all the userland Linux APIs assumed that - the user was utilising the pthreads library. Some only enabled thread - safety when they detected that pthreads was in use - this is true of - glibc, for instance. Worse, pthreads and pure kernel threads had - strange interactions when run in the same process yet some libraries - used by Wine used pthreads internally. Throw in source code porting - using Winelib - where you have both UNIX and Win32 code in the same - process - and chaos was the result. - </para> - - <para> - The solution was simple yet ingenious: Wine would provide its own - implementation of the pthread library <emphasis>inside</emphasis> its - own binary. Due to the semantics of ELF symbol scoping, this would - cause Wine's own implementation to override any implementation loaded - later on (like the real libpthread.so). Therefore, any calls to the - pthread APIs in external libraries would be linked to Wine's instead - of the system's pthreads library, and Wine implemented pthreads by - using the standard Windows threading APIs it in turn implemented - itself. - </para> - - <para> - As a result, libraries that only became thread-safe in the presence of - a loaded pthreads implementation would now do so, and any external - code that used pthreads would actually end up creating Win32 threads - that Wine was aware of and controlled. This worked quite nicely for a - long time, even though it required doing some extremely un-kosher - things like overriding internal libc structures and functions. That - is, it worked until NPTL was developed at which point the underlying - thread implementation on Linux changed dramatically. - </para> - - <para> - The fake pthread implementation can be found in - <filename>loader/kthread.c</filename>, which is used to - produce the <command>wine-kthread</command> binary. In contrast, - <filename>loader/pthread.c</filename> produces the - <command>wine-pthread</command> binary which is used on newer NPTL - systems. - </para> - - <para> - NPTL is a new threading subsystem for Linux that hugely improves its - performance and flexibility. By allowing threads to become much more - scalable and adding new pthread APIs, NPTL made Linux competitive with - Windows in the multi-threaded world. Unfortunately it also broke many - assumptions made by Wine (as well as other applications such as the - Sun JVM and RealPlayer) in the process. - </para> - - <para> - There was, however, some good news. NPTL made Linux threading powerful - enough that Win32 threads could now be implemented on top of pthreads - like any other normal application. There would no longer be problems - with mixing win32-kthreads and pthreads created by external libraries, - and no need to override glibc internals. As you can see from the - relative sizes of the <filename>loader/kthread.c</filename> and - <filename>loader/pthread.c</filename> files, the difference in code - complexity is considerable. NPTL also made several other semantic - changes to things such as signal delivery so changes were required in - many different places in Wine. - </para> - - <para> - On non-Linux systems the threading interface is typically not powerful - enough to replicate the semantics Win32 applications expect and so - kthreads with the pthread overrides are used. - </para> - </sect2> - - <sect2> <title>The Win32 thread environment</title> <para>

1 0

Alexandre Julliard : Wine release 1.3.12
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: website Branch: master Commit: 1437bc73c85309aed00ba76e93721f6c73190066 URL: http://source.winehq.org/git/website.git/?a=commit;h=1437bc73c85309aed00ba7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 20:42:42 2011 +0100 Wine release 1.3.12 --- news/en/2011012101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011012101.xml b/news/en/2011012101.xml new file mode 100644 index 0000000..c9ec676 --- /dev/null +++ b/news/en/2011012101.xml @@ -0,0 +1,17 @@ +<news> +<date>January 21, 2011</date> +<title>Wine 1.3.12 Released</title> +<body> + The Wine development release 1.3.12 is now available. + <a href="{$root}/announce/1.3.12">What's new</a> in this release: +<ul> + <li>Support for multiple icon sizes in winemenubuilder.</li> + <li>Improvements to the help browser.</li> + <li>Initial stab at DOSBox integration.</li> + <li>Various MSI fixes.</li> + <li>Some fixes to the Wine debugger.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.12.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.12 : Alexandre Julliard : Release 1.3.12
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: refs/tags/wine-1.3.12 Tag: 31cf4993acdb5abf703cbc114547d8efb4a3da4a URL: http://source.winehq.org/git/wine.git/?a=tag;h=31cf4993acdb5abf703cbc114547… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 20:32:01 2011 +0100 Release 1.3.12

1 0

Alexandre Julliard : Release 1.3.12.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: f0296a815e32ef954975b6c2a43951d4fff8ff09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0296a815e32ef954975b6c2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 20:31:58 2011 +0100 Release 1.3.12. --- ANNOUNCE | 1059 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 573 insertions(+), 506 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0296a815e32ef954975b…

1 0

Henri Verbeet : wined3d: Remove IWineD3DVolume::LoadTexture() from the public interface.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 1eefb46a57e58279fbd28b7cd45f0cbeb2741723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eefb46a57e58279fbd28b7cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 20 19:52:01 2011 +0100 wined3d: Remove IWineD3DVolume::LoadTexture() from the public interface. --- dlls/wined3d/volume.c | 60 ++++++++++++++++----------------------- dlls/wined3d/volumetexture.c | 5 +-- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 4 -- 4 files changed, 28 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a75ca78..060e361 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -93,6 +93,31 @@ void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DVolumeTextu volume->container = container; } +/* Context activation is done by the caller. */ +void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode) +{ + const struct wined3d_gl_info *gl_info = &volume->resource.device->adapter->gl_info; + const struct wined3d_format *format = volume->resource.format; + + TRACE("volume %p, level %u, srgb %#x, format %s (%#x).\n", + volume, level, srgb_mode, debug_d3dformat(format->id), format->id); + + volume_bind_and_dirtify(volume); + + ENTER_GL(); + GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, level, format->glInternal, + volume->currentDesc.Width, volume->currentDesc.Height, volume->currentDesc.Depth, + 0, format->glFormat, format->glType, volume->resource.allocatedMemory)); + checkGLcall("glTexImage3D"); + LEAVE_GL(); + + /* When adding code releasing volume->resource.allocatedMemory to save + * data keep in mind that GL_UNPACK_CLIENT_STORAGE_APPLE is enabled by + * default if supported(GL_APPLE_client_storage). Thus do not release + * volume->resource.allocatedMemory if GL_APPLE_client_storage is + * supported. */ +} + /* ******************************************* IWineD3DVolume IUnknown parts follow ******************************************* */ @@ -277,39 +302,6 @@ static HRESULT WINAPI IWineD3DVolumeImpl_Unmap(IWineD3DVolume *iface) return WINED3D_OK; } -/* Internal use functions follow : */ - -/* Context activation is done by the caller. */ -static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level, BOOL srgb_mode) -{ - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; - const struct wined3d_format *format = This->resource.format; - - TRACE("iface %p, level %u, srgb %#x, format %s (%#x).\n", - iface, gl_level, srgb_mode, debug_d3dformat(format->id), format->id); - - volume_bind_and_dirtify(This); - - TRACE("Calling glTexImage3D %x level=%d, intfmt=%x, w=%d, h=%d,d=%d, 0=%d, glFmt=%x, glType=%x, Mem=%p\n", - GL_TEXTURE_3D, gl_level, format->glInternal, This->currentDesc.Width, This->currentDesc.Height, - This->currentDesc.Depth, 0, format->glFormat, format->glType, This->resource.allocatedMemory); - - ENTER_GL(); - GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, gl_level, format->glInternal, - This->currentDesc.Width, This->currentDesc.Height, This->currentDesc.Depth, - 0, format->glFormat, format->glType, This->resource.allocatedMemory)); - checkGLcall("glTexImage3D"); - LEAVE_GL(); - - /* When adding code releasing This->resource.allocatedMemory to save data keep in mind that - * GL_UNPACK_CLIENT_STORAGE_APPLE is enabled by default if supported(GL_APPLE_client_storage). - * Thus do not release This->resource.allocatedMemory if GL_APPLE_client_storage is supported. - */ - return WINED3D_OK; - -} - static const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = { /* IUnknown */ @@ -330,8 +322,6 @@ static const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = IWineD3DVolumeImpl_GetDesc, IWineD3DVolumeImpl_Map, IWineD3DVolumeImpl_Unmap, - /* Internal interface */ - IWineD3DVolumeImpl_LoadTexture, }; HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT width, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 4a744eb..ac7674a 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -62,8 +62,7 @@ static void volumetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3D { for (i = 0; i < texture->baseTexture.level_count; ++i) { - IWineD3DVolume *volume = (IWineD3DVolume *)texture->baseTexture.sub_resources[i]; - IWineD3DVolume_LoadTexture(volume, i, srgb_mode); + volume_load((IWineD3DVolumeImpl *)texture->baseTexture.sub_resources[i], i, srgb_mode); } } else if (srgb_was_toggled) @@ -72,7 +71,7 @@ static void volumetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3D { IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)texture->baseTexture.sub_resources[i]; volume_add_dirty_box(volume, NULL); - IWineD3DVolume_LoadTexture((IWineD3DVolume *)volume, i, srgb_mode); + volume_load(volume, i, srgb_mode); } } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5cd4bb6..66532e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2005,6 +2005,7 @@ void volume_add_dirty_box(struct IWineD3DVolumeImpl *volume, const WINED3DBOX *d HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT width, UINT height, UINT depth, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DVolumeTextureImpl *container) DECLSPEC_HIDDEN; /***************************************************************************** diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 2be655b..585932b 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2490,10 +2490,6 @@ interface IWineD3DVolume : IWineD3DResource ); HRESULT Unmap( ); - HRESULT LoadTexture( - [in] int gl_level, - [in] BOOL srgb_mode - ); } [

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DSurface::GetData().
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: ce050c89de812567c44a5ae90dff56cc4176596c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce050c89de812567c44a5ae90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 20 19:52:00 2011 +0100 wined3d: Get rid of IWineD3DSurface::GetData(). --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 1 - dlls/wined3d/surface_base.c | 14 -------------- dlls/wined3d/surface_gdi.c | 1 - include/wine/wined3d.idl | 2 -- 5 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 887546a..71c63b2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5469,7 +5469,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, update_w = src_rect ? src_rect->right - src_rect->left : src_w; update_h = src_rect ? src_rect->bottom - src_rect->top : src_h; - data = IWineD3DSurface_GetData(src_surface); + data = src_impl->resource.allocatedMemory; if (!data) ERR("Source surface has no allocated memory, but should be a sysmem surface.\n"); ENTER_GL(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d6734a7..2e97985 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4712,7 +4712,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_SetClipper, IWineD3DBaseSurfaceImpl_GetClipper, /* Internal use: */ - IWineD3DBaseSurfaceImpl_GetData, IWineD3DSurfaceImpl_SetFormat, IWineD3DSurfaceImpl_PrivateSetup, IWineD3DSurfaceImpl_GetImplType, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 4449bf0..21c81a2 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1885,17 +1885,3 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Map(IWineD3DSurface *iface, return WINED3D_OK; } - -/* TODO: think about moving this down to resource? */ -const void *WINAPI IWineD3DBaseSurfaceImpl_GetData(IWineD3DSurface *iface) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - /* This should only be called for sysmem textures, it may be a good idea - * to extend this to all pools at some point in the future */ - if (This->resource.pool != WINED3DPOOL_SYSTEMMEM) - { - FIXME("(%p) Attempting to get system memory for a non-system memory texture\n", iface); - } - return This->resource.allocatedMemory; -} diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 9616489..dff1c35 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -480,7 +480,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_SetClipper, IWineD3DBaseSurfaceImpl_GetClipper, /* Internal use: */ - IWineD3DBaseSurfaceImpl_GetData, IWineD3DBaseSurfaceImpl_SetFormat, IWineGDISurfaceImpl_PrivateSetup, IWineGDISurfaceImpl_GetImplType, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 10d41d1..2be655b 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2462,8 +2462,6 @@ interface IWineD3DSurface : IWineD3DResource HRESULT GetClipper( [out] IWineD3DClipper **clipper ); - const void *GetData( - ); HRESULT SetFormat( [in] enum wined3d_format_id format_id );

1 0

Henri Verbeet : wined3d: Remove IWineD3DSurface::LoadTexture() from the public interface.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 0b7fef751ed3dc2a2e88ffcc6ceb71611494a78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7fef751ed3dc2a2e88ffcc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 20 19:51:59 2011 +0100 wined3d: Remove IWineD3DSurface::LoadTexture() from the public interface. --- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/surface.c | 111 +++++++++++++++++++-------------------- dlls/wined3d/surface_gdi.c | 17 ------ dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 3 - 6 files changed, 57 insertions(+), 79 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index cc2c6e9..feefebc 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -122,7 +122,7 @@ static void cubetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSR { for (i = 0; i < sub_count; ++i) { - IWineD3DSurface_LoadTexture((IWineD3DSurface *)texture->baseTexture.sub_resources[i], srgb_mode); + surface_load((IWineD3DSurfaceImpl *)texture->baseTexture.sub_resources[i], srgb_mode); } } else diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cacf062..d6734a7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1087,6 +1087,59 @@ static BOOL surface_convert_color_to_float(IWineD3DSurfaceImpl *surface, DWORD c return TRUE; } +HRESULT surface_load(IWineD3DSurfaceImpl *surface, BOOL srgb) +{ + DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; + + TRACE("surface %p, srgb %#x.\n", surface, srgb); + + if (surface->resource.pool == WINED3DPOOL_SCRATCH) + { + ERR("Not supported on scratch surfaces.\n"); + return WINED3DERR_INVALIDCALL; + } + + if (!(surface->flags & flag)) + { + TRACE("Reloading because surface is dirty\n"); + } + /* Reload if either the texture and sysmem have different ideas about the + * color key, or the actual key values changed. */ + else if (!(surface->flags & SFLAG_GLCKEY) != !(surface->CKeyFlags & WINEDDSD_CKSRCBLT) + || ((surface->CKeyFlags & WINEDDSD_CKSRCBLT) + && (surface->glCKey.dwColorSpaceLowValue != surface->SrcBltCKey.dwColorSpaceLowValue + || surface->glCKey.dwColorSpaceHighValue != surface->SrcBltCKey.dwColorSpaceHighValue))) + { + TRACE("Reloading because of color keying\n"); + /* To perform the color key conversion we need a sysmem copy of + * the surface. Make sure we have it. */ + + surface_load_location(surface, SFLAG_INSYSMEM, NULL); + /* Make sure the texture is reloaded because of the color key change, + * this kills performance though :( */ + /* TODO: This is not necessarily needed with hw palettized texture support. */ + surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); + } + else + { + TRACE("surface is already in texture\n"); + return WINED3D_OK; + } + + /* No partial locking for textures yet. */ + surface_load_location(surface, flag, NULL); + + if (!(surface->flags & SFLAG_DONOTFREE)) + { + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.allocatedMemory = NULL; + surface->resource.heapMemory = NULL; + surface_modify_location(surface, SFLAG_INSYSMEM, FALSE); + } + + return WINED3D_OK; +} + /* Do not call while under the GL lock. */ static ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { @@ -1145,7 +1198,7 @@ void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srg } } - IWineD3DSurface_LoadTexture((IWineD3DSurface *)surface, srgb == SRGB_SRGB ? TRUE : FALSE); + surface_load(surface, srgb == SRGB_SRGB ? TRUE : FALSE); if (surface->resource.pool == WINED3DPOOL_DEFAULT) { @@ -2489,61 +2542,6 @@ BOOL palette9_changed(IWineD3DSurfaceImpl *This) return TRUE; } -static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BOOL srgb_mode) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - DWORD flag = srgb_mode ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; - - TRACE("iface %p, srgb %#x.\n", iface, srgb_mode); - - if (!(This->flags & flag)) - { - TRACE("Reloading because surface is dirty\n"); - } - /* Reload if either the texture and sysmem have different ideas about the - * color key, or the actual key values changed. */ - else if (!(This->flags & SFLAG_GLCKEY) != !(This->CKeyFlags & WINEDDSD_CKSRCBLT) - || ((This->CKeyFlags & WINEDDSD_CKSRCBLT) - && (This->glCKey.dwColorSpaceLowValue != This->SrcBltCKey.dwColorSpaceLowValue - || This->glCKey.dwColorSpaceHighValue != This->SrcBltCKey.dwColorSpaceHighValue))) - { - TRACE("Reloading because of color keying\n"); - /* To perform the color key conversion we need a sysmem copy of - * the surface. Make sure we have it - */ - - surface_load_location(This, SFLAG_INSYSMEM, NULL); - /* Make sure the texture is reloaded because of the color key change, this kills performance though :( */ - /* TODO: This is not necessarily needed with hw palettized texture support */ - surface_modify_location(This, SFLAG_INSYSMEM, TRUE); - } else { - TRACE("surface is already in texture\n"); - return WINED3D_OK; - } - - /* Resources are placed in system RAM and do not need to be recreated when a device is lost. - * These resources are not bound by device size or format restrictions. Because of this, - * these resources cannot be accessed by the Direct3D device nor set as textures or render targets. - * However, these resources can always be created, locked, and copied. - */ - if (This->resource.pool == WINED3DPOOL_SCRATCH ) - { - FIXME("(%p) Operation not supported for scratch textures\n",This); - return WINED3DERR_INVALIDCALL; - } - - surface_load_location(This, flag, NULL /* no partial locking for textures yet */); - - if (!(This->flags & SFLAG_DONOTFREE)) - { - HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); - This->resource.allocatedMemory = NULL; - This->resource.heapMemory = NULL; - surface_modify_location(This, SFLAG_INSYSMEM, FALSE); - } - - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, enum wined3d_format_id format) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -4714,7 +4712,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_SetClipper, IWineD3DBaseSurfaceImpl_GetClipper, /* Internal use: */ - IWineD3DSurfaceImpl_LoadTexture, IWineD3DBaseSurfaceImpl_GetData, IWineD3DSurfaceImpl_SetFormat, IWineD3DSurfaceImpl_PrivateSetup, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 28a465c..9616489 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -193,22 +193,6 @@ static HRESULT WINAPI IWineGDISurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS return hr; } -/***************************************************************************** - * IWineD3DSurface::LoadTexture, GDI version - * - * This is mutually unsupported by GDI surfaces - * - * Returns: - * D3DERR_INVALIDCALL - * - *****************************************************************************/ -static HRESULT WINAPI -IWineGDISurfaceImpl_LoadTexture(IWineD3DSurface *iface, BOOL srgb_mode) -{ - ERR("Unsupported on X11 surfaces\n"); - return WINED3DERR_INVALIDCALL; -} - static HRESULT WINAPI IWineGDISurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; WINED3DLOCKED_RECT lock; @@ -496,7 +480,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_SetClipper, IWineD3DBaseSurfaceImpl_GetClipper, /* Internal use: */ - IWineGDISurfaceImpl_LoadTexture, IWineD3DBaseSurfaceImpl_GetData, IWineD3DBaseSurfaceImpl_SetFormat, IWineGDISurfaceImpl_PrivateSetup, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 036fa2e..02909b3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -146,7 +146,7 @@ static void texture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB s { for (i = 0; i < texture->baseTexture.level_count; ++i) { - IWineD3DSurface_LoadTexture((IWineD3DSurface *)texture->baseTexture.sub_resources[i], srgb_mode); + surface_load((IWineD3DSurfaceImpl *)texture->baseTexture.sub_resources[i], srgb_mode); } } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a409f05..5cd4bb6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2165,6 +2165,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, BOOL surface_init_sysmem(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(IWineD3DSurfaceImpl *iface) DECLSPEC_HIDDEN; +HRESULT surface_load(IWineD3DSurfaceImpl *surface, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RECT *rect) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 9c1a04a..10d41d1 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2462,9 +2462,6 @@ interface IWineD3DSurface : IWineD3DResource HRESULT GetClipper( [out] IWineD3DClipper **clipper ); - HRESULT LoadTexture( - [in] BOOL srgb_mode - ); const void *GetData( ); HRESULT SetFormat(

1 0

Henri Verbeet : wined3d: Remove IWineD3DSurface::BindTexture() from the public interface.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 629d81b192fad68c3c8e99f8c1cf3437cd090835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629d81b192fad68c3c8e99f8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 20 19:51:58 2011 +0100 wined3d: Remove IWineD3DSurface::BindTexture() from the public interface. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 110 ++++++++++++++++++--------------------- dlls/wined3d/surface_gdi.c | 6 -- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 3 - 5 files changed, 53 insertions(+), 69 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d375ca3..887546a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5462,7 +5462,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, /* Make sure the surface is loaded and up to date */ surface_internal_preload(dst_impl, SRGB_RGB); - IWineD3DSurface_BindTexture(dst_surface, FALSE); + surface_bind(dst_impl, FALSE); src_w = src_impl->currentDesc.Width; src_h = src_impl->currentDesc.Height; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cce1a2f..cacf062 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -510,6 +510,56 @@ void surface_set_texture_target(IWineD3DSurfaceImpl *surface, GLenum target) } /* Context activation is done by the caller. */ +void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) +{ + TRACE("surface %p, srgb %#x.\n", surface, srgb); + + if (surface->container.type == WINED3D_CONTAINER_TEXTURE) + { + IWineD3DBaseTextureImpl *texture = surface->container.u.texture; + + TRACE("Passing to container (%p).\n", texture); + texture->baseTexture.texture_ops->texture_bind(texture, srgb); + } + else + { + GLuint *name = srgb ? &surface->texture_name_srgb : &surface->texture_name; + + if (surface->texture_level) + { + ERR("Standalone surface %p is non-zero texture level %u.\n", + surface, surface->texture_level); + } + + ENTER_GL(); + + if (!*name) + { + glGenTextures(1, name); + checkGLcall("glGenTextures"); + + TRACE("Surface %p given name %u.\n", surface, *name); + + glBindTexture(surface->texture_target, *name); + checkGLcall("glBindTexture"); + glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); + glTexParameteri(surface->texture_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(surface->texture_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); + } + else + { + glBindTexture(surface->texture_target, *name); + checkGLcall("glBindTexture"); + } + + LEAVE_GL(); + } +} + +/* Context activation is done by the caller. */ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This, BOOL srgb) { DWORD active_sampler; @@ -534,7 +584,7 @@ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This, BOOL srgb) { { IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_SAMPLER(active_sampler)); } - IWineD3DSurface_BindTexture((IWineD3DSurface *)This, srgb); + surface_bind(This, srgb); } /* This function checks if the primary render target uses the 8bit paletted format. */ @@ -2494,63 +2544,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO return WINED3D_OK; } -/* Context activation is done by the caller. */ -static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - TRACE("iface %p, srgb %#x.\n", iface, srgb); - - if (This->container.type == WINED3D_CONTAINER_TEXTURE) - { - IWineD3DBaseTextureImpl *texture = This->container.u.texture; - - TRACE("Passing to container (%p).\n", texture); - texture->baseTexture.texture_ops->texture_bind(texture, srgb); - } - else - { - GLuint *name; - - TRACE("(%p) : Binding surface\n", This); - - name = srgb ? &This->texture_name_srgb : &This->texture_name; - - ENTER_GL(); - - if (!This->texture_level) - { - if (!*name) { - glGenTextures(1, name); - checkGLcall("glGenTextures"); - TRACE("Surface %p given name %d\n", This, *name); - - glBindTexture(This->texture_target, *name); - checkGLcall("glBindTexture"); - glTexParameteri(This->texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)"); - glTexParameteri(This->texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)"); - glTexParameteri(This->texture_target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); - checkGLcall("glTexParameteri(dimension, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE)"); - glTexParameteri(This->texture_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri(dimension, GL_TEXTURE_MIN_FILTER, GL_NEAREST)"); - glTexParameteri(This->texture_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri(dimension, GL_TEXTURE_MAG_FILTER, GL_NEAREST)"); - } - /* This is where we should be reducing the amount of GLMemoryUsed */ - } else if (*name) { - /* Mipmap surfaces should have a base texture container */ - ERR("Mipmap surface has a glTexture bound to it!\n"); - } - - glBindTexture(This->texture_target, *name); - checkGLcall("glBindTexture"); - - LEAVE_GL(); - } -} - static HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, enum wined3d_format_id format) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -4722,7 +4715,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_GetClipper, /* Internal use: */ IWineD3DSurfaceImpl_LoadTexture, - IWineD3DSurfaceImpl_BindTexture, IWineD3DBaseSurfaceImpl_GetData, IWineD3DSurfaceImpl_SetFormat, IWineD3DSurfaceImpl_PrivateSetup, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index d7a6f4a..28a465c 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -209,11 +209,6 @@ IWineGDISurfaceImpl_LoadTexture(IWineD3DSurface *iface, BOOL srgb_mode) return WINED3DERR_INVALIDCALL; } -static void WINAPI IWineGDISurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) -{ - ERR("Not supported.\n"); -} - static HRESULT WINAPI IWineGDISurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; WINED3DLOCKED_RECT lock; @@ -502,7 +497,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_GetClipper, /* Internal use: */ IWineGDISurfaceImpl_LoadTexture, - IWineGDISurfaceImpl_BindTexture, IWineD3DBaseSurfaceImpl_GetData, IWineD3DBaseSurfaceImpl_SetFormat, IWineGDISurfaceImpl_PrivateSetup, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index baf009f..a409f05 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2154,6 +2154,7 @@ extern const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl DECLSPEC_HIDDEN; extern const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl DECLSPEC_HIDDEN; void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; +void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) DECLSPEC_HIDDEN; HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN; void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 3fea495..9c1a04a 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2465,9 +2465,6 @@ interface IWineD3DSurface : IWineD3DResource HRESULT LoadTexture( [in] BOOL srgb_mode ); - void BindTexture( - [in] BOOL srgb - ); const void *GetData( ); HRESULT SetFormat(

1 0

Jacek Caban : urlmon: Call remove_dot_segments on path opaque for mk: protocol.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 4454770cbcb8948b5545498f89831bc2d07a4767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4454770cbcb8948b5545498f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 21 16:11:58 2011 +0100 urlmon: Call remove_dot_segments on path opaque for mk: protocol. --- dlls/urlmon/tests/uri.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 6 ++ 2 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 5bbd051..c88c8e4 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3963,6 +3963,156 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_RES,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "mk:@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg", 0, S_OK, FALSE, + { + {"mk:@MSITStore:Z:\\dir\\test.chm::/images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\dir\\test.chm::/images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:Z:\\dir\\test.chm::/images/xxx.jpg",S_OK,FALSE}, + {"@MSITStore:Z:\\dir\\test.chm::/images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "mk:@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + { + {"mk:@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "xx:@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg", 0, S_OK, FALSE, + { + {"xx:@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"xx:@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"xx:@MSITStore:Z:\\dir\\test.chm::/html/../images/xxx.jpg",S_OK,FALSE}, + {"xx",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "mk:@MSITStore:Z:\\dir\\test.chm::/html/../../images/xxx.jpg", 0, S_OK, FALSE, + { + {"mk:@MSITStore:Z:\\dir\\images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\dir\\images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:Z:\\dir\\images/xxx.jpg",S_OK,FALSE}, + {"@MSITStore:Z:\\dir\\images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\dir\\test.chm::/html/../../images/xxx.jpg",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "mk:@MSITStore:Z:\\dir\\dir2\\..\\test.chm::/html/../../images/xxx.jpg", 0, S_OK, FALSE, + { + {"mk:@MSITStore:Z:\\dir\\images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\dir\\images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:Z:\\dir\\images/xxx.jpg",S_OK,FALSE}, + {"@MSITStore:Z:\\dir\\images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\dir\\dir2\\..\\test.chm::/html/../../images/xxx.jpg",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "mk:@MSITStore:Z:\\dir\\test.chm::/html/../../../../images/xxx.jpg", 0, S_OK, FALSE, + { + {"mk:images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"images/xxx.jpg",S_OK,FALSE}, + {"images/xxx.jpg",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\dir\\test.chm::/html/../../../../images/xxx.jpg",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 36ae913..e7b3078 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3152,6 +3152,12 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla } } + if(data->scheme_type == URL_SCHEME_MK && !computeOnly && !(flags & Uri_CREATE_NO_CANONICALIZE)) { + DWORD new_len = remove_dot_segments(uri->canon_uri + uri->path_start, + uri->canon_len - uri->path_start); + uri->canon_len = uri->path_start + new_len; + } + uri->path_len = uri->canon_len - uri->path_start; TRACE("(%p %p %x %d): Canonicalized opaque URI path %s len=%d\n", data, uri, flags, computeOnly,

1 0

Jacek Caban : urlmon: Added backslash handling to remove_dot_segments.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 3c6c6e9d94ef52ce52f7f0feecb021b306a325cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6c6e9d94ef52ce52f7f0fee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 21 16:11:46 2011 +0100 urlmon: Added backslash handling to remove_dot_segments. --- dlls/urlmon/uri.c | 75 +++++++++++++++++++++++++++-------------------------- 1 files changed, 38 insertions(+), 37 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 206fa6b..36ae913 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -350,6 +350,11 @@ static inline BOOL is_path_delim(WCHAR val) { return (!val || val == '#' || val == '?'); } +static inline BOOL is_slash(WCHAR c) +{ + return c == '/' || c == '\\'; +} + static BOOL is_default_port(URL_SCHEME scheme, DWORD port) { DWORD i; @@ -727,8 +732,6 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, /* Removes the dot segments from a hierarchical URIs path component. This * function performs the removal in place. * - * This is a modified version of Qt's QUrl function "removeDotsFromPath". - * * This function returns the new length of the path string. */ static DWORD remove_dot_segments(WCHAR *path, DWORD path_len) { @@ -738,48 +741,46 @@ static DWORD remove_dot_segments(WCHAR *path, DWORD path_len) { DWORD len; while(in < end) { - /* A. if the input buffer begins with a prefix of "/./" or "/.", - * where "." is a complete path segment, then replace that - * prefix with "/" in the input buffer; otherwise, + /* Move the first path segment in the input buffer to the end of + * the output buffer, and any subsequent characters up to, including + * the next "/" character (if any) or the end of the input buffer. */ - if(in <= end - 3 && in[0] == '/' && in[1] == '.' && in[2] == '/') { - in += 2; - continue; - } else if(in == end - 2 && in[0] == '/' && in[1] == '.') { - *out++ = '/'; - in += 2; + while(in < end && !is_slash(*in)) + *out++ = *in++; + if(in == end) break; - } + *out++ = *in++; - /* B. if the input buffer begins with a prefix of "/../" or "/..", - * where ".." is a complete path segment, then replace that - * prefix with "/" in the input buffer and remove the last - * segment and its preceding "/" (if any) from the output - * buffer; otherwise, - */ - if(in <= end - 4 && in[0] == '/' && in[1] == '.' && in[2] == '.' && in[3] == '/') { - while(out > path && *(--out) != '/'); + while(in < end) { + if(*in != '.') + break; - in += 3; - continue; - } else if(in == end - 3 && in[0] == '/' && in[1] == '.' && in[2] == '.') { - while(out > path && *(--out) != '/'); + /* Handle ending "/." */ + if(in + 1 == end) { + ++in; + break; + } - if(*out == '/') - ++out; + /* Handle "/./" */ + if(is_slash(in[1])) { + in += 2; + continue; + } - in += 3; - break; - } + /* If we don't have "/../" or ending "/.." */ + if(in[1] != '.' || (in + 2 != end && !is_slash(in[2]))) + break; - /* C. move the first path segment in the input buffer to the end of - * the output buffer, including the initial "/" character (if - * any) and any subsequent characters up to, but not including, - * the next "/" character or the end of the input buffer. - */ - *out++ = *in++; - while(in < end && *in != '/') - *out++ = *in++; + /* Find the slash preceding out pointer and move out pointer to it */ + if(out > path+1 && is_slash(*--out)) + --out; + while(out > path && !is_slash(*(--out))); + if(is_slash(*out)) + ++out; + in += 2; + if(in != end) + ++in; + } } len = out - path;

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
88
Older →

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 January 2011