July 2014 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Remove wined3d_texture_set /get_priority.
by Alexandre Julliard July 16, 2014

July 16, 2014

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_volume_set/ get_priority.
by Alexandre Julliard July 16, 2014

July 16, 2014

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 July 16, 2014

July 16, 2014

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

Henri Verbeet : d3d9/tests: Get rid of struct vertex_floatcolor.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: 30437f9fe4f2761af1d2b646bca28b1969c2f9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30437f9fe4f2761af1d2b646b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 16 09:09:51 2014 +0200 d3d9/tests: Get rid of struct vertex_floatcolor. --- dlls/d3d9/tests/visual.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6a475a6..117c8eb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7943,11 +7943,6 @@ done: DestroyWindow(window); } -struct vertex_floatcolor { - float x, y, z; - float r, g, b, a; -}; - static void fixed_function_decl_test(void) { IDirect3DVertexDeclaration9 *dcl_float = NULL, *dcl_short = NULL, *dcl_ubyte = NULL, *dcl_color = NULL; @@ -8029,12 +8024,17 @@ static void fixed_function_decl_test(void) {{1.0f, -1.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, {{1.0f, 0.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, }; - static const struct vertex_floatcolor quad4[] = + static const struct + { + struct vec3 position; + struct vec4 color; + } + quad4[] = { - { 0.0f, 0.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, - { 0.0f, 1.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, - { 1.0f, 0.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, - { 1.0f, 1.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 0.0f, 0.0f, 0.0f}}, + {{0.0f, 1.0f, 0.1f}, {1.0f, 0.0f, 0.0f, 0.0f}}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 0.0f, 0.0f, 0.0f}}, + {{1.0f, 1.0f, 0.1f}, {1.0f, 0.0f, 0.0f, 0.0f}}, }; static const DWORD colors[] = {

1 0

Henri Verbeet : d3d9/tests: Get rid of struct tvertex.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: 86ba5b604e764248934ecbc3283c8dff9bfab235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ba5b604e764248934ecbc32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 16 09:09:48 2014 +0200 d3d9/tests: Get rid of struct tvertex. --- dlls/d3d9/tests/visual.c | 138 ++++++++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 62 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b481ddc..caf8f75 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -209,12 +209,6 @@ static void cleanup_device(IDirect3DDevice9 *device) } } -struct tvertex -{ - float x, y, z, rhw; - DWORD diffuse; -}; - struct nvertex { float x, y, z; @@ -2650,19 +2644,24 @@ static void z_range_test(void) {{ 1.0f, 0.0f, -1.1f}, 0xff0000ff}, {{ 1.0f, 1.0f, -1.1f}, 0xff0000ff}, }; - static const struct tvertex quad3[] = + static const struct { - {640.0f, 240.0f, -1.1f, 1.0f, 0xffffff00}, - {640.0f, 480.0f, -1.1f, 1.0f, 0xffffff00}, - { 0.0f, 240.0f, 1.1f, 1.0f, 0xffffff00}, - { 0.0f, 480.0f, 1.1f, 1.0f, 0xffffff00}, - }; - static const struct tvertex quad4[] = + struct vec4 position; + DWORD diffuse; + } + quad3[] = + { + {{640.0f, 240.0f, -1.1f, 1.0f}, 0xffffff00}, + {{640.0f, 480.0f, -1.1f, 1.0f}, 0xffffff00}, + {{ 0.0f, 240.0f, 1.1f, 1.0f}, 0xffffff00}, + {{ 0.0f, 480.0f, 1.1f, 1.0f}, 0xffffff00}, + }, + quad4[] = { - {640.0f, 240.0f, -1.1f, 1.0f, 0xff00ff00}, - {640.0f, 480.0f, -1.1f, 1.0f, 0xff00ff00}, - { 0.0f, 240.0f, 1.1f, 1.0f, 0xff00ff00}, - { 0.0f, 480.0f, 1.1f, 1.0f, 0xff00ff00}, + {{640.0f, 240.0f, -1.1f, 1.0f}, 0xff00ff00}, + {{640.0f, 480.0f, -1.1f, 1.0f}, 0xff00ff00}, + {{ 0.0f, 240.0f, 1.1f, 1.0f}, 0xff00ff00}, + {{ 0.0f, 480.0f, 1.1f, 1.0f}, 0xff00ff00}, }; static const DWORD shader_code[] = { @@ -8078,12 +8077,17 @@ static void fixed_function_decl_test(void) 0.0f, 0.0f, 0.1f, 0.0f, 1.0f, 0.1f, }; - static const struct tvertex quad_transformed[] = + static const struct + { + struct vec4 position; + DWORD diffuse; + } + quad_transformed[] = { - { 90, 110, 0.1, 2.0, 0x00ffff00}, - { 570, 110, 0.1, 2.0, 0x00ffff00}, - { 90, 300, 0.1, 2.0, 0x00ffff00}, - { 570, 300, 0.1, 2.0, 0x00ffff00} + {{ 90.0f, 110.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{570.0f, 110.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{ 90.0f, 300.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{570.0f, 300.0f, 0.1f, 2.0f}, 0x00ffff00}, }; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -12312,33 +12316,38 @@ static void depth_clamp_test(void) HWND window; HRESULT hr; - static const struct tvertex quad1[] = + static const struct { - { 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, - {640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, - { 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, - {640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, - }; - static const struct tvertex quad2[] = + struct vec4 position; + DWORD diffuse; + } + quad1[] = { - { 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, - {640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, - { 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, - {640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, - }; - static const struct tvertex quad3[] = + {{ 0.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{640.0f, 0.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{ 0.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f}, + {{640.0f, 480.0f, 5.0f, 1.0f}, 0xff002b7f}, + }, + quad2[] = { - {112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, - {208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, - {112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, - {208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, - }; - static const struct tvertex quad4[] = + {{ 0.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 300.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{ 0.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 360.0f, 10.0f, 1.0f}, 0xfff9e814}, + }, + quad3[] = + { + {{112.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff}, + {{208.0f, 108.0f, 5.0f, 1.0f}, 0xffffffff}, + {{112.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff}, + {{208.0f, 204.0f, 5.0f, 1.0f}, 0xffffffff}, + }, + quad4[] = { - { 42.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, - {112.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, - { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, - {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, + {{ 42.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff}, + {{112.0f, 41.0f, 10.0f, 1.0f}, 0xffffffff}, + {{ 42.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff}, + {{112.0f, 108.0f, 10.0f, 1.0f}, 0xffffffff}, }; static const struct { @@ -12482,26 +12491,31 @@ done: static void depth_bounds_test(void) { - const struct tvertex quad1[] = + static const struct { - { 0, 0, 0.0f, 1, 0xfff9e814}, - { 640, 0, 0.0f, 1, 0xfff9e814}, - { 0, 480, 1.0f, 1, 0xfff9e814}, - { 640, 480, 1.0f, 1, 0xfff9e814}, - }; - const struct tvertex quad2[] = + struct vec4 position; + DWORD diffuse; + } + quad1[] = { - { 0, 0, 0.6f, 1, 0xff002b7f}, - { 640, 0, 0.6f, 1, 0xff002b7f}, - { 0, 480, 0.6f, 1, 0xff002b7f}, - { 640, 480, 0.6f, 1, 0xff002b7f}, - }; - const struct tvertex quad3[] = + {{ 0.0f, 0.0f, 0.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 0.0f, 0.0f, 1.0f}, 0xfff9e814}, + {{ 0.0f, 480.0f, 1.0f, 1.0f}, 0xfff9e814}, + {{640.0f, 480.0f, 1.0f, 1.0f}, 0xfff9e814}, + }, + quad2[] = + { + {{ 0.0f, 0.0f, 0.6f, 1.0f}, 0xff002b7f}, + {{640.0f, 0.0f, 0.6f, 1.0f}, 0xff002b7f}, + {{ 0.0f, 480.0f, 0.6f, 1.0f}, 0xff002b7f}, + {{640.0f, 480.0f, 0.6f, 1.0f}, 0xff002b7f}, + }, + quad3[] = { - { 0, 100, 0.6f, 1, 0xfff91414}, - { 640, 100, 0.6f, 1, 0xfff91414}, - { 0, 160, 0.6f, 1, 0xfff91414}, - { 640, 160, 0.6f, 1, 0xfff91414}, + {{ 0.0f, 100.0f, 0.6f, 1.0f}, 0xfff91414}, + {{640.0f, 100.0f, 0.6f, 1.0f}, 0xfff91414}, + {{ 0.0f, 160.0f, 0.6f, 1.0f}, 0xfff91414}, + {{640.0f, 160.0f, 0.6f, 1.0f}, 0xfff91414}, }; union {

1 0

Henri Verbeet : d3d9/tests: Get rid of struct nvertex.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: 1ccf7f5e745543744e4ba301f83e5d9da015d362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccf7f5e745543744e4ba301f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 16 09:09:49 2014 +0200 d3d9/tests: Get rid of struct nvertex. --- dlls/d3d9/tests/visual.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index caf8f75..e099f9c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -209,13 +209,6 @@ static void cleanup_device(IDirect3DDevice9 *device) } } -struct nvertex -{ - float x, y, z; - float nx, ny, nz; - DWORD diffuse; -}; - static void test_sanity(void) { IDirect3DDevice9 *device; @@ -303,19 +296,25 @@ static void lighting_test(void) {{-1.0f, 1.0f, 0.1f}, 0x8000ff00}, {{ 1.0f, 1.0f, 0.1f}, 0x80000000}, }; - static const struct nvertex unlitnquad[] = + static const struct { - { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - }; - static const struct nvertex litnquad[] = + struct vec3 position; + struct vec3 normal; + DWORD diffuse; + } + unlitnquad[] = + { + {{0.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + }, + litnquad[] = { - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{0.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{1.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, }; static const WORD Indices[] = {0, 1, 2, 2, 3, 0};

1 0

Henri Verbeet : d3d9/tests: Get rid of struct vertex.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: 51f5bc903a26570ba1c3205d863e99e92fe07d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f5bc903a26570ba1c3205d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 16 09:09:47 2014 +0200 d3d9/tests: Get rid of struct vertex. --- dlls/d3d9/tests/visual.c | 541 ++++++++++++++++++++++++++++------------------- 1 file changed, 320 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51f5bc903a26570ba1c32…

1 0

Henri Verbeet : d3d9/tests: Get rid of struct vertex_shortcolor.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: 0cae65d494492c03af8063ee34130dd043b627bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cae65d494492c03af8063ee3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 16 09:09:50 2014 +0200 d3d9/tests: Get rid of struct vertex_shortcolor. --- dlls/d3d9/tests/visual.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e099f9c..6a475a6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7943,10 +7943,6 @@ done: DestroyWindow(window); } -struct vertex_shortcolor { - float x, y, z; - unsigned short r, g, b, a; -}; struct vertex_floatcolor { float x, y, z; float r, g, b, a; @@ -8021,12 +8017,17 @@ static void fixed_function_decl_test(void) {{ 0.0f, 0.0f, 0.1f}, 0x00ffff00}, {{ 0.0f, 1.0f, 0.1f}, 0x00ffff00}, }; - static const struct vertex_shortcolor quad3[] = /* short */ + static const struct + { + struct vec3 position; + struct { unsigned short x, y, z, w; } color; + } + quad3[] = /* USHORT4N */ { - { 0.0f, -1.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, - { 0.0f, 0.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, - { 1.0f, -1.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, - { 1.0f, 0.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, + {{0.0f, -1.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, + {{0.0f, 0.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, + {{1.0f, -1.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, + {{1.0f, 0.0f, 0.1f}, {0x0000, 0x0000, 0xffff, 0xffff}}, }; static const struct vertex_floatcolor quad4[] = {

1 0

Julian Rüger : German translation for release 1.7.22
by Jeremy Newman July 16, 2014

July 16, 2014

Module: website Branch: master Commit: fdfe513040af7374b4b73ca30f90f1b2824c3022 URL: http://source.winehq.org/git/website.git/?a=commit;h=fdfe513040af7374b4b73c… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jul 16 00:24:37 2014 +0200 German translation for release 1.7.22 --- news/de/2014071101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014071101.xml b/news/de/2014071101.xml new file mode 100644 index 0000000..8f5d33b --- /dev/null +++ b/news/de/2014071101.xml @@ -0,0 +1,16 @@ +<news> +<date>11. Juli 2014</date> +<title>Wine 1.7.22 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Unicode-Klammerpaaren.</li> + <li>Verbesserte Internet-Cookie Unterstützung.</li> + <li>OS X CoreAudio-Treiber benutzt AUHAL an Stelle von AudioQueue.</li> + <li>Anfängliche Unterstützung von Geografischen Informationen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">verfügbar</a>. +15 Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Jacek Caban : wininet: Added new cookie_set_t type and use it in get_cookie.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: e24ce4c128d91f7eb0bf727246ec36eb2fbc4092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24ce4c128d91f7eb0bf72724… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 15 17:13:03 2014 +0200 wininet: Added new cookie_set_t type and use it in get_cookie. --- dlls/wininet/cookie.c | 158 +++++++++++++++++++++++++++++++++--------------- dlls/wininet/http.c | 17 ++---- dlls/wininet/internet.h | 2 +- 3 files changed, 114 insertions(+), 63 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 2c8dd84..d98a127 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -555,15 +555,23 @@ static BOOL COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostName return TRUE; } -DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD *size, DWORD flags) +typedef struct { + cookie_t **cookies; + unsigned cnt; + unsigned size; + + unsigned string_len; +} cookie_set_t; + +static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cookie_set_t *res) { static const WCHAR empty_path[] = { '/',0 }; - unsigned cnt = 0, len, name_len, domain_count = 0, cookie_count = 0; WCHAR *ptr, subpath[INTERNET_MAX_PATH_LENGTH]; const WCHAR *p; cookie_domain_t *domain; cookie_container_t *container; + unsigned len; FILETIME tm; GetSystemTimeAsFileTime(&tm); @@ -600,8 +608,6 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD return ERROR_NO_MORE_ITEMS; } - ptr = cookie_data; - for(domain = get_cookie_domain(host, FALSE); domain; domain = domain->parent) { TRACE("Trying %s domain...\n", debugstr_w(domain->domain)); @@ -613,7 +619,6 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD if(!cookie_match_path(container, path)) continue; - domain_count++; TRACE("found domain %p\n", domain->domain); LIST_FOR_EACH_SAFE(cursor, cursor2, &container->cookie_list) { @@ -630,62 +635,93 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD if((cookie_iter->flags & INTERNET_COOKIE_HTTPONLY) && !(flags & INTERNET_COOKIE_HTTPONLY)) continue; - if (cookie_count) - cnt += 2; /* '; ' */ - cnt += name_len = strlenW(cookie_iter->name); - if ((len = strlenW(cookie_iter->data))) { - cnt += 1; /* = */ - cnt += len; + if(res->size) { + cookie_t **new_cookies = heap_realloc(res->cookies, res->size*2*sizeof(*res->cookies)); + if(!new_cookies) + continue; + res->cookies = new_cookies; + res->size *= 2; + }else { + res->cookies = heap_alloc(4*sizeof(*res->cookies)); + if(!res->cookies) + continue; + res->size = 4; } - if(ptr) { - if(*size > cnt) { - if(cookie_count) { - *ptr++ = ';'; - *ptr++ = ' '; - } + if(res->cnt) + res->string_len += 2; /* '; ' */ + res->cookies[res->cnt++] = cookie_iter; - memcpy(ptr, cookie_iter->name, name_len*sizeof(WCHAR)); - ptr += name_len; - - if(len) { - *ptr++ = '='; - memcpy(ptr, cookie_iter->data, len*sizeof(WCHAR)); - ptr += len; - } - - assert(cookie_data+cnt == ptr); - TRACE("Cookie: %s\n", debugstr_wn(cookie_data, cnt)); - }else { - /* Stop writing data, just compute the size */ - ptr = NULL; - } - } - - cookie_count++; + res->string_len += strlenW(cookie_iter->name); + if(*cookie_iter->data) + res->string_len += 1 /* = */ + strlenW(cookie_iter->data); } } } LeaveCriticalSection(&cookie_cs); + return ERROR_SUCCESS; +} - if(ptr) - *ptr = 0; +static void cookie_set_to_string(const cookie_set_t *cookie_set, WCHAR *str) +{ + WCHAR *ptr = str; + unsigned i, len; - if (!cnt) { - TRACE("no cookies found for %s\n", debugstr_w(host)); - return ERROR_NO_MORE_ITEMS; + for(i=0; i<cookie_set->cnt; i++) { + if(i) { + *ptr++ = ';'; + *ptr++ = ' '; + } + + len = strlenW(cookie_set->cookies[i]->name); + memcpy(ptr, cookie_set->cookies[i]->name, len*sizeof(WCHAR)); + ptr += len; + + if(*cookie_set->cookies[i]->data) { + *ptr++ = '='; + len = strlenW(cookie_set->cookies[i]->data); + memcpy(ptr, cookie_set->cookies[i]->data, len*sizeof(WCHAR)); + ptr += len; + } } - if(!cookie_data || !ptr) { - *size = (cnt + 1) * sizeof(WCHAR); - TRACE("returning %u\n", *size); - return cookie_data ? ERROR_INSUFFICIENT_BUFFER : ERROR_SUCCESS; + assert(ptr-str == cookie_set->string_len); + TRACE("%s\n", debugstr_wn(str, ptr-str)); +} + +DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) +{ + cookie_set_t cookie_set = {0}; + WCHAR *header, *ptr; + DWORD res; + + static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + + res = get_cookie(host, path, INTERNET_COOKIE_HTTPONLY, &cookie_set); + if(res != ERROR_SUCCESS) + return res; + if(!cookie_set.cnt) { + *ret = NULL; + return ERROR_SUCCESS; } - *size = cnt + 1; + ptr = header = heap_alloc(sizeof(cookieW) + (cookie_set.string_len + 3 /* crlf0 */) * sizeof(WCHAR)); + if(!header) + return ERROR_NOT_ENOUGH_MEMORY; + + memcpy(ptr, cookieW, sizeof(cookieW)); + ptr += sizeof(cookieW)/sizeof(*cookieW); + + cookie_set_to_string(&cookie_set, ptr); + heap_free(cookie_set.cookies); + ptr += cookie_set.string_len; - TRACE("Returning %u (from %u domains): %s\n", cnt, domain_count, debugstr_w(cookie_data)); + *ptr++ = '\r'; + *ptr++ = '\n'; + *ptr++ = 0; + + *ret = header; return ERROR_SUCCESS; } @@ -706,6 +742,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPWSTR lpCookieData, LPDWORD lpdwSize, DWORD flags, void *reserved) { WCHAR host[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; + cookie_set_t cookie_set = {0}; DWORD res; BOOL ret; @@ -727,10 +764,33 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return FALSE; } - res = get_cookie(host, path, lpCookieData, lpdwSize, flags); - if(res != ERROR_SUCCESS) + res = get_cookie(host, path, flags, &cookie_set); + if(res != ERROR_SUCCESS) { SetLastError(res); - return res == ERROR_SUCCESS; + return FALSE; + } + + if(!cookie_set.cnt) { + TRACE("no cookies found for %s\n", debugstr_w(host)); + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; + } + + if(!lpCookieData || cookie_set.string_len+1 > *lpdwSize) { + *lpdwSize = (cookie_set.string_len + 1) * sizeof(WCHAR); + TRACE("returning %u\n", *lpdwSize); + if(lpCookieData) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + }else { + *lpdwSize = cookie_set.string_len + 1; + cookie_set_to_string(&cookie_set, lpCookieData); + lpCookieData[cookie_set.string_len] = 0; + } + + heap_free(cookie_set.cookies); + return ret; } /*********************************************************************** diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8ff42a2..2486fbf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4176,24 +4176,15 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static void HTTP_InsertCookies(http_request_t *request) { - DWORD cookie_size, size, cnt = 0; WCHAR *cookies; + DWORD res; - static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' ',0}; - - if(get_cookie(request->server->name, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) - return; - - size = sizeof(cookieW) + cookie_size * sizeof(WCHAR) + sizeof(szCrLf); - if(!(cookies = heap_alloc(size))) + res = get_cookie_header(request->server->name, request->path, &cookies); + if(res != ERROR_SUCCESS || !cookies) return; - cnt += sprintfW(cookies, cookieW); - get_cookie(request->server->name, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); - strcatW(cookies, szCrLf); - + get_cookie_header(request->server->name, request->path, &cookies); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); - heap_free(cookies); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2647f98..54f688d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -420,7 +420,7 @@ DWORD HTTP_Connect(appinfo_t*,LPCWSTR, BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; -DWORD get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*,DWORD) DECLSPEC_HIDDEN; +DWORD get_cookie_header(const WCHAR*,const WCHAR*,WCHAR**) DECLSPEC_HIDDEN; DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN;

1 0