wine-commits July 2014

wine-commits@winehq.org

2 participants
287 discussions

Alexandre Julliard : lxr: Run LXR update in the background since it' s so slow.
by Alexandre Julliard 17 Jul '14

17 Jul '14

Module: tools Branch: master Commit: aeed6c973fa4b806bacf782a4f2011006fb6870d URL: http://source.winehq.org/git/tools.git/?a=commit;h=aeed6c973fa4b806bacf782a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 20:26:49 2014 +0200 lxr: Run LXR update in the background since it's so slow. --- lxr/update-version | 4 +--- wine_release | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lxr/update-version b/lxr/update-version index 6a323c9..bed9714 100755 --- a/lxr/update-version +++ b/lxr/update-version @@ -16,10 +16,8 @@ fi version=$1 -tools_dir="/home/winehq/opt/git-tools" - cd /home/winehq/opt/source (echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv -f wine-versions.new wine-versions -$tools_dir/lxr/genxref --url=http://source.winehq.org --version=wine-$version +./genxref --url=http://source.winehq.org --version=wine-$version diff --git a/wine_release b/wine_release index 7306aa6..af9e5a7 100755 --- a/wine_release +++ b/wine_release @@ -86,7 +86,6 @@ fi echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql # make cross reference database for LXR -echo "==== UPDATING LXR ====" -$tools_dir/lxr/update-version $version +$tools_dir/lxr/update-version $version & # end

1 0

Alexandre Julliard : lxr: Only markup potential filenames surrounded by spaces.
by Alexandre Julliard 17 Jul '14

17 Jul '14

Module: tools Branch: master Commit: d2264373dc9461f1962aafbaa7d37018a28a3403 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d2264373dc9461f1962aafba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 30 21:12:53 2014 +0200 lxr: Only markup potential filenames surrounded by spaces. Otherwise it considers a version name like wine-1.7 to be a filename. --- lxr/lib/LXR/Markup.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxr/lib/LXR/Markup.pm b/lxr/lib/LXR/Markup.pm index 6c5a33c..94d0c78 100644 --- a/lxr/lib/LXR/Markup.pm +++ b/lxr/lib/LXR/Markup.pm @@ -111,7 +111,7 @@ sub markupstring { $string =~ s/(<)(.*@.*)(>)/$1<a class='offshore' href=\"mailto:$2\">$2<\/a>$3/g; # HTMLify file names, assuming file is in the directory defined by $virtp. - $string =~ s{\b([\w\-_\/]+\.\w{1,5}|README)\b} + $string =~ s{\s([\w\-_\/]+\.\w{1,5}|README)\s} {fileref($1, '', $virtp . $1);}ge; return ($string);

1 0

Ken Thomases : winemac: Don' t query the position of the one-past-the-end character with IMR_QUERYCHARPOSITION.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: cafb192ecc93880d508493cda012267bdb0ed6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafb192ecc93880d508493cda… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 16 12:59:03 2014 -0500 winemac: Don't query the position of the one-past-the-end character with IMR_QUERYCHARPOSITION. This means the resulting rectangle will be short, but we don't have much choice. Some apps don't cope properly with the one-past-the-end character. For example, Excel 2007 gets stuck in an infinite loop. --- dlls/winemac.drv/ime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index b62736f..7f98914 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1509,7 +1509,7 @@ BOOL query_ime_char_rect(macdrv_query* query) *rect = CGRectMake(charpos.pt.x, charpos.pt.y, 0, charpos.cLineHeight); /* iterate over rest of length to extend rect */ - for (i = 1; i <= range->length; i++) + for (i = 1; i < range->length; i++) { charpos.dwSize = sizeof(charpos); charpos.dwCharPos = range->location + i;

1 0

Stefan Dösinger : wined3d: Remove wined3d_texture_set /get_priority.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 341db6d8d3d2251ffb406636cba15cb755cd2c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341db6d8d3d2251ffb406636c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:15 2014 +0200 wined3d: Remove wined3d_texture_set/get_priority. --- dlls/d3d8/texture.c | 24 ++++++++++++++++++------ dlls/d3d9/texture.c | 24 ++++++++++++++++++------ dlls/ddraw/surface.c | 8 ++++++-- dlls/wined3d/texture.c | 10 ---------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 6 files changed, 42 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=341db6d8d3d2251ffb406…

1 0

Stefan Dösinger : wined3d: Remove wined3d_buffer_set/ get_priority.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: cf11933701a4e0f6c9fbabda97d11df6465aff43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf11933701a4e0f6c9fbabda9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:14 2014 +0200 wined3d: Remove wined3d_buffer_set/get_priority. --- dlls/d3d8/buffer.c | 16 ++++++++++++---- dlls/d3d9/buffer.c | 16 ++++++++++++---- dlls/wined3d/buffer.c | 10 ---------- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d.spec | 4 ++-- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 4 ++-- 8 files changed, 32 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf11933701a4e0f6c9fba…

1 0

Stefan Dösinger : wined3d: Remove wined3d_volume_set/ get_priority.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 086545cdd3b073b354388e0a19b6c6a567a3f4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=086545cdd3b073b354388e0a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:13 2014 +0200 wined3d: Remove wined3d_volume_set/get_priority. --- dlls/wined3d/volume.c | 10 ---------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 3 files changed, 14 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 817fe7e..994cfc2 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -553,16 +553,6 @@ void * CDECL wined3d_volume_get_parent(const struct wined3d_volume *volume) return volume->resource.parent; } -DWORD CDECL wined3d_volume_set_priority(struct wined3d_volume *volume, DWORD priority) -{ - return resource_set_priority(&volume->resource, priority); -} - -DWORD CDECL wined3d_volume_get_priority(const struct wined3d_volume *volume) -{ - return resource_get_priority(&volume->resource); -} - void CDECL wined3d_volume_preload(struct wined3d_volume *volume) { FIXME("volume %p stub!\n", volume); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index eb594b3..61fa481 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -268,10 +268,8 @@ @ cdecl wined3d_volume_decref(ptr) @ cdecl wined3d_volume_from_resource(ptr) @ cdecl wined3d_volume_get_parent(ptr) -@ cdecl wined3d_volume_get_priority(ptr) @ cdecl wined3d_volume_get_resource(ptr) @ cdecl wined3d_volume_incref(ptr) @ cdecl wined3d_volume_map(ptr ptr ptr long) @ cdecl wined3d_volume_preload(ptr) -@ cdecl wined3d_volume_set_priority(ptr long) @ cdecl wined3d_volume_unmap(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ba5eb61..0c0c594 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2486,13 +2486,11 @@ ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaratio ULONG __cdecl wined3d_volume_decref(struct wined3d_volume *volume); struct wined3d_volume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource); void * __cdecl wined3d_volume_get_parent(const struct wined3d_volume *volume); -DWORD __cdecl wined3d_volume_get_priority(const struct wined3d_volume *volume); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); void __cdecl wined3d_volume_preload(struct wined3d_volume *volume); -DWORD __cdecl wined3d_volume_set_priority(struct wined3d_volume *volume, DWORD new_priority); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume); #endif /* __WINE_WINED3D_H */

1 0

Stefan Dösinger : wined3d: Remove wined3d_surface_set /get_priority.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 2abecc46c6259a664ae486323aa4c415b7a39321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2abecc46c6259a664ae486323… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:12 2014 +0200 wined3d: Remove wined3d_surface_set/get_priority. --- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/surface.c | 10 ---------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 355a88b..905223b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2247,7 +2247,7 @@ static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWO } else { - wined3d_surface_set_priority(surface->wined3d_surface, priority); + wined3d_texture_set_priority(surface->wined3d_texture, priority); hr = DD_OK; } wined3d_mutex_unlock(); @@ -2276,7 +2276,7 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO } else { - *priority = wined3d_surface_get_priority(surface->wined3d_surface); + *priority = wined3d_texture_get_priority(surface->wined3d_texture); hr = DD_OK; } wined3d_mutex_unlock(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5cd245e..d384d78 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2205,16 +2205,6 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) return refcount; } -DWORD CDECL wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD priority) -{ - return resource_set_priority(&surface->resource, priority); -} - -DWORD CDECL wined3d_surface_get_priority(const struct wined3d_surface *surface) -{ - return resource_get_priority(&surface->resource); -} - void CDECL wined3d_surface_preload(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1a41f8c..eb594b3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -210,7 +210,6 @@ @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) -@ cdecl wined3d_surface_get_priority(ptr) @ cdecl wined3d_surface_get_render_target_data(ptr ptr) @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_getdc(ptr ptr) @@ -221,7 +220,6 @@ @ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_restore(ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) -@ cdecl wined3d_surface_set_priority(ptr long) @ cdecl wined3d_surface_unmap(ptr) @ cdecl wined3d_surface_update_desc(ptr long long long long long ptr long) @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0695a81..ba5eb61 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2401,7 +2401,6 @@ HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *su HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); -DWORD __cdecl wined3d_surface_get_priority(const struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_get_render_target_data(struct wined3d_surface *surface, struct wined3d_surface *render_target); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); @@ -2414,7 +2413,6 @@ void __cdecl wined3d_surface_preload(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc); HRESULT __cdecl wined3d_surface_restore(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); -DWORD __cdecl wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD new_priority); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_update_desc(struct wined3d_surface *surface, UINT width, UINT height, enum wined3d_format_id format_id,

1 0

Stefan Dösinger : ddraw/tests: Add a test for IDirectDrawSurface7::SetPriority.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 8b367c79098690445553a1ee228070789bfdc021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b367c79098690445553a1ee2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:11 2014 +0200 ddraw/tests: Add a test for IDirectDrawSurface7::SetPriority. --- dlls/ddraw/tests/ddraw7.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 393cea3..3e29164 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7448,6 +7448,127 @@ static void test_lost_device(void) DestroyWindow(window); } +static void test_resource_priority(void) +{ + IDirectDrawSurface7 *surface, *mipmap; + DDSURFACEDESC2 surface_desc; + IDirectDraw7 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + DDSCAPS2 caps = {DDSCAPS_COMPLEX, 0, 0, 0}; + DDCAPS hal_caps; + DWORD needed_caps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_MIPMAP; + unsigned int i; + DWORD priority; + static const struct + { + DWORD caps, caps2; + const char *name; + HRESULT hr; + /* SetPriority on offscreenplain surfaces crashes on AMD GPUs on Win7. */ + BOOL crash; + } + test_data[] = + { + {DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY, 0, "vidmem texture", DDERR_INVALIDPARAMS, FALSE}, + {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, 0, "sysmem texture", DDERR_INVALIDPARAMS, FALSE}, + {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, "managed texture", DD_OK, FALSE}, + {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, "managed texture", DD_OK, FALSE}, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY, 0, "vidmem offscreenplain", DDERR_INVALIDOBJECT, TRUE}, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, 0, "sysmem offscreenplain", DDERR_INVALIDOBJECT, TRUE}, + }; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & needed_caps) != needed_caps + || !(hal_caps.ddsCaps.dwCaps & DDSCAPS2_TEXTUREMANAGE)) + { + skip("Required surface types not supported, skipping test.\n"); + goto done; + } + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + surface_desc.ddsCaps.dwCaps = test_data[i].caps; + surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, type %s.\n", hr, test_data[i].name); + + /* Priority == NULL segfaults. */ + priority = 0xdeadbeef; + hr = IDirectDrawSurface7_GetPriority(surface, &priority); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + if (SUCCEEDED(test_data[i].hr)) + ok(priority == 0, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + else + ok(priority == 0xdeadbeef, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + + if (!test_data[i].crash) + { + hr = IDirectDrawSurface7_SetPriority(surface, 1); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + hr = IDirectDrawSurface7_GetPriority(surface, &priority); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + if (SUCCEEDED(test_data[i].hr)) + { + ok(priority == 1, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + hr = IDirectDrawSurface7_SetPriority(surface, 2); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + } + else + ok(priority == 0xdeadbeef, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + } + + IDirectDrawSurface7_Release(surface); + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE; + U2(surface_desc).dwMipMapCount = 2; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &mipmap); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + + priority = 0xdeadbeef; + hr = IDirectDrawSurface7_GetPriority(mipmap, &priority); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type managed mipmap.\n", hr); + ok(priority == 0xdeadbeef, "Got unexpected priority %u, type managed mipmap.\n", priority); + /* SetPriority on the mipmap surface crashes. */ + hr = IDirectDrawSurface7_GetPriority(surface, &priority); + ok(SUCCEEDED(hr), "Failed to get priority, hr %#x.\n", hr); + ok(priority == 0, "Got unexpected priority %u, type managed mipmap.\n", priority); + + IDirectDrawSurface7_Release(mipmap); + refcount = IDirectDrawSurface7_Release(surface); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + +done: + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -7519,4 +7640,5 @@ START_TEST(ddraw7) test_palette_alpha(); test_vb_writeonly(); test_lost_device(); + test_resource_priority(); }

1 0

Stefan Dösinger : ddraw: Add validation to SetPriority / GetPriority.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: 5b9f91c18d7e21ecdd1dfb662682c34cd143d4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9f91c18d7e21ecdd1dfb662… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:10 2014 +0200 ddraw: Add validation to SetPriority / GetPriority. --- dlls/ddraw/surface.c | 72 +++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3d61e61..355a88b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2229,63 +2229,59 @@ static HRESULT WINAPI ddraw_surface1_GetCaps(IDirectDrawSurface *iface, DDSCAPS return hr; } -/***************************************************************************** - * IDirectDrawSurface7::SetPriority - * - * Sets a texture priority for managed textures. - * - * Params: - * Priority: The new priority - * - * Returns: - * DD_OK on success - * For more details, see IWineD3DSurface::SetPriority - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWORD Priority) +static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWORD priority) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + DWORD managed = DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE; HRESULT hr; - TRACE("iface %p, priority %u.\n", iface, Priority); + TRACE("iface %p, priority %u.\n", iface, priority); wined3d_mutex_lock(); - hr = wined3d_surface_set_priority(surface->wined3d_surface, Priority); + /* No need to check for offscreen plain surfaces or mipmap sublevels. SetPriority + * calls on such surfaces segfault on Windows. */ + if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed)) + { + WARN("Called on non-managed texture returning DDERR_INVALIDPARAMS.\n"); + hr = DDERR_INVALIDPARAMS; + } + else + { + wined3d_surface_set_priority(surface->wined3d_surface, priority); + hr = DD_OK; + } wined3d_mutex_unlock(); return hr; } -/***************************************************************************** - * IDirectDrawSurface7::GetPriority - * - * Returns the surface's priority - * - * Params: - * Priority: Address of a variable to write the priority to - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Priority == NULL - * For more details, see IWineD3DSurface::GetPriority - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWORD *Priority) +static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWORD *priority) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + DWORD managed = DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE; + HRESULT hr; - TRACE("iface %p, priority %p.\n", iface, Priority); + TRACE("iface %p, priority %p.\n", iface, priority); - if(!Priority) + wined3d_mutex_lock(); + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) { - return DDERR_INVALIDPARAMS; + WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n"); + hr = DDERR_INVALIDOBJECT; + } + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) + { + WARN("Called on non-managed texture or mipmap sublevel, returning DDERR_INVALIDPARAMS.\n"); + hr = DDERR_INVALIDPARAMS; + } + else + { + *priority = wined3d_surface_get_priority(surface->wined3d_surface); + hr = DD_OK; } - - wined3d_mutex_lock(); - *Priority = wined3d_surface_get_priority(surface->wined3d_surface); wined3d_mutex_unlock(); - return DD_OK; + return hr; } /*****************************************************************************

1 0

Alexandre Julliard : cmd: Use array indexing syntax to access array members.
by Alexandre Julliard 16 Jul '14

16 Jul '14

Module: wine Branch: master Commit: fd17c93224a75323c5e9b912521a046da81fbf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd17c93224a75323c5e9b9125… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 16 14:53:18 2014 +0200 cmd: Use array indexing syntax to access array members. --- programs/cmd/directory.c | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 58fff44..678e2a1 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -283,18 +283,18 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Load all files into an in memory structure */ WINE_TRACE("Looking for matches to '%s'\n", wine_dbgstr_w(real_path)); - hff = FindFirstFileW(real_path, (fd+entry_count)); + hff = FindFirstFileW(real_path, &fd[entry_count]); if (hff != INVALID_HANDLE_VALUE) { do { /* Skip any which are filtered out by attribute */ - if (((fd+entry_count)->dwFileAttributes & attrsbits) != showattrs) continue; + if ((fd[entry_count].dwFileAttributes & attrsbits) != showattrs) continue; entry_count++; /* Keep running track of longest filename for wide output */ if (wide || orderByCol) { - int tmpLen = strlenW((fd+(entry_count-1))->cFileName) + 3; - if ((fd+(entry_count-1))->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) tmpLen = tmpLen + 2; + int tmpLen = strlenW(fd[entry_count-1].cFileName) + 3; + if (fd[entry_count-1].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) tmpLen = tmpLen + 2; if (tmpLen > widest) widest = tmpLen; } @@ -305,7 +305,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le errorlevel = 1; return parms->next; } - } while (FindNextFileW(hff, (fd+entry_count)) != 0); + } while (FindNextFileW(hff, &fd[entry_count]) != 0); FindClose (hff); } @@ -362,23 +362,23 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* /L convers all names to lower case */ if (lower) { - WCHAR *p = (fd+i)->cFileName; + WCHAR *p = fd[i].cFileName; while ( (*p = tolower(*p)) ) ++p; } /* /Q gets file ownership information */ if (usernames) { strcpyW (string, inputparms->dirName); - strcatW (string, (fd+i)->cFileName); + strcatW (string, fd[i].cFileName); WCMD_getfileowner(string, username, sizeof(username)/sizeof(WCHAR)); } if (dirTime == Written) { - FileTimeToLocalFileTime (&(fd+i)->ftLastWriteTime, &ft); + FileTimeToLocalFileTime (&fd[i].ftLastWriteTime, &ft); } else if (dirTime == Access) { - FileTimeToLocalFileTime (&(fd+i)->ftLastAccessTime, &ft); + FileTimeToLocalFileTime (&fd[i].ftLastAccessTime, &ft); } else { - FileTimeToLocalFileTime (&(fd+i)->ftCreationTime, &ft); + FileTimeToLocalFileTime (&fd[i].ftCreationTime, &ft); } FileTimeToSystemTime (&ft, &st); GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, @@ -389,18 +389,18 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (wide) { tmp_width = cur_width; - if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + if (fd[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { static const WCHAR fmt[] = {'[','%','1',']','\0'}; - WCMD_output (fmt, (fd+i)->cFileName); + WCMD_output (fmt, fd[i].cFileName); dir_count++; - tmp_width = tmp_width + strlenW((fd+i)->cFileName) + 2; + tmp_width = tmp_width + strlenW(fd[i].cFileName) + 2; } else { static const WCHAR fmt[] = {'%','1','\0'}; - WCMD_output (fmt, (fd+i)->cFileName); - tmp_width = tmp_width + strlenW((fd+i)->cFileName) ; + WCMD_output (fmt, fd[i].cFileName); + tmp_width = tmp_width + strlenW(fd[i].cFileName) ; file_count++; - file_size.u.LowPart = (fd+i)->nFileSizeLow; - file_size.u.HighPart = (fd+i)->nFileSizeHigh; + file_size.u.LowPart = fd[i].nFileSizeLow; + file_size.u.HighPart = fd[i].nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; } cur_width = cur_width + widest; @@ -412,18 +412,18 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le WCMD_output(padfmt, cur_width - tmp_width, nullW); } - } else if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + } else if (fd[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { dir_count++; if (!bare) { WCMD_output (fmtDir, datestring, timestring); - if (shortname) WCMD_output (fmt2, (fd+i)->cAlternateFileName); + if (shortname) WCMD_output (fmt2, fd[i].cAlternateFileName); if (usernames) WCMD_output (fmt3, username); - WCMD_output(fmt4,(fd+i)->cFileName); + WCMD_output(fmt4,fd[i].cFileName); } else { - if (!((strcmpW((fd+i)->cFileName, dotW) == 0) || - (strcmpW((fd+i)->cFileName, dotdotW) == 0))) { - WCMD_output (fmt5, recurse?inputparms->dirName:nullW, (fd+i)->cFileName); + if (!((strcmpW(fd[i].cFileName, dotW) == 0) || + (strcmpW(fd[i].cFileName, dotdotW) == 0))) { + WCMD_output (fmt5, recurse?inputparms->dirName:nullW, fd[i].cFileName); } else { addNewLine = FALSE; } @@ -431,17 +431,17 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le } else { file_count++; - file_size.u.LowPart = (fd+i)->nFileSizeLow; - file_size.u.HighPart = (fd+i)->nFileSizeHigh; + file_size.u.LowPart = fd[i].nFileSizeLow; + file_size.u.HighPart = fd[i].nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; if (!bare) { WCMD_output (fmtFile, datestring, timestring, WCMD_filesize64(file_size.QuadPart)); - if (shortname) WCMD_output (fmt2, (fd+i)->cAlternateFileName); + if (shortname) WCMD_output (fmt2, fd[i].cAlternateFileName); if (usernames) WCMD_output (fmt3, username); - WCMD_output(fmt4,(fd+i)->cFileName); + WCMD_output(fmt4,fd[i].cFileName); } else { - WCMD_output (fmt5, recurse?inputparms->dirName:nullW, (fd+i)->cFileName); + WCMD_output (fmt5, recurse?inputparms->dirName:nullW, fd[i].cFileName); } } }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2014