January 2014 - Wine-commits

Stefan Dösinger : d3dx9_36/tests: Use D3DX_PI instead of M_PI.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: ebfdcc9c9a1dd0af98c9692510dce8ac60269e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfdcc9c9a1dd0af98c969251… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 1 19:01:43 2014 +0100 d3dx9_36/tests: Use D3DX_PI instead of M_PI. --- dlls/d3dx9_36/tests/mesh.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4878256..c700e43 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2564,12 +2564,12 @@ static BOOL compute_sphere(struct mesh *mesh, FLOAT radius, UINT slices, UINT st int slice, stack; /* theta = angle on xy plane wrt x axis */ - theta_step = M_PI / stacks; + theta_step = D3DX_PI / stacks; theta_start = theta_step; /* phi = angle on xz plane wrt z axis */ - phi_step = -2 * M_PI / slices; - phi_start = M_PI / 2; + phi_step = -2 * D3DX_PI / slices; + phi_start = D3DX_PI / 2; if (!compute_sincos_table(&theta, theta_start, theta_step, stacks)) { @@ -2800,8 +2800,8 @@ static BOOL compute_cylinder(struct mesh *mesh, FLOAT radius1, FLOAT radius2, FL int slice, stack; /* theta = angle on xy plane wrt x axis */ - theta_step = -2 * M_PI / slices; - theta_start = M_PI / 2; + theta_step = -2 * D3DX_PI / slices; + theta_start = D3DX_PI / 2; if (!compute_sincos_table(&theta, theta_start, theta_step, slices)) {

1 0

Stefan Dösinger : d3dx9_36: Use SIZE_T for some iterators.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: dcb101666b52dcf19397a6e01045a4a965475a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb101666b52dcf19397a6e01… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 1 19:01:44 2014 +0100 d3dx9_36: Use SIZE_T for some iterators. --- dlls/d3dx9_36/mesh.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index bbe1eb1..414f338 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2686,8 +2686,7 @@ static HRESULT parse_material(ID3DXFileData *filedata, D3DXMATERIAL *material) const BYTE *data; GUID type; ID3DXFileData *child; - SIZE_T nb_children; - int i; + SIZE_T i, nb_children; material->pTextureFilename = NULL; @@ -3827,8 +3826,7 @@ static HRESULT load_frame(struct ID3DXFileData *filedata, DWORD options, struct D3DXFRAME *frame = NULL; D3DXMESHCONTAINER **next_container; D3DXFRAME **next_child; - SIZE_T nb_children; - int i; + SIZE_T i, nb_children; hr = filedata_get_name(filedata, &name); if (FAILED(hr)) return hr; @@ -3885,9 +3883,8 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memo D3DXF_FILELOADMEMORY source; D3DXFRAME *first_frame = NULL; D3DXFRAME **next_frame = &first_frame; - SIZE_T nb_children; + SIZE_T i, nb_children; GUID guid; - int i; TRACE("(%p, %u, %x, %p, %p, %p, %p, %p)\n", memory, memory_size, options, device, alloc_hier, load_user_data, frame_hierarchy, anim_controller); @@ -4124,8 +4121,7 @@ static HRESULT parse_frame(struct ID3DXFileData *filedata, DWORD options, struct D3DXMATRIX transform = *parent_transform; ID3DXFileData *child; GUID type; - SIZE_T nb_children; - int i; + SIZE_T i, nb_children; hr = filedata->lpVtbl->GetChildren(filedata, &nb_children); if (FAILED(hr)) @@ -4190,9 +4186,8 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, void *concat_indices = NULL; DWORD index_offset; DWORD concat_vertex_size; - SIZE_T nb_children; + SIZE_T i, nb_children; GUID guid; - int i; TRACE("(%p, %u, %x, %p, %p, %p, %p, %p, %p)\n", memory, memory_size, options, device, adjacency_out, materials_out, effects_out, num_materials_out, mesh_out);

1 0

Stefan Dösinger : d3dx9_36: Make NUM_ELEM a define.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 4734771f2867e5df5ff177f320aff984ec0e65e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4734771f2867e5df5ff177f32… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 1 19:01:45 2014 +0100 d3dx9_36: Make NUM_ELEM a define. --- dlls/d3dx9_36/mesh.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 414f338..8180d8e 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -6393,7 +6393,7 @@ static BOOL weld_float16_2(void *to, void *from, FLOAT epsilon) FLOAT diff_x; FLOAT diff_y; FLOAT max_abs_diff; - const UINT NUM_ELEM = 2; +#define NUM_ELEM 2 FLOAT v1[NUM_ELEM]; FLOAT v2[NUM_ELEM]; @@ -6412,6 +6412,7 @@ static BOOL weld_float16_2(void *to, void *from, FLOAT epsilon) } return FALSE; +#undef NUM_ELEM } static BOOL weld_float16_4(void *to, void *from, FLOAT epsilon) @@ -6423,7 +6424,7 @@ static BOOL weld_float16_4(void *to, void *from, FLOAT epsilon) FLOAT diff_z; FLOAT diff_w; FLOAT max_abs_diff; - const UINT NUM_ELEM = 4; +#define NUM_ELEM 4 FLOAT v1[NUM_ELEM]; FLOAT v2[NUM_ELEM]; @@ -6446,6 +6447,7 @@ static BOOL weld_float16_4(void *to, void *from, FLOAT epsilon) } return FALSE; +#undef NUM_ELEM } /* Sets the vertex components to the same value if they are within epsilon. */

1 0

Sebastian Lackner : kernel32: Prevent endless loop if NtQuerySystemInformation fails.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 3caa4e035d2802bab7bb39c2bd5b5abb5a76c8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3caa4e035d2802bab7bb39c2b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Dec 31 17:48:42 2013 +0100 kernel32: Prevent endless loop if NtQuerySystemInformation fails. --- dlls/kernel32/toolhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c index 94c1a78..49e14ff 100644 --- a/dlls/kernel32/toolhelp.c +++ b/dlls/kernel32/toolhelp.c @@ -209,7 +209,7 @@ static BOOL fetch_process_thread( DWORD flags, SYSTEM_PROCESS_INFORMATION** pspi break; default: SetLastError( RtlNtStatusToDosError( status ) ); - break; + return FALSE; } } }

1 0