January 2013 - Wine-commits

André Hentschel : netstat: Make functions static.
by Alexandre Julliard 03 Jan '13

03 Jan '13

Module: wine Branch: master Commit: 7357b65d62a2058c1502094353ff105cfab4de06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7357b65d62a2058c150209435… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 2 21:37:17 2013 +0100 netstat: Make functions static. --- programs/netstat/netstat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 2fe2e0c..999e409 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -107,7 +107,7 @@ static int __cdecl NETSTAT_wprintf(const WCHAR *format, ...) return nOut; } -WCHAR *NETSTAT_load_message(UINT id) { +static WCHAR *NETSTAT_load_message(UINT id) { static WCHAR msg[2048]; static const WCHAR failedW[] = {'F','a','i','l','e','d','!','\0'}; @@ -118,14 +118,14 @@ WCHAR *NETSTAT_load_message(UINT id) { return msg; } -WCHAR *NETSTAT_port_name(UINT port, WCHAR name[]) +static WCHAR *NETSTAT_port_name(UINT port, WCHAR name[]) { /* FIXME: can we get the name? */ sprintfW(name, fmtport, htons((WORD)port)); return name; } -WCHAR *NETSTAT_host_name(UINT ip, WCHAR name[]) +static WCHAR *NETSTAT_host_name(UINT ip, WCHAR name[]) { UINT nip; @@ -135,7 +135,7 @@ WCHAR *NETSTAT_host_name(UINT ip, WCHAR name[]) return name; } -void NETSTAT_tcp_table(void) +static void NETSTAT_tcp_table(void) { PMIB_TCPTABLE table; DWORD err, size, i;

1 0

André Hentschel : netstat: Parse command line arguments.
by Alexandre Julliard 03 Jan '13

03 Jan '13

Module: wine Branch: master Commit: c25c7f804988a782b2eb7f515f322b51b5557f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25c7f804988a782b2eb7f515… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 2 21:37:45 2013 +0100 netstat: Parse command line arguments. --- programs/netstat/netstat.c | 60 ++++++++++++++++++++++++++++++++++++------- programs/netstat/netstat.h | 12 +++++++++ 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 999e409..dede96d 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -24,7 +24,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(netstat); +static const WCHAR ipW[] = {'I', 'P', 0}; +static const WCHAR ipv6W[] = {'I', 'P', 'v', '6', 0}; +static const WCHAR icmpW[] = {'I', 'C', 'M', 'P', 0}; +static const WCHAR icmpv6W[] = {'I', 'C', 'M', 'P', 'v', '6', 0}; static const WCHAR tcpW[] = {'T', 'C', 'P', 0}; +static const WCHAR tcpv6W[] = {'T', 'C', 'P', 'v', '6', 0}; +static const WCHAR udpW[] = {'U', 'D', 'P', 0}; +static const WCHAR udpv6W[] = {'U', 'D', 'P', 'v', '6', 0}; + static const WCHAR fmtport[] = {'%', 'd', 0}; static const WCHAR fmtip[] = {'%', 'd', '.', '%', 'd', '.', '%', 'd', '.', '%', 'd', 0}; static const WCHAR fmtn[] = {'\n', 0}; @@ -181,26 +189,58 @@ static void NETSTAT_tcp_table(void) HeapFree(GetProcessHeap(), 0, table); } +static NETSTATPROTOCOLS NETSTAT_get_protocol(WCHAR name[]) +{ + if (!strcmpiW(name, ipW)) return PROT_IP; + if (!strcmpiW(name, ipv6W)) return PROT_IPV6; + if (!strcmpiW(name, icmpW)) return PROT_ICMP; + if (!strcmpiW(name, icmpv6W)) return PROT_ICMPV6; + if (!strcmpiW(name, tcpW)) return PROT_TCP; + if (!strcmpiW(name, tcpv6W)) return PROT_TCPV6; + if (!strcmpiW(name, udpW)) return PROT_UDP; + if (!strcmpiW(name, udpv6W)) return PROT_UDPV6; + return PROT_UNKNOWN; +} + int wmain(int argc, WCHAR *argv[]) { WSADATA wsa_data; - if (argc > 1) - { - int i; - WINE_FIXME("stub:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); - } - if (WSAStartup(MAKEWORD(2, 2), &wsa_data)) { WINE_ERR("WSAStartup failed: %d\n", WSAGetLastError()); return 1; } - NETSTAT_tcp_table(); + if (argc == 1) + { + /* No options */ + NETSTAT_tcp_table(); + return 0; + } + + while (argv[1] && argv[1][0] == '-') + { + switch (argv[1][1]) + { + case 'p': + argv++; argc--; + if (argc == 1) return 1; + switch (NETSTAT_get_protocol(argv[1])) + { + case PROT_TCP: + NETSTAT_tcp_table(); + break; + default: + WINE_FIXME("Protocol not yet implemented: %s\n", debugstr_w(argv[1])); + } + break; + default: + WINE_FIXME("Unknown option: %s\n", debugstr_w(argv[1])); + return 1; + } + argv++; argc--; + } return 0; } diff --git a/programs/netstat/netstat.h b/programs/netstat/netstat.h index b51a81f..dc4fb1e 100644 --- a/programs/netstat/netstat.h +++ b/programs/netstat/netstat.h @@ -18,6 +18,18 @@ #include <windows.h> +typedef enum _NETSTATPROTOCOLS { + PROT_UNKNOWN, + PROT_IP, + PROT_IPV6, + PROT_ICMP, + PROT_ICMPV6, + PROT_TCP, + PROT_TCPV6, + PROT_UDP, + PROT_UDPV6, +} NETSTATPROTOCOLS; + #define IDS_TCP_CLOSED 1 #define IDS_TCP_LISTENING 2 #define IDS_TCP_SYN_SENT 3

1 0

André Hentschel : netstat: Implement the UDP table output.
by Alexandre Julliard 03 Jan '13

03 Jan '13

Module: wine Branch: master Commit: fc5a2aa05c70ac5d9befb5f15aa8042017962a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5a2aa05c70ac5d9befb5f15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 2 21:38:00 2013 +0100 netstat: Implement the UDP table output. --- programs/netstat/netstat.c | 55 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 47 insertions(+), 8 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index dede96d..a3f584c 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2012 André Hentschel + * Copyright 2011-2013 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -39,6 +39,7 @@ static const WCHAR fmtn[] = {'\n', 0}; static const WCHAR fmtnn[] = {'\n', '%', 's', '\n', 0}; static const WCHAR fmtcolon[] = {'%', 's', ':', '%', 's', 0}; static const WCHAR fmttcpout[] = {' ', ' ', '%', '-', '6', 's', ' ', '%', '-', '2', '2', 's', ' ', '%', '-', '2', '2', 's', ' ', '%', 's', '\n', 0}; +static const WCHAR fmtudpout[] = {' ', ' ', '%', '-', '6', 's', ' ', '%', '-', '2', '2', 's', ' ', '*', ':', '*', '\n', 0}; /* ========================================================================= * Output a unicode string. Ideally this will go to the console @@ -143,11 +144,21 @@ static WCHAR *NETSTAT_host_name(UINT ip, WCHAR name[]) return name; } +static void NETSTAT_tcp_header(void) +{ + WCHAR local[22], remote[22], state[22]; + NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_TCP_ACTIVE_CONN)); + NETSTAT_wprintf(fmtn); + strcpyW(local, NETSTAT_load_message(IDS_TCP_LOCAL_ADDR)); + strcpyW(remote, NETSTAT_load_message(IDS_TCP_REMOTE_ADDR)); + strcpyW(state, NETSTAT_load_message(IDS_TCP_STATE)); + NETSTAT_wprintf(fmttcpout, NETSTAT_load_message(IDS_TCP_PROTO), local, remote, state); +} + static void NETSTAT_tcp_table(void) { PMIB_TCPTABLE table; DWORD err, size, i; - WCHAR local[22], remote[22], state[22]; WCHAR HostIp[MAX_HOSTNAME_LEN], HostPort[32]; WCHAR RemoteIp[MAX_HOSTNAME_LEN], RemotePort[32]; WCHAR Host[MAX_HOSTNAME_LEN + 32]; @@ -163,12 +174,7 @@ static void NETSTAT_tcp_table(void) if (err) return; - NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_TCP_ACTIVE_CONN)); - NETSTAT_wprintf(fmtn); - strcpyW(local, NETSTAT_load_message(IDS_TCP_LOCAL_ADDR)); - strcpyW(remote, NETSTAT_load_message(IDS_TCP_REMOTE_ADDR)); - strcpyW(state, NETSTAT_load_message(IDS_TCP_STATE)); - NETSTAT_wprintf(fmttcpout, NETSTAT_load_message(IDS_TCP_PROTO), local, remote, state); + NETSTAT_tcp_header(); for (i = 0; i < table->dwNumEntries; i++) { @@ -189,6 +195,36 @@ static void NETSTAT_tcp_table(void) HeapFree(GetProcessHeap(), 0, table); } +static void NETSTAT_udp_table(void) +{ + PMIB_UDPTABLE table; + DWORD err, size, i; + WCHAR HostIp[MAX_HOSTNAME_LEN], HostPort[32]; + WCHAR Host[MAX_HOSTNAME_LEN + 32]; + + size = sizeof(MIB_UDPTABLE); + do + { + table = (PMIB_UDPTABLE)HeapAlloc(GetProcessHeap(), 0, size); + err = GetUdpTable(table, &size, TRUE); + if (err != NO_ERROR) HeapFree(GetProcessHeap(), 0, table); + } while (err == ERROR_INSUFFICIENT_BUFFER); + + if (err) return; + + NETSTAT_tcp_header(); + + for (i = 0; i < table->dwNumEntries; i++) + { + NETSTAT_host_name(table->table[i].dwLocalAddr, HostIp); + NETSTAT_port_name(table->table[i].dwLocalPort, HostPort); + + sprintfW(Host, fmtcolon, HostIp, HostPort); + NETSTAT_wprintf(fmtudpout, udpW, Host); + } + HeapFree(GetProcessHeap(), 0, table); +} + static NETSTATPROTOCOLS NETSTAT_get_protocol(WCHAR name[]) { if (!strcmpiW(name, ipW)) return PROT_IP; @@ -231,6 +267,9 @@ int wmain(int argc, WCHAR *argv[]) case PROT_TCP: NETSTAT_tcp_table(); break; + case PROT_UDP: + NETSTAT_udp_table(); + break; default: WINE_FIXME("Protocol not yet implemented: %s\n", debugstr_w(argv[1])); }

1 0

Andrew Talbot : d3dx9_36: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 03 Jan '13

03 Jan '13

Module: wine Branch: master Commit: 2cf00836ef4232934f159e49acde4ee17c636472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf00836ef4232934f159e49a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 2 21:49:19 2013 +0000 d3dx9_36: Avoid signed-unsigned integer comparisons. --- dlls/d3dx9_36/mesh.c | 55 +++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 986cbd4..8a3d49a 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -686,7 +686,6 @@ static HRESULT WINAPI ID3DXMeshImpl_CloneMesh(struct ID3DXMesh *iface, DWORD opt void *data_in, *data_out; DWORD vertex_size; HRESULT hr; - int i; BOOL same_declaration; TRACE("(%p)->(%x,%p,%p,%p)\n", This, options, declaration, device, clone_mesh_out); @@ -738,6 +737,7 @@ static HRESULT WINAPI ID3DXMeshImpl_CloneMesh(struct ID3DXMesh *iface, DWORD opt goto error; } if ((options ^ This->options) & D3DXMESH_32BIT) { + DWORD i; if (options & D3DXMESH_32BIT) { for (i = 0; i < This->numfaces * 3; i++) ((DWORD*)data_out)[i] = ((WORD*)data_in)[i]; @@ -1230,7 +1230,7 @@ static HRESULT WINAPI ID3DXMeshImpl_GenerateAdjacency(ID3DXMesh *iface, FLOAT ep * that adjacency checks can be limited to faces sharing a vertex */ DWORD *shared_indices = NULL; const FLOAT epsilon_sq = epsilon * epsilon; - int i; + DWORD i; TRACE("(%p)->(%f,%p)\n", This, epsilon, adjacency); @@ -1279,7 +1279,7 @@ static HRESULT WINAPI ID3DXMeshImpl_GenerateAdjacency(ID3DXMesh *iface, FLOAT ep DWORD shared_index_a = sorted_vertex_a->first_shared_index; while (shared_index_a != -1) { - int j = i; + DWORD j = i; DWORD shared_index_b = shared_indices[shared_index_a]; struct vertex_metadata *sorted_vertex_b = sorted_vertex_a; @@ -2763,7 +2763,7 @@ static HRESULT parse_material(IDirectXFileData *filedata, D3DXMATERIAL *material static void destroy_materials(struct mesh_data *mesh) { - int i; + DWORD i; for (i = 0; i < mesh->num_materials; i++) HeapFree(GetProcessHeap(), 0, mesh->materials[i].pTextureFilename); HeapFree(GetProcessHeap(), 0, mesh->materials); @@ -2781,7 +2781,7 @@ static HRESULT parse_material_list(IDirectXFileData *filedata, struct mesh_data const GUID *type; IDirectXFileData *child; DWORD num_materials; - int i; + DWORD i; destroy_materials(mesh); @@ -2902,7 +2902,7 @@ static HRESULT parse_vertex_colors(IDirectXFileData *filedata, struct mesh_data DWORD data_size; BYTE *data; DWORD num_colors; - int i; + DWORD i; HeapFree(GetProcessHeap(), 0, mesh->vertex_colors); mesh->vertex_colors = NULL; @@ -2969,7 +2969,7 @@ static HRESULT parse_normals(IDirectXFileData *filedata, struct mesh_data *mesh) DWORD data_size; BYTE *data; DWORD *index_out_ptr; - int i; + DWORD i; DWORD num_face_indices = mesh->num_poly_faces * 2 + mesh->num_tri_faces; HeapFree(GetProcessHeap(), 0, mesh->normals); @@ -3065,7 +3065,7 @@ static HRESULT parse_mesh(IDirectXFileData *filedata, struct mesh_data *mesh_dat DWORD *index_out_ptr; const GUID *type; IDirectXFileData *child; - int i; + DWORD i; /* * template Mesh { @@ -3201,7 +3201,7 @@ static HRESULT generate_effects(ID3DXBuffer *materials, DWORD num_materials, }; static const char texture_paramname[] = "Texture0(a)Name"; DWORD buffer_size; - int i; + DWORD i; /* effects buffer layout: * @@ -3238,7 +3238,7 @@ static HRESULT generate_effects(ID3DXBuffer *materials, DWORD num_materials, for (i = 0; i < num_materials; i++) { - int j; + DWORD j; D3DXEFFECTDEFAULT *defaults = (D3DXEFFECTDEFAULT*)out_ptr; effect_ptr->pDefaults = defaults; @@ -3292,7 +3292,7 @@ static HRESULT load_skin_mesh_from_xof(struct IDirectXFileData *filedata, DWORD DWORD normal_index; struct list entry; } *duplications = NULL; - int i; + DWORD i; void *vertices = NULL; void *indices = NULL; BYTE *out_ptr; @@ -3983,7 +3983,6 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, DWORD num_materials; DWORD num_faces, num_vertices; D3DXMATRIX identity; - int i; DWORD provide_flags = 0; DWORD fvf; ID3DXMesh *concat_mesh = NULL; @@ -4087,6 +4086,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, DWORD num_mesh_vertices = mesh->lpVtbl->GetNumVertices(mesh); DWORD mesh_vertex_size; const BYTE *mesh_vertices; + DWORD i; hr = mesh->lpVtbl->GetDeclaration(mesh, mesh_decl); if (FAILED(hr)) goto cleanup; @@ -4139,7 +4139,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, ID3DXMesh *mesh = container_ptr->mesh; const void *mesh_indices; DWORD num_mesh_faces = mesh->lpVtbl->GetNumFaces(mesh); - int i; + DWORD i; hr = mesh->lpVtbl->LockIndexBuffer(mesh, D3DLOCK_READONLY, (void**)&mesh_indices); if (FAILED(hr)) goto cleanup; @@ -4215,6 +4215,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, LIST_FOR_EACH_ENTRY(container_ptr, &container_list, struct mesh_container, entry) { if (container_ptr->materials) { + DWORD i; const D3DXMATERIAL *in_ptr = ID3DXBuffer_GetBufferPointer(container_ptr->materials); for (i = 0; i < container_ptr->num_materials; i++) { @@ -4233,6 +4234,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, LIST_FOR_EACH_ENTRY(container_ptr, &container_list, struct mesh_container, entry) { if (container_ptr->materials) { + DWORD i; const D3DXMATERIAL *in_ptr = ID3DXBuffer_GetBufferPointer(container_ptr->materials); for (i = 0; i < container_ptr->num_materials; i++) { @@ -4275,8 +4277,9 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, out_ptr = ID3DXBuffer_GetBufferPointer(adjacency); LIST_FOR_EACH_ENTRY(container_ptr, &container_list, struct mesh_container, entry) { + DWORD i; + DWORD count = 3 * container_ptr->mesh->lpVtbl->GetNumFaces(container_ptr->mesh); DWORD *in_ptr = ID3DXBuffer_GetBufferPointer(container_ptr->adjacency); - int count = 3 * container_ptr->mesh->lpVtbl->GetNumFaces(container_ptr->mesh); for (i = 0; i < count; i++) *out_ptr++ = offset + *in_ptr++; @@ -4389,8 +4392,7 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U float phi_step, phi_start; struct sincos_table phi; float theta_step, theta, sin_theta, cos_theta; - DWORD vertex, face; - int slice, stack; + DWORD vertex, face, stack, slice; TRACE("(%p, %f, %u, %u, %p, %p)\n", device, radius, slices, stacks, mesh, adjacency); @@ -4561,8 +4563,7 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 struct sincos_table theta; float delta_radius, radius, radius_step; float z, z_step, z_normal; - DWORD vertex, face; - int slice, stack; + DWORD vertex, face, slice, stack; TRACE("(%p, %f, %f, %f, %u, %u, %p, %p)\n", device, radius1, radius2, length, slices, stacks, mesh, adjacency); @@ -5060,6 +5061,7 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da { D3DXVECTOR2 bezier_start = outline->items[outline->count - 1].pos; BOOL to_curve = curve->wType != TT_PRIM_LINE && curve->cpfx > 1; + unsigned int j2 = 0; if (!curve->cpfx) { curve = (TTPOLYCURVE *)&curve->apfx[curve->cpfx]; @@ -5074,37 +5076,36 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da { HRESULT hr; int count = curve->cpfx; - j = 0; while (count > 2) { D3DXVECTOR2 bezier_end; - D3DXVec2Scale(&bezier_end, D3DXVec2Add(&bezier_end, &pt_flt[j], &pt_flt[j+1]), 0.5f); - hr = add_bezier_points(outline, &bezier_start, &pt_flt[j], &bezier_end, max_deviation_sq); + D3DXVec2Scale(&bezier_end, D3DXVec2Add(&bezier_end, &pt_flt[j2], &pt_flt[j2+1]), 0.5f); + hr = add_bezier_points(outline, &bezier_start, &pt_flt[j2], &bezier_end, max_deviation_sq); if (hr != S_OK) return hr; bezier_start = bezier_end; count--; - j++; + j2++; } - hr = add_bezier_points(outline, &bezier_start, &pt_flt[j], &pt_flt[j+1], max_deviation_sq); + hr = add_bezier_points(outline, &bezier_start, &pt_flt[j2], &pt_flt[j2+1], max_deviation_sq); if (hr != S_OK) return hr; pt = add_points(outline, 1); if (!pt) return E_OUTOFMEMORY; - j++; - pt->pos = pt_flt[j]; + j2++; + pt->pos = pt_flt[j2]; pt->corner = POINTTYPE_CURVE_END; } else { pt = add_points(outline, curve->cpfx); if (!pt) return E_OUTOFMEMORY; - for (j = 0; j < curve->cpfx; j++) + for (j2 = 0; j2 < curve->cpfx; j2++) { - pt->pos = pt_flt[j]; + pt->pos = pt_flt[j2]; pt->corner = POINTTYPE_CORNER; pt++; }

1 0

Andrew Talbot : d3drm: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 03 Jan '13

03 Jan '13

Module: wine Branch: master Commit: c39f7e7fdb2d731a8b0f838aed7f544fef08c29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39f7e7fdb2d731a8b0f838ae… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 2 21:49:12 2013 +0000 d3drm: Avoid signed-unsigned integer comparisons. --- dlls/d3drm/meshbuilder.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4fc8462..a07ce54 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -325,7 +325,7 @@ static inline IDirect3DRMMeshBuilderImpl *impl_from_IDirect3DRMMeshBuilder3(IDir static void clean_mesh_builder_data(IDirect3DRMMeshBuilderImpl *mesh_builder) { - int i; + DWORD i; HeapFree(GetProcessHeap(), 0, mesh_builder->name); mesh_builder->name = NULL; @@ -1689,7 +1689,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Scale(IDirect3DRMMeshBuilder3* D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - int i; + DWORD i; TRACE("(%p)->(%f,%f,%f)\n", This, sx, sy, sz); @@ -2108,7 +2108,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil /* If there is mesh data, create a group and put data inside */ if (This->nb_vertices) { - int i, j, k; + DWORD i, j; + int k; D3DRMVERTEX* vertices; vertices = HeapAlloc(GetProcessHeap(), 0, This->nb_vertices * sizeof(D3DRMVERTEX)); @@ -2588,7 +2589,7 @@ static ULONG WINAPI IDirect3DRMMeshImpl_Release(IDirect3DRMMesh* iface) if (!ref) { - int i; + DWORD i; for (i = 0; i < This->nb_groups; i++) { @@ -2776,7 +2777,7 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_AddGroup(IDirect3DRMMesh* iface, } else { - int i; + unsigned i; unsigned nb_indices; unsigned* face_data_ptr = face_data; group->face_data_size = 0;

1 0

André Hentschel : Fix german translation
by Jeremy Newman 03 Jan '13

03 Jan '13

Module: website Branch: master Commit: b3febd39676caa89c49b7b654541545e8eda375b URL: http://source.winehq.org/git/website.git/?a=commit;h=b3febd39676caa89c49b7b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 3 19:25:48 2013 +0100 Fix german translation --- news/de/2012122101.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2012122101.xml b/news/de/2012122101.xml index 3af627f..45fc1aa 100644 --- a/news/de/2012122101.xml +++ b/news/de/2012122101.xml @@ -6,7 +6,7 @@ <p> <a href="{$root}/announce/1.5.20">Neuerungen (en)</a> in dieser Version:</p> <ul> <li>Ein haufen DLLs mit hässlichen Namen für die API Set Unterstützung.</li> - <li>Mehr implementierete ATL Funktionen.</li> + <li>Mehr implementierte ATL Funktionen.</li> <li>Schonwieder mehr C++ Runtime Funktionen.</li> <li>Mehere Text Render Fehlerbehebungen.</li> <li>PostScript Treiber Verbesserungen.</li>

1 0

Andrew Talbot : cabinet: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: d03b13c5349bf6034b729b95922d20aecb776cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03b13c5349bf6034b729b959… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 22:05:29 2012 +0000 cabinet: Avoid signed-unsigned integer comparisons. --- dlls/cabinet/fdi.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index fb675fc..33734e7 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2041,7 +2041,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state /* outlen=0 means this block was the last contiguous part of a split block, continued in the next cabinet */ if (outlen == 0) { - int pathlen, filenamelen, i; + int pathlen, filenamelen; INT_PTR cabhf; char fullpath[MAX_PATH], userpath[256]; FDINOTIFICATION fdin; @@ -2056,6 +2056,8 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state /* set up the next decomp_state... */ if (!(cab->next)) { + unsigned int i; + if (!cab->mii.hasnext) return DECR_INPUT; if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state))))) @@ -2695,13 +2697,13 @@ BOOL __cdecl FDICopy( /* find the folder for this file if necc. */ if (filehf) { - int i2; - fol = CAB(firstfol); if ((file->index & cffileCONTINUED_TO_NEXT) == cffileCONTINUED_TO_NEXT) { /* pick the last folder */ while (fol->next) fol = fol->next; } else { + unsigned int i2; + for (i2 = 0; (i2 < file->index); i2++) if (fol->next) /* bug resistance, should always be true */ fol = fol->next;

1 0

Andrew Talbot : advapi32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: a377563b00b0ac1bb7d9f788cb000a4335e6725d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a377563b00b0ac1bb7d9f788c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 22:05:26 2012 +0000 advapi32: Avoid signed-unsigned integer comparisons. --- dlls/advapi32/eventlog.c | 4 ++-- dlls/advapi32/security.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 38c533a..0922fff 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -651,7 +651,7 @@ BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD d { LPWSTR *wideStrArray; UNICODE_STRING str; - int i; + UINT i; BOOL ret; FIXME("(%p,0x%04x,0x%04x,0x%08x,%p,0x%04x,0x%08x,%p,%p): stub\n", hEventLog, @@ -684,7 +684,7 @@ BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD d BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID, PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCWSTR *lpStrings, LPVOID lpRawData ) { - int i; + UINT i; FIXME("(%p,0x%04x,0x%04x,0x%08x,%p,0x%04x,0x%08x,%p,%p): stub\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, wNumStrings, dwDataSize, lpStrings, lpRawData); diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index d857591..5a74783 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4785,7 +4785,7 @@ static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen) static BOOL DumpAcl(PACL pacl, WCHAR **pwptr, ULONG *plen, BOOL protected, BOOL autoInheritReq, BOOL autoInherited) { WORD count; - int i; + UINT i; if (protected) DumpString(SDDL_PROTECTED, -1, pwptr, plen);

1 0

Andrew Talbot : comctl32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 23fde785eeeb5b5e0451f810d260909e742462eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fde785eeeb5b5e0451f810d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 22:05:31 2012 +0000 comctl32: Avoid signed-unsigned integer comparisons. --- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/monthcal.c | 6 ++++-- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/status.c | 10 ++++++---- dlls/comctl32/updown.c | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 6142ba7..3eb7724 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2235,7 +2235,7 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) void *image_bits, *mask_bits = NULL; ILHEAD ilHead; HIMAGELIST himl; - int i; + unsigned int i; TRACE("%p\n", pstm); diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index f27eee3..ef2ad68 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1076,7 +1076,8 @@ static void MONTHCAL_PaintFocusAndCircle(const MONTHCAL_INFO *infoPtr, HDC hdc, /* months before first calendar month and after last calendar month */ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - INT mask, length, index; + INT mask, index; + UINT length; SYSTEMTIME st_max, st; if (infoPtr->dwStyle & MCS_NOTRAILINGDATES) return; @@ -1116,7 +1117,8 @@ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { const SYSTEMTIME *date = &infoPtr->calendars[calIdx].month; - INT i, j, length; + INT i, j; + UINT length; RECT r, fill_bk_rect; SYSTEMTIME st; WCHAR buf[80]; diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 0ae69ef..4e26c33 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1124,7 +1124,7 @@ REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus) * or infoPtr->uNumBands if none */ static int next_visible(const REBAR_INFO *infoPtr, int i) { - int n; + unsigned int n; for (n = i + 1; n < infoPtr->uNumBands; n++) if (!HIDDENBAND(REBAR_GetBand(infoPtr, n))) break; diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 19d671d..c4efedb 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -285,7 +285,6 @@ STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPA static LRESULT STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) { - int i; RECT rect; HBRUSH hbrBk; HFONT hOldFont; @@ -319,6 +318,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) if (infoPtr->simple) { STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0); } else { + unsigned int i; + for (i = 0; i < infoPtr->numParts; i++) { STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i); } @@ -336,7 +337,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) static int STATUSBAR_InternalHitTest(const STATUS_INFO *infoPtr, const POINT *pt) { - int i; + unsigned int i; + if (infoPtr->simple) return 255; @@ -352,7 +354,7 @@ STATUSBAR_SetPartBounds (STATUS_INFO *infoPtr) { STATUSWINDOWPART *part; RECT rect, *r; - int i; + UINT i; /* get our window size */ GetClientRect (infoPtr->Self, &rect); @@ -883,7 +885,7 @@ STATUSBAR_Simple (STATUS_INFO *infoPtr, BOOL simple) static LRESULT STATUSBAR_WMDestroy (STATUS_INFO *infoPtr) { - int i; + unsigned int i; TRACE("\n"); for (i = 0; i < infoPtr->numParts; i++) { diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 2c5fc60..390f829 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -1026,10 +1026,10 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L if (TRACE_ON(updown)) { - INT i; + UINT i; for (i = 0; i < wParam; i++) - TRACE("%d: nSec %u nInc %u\n", i, + TRACE("%u: nSec %u nInc %u\n", i, infoPtr->AccelVect[i].nSec, infoPtr->AccelVect[i].nInc); }

1 0

Andrew Talbot : d3dcompiler_43: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 80e4d899edd168f873a23a0e55e23ce0ac562d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e4d899edd168f873a23a0e5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 1 15:48:30 2013 +0000 d3dcompiler_43: Avoid signed-unsigned integer comparisons. --- dlls/d3dcompiler_43/bytecodewriter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index d10f6bc..17289d2 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -609,7 +609,7 @@ static void write_declarations(struct bc_writer *This, } static void write_const(struct constant **consts, int num, DWORD opcode, DWORD reg_type, struct bytecode_buffer *buffer, BOOL len) { - DWORD i; + int i; DWORD instr_def = opcode; const DWORD reg = (1<<31) | ((reg_type << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK) |

1 0