January 2013 - Wine-Commits

André Hentschel : netstat: Implement the UDP table output.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

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 Jan. 3, 2013

Jan. 3, 2013

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

Vincent Povirk : windowscodecs: Add test showing CreateBitmapFromMemory copies the data.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

Module: wine Branch: master Commit: 5e3e7304a1bf28e692f6b0b3b7010dc15aee4f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3e7304a1bf28e692f6b0b3b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 2 13:25:18 2013 -0600 windowscodecs: Add test showing CreateBitmapFromMemory copies the data. --- dlls/windowscodecs/tests/bitmap.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index cec714b..af0446c 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -421,10 +421,11 @@ static void test_createbitmapfromsource(void) static void test_CreateBitmapFromMemory(void) { - BYTE data3x3[27] = { + BYTE orig_data3x3[27] = { 128,128,255, 128,128,128, 128,255,128, 128,128,128, 128,128,128, 255,255,255, 255,128,128, 255,255,255, 255,255,255 }; + BYTE data3x3[27]; BYTE data3x2[27] = { 128,128,255, 128,128,128, 128,255,128, 0,0,0, 0,128,128, 255,255,255, @@ -434,6 +435,8 @@ static void test_CreateBitmapFromMemory(void) IWICBitmap *bitmap; UINT width, height, i; + memcpy(data3x3, orig_data3x3, sizeof(data3x3)); + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 0, 0, NULL, &bitmap); todo_wine @@ -470,16 +473,18 @@ todo_wine ok(width == 3, "expected 3, got %u\n", width); ok(height == 3, "expected 3, got %u\n", height); + data3x3[2] = 192; + memset(data, 0, sizeof(data)); hr = IWICBitmap_CopyPixels(bitmap, NULL, 9, sizeof(data), data); ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); for (i = 0; i < sizeof(data); i++) - ok(data[i] == data3x3[i], "%u: expected %u, got %u\n", i, data[i], data3x3[i]); + ok(data[i] == orig_data3x3[i], "%u: expected %u, got %u\n", i, data[i], data3x3[i]); IWICBitmap_Release(bitmap); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 2, &GUID_WICPixelFormat24bppBGR, - 13, sizeof(data3x3), data3x3, &bitmap); + 13, sizeof(orig_data3x3), orig_data3x3, &bitmap); ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromMemory error %#x\n", hr); if (hr != S_OK) return;

1 0

Andrew Talbot : d3drm: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

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 : netstat: Make functions static.
by Alexandre Julliard Jan. 3, 2013

Jan. 3, 2013

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 : Fix german translation
by Jeremy Newman Jan. 3, 2013

Jan. 3, 2013

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

Hans Leidekker : wmiutils: Implement IWbemPath::GetNamespaceCount.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 38434826689e77193e826ea27e490fcadc5f152f URL: http://source.winehq.org/git/wine.git/?a=commit;h=38434826689e77193e826ea27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:34:17 2013 +0100 wmiutils: Implement IWbemPath::GetNamespaceCount. --- dlls/wmiutils/path.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 0d52544..0cb7170 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -268,8 +268,13 @@ static HRESULT WINAPI path_GetNamespaceCount( IWbemPath *iface, ULONG *puCount) { - FIXME("%p, %p\n", iface, puCount); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %p\n", iface, puCount); + + if (!puCount) return WBEM_E_INVALID_PARAMETER; + *puCount = path->num_namespaces; + return S_OK; } static HRESULT WINAPI path_SetNamespaceAt(

1 0

Jacek Caban : iphlpapi: Added support for direct routes when using NET_RT_DUMP.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: fdcbd3137a6100da6520ecaf3b3b58b7d2d5a7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdcbd3137a6100da6520ecaf3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 2 15:33:28 2013 +0100 iphlpapi: Added support for direct routes when using NET_RT_DUMP. --- dlls/iphlpapi/ipstats.c | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index a78424b..f8191ba 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1497,15 +1497,13 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw continue; } - /* Ignore all entries except for gateway routes which aren't - multicast */ - if (!(rtm->rtm_flags & RTF_GATEWAY) || - (rtm->rtm_flags & RTF_MULTICAST)) + /* Ignore gateway routes which are multicast */ + if ((rtm->rtm_flags & RTF_GATEWAY) && (rtm->rtm_flags & RTF_MULTICAST)) continue; memset( &row, 0, sizeof(row) ); row.dwForwardIfIndex = rtm->rtm_index; - row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT; + row.u1.ForwardType = (rtm->rtm_flags & RTF_GATEWAY) ? MIB_IPROUTE_TYPE_INDIRECT : MIB_IPROUTE_TYPE_DIRECT; row.dwForwardMetric1 = rtm->rtm_rmx.rmx_hopcount; row.u2.ForwardProto = MIB_IPPROTO_LOCAL; @@ -1523,19 +1521,29 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw ADVANCE (addrPtr, sa); /* default routes are encoded by length-zero sockaddr */ - if (sa->sa_len == 0) + if (sa->sa_len == 0) { addr = 0; - else if (sa->sa_family != AF_INET) - { - WARN ("Received unsupported sockaddr family 0x%x\n", - sa->sa_family); - addr = 0; - } - else - { - struct sockaddr_in *sin = (struct sockaddr_in *)sa; - - addr = sin->sin_addr.s_addr; + }else { + switch(sa->sa_family) { + case AF_INET: { + struct sockaddr_in *sin = (struct sockaddr_in *)sa; + addr = sin->sin_addr.s_addr; + break; + } +#ifdef AF_LINK + case AF_LINK: + if(i == RTA_GATEWAY && row.u1.ForwardType == MIB_IPROUTE_TYPE_DIRECT) { + /* For direct route we may simply use dest addr as next hop */ + C_ASSERT(RTA_DST < RTA_GATEWAY); + addr = row.dwForwardDest; + break; + } + /* fallthrough */ +#endif + default: + WARN ("Received unsupported sockaddr family 0x%x\n", sa->sa_family); + addr = 0; + } } switch (i)

1 0

Hans Leidekker : wmiutils: Validate parameters in IWbemPath:: SetText and IWbemPath::GetText.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 7e936825e2368b148a38337e4994fab0ba12e50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e936825e2368b148a38337e4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:33:31 2013 +0100 wmiutils: Validate parameters in IWbemPath::SetText and IWbemPath::GetText. --- dlls/wmiutils/path.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index a4f3870..e32c9b6 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -100,6 +100,8 @@ static HRESULT WINAPI path_SetText( TRACE("%p, %u, %s\n", iface, uMode, debugstr_w(pszPath)); + if (!pszPath) return WBEM_E_INVALID_PARAMETER; + if (uMode) FIXME("igoring mode %u\n", uMode); len = strlenW( pszPath ); @@ -120,6 +122,8 @@ static HRESULT WINAPI path_GetText( TRACE("%p, 0x%x, %p, %p\n", iface, lFlags, puBufferLength, pszText); + if (!puBufferLength || !pszText) return WBEM_E_INVALID_PARAMETER; + if (lFlags != WBEMPATH_GET_ORIGINAL) { FIXME("flags 0x%x not supported\n", lFlags);

1 0

Andrew Talbot : cryptui: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: bb7ca4379e1808609df13206c407cc7337fbf051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb7ca4379e1808609df13206c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 1 15:48:27 2013 +0000 cryptui: Avoid signed-unsigned integer comparisons. --- dlls/cryptui/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 3835573..6481c1f 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -2836,7 +2836,7 @@ static const struct v1_field v1_fields[] = { static void add_v1_fields(HWND hwnd, struct detail_data *data) { - int i; + unsigned int i; PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; /* The last item in v1_fields is the public key, which is not in the loop @@ -3768,7 +3768,7 @@ static void show_edit_cert_properties_dialog(HWND parent, static void free_detail_fields(struct detail_data *data) { - DWORD i; + int i; for (i = 0; i < data->cFields; i++) HeapFree(GetProcessHeap(), 0, data->fields[i].detailed_value);

1 0