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

Akihiro Sagawa : oleaut32/tests: Add more test cases that proxy stub interface is on one side.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: 8b0b6f90afb98be8345b654e187256307add794d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0b6f90afb98be8345b654e1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:44 2014 +0900 oleaut32/tests: Add more test cases that proxy stub interface is on one side. --- dlls/oleaut32/tests/typelib.c | 114 ++++++++++++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 31 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 492975d..eb0c6e6 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5337,10 +5337,9 @@ IUnknown uk = {&vt}; static void test_stub(void) { + BOOL is_wow64 = FALSE; + DWORD *sam_list; HRESULT hr; - CLSID clsid; - IPSFactoryBuffer *factory; - IRpcStubBuffer *base_stub; ITypeLib *stdole; ICreateTypeLib2 *ctl; ICreateTypeInfo *cti; @@ -5349,14 +5348,22 @@ static void test_stub(void) HREFTYPE href; char filenameA[MAX_PATH]; WCHAR filenameW[MAX_PATH]; - HKEY hkey; - LONG lr; + int i; static const GUID libguid = {0x3b9ff02e,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static const GUID interfaceguid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static const GUID coclassguid = {0x3b9ff030,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static OLECHAR interfaceW[] = {'i','n','t','e','r','f','a','c','e',0}; static OLECHAR classW[] = {'c','l','a','s','s',0}; + static DWORD sam_list32[] = { 0, ~0 }; + static DWORD sam_list64[] = { 0, KEY_WOW64_32KEY, KEY_WOW64_64KEY, ~0 }; + + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); + if (is_wow64 || is_win64) + sam_list = sam_list64; + else + sam_list = sam_list32; CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -5421,41 +5428,86 @@ static void test_stub(void) hr = ICreateTypeLib2_QueryInterface(ctl, &IID_ITypeLib, (void**)&tl); ok(hr == S_OK, "got %08x\n", hr); - hr = RegisterTypeLib(tl, filenameW, NULL); - if (hr == TYPE_E_REGISTRYACCESS) + for (i = 0; sam_list[i] != ~0; i++) { - win_skip("Insufficient privileges to register typelib in the registry\n"); - ITypeLib_Release(tl); - DeleteFileW(filenameW); - CoUninitialize(); - return; - } - ok(hr == S_OK, "got %08x\n", hr); + IPSFactoryBuffer *factory; + IRpcStubBuffer *base_stub; + REGSAM side = sam_list[i]; + CLSID clsid; + HKEY hkey; + LONG lr; + + hr = RegisterTypeLib(tl, filenameW, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + break; + } + ok(hr == S_OK, "got %08x, side: %04x\n", hr, side); - ITypeLib_Release(tl); - ok(0 == ICreateTypeLib2_Release(ctl), "Typelib still has references\n"); + /* SYS_WIN32 typelibs should be registered only as 32-bit */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win64", 0, KEY_READ | side, &hkey); + ok(lr == ERROR_FILE_NOT_FOUND, "got wrong return code: %u, side: %04x\n", lr, side); - /* SYS_WIN32 typelibs should be registered only as 32-bit */ - lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win64", 0, KEY_READ, &hkey); - ok(lr == ERROR_FILE_NOT_FOUND, "got wrong return code: %u\n", lr); + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win32", 0, KEY_READ | side, &hkey); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + RegCloseKey(hkey); - lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win32", 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "got wrong return code: %u\n", lr); - RegCloseKey(hkey); + /* Simulate pre-win7 installers that create interface key on one side */ + if (side != 0) + { + WCHAR guidW[40]; + REGSAM opposite = side ^ (KEY_WOW64_64KEY | KEY_WOW64_32KEY); + + StringFromGUID2(&interfaceguid, guidW, sizeof(guidW)/sizeof(guidW[0])); + + /* Delete the opposite interface key */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_READ | opposite, &hkey); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + lr = myRegDeleteTreeW(hkey, guidW, opposite); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + RegCloseKey(hkey); + + /* Is our side interface key affected by above operation? */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface\\{3b9ff02f-9675-4861-b781-ceaea4782acc}", 0, KEY_READ | side, &hkey); + ok(lr == ERROR_SUCCESS || broken(lr == ERROR_FILE_NOT_FOUND), "got wrong return code: %u, side: %04x\n", lr, side); + if (lr == ERROR_FILE_NOT_FOUND) + { + /* win2k3, vista, 2008 */ + win_skip("Registry reflection is enabled on this platform.\n"); + goto next; + } + RegCloseKey(hkey); - hr = CoGetPSClsid(&interfaceguid, &clsid); - ok(hr == S_OK, "got: %x\n", hr); + /* Opposite side typelib key still exists */ + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "TypeLib\\{3b9ff02e-9675-4861-b781-ceaea4782acc}\\0.0\\0\\win32", 0, KEY_READ | opposite, &hkey); + ok(lr == ERROR_SUCCESS, "got wrong return code: %u, side: %04x\n", lr, side); + RegCloseKey(hkey); + } - hr = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, - &IID_IPSFactoryBuffer, (void **)&factory); - ok(hr == S_OK, "got: %x\n", hr); + hr = CoGetPSClsid(&interfaceguid, &clsid); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); - hr = IPSFactoryBuffer_CreateStub(factory, &interfaceguid, &uk, &base_stub); - ok(hr == S_OK, "got: %x\n", hr); + hr = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, + &IID_IPSFactoryBuffer, (void **)&factory); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); - IPSFactoryBuffer_Release(factory); + hr = IPSFactoryBuffer_CreateStub(factory, &interfaceguid, &uk, &base_stub); + if ((is_win64 && side == KEY_WOW64_32KEY) + || (is_wow64 && side == KEY_WOW64_64KEY)) + todo_wine ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + else + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + + IPSFactoryBuffer_Release(factory); + next: + hr = UnRegisterTypeLib(&libguid, 0, 0, 0, SYS_WIN32); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + } + + ITypeLib_Release(tl); + ok(0 == ICreateTypeLib2_Release(ctl), "Typelib still has references\n"); - UnRegisterTypeLib(&libguid, 0, 0, 0, SYS_WIN32); DeleteFileW(filenameW); CoUninitialize();

1 0

Akihiro Sagawa : oleaut32/tests: Add registry view flag to myRegDeleteTreeW like RegDeleteKeyEx.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: eb95ad074f4af5b847b6b2ea298c4db20d2d4e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb95ad074f4af5b847b6b2ea2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:43 2014 +0900 oleaut32/tests: Add registry view flag to myRegDeleteTreeW like RegDeleteKeyEx. --- dlls/oleaut32/tests/typelib.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 312195b..492975d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -75,6 +75,7 @@ static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pIsWow64Process)(HANDLE,LPBOOL); +static LONG (WINAPI *pRegDeleteKeyExW)(HKEY,LPCWSTR,REGSAM,DWORD); static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; static WCHAR wszGUID[] = {'G','U','I','D',0}; @@ -166,6 +167,7 @@ static void init_function_pointers(void) { HMODULE hmod = GetModuleHandleA("oleaut32.dll"); HMODULE hk32 = GetModuleHandleA("kernel32.dll"); + HMODULE hadv = GetModuleHandleA("advapi32.dll"); pRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "RegisterTypeLibForUser"); pUnRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "UnRegisterTypeLibForUser"); @@ -174,6 +176,7 @@ static void init_function_pointers(void) pDeactivateActCtx = (void *)GetProcAddress(hk32, "DeactivateActCtx"); pReleaseActCtx = (void *)GetProcAddress(hk32, "ReleaseActCtx"); pIsWow64Process = (void *)GetProcAddress(hk32, "IsWow64Process"); + pRegDeleteKeyExW = (void*)GetProcAddress(hadv, "RegDeleteKeyExW"); } static void ref_count_test(LPCWSTR type_lib) @@ -1154,18 +1157,19 @@ static void test_DispCallFunc(void) ok(V_VT(&result) == 0xcccc, "V_VT(result) = %u\n", V_VT(&result)); } -/* RegDeleteTreeW from dlls/advapi32/registry.c */ -static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +/* RegDeleteTreeW from dlls/advapi32/registry.c, plus additional view flag */ +static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey, REGSAM view) { LONG ret; DWORD dwMaxSubkeyLen, dwMaxValueLen; DWORD dwMaxLen, dwSize; WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; HKEY hSubKey = hKey; + view &= (KEY_WOW64_64KEY | KEY_WOW64_32KEY); if(lpszSubKey) { - ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ | view, &hSubKey); if (ret) return ret; } @@ -1193,12 +1197,15 @@ static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, NULL, NULL, NULL)) break; - ret = myRegDeleteTreeW(hSubKey, lpszName); + ret = myRegDeleteTreeW(hSubKey, lpszName, view); if (ret) goto cleanup; } if (lpszSubKey) - ret = RegDeleteKeyW(hKey, lpszSubKey); + if (pRegDeleteKeyExW && view != 0) + ret = pRegDeleteKeyExW(hKey, lpszSubKey, view, 0); + else + ret = RegDeleteKeyW(hKey, lpszSubKey); else while (TRUE) { @@ -1233,7 +1240,7 @@ static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, DWORD arch, LPCWST if (remove) { - ok(myRegDeleteTreeW(HKEY_CLASSES_ROOT, buf) == ERROR_SUCCESS, "SHDeleteKey failed\n"); + ok(myRegDeleteTreeW(HKEY_CLASSES_ROOT, buf, 0) == ERROR_SUCCESS, "SHDeleteKey failed\n"); return TRUE; }

1 0

Akihiro Sagawa : ole32: Search 32-bit registry in 64-bit CoGetPSClsid and vice versa.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: efdaa4a17a4a2582123e83da80a03f401e8146e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdaa4a17a4a2582123e83da8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:41 2014 +0900 ole32: Search 32-bit registry in 64-bit CoGetPSClsid and vice versa. --- dlls/ole32/compobj.c | 60 ++++++++++++++++++++++++++-------------------- dlls/ole32/tests/compobj.c | 4 ++-- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index acfb630..1fab04f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2491,6 +2491,28 @@ HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, LPCLSID clsid) return CLSIDFromProgID(progid, clsid); } +static HRESULT get_ps_clsid_from_registry(const WCHAR* path, REGSAM access, CLSID *pclsid) +{ + HKEY hkey; + WCHAR value[CHARS_IN_GUID]; + DWORD len; + + access |= KEY_READ; + + if (open_classes_key(HKEY_CLASSES_ROOT, path, access, &hkey)) + return REGDB_E_IIDNOTREG; + + len = sizeof(value); + if (ERROR_SUCCESS != RegQueryValueExW(hkey, NULL, NULL, NULL, (BYTE *)value, &len)) + return REGDB_E_IIDNOTREG; + RegCloseKey(hkey); + + if (CLSIDFromString(value, pclsid) != NOERROR) + return REGDB_E_IIDNOTREG; + + return S_OK; +} + /***************************************************************************** * CoGetPSClsid [OLE32.@] * @@ -2532,12 +2554,12 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) static const WCHAR wszInterface[] = {'I','n','t','e','r','f','a','c','e','\\',0}; static const WCHAR wszPSC[] = {'\\','P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; WCHAR path[ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAYSIZE(wszPSC)]; - WCHAR value[CHARS_IN_GUID]; - LONG len; - HKEY hkey; APARTMENT *apt = COM_CurrentApt(); struct registered_psclsid *registered_psclsid; ACTCTX_SECTION_KEYED_DATA data; + HRESULT hr; + REGSAM opposite = (sizeof(void*) > sizeof(int)) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64; TRACE("() riid=%s, pclsid=%p\n", debugstr_guid(riid), pclsid); @@ -2576,31 +2598,17 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) StringFromGUID2(riid, path + ARRAYSIZE(wszInterface) - 1, CHARS_IN_GUID); strcpyW(path + ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); - /* Open the key.. */ - if (open_classes_key(HKEY_CLASSES_ROOT, path, KEY_READ, &hkey)) - { - WARN("No PSFactoryBuffer object is registered for IID %s\n", debugstr_guid(riid)); - return REGDB_E_IIDNOTREG; - } + hr = get_ps_clsid_from_registry(path, 0, pclsid); + if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || + (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + hr = get_ps_clsid_from_registry(path, opposite, pclsid); - /* ... Once we have the key, query the registry to get the - value of CLSID as a string, and convert it into a - proper CLSID structure to be passed back to the app */ - len = sizeof(value); - if (ERROR_SUCCESS != RegQueryValueW(hkey, NULL, value, &len)) - { - RegCloseKey(hkey); - return REGDB_E_IIDNOTREG; - } - RegCloseKey(hkey); - - /* We have the CLSID we want back from the registry as a string, so - let's convert it into a CLSID structure */ - if (CLSIDFromString(value, pclsid) != NOERROR) - return REGDB_E_IIDNOTREG; + if (hr == S_OK) + TRACE ("() Returning CLSID=%s\n", debugstr_guid(pclsid)); + else + WARN("No PSFactoryBuffer object is registered for IID %s\n", debugstr_guid(riid)); - TRACE ("() Returning CLSID=%s\n", debugstr_guid(pclsid)); - return S_OK; + return hr; } /***************************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b789794..1dfa9fb 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1162,8 +1162,8 @@ static void test_CoGetPSClsid(void) RegCloseKey(hkey_psclsid); hr = CoGetPSClsid(&IID_DeadBeef, &clsid); - todo_wine ok_ole_success(hr, "CoGetPSClsid"); - todo_wine ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", wine_dbgstr_guid(&clsid)); + ok_ole_success(hr, "CoGetPSClsid"); + ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", wine_dbgstr_guid(&clsid)); res = pRegDeleteKeyExA(hkey, "ProxyStubClsid32", opposite, 0); ok(!res, "RegDeleteKeyEx returned %d\n", res);

1 0

Akihiro Sagawa : oleaut32: Use the alternate interface key if not present on current view.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: 75c02048713ba398a078d5ecc51ef9f77c0f47a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c02048713ba398a078d5ecc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:46 2014 +0900 oleaut32: Use the alternate interface key if not present on current view. --- dlls/oleaut32/tests/typelib.c | 6 +----- dlls/oleaut32/tmarshal.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index eb0c6e6..49057a4 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5493,11 +5493,7 @@ static void test_stub(void) ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); hr = IPSFactoryBuffer_CreateStub(factory, &interfaceguid, &uk, &base_stub); - if ((is_win64 && side == KEY_WOW64_32KEY) - || (is_wow64 && side == KEY_WOW64_64KEY)) - todo_wine ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); - else - ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); IPSFactoryBuffer_Release(factory); next: diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index ee2a95b..b812215 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -270,11 +270,13 @@ static HRESULT _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { HRESULT hres; HKEY ikey; + REGSAM opposite = (sizeof(void*) == 8) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64; char tlguid[200],typelibkey[300],interfacekey[300],ver[100]; char tlfn[260]; OLECHAR tlfnW[260]; DWORD tlguidlen, verlen, type; - LONG tlfnlen; + LONG tlfnlen, err; ITypeLib *tl; sprintf( interfacekey, "Interface\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\Typelib", @@ -283,9 +285,14 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] ); - if (RegOpenKeyA(HKEY_CLASSES_ROOT,interfacekey,&ikey)) { - ERR("No %s key found.\n",interfacekey); - return E_FAIL; + err = RegOpenKeyExA(HKEY_CLASSES_ROOT,interfacekey,0,KEY_READ,&ikey); + if (err && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) + && is_wow64))) { + err = RegOpenKeyExA(HKEY_CLASSES_ROOT,interfacekey,0,KEY_READ|opposite,&ikey); + } + if (err) { + ERR("No %s key found.\n",interfacekey); + return E_FAIL; } tlguidlen = sizeof(tlguid); if (RegQueryValueExA(ikey,NULL,NULL,&type,(LPBYTE)tlguid,&tlguidlen)) {

1 0

Akihiro Sagawa : ole32: Add KEY_WOW64 support in wrapper registry functions.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: 414398c1e7e2d04166a375088a4b62855e9bc782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=414398c1e7e2d04166a375088… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:39 2014 +0900 ole32: Add KEY_WOW64 support in wrapper registry functions. --- dlls/ole32/compobj.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 7af3bb7..acfb630 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -337,7 +337,7 @@ static const WCHAR classes_rootW[] = static HKEY classes_root_hkey; /* create the special HKEY_CLASSES_ROOT key */ -static HKEY create_classes_root_hkey(void) +static HKEY create_classes_root_hkey(DWORD access) { HKEY hkey, ret = 0; OBJECT_ATTRIBUTES attr; @@ -350,23 +350,39 @@ static HKEY create_classes_root_hkey(void) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &name, classes_rootW ); - if (create_key( &hkey, MAXIMUM_ALLOWED, &attr )) return 0; + if (create_key( &hkey, access, &attr )) return 0; TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); - if (!(ret = InterlockedCompareExchangePointer( (void **)&classes_root_hkey, hkey, 0 ))) - ret = hkey; + if (!(access & KEY_WOW64_64KEY)) + { + if (!(ret = InterlockedCompareExchangePointer( (void **)&classes_root_hkey, hkey, 0 ))) + ret = hkey; + else + NtClose( hkey ); /* somebody beat us to it */ + } else - NtClose( hkey ); /* somebody beat us to it */ + ret = hkey; return ret; } /* map the hkey from special root to normal key if necessary */ -static inline HKEY get_classes_root_hkey( HKEY hkey ) +static inline HKEY get_classes_root_hkey( HKEY hkey, REGSAM access ) { HKEY ret = hkey; + const BOOL is_win64 = sizeof(void*) > sizeof(int); + const BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY); - if (hkey == HKEY_CLASSES_ROOT && !(ret = classes_root_hkey)) - ret = create_classes_root_hkey(); + if (hkey == HKEY_CLASSES_ROOT && + ((access & KEY_WOW64_64KEY) || !(ret = classes_root_hkey))) + ret = create_classes_root_hkey(MAXIMUM_ALLOWED | (access & KEY_WOW64_64KEY)); + if (force_wow32 && ret && ret == classes_root_hkey) + { + static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; + access &= ~KEY_WOW64_32KEY; + if (create_classes_key(classes_root_hkey, wow6432nodeW, access, &hkey)) + return 0; + ret = hkey; + } return ret; } @@ -376,7 +392,7 @@ LSTATUS create_classes_key( HKEY hkey, const WCHAR *name, REGSAM access, HKEY *r OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - if (!(hkey = get_classes_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + if (!(hkey = get_classes_root_hkey( hkey, access ))) return ERROR_INVALID_HANDLE; attr.Length = sizeof(attr); attr.RootDirectory = hkey; @@ -394,7 +410,7 @@ LSTATUS open_classes_key( HKEY hkey, const WCHAR *name, REGSAM access, HKEY *ret OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - if (!(hkey = get_classes_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + if (!(hkey = get_classes_root_hkey( hkey, access ))) return ERROR_INVALID_HANDLE; attr.Length = sizeof(attr); attr.RootDirectory = hkey;

1 0

Zhenbo Li : mshtml: Added IHTMLTable::summary property implementation.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: 720207ad4630b8cfb591c68bd3a27bba9ed9cfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=720207ad4630b8cfb591c68bd… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jul 15 21:06:41 2014 +0800 mshtml: Added IHTMLTable::summary property implementation. --- dlls/mshtml/htmltable.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 0f64330..e7991da 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -869,15 +869,35 @@ static HRESULT WINAPI HTMLTable3_Invoke(IHTMLTable3 *iface, DISPID dispIdMember, static HRESULT WINAPI HTMLTable3_put_summary(IHTMLTable3 *iface, BSTR v) { HTMLTable *This = impl_from_IHTMLTable3(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&str, v); + + nsres = nsIDOMHTMLTableElement_SetSummary(This->nstable, &str); + + nsAString_Finish(&str); + if (NS_FAILED(nsres)) { + ERR("Set summary(%s) failed: %08x\n", debugstr_w(v), nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTable3_get_summary(IHTMLTable3 *iface, BSTR * p) { HTMLTable *This = impl_from_IHTMLTable3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLTableElement_GetSummary(This->nstable, &str); + + return return_nsstr(nsres, &str, p); } static const IHTMLTable3Vtbl HTMLTable3Vtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 941e87b..532bbfb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5930,6 +5930,7 @@ static void test_table_elem(IHTMLElement *elem) { IHTMLElementCollection *col; IHTMLTable *table; + IHTMLTable3 *table3; IHTMLDOMNode *node; VARIANT v; HRESULT hres; @@ -5945,6 +5946,11 @@ static void test_table_elem(IHTMLElement *elem) if(FAILED(hres)) return; + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable3, (void**)&table3); + ok(hres == S_OK, "Could not get IHTMLTable3 iface: %08x\n", hres); + if(FAILED(hres)) + return; + col = NULL; hres = IHTMLTable_get_rows(table, &col); ok(hres == S_OK, "get_rows failed: %08x\n", hres); @@ -6082,6 +6088,17 @@ static void test_table_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + bstr = a2bstr("summary"); + hres = IHTMLTable3_put_summary(table3, bstr); + ok(hres == S_OK, "put_summary = %08x\n", hres); + SysFreeString(bstr); + + hres = IHTMLTable3_get_summary(table3, &bstr); + ok(hres == S_OK, "get_summary = %08x\n", hres); + ok(!strcmp_wa(bstr, "summary"), "Expected summary, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + IHTMLTable3_Release(table3); IHTMLTable_Release(table); }

1 0

Marcus Meissner : rpcrt4: Fixed memory leak on error exit (Coverity).
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: 906c341781c327f4ad67d9c49366c7b99fdb19fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=906c341781c327f4ad67d9c49… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 15 10:00:43 2014 +0200 rpcrt4: Fixed memory leak on error exit (Coverity). --- dlls/rpcrt4/rpc_transport.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b283301..c5ed04d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -942,6 +942,7 @@ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data, else { ERR("unexpected protocol family %d\n", ai->ai_family); + freeaddrinfo(ai); return 0; }

1 0

Henri Verbeet : ddraw/tests: Get rid of struct sVertexT.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: ce60e4ec711826cd33a4f4d93eae03d0d11d03bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce60e4ec711826cd33a4f4d93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 15 08:43:55 2014 +0200 ddraw/tests: Get rid of struct sVertexT. --- dlls/ddraw/tests/visual.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 58c7d7d..097e8be 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -446,12 +446,6 @@ static void clear_test(IDirect3DDevice7 *device) ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color); } -struct sVertexT { - float x, y, z, rhw; - DWORD diffuse; - DWORD specular; -}; - static void fog_test(IDirect3DDevice7 *device) { HRESULT hr; @@ -495,20 +489,28 @@ static void fog_test(IDirect3DDevice7 *device) {{ 0.0f, 1.0f, 1.5f}, 0xffff0000, 0xff000000}, {{ 0.0f, 0.0f, 1.5f}, 0xffff0000, 0xff000000}, }; - /* Untransformed ones. Give them a different diffuse color to make the test look - * nicer. It also makes making sure that they are drawn correctly easier. - */ - struct sVertexT transformed_1[] = { - {320, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - }; - struct sVertexT transformed_2[] = { - {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {320, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + /* Untransformed ones. Give them a different diffuse color to make the + * test look nicer. It also makes making sure that they are drawn + * correctly easier. */ + struct + { + struct vec4 position; + DWORD diffuse; + DWORD specular; + } + transformed_1[] = + { + {{320.0f, 0.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{640.0f, 0.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{640.0f, 240.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{320.0f, 240.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + }, + transformed_2[] = + { + {{320.0f, 240.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{640.0f, 240.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{640.0f, 480.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, + {{320.0f, 480.0f, 1.0f, 1.0f}, 0xffffff00, 0xff000000}, }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; D3DMATRIX ident_mat =

1 0

Vincent Povirk : mscoree: Accept "v4.0" as a runtime version in config files.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: 805da6bf838158b81a7e1b3d00ae7d983268c3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805da6bf838158b81a7e1b3d0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 14 15:55:18 2014 -0500 mscoree: Accept "v4.0" as a runtime version in config files. --- dlls/mscoree/metahost.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 61bd89e..2383068 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -981,14 +981,12 @@ static BOOL parse_runtime_version(LPCWSTR version, DWORD *major, DWORD *minor, D return FALSE; } -HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, - LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) +static HRESULT get_runtime(LPCWSTR pwzVersion, BOOL allow_short, + REFIID iid, LPVOID *ppRuntime) { int i; DWORD major, minor, build; - TRACE("%s %s %p\n", debugstr_w(pwzVersion), debugstr_guid(iid), ppRuntime); - if (!pwzVersion) return E_POINTER; @@ -1003,7 +1001,7 @@ HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, for (i=0; i<NUM_RUNTIMES; i++) { if (runtimes[i].major == major && runtimes[i].minor == minor && - runtimes[i].build == build) + (runtimes[i].build == build || (allow_short && major >= 4 && build == 0))) { if (runtimes[i].found) return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, iid, @@ -1020,6 +1018,14 @@ HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, return CLR_E_SHIM_RUNTIME; } +HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, + LPCWSTR pwzVersion, REFIID iid, LPVOID *ppRuntime) +{ + TRACE("%s %s %p\n", debugstr_w(pwzVersion), debugstr_guid(iid), ppRuntime); + + return get_runtime(pwzVersion, FALSE, iid, ppRuntime); +} + HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) { @@ -1389,7 +1395,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, supported_runtime *entry; LIST_FOR_EACH_ENTRY(entry, &parsed_config.supported_runtimes, supported_runtime, entry) { - hr = CLRMetaHost_GetRuntime(0, entry->version, &IID_ICLRRuntimeInfo, (void**)result); + hr = get_runtime(entry->version, TRUE, &IID_ICLRRuntimeInfo, (void**)result); if (SUCCEEDED(hr)) { found = TRUE;

1 0

Akihiro Sagawa : ole32/tests: Add CoGetPSClsid WOW64 registry tests.
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: fae8d9db5f3dcbec198d1a4cde6c9cfe8684b5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae8d9db5f3dcbec198d1a4cd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 15 19:34:38 2014 +0900 ole32/tests: Add CoGetPSClsid WOW64 registry tests. --- dlls/ole32/tests/compobj.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 6d5e811..b789794 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -43,11 +43,13 @@ static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppO static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); static HRESULT (WINAPI * pCoTreatAsClass)(REFCLSID clsidOld, REFCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); +static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, LPBOOL); static void (WINAPI *pReleaseActCtx)(HANDLE); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -1049,6 +1051,8 @@ static void test_CoGetPSClsid(void) CLSID clsid; HKEY hkey; LONG res; + const BOOL is_win64 = (sizeof(void*) != sizeof(int)); + BOOL is_wow64 = FALSE; hr = CoGetPSClsid(&IID_IClassFactory, &clsid); ok(hr == CO_E_NOTINITIALIZED, @@ -1132,6 +1136,43 @@ static void test_CoGetPSClsid(void) pReleaseActCtx(handle); } + if (pRegDeleteKeyExA && + (is_win64 || + (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + { + static GUID IID_DeadBeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; + static const char clsidDeadBeef[] = "{deadbeef-dead-beef-dead-beefdeadbeef}"; + static const char clsidA[] = "{66666666-8888-7777-6666-555555555555}"; + HKEY hkey_iface, hkey_psclsid; + REGSAM opposite = is_win64 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + + hr = CoGetPSClsid(&IID_DeadBeef, &clsid); + ok(hr == REGDB_E_IIDNOTREG, "got 0x%08x\n", hr); + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, "Interface", + 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey_iface, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); + res = RegCreateKeyExA(hkey_iface, clsidDeadBeef, + 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); + res = RegCreateKeyExA(hkey, "ProxyStubClsid32", + 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey_psclsid, NULL); + res = RegSetValueExA(hkey_psclsid, NULL, 0, REG_SZ, (const BYTE *)clsidA, strlen(clsidA)+1); + ok(!res, "RegSetValueEx returned %d\n", res); + RegCloseKey(hkey_psclsid); + + hr = CoGetPSClsid(&IID_DeadBeef, &clsid); + todo_wine ok_ole_success(hr, "CoGetPSClsid"); + todo_wine ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", wine_dbgstr_guid(&clsid)); + + res = pRegDeleteKeyExA(hkey, "ProxyStubClsid32", opposite, 0); + ok(!res, "RegDeleteKeyEx returned %d\n", res); + RegCloseKey(hkey); + res = pRegDeleteKeyExA(hkey_iface, clsidDeadBeef, opposite, 0); + ok(!res, "RegDeleteKeyEx returned %d\n", res); + RegCloseKey(hkey_iface); + } + CoUninitialize(); } @@ -2058,12 +2099,14 @@ static void init_funcs(void) pCoGetTreatAsClass = (void*)GetProcAddress(hOle32,"CoGetTreatAsClass"); pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); + pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); pActivateActCtx = (void*)GetProcAddress(hkernel32, "ActivateActCtx"); pCreateActCtxW = (void*)GetProcAddress(hkernel32, "CreateActCtxW"); pDeactivateActCtx = (void*)GetProcAddress(hkernel32, "DeactivateActCtx"); + pIsWow64Process = (void*)GetProcAddress(hkernel32, "IsWow64Process"); pReleaseActCtx = (void*)GetProcAddress(hkernel32, "ReleaseActCtx"); }

1 0

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

July 15, 2014

Module: wine Branch: master Commit: 4cb91a69b008dabc69a1250b4bf9840ceb7360ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb91a69b008dabc69a1250b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 15 08:43:58 2014 +0200 d3d8/tests: Get rid of struct nvertex. --- dlls/d3d8/tests/device.c | 17 +++++++++-------- dlls/d3d8/tests/visual.c | 35 +++++++++++++++++------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f6fa169..a92ca81 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1919,17 +1919,18 @@ static void test_render_zero_triangles(void) HWND window; HRESULT hr; - struct nvertex + static const struct { - float x, y, z; - float nx, ny, nz; + struct vec3 position; + struct vec3 normal; DWORD diffuse; - } quad[] = + } + quad[] = { - { 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}, + {{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}, }; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1bf2e0a..ba73bb6 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -133,13 +133,6 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND return NULL; } -struct nvertex -{ - float x, y, z; - float nx, ny, nz; - DWORD diffuse; -}; - static void test_sanity(void) { IDirect3DDevice8 *device; @@ -212,19 +205,25 @@ static void lighting_test(void) {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, }; - 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}; static const D3DMATRIX mat =

1 0

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

July 15, 2014

Module: wine Branch: master Commit: 59208edffee7737313928b89775d9cb776dfe2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59208edffee7737313928b897… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 15 08:43:57 2014 +0200 d3d8/tests: Get rid of struct tvertex. --- dlls/d3d8/tests/visual.c | 84 +++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 5521066..1bf2e0a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -133,12 +133,6 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND return NULL; } -struct tvertex -{ - float x, y, z, w; - DWORD diffuse; -}; - struct nvertex { float x, y, z; @@ -1603,19 +1597,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, 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}, 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}, }; static const DWORD shader_code[] = { @@ -2653,33 +2652,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 {

1 0

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

July 15, 2014

Module: wine Branch: master Commit: ab1a53c1b9091a14454226b309b6aa8f0ebe5f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1a53c1b9091a14454226b30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 15 08:43:56 2014 +0200 d3d8/tests: Get rid of struct vertex. --- dlls/d3d8/tests/visual.c | 191 +++++++++++++++++++++++++++-------------------- 1 file changed, 110 insertions(+), 81 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e975e58..5521066 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -133,12 +133,6 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND return NULL; } -struct vertex -{ - float x, y, z; - DWORD diffuse; -}; - struct tvertex { float x, y, z, w; @@ -205,19 +199,24 @@ static void lighting_test(void) HWND window; HRESULT hr; - static const struct vertex unlitquad[] = + static const struct { - {-1.0f, -1.0f, 0.1f, 0xffff0000}, - {-1.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, -1.0f, 0.1f, 0xffff0000}, - }; - static const struct vertex litquad[] = + struct vec3 position; + DWORD diffuse; + } + unlitquad[] = { - {-1.0f, 0.0f, 0.1f, 0xff00ff00}, - {-1.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 0.0f, 0.1f, 0xff00ff00}, + {{-1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 0.0f, 0.1f}, 0xffff0000}, + {{ 0.0f, 0.0f, 0.1f}, 0xffff0000}, + {{ 0.0f, -1.0f, 0.1f}, 0xffff0000}, + }, + litquad[] = + { + {{-1.0f, 0.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, }; static const struct nvertex unlitnquad[] = { @@ -754,12 +753,17 @@ static void fog_with_shader_test(void) 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ 0x0000ffff }; - static struct vertex quad[] = + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = { - {-1.0f, -1.0f, 0.0f, 0xffff0000}, - {-1.0f, 1.0f, 0.0f, 0xffff0000}, - { 1.0f, -1.0f, 0.0f, 0xffff0000}, - { 1.0f, 1.0f, 0.0f, 0xffff0000}, + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000}, }; static const DWORD decl[] = { @@ -980,10 +984,10 @@ static void fog_with_shader_test(void) for(j = 0; j < 11; ++j) { /* Don't use the whole zrange to prevent rounding errors */ - quad[0].z = 0.001f + j / 10.02f; - quad[1].z = 0.001f + j / 10.02f; - quad[2].z = 0.001f + j / 10.02f; - quad[3].z = 0.001f + j / 10.02f; + quad[0].position.z = 0.001f + j / 10.02f; + quad[1].position.z = 0.001f + j / 10.02f; + quad[2].position.z = 0.001f + j / 10.02f; + quad[3].position.z = 0.001f + j / 10.02f; hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff00ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed (%08x)\n", hr); @@ -1580,19 +1584,24 @@ static void z_range_test(void) HWND window; HRESULT hr; - static const struct vertex quad[] = + static const struct { - {-1.0f, 0.0f, 1.1f, 0xffff0000}, - {-1.0f, 1.0f, 1.1f, 0xffff0000}, - { 1.0f, 0.0f, -1.1f, 0xffff0000}, - { 1.0f, 1.0f, -1.1f, 0xffff0000}, - }; - static const struct vertex quad2[] = + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, 0.0f, 1.1f}, 0xffff0000}, + {{-1.0f, 1.0f, 1.1f}, 0xffff0000}, + {{ 1.0f, 0.0f, -1.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, -1.1f}, 0xffff0000}, + }, + quad2[] = { - {-1.0f, 0.0f, 1.1f, 0xff0000ff}, - {-1.0f, 1.0f, 1.1f, 0xff0000ff}, - { 1.0f, 0.0f, -1.1f, 0xff0000ff}, - { 1.0f, 1.0f, -1.1f, 0xff0000ff}, + {{-1.0f, 0.0f, 1.1f}, 0xff0000ff}, + {{-1.0f, 1.0f, 1.1f}, 0xff0000ff}, + {{ 1.0f, 0.0f, -1.1f}, 0xff0000ff}, + {{ 1.0f, 1.0f, -1.1f}, 0xff0000ff}, }; static const struct tvertex quad3[] = { @@ -2108,19 +2117,24 @@ static void alpha_test(void) HWND window; HRESULT hr; - static const struct vertex quad1[] = + static const struct { - {-1.0f, -1.0f, 0.1f, 0x4000ff00}, - {-1.0f, 0.0f, 0.1f, 0x4000ff00}, - { 1.0f, -1.0f, 0.1f, 0x4000ff00}, - { 1.0f, 0.0f, 0.1f, 0x4000ff00}, - }; - static const struct vertex quad2[] = + struct vec3 position; + DWORD diffuse; + } + quad1[] = + { + {{-1.0f, -1.0f, 0.1f}, 0x4000ff00}, + {{-1.0f, 0.0f, 0.1f}, 0x4000ff00}, + {{ 1.0f, -1.0f, 0.1f}, 0x4000ff00}, + {{ 1.0f, 0.0f, 0.1f}, 0x4000ff00}, + }, + quad2[] = { - {-1.0f, 0.0f, 0.1f, 0xc00000ff}, - {-1.0f, 1.0f, 0.1f, 0xc00000ff}, - { 1.0f, 0.0f, 0.1f, 0xc00000ff}, - { 1.0f, 1.0f, 0.1f, 0xc00000ff}, + {{-1.0f, 0.0f, 0.1f}, 0xc00000ff}, + {{-1.0f, 1.0f, 0.1f}, 0xc00000ff}, + {{ 1.0f, 0.0f, 0.1f}, 0xc00000ff}, + {{ 1.0f, 1.0f, 0.1f}, 0xc00000ff}, }; static const float composite_quad[][5] = { @@ -2667,19 +2681,24 @@ static void depth_clamp_test(void) { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, }; - static const struct vertex quad5[] = + static const struct { - { -0.5f, 0.5f, 10.0f, 0xff14f914}, - { 0.5f, 0.5f, 10.0f, 0xff14f914}, - { -0.5f, -0.5f, 10.0f, 0xff14f914}, - { 0.5f, -0.5f, 10.0f, 0xff14f914}, - }; - static const struct vertex quad6[] = + struct vec3 position; + DWORD diffuse; + } + quad5[] = + { + {{-0.5f, 0.5f, 10.0f}, 0xff14f914}, + {{ 0.5f, 0.5f, 10.0f}, 0xff14f914}, + {{-0.5f, -0.5f, 10.0f}, 0xff14f914}, + {{ 0.5f, -0.5f, 10.0f}, 0xff14f914}, + }, + quad6[] = { - { -1.0f, 0.5f, 10.0f, 0xfff91414}, - { 1.0f, 0.5f, 10.0f, 0xfff91414}, - { -1.0f, 0.25f, 10.0f, 0xfff91414}, - { 1.0f, 0.25f, 10.0f, 0xfff91414}, + {{-1.0f, 0.5f, 10.0f}, 0xfff91414}, + {{ 1.0f, 0.5f, 10.0f}, 0xfff91414}, + {{-1.0f, 0.25f, 10.0f}, 0xfff91414}, + {{ 1.0f, 0.25f, 10.0f}, 0xfff91414}, }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -2803,26 +2822,31 @@ static void depth_buffer_test(void) HWND window; HRESULT hr; - static const struct vertex quad1[] = + static const struct { - { -1.0, 1.0, 0.33f, 0xff00ff00}, - { 1.0, 1.0, 0.33f, 0xff00ff00}, - { -1.0, -1.0, 0.33f, 0xff00ff00}, - { 1.0, -1.0, 0.33f, 0xff00ff00}, - }; - static const struct vertex quad2[] = + struct vec3 position; + DWORD diffuse; + } + quad1[] = { - { -1.0, 1.0, 0.50f, 0xffff00ff}, - { 1.0, 1.0, 0.50f, 0xffff00ff}, - { -1.0, -1.0, 0.50f, 0xffff00ff}, - { 1.0, -1.0, 0.50f, 0xffff00ff}, - }; - static const struct vertex quad3[] = + {{-1.0f, 1.0f, 0.33f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.33f}, 0xff00ff00}, + {{-1.0f, -1.0f, 0.33f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.33f}, 0xff00ff00}, + }, + quad2[] = + { + {{-1.0f, 1.0f, 0.50f}, 0xffff00ff}, + {{ 1.0f, 1.0f, 0.50f}, 0xffff00ff}, + {{-1.0f, -1.0f, 0.50f}, 0xffff00ff}, + {{ 1.0f, -1.0f, 0.50f}, 0xffff00ff}, + }, + quad3[] = { - { -1.0, 1.0, 0.66f, 0xffff0000}, - { 1.0, 1.0, 0.66f, 0xffff0000}, - { -1.0, -1.0, 0.66f, 0xffff0000}, - { 1.0, -1.0, 0.66f, 0xffff0000}, + {{-1.0f, 1.0f, 0.66f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.66f}, 0xffff0000}, + {{-1.0f, -1.0f, 0.66f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.66f}, 0xffff0000}, }; static const DWORD expected_colors[4][4] = { @@ -2959,12 +2983,17 @@ static void depth_buffer2_test(void) HWND window; HRESULT hr; - static const struct vertex quad[] = + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = { - { -1.0, 1.0, 0.66f, 0xffff0000}, - { 1.0, 1.0, 0.66f, 0xffff0000}, - { -1.0, -1.0, 0.66f, 0xffff0000}, - { 1.0, -1.0, 0.66f, 0xffff0000}, + {{-1.0f, 1.0f, 0.66f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.66f}, 0xffff0000}, + {{-1.0f, -1.0f, 0.66f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.66f}, 0xffff0000}, }; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,

1 0

Nikolay Sivov : kernel32: Implement GEO_PARENT for GetGeoInfo().
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: 17777c8497d1e314deaf65cd87660ed9a2aeb81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17777c8497d1e314deaf65cd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 15 05:51:32 2014 +0400 kernel32: Implement GEO_PARENT for GetGeoInfo(). --- dlls/kernel32/locale.c | 680 ++++++++++++++++++++----------------------- dlls/kernel32/tests/locale.c | 64 ++++ 2 files changed, 376 insertions(+), 368 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17777c8497d1e314deaf6…

1 0

Nikolay Sivov : kernel32: Properly implement EnumSystemGeoID().
by Alexandre Julliard July 15, 2014

July 15, 2014

Module: wine Branch: master Commit: ed9e0304562826218336a22114245c4c84d30995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9e0304562826218336a2211… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 15 06:41:02 2014 +0400 kernel32: Properly implement EnumSystemGeoID(). --- dlls/kernel32/locale.c | 182 +++++++++++++++++++++---------------------- dlls/kernel32/tests/locale.c | 21 ++++- 2 files changed, 109 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed9e0304562826218336a…

1 0