December 2009 - Wine-commits

Henri Verbeet : wined3d: Remove a few redundant assignments.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: d2ad2df6377125beebf841bf9696f39aa2275455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ad2df6377125beebf841bf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:15 2009 +0100 wined3d: Remove a few redundant assignments. --- dlls/wined3d/arb_program_shader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6401407..42ed898 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5275,7 +5275,6 @@ static void state_texfactor_arbfp(DWORD state, IWineD3DStateBlockImpl *statebloc if(device->shader_backend == &arb_program_shader_backend) { if (use_ps(stateblock)) return; - device = stateblock->wineD3DDevice; context->pshader_const_dirty[ARB_FFP_CONST_TFACTOR] = 1; device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_TFACTOR + 1); } @@ -5297,7 +5296,6 @@ static void state_arb_specularenable(DWORD state, IWineD3DStateBlockImpl *stateb if(device->shader_backend == &arb_program_shader_backend) { if (use_ps(stateblock)) return; - device = stateblock->wineD3DDevice; context->pshader_const_dirty[ARB_FFP_CONST_SPECULAR_ENABLE] = 1; device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_SPECULAR_ENABLE + 1); }

1 0

Henri Verbeet : d3d8: Forward the volume's GetDevice() to the texture instead of the wined3d volume.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 789fed5095f067350a451fa9b1783b0fd13ba9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=789fed5095f067350a451fa9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:16 2009 +0100 d3d8: Forward the volume's GetDevice() to the texture instead of the wined3d volume. --- dlls/d3d8/volume.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 8948997..8e8dc60 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -94,19 +94,24 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { } /* IDirect3DVolume8 Interface follow: */ -static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, IDirect3DDevice8 **device) +{ IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - IWineD3DDevice *myDevice = NULL; + IDirect3DResource8 *resource; + HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice); - IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); - IWineD3DDevice_Release(myDevice); - wined3d_mutex_unlock(); + hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource8, (void **)&resource); + if (SUCCEEDED(hr)) + { + hr = IDirect3DResource8_GetDevice(resource, device); + IDirect3DResource8_Release(resource); - return D3D_OK; + TRACE("Returning device %p.\n", *device); + } + + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) {

1 0

Henri Verbeet : d3d9: Forward the volume's GetDevice() to the texture instead of the wined3d volume.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: c2cf1935635d348ea1ffdcfebbbe08b71b65d157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cf1935635d348ea1ffdcfeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:17 2009 +0100 d3d9: Forward the volume's GetDevice() to the texture instead of the wined3d volume. --- dlls/d3d9/volume.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 0d83ce1..baa286b 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -94,21 +94,24 @@ static ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { } /* IDirect3DVolume9 Interface follow: */ -static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(LPDIRECT3DVOLUME9 iface, IDirect3DDevice9** ppDevice) { +static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(IDirect3DVolume9 *iface, IDirect3DDevice9 **device) +{ IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - IWineD3DDevice *myDevice = NULL; + IDirect3DResource9 *resource; + HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - - IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice); - IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); - IWineD3DDevice_Release(myDevice); + hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource9, (void **)&resource); + if (SUCCEEDED(hr)) + { + hr = IDirect3DResource9_GetDevice(resource, device); + IDirect3DResource9_Release(resource); - wined3d_mutex_unlock(); + TRACE("Returning device %p.\n", *device); + } - return D3D_OK; + return hr; } static HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(LPDIRECT3DVOLUME9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {

1 0

Henri Verbeet : wined3d: Remove unused GetDevice() implementations.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: b6ef17f23d6d24691e439f5bb8b1b1342b3bbcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ef17f23d6d24691e439f5bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:18 2009 +0100 wined3d: Remove unused GetDevice() implementations. --- dlls/wined3d/buffer.c | 6 ------ dlls/wined3d/cubetexture.c | 5 ----- dlls/wined3d/pixelshader.c | 10 ---------- dlls/wined3d/query.c | 12 ------------ dlls/wined3d/resource.c | 9 --------- dlls/wined3d/stateblock.c | 11 ----------- dlls/wined3d/surface.c | 1 - dlls/wined3d/surface_base.c | 4 ---- dlls/wined3d/surface_gdi.c | 1 - dlls/wined3d/texture.c | 5 ----- dlls/wined3d/vertexdeclaration.c | 11 ----------- dlls/wined3d/vertexshader.c | 9 --------- dlls/wined3d/volume.c | 5 ----- dlls/wined3d/volumetexture.c | 5 ----- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.idl | 15 --------------- 16 files changed, 0 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6ef17f23d6d24691e439…

1 0

Henri Verbeet : wined3d: Only disable blending for offscreen targets.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: bfe6695d30bb0d2cb6a97d83cea66cf417bb144e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe6695d30bb0d2cb6a97d83c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:19 2009 +0100 wined3d: Only disable blending for offscreen targets. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6df6e54..716ec48 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -252,7 +252,8 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, struct /* Disable blending in all cases even without pixelshaders. With blending on we could face a big performance penalty. * The d3d9 visual test confirms the behavior. */ - if (!(target->resource.format_desc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + if (context->render_offscreen + && !(target->resource.format_desc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) { glDisable(GL_BLEND); checkGLcall("glDisable GL_BLEND");

1 0

Nikolay Sivov : comctl32/listview: Update item width every time new item is inserted.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: c2a7535e9d112989abe687255b4f0da9a597678e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a7535e9d112989abe687255… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 9 15:17:12 2009 +0300 comctl32/listview: Update item width every time new item is inserted. This prevents retaining previously stored width and unexpected item displaying collapsing with ending ellipsis. --- dlls/comctl32/listview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8f6db54..3d32708 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2834,6 +2834,8 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) nItemWidth += WIDTH_PADDING; } + TRACE("nItemWidth=%d\n", nItemWidth); + return nItemWidth; } @@ -7476,7 +7478,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems ); if (nItem == -1) goto fail; - if (infoPtr->nItemCount++ == 0) LISTVIEW_UpdateItemSize(infoPtr); + if (++infoPtr->nItemCount > 0) LISTVIEW_UpdateItemSize(infoPtr); /* shift indices first so they don't get tangled */ LISTVIEW_ShiftIndices(infoPtr, nItem, 1);

1 0

Nikolay Sivov : shell32: Fix some trace typos.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: daf99d4bddb205236b36a97218888a090743729e URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf99d4bddb205236b36a9721… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 9 15:49:51 2009 +0300 shell32: Fix some trace typos. --- dlls/shell32/shlview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 47167a7..6deed53 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1321,7 +1321,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn break; case NM_RETURN: - TRACE("-- NM_DBLCLK %p\n",This); + TRACE("-- NM_RETURN %p\n",This); if (OnDefaultCommand(This) != S_OK) ShellView_OpenSelectedItems(This); break; @@ -1441,7 +1441,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn DWORD dwAttr = SFGAO_CANRENAME; pidl = (LPITEMIDLIST)lpdi->item.lParam; - TRACE("-- LVN_BEGINLABELEDITA %p\n",This); + TRACE("-- LVN_BEGINLABELEDITW %p\n",This); IShellFolder_GetAttributesOf(This->pSFParent, 1, (LPCITEMIDLIST*)&pidl, &dwAttr); if (SFGAO_CANRENAME & dwAttr)

1 0

Alexandre Julliard : shlwapi/tests: Avoid size_t in traces.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 321292a26c9c69e6d3dc449a4dafcb2214112310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321292a26c9c69e6d3dc449a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:19:43 2009 +0100 shlwapi/tests: Avoid size_t in traces. --- dlls/shlwapi/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 0c2900e..0138c35 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1023,7 +1023,7 @@ static void test_ParseURL(void) parseda.pszSuffix, test->url+test->protocol_len+1); ok(parseda.cchSuffix == strlen(test->url+test->protocol_len+1), "parseda.pszSuffix = %d, expected %d\n", - parseda.cchSuffix, strlen(test->url+test->protocol_len+1)); + parseda.cchSuffix, lstrlenA(test->url+test->protocol_len+1)); ok(parseda.nScheme == test->scheme, "parseda.nScheme = %d, expected %d\n", parseda.nScheme, test->scheme); }else { @@ -1046,7 +1046,7 @@ static void test_ParseURL(void) wine_dbgstr_w(parsedw.pszSuffix), wine_dbgstr_w(url+test->protocol_len+1)); ok(parsedw.cchSuffix == strlen(test->url+test->protocol_len+1), "parsedw.pszSuffix = %d, expected %d\n", - parsedw.cchSuffix, strlen(test->url+test->protocol_len+1)); + parsedw.cchSuffix, lstrlenA(test->url+test->protocol_len+1)); ok(parsedw.nScheme == test->scheme, "parsedw.nScheme = %d, expected %d\n", parsedw.nScheme, test->scheme); }else {

1 0

Alexandre Julliard : ntdll/tests: Avoid size_t in traces.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 70c20027a98722cde3e38dee90b3570e23244941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c20027a98722cde3e38dee9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:19:48 2009 +0100 ntdll/tests: Avoid size_t in traces. --- dlls/ntdll/tests/file.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7e8f101..d98488b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1191,22 +1191,20 @@ static void test_file_name_information(void) hr, STATUS_BUFFER_OVERFLOW); ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_BUFFER_OVERFLOW); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u, expected %u.\n", - info->FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); ok(info->FileName[2] == 0xcccc, "info->FileName[2] is %#x, expected 0xcccc.\n", info->FileName[2]); ok(CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), "info->FileName[1] is %p, expected %p.\n", CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); - ok(io.Information == sizeof(*info), "io.Information is %lu, expected %u.\n", io.Information, sizeof(*info)); + ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information); memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u, expected %u.\n", - info->FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); - ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[%u] is %#x, expected 0xcccc.\n", - info->FileNameLength / sizeof(WCHAR), info->FileName[info->FileNameLength / sizeof(WCHAR)]); + ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); + ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[len] is %#x, expected 0xcccc.\n", + info->FileName[info->FileNameLength / sizeof(WCHAR)]); info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); @@ -1324,35 +1322,30 @@ static void test_file_all_name_information(void) ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_BUFFER_OVERFLOW); ok(info->NameInformation.FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), - "info->NameInformation.FileNameLength is %u, expected %u.\n", - info->NameInformation.FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + "info->NameInformation.FileNameLength is %u\n", info->NameInformation.FileNameLength ); ok(info->NameInformation.FileName[2] == 0xcccc, "info->NameInformation.FileName[2] is %#x, expected 0xcccc.\n", info->NameInformation.FileName[2]); ok(CharLowerW((LPWSTR)(UINT_PTR)info->NameInformation.FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), "info->NameInformation.FileName[1] is %p, expected %p.\n", CharLowerW((LPWSTR)(UINT_PTR)info->NameInformation.FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); - ok(io.Information == sizeof(*info), "io.Information is %lu, expected %u.\n", io.Information, sizeof(*info)); + ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information); memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, info_size, FileAllInformation ); ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); ok(info->NameInformation.FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), - "info->NameInformation.FileNameLength is %u, expected %u.\n", - info->NameInformation.FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + "info->NameInformation.FileNameLength is %u\n", info->NameInformation.FileNameLength ); ok(info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] == 0xcccc, - "info->NameInformation.FileName[%u] is %#x, expected 0xcccc.\n", - info->NameInformation.FileNameLength / sizeof(WCHAR), - info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)]); + "info->NameInformation.FileName[len] is %#x, expected 0xcccc.\n", + info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)]); info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] = '\0'; ok(!lstrcmpiW( info->NameInformation.FileName, expected ), "info->NameInformation.FileName is %s, expected %s.\n", wine_dbgstr_w( info->NameInformation.FileName ), wine_dbgstr_w( expected )); ok(io.Information == FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + info->NameInformation.FileNameLength, - "io.Information is %lu, expected %u.\n", - io.Information, - FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + info->NameInformation.FileNameLength); + "io.Information is %lu\n", io.Information ); CloseHandle( h ); HeapFree( GetProcessHeap(), 0, info );

1 0

Alexandre Julliard : winex11: Fix a compiler warning.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: e099b80a6f26e133fb9996ab9baf257d8dd3e893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e099b80a6f26e133fb9996ab9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 13:13:29 2009 +0100 winex11: Fix a compiler warning. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index aadb7f1..38f1dad 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -368,7 +368,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) /* In general indirect rendering on a local X11 server indicates a driver problem. * Detect a local X11 server by checking whether the X11 socket is a Unix socket. */ - if(!getsockname(fd, &uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) + if(!getsockname(fd, (struct sockaddr *)&uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers haven't been installed correctly\n"); }

1 0