wine-commits September 2013

2 participants
645 discussions

Henri Verbeet : wined3d: Call state_init_default() from state_init() when the appropriate flag is set.

by Alexandre Julliard

Module: wine Branch: master Commit: 8a7744b06ec3d243a0f39bc7f8bbfc5705a6e39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7744b06ec3d243a0f39bc7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 30 09:40:40 2013 +0200 wined3d: Call state_init_default() from state_init() when the appropriate flag is set. --- dlls/wined3d/cs.c | 4 +- dlls/wined3d/device.c | 8 ++-- dlls/wined3d/stateblock.c | 62 +++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 5 ++- 4 files changed, 42 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a03e608..bf88f9f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -224,13 +224,13 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) return NULL; } - if (FAILED(state_init(&cs->state, &cs->fb, &device->adapter->d3d_info, WINED3D_STATE_NO_REF))) + if (FAILED(state_init(&cs->state, &cs->fb, gl_info, &device->adapter->d3d_info, + WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT))) { HeapFree(GetProcessHeap(), 0, cs->fb.render_targets); HeapFree(GetProcessHeap(), 0, cs); return NULL; } - state_init_default(&cs->state, gl_info); cs->ops = &wined3d_cs_st_ops; cs->device = device; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 391e876..d7ef129 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4705,9 +4705,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->d3d_initialized) delete_opengl_contexts(device, swapchain); - if (FAILED(hr = state_init(&device->state, &device->fb, &device->adapter->d3d_info, 0))) + if (FAILED(hr = state_init(&device->state, &device->fb, &device->adapter->gl_info, + &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT))) ERR("Failed to initialize device state, hr %#x.\n", hr); - state_init_default(&device->state, &device->adapter->gl_info); device->update_state = &device->state; device_init_swapchain_state(device, swapchain); @@ -4969,12 +4969,12 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->blitter = adapter->blitter; - if (FAILED(hr = state_init(&device->state, &device->fb, &adapter->d3d_info, 0))) + if (FAILED(hr = state_init(&device->state, &device->fb, &adapter->gl_info, + &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT))) { ERR("Failed to initialize device state, hr %#x.\n", hr); goto err; } - state_init_default(&device->state, &adapter->gl_info); device->update_state = &device->state; if (!(device->cs = wined3d_cs_create(device))) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c0d37f0..24c4362 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -599,33 +599,6 @@ void state_cleanup(struct wined3d_state *state) HeapFree(GetProcessHeap(), 0, state->ps_consts_f); } -HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_d3d_info *d3d_info, DWORD flags) -{ - unsigned int i; - - state->flags = flags; - state->fb = fb; - - for (i = 0; i < LIGHTMAP_SIZE; i++) - { - list_init(&state->light_map[i]); - } - - if (!(state->vs_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - 4 * sizeof(float) * d3d_info->limits.vs_uniform_count))) - return E_OUTOFMEMORY; - - if (!(state->ps_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - 4 * sizeof(float) * d3d_info->limits.ps_uniform_count))) - { - HeapFree(GetProcessHeap(), 0, state->vs_consts_f); - return E_OUTOFMEMORY; - } - - return WINED3D_OK; -} - ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) { ULONG refcount = InterlockedDecrement(&stateblock->ref); @@ -1173,7 +1146,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } -void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) +static void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) { union { @@ -1379,6 +1352,37 @@ void state_init_default(struct wined3d_state *state, const struct wined3d_gl_inf } } +HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, + const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, + DWORD flags) +{ + unsigned int i; + + state->flags = flags; + state->fb = fb; + + for (i = 0; i < LIGHTMAP_SIZE; i++) + { + list_init(&state->light_map[i]); + } + + if (!(state->vs_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + 4 * sizeof(float) * d3d_info->limits.vs_uniform_count))) + return E_OUTOFMEMORY; + + if (!(state->ps_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + 4 * sizeof(float) * d3d_info->limits.ps_uniform_count))) + { + HeapFree(GetProcessHeap(), 0, state->vs_consts_f); + return E_OUTOFMEMORY; + } + + if (flags & WINED3D_STATE_INIT_DEFAULT) + state_init_default(state, gl_info); + + return WINED3D_OK; +} + static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, struct wined3d_device *device, enum wined3d_stateblock_type type) { @@ -1388,7 +1392,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - if (FAILED(hr = state_init(&stateblock->state, NULL, d3d_info, 0))) + if (FAILED(hr = state_init(&stateblock->state, NULL, &device->adapter->gl_info, d3d_info, 0))) return hr; if (FAILED(hr = stateblock_allocate_shader_constants(stateblock))) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d6b3a9..5fd759a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1805,6 +1805,7 @@ struct wined3d_stream_state }; #define WINED3D_STATE_NO_REF 0x00000001 +#define WINED3D_STATE_INIT_DEFAULT 0x00000002 struct wined3d_state { @@ -2454,8 +2455,8 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DEC void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; -void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; + const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, + DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; struct wined3d_cs_ops

10 years, 7 months

Henri Verbeet : wined3d: Send viewport updates through the command stream.

by Alexandre Julliard

Module: wine Branch: master Commit: bc0f990b44893f531720c041e7cc5a7bd4fa8bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc0f990b44893f531720c041e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 30 09:40:39 2013 +0200 wined3d: Send viewport updates through the command stream. --- dlls/wined3d/cs.c | 47 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 10 ++++---- dlls/wined3d/stateblock.c | 8 ++++-- dlls/wined3d/wined3d_private.h | 8 ++++++- 4 files changed, 63 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index cdd7794..a03e608 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -28,6 +28,7 @@ enum wined3d_cs_op WINED3D_CS_OP_PRESENT, WINED3D_CS_OP_CLEAR, WINED3D_CS_OP_DRAW, + WINED3D_CS_OP_SET_VIEWPORT, }; struct wined3d_cs_present @@ -62,6 +63,12 @@ struct wined3d_cs_draw BOOL indexed; }; +struct wined3d_cs_set_viewport +{ + enum wined3d_cs_op opcode; + const struct wined3d_viewport *viewport; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -146,11 +153,31 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun cs->ops->submit(cs); } +static void wined3d_cs_exec_set_viewport(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_viewport *op = data; + + cs->state.viewport = *op->viewport; + device_invalidate_state(cs->device, STATE_VIEWPORT); +} + +void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) +{ + struct wined3d_cs_set_viewport *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_VIEWPORT; + op->viewport = viewport; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, + /* WINED3D_CS_OP_SET_VIEWPORT */ wined3d_cs_exec_set_viewport, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) @@ -184,10 +211,26 @@ static const struct wined3d_cs_ops wined3d_cs_st_ops = struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) { + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_cs *cs; - if (!(cs = HeapAlloc(GetProcessHeap(), 0, sizeof(*cs)))) + if (!(cs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cs)))) + return NULL; + + if (!(cs->fb.render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*cs->fb.render_targets) * gl_info->limits.buffers))) + { + HeapFree(GetProcessHeap(), 0, cs); + return NULL; + } + + if (FAILED(state_init(&cs->state, &cs->fb, &device->adapter->d3d_info, WINED3D_STATE_NO_REF))) + { + HeapFree(GetProcessHeap(), 0, cs->fb.render_targets); + HeapFree(GetProcessHeap(), 0, cs); return NULL; + } + state_init_default(&cs->state, gl_info); cs->ops = &wined3d_cs_st_ops; cs->device = device; @@ -204,5 +247,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) void wined3d_cs_destroy(struct wined3d_cs *cs) { + state_cleanup(&cs->state); + HeapFree(GetProcessHeap(), 0, cs->fb.render_targets); HeapFree(GetProcessHeap(), 0, cs); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d5f913..391e876 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1922,7 +1922,7 @@ void CDECL wined3d_device_set_viewport(struct wined3d_device *device, const stru return; } - device_invalidate_state(device, STATE_VIEWPORT); + wined3d_cs_emit_set_viewport(device->cs, viewport); } void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport) @@ -4015,7 +4015,7 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, state->viewport.height = render_target->resource.height; state->viewport.min_z = 0.0f; state->viewport.max_z = 1.0f; - device_invalidate_state(device, STATE_VIEWPORT); + wined3d_cs_emit_set_viewport(device->cs, &state->viewport); state->scissor_rect.top = 0; state->scissor_rect.left = 0; @@ -4705,7 +4705,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->d3d_initialized) delete_opengl_contexts(device, swapchain); - if (FAILED(hr = state_init(&device->state, &device->fb, &device->adapter->d3d_info))) + if (FAILED(hr = state_init(&device->state, &device->fb, &device->adapter->d3d_info, 0))) ERR("Failed to initialize device state, hr %#x.\n", hr); state_init_default(&device->state, &device->adapter->gl_info); device->update_state = &device->state; @@ -4722,7 +4722,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state->viewport.y = 0; state->viewport.width = rt->resource.width; state->viewport.height = rt->resource.height; - device_invalidate_state(device, STATE_VIEWPORT); + wined3d_cs_emit_set_viewport(device->cs, &state->viewport); state->scissor_rect.top = 0; state->scissor_rect.left = 0; @@ -4969,7 +4969,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->blitter = adapter->blitter; - if (FAILED(hr = state_init(&device->state, &device->fb, &adapter->d3d_info))) + if (FAILED(hr = state_init(&device->state, &device->fb, &adapter->d3d_info, 0))) { ERR("Failed to initialize device state, hr %#x.\n", hr); goto err; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c990e7d..c0d37f0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -581,7 +581,8 @@ void state_cleanup(struct wined3d_state *state) { unsigned int counter; - state_unbind_resources(state); + if (!(state->flags & WINED3D_STATE_NO_REF)) + state_unbind_resources(state); for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) { @@ -599,10 +600,11 @@ void state_cleanup(struct wined3d_state *state) } HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_d3d_info *d3d_info) + const struct wined3d_d3d_info *d3d_info, DWORD flags) { unsigned int i; + state->flags = flags; state->fb = fb; for (i = 0; i < LIGHTMAP_SIZE; i++) @@ -1386,7 +1388,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - if (FAILED(hr = state_init(&stateblock->state, NULL, d3d_info))) + if (FAILED(hr = state_init(&stateblock->state, NULL, d3d_info, 0))) return hr; if (FAILED(hr = stateblock_allocate_shader_constants(stateblock))) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3ffa4da..6d6b3a9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1804,8 +1804,11 @@ struct wined3d_stream_state UINT flags; }; +#define WINED3D_STATE_NO_REF 0x00000001 + struct wined3d_state { + DWORD flags; const struct wined3d_fb_state *fb; struct wined3d_vertex_declaration *vertex_declaration; @@ -2451,7 +2454,7 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DEC void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; + const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -2465,6 +2468,8 @@ struct wined3d_cs { const struct wined3d_cs_ops *ops; struct wined3d_device *device; + struct wined3d_fb_state fb; + struct wined3d_state state; size_t data_size; void *data; @@ -2480,6 +2485,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d

10 years, 7 months

Nikolay Sivov : xmllite: Fix node type for whitespace text nodes in Content .

by Alexandre Julliard

Module: wine Branch: master Commit: ece36f17d06a8b3ac98ea4dfc333c0d5381b16a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece36f17d06a8b3ac98ea4dfc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 29 18:55:20 2013 +0400 xmllite: Fix node type for whitespace text nodes in Content. --- dlls/xmllite/reader.c | 5 ++++- dlls/xmllite/tests/reader.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 325a7a5..b181230 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2205,7 +2205,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader) ptr = start = reader_get_cur(reader); /* There's no text */ if (!*ptr || *ptr == '<') return S_OK; - reader->nodetype = XmlNodeType_Text; + reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); @@ -2232,6 +2232,9 @@ static HRESULT reader_parse_chardata(xmlreader *reader) } reader_skipn(reader, 1); + + /* this covers a case when text has leading whitespace chars */ + if (!is_wchar_space(*ptr)) reader->nodetype = XmlNodeType_Text; ptr++; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 04761cb..6296028 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -943,11 +943,13 @@ static const char misc_test_xml[] = " \t \r \n" "" "<a>" + "\r\n\t" "<b/>" "text" "" "text2" "<?pi pibody ?>" + "\r\n" "</a>" ; @@ -961,11 +963,13 @@ static struct nodes_test misc_test = { XmlNodeType_Whitespace, XmlNodeType_Comment, XmlNodeType_Element, + XmlNodeType_Whitespace, XmlNodeType_Element, XmlNodeType_Text, XmlNodeType_Comment, XmlNodeType_Text, XmlNodeType_ProcessingInstruction, + XmlNodeType_Whitespace, XmlNodeType_EndElement, XmlNodeType_None }

10 years, 7 months

Nikolay Sivov : xmllite: Reset resume state when text node is parsed.

by Alexandre Julliard

Module: wine Branch: master Commit: 249b45786f209f902bbfbcfecd8ade18a75bb7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=249b45786f209f902bbfbcfec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 29 18:52:47 2013 +0400 xmllite: Reset resume state when text node is parsed. --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e193e9d..325a7a5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2226,6 +2226,8 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader_init_strvalue(start, ptr-start, &value); reader_set_strvalue(reader, StringValue_Value, &value); + reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d7400bc..04761cb 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -944,7 +944,9 @@ static const char misc_test_xml[] = "" "<a>" "<b/>" + "text" "" + "text2" "<?pi pibody ?>" "</a>" ; @@ -960,7 +962,9 @@ static struct nodes_test misc_test = { XmlNodeType_Comment, XmlNodeType_Element, XmlNodeType_Element, + XmlNodeType_Text, XmlNodeType_Comment, + XmlNodeType_Text, XmlNodeType_ProcessingInstruction, XmlNodeType_EndElement, XmlNodeType_None

10 years, 7 months

Marcus Meissner : wintrust: Fixed some memory leaks (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: a090b46f727b9ccd0efd97cce0f870d56ad31519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a090b46f727b9ccd0efd97cce… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 14:17:45 2013 +0200 wintrust: Fixed some memory leaks (Coverity). --- dlls/wintrust/crypt.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 341f45b..0ed45d3 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -909,6 +909,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, NULL, &size)) { CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } sum += size; @@ -916,6 +917,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h if (!(cc->attr = HeapAlloc(GetProcessHeap(), 0, sizeof(*cc->attr) * cc->attr_count + sum))) { CryptMsgClose(hmsg); + HeapFree(GetProcessHeap(), 0, cc); SetLastError(ERROR_OUTOFMEMORY); return INVALID_HANDLE_VALUE; } @@ -926,12 +928,14 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h { CryptMsgClose(hmsg); HeapFree(GetProcessHeap(), 0, cc->attr); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } if (!CryptMsgGetParam(hmsg, CMSG_ATTR_CERT_PARAM, i, p, &size)) { CryptMsgClose(hmsg); HeapFree(GetProcessHeap(), 0, cc->attr); + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; } p += size; @@ -948,6 +952,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h cc->magic = CRYPTCAT_MAGIC; return cc; } + HeapFree(GetProcessHeap(), 0, cc); return INVALID_HANDLE_VALUE; }

10 years, 7 months

Marcus Meissner : msvcrt: Restore a stack mark on error (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: e9358909f8bc940da4bd614dd68d5142b599f447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9358909f8bc940da4bd614dd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 23:08:38 2013 +0200 msvcrt: Restore a stack mark on error (Coverity). --- dlls/msvcrt/undname.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index ec974a0..057d40a 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -539,8 +539,10 @@ static char* get_template_name(struct parsed_symbol* sym) struct array array_pmt; sym->names.start = sym->names.num; - if (!(name = get_literal_string(sym))) + if (!(name = get_literal_string(sym))) { + sym->names.start = start_mark; return FALSE; + } str_array_init(&array_pmt); args = get_args(sym, &array_pmt, FALSE, '<', '>'); if (args != NULL)

10 years, 7 months

Marcus Meissner : view: Free the data on error exit (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: 8953e8d7eeecca278ced44a172c31bb6d31c10b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8953e8d7eeecca278ced44a17… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 19:33:57 2013 +0200 view: Free the data on error exit (Coverity). --- programs/view/view.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 9e60824..0adade7 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -166,8 +166,10 @@ static HMETAFILE GetPlaceableMetaFile( LPCWSTR szFileName ) } CloseHandle( handle ); - if (!(hmf = SetMetaFileBitsEx(mfHeader.mtSize*2, lpData))) + if (!(hmf = SetMetaFileBitsEx(mfHeader.mtSize*2, lpData))) { + GlobalFree(lpData); return 0; + } width = APMHeader.bbox.Right - APMHeader.bbox.Left; @@ -181,6 +183,7 @@ static HMETAFILE GetPlaceableMetaFile( LPCWSTR szFileName ) deltax = 0; deltay = 0 ; + GlobalFree(lpData); return hmf; }

10 years, 7 months

Marcus Meissner : xcopy: Allocate more space for the W buffer (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: a6550abee5d690b4d7c0e6ac039d0f240e954d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6550abee5d690b4d7c0e6ac0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 14:23:04 2013 +0200 xcopy: Allocate more space for the W buffer (Coverity). --- programs/xcopy/xcopy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index f894b0e..e3312db 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -114,7 +114,7 @@ static int __cdecl XCOPY_wprintf(const WCHAR *format, ...) { */ if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); + MAX_WRITECONSOLE_SIZE*sizeof(WCHAR)); if (!output_bufW) { WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); return 0;

10 years, 7 months

Marcus Meissner : attrib: Fixed an allocation size (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: 7c8c90abbb1e76ef391d3a80d690e9db9adf7c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8c90abbb1e76ef391d3a80d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 13:01:51 2013 +0200 attrib: Fixed an allocation size (Coverity). --- programs/attrib/attrib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 443a0c0..4342779 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -68,7 +68,7 @@ static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) */ if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); + MAX_WRITECONSOLE_SIZE*sizeof(WCHAR)); if (!output_bufW) { WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); return 0;

10 years, 7 months

Marcus Meissner : wined3d: Fixed sizeof() to HeapAlloc (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: 0c9ce583bcf78e531af92f351557e767892c7616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9ce583bcf78e531af92f351… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 12:55:11 2013 +0200 wined3d: Fixed sizeof() to HeapAlloc (Coverity). --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 631c2ea..282c2d0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3988,7 +3988,7 @@ static DWORD find_input_signature(struct shader_arb_priv *priv, const struct win TRACE("Found existing signature %u\n", found_sig->idx); return found_sig->idx; } - found_sig = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sig)); + found_sig = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*found_sig)); found_sig->sig = clone_sig(sig); found_sig->idx = priv->ps_sig_number++; TRACE("New signature stored and assigned number %u\n", found_sig->idx);

10 years, 7 months

Jump to page:

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 September 2013