August 2011 - Wine-Commits - list.winehq.org

Michael Mc Donnell : d3dx9: Implemented ConvertPointRepsToAdjacency.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 507daa2154688d7b294591c078fb42b078eb3710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=507daa2154688d7b294591c07… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Mon Jun 27 22:44:33 2011 +0200 d3dx9: Implemented ConvertPointRepsToAdjacency. --- dlls/d3dx9_36/mesh.c | 177 +++++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 30 ++++---- 2 files changed, 190 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 0d17941..9a0fd03 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -432,13 +432,186 @@ static HRESULT WINAPI ID3DXMeshImpl_GetAttributeTable(ID3DXMesh *iface, D3DXATTR return D3D_OK; } +struct edge_face +{ + struct list entry; + DWORD v2; + DWORD face; +}; + +struct edge_face_map +{ + struct list *lists; + struct edge_face *entries; +}; + +/* Builds up a map of which face a new edge belongs to. That way the adjacency + * of another edge can be looked up. An edge has an adjacent face if there + * is an edge going in the opposite direction in the map. For example if the + * edge (v1, v2) belongs to face 4, and there is a mapping (v2, v1)->7, then + * face 4 and 7 are adjacent. + * + * Each edge might have been replaced with another edge, or none at all. There + * is at most one edge to face mapping, i.e. an edge can only belong to one + * face. + */ +static HRESULT init_edge_face_map(struct edge_face_map *edge_face_map, CONST DWORD *index_buffer, CONST DWORD *point_reps, CONST DWORD num_faces) +{ + DWORD face, edge; + DWORD i; + + edge_face_map->lists = HeapAlloc(GetProcessHeap(), 0, 3 * num_faces * sizeof(*edge_face_map->lists)); + if (!edge_face_map->lists) return E_OUTOFMEMORY; + + edge_face_map->entries = HeapAlloc(GetProcessHeap(), 0, 3 * num_faces * sizeof(*edge_face_map->entries)); + if (!edge_face_map->entries) return E_OUTOFMEMORY; + + + /* Initialize all lists */ + for (i = 0; i < 3 * num_faces; i++) + { + list_init(&edge_face_map->lists[i]); + } + /* Build edge face mapping */ + for (face = 0; face < num_faces; face++) + { + for (edge = 0; edge < 3; edge++) + { + DWORD v1 = index_buffer[3*face + edge]; + DWORD v2 = index_buffer[3*face + (edge+1)%3]; + DWORD new_v1 = point_reps[v1]; /* What v1 has been replaced with */ + DWORD new_v2 = point_reps[v2]; + + if (v1 != v2) /* Only map non-collapsed edges */ + { + i = 3*face + edge; + edge_face_map->entries[i].v2 = new_v2; + edge_face_map->entries[i].face = face; + list_add_head(&edge_face_map->lists[new_v1], &edge_face_map->entries[i].entry); + } + } + } + + return D3D_OK; +} + +static DWORD find_adjacent_face(struct edge_face_map *edge_face_map, DWORD vertex1, DWORD vertex2, CONST DWORD num_faces) +{ + struct edge_face *edge_face_ptr; + + LIST_FOR_EACH_ENTRY(edge_face_ptr, &edge_face_map->lists[vertex2], struct edge_face, entry) + { + if (edge_face_ptr->v2 == vertex1) + return edge_face_ptr->face; + } + + return -1; +} + +static DWORD *generate_identity_point_reps(DWORD num_vertices) +{ + DWORD *id_point_reps; + DWORD i; + + id_point_reps = HeapAlloc(GetProcessHeap(), 0, num_vertices * sizeof(*id_point_reps)); + if (!id_point_reps) + return NULL; + + for (i = 0; i < num_vertices; i++) + { + id_point_reps[i] = i; + } + + return id_point_reps; +} + static HRESULT WINAPI ID3DXMeshImpl_ConvertPointRepsToAdjacency(ID3DXMesh *iface, CONST DWORD *point_reps, DWORD *adjacency) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + HRESULT hr; + DWORD num_faces = iface->lpVtbl->GetNumFaces(iface); + DWORD num_vertices = iface->lpVtbl->GetNumVertices(iface); + DWORD options = iface->lpVtbl->GetOptions(iface); + BOOL indices_are_16_bit = !(options & D3DXMESH_32BIT); + DWORD *ib = NULL; + void *ib_ptr = NULL; + DWORD face; + DWORD edge; + struct edge_face_map edge_face_map = {0}; + CONST DWORD *point_reps_ptr = NULL; + DWORD *id_point_reps = NULL; - FIXME("(%p)->(%p,%p): stub\n", This, point_reps, adjacency); + TRACE("(%p)->(%p,%p)\n", This, point_reps, adjacency); - return E_NOTIMPL; + if (!adjacency) return D3DERR_INVALIDCALL; + + if (!point_reps) /* Identity point reps */ + { + id_point_reps = generate_identity_point_reps(num_vertices); + if (!id_point_reps) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + + point_reps_ptr = id_point_reps; + } + else + { + point_reps_ptr = point_reps; + } + + hr = iface->lpVtbl->LockIndexBuffer(iface, D3DLOCK_READONLY, &ib_ptr); + if (FAILED(hr)) goto cleanup; + + if (indices_are_16_bit) + { + /* Widen 16 bit to 32 bit */ + DWORD i; + WORD *ib_16bit = ib_ptr; + ib = HeapAlloc(GetProcessHeap(), 0, 3 * num_faces * sizeof(DWORD)); + if (!ib) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + for (i = 0; i < 3 * num_faces; i++) + { + ib[i] = ib_16bit[i]; + } + } + else + { + ib = ib_ptr; + } + + hr = init_edge_face_map(&edge_face_map, ib, point_reps_ptr, num_faces); + if (FAILED(hr)) goto cleanup; + + /* Create adjacency */ + for (face = 0; face < num_faces; face++) + { + for (edge = 0; edge < 3; edge++) + { + DWORD v1 = ib[3*face + edge]; + DWORD v2 = ib[3*face + (edge+1)%3]; + DWORD new_v1 = point_reps_ptr[v1]; + DWORD new_v2 = point_reps_ptr[v2]; + DWORD adj_face; + + adj_face = find_adjacent_face(&edge_face_map, new_v1, new_v2, num_faces); + adjacency[3*face + edge] = adj_face; + } + } + + hr = D3D_OK; +cleanup: + HeapFree(GetProcessHeap(), 0, id_point_reps); + if (indices_are_16_bit) HeapFree(GetProcessHeap(), 0, ib); + HeapFree(GetProcessHeap(), 0, edge_face_map.lists); + HeapFree(GetProcessHeap(), 0, edge_face_map.entries); + if(ib_ptr) iface->lpVtbl->UnlockIndexBuffer(iface); + return hr; } /* ConvertAdjacencyToPointReps helper function. diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d8f9b97..39c78e6 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -5923,28 +5923,28 @@ static void test_convert_point_reps_to_adjacency(void) /* Convert point representation to adjacency*/ memset(adjacency, -2, VERTS_PER_FACE * tc[i].num_faces * sizeof(*adjacency)); hr = mesh->lpVtbl->ConvertPointRepsToAdjacency(mesh, tc[i].point_reps, adjacency); - todo_wine ok(hr == D3D_OK, "ConvertPointRepsToAdjacency failed case %d. " - "Got %x expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "ConvertPointRepsToAdjacency failed case %d. " + "Got %x expected D3D_OK\n", i, hr); /* Check adjacency */ for (j = 0; j < VERTS_PER_FACE * tc[i].num_faces; j++) { - todo_wine ok(adjacency[j] == tc[i].exp_adjacency[j], - "Unexpected adjacency information at (%d, %d)." - " Got %d expected %d\n", - i, j, adjacency[j], tc[i].exp_adjacency[j]); + ok(adjacency[j] == tc[i].exp_adjacency[j], + "Unexpected adjacency information at (%d, %d)." + " Got %d expected %d\n", + i, j, adjacency[j], tc[i].exp_adjacency[j]); } /* NULL point representation is considered identity. */ memset(adjacency, -2, VERTS_PER_FACE * tc[i].num_faces * sizeof(*adjacency)); hr = mesh_null_check->lpVtbl->ConvertPointRepsToAdjacency(mesh, NULL, adjacency); - todo_wine ok(hr == D3D_OK, "ConvertPointRepsToAdjacency NULL point_reps. " + ok(hr == D3D_OK, "ConvertPointRepsToAdjacency NULL point_reps. " "Got %x expected D3D_OK\n", hr); for (j = 0; j < VERTS_PER_FACE * tc[i].num_faces; j++) { - todo_wine ok(adjacency[j] == tc[i].exp_id_adjacency[j], - "Unexpected adjacency information (id) at (%d, %d)." - " Got %d expected %d\n", - i, j, adjacency[j], tc[i].exp_id_adjacency[j]); + ok(adjacency[j] == tc[i].exp_id_adjacency[j], + "Unexpected adjacency information (id) at (%d, %d)." + " Got %d expected %d\n", + i, j, adjacency[j], tc[i].exp_id_adjacency[j]); } HeapFree(GetProcessHeap(), 0, adjacency); @@ -5954,11 +5954,11 @@ static void test_convert_point_reps_to_adjacency(void) /* NULL checks */ hr = mesh_null_check->lpVtbl->ConvertPointRepsToAdjacency(mesh_null_check, tc[0].point_reps, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "ConvertPointRepsToAdjacency NULL adjacency. " - "Got %x expected D3DERR_INVALIDCALL\n", hr); + ok(hr == D3DERR_INVALIDCALL, "ConvertPointRepsToAdjacency NULL adjacency. " + "Got %x expected D3DERR_INVALIDCALL\n", hr); hr = mesh_null_check->lpVtbl->ConvertPointRepsToAdjacency(mesh_null_check, NULL, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "ConvertPointRepsToAdjacency NULL point_reps and adjacency. " - "Got %x expected D3DERR_INVALIDCALL\n", hr); + ok(hr == D3DERR_INVALIDCALL, "ConvertPointRepsToAdjacency NULL point_reps and adjacency. " + "Got %x expected D3DERR_INVALIDCALL\n", hr); cleanup: if (mesh_null_check)

1 0

Camillo Lugaresi : configure: Fix problem with linking on OS X 10.7.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 0b5dcbafea44bf68ec72494cc9f2c6f2dbb2cd16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5dcbafea44bf68ec72494cc… Author: Camillo Lugaresi <camillo.lugaresi(a)gmail.com> Date: Tue Aug 2 04:31:53 2011 +0200 configure: Fix problem with linking on OS X 10.7. Some of the new link commands in the latest ld appear to be buggy and cause bus error while initializing libSystem. Fixed by reverting to 10.6 linking behavior. --- configure | 10 ++++++++-- configure.ac | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 0fbfd51..3876127 100755 --- a/configure +++ b/configure @@ -6417,8 +6417,14 @@ fi APPLICATIONSERVICESLIB="-framework ApplicationServices" - LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000" - + case $host_os in + darwin11*) + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000" + ;; + *) + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000" + ;; + esac if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation" diff --git a/configure.ac b/configure.ac index 8104f7f..ecd74d6 100644 --- a/configure.ac +++ b/configure.ac @@ -697,7 +697,12 @@ case $host_os in AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") - AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) + case $host_os in + darwin11*) + AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) ;; + *) + AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) ;; + esac if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found

1 0

Frédéric Delanoy : cmd/tests: Additional tests for variable delayed expansion.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 0cfe9fa6a5e4ebb95394cd5b21a6d7a2bd9009b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cfe9fa6a5e4ebb95394cd5b2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 2 10:10:52 2011 +0200 cmd/tests: Additional tests for variable delayed expansion. --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f8c72e..eb79fb2 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -207,6 +207,15 @@ set FOO=foo echo %FOO% echo !FOO! set FOO= +echo ...using /V cmd flag +echo @echo off> tmp.cmd +echo set FOO=foo>> tmp.cmd +echo echo %%FOO%%>> tmp.cmd +echo echo !FOO!>> tmp.cmd +echo set FOO=>> tmp.cmd +cmd /V:ON /C tmp.cmd +cmd /V:OfF /C tmp.cmd +del tmp.cmd echo ------------ Testing conditional execution -------------- echo ...unconditional ^& diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b754faf..463b225 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -161,6 +161,11 @@ foo 0(a)or_broken@1 foo !FOO! +...using /V cmd flag +foo +(a)todo_wine@foo(a)or_broken@!FOO! +foo +!FOO! ------------ Testing conditional execution -------------- @todo_wine(a)...unconditional & foo1

1 0

Huw Davies : gdi32: Add a copy_rect primitive.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 2521bf3cc2d236169921c7217df56cf3e970cd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2521bf3cc2d236169921c7217… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 2 14:11:08 2011 +0100 gdi32: Add a copy_rect primitive. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 331 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 332 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2521bf3cc2d236169921c…

1 0

Jay Yang : shell32/tests: Add tests for SHCreateDefaultContextMenu.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 23c8704cb50818a0cdb586e9ae43e391e52c23c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c8704cb50818a0cdb586e9a… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Mon Aug 1 17:47:52 2011 -0400 shell32/tests: Add tests for SHCreateDefaultContextMenu. --- dlls/shell32/tests/shlfolder.c | 90 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 0006155..c0533cb 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -71,6 +71,7 @@ static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); +static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static WCHAR *make_wstr(const char *str) { @@ -126,6 +127,7 @@ static void init_function_pointers(void) MAKEFUNC(SHGetItemFromDataObject); MAKEFUNC(SHGetIDListFromObject); MAKEFUNC(SHGetItemFromObject); + MAKEFUNC(SHCreateDefaultContextMenu); #undef MAKEFUNC #define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) @@ -4475,6 +4477,93 @@ static void test_SHChangeNotify(void) ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); } +static void test_SHCreateDefaultContextMenu(void) +{ + HKEY keys[16]; + WCHAR path[MAX_PATH]; + IShellFolder *desktop,*folder; + IPersistFolder2 *persist; + IContextMenu *cmenu; + LONG status; + LPITEMIDLIST pidlFolder, pidl_child, pidl; + DEFCONTEXTMENU cminfo; + HRESULT hr; + UINT i; + const WCHAR filename[] = + {'\\','t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; + if(!pSHCreateDefaultContextMenu) + { + todo_wine win_skip("SHCreateDefaultContextMenu missing.\n"); + return; + } + + if(!pSHBindToParent) + { + skip("SHBindToParent missing.\n"); + return; + } + + GetCurrentDirectoryW(MAX_PATH, path); + if(!lstrlenW(path)) + { + skip("GetCurrentDirectoryW returned an empty string.\n"); + return; + } + lstrcatW(path, filename); + SHGetDesktopFolder(&desktop); + + CreateFilesFolders(); + + hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, path, NULL, &pidl, 0); + ok(hr == S_OK || broken(hr == E_FAIL) /* WinME */, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + + hr = pSHBindToParent(pidl, &IID_IShellFolder, (void**)&folder, (LPCITEMIDLIST*)&pidl_child); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + IShellFolder_QueryInterface(folder,&IID_IPersistFolder2,(void**)&persist); + IPersistFolder2_GetCurFolder(persist,&pidlFolder); + IPersistFolder2_Release(persist); + if(SUCCEEDED(hr)) + { + + cminfo.hwnd=NULL; + cminfo.pcmcb=NULL; + cminfo.psf=folder; + cminfo.pidlFolder=NULL; + cminfo.apidl=(LPCITEMIDLIST*)&pidl_child; + cminfo.cidl=1; + cminfo.aKeys=NULL; + cminfo.cKeys=0; + cminfo.punkAssociationInfo=NULL; + hr = pSHCreateDefaultContextMenu(&cminfo,&IID_IContextMenu,(void**)&cmenu); + ok(hr==S_OK,"Got 0x%08x\n", hr); + IContextMenu_Release(cmenu); + cminfo.pidlFolder=pidlFolder; + hr = pSHCreateDefaultContextMenu(&cminfo,&IID_IContextMenu,(void**)&cmenu); + ok(hr==S_OK,"Got 0x%08x\n", hr); + IContextMenu_Release(cmenu); + status = RegOpenKeyExA(HKEY_CLASSES_ROOT,"*",0,KEY_READ,keys); + if(status==ERROR_SUCCESS){ + for(i=1;i<16;i++) + keys[i]=keys[0]; + cminfo.aKeys=keys; + cminfo.cKeys=16; + hr = pSHCreateDefaultContextMenu(&cminfo,&IID_IContextMenu,(void**)&cmenu); + RegCloseKey(keys[0]); + ok(hr==S_OK,"Got 0x%08x\n", hr); + IContextMenu_Release(cmenu); + } + } + ILFree(pidlFolder); + IShellFolder_Release(folder); + } + IShellFolder_Release(desktop); + ILFree(pidl); + Cleanup(); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -4509,6 +4598,7 @@ START_TEST(shlfolder) test_SHChangeNotify(); test_ShellItemBindToHandler(); test_ShellItemGetAttributes(); + test_SHCreateDefaultContextMenu(); OleUninitialize(); }

1 0

Huw Davies : gdi32: Add a PutImage implementation to the dib driver.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: d4076d438cb5ff05f6800cdaae7ac88844e70595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4076d438cb5ff05f6800cdaa… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 2 14:11:10 2011 +0100 gdi32: Add a PutImage implementation to the dib driver. --- dlls/gdi32/dibdrv/dc.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 186 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index dacd40b..d9a2443 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -293,6 +293,33 @@ static void update_masks( dibdrv_physdev *pdev, INT rop ) calc_and_xor_masks( rop, pdev->bkgnd_color, &pdev->bkgnd_and, &pdev->bkgnd_xor ); } + /*********************************************************************** + * add_extra_clipping_region + * + * Temporarily add a region to the current clipping region. + * The returned region must be restored with restore_clipping_region. + */ +static HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) +{ + HRGN ret, clip; + + if (!(clip = CreateRectRgn( 0, 0, 0, 0 ))) return 0; + CombineRgn( clip, pdev->clip, rgn, RGN_AND ); + ret = pdev->clip; + pdev->clip = clip; + return ret; +} + +/*********************************************************************** + * restore_clipping_region + */ +static void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) +{ + if (!rgn) return; + DeleteObject( pdev->clip ); + pdev->clip = rgn; +} + /*********************************************************************** * dibdrv_DeleteDC */ @@ -433,6 +460,164 @@ static DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, return ERROR_SUCCESS; } +static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) +{ + switch (info->bmiHeader.biBitCount) + { + case 1: + case 4: + case 8: + { + RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); + if (dib->color_table_size != info->bmiHeader.biClrUsed ) return FALSE; + return memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); + } + + case 16: + { + DWORD *masks = (DWORD *)info->bmiColors; + if (info->bmiHeader.biCompression == BI_RGB) return dib->funcs == &funcs_555; + if (info->bmiHeader.biCompression == BI_BITFIELDS) + return masks[0] == dib->red_mask && masks[1] == dib->green_mask && masks[2] == dib->blue_mask; + break; + } + + case 24: + return TRUE; + + case 32: + { + DWORD *masks = (DWORD *)info->bmiColors; + if (info->bmiHeader.biCompression == BI_RGB) return dib->funcs == &funcs_8888; + if (info->bmiHeader.biCompression == BI_BITFIELDS) + return masks[0] == dib->red_mask && masks[1] == dib->green_mask && masks[2] == dib->blue_mask; + break; + } + + } + + return FALSE; +} + +static inline BOOL rop_uses_pat(DWORD rop) +{ + return ((rop >> 4) & 0x0f0000) != (rop & 0x0f0000); +} + +/*********************************************************************** + * dibdrv_PutImage + */ +static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) +{ + dib_info *dib, stand_alone; + DWORD ret; + RECT rect; + POINT origin; + dib_info src_dib; + HRGN total_clip, saved_clip = NULL; + dibdrv_physdev *pdev = NULL; + const WINEREGION *clip_data; + int i, rop2; + + TRACE( "%p %p %p\n", dev, hbitmap, info ); + + if (!hbitmap && rop_uses_pat( rop )) + { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPutImage ); + FIXME( "rop %08x unsupported, forwarding to graphics driver\n", rop ); + return next->funcs->pPutImage( next, 0, clip, info, bits, src, dst, rop ); + } + + if (hbitmap) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); + + if (!bmp) return ERROR_INVALID_HANDLE; + assert(bmp->dib); + + if (!init_dib_info( &stand_alone, &bmp->dib->dsBmih, bmp->dib->dsBitfields, + bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, 0 )) + { + ret = ERROR_BAD_FORMAT; + goto done; + } + dib = &stand_alone; + } + else + dib = &pdev->dib; + + if (info->bmiHeader.biPlanes != 1) goto update_format; + if (info->bmiHeader.biBitCount != dib->bit_count) goto update_format; + if (!matching_color_info( dib, info )) goto update_format; + if (!bits) + { + ret = ERROR_SUCCESS; + goto done; + } + if ((src->width != dst->width) || (src->height != dst->height)) + { + ret = ERROR_TRANSFORM_NOT_SUPPORTED; + goto done; + } + + init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 ); + + rect.left = dst->x; + rect.top = dst->y; + rect.right = dst->x + dst->width; + rect.bottom = dst->y + dst->height; + origin.x = src->x; + origin.y = src->y; + + if (hbitmap) + { + total_clip = clip; + rop2 = R2_COPYPEN; + } + else + { + if (clip) saved_clip = add_extra_clipping_region( pdev, clip ); + total_clip = pdev->clip; + rop2 = ((rop >> 16) & 0xf) + 1; + } + + if (total_clip == NULL) dib->funcs->copy_rect( dib, &rect, &src_dib, &origin, rop2 ); + else + { + clip_data = get_wine_region( total_clip ); + for (i = 0; i < clip_data->numRects; i++) + { + RECT clipped_rect; + + if (intersect_rect( &clipped_rect, &rect, clip_data->rects + i )) + { + origin.x = src->x + clipped_rect.left - dst->x; + origin.y = src->y + clipped_rect.top - dst->y; + dib->funcs->copy_rect( dib, &clipped_rect, &src_dib, &origin, rop2 ); + } + } + release_wine_region( total_clip ); + } + ret = ERROR_SUCCESS; + + if (saved_clip) restore_clipping_region( pdev, saved_clip ); + + goto done; + +update_format: + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = dib->bit_count; + set_color_info( dib, info ); + ret = ERROR_BAD_FORMAT; + +done: + if (hbitmap) GDI_ReleaseObj( hbitmap ); + + return ret; +} + /*********************************************************************** * dibdrv_SelectBitmap */ @@ -619,7 +804,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pPolygon */ NULL, /* pPolyline */ NULL, /* pPolylineTo */ - NULL, /* pPutImage */ + dibdrv_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ dibdrv_Rectangle, /* pRectangle */

1 0

Huw Davies : gdi32: Actually use the dib driver's Get/ PutImage if the bitmap is a dib.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: e81e73149fb66e776cbd768f600bc8bb547b7052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81e73149fb66e776cbd768f6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 2 14:11:11 2011 +0100 gdi32: Actually use the dib driver's Get/PutImage if the bitmap is a dib. --- dlls/gdi32/dib.c | 17 +++++++++++++---- dlls/gdi32/tests/bitmap.c | 3 +-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 5adafcb..4fc3f3a 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -509,6 +509,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, struct bitblt_coords src, dst; INT src_to_dst_offset; HRGN clip = 0; + const struct gdi_dc_funcs *funcs; src_bits.ptr = (void *)bits; src_bits.is_copy = FALSE; @@ -578,9 +579,14 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, if (lines < src.visrect.bottom) src.visrect.bottom = lines; } - physdev = GET_DC_PHYSDEV( dc, pPutImage ); + /* Hack to ensure we don't get the nulldrv if the bmp hasn't been selected + into a dc yet */ + physdev = GET_DC_PHYSDEV( dc, pCreateBitmap ); if (!BITMAP_SetOwnerDC( hbitmap, physdev )) goto done; + funcs = bitmap->funcs; + if (bitmap->dib) funcs = dc->dibdrv.dev.funcs; + result = lines; offset_rect( &src.visrect, 0, src_to_dst_offset ); @@ -600,7 +606,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); - err = physdev->funcs->pPutImage( physdev, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); + err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); if (err == ERROR_BAD_FORMAT) { void *ptr; @@ -616,7 +622,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, src_bits.is_copy = TRUE; src_bits.free = free_heap_bits; if (!err) - err = physdev->funcs->pPutImage( physdev, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); + err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); } } else err = ERROR_OUTOFMEMORY; @@ -915,6 +921,7 @@ INT WINAPI GetDIBits( char dst_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *dst_info = (BITMAPINFO *)dst_bmibuf; unsigned int colors = 0; + const struct gdi_dc_funcs *funcs; if (!info) return 0; @@ -936,6 +943,8 @@ INT WINAPI GetDIBits( return 0; } + funcs = bmp->funcs; + if (bmp->dib) funcs = dc->dibdrv.dev.funcs; if (bpp == 0) /* query bitmap info only */ { @@ -1104,7 +1113,7 @@ INT WINAPI GetDIBits( lines = src.height; - err = bmp->funcs->pGetImage( NULL, hbitmap, src_info, &src_bits, &src ); + err = funcs->pGetImage( NULL, hbitmap, src_info, &src_bits, &src ); if(err) { diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index bf51b4a..f12a40e 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -437,8 +437,7 @@ static void test_dib_bits_access( HBITMAP hdib, void *bits ) ok(info.AllocationProtect == PAGE_READWRITE, "%x != PAGE_READWRITE\n", info.AllocationProtect); ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State); ok(info.Type == MEM_PRIVATE, "%x != MEM_PRIVATE\n", info.Type); - /* it has been protected now */ - todo_wine ok(info.Protect == PAGE_READWRITE, "%x != PAGE_READWRITE\n", info.Protect); + ok(info.Protect == PAGE_READWRITE, "%x != PAGE_READWRITE\n", info.Protect); /* try writing protected bits to a file */

1 0

Michael Mc Donnell : d3dx9/tests: Implemented ConvertPointRepsToAdjacency test.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 5552613b81f8ce9a0044640b2ec2450f8abbdefe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5552613b81f8ce9a0044640b2… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Thu Jun 23 17:46:51 2011 +0200 d3dx9/tests: Implemented ConvertPointRepsToAdjacency test. --- dlls/d3dx9_36/tests/mesh.c | 548 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 548 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5552613b81f8ce9a00446…

1 0

Frédéric Delanoy : dlls: Assorted spelling fixes.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: b5a33dab886df6352011457932713ed321976bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a33dab886df635201145793… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 27 13:38:43 2011 +0200 dlls: Assorted spelling fixes. --- dlls/dmloader/container.c | 12 ++++++------ dlls/dmloader/loaderstream.c | 2 +- dlls/dmscript/script.c | 8 ++++---- dlls/dmstyle/chordtrack.c | 2 +- dlls/dmstyle/dmutils.c | 2 +- dlls/dmstyle/style.c | 26 +++++++++++++------------- dlls/dmstyle/styletrack.c | 4 ++-- dlls/dmusic/collection.c | 12 ++++++------ dlls/dmusic/instrument.c | 10 +++++----- dlls/dplayx/dplayx_main.c | 4 ++-- dlls/dsound/buffer.c | 2 +- dlls/dswave/dswave.c | 8 ++++---- dlls/dxerr8/errors.dat | 18 +++++++++--------- dlls/dxerr8/errors.h | 18 +++++++++--------- dlls/dxerr9/errors.dat | 18 +++++++++--------- dlls/dxerr9/errors.h | 18 +++++++++--------- dlls/gameux/gamestatistics.c | 2 +- dlls/gameux/gameux_private.h | 2 +- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/region.c | 2 +- dlls/gdiplus/image.c | 2 +- dlls/ieframe/navigate.c | 4 ++-- dlls/imaadp32.acm/imaadp32.c | 4 ++-- dlls/imagehlp/integrity.c | 2 +- dlls/jscript/regexp.c | 2 +- dlls/kernel32/console.c | 4 ++-- dlls/kernel32/debugger.c | 2 +- dlls/kernel32/lcformat.c | 2 +- dlls/kernel32/locale.c | 2 +- dlls/kernel32/lzexpand.c | 2 +- dlls/kernel32/path.c | 2 +- dlls/krnl386.exe16/dosaspi.c | 2 +- dlls/krnl386.exe16/ioports.c | 6 +++--- dlls/krnl386.exe16/soundblaster.c | 2 +- dlls/mapi32/prop.c | 5 +++-- dlls/msacm32.drv/wavemap.c | 2 +- dlls/msacm32/pcmconverter.c | 4 ++-- dlls/msadp32.acm/msadp32.c | 4 ++-- 40 files changed, 116 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5a33dab886df63520114…

1 0

Huw Davies : gdi32: Simplify the calculation of the rop masks.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 4b50743f87e9c66faee0aaf059de392a28728a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b50743f87e9c66faee0aaf05… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 2 14:11:06 2011 +0100 gdi32: Simplify the calculation of the rop masks. --- dlls/gdi32/dibdrv/objects.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 0dcf0da..70e2904 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -57,11 +57,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); * */ -/* A = (P & A1) | (~P & A2) */ -#define ZERO {0, 0} -#define ONE {0xffffffff, 0xffffffff} -#define P {0xffffffff, 0} -#define NOT_P {0, 0xffffffff} +/* A = (P & A1) ^ A2 */ +#define ZERO { 0u, 0u} +#define ONE { 0u, ~0u} +#define P {~0u, 0u} +#define NOT_P {~0u, ~0u} static const DWORD rop2_and_array[16][2] = { @@ -71,7 +71,7 @@ static const DWORD rop2_and_array[16][2] = ZERO, NOT_P, NOT_P, ZERO }; -/* X = (P & X1) | (~P & X2) */ +/* X = (P & X1) ^ X2 */ static const DWORD rop2_xor_array[16][2] = { ZERO, NOT_P, ZERO, NOT_P, @@ -88,8 +88,8 @@ static const DWORD rop2_xor_array[16][2] = void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) { /* NB The ROP2 codes start at one and the arrays are zero-based */ - *and = (color & rop2_and_array[rop-1][0]) | ((~color) & rop2_and_array[rop-1][1]); - *xor = (color & rop2_xor_array[rop-1][0]) | ((~color) & rop2_xor_array[rop-1][1]); + *and = (color & rop2_and_array[rop-1][0]) ^ rop2_and_array[rop-1][1]; + *xor = (color & rop2_xor_array[rop-1][0]) ^ rop2_xor_array[rop-1][1]; } static inline RGBQUAD rgbquad_from_colorref(COLORREF c)

1 0