October 2013 - Wine-Commits

Frédéric Delanoy : dinput: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: b95272e2d5f761e0994286f9996882fbf6c1c318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95272e2d5f761e0994286f99… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:35 2013 +0200 dinput: Use BOOL type where appropriate. --- dlls/dinput/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index fc5ad5d..08ebfd7 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -575,7 +575,7 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) DWORD type = (0x0000ff00 & dwSemantic) >> 8; DWORD offset = 0x000000ff & dwSemantic; DWORD obj_instance = 0; - DWORD found = 0; + BOOL found = FALSE; int i; for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++) @@ -585,7 +585,7 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) if (odf->dwOfs == offset) { obj_instance = DIDFT_GETINSTANCE(odf->dwType); - found = 1; + found = TRUE; break; } }

1 0

Henri Verbeet : wined3d: Send sampler state updates through the command stream.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: b2e75e27f368852e3c2497c7684d6913c472673a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e75e27f368852e3c2497c76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:48 2013 +0200 wined3d: Send sampler state updates through the command stream. --- dlls/wined3d/cs.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3ddfeb1..af23a47 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -43,6 +43,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_PIXEL_SHADER, WINED3D_CS_OP_SET_RENDER_STATE, WINED3D_CS_OP_SET_TEXTURE_STATE, + WINED3D_CS_OP_SET_SAMPLER_STATE, }; struct wined3d_cs_present @@ -160,6 +161,14 @@ struct wined3d_cs_set_texture_state DWORD value; }; +struct wined3d_cs_set_sampler_state +{ + enum wined3d_cs_op opcode; + UINT sampler_idx; + enum wined3d_sampler_state state; + DWORD value; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -630,6 +639,28 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, cs->ops->submit(cs); } +static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_sampler_state *op = data; + + cs->state.sampler_states[op->sampler_idx][op->state] = op->value; + device_invalidate_state(cs->device, STATE_SAMPLER(op->sampler_idx)); +} + +void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, + enum wined3d_sampler_state state, DWORD value) +{ + struct wined3d_cs_set_sampler_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_SAMPLER_STATE; + op->sampler_idx = sampler_idx; + op->state = state; + op->value = value; + + 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, @@ -649,6 +680,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_PIXEL_SHADER */ wined3d_cs_exec_set_pixel_shader, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, + /* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 73231da..cae3cfd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1990,7 +1990,7 @@ void CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, return; } - device_invalidate_state(device, STATE_SAMPLER(sampler_idx)); + wined3d_cs_emit_set_sampler_state(device->cs, sampler_idx, state, value); } DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96e5d3b..9626c54 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2495,6 +2495,8 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, struct wined3d_surface *render_target) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, + enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN;

1 0

Frédéric Delanoy : msi/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: e21abfe07a7be233993cc52612b29597f419379c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21abfe07a7be233993cc5261… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:36 2013 +0200 msi/tests: Use BOOL type where appropriate. --- dlls/msi/tests/msi.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 5df72e9..066b1d4 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -12766,7 +12766,7 @@ static void test_MsiGetPatchInfo(void) static void test_MsiEnumProducts(void) { UINT r; - int found1, found2, found3; + BOOL found1, found2, found3; DWORD index; char product1[39], product2[39], product3[39], guid[39]; char product_squashed1[33], product_squashed2[33], product_squashed3[33]; @@ -12824,12 +12824,12 @@ static void test_MsiEnumProducts(void) r = MsiEnumProductsA(index, guid); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - found1 = found2 = found3 = 0; + found1 = found2 = found3 = FALSE; while ((r = MsiEnumProductsA(index, guid)) == ERROR_SUCCESS) { - if (!strcmp(product1, guid)) found1 = 1; - if (!strcmp(product2, guid)) found2 = 1; - if (!strcmp(product3, guid)) found3 = 1; + if (!strcmp(product1, guid)) found1 = TRUE; + if (!strcmp(product2, guid)) found2 = TRUE; + if (!strcmp(product3, guid)) found3 = TRUE; index++; } ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %u\n", r);

1 0

Henri Verbeet : wined3d: Send texture state updates through the command stream.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 8cf6d1a429428dcd64a3c76f0f0d6a8bf3d6b650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf6d1a429428dcd64a3c76f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:47 2013 +0200 wined3d: Send texture state updates through the command stream. --- dlls/wined3d/cs.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f295aa7..3ddfeb1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -42,6 +42,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_GEOMETRY_SHADER, WINED3D_CS_OP_SET_PIXEL_SHADER, WINED3D_CS_OP_SET_RENDER_STATE, + WINED3D_CS_OP_SET_TEXTURE_STATE, }; struct wined3d_cs_present @@ -151,6 +152,14 @@ struct wined3d_cs_set_render_state DWORD value; }; +struct wined3d_cs_set_texture_state +{ + enum wined3d_cs_op opcode; + UINT stage; + enum wined3d_texture_stage_state state; + DWORD value; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -599,6 +608,28 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render cs->ops->submit(cs); } +static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_texture_state *op = data; + + cs->state.texture_states[op->stage][op->state] = op->value; + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, op->state)); +} + +void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, + enum wined3d_texture_stage_state state, DWORD value) +{ + struct wined3d_cs_set_texture_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_TEXTURE_STATE; + op->stage = stage; + op->state = state; + op->value = value; + + 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, @@ -617,6 +648,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_GEOMETRY_SHADER */ wined3d_cs_exec_set_geometry_shader, /* WINED3D_CS_OP_SET_PIXEL_SHADER */ wined3d_cs_exec_set_pixel_shader, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, + /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b050cd..73231da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3074,7 +3074,7 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, return; } - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, state)); + wined3d_cs_emit_set_texture_state(device->cs, stage, state, value); } DWORD CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b31908d..96e5d3b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2501,6 +2501,8 @@ void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, + enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Add support for vtordispex demangling.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 0aa72d880a9d6a3a72252f4e0d75cab4608185dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa72d880a9d6a3a72252f4e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 7 13:01:24 2013 +0200 msvcrt: Add support for vtordispex demangling. --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index f36641e..e545a5f 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1315,6 +1315,9 @@ static void test_demangle(void) /* 124 */ {"??_9CView@@$BBII(a)AE", "[thunk]: __thiscall CView::`vcall'{392,{flat}}' }'", "[thunk]: __thiscall CView::`vcall'{392,{flat}}' "}, +/* 125 */ {"?_dispatch(a)_impl_Engine@SalomeApp@@$R4CE(a)BA@PPPPPPPM(a)7AE_NAAVomniCallHandle@@@Z", + "[thunk]:public: virtual bool __thiscall SalomeApp::_impl_Engine::_dispatch`vtordispex{36,16,4294967292,8}' (class omniCallHandle &)", + "?_dispatch(a)_impl_Engine@SalomeApp@@$R4CE(a)BA@PPPPPPPM(a)7AE_NAAVomniCallHandle@@@Z"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index bc2a6fb..396a003 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1113,12 +1113,15 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) * "$4" public: thunk vtordisp * "$5" public: thunk vtordisp * "$B" vcall thunk + * "$R" thunk vtordispex */ accmem = *sym->current++; if (accmem == '$') { if (*sym->current >= '0' && *sym->current <= '5') access_id = (*sym->current - '0') / 2; + else if (*sym->current == 'R') + access_id = (sym->current[1] - '0') / 2; else if (*sym->current != 'B') goto done; } @@ -1136,7 +1139,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) if (accmem == '$' || (accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) access = str_printf(sym, "[thunk]:%s", access ? access : " "); - if (accmem == '$' && *sym->current >= '0' && *sym->current <= '5') + if (accmem == '$' && *sym->current != 'B') member_type = "virtual "; else if (accmem <= 'X') { @@ -1154,19 +1157,38 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) name = get_class_string(sym, 0); - if (accmem == '$' && *sym->current++ == 'B') /* vcall thunk */ + if (accmem == '$' && *sym->current == 'B') /* vcall thunk */ { - const char *n = get_number(sym); + const char *n; + + sym->current++; + n = get_number(sym); if(!n || *sym->current++ != 'A') goto done; name = str_printf(sym, "%s{%s,{flat}}' }'", name, n); has_args = FALSE; has_ret = FALSE; } + else if (accmem == '$' && *sym->current == 'R') /* vtordispex thunk */ + { + const char *n1, *n2, *n3, *n4; + + sym->current += 2; + n1 = get_number(sym); + n2 = get_number(sym); + n3 = get_number(sym); + n4 = get_number(sym); + + if(!n1 || !n2 || !n3 || !n4) goto done; + name = str_printf(sym, "%s`vtordispex{%s,%s,%s,%s}' ", name, n1, n2, n3, n4); + } else if (accmem == '$') /* vtordisp thunk */ { - const char *n1 = get_number(sym); - const char *n2 = get_number(sym); + const char *n1, *n2; + + sym->current++; + n1 = get_number(sym); + n2 = get_number(sym); if (!n1 || !n2) goto done; name = str_printf(sym, "%s`vtordisp{%s,%s}' ", name, n1, n2);

1 0

Piotr Caban : msvcrt: Don' t try to demangle template after function or variable name.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: d13436e048894e0a57cfe5a7cc89100c48956d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13436e048894e0a57cfe5a7c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 7 13:00:54 2013 +0200 msvcrt: Don't try to demangle template after function or variable name. --- dlls/msvcrt/undname.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 057d40a..dfcf2ab 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1219,23 +1219,6 @@ done: return ret; } -/****************************************************************** - * handle_template - * Does the final parsing and handling for a name with templates - */ -static BOOL handle_template(struct parsed_symbol* sym) -{ - const char* name; - const char* args; - - assert(*sym->current == '$'); - sym->current++; - if (!(name = get_literal_string(sym))) return FALSE; - if (!(args = get_args(sym, NULL, FALSE, '<', '>'))) return FALSE; - sym->result = str_printf(sym, "%s%s", name, args); - return TRUE; -} - /******************************************************************* * symbol_demangle * Demangle a C++ linker symbol @@ -1469,8 +1452,6 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) /* Function/Data type and access level */ if (*sym->current >= '0' && *sym->current <= '9') ret = handle_data(sym); - else if (sym->current[0] == '$' && (sym->current[1] < '0' || sym->current[1] > '9')) - ret = handle_template(sym); else if ((*sym->current >= 'A' && *sym->current <= 'Z') || *sym->current == '$') ret = handle_method(sym, do_after == 3); else ret = FALSE;

1 0

Francois Gouget : mscoree/tests: Make test_createinstance() static.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: cd35ac901f2b2906813ee08b65c851bf7f0ffede URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd35ac901f2b2906813ee08b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 7 09:29:46 2013 +0200 mscoree/tests: Make test_createinstance() static. --- dlls/mscoree/tests/mscoree.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 41844ef..19e8fdd 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -390,7 +390,7 @@ static void test_createconfigstream(void) DeleteFileW(file); } -void test_createinstance(void) +static void test_createinstance(void) { HRESULT hr; ICLRMetaHost *host;

1 0

Dmitry Timoshkov : ntdll/tests: Accept previously declared behaviour of overlapped IO as broken.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 1670c7f9a61306b4103105467b2f8b913a01dc04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1670c7f9a61306b4103105467… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 16:36:31 2013 +0900 ntdll/tests: Accept previously declared behaviour of overlapped IO as broken. It highly depends on Windows version and updates/SP installed. --- dlls/ntdll/tests/file.c | 123 +++++++++++++++++++++------------------------- 1 files changed, 56 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1670c7f9a61306b410310…

1 0

Hans Leidekker : iphlpapi: Set the mask for gateway entries in GetAdaptersInfo.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: a873fdc66f57b13490606a1abfb6131b72753899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a873fdc66f57b13490606a1ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 7 12:24:17 2013 +0200 iphlpapi: Set the mask for gateway entries in GetAdaptersInfo. --- dlls/iphlpapi/iphlpapi_main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9d23c82..141dbd8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -564,8 +564,12 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) if (routeTable->table[i].dwForwardIfIndex == ptr->Index && routeTable->table[i].u1.ForwardType == MIB_IPROUTE_TYPE_INDIRECT) + { toIPAddressString(routeTable->table[i].dwForwardNextHop, ptr->GatewayList.IpAddress.String); + toIPAddressString(routeTable->table[i].dwForwardMask, + ptr->GatewayList.IpMask.String); + } if (winsEnabled) { ptr->HaveWins = TRUE; memcpy(ptr->PrimaryWinsServer.IpAddress.String,

1 0

Rico Schüller : d3dx9: Don' t allocate the state parameter.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: bc1d6e5098c08e59f43fafe8e5e2b649f2006ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1d6e5098c08e59f43fafe8e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 6 21:25:41 2013 +0200 d3dx9: Don't allocate the state parameter. --- dlls/d3dx9_36/effect.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0c4fecc..547e810 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -127,7 +127,7 @@ struct d3dx_state UINT operation; UINT index; enum STATE_TYPE type; - struct d3dx_parameter *parameter; + struct d3dx_parameter parameter; }; struct d3dx_sampler @@ -558,8 +558,7 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base static void free_state(struct d3dx_state *state) { - free_parameter(state->parameter, FALSE, FALSE); - HeapFree(GetProcessHeap(), 0, state->parameter); + free_parameter(&state->parameter, FALSE, FALSE); } static void free_object(struct d3dx_object *object) @@ -4618,11 +4617,6 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con DWORD offset; const char *ptr2; HRESULT hr; - struct d3dx_parameter *parameter; - - parameter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter)); - if (!parameter) - return E_OUTOFMEMORY; state->type = ST_CONSTANT; @@ -4635,7 +4629,7 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; - hr = d3dx9_parse_effect_typedef(parameter, data, &ptr2, NULL, 0); + hr = d3dx9_parse_effect_typedef(&state->parameter, data, &ptr2, NULL, 0); if (hr != D3D_OK) { WARN("Failed to parse type definition\n"); @@ -4644,20 +4638,18 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx9_parse_init_value(parameter, data, data + offset, objects); + hr = d3dx9_parse_init_value(&state->parameter, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); goto err_out; } - state->parameter = parameter; - return D3D_OK; err_out: - free_parameter(parameter, FALSE, FALSE); + free_parameter(&state->parameter, FALSE, FALSE); return hr; } @@ -5007,7 +4999,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * state = &pass->states[state_index]; } - param = state->parameter; + param = &state->parameter; /* * TODO: Do we need to create the shader/string here or later when we access them?

1 0