wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Henri Verbeet : wined3d: Get rid of the user_stream field from wined3d_state.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 3e7c800e9c1c2b021021dddbda9178303c63ebb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7c800e9c1c2b021021dddbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 6 14:44:08 2013 +0100 wined3d: Get rid of the user_stream field from wined3d_state. All remaining uses are equivalent to "device->up_strided". (Which should of course eventually go away as well.) --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 -- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c0b66b1..9dfb3a9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2298,7 +2298,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de device_preload_textures(device); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) device_update_stream_info(device, context->gl_info); - if (state->index_buffer && !state->user_stream) + if (state->index_buffer && !device->up_strided) { if (device->strided_streams.all_vbo) wined3d_buffer_preload(state->index_buffer); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 78997f0..d718b04 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4162,12 +4162,10 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_strided(struct wined3d_devic prev_idx_format = device->stateBlock->state.index_format; device->stateBlock->state.index_format = index_data_format_id; - device->stateBlock->state.user_stream = TRUE; device->stateBlock->state.base_vertex_index = 0; device->up_strided = strided_data; draw_primitive(device, 0, index_count, 0, 0, TRUE, index_data); device->up_strided = NULL; - device->stateBlock->state.user_stream = FALSE; device->stateBlock->state.index_format = prev_idx_format; device_invalidate_state(device, STATE_VDECL); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 67f84a5..ed32ee2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -676,7 +676,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (indexed) { - if (!state->user_stream) + if (!device->up_strided) { struct wined3d_buffer *index_buffer = state->index_buffer; if (!index_buffer->buffer_object || !stream_info->all_vbo) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09055f7..a045f7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2296,7 +2296,6 @@ struct wined3d_state struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[MAX_STREAM_OUT]; struct wined3d_stream_state streams[MAX_STREAMS + 1 /* tesselated pseudo-stream */]; - BOOL user_stream; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; INT base_vertex_index;

1 0

Henri Verbeet : wined3d: Remove a redundant condition in the indexbuffer() state handler.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 5b42297a319fc051814314e79ca09e922bce130f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b42297a319fc051814314e79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 6 14:44:07 2013 +0100 wined3d: Remove a redundant condition in the indexbuffer() state handler. Strided draws don't use VBOs. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a193fbd..6d97981 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4897,7 +4897,7 @@ static void indexbuffer(struct wined3d_context *context, const struct wined3d_st const struct wined3d_stream_info *stream_info = &context->swapchain->device->strided_streams; const struct wined3d_gl_info *gl_info = context->gl_info; - if (state->user_stream || !state->index_buffer || !stream_info->all_vbo) + if (!state->index_buffer || !stream_info->all_vbo) { GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); }

1 0

Henri Verbeet : ddraw: Avoid LPD3DVIEWPORT7.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: da71c922a5e3576e4b64f1953b78e1d11eecda87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da71c922a5e3576e4b64f1953… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 6 14:44:06 2013 +0100 ddraw: Avoid LPD3DVIEWPORT7. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 593cbc7..322384a 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1306,9 +1306,9 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil) PURE; STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; - STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE; + STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT7 *data) PURE; STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; - STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE; + STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT7 *data) PURE; STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE; STDMETHOD(SetLight)(THIS_ DWORD dwLightIndex,LPD3DLIGHT7 lpLight) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPD3DVIEWPORT2.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 768c7121b7abbeec20e3f0a3fd3031eea93910be URL: http://source.winehq.org/git/wine.git/?a=commit;h=768c7121b7abbeec20e3f0a3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 6 14:44:05 2013 +0100 ddraw: Avoid LPD3DVIEWPORT2. --- include/d3d.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 72b73d1..593cbc7 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -734,8 +734,8 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; /*** IDirect3DViewport2 methods ***/ - STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; - STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; + STDMETHOD(GetViewport2)(THIS_ D3DVIEWPORT2 *data) PURE; + STDMETHOD(SetViewport2)(THIS_ D3DVIEWPORT2 *data) PURE; }; #undef INTERFACE @@ -810,8 +810,8 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; /*** IDirect3DViewport2 methods ***/ - STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; - STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; + STDMETHOD(GetViewport2)(THIS_ D3DVIEWPORT2 *data) PURE; + STDMETHOD(SetViewport2)(THIS_ D3DVIEWPORT2 *data) PURE; /*** IDirect3DViewport3 methods ***/ STDMETHOD(SetBackgroundDepth2)(THIS_ IDirectDrawSurface4 *surface) PURE; STDMETHOD(GetBackgroundDepth2)(THIS_ IDirectDrawSurface4 **surface, BOOL *valid) PURE;

1 0

Francois Gouget : netstat: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: ca9ceddd5ddf4aa549db5f0288420128eec62995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9ceddd5ddf4aa549db5f028… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 5 16:17:30 2013 +0100 netstat: Fix compilation on systems that don't support nameless unions. --- programs/netstat/netstat.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index a3f584c..4f29788 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "netstat.h" #include <winsock2.h> #include <iphlpapi.h> @@ -178,9 +179,9 @@ static void NETSTAT_tcp_table(void) for (i = 0; i < table->dwNumEntries; i++) { - if ((table->table[i].dwState == MIB_TCP_STATE_CLOSE_WAIT) || - (table->table[i].dwState == MIB_TCP_STATE_ESTAB) || - (table->table[i].dwState == MIB_TCP_STATE_TIME_WAIT)) + if ((table->table[i].u.dwState == MIB_TCP_STATE_CLOSE_WAIT) || + (table->table[i].u.dwState == MIB_TCP_STATE_ESTAB) || + (table->table[i].u.dwState == MIB_TCP_STATE_TIME_WAIT)) { NETSTAT_host_name(table->table[i].dwLocalAddr, HostIp); NETSTAT_port_name(table->table[i].dwLocalPort, HostPort); @@ -189,7 +190,7 @@ static void NETSTAT_tcp_table(void) sprintfW(Host, fmtcolon, HostIp, HostPort); sprintfW(Remote, fmtcolon, RemoteIp, RemotePort); - NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, NETSTAT_load_message(table->table[i].dwState)); + NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, NETSTAT_load_message(table->table[i].u.dwState)); } } HeapFree(GetProcessHeap(), 0, table);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: f963f939645f1c36419230b85e7a60fdd7a63850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f963f939645f1c36419230b85… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 5 16:17:18 2013 +0100 Assorted spelling fixes. --- dlls/crypt32/rootstore.c | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 2 +- dlls/d3dx9_36/tests/texture.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/ole32/tests/compobj.c | 2 +- dlls/usp10/tests/usp10.c | 2 +- dlls/winmm/waveform.c | 2 +- dlls/xmllite/reader.c | 2 +- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 386bc9b..4e4e4e4 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -189,7 +189,7 @@ static const char *trust_status_to_str(DWORD status) "\n\tbad name constraints"); if (status & CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT) pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tunsuported name constraint"); + "\n\tunsupported name constraint"); if (status & CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT) pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tundefined name constraint"); diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 1bc3641..1546bfe 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -642,7 +642,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge "function names\n"); ok(errors != NULL, "No errors returned for a shader with invalid variable and function " "names\n"); - ok(compiled == NULL, "A shader blob was returend for a shader with invalid variable and " + ok(compiled == NULL, "A shader blob was returned for a shader with invalid variable and " "function names\n"); IUnknown_Release(errors); diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index ebaf385..7c69d90 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1591,7 +1591,7 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(levelcount == 3, "GetLevelCount returned %u, expected 3\n", levelcount); hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &volume_desc); - ok(hr == D3D_OK, "GetLevelDesc returend %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); ok(volume_desc.Width == 4, "Got width %u, expected 4\n", volume_desc.Width); ok(volume_desc.Height == 4, "Got height %u, expected 4\n", volume_desc.Height); ok(volume_desc.Depth == 2, "Got depth %u, expected 2\n", volume_desc.Depth); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fb4f1e8..89729f1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1248,7 +1248,7 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_QueryInterface(nsIAsyncVerif nsRedirectCallback *This = impl_from_nsIAsyncVerifyRedirectCallback(iface); if(IsEqualGUID(&IID_nsISupports, riid)) { - TRACE("(%p)->(IID_nsISuports %p)\n", This, result); + TRACE("(%p)->(IID_nsISupports %p)\n", This, result); *result = &This->nsIAsyncVerifyRedirectCallback_iface; }else if(IsEqualGUID(&IID_nsIAsyncVerifyRedirectCallback, riid)) { TRACE("(%p)->(IID_nsIAsyncVerifyRedirectCallback %p)\n", This, result); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 7584d0d..d0adf79 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -707,7 +707,7 @@ static void test_CoRegisterPSClsid(void) CLSID clsid; hr = CoRegisterPSClsid(&IID_IWineTest, &CLSID_WineTestPSFactoryBuffer); - ok(hr == CO_E_NOTINITIALIZED, "CoRegisterPSClsid should have returened CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "CoRegisterPSClsid should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d6786cd..9f7088d 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1860,7 +1860,7 @@ static void test_ScriptGetFontProperties(HDC hdc) static const WCHAR invalids[] = {0x0020, 0x200B, 0xF71B}; /* U+0020: numeric space U+200B: zero width space - U+F71B: unkown, found by black box testing */ + U+F71B: unknown, found by black box testing */ BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); /* Some sanity checks for ScriptGetFontProperties */ diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 8957c4c..e6fe360 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -107,7 +107,7 @@ typedef struct _WINMM_Device { BOOL stopped; DWORD loop_counter; UINT32 bytes_per_frame, samples_per_sec, ofs_bytes, played_frames; - UINT32 remainder_frames; /* header chunk frames already played when a device switch occured */ + UINT32 remainder_frames; /* header chunk frames already played when a device switch occurred */ /* stored in frames of sample rate, *not* AC::GetFrequency */ UINT64 last_clock_pos; diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a6caf66..a1ce662 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -366,7 +366,7 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) ULONG read; HRESULT hr; - /* always try to get aligned to 4 bytes, so the only case we can get partialy read characters is + /* always try to get aligned to 4 bytes, so the only case we can get partially read characters is variable width encodings like UTF-8 */ len = (len + 3) & ~3; /* try to use allocated space or grow */ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2899418..4590769 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3778,7 +3778,7 @@ static int WCMD_handleExpression(WCHAR **expr, int *ret, int depth) WCHAR *nextpos; /* Cannot have an expression with var/number twice, without an operator - inbetween, nor or number following a half constructed << or >> operator */ + in-between, nor or number following a half constructed << or >> operator */ if (lastwasnumber || foundhalf) { rc = WCMD_NOOPERATOR; goto exprerrorreturn; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 508691e..54070bc 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1220,7 +1220,7 @@ set WINE_foo=2 set /a WINE_bar=WINE_foo=7 call :checkenvvars WINE_foo 7 WINE_bar 7 echo ----- equal precedence on stack -rem Unary - dont reduce if precedence is equal +rem Unary - don't reduce if precedence is equal set /a WINE_foo=!!1 call :checkenvvars WINE_foo 1 set /a WINE_foo=!!0 @@ -1262,7 +1262,7 @@ set /a WINE_foo=10-5+2 call :checkenvvars WINE_foo 7 set /a WINE_foo=1^<^<4^>^>1 call :checkenvvars WINE_foo 8 -rem Assignment - dont reduce if precedence is equal +rem Assignment - don't reduce if precedence is equal set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to a win_skip() call.
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 6ada0608bfad2839415a19bb94c0ee5640354099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ada0608bfad2839415a19bb9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 5 16:17:42 2013 +0100 msvcrt/tests: Add a trailing '\n' to a win_skip() call. --- dlls/msvcrt/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f2fd8f9..43fe7c5 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2452,7 +2452,7 @@ static void test__stricmp(void) ok(ret < 0, "_stricmp returned %d\n", ret); if(!setlocale(LC_ALL, "polish")) { - win_skip("stricmp tests"); + win_skip("stricmp tests\n"); return; }

1 0

Michael Stefaniuc : winmm: Add missing LeaveCriticalSection on error paths (Smatch).
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 3b4bb9dcf37c7f16773a85babce460eb7cd85015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4bb9dcf37c7f16773a85bab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 5 00:22:32 2013 +0100 winmm: Add missing LeaveCriticalSection on error paths (Smatch). --- dlls/winmm/waveform.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index ec230c9..8957c4c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -757,12 +757,14 @@ static HRESULT reroute_mapper_device(WINMM_Device *device, BOOL is_out) hr = IAudioClock_GetFrequency(device->clock, &clock_freq); if(FAILED(hr)){ WARN("GetFrequency failed: %08x\n", hr); + LeaveCriticalSection(&device->lock); return hr; } hr = IAudioClock_GetPosition(device->clock, &clock_pos, NULL); if(FAILED(hr)){ WARN("GetPosition failed: %08x\n", hr); + LeaveCriticalSection(&device->lock); return hr; }

1 0

Michael Stefaniuc : atl100: Fix a mem leak on an error path (Smatch).
by Alexandre Julliard 07 Jan '13

07 Jan '13

Module: wine Branch: master Commit: 4bdb5b55ec0ff92a37c5d4322778eb2a16058388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdb5b55ec0ff92a37c5d4322… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 5 00:20:57 2013 +0100 atl100: Fix a mem leak on an error path (Smatch). --- dlls/atl100/atl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 4e2ba9f..61477ae 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -331,8 +331,10 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, return E_OUTOFMEMORY; path_len = GetModuleFileNameW(inst, path, MAX_PATH); - if(!path_len) + if(!path_len) { + heap_free(path); return HRESULT_FROM_WIN32(GetLastError()); + } if(index_len) memcpy(path+path_len, lpszIndex, (index_len+1)*sizeof(WCHAR));

1 0

Lucas Zawacki : Portuguese translation for release 1.5.21
by Jeremy Newman 07 Jan '13

07 Jan '13

Module: website Branch: master Commit: 1ccc6b2551d5ece58115093c41d49eb81dcea54e URL: http://source.winehq.org/git/website.git/?a=commit;h=1ccc6b2551d5ece5811509… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Jan 7 13:10:11 2013 -0200 Portuguese translation for release 1.5.21 --- news/pt/2013010401.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/pt/2013010401.xml b/news/pt/2013010401.xml new file mode 100644 index 0000000..7f50c9f --- /dev/null +++ b/news/pt/2013010401.xml @@ -0,0 +1,13 @@ +<news> +<date>4 de Janeiro de 2013</date> +<title>Wine 1.5.21 lançado</title> +<body> + A versão de desenvolvimento 1.5.21 já está disponível agora. + <a href="{$root}/announce/1.5.21">Novidades</a> desta versão: +<ul> + <li>Versão inicial do programa netstat.</li> + <li>Suporte à seleção de resolução no driver Postscript.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.21.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013