November 2013 - Wine-commits

Frédéric Delanoy : netapi32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: b7dc0021583ede4af0a0aa95fc929a64221e0895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7dc0021583ede4af0a0aa95f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 22:11:10 2013 +0100 netapi32/tests: Use BOOL type where appropriate. --- dlls/netapi32/tests/access.c | 6 +++--- dlls/netapi32/tests/wksta.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index a8c43c3..b71e1c8 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -66,7 +66,7 @@ static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL; static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR)=NULL; -static int init_access_tests(void) +static BOOL init_access_tests(void) { DWORD dwSize; BOOL rc; @@ -77,14 +77,14 @@ static int init_access_tests(void) if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not available.\n"); - return 0; + return FALSE; } ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; dwSize = sizeof(computer_name)/sizeof(WCHAR); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); - return 1; + return TRUE; } static NET_API_STATUS create_test_user(void) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 5d1d8ac..ee3004e 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -44,7 +44,7 @@ static NET_API_STATUS (WINAPI *pNetGetJoinInformation)(LPCWSTR,LPWSTR*,PNETSETUP static WCHAR user_name[UNLEN + 1]; static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; -static int init_wksta_tests(void) +static BOOL init_wksta_tests(void) { DWORD dwSize; BOOL rc; @@ -54,14 +54,14 @@ static int init_wksta_tests(void) rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not implemented\n"); - return 0; + return FALSE; } ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; dwSize = sizeof(computer_name)/sizeof(computer_name[0]); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); - return 1; + return TRUE; } static void run_get_comp_name_tests(void)

1 0

Frédéric Delanoy : gdiplus/tests: Use BOOL type where appropriate.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 17875091113c0069b050ae2bde74c36eb7033b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17875091113c0069b050ae2bd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 22:11:13 2013 +0100 gdiplus/tests: Use BOOL type where appropriate. --- dlls/gdiplus/tests/metafile.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index aa39351..9dcc803 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -26,9 +26,9 @@ typedef struct emfplus_record { - ULONG todo; + BOOL todo; ULONG record_type; - ULONG playback_todo; + BOOL playback_todo; } emfplus_record; typedef struct emfplus_check_state @@ -88,7 +88,7 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR if (state->expected[state->count].record_type) { - actual.todo = 0; + actual.todo = FALSE; actual.record_type = record->Type; check_record(state->count, state->desc, &state->expected[state->count], &actual); @@ -111,7 +111,7 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR if (state->expected[state->count].record_type) { - actual.todo = 0; + actual.todo = FALSE; actual.record_type = lpEMFR->iType; check_record(state->count, state->desc, &state->expected[state->count], &actual); @@ -148,7 +148,7 @@ static BOOL CALLBACK enum_metafile_proc(EmfPlusRecordType record_type, unsigned emfplus_check_state *state = (emfplus_check_state*)userdata; emfplus_record actual; - actual.todo = 0; + actual.todo = FALSE; actual.record_type = record_type; if (dataSize == 0)

1 0

Alexandre Julliard : msvcp71: Share part of the implementation with msvcp90 .
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 949a8afdaf394a588209c3ee7692630c90b32e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949a8afdaf394a588209c3ee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 12 12:51:51 2013 +0100 msvcp71: Share part of the implementation with msvcp90. --- dlls/msvcp71/Makefile.in | 4 +- dlls/msvcp71/cxx.h | 446 ---------- dlls/msvcp71/exception.c | 563 ------------ dlls/msvcp71/math.c | 2169 ---------------------------------------------- dlls/msvcp71/memory.c | 102 --- dlls/msvcp71/misc.c | 190 ---- dlls/msvcp71/msvcp71.c | 105 --- 7 files changed, 3 insertions(+), 3576 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=949a8afdaf394a588209c…

1 0

Dmitry Timoshkov : gdiplus: Determine type of the path at the time the region data are written instead of the path creation time .
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: b0da54221047ffdb94d51d53b01682eec7a23731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0da54221047ffdb94d51d53b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 12 18:16:15 2013 +0900 gdiplus: Determine type of the path at the time the region data are written instead of the path creation time. --- dlls/gdiplus/region.c | 121 +++++++++++++++++++++++++------------------ dlls/gdiplus/tests/region.c | 13 ----- 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 4cd9636..4f16f62 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -87,6 +87,22 @@ typedef struct packed_point short Y; } packed_point; +/* Test to see if the path could be stored as an array of shorts */ +static BOOL is_integer_path(const GpPath *path) +{ + int i; + + if (!path->pathdata.Count) return FALSE; + + for (i = 0; i < path->pathdata.Count; i++) + { + if (path->pathdata.Points[i].X != gdip_round(path->pathdata.Points[i].X) || + path->pathdata.Points[i].Y != gdip_round(path->pathdata.Points[i].Y)) + return FALSE; + } + return TRUE; +} + /* Everything is measured in DWORDS; round up if there's a remainder */ static inline INT get_pathtypes_size(const GpPath* path) { @@ -106,9 +122,20 @@ static inline INT get_element_size(const region_element* element) case RegionDataRect: return needed + sizeof(GpRect); case RegionDataPath: - needed += element->elementdata.pathdata.pathheader.size; - needed += sizeof(DWORD); /* Extra DWORD for pathheader.size */ - return needed; + { + const GpPath *path = element->elementdata.pathdata.path; + DWORD flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; + /* 3 for headers, once again size doesn't count itself */ + needed += sizeof(DWORD) * 3; + if (flags & FLAGS_INTPATH) + needed += 2 * sizeof(SHORT) * path->pathdata.Count; + else + needed += 2 * sizeof(FLOAT) * path->pathdata.Count; + + needed += get_pathtypes_size(path); + needed += sizeof(DWORD); /* Extra DWORD for pathheader.size */ + return needed; + } case RegionDataEmptyRect: case RegionDataInfiniteRect: return needed; @@ -128,7 +155,7 @@ static inline GpStatus init_region(GpRegion* region, const RegionType type) region->header.checksum = 0xdeadbeef; region->header.magic = VERSION_MAGIC; region->header.num_children = 0; - region->header.size = sizeheader_size + get_element_size(&region->node); + region->header.size = 0; return Ok; } @@ -426,8 +453,6 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) { region_element* element; GpStatus stat; - DWORD flags; - INT count, i; TRACE("%p, %p\n", path, region); @@ -444,20 +469,6 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) return stat; } element = &(*region)->node; - count = path->pathdata.Count; - - flags = count ? FLAGS_INTPATH : FLAGS_NOFLAGS; - - /* Test to see if the path is an Integer path */ - for (i = 0; i < count; i++) - { - if (path->pathdata.Points[i].X != gdip_round(path->pathdata.Points[i].X) || - path->pathdata.Points[i].Y != gdip_round(path->pathdata.Points[i].Y)) - { - flags = FLAGS_NOFLAGS; - break; - } - } stat = GdipClonePath(path, &element->elementdata.pathdata.path); if (stat != Ok) @@ -466,29 +477,6 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) return stat; } - /* 3 for headers, once again size doesn't count itself */ - element->elementdata.pathdata.pathheader.size = ((sizeof(DWORD) * 3)); - switch(flags) - { - /* Floats, sent out as floats */ - case FLAGS_NOFLAGS: - element->elementdata.pathdata.pathheader.size += - (sizeof(DWORD) * count * 2); - break; - /* INTs, sent out as packed shorts */ - case FLAGS_INTPATH: - element->elementdata.pathdata.pathheader.size += - (sizeof(DWORD) * count); - break; - default: - FIXME("Unhandled flags (%08x). Expect wrong results.\n", flags); - } - element->elementdata.pathdata.pathheader.size += get_pathtypes_size(path); - element->elementdata.pathdata.pathheader.magic = VERSION_MAGIC; - element->elementdata.pathdata.pathheader.count = count; - element->elementdata.pathdata.pathheader.flags = flags; - (*region)->header.size = sizeheader_size + get_element_size(element); - return Ok; } @@ -754,11 +742,30 @@ static void write_element(const region_element* element, DWORD *buffer, { INT i; const GpPath* path = element->elementdata.pathdata.path; + struct _pathheader + { + DWORD size; + DWORD magic; + DWORD count; + DWORD flags; + } *pathheader; + + pathheader = (struct _pathheader *)(buffer + *filled); + + pathheader->flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; + /* 3 for headers, once again size doesn't count itself */ + pathheader->size = sizeof(DWORD) * 3; + if (pathheader->flags & FLAGS_INTPATH) + pathheader->size += 2 * sizeof(SHORT) * path->pathdata.Count; + else + pathheader->size += 2 * sizeof(FLOAT) * path->pathdata.Count; + pathheader->size += get_pathtypes_size(path); + pathheader->magic = VERSION_MAGIC; + pathheader->count = path->pathdata.Count; + + *filled += 4; - memcpy(buffer + *filled, &element->elementdata.pathdata.pathheader, - sizeof(element->elementdata.pathdata.pathheader)); - *filled += sizeof(element->elementdata.pathdata.pathheader) / sizeof(DWORD); - switch (element->elementdata.pathdata.pathheader.flags) + switch (pathheader->flags & FLAGS_INTPATH) { case FLAGS_NOFLAGS: for (i = 0; i < path->pathdata.Count; i++) @@ -773,6 +780,7 @@ static void write_element(const region_element* element, DWORD *buffer, write_packed_point(buffer, filled, &path->pathdata.Points[i]); } + break; } write_path_types(buffer, filled, path); break; @@ -819,6 +827,13 @@ static void write_element(const region_element* element, DWORD *buffer, GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, UINT *needed) { + struct _region_header + { + DWORD size; + DWORD checksum; + DWORD magic; + DWORD num_children; + } *region_header; INT filled = 0; TRACE("%p, %p, %d, %p\n", region, buffer, size, needed); @@ -826,8 +841,12 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, if (!(region && buffer && size)) return InvalidParameter; - memcpy(buffer, &region->header, sizeof(region->header)); - filled += sizeof(region->header) / sizeof(DWORD); + region_header = (struct _region_header *)buffer; + region_header->size = sizeheader_size + get_element_size(&region->node); + region_header->checksum = 0; + region_header->magic = VERSION_MAGIC; + region_header->num_children = region->header.num_children; + filled += 4; /* With few exceptions, everything written is DWORD aligned, * so use that as our base */ write_element(&region->node, (DWORD*)buffer, &filled); @@ -849,7 +868,7 @@ GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) return InvalidParameter; /* header.size doesn't count header.size and header.checksum */ - *needed = region->header.size + sizeof(DWORD) * 2; + *needed = sizeof(DWORD) * 2 + sizeheader_size + get_element_size(&region->node); return Ok; } diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index f509204..23c7a07 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -427,37 +427,24 @@ static void test_getregiondata(void) needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); expect(Ok, status); -todo_wine expect(72, needed); -todo_wine expect_dword(buf, 64); expect_magic(buf + 2); expect_dword(buf + 3 , 0); expect_dword(buf + 4 , RGNDATA_PATH); -todo_wine expect_dword(buf + 5, 48); expect_magic(buf + 6); expect_dword(buf + 7, 4); /* flags 0 means that a path is an array of FLOATs */ -todo_wine expect_dword(buf + 8, 0); -todo_wine expect_float(buf + 9, 5.6); -todo_wine expect_float(buf + 10, 6.8); -todo_wine expect_float(buf + 11, 7.6); -todo_wine expect_float(buf + 12, 8.8); -todo_wine expect_float(buf + 13, 8.6); -todo_wine expect_float(buf + 14, 1.8); -todo_wine expect_float(buf + 15, 5.6); -todo_wine expect_float(buf + 16, 6.8); -todo_wine expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ status = GdipDeletePath(path);

1 0

Dmitry Timoshkov : gdiplus: Get rid of no longer needed path and region fields.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: f5d807b7d7f284e2037397007c73e5d73f77138f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d807b7d7f284e2037397007… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 12 18:16:28 2013 +0900 gdiplus: Get rid of no longer needed path and region fields. --- dlls/gdiplus/gdiplus.c | 2 +- dlls/gdiplus/gdiplus_private.h | 20 +----------------- dlls/gdiplus/region.c | 41 ++++++++++++++++----------------------- 3 files changed, 20 insertions(+), 43 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index a76143e..8cef167 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -459,7 +459,7 @@ void delete_element(region_element* element) case RegionDataRect: break; case RegionDataPath: - GdipDeletePath(element->elementdata.pathdata.path); + GdipDeletePath(element->elementdata.path); break; case RegionDataEmptyRect: case RegionDataInfiniteRect: diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 19b2130..b2327f9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -404,17 +404,7 @@ struct region_element union { GpRectF rect; - struct - { - GpPath* path; - struct - { - DWORD size; - DWORD magic; - DWORD count; - DWORD flags; - } pathheader; - } pathdata; + GpPath *path; struct { struct region_element *left; /* the original region */ @@ -424,13 +414,7 @@ struct region_element }; struct GpRegion{ - struct - { - DWORD size; - DWORD checksum; - DWORD magic; - DWORD num_children; - } header; + DWORD num_children; region_element node; }; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 4f16f62..aef2ac7 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -123,7 +123,7 @@ static inline INT get_element_size(const region_element* element) return needed + sizeof(GpRect); case RegionDataPath: { - const GpPath *path = element->elementdata.pathdata.path; + const GpPath *path = element->elementdata.path; DWORD flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; /* 3 for headers, once again size doesn't count itself */ needed += sizeof(DWORD) * 3; @@ -151,11 +151,8 @@ static inline INT get_element_size(const region_element* element) /* Does not check parameters, caller must do that */ static inline GpStatus init_region(GpRegion* region, const RegionType type) { - region->node.type = type; - region->header.checksum = 0xdeadbeef; - region->header.magic = VERSION_MAGIC; - region->header.num_children = 0; - region->header.size = 0; + region->node.type = type; + region->num_children = 0; return Ok; } @@ -183,9 +180,7 @@ static inline GpStatus clone_element(const region_element* element, case RegionDataInfiniteRect: return Ok; case RegionDataPath: - (*element2)->elementdata.pathdata.pathheader = element->elementdata.pathdata.pathheader; - stat = GdipClonePath(element->elementdata.pathdata.path, - &(*element2)->elementdata.pathdata.path); + stat = GdipClonePath(element->elementdata.path, &(*element2)->elementdata.path); if (stat == Ok) return Ok; break; default: @@ -217,9 +212,7 @@ static inline void fuse_region(GpRegion* region, region_element* left, region->node.type = mode; region->node.elementdata.combine.left = left; region->node.elementdata.combine.right = right; - - region->header.size = sizeheader_size + get_element_size(&region->node); - region->header.num_children += 2; + region->num_children += 2; } /***************************************************************************** @@ -249,7 +242,7 @@ GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *region, GpRegion **clone) return OutOfMemory; element = &(*clone)->node; - (*clone)->header = region->header; + (*clone)->num_children = region->num_children; return clone_element(&region->node, &element); } @@ -406,7 +399,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, } fuse_region(region1, left, right, mode); - region1->header.num_children += region2->header.num_children; + region1->num_children += region2->num_children; return Ok; } @@ -470,7 +463,7 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) } element = &(*region)->node; - stat = GdipClonePath(path, &element->elementdata.pathdata.path); + stat = GdipClonePath(path, &element->elementdata.path); if (stat != Ok) { GdipDeleteRegion(*region); @@ -741,7 +734,7 @@ static void write_element(const region_element* element, DWORD *buffer, case RegionDataPath: { INT i; - const GpPath* path = element->elementdata.pathdata.path; + const GpPath* path = element->elementdata.path; struct _pathheader { DWORD size; @@ -845,7 +838,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, region_header->size = sizeheader_size + get_element_size(&region->node); region_header->checksum = 0; region_header->magic = VERSION_MAGIC; - region_header->num_children = region->header.num_children; + region_header->num_children = region->num_children; filled += 4; /* With few exceptions, everything written is DWORD aligned, * so use that as our base */ @@ -938,7 +931,7 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap *hrgn = CreateRectRgn(0, 0, 0, 0); return *hrgn ? Ok : OutOfMemory; case RegionDataPath: - return get_path_hrgn(element->elementdata.pathdata.path, graphics, hrgn); + return get_path_hrgn(element->elementdata.path, graphics, hrgn); case RegionDataRect: { GpPath* path; @@ -1298,12 +1291,12 @@ static GpStatus transform_region_element(region_element* element, GpMatrix *matr } /* Fall-through to do the actual conversion. */ case RegionDataPath: - if (!element->elementdata.pathdata.path->pathdata.Count) + if (!element->elementdata.path->pathdata.Count) return Ok; stat = GdipTransformMatrixPoints(matrix, - element->elementdata.pathdata.path->pathdata.Points, - element->elementdata.pathdata.path->pathdata.Count); + element->elementdata.path->pathdata.Points, + element->elementdata.path->pathdata.Count); return stat; default: stat = transform_region_element(element->elementdata.combine.left, matrix); @@ -1338,9 +1331,9 @@ static void translate_region_element(region_element* element, REAL dx, REAL dy) element->elementdata.rect.Y += dy; return; case RegionDataPath: - for(i = 0; i < element->elementdata.pathdata.path->pathdata.Count; i++){ - element->elementdata.pathdata.path->pathdata.Points[i].X += dx; - element->elementdata.pathdata.path->pathdata.Points[i].Y += dy; + for(i = 0; i < element->elementdata.path->pathdata.Count; i++){ + element->elementdata.path->pathdata.Points[i].X += dx; + element->elementdata.path->pathdata.Points[i].Y += dy; } return; default:

1 0

Henri Verbeet : d3d8: Clear pBits and Pitch when d3d8_surface_LockRect() fails.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: b83a0b9d3ee88b5a09700bc3a25d3ae3a49aa84f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83a0b9d3ee88b5a09700bc3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:25 2013 +0100 d3d8: Clear pBits and Pitch when d3d8_surface_LockRect() fails. This is a only slightly modified version of a patch by Lasse Rasinen. --- dlls/d3d8/surface.c | 12 ++++++++++-- dlls/d3d8/tests/device.c | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index a157c51..0b40c46 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -273,8 +273,16 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); wined3d_mutex_unlock(); - locked_rect->Pitch = map_desc.row_pitch; - locked_rect->pBits = map_desc.data; + if (SUCCEEDED(hr)) + { + locked_rect->Pitch = map_desc.row_pitch; + locked_rect->pBits = map_desc.data; + } + else + { + locked_rect->Pitch = 0; + locked_rect->pBits = NULL; + } return hr; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a0fcd71..f5afbc4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4039,8 +4039,12 @@ static void test_lockrect_invalid(void) hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr %#x.\n", hr); + locked_rect.pBits = (void *)0xdeadbeef; + locked_rect.Pitch = 1; hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!locked_rect.pBits, "Got unexpected pBits %p.\n", locked_rect.pBits); + ok(!locked_rect.Pitch, "Got unexpected Pitch %u.\n", locked_rect.Pitch); hr = IDirect3DSurface8_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw: Introduce a ddraw_texture structure as parent for textures.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 80dbeb9699d3fe4afa5e38391cb21cad03c4b2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=80dbeb9699d3fe4afa5e38391… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:26 2013 +0100 ddraw: Introduce a ddraw_texture structure as parent for textures. --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/ddraw_private.h | 8 ++++++++ dlls/ddraw/device.c | 10 +++++----- dlls/ddraw/surface.c | 20 +++++++++++++++----- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 964428a..f9a4b09 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5152,8 +5152,8 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ DWORD flags, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - struct ddraw_surface *tex_root = container_parent; - DDSURFACEDESC2 desc = tex_root->surface_desc; + struct ddraw_texture *texture = container_parent; + DDSURFACEDESC2 desc = texture->surface_desc; struct ddraw_surface *ddraw_surface; HRESULT hr; @@ -5163,7 +5163,7 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ /* The ddraw root surface is created before the wined3d texture. */ if (!sub_resource_idx) { - ddraw_surface = tex_root; + ddraw_surface = texture->root; goto done; } @@ -5171,7 +5171,7 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ desc.dwHeight = wined3d_desc->height; /* FIXME: Validate that format, usage, pool, etc. really make sense. */ - if (FAILED(hr = ddraw_create_surface(ddraw, &desc, flags, &ddraw_surface, tex_root->version))) + if (FAILED(hr = ddraw_create_surface(ddraw, &desc, flags, &ddraw_surface, texture->version))) return hr; done: diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 21e0ca8..24a02de 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -185,6 +185,14 @@ struct ddraw_surface DWORD Handle; }; +struct ddraw_texture +{ + unsigned int version; + DDSURFACEDESC2 surface_desc; + + struct ddraw_surface *root; +}; + HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surface_flags) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, DDSURFACEDESC2 *desc, DWORD flags, UINT version) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f1b1346..b7511bc 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2454,9 +2454,9 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, { /* The parent of the texture is the IDirectDrawSurface7 * interface of the ddraw surface. */ - struct ddraw_surface *parent = wined3d_texture_get_parent(tex); + struct ddraw_texture *parent = wined3d_texture_get_parent(tex); if (parent) - *value = parent->Handle; + *value = parent->root->Handle; } wined3d_mutex_unlock(); @@ -4586,7 +4586,7 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct wined3d_texture *wined3d_texture; - struct ddraw_surface *surface; + struct ddraw_texture *ddraw_texture; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); @@ -4601,8 +4601,8 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface, return D3D_OK; } - surface = wined3d_texture_get_parent(wined3d_texture); - *texture = &surface->IDirectDrawSurface7_iface; + ddraw_texture = wined3d_texture_get_parent(wined3d_texture); + *texture = &ddraw_texture->root->IDirectDrawSurface7_iface; IDirectDrawSurface7_AddRef(*texture); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index bbe7d0e..13dc1a6 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5575,11 +5575,12 @@ static const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops = static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void *parent) { - struct ddraw_surface *surface = parent; + struct ddraw_texture *texture = parent; - TRACE("surface %p.\n", surface); + TRACE("texture %p.\n", texture); - ddraw_surface_cleanup(surface); + ddraw_surface_cleanup(texture->root); + HeapFree(GetProcessHeap(), 0, parent); } static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops = @@ -5593,11 +5594,19 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac struct wined3d_resource_desc wined3d_desc; struct ddraw_surface *mip, **attach; struct wined3d_resource *resource; + struct ddraw_texture *texture; UINT layers, levels, i, j; DDSURFACEDESC2 *mip_desc; enum wined3d_pool pool; HRESULT hr; + if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) + return E_OUTOFMEMORY; + + texture->version = surface->version; + texture->surface_desc = *desc; + texture->root = surface; + if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) levels = desc->u2.dwMipMapCount; else @@ -5640,13 +5649,13 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac { wined3d_desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE; hr = wined3d_texture_create_cube(surface->ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); + surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); } else { wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE; hr = wined3d_texture_create_2d(surface->ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); + surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); } if (FAILED(hr)) @@ -5662,6 +5671,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac FIXME("Unexpected wined3d error %#x.\n", hr); break; } + HeapFree(GetProcessHeap(), 0, texture); return hr; }

1 0

Henri Verbeet : ddraw: Create wined3d textures before ddraw surfaces.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 3d452ed95a11becb56c4fbc2145e3ff9aba43d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d452ed95a11becb56c4fbc21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:27 2013 +0100 ddraw: Create wined3d textures before ddraw surfaces. --- dlls/ddraw/ddraw.c | 35 +++++++++-------------------------- dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/surface.c | 33 ++++++++++++++++++++------------- 3 files changed, 31 insertions(+), 40 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f9a4b09..1dafa1e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3116,8 +3116,15 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - /* Create the first surface */ - if (FAILED(hr = ddraw_create_surface(ddraw, &desc2, flags, &object, version))) + if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) + { + if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, flags, &object))) + { + WARN("Failed to create texture, hr %#x.\n", hr); + return hr; + } + } + else if (FAILED(hr = ddraw_create_surface(ddraw, &desc2, flags, &object, version))) { WARN("ddraw_create_surface failed, hr %#x.\n", hr); return hr; @@ -3168,22 +3175,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) - { - hr = ddraw_surface_create_texture(object, flags); - if (FAILED(hr)) - { - if (version == 7) - IDirectDrawSurface7_Release(&object->IDirectDrawSurface7_iface); - else if (version == 4) - IDirectDrawSurface4_Release(&object->IDirectDrawSurface4_iface); - else - IDirectDrawSurface_Release(&object->IDirectDrawSurface_iface); - - return hr; - } - } - if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ddraw->primary = object; @@ -5160,13 +5151,6 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ TRACE("device_parent %p, container_parent %p, wined3d_desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", device_parent, container_parent, wined3d_desc, sub_resource_idx, flags, surface); - /* The ddraw root surface is created before the wined3d texture. */ - if (!sub_resource_idx) - { - ddraw_surface = texture->root; - goto done; - } - desc.dwWidth = wined3d_desc->width; desc.dwHeight = wined3d_desc->height; @@ -5174,7 +5158,6 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ if (FAILED(hr = ddraw_create_surface(ddraw, &desc, flags, &ddraw_surface, texture->version))) return hr; -done: *surface = ddraw_surface->wined3d_surface; wined3d_surface_incref(*surface); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 24a02de..8c37a1e 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -193,7 +193,8 @@ struct ddraw_texture struct ddraw_surface *root; }; -HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surface_flags) DECLSPEC_HIDDEN; +HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 *desc, + unsigned int version, DWORD surface_flags, struct ddraw_surface **surface) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, DDSURFACEDESC2 *desc, DWORD flags, UINT version) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 13dc1a6..808cd5f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5588,11 +5588,12 @@ static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops = ddraw_texture_wined3d_object_destroyed, }; -HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surface_flags) +HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 *desc, + unsigned int version, DWORD surface_flags, struct ddraw_surface **surface) { - const DDSURFACEDESC2 *desc = &surface->surface_desc; + struct ddraw_surface *root, *mip, **attach; struct wined3d_resource_desc wined3d_desc; - struct ddraw_surface *mip, **attach; + struct wined3d_texture *wined3d_texture; struct wined3d_resource *resource; struct ddraw_texture *texture; UINT layers, levels, i, j; @@ -5603,9 +5604,8 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) return E_OUTOFMEMORY; - texture->version = surface->version; + texture->version = version; texture->surface_desc = *desc; - texture->root = surface; if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) levels = desc->u2.dwMipMapCount; @@ -5636,7 +5636,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac pool = WINED3D_POOL_DEFAULT; } - wined3d_desc.format = wined3dformat_from_ddrawformat(&surface->surface_desc.u4.ddpfPixelFormat); + wined3d_desc.format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.pool = pool; @@ -5648,14 +5648,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) { wined3d_desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE; - hr = wined3d_texture_create_cube(surface->ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); + hr = wined3d_texture_create_cube(ddraw->wined3d_device, &wined3d_desc, levels, + surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); } else { wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE; - hr = wined3d_texture_create_2d(surface->ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); + hr = wined3d_texture_create_2d(ddraw->wined3d_device, &wined3d_desc, levels, + surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); } if (FAILED(hr)) @@ -5675,16 +5675,21 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac return hr; } + resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + root = wined3d_resource_get_parent(resource); + root->wined3d_texture = wined3d_texture; + texture->root = root; + for (i = 0; i < layers; ++i) { - attach = &surface->complex_array[layers - 1 - i]; + attach = &root->complex_array[layers - 1 - i]; for (j = 0; j < levels; ++j) { - resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, i * levels + j); + resource = wined3d_texture_get_sub_resource(wined3d_texture, i * levels + j); mip = wined3d_resource_get_parent(resource); - if (mip == surface) + if (mip == root) continue; mip_desc = &mip->surface_desc; @@ -5727,6 +5732,8 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac } } + *surface = root; + return DD_OK; }

1 0

Henri Verbeet : ddrawex: Get rid of the IDirectDrawImpl typedef.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 38b4364ce4039d9f0bb2ec5fd7c53b1e5d65a3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b4364ce4039d9f0bb2ec5fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:28 2013 +0100 ddrawex: Get rid of the IDirectDrawImpl typedef. --- dlls/ddrawex/ddraw.c | 1566 +++++++++++++++++++++------------------ dlls/ddrawex/ddrawex_private.h | 7 +- 2 files changed, 845 insertions(+), 728 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38b4364ce4039d9f0bb2e…

1 0

Henri Verbeet : ddrawex: Get rid of the IDirectDrawSurfaceImpl typedef.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 8c97327da613a1eddecc02410ead27060c5d6ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c97327da613a1eddecc02410… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:29 2013 +0100 ddrawex: Get rid of the IDirectDrawSurfaceImpl typedef. --- dlls/ddrawex/ddraw.c | 2 +- dlls/ddrawex/ddrawex_private.h | 10 +- dlls/ddrawex/surface.c | 1423 +++++++++++++++++++++------------------- 3 files changed, 766 insertions(+), 669 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c97327da613a1eddecc0…

1 0