March 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : server: Infrastructure for having a thread own the desktop window.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 251be542aca1dbf418e5c15e4adb0c5a2d7d3fc0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=251be542aca1dbf418e5c15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 20:37:52 2006 +0100 server: Infrastructure for having a thread own the desktop window. --- server/class.c | 31 +++-------------- server/user.h | 1 + server/window.c | 99 ++++++++++++++++++++++++++++++++++--------------------- 3 files changed, 69 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=251be542aca1dbf418e…

1 0

Alexandre Julliard : mlang: Decrement the module refcount when an object is destroyed.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 19a3adb9580ccf32c66c0ff4864a68d31044684f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19a3adb9580ccf32c66c0ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 20:10:36 2006 +0100 mlang: Decrement the module refcount when an object is destroyed. --- dlls/mlang/mlang.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e339b02..21076f4 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -836,6 +836,7 @@ static ULONG WINAPI MLang_Release( MLang { TRACE("Destroying %p\n", This); HeapFree(GetProcessHeap(), 0, This); + UnlockModule(); } return ref;

1 0

H. Verbeet : wined3d: Fix the relation between volumes and their container.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 07004966a8585f55074d5fff903c51bf2a033070 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07004966a8585f55074d5ff… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 6 18:28:20 2006 +0000 wined3d: Fix the relation between volumes and their container. --- dlls/d3d8/volume.c | 41 ++++++++++++++++++++++++++++++-------- dlls/d3d9/volume.c | 40 +++++++++++++++++++++++++++++-------- dlls/wined3d/volume.c | 24 ++++++++++++++++++++++ dlls/wined3d/volumetexture.c | 13 +++++++++++- include/wine/wined3d_interface.h | 2 ++ 5 files changed, 101 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index cffc50b..20421a8 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -40,24 +40,47 @@ HRESULT WINAPI IDirect3DVolume8Impl_Quer ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); + IUnknown *containerParent = NULL; - TRACE("(%p) : AddRef from %ld\n", This, ref - 1); + TRACE("(%p)\n", This); - return ref; + IWineD3DVolume_GetContainerParent(This->wineD3DVolume, &containerParent); + if (containerParent) { + /* Forward to the containerParent */ + TRACE("(%p) : Forwarding to %p\n", This, containerParent); + return IUnknown_AddRef(containerParent); + } else { + /* No container, handle our own refcounting */ + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) : AddRef from %ld\n", This, ref - 1); + return ref; + } } ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); + IUnknown *containerParent = NULL; - TRACE("(%p) : ReleaseRef to %ld\n", This, ref); + TRACE("(%p)\n", This); + + IWineD3DVolume_GetContainerParent(This->wineD3DVolume, &containerParent); + if (containerParent) { + /* Forward to the containerParent */ + TRACE("(%p) : Forwarding to %p\n", This, containerParent); + return IUnknown_Release(containerParent); + } + else { + /* No container, handle our own refcounting */ + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) : ReleaseRef to %ld\n", This, ref); + + if (ref == 0) { + IWineD3DVolume_Release(This->wineD3DVolume); + HeapFree(GetProcessHeap(), 0, This); + } - if (ref == 0) { - IWineD3DVolume_Release(This->wineD3DVolume); - HeapFree(GetProcessHeap(), 0, This); + return ref; } - return ref; } /* IDirect3DVolume8 Interface follow: */ diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 4e53b2a..1223932 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -41,24 +41,46 @@ HRESULT WINAPI IDirect3DVolume9Impl_Quer ULONG WINAPI IDirect3DVolume9Impl_AddRef(LPDIRECT3DVOLUME9 iface) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); + IUnknown *containerParent = NULL; - TRACE("(%p) : AddRef from %ld\n", This, ref - 1); + TRACE("(%p)\n", This); - return ref; + IWineD3DVolume_GetContainerParent(This->wineD3DVolume, &containerParent); + if (containerParent) { + /* Forward to the containerParent */ + TRACE("(%p) : Forwarding to %p\n", This, containerParent); + return IUnknown_AddRef(containerParent); + } else { + /* No container, handle our own refcounting */ + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) : AddRef from %ld\n", This, ref - 1); + return ref; + } } ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); + IUnknown *containerParent = NULL; - TRACE("(%p) : ReleaseRef to %ld\n", This, ref); + TRACE("(%p)\n", This); + + IWineD3DVolume_GetContainerParent(This->wineD3DVolume, &containerParent); + if (containerParent) { + /* Forward to the containerParent */ + TRACE("(%p) : Forwarding to %p\n", This, containerParent); + return IUnknown_Release(containerParent); + } else { + /* No container, handle our own refcounting */ + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) : ReleaseRef to %ld\n", This, ref); + + if (ref == 0) { + IWineD3DVolume_Release(This->wineD3DVolume); + HeapFree(GetProcessHeap(), 0, This); + } - if (ref == 0) { - IWineD3DVolume_Release(This->wineD3DVolume); - HeapFree(GetProcessHeap(), 0, This); + return ref; } - return ref; } /* IDirect3DVolume9 Interface follow: */ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3fa1717..151ade3 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -103,6 +103,29 @@ D3DRESOURCETYPE WINAPI IWineD3DVolumeImp /* ******************************************* IWineD3DVolume parts follow ******************************************* */ +HRESULT WINAPI IWineD3DVolumeImpl_GetContainerParent(IWineD3DVolume *iface, IUnknown **ppContainerParent) { + IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; + + TRACE("(%p) : ppContainerParent %p\n", This, ppContainerParent); + + if (!ppContainerParent) { + ERR("(%p) : Called without a valid ppContainerParent\n", This); + } + + if (This->container) { + IWineD3DBase_GetParent(This->container, ppContainerParent); + if (!ppContainerParent) { + /* WineD3D objects should always have a parent */ + ERR("(%p) : GetParent returned NULL\n", This); + } + IUnknown_Release(*ppContainerParent); /* GetParent adds a reference; we want just the pointer */ + } else { + *ppContainerParent = NULL; + } + + return D3D_OK; +} + HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REFIID riid, void** ppContainer) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; @@ -304,6 +327,7 @@ const IWineD3DVolumeVtbl IWineD3DVolume_ IWineD3DVolumeImpl_PreLoad, IWineD3DVolumeImpl_GetType, /* IWineD3DVolume */ + IWineD3DVolumeImpl_GetContainerParent, IWineD3DVolumeImpl_GetContainer, IWineD3DVolumeImpl_GetDesc, IWineD3DVolumeImpl_LockBox, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 14e1154..9464357 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -60,8 +60,19 @@ ULONG WINAPI IWineD3DVolumeTextureImpl_R if (ref == 0) { for (i = 0; i < This->baseTexture.levels; i++) { if (This->volumes[i] != NULL) { + /* Since the volumes were created by callback, the texture is + * keeping the reference to the parent, so the texture should + * release it. */ + IUnknown *volumeParent = NULL; + TRACE("(%p) : Releasing volume %p\n", This, This->volumes[i]); - IWineD3DVolume_Release(This->volumes[i]); + + /* Cleanup the container */ + IWineD3DVolume_SetContainer(This->volumes[i], 0); + /* Now, release the parent, which will take care of cleaning up the volume for us */ + IWineD3DVolume_GetParent(This->volumes[i], &volumeParent); + IUnknown_Release(volumeParent); /* Once for the reference GetParent added */ + IUnknown_Release(volumeParent); /* Once for the reference we're keeping */ } } IWineD3DBaseTextureImpl_CleanUp((IWineD3DBaseTexture *) iface); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 4184fee..c37ac00 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1125,6 +1125,7 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD STDMETHOD_(void,PreLoad)(THIS) PURE; STDMETHOD_(D3DRESOURCETYPE, GetType)(THIS) PURE; /*** IWineD3DVolume methods ***/ + STDMETHOD(GetContainerParent)(THIS_ IUnknown **ppContainerParent) PURE; STDMETHOD(GetContainer)(THIS_ REFIID riid, void ** ppContainer) PURE; STDMETHOD(GetDesc)(THIS_ WINED3DVOLUME_DESC * pDesc) PURE; STDMETHOD(LockBox)(THIS_ D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; @@ -1153,6 +1154,7 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD #define IWineD3DVolume_PreLoad(p) (p)->lpVtbl->PreLoad(p) #define IWineD3DVolume_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DVolume methods ***/ +#define IWineD3DVolume_GetContainerParent(p,a) (p)->lpVtbl->GetContainerParent(p,a) #define IWineD3DVolume_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b) #define IWineD3DVolume_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) #define IWineD3DVolume_LockBox(p,a,b,c) (p)->lpVtbl->LockBox(p,a,b,c)

1 0

H. Verbeet : wined3d: Fix the relation between surfaces and their container .
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: f7356a34c37f96a6f56120d875f77cfccd79c947 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f7356a34c37f96a6f56120d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 6 18:28:03 2006 +0000 wined3d: Fix the relation between surfaces and their container. --- dlls/d3d8/surface.c | 40 ++++++++++++++++++++++++++++-------- dlls/d3d9/surface.c | 42 ++++++++++++++++++++++++++++++-------- dlls/wined3d/cubetexture.c | 3 +++ dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 24 ++++++++++++++++++++++ dlls/wined3d/swapchain.c | 2 ++ dlls/wined3d/texture.c | 3 +++ include/wine/wined3d_interface.h | 2 ++ 8 files changed, 99 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f7356a34c37f96a6f56…

1 0

Robert Shearman : wininet: Rewrite InternetCreateUrlW.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 414d1ddeb92f5fc9b0afb6c28347c7db8e9a6fd5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=414d1ddeb92f5fc9b0afb6c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 6 17:31:56 2006 +0000 wininet: Rewrite InternetCreateUrlW. - Rewrite InternetCreateUrlW to respect the lengths passed in via the URL_COMPONENTS structure and fall back to a strlenW call when a length is zero. - Expand the number of protocols supported when determining whether the port number should be added. - Fix a test by passing in the correct length of scheme. --- dlls/wininet/internet.c | 139 ++++++++++++++++++++++++++------------------- dlls/wininet/tests/http.c | 12 ++-- 2 files changed, 86 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=414d1ddeb92f5fc9b0a…

1 0

H. Verbeet : wined3d: Don' t call glCompressedTexImage2DARB without allocatedMemory.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: fd2739b0239f3e4186664868b300a133cdc073b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd2739b0239f3e418666486… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 6 18:27:53 2006 +0000 wined3d: Don't call glCompressedTexImage2DARB without allocatedMemory. Don't call glCompressedTexImage2DARB if we haven't got allocatedMemory (yet). Fix a small typo. --- dlls/wined3d/surface.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a4d9770..f8e6abf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1029,7 +1029,9 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT This->resource.format == WINED3DFMT_DXT3 || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { - if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { + if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { + FIXME("Using DXT1/3/5 without advertized support\n"); + } else if (This->resource.allocatedMemory) { TRACE("Calling glCompressedTexImage2D %x i=%d, intfmt=%x, w=%d, h=%d,0=%d, sz=%d, Mem=%p\n", This->glDescription.target, This->glDescription.level, @@ -1050,7 +1052,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT 0, This->resource.size, This->resource.allocatedMemory); - checkGLcall("glCommpressedTexTexImage2D"); + checkGLcall("glCommpressedTexImage2D"); LEAVE_GL(); @@ -1058,9 +1060,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); This->resource.allocatedMemory = NULL; } - - } else { - FIXME("Using DXT1/3/5 without advertized support\n"); } } else {

1 0

Victor Pelt : wininet: Add stub for missing InternetSetOption.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 472ad3a450f044aa6c99086b36d0666e28dd9c59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=472ad3a450f044aa6c99086… Author: Victor Pelt <victor.pelt(a)gmail.com> Date: Mon Mar 6 14:04:47 2006 +0100 wininet: Add stub for missing InternetSetOption. --- dlls/wininet/internet.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f52103d..ff189a0 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2455,6 +2455,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET case INTERNET_OPTION_CONNECT_RETRIES: FIXME("Option INTERNET_OPTION_CONNECT_RETRIES: STUB\n"); break; + case INTERNET_OPTION_CONTEXT_VALUE: + FIXME("Option INTERNET_OPTION_CONTEXT_VALUE; STUB\n"); + break; default: FIXME("Option %ld STUB\n",dwOption); INTERNET_SetLastError(ERROR_INVALID_PARAMETER);

1 0

Robert Shearman : wininet: More tests for InternetCreateUrl.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 8bfc85957ac58de832793690ebe2b50de3bf4a0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8bfc85957ac58de83279369… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 6 17:31:32 2006 +0000 wininet: More tests for InternetCreateUrl. Fix an InternetCreateUrl test so that it correctly sets the scheme length and add tests which show the behaviour when the lengths are set to zero and when the https scheme is used. --- dlls/wininet/tests/http.c | 87 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 69 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1abecec..f7b6851 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -44,8 +44,9 @@ #define CREATE_URL3 "http://username:" #define CREATE_URL4 "http://www.winehq.org/site/about" #define CREATE_URL5 "http://" -#define CREATE_URL6 "nhtt://username:password(a)www.winehq.org:80/site/about" +#define CREATE_URL6 "nhttp://username:password(a)www.winehq.org:80/site/about" #define CREATE_URL7 "http://username:password(a)www.winehq.org:42/site/about" +#define CREATE_URL8 "https://username:password(a)www.winehq.org/site/about" static HANDLE hCompleteEvent; @@ -967,7 +968,7 @@ static void InternetCreateUrlA_test(void ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == 50, "Expected len 50, got %ld\n", len); - ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL2, szUrl); + ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL3, szUrl); /* valid password, NULL username * if password is provided, username has to exist @@ -981,7 +982,7 @@ static void InternetCreateUrlA_test(void ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); ok(len == 42, "Expected len 42, got %ld\n", len); - ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL2, szUrl); + ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL3, szUrl); /* valid password, empty username * if password is provided, username has to exist @@ -995,7 +996,7 @@ static void InternetCreateUrlA_test(void ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == 50, "Expected len 50, got %ld\n", len); - ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL4, szUrl); + ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL5, szUrl); /* NULL username, NULL password */ fill_url_components(&urlComp); @@ -1008,7 +1009,7 @@ static void InternetCreateUrlA_test(void ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == 32, "Expected len 32, got %ld\n", len); - ok(!strcmp(szUrl, CREATE_URL4), "Expected %s, got %s\n", CREATE_URL3, szUrl); + ok(!strcmp(szUrl, CREATE_URL4), "Expected %s, got %s\n", CREATE_URL4, szUrl); /* empty username, empty password */ fill_url_components(&urlComp); @@ -1021,25 +1022,23 @@ static void InternetCreateUrlA_test(void ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == 50, "Expected len 50, got %ld\n", len); - ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL4, szUrl); + ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL5, szUrl); - /* if lpszScheme != "http" or nPort != 80, display nPort. - * depending on nScheme, displays only first x characters - * of lpszScheme: - * HTTP: x=4 - * FTP: x=3 etc + /* shows that nScheme is ignored, as the appearance of the port number + * depends on lpszScheme and the string copied depends on lpszScheme. */ fill_url_components(&urlComp); HeapFree(GetProcessHeap(), 0, szUrl); urlComp.lpszScheme = "nhttp"; - len = 54; - szUrl = HeapAlloc(GetProcessHeap(), 0, len); + urlComp.dwSchemeLength = strlen(urlComp.lpszScheme); + len = strlen(CREATE_URL6) + 1; + szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == 53, "Expected len 51, got %ld\n", len); - ok(strstr(szUrl, "80") != NULL, "Expected to find 80 in szUrl\n"); - ok(!strncmp(szUrl, "nhtt://", 7), "Expected 'nhtt://'\n"); - ok(!strcmp(szUrl, CREATE_URL6), "Expected %s, got %s\n", CREATE_URL5, szUrl); + todo_wine { + ok(len == strlen(CREATE_URL6), "Expected len %d, got %ld\n", strlen(CREATE_URL6) + 1, len); + ok(!strcmp(szUrl, CREATE_URL6), "Expected %s, got %s\n", CREATE_URL6, szUrl); + } /* if lpszScheme != "http" or nPort != 80, display nPort */ HeapFree(GetProcessHeap(), 0, szUrl); @@ -1050,7 +1049,59 @@ static void InternetCreateUrlA_test(void ok(ret, "Expected success\n"); ok(len == 53, "Expected len 53, got %ld\n", len); ok(strstr(szUrl, "42") != NULL, "Expected to find 42 in szUrl\n"); - ok(!strcmp(szUrl, CREATE_URL7), "Expected %s, got %s\n", CREATE_URL6, szUrl); + ok(!strcmp(szUrl, CREATE_URL7), "Expected %s, got %s\n", CREATE_URL7, szUrl); + + HeapFree(GetProcessHeap(), 0, szUrl); + + memset(&urlComp, 0, sizeof(urlComp)); + urlComp.dwStructSize = sizeof(URL_COMPONENTS); + urlComp.lpszScheme = "http"; + urlComp.dwSchemeLength = 0; + urlComp.nScheme = INTERNET_SCHEME_HTTP; + urlComp.lpszHostName = "www.winehq.org"; + urlComp.dwHostNameLength = 0; + urlComp.nPort = 80; + urlComp.lpszUserName = "username"; + urlComp.dwUserNameLength = 0; + urlComp.lpszPassword = "password"; + urlComp.dwPasswordLength = 0; + urlComp.lpszUrlPath = "/site/about"; + urlComp.dwUrlPathLength = 0; + urlComp.lpszExtraInfo = ""; + urlComp.dwExtraInfoLength = 0; + len = strlen(CREATE_URL1); + szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ok(ret, "Expected success\n"); + todo_wine { + ok(len == strlen(CREATE_URL1), "Expected len %d, got %ld\n", strlen(CREATE_URL1), len); + ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl); + } + + memset(&urlComp, 0, sizeof(urlComp)); + urlComp.dwStructSize = sizeof(URL_COMPONENTS); + urlComp.lpszScheme = "https"; + urlComp.dwSchemeLength = 0; + urlComp.nScheme = INTERNET_SCHEME_HTTP; + urlComp.lpszHostName = "www.winehq.org"; + urlComp.dwHostNameLength = 0; + urlComp.nPort = 443; + urlComp.lpszUserName = "username"; + urlComp.dwUserNameLength = 0; + urlComp.lpszPassword = "password"; + urlComp.dwPasswordLength = 0; + urlComp.lpszUrlPath = "/site/about"; + urlComp.dwUrlPathLength = 0; + urlComp.lpszExtraInfo = ""; + urlComp.dwExtraInfoLength = 0; + len = strlen(CREATE_URL8); + szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ok(ret, "Expected success\n"); + todo_wine { + ok(len == strlen(CREATE_URL8), "Expected len %d, got %ld\n", strlen(CREATE_URL8), len); + ok(!strcmp(szUrl, CREATE_URL8), "Expected %s, got %s\n", CREATE_URL8, szUrl); + } HeapFree(GetProcessHeap(), 0, szUrl); }

1 0

Robert Shearman : wininet: Don' t continue to connect to a secure server without SSL support since it won' t work.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 9981f337e3aa38cc1b1cbf89f646030397540cd8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9981f337e3aa38cc1b1cbf8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 6 17:31:09 2006 +0000 wininet: Don't continue to connect to a secure server without SSL support since it won't work. Don't continue to connect to a secure server without SSL support since it won't work. Return an error back to the application instead. --- dlls/wininet/http.c | 11 +++++++++-- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 31 ++++++++++++++++++------------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9e74001..495b0b5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1016,7 +1016,12 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L goto lend; } - NETCON_init(&lpwhr->netConnection, dwFlags & INTERNET_FLAG_SECURE); + if (!NETCON_init(&lpwhr->netConnection, dwFlags & INTERNET_FLAG_SECURE)) + { + InternetCloseHandle( handle ); + handle = NULL; + goto lend; + } if (NULL != lpszObjectName && strlenW(lpszObjectName)) { HRESULT rc; @@ -2077,7 +2082,9 @@ static BOOL HTTP_HandleRedirect(LPWININE szaddr, strlen(szaddr)+1); NETCON_close(&lpwhr->netConnection); - NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE); + + if (!NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) + return FALSE; } HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6df7e31..6399de9 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -468,7 +468,7 @@ VOID INTERNET_SendCallback(LPWININETHAND LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW lpwhr, LPCWSTR header); BOOL NETCON_connected(WININET_NETCONNECTION *connection); -void NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL); +BOOL NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL); BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain, int type, int protocol); BOOL NETCON_close(WININET_NETCONNECTION *connection); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 97608b6..e046e04 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -111,7 +111,7 @@ MAKE_FUNCPTR(ERR_error_string); #endif -void NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) +BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) { connection->useSSL = FALSE; connection->socketFD = -1; @@ -119,23 +119,23 @@ void NETCON_init(WININET_NETCONNECTION * { #if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H TRACE("using SSL connection\n"); - if (OpenSSL_ssl_handle) /* already initilzed everything */ - return; + if (OpenSSL_ssl_handle) /* already initialized everything */ + return TRUE; OpenSSL_ssl_handle = wine_dlopen(SONAME_LIBSSL, RTLD_NOW, NULL, 0); if (!OpenSSL_ssl_handle) { ERR("trying to use a SSL connection, but couldn't load %s. Expect trouble.\n", SONAME_LIBSSL); - connection->useSSL = FALSE; - return; + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); + return FALSE; } OpenSSL_crypto_handle = wine_dlopen(SONAME_LIBCRYPTO, RTLD_NOW, NULL, 0); if (!OpenSSL_crypto_handle) { ERR("trying to use a SSL connection, but couldn't load %s. Expect trouble.\n", SONAME_LIBCRYPTO); - connection->useSSL = FALSE; - return; + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); + return FALSE; } /* mmm nice ugly macroness */ @@ -144,8 +144,8 @@ void NETCON_init(WININET_NETCONNECTION * if (!p##x) \ { \ ERR("failed to load symbol %s\n", #x); \ - connection->useSSL = FALSE; \ - return; \ + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); \ + return FALSE; \ } DYNSSL(SSL_library_init); @@ -172,8 +172,8 @@ void NETCON_init(WININET_NETCONNECTION * if (!p##x) \ { \ ERR("failed to load symbol %s\n", #x); \ - connection->useSSL = FALSE; \ - return; \ + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); \ + return FALSE; \ } DYNCRYPTO(BIO_new_fp); DYNCRYPTO(ERR_get_error); @@ -189,9 +189,11 @@ void NETCON_init(WININET_NETCONNECTION * connection->peek_msg_mem = NULL; #else FIXME("can't use SSL, not compiled in.\n"); - connection->useSSL = FALSE; + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); + return FALSE; #endif } + return TRUE; } BOOL NETCON_connected(WININET_NETCONNECTION *connection) @@ -353,6 +355,7 @@ BOOL NETCON_secure_connect(WININET_NETCO { ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string(pERR_get_error(), 0)); + INTERNET_SetLastError(ERROR_OUTOFMEMORY); return FALSE; } connection->ssl_s = pSSL_new(ctx); @@ -360,6 +363,7 @@ BOOL NETCON_secure_connect(WININET_NETCO { ERR("SSL_new failed: %s\n", pERR_error_string(pERR_get_error(), 0)); + INTERNET_SetLastError(ERROR_OUTOFMEMORY); goto fail; } @@ -367,6 +371,7 @@ BOOL NETCON_secure_connect(WININET_NETCO { ERR("SSL_set_fd failed: %s\n", pERR_error_string(pERR_get_error(), 0)); + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); goto fail; } @@ -397,7 +402,7 @@ BOOL NETCON_secure_connect(WININET_NETCO hostname_unix = HeapAlloc(GetProcessHeap(), 0, len); if (!hostname_unix) { - INTERNET_SetLastError(ERROR_NOT_ENOUGH_MEMORY); + INTERNET_SetLastError(ERROR_OUTOFMEMORY); goto fail; } WideCharToMultiByte(CP_UNIXCP, 0, hostname, -1, hostname_unix, len, NULL, NULL);

1 0

Alexandre Julliard : libwine: Export a function to retrieve the data directory (based on a
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 2f026d1694d6e34b6e2d9d4d61ef5632e6f3251d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f026d1694d6e34b6e2d9d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 18:50:15 2006 +0100 libwine: Export a function to retrieve the data directory (based on a patch by Dmitry Timoshkov). --- include/wine/library.h | 1 + libs/wine/Makefile.in | 4 +++- libs/wine/config.c | 9 +++++++++ libs/wine/wine.def | 1 + libs/wine/wine.map | 1 + 5 files changed, 15 insertions(+), 1 deletions(-) diff --git a/include/wine/library.h b/include/wine/library.h index e92262c..385256d 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -30,6 +30,7 @@ /* configuration */ extern const char *wine_get_config_dir(void); +extern const char *wine_get_data_dir(void); extern const char *wine_get_server_dir(void); extern const char *wine_get_user_name(void); extern void wine_init_argv0_path( const char *argv0 ); diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 9304175..9d5d6ee 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -23,7 +23,9 @@ CONFIGDIRS = \ -DDLLDIR='"$(dlldir)"' \ -DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \ -DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \ - -DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" + -DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" \ + -DLIB_TO_DATADIR=\"`$(RELPATH) $(libdir) $(datadir)/wine`\" \ + -DBIN_TO_DATADIR=\"`$(RELPATH) $(bindir) $(datadir)/wine`\" config.o: config.c $(RELPATH) $(CC) -c $(ALLCFLAGS) -o $@ $(SRCDIR)/config.c $(CONFIGDIRS) diff --git a/libs/wine/config.c b/libs/wine/config.c index ca1080a..9bafe0f 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -41,6 +41,7 @@ static const char server_dir_prefix[] = static char *bindir; static char *dlldir; +static char *datadir; static char *config_dir; static char *server_dir; static char *user_name; @@ -248,6 +249,7 @@ void wine_init_argv0_path( const char *a { bindir = build_path( libdir, LIB_TO_BINDIR ); dlldir = build_path( libdir, LIB_TO_DLLDIR ); + datadir = build_path( libdir, LIB_TO_DATADIR ); return; } @@ -283,6 +285,7 @@ void wine_init_argv0_path( const char *a } dlldir = build_path( bindir, BIN_TO_DLLDIR ); + datadir = build_path( bindir, BIN_TO_DATADIR ); } /* return the configuration directory ($WINEPREFIX or $HOME/.wine) */ @@ -292,6 +295,12 @@ const char *wine_get_config_dir(void) return config_dir; } +/* retrieve the wine data dir */ +const char *wine_get_data_dir(void) +{ + return datadir; +} + /* return the full name of the server directory (the one containing the socket) */ const char *wine_get_server_dir(void) { diff --git a/libs/wine/wine.def b/libs/wine/wine.def index ffd8667..0388374 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -27,6 +27,7 @@ EXPORTS wine_exec_wine_binary wine_get_config_dir wine_get_cs + wine_get_data_dir wine_get_ds wine_get_es wine_get_fs diff --git a/libs/wine/wine.map b/libs/wine/wine.map index b230047..3a9c72a 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -27,6 +27,7 @@ WINE_1.0 wine_exec_wine_binary; wine_get_config_dir; wine_get_cs; + wine_get_data_dir; wine_get_ds; wine_get_es; wine_get_fs;

1 0