October 2008 - Wine-Commits

Henri Verbeet : wined3d: We only need to enable texturing for a target if we' re going to draw with it (without a shader).
by Alexandre Julliard Oct. 15, 2008

Oct. 15, 2008

Module: wine Branch: master Commit: c777f962a213cfd7cf7c249003d61e5293240eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c777f962a213cfd7cf7c24900… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 15 13:35:31 2008 +0200 wined3d: We only need to enable texturing for a target if we're going to draw with it (without a shader). Also, these enables cause problems if they're done while the context is setup for blitting. --- dlls/wined3d/drawprim.c | 1 - dlls/wined3d/surface.c | 12 ------------ 2 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 31bbb85..c212f14 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -673,7 +673,6 @@ void depth_blt(IWineD3DDevice *iface, GLuint texture, GLsizei w, GLsizei h) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); glBindTexture(GL_TEXTURE_2D, texture); - glEnable(GL_TEXTURE_2D); This->shader_backend->shader_select_depth_blt(iface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c22a547..6f0c107 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2217,7 +2217,6 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, device->paletteConversionShader)); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE1)); - glEnable(GL_TEXTURE_1D); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); @@ -2379,8 +2378,6 @@ static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface) { ENTER_GL(); - glEnable(This->glDescription.target); - if (!This->glDescription.level) { if (!This->glDescription.textureName) { glGenTextures(1, &This->glDescription.textureName); @@ -2452,7 +2449,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch GLint prevRead; ENTER_GL(); TRACE("(%p) Reading render target into texture\n", This); - glEnable(GL_TEXTURE_2D); glGenTextures(1, &tmpTexture); glBindTexture(GL_TEXTURE_2D, tmpTexture); @@ -2818,10 +2814,6 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D IWineD3DSurface_PreLoad((IWineD3DSurface *) This); ENTER_GL(); - /* TODO: Do we need GL_TEXTURE_2D enabled fpr copyteximage? */ - glEnable(This->glDescription.target); - checkGLcall("glEnable(This->glDescription.target)"); - /* Bind the target texture */ glBindTexture(This->glDescription.target, This->glDescription.textureName); checkGLcall("glBindTexture"); @@ -2891,10 +2883,6 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } vcheckGLcall("glCopyTexSubImage2D"); - /* Leave the opengl state valid for blitting */ - glDisable(This->glDescription.target); - checkGLcall("glDisable(This->glDescription.target)"); - LEAVE_GL(); }

1 0

Henri Verbeet : wined3d: Cleanup properly if creating the context array fails in CreateAdditionalSwapChain ().
by Alexandre Julliard Oct. 15, 2008

Oct. 15, 2008

Module: wine Branch: master Commit: 2889b42a3f48abb18a079c4063acf958d2a090bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2889b42a3f48abb18a079c406… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 15 13:35:31 2008 +0200 wined3d: Cleanup properly if creating the context array fails in CreateAdditionalSwapChain(). --- dlls/wined3d/device.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e62d24..3111993 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1550,8 +1550,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic /** FIXME: Handle stencil appropriately via EnableAutoDepthStencil / AutoDepthStencilFormat **/ object->context = HeapAlloc(GetProcessHeap(), 0, sizeof(object->context)); - if(!object->context) - return E_OUTOFMEMORY; + if(!object->context) { + ERR("Failed to create the context array\n"); + hr = E_OUTOFMEMORY; + goto error; + } object->num_contexts = 1; if(surface_type == SURFACE_OPENGL) {

1 0

Henri Verbeet : wined3d: Don't crash in CreateAdditionalSwapChain() if the context array wasn't allocated yet.
by Alexandre Julliard Oct. 15, 2008

Oct. 15, 2008

Module: wine Branch: master Commit: 2bb7aa7252aff1dd6e4e48b9ad3c108be867c4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb7aa7252aff1dd6e4e48b9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 15 13:35:31 2008 +0200 wined3d: Don't crash in CreateAdditionalSwapChain() if the context array wasn't allocated yet. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b90ac1d..7e62d24 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1677,7 +1677,7 @@ error: HeapFree(GetProcessHeap(), 0, object->backBuffer); object->backBuffer = NULL; } - if(object->context[0]) + if(object->context && object->context[0]) DestroyContext(This, object->context[0]); if(object->frontBuffer) { IWineD3DSurface_GetParent(object->frontBuffer, &bufferParent);

1 0

Reece Dunn : msvcmaker: The Visual Studio project conversion tool requires a configuration type.
by Alexandre Julliard Oct. 15, 2008

Oct. 15, 2008

Module: wine Branch: master Commit: 23787fc7d976b37c28678b2e9bac89b04ce08e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23787fc7d976b37c28678b2e9… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Wed Oct 15 08:19:00 2008 +0100 msvcmaker: The Visual Studio project conversion tool requires a configuration type. --- tools/winapi/msvcmaker | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 91ea656..c84b703 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -514,6 +514,12 @@ sub _generate_dsp($$) { push @_cfgs, "$cfg Release"; } @cfgs = @_cfgs; + } else { + my @_cfgs; + foreach my $cfg (@cfgs) { + push @_cfgs, "$cfg Debug"; + } + @cfgs = @_cfgs; } if (!$no_msvc_headers) {

1 0

Nikolay Sivov : oleacc: Implemented GetRoleText[A/W] with tests.
by Alexandre Julliard Oct. 15, 2008

Oct. 15, 2008

Module: wine Branch: master Commit: e2399a969ffa0253443a9302995a8977c7982bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2399a969ffa0253443a93029… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 14 22:18:08 2008 +0400 oleacc: Implemented GetRoleText[A/W] with tests. --- configure | 9 +++ configure.ac | 1 + dlls/oleacc/Makefile.in | 4 +- dlls/oleacc/main.c | 74 +++++++++++++++++++++++++ dlls/oleacc/oleacc.rc | 24 ++++++++ dlls/oleacc/oleacc.spec | 4 +- dlls/oleacc/oleacc_En.rc | 90 ++++++++++++++++++++++++++++++ dlls/oleacc/tests/Makefile.in | 13 +++++ dlls/oleacc/tests/main.c | 121 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 337 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2399a969ffa0253443a9…

1 0

Austin English : wininet: Quiet a noisy fixme.
by Alexandre Julliard Oct. 15, 2008

Oct. 15, 2008

Module: wine Branch: master Commit: 3d143253e431c00ab751d84c94b5571526790930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d143253e431c00ab751d84c9… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 14 23:44:53 2008 -0500 wininet: Quiet a noisy fixme. --- dlls/wininet/internet.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b027c1a..277ea23 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2024,6 +2024,8 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) { + static BOOL warn = TRUE; + switch(option) { case INTERNET_OPTION_REQUEST_FLAGS: TRACE("INTERNET_OPTION_REQUEST_FLAGS\n"); @@ -2050,8 +2052,11 @@ DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) return ERROR_SUCCESS; case INTERNET_OPTION_CONNECTED_STATE: - FIXME("INTERNET_OPTION_CONNECTED_STATE: semi-stub\n"); + if (warn) { + FIXME("INTERNET_OPTION_CONNECTED_STATE: semi-stub\n"); + warn = FALSE; + } if (*size < sizeof(ULONG)) return ERROR_INSUFFICIENT_BUFFER;

1 0

Austin English : advapi32: Quiet a noisy fixme.
by Alexandre Julliard Oct. 15, 2008

Oct. 15, 2008

Module: wine Branch: master Commit: 6f23a98c08d6af674bb525e54014d5fe24cc1710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f23a98c08d6af674bb525e54… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 14 22:43:23 2008 -0500 advapi32: Quiet a noisy fixme. --- dlls/advapi32/security.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ca26217..832e6fa 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2315,9 +2315,13 @@ BOOL WINAPI ImpersonateLoggedOnUser(HANDLE hToken) NTSTATUS Status; HANDLE ImpersonationToken; TOKEN_TYPE Type; + static BOOL warn = TRUE; - FIXME( "(%p)\n", hToken ); - + if (warn) + { + FIXME( "(%p)\n", hToken ); + warn = FALSE; + } if (!GetTokenInformation( hToken, TokenType, &Type, sizeof(TOKEN_TYPE), &size )) return FALSE;

1 0

Lei Zhang : user32: Send messages for edit control context menu operations.
by Alexandre Julliard Oct. 15, 2008

Oct. 15, 2008

Module: wine Branch: master Commit: ec91536ec9628259004c3cacc54adfb99a007922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec91536ec9628259004c3cacc… Author: Lei Zhang <thestig(a)google.com> Date: Tue Oct 14 17:56:52 2008 -0700 user32: Send messages for edit control context menu operations. --- dlls/user32/edit.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index dcf9550..4b4e286 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4103,19 +4103,19 @@ static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND control) switch (id) { case EM_UNDO: - EDIT_EM_Undo(es); + SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); break; case WM_CUT: - EDIT_WM_Cut(es); + SendMessageW(es->hwndSelf, WM_CUT, 0, 0); break; case WM_COPY: - EDIT_WM_Copy(es); + SendMessageW(es->hwndSelf, WM_COPY, 0, 0); break; case WM_PASTE: - EDIT_WM_Paste(es); + SendMessageW(es->hwndSelf, WM_PASTE, 0, 0); break; case WM_CLEAR: - EDIT_WM_Clear(es); + SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0); break; case EM_SETSEL: EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE);

1 0

Lei Zhang : shlwapi: Properly handle pszExtra in IQueryAssociations_GetString.
by Alexandre Julliard Oct. 15, 2008

Oct. 15, 2008

Module: wine Branch: master Commit: dc9eeb75bad00006542a8068a024a604f68ad77e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9eeb75bad00006542a8068a… Author: Lei Zhang <thestig(a)google.com> Date: Tue Oct 14 15:06:45 2008 -0700 shlwapi: Properly handle pszExtra in IQueryAssociations_GetString. --- dlls/shlwapi/tests/assoc.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index e5d40d1..2e383bb 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -32,6 +32,19 @@ static const WCHAR dotBad[] = { '.','b','a','d',0 }; static const WCHAR open[] = { 'o','p','e','n',0 }; static const WCHAR invalid[] = { 'i','n','v','a','l','i','d',0 }; +/* copied from libs/wine/string.c */ +WCHAR *strstrW(const WCHAR *str, const WCHAR *sub) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) return (WCHAR *)str; + str++; + } + return NULL; +} + static void test_getstring_bad(void) { HRESULT hr; @@ -127,8 +140,67 @@ static void test_getstring_basic(void) HeapFree(GetProcessHeap(), 0, friendlyName); } +static void test_getstring_no_extra(void) +{ + LONG ret; + HKEY hkey; + HRESULT hr; + static const WCHAR dotWinetest[] = { + '.','w','i','n','e','t','e','s','t',0 + }; + static const WCHAR winetestfile[] = { + 'w','i','n','e','t','e','s','t', 'f','i','l','e',0 + }; + static const WCHAR winetestfileAction[] = { + 'w','i','n','e','t','e','s','t','f','i','l','e', + '\\','s','h','e','l','l', + '\\','f','o','o', + '\\','c','o','m','m','a','n','d',0 + }; + static const WCHAR action[] = { + 'n','o','t','e','p','a','d','.','e','x','e',0 + }; + WCHAR buf[MAX_PATH]; + DWORD len = MAX_PATH; + + ret = RegCreateKeyW(HKEY_CLASSES_ROOT, dotWinetest, &hkey); + if (ret != ERROR_SUCCESS) + skip("failed to create dotWinetest key\n"); + ret = RegSetValueW(hkey, NULL, REG_SZ, winetestfile, + lstrlenW(winetestfile)); + RegCloseKey(hkey); + if (ret != ERROR_SUCCESS) + { + RegDeleteTreeW(HKEY_CLASSES_ROOT, dotWinetest); + skip("failed to set dotWinetest key\n"); + } + + ret = RegCreateKeyW(HKEY_CLASSES_ROOT, winetestfileAction, &hkey); + if (ret != ERROR_SUCCESS) + { + RegDeleteTreeW(HKEY_CLASSES_ROOT, dotWinetest); + skip("failed to create winetestfileAction key\n"); + } + ret = RegSetValueW(hkey, NULL, REG_SZ, action, lstrlenW(action)); + RegCloseKey(hkey); + if (ret != ERROR_SUCCESS) + { + RegDeleteTreeW(HKEY_CLASSES_ROOT, dotWinetest); + RegDeleteTreeW(HKEY_CLASSES_ROOT, winetestfile); + skip("failed to set winetestfileAction key\n"); + } + + hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotWinetest, NULL, + buf, &len); + expect_hr(S_OK, hr); + ok(strstrW(buf, action) != NULL, "exe path does not contain notepad\n"); + RegDeleteTreeW(HKEY_CLASSES_ROOT, dotWinetest); + RegDeleteTreeW(HKEY_CLASSES_ROOT, winetestfile); +} + START_TEST(assoc) { test_getstring_bad(); test_getstring_basic(); + test_getstring_no_extra(); }

1 0

Michael Karcher : msxml3: Initialize xmldoc->_private in IPersistStream:: Load for IXMLDOMDocument.
by Alexandre Julliard Oct. 15, 2008

Oct. 15, 2008

Module: wine Branch: master Commit: 859f3bff88970bbe74b36a55b5b6c67153f5c804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859f3bff88970bbe74b36a55b… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Tue Oct 14 23:51:51 2008 +0200 msxml3: Initialize xmldoc->_private in IPersistStream::Load for IXMLDOMDocument. --- dlls/msxml3/domdoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d03d8c7..8ef0db4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -330,6 +330,7 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( return E_FAIL; } + xmldoc->_private = create_priv(); attach_xmlnode( This->node, (xmlNodePtr)xmldoc ); return S_OK;

1 0